wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-04-13 14:42:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 948a6a47b8dbd0ddd86cad04de03f0e4ba81b65d.

Browse Source
This commit is contained in:
Zebediah Figura
2020-06-12 18:15:13 -05:00
parent eb4f9db59c
commit b6595d9e28
23 changed files with 509 additions and 744 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
patches/xactengine-initial/0001-include-Add-xact3.idl.patch
View File

@@ -1,4 +1,4 @@
From fa4b6d66242136e922620295da4a22a7431d17fe Mon Sep 17 00:00:00 2001
From 1528db6daac145ca3444b432382c8e4b8fd15a5d Mon Sep 17 00:00:00 2001
From: Ethan Lee <elee@codeweavers.com>
Date: Wed, 22 Jan 2020 00:12:10 +0000
Subject: [PATCH] include: Add xact3.idl
@@ -7,15 +7,14 @@ Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
---
include/Makefile.in | 1 +
include/xact3.idl | 533 ++++++++++++++++++++++++++++++++++++++++++++
include/xact3wb.h | 2 +
3 files changed, 536 insertions(+)
2 files changed, 534 insertions(+)
create mode 100644 include/xact3.idl
diff --git a/include/Makefile.in b/include/Makefile.in
index ce0f6fc433..faba1622d9 100644
index 9f70e72b4c7..200d4a69423 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -784,6 +784,7 @@ SOURCES = \
@@ -802,6 +802,7 @@ SOURCES = \
wtypes.idl \
wuapi.idl \
x3daudio.h \
@@ -25,7 +24,7 @@ index ce0f6fc433..faba1622d9 100644
xapofx.h \
diff --git a/include/xact3.idl b/include/xact3.idl
new file mode 100644
index 0000000000..c49718ff39
index 00000000000..c49718ff393
--- /dev/null
+++ b/include/xact3.idl
@@ -0,0 +1,533 @@
@@ -562,19 +561,6 @@ index 0000000000..c49718ff39
+
+ HRESULT GetProperties(XACT_WAVE_INSTANCE_PROPERTIES *pProperties);
+}
diff --git a/include/xact3wb.h b/include/xact3wb.h
index b4c5a53d40..130efc9745 100644
--- a/include/xact3wb.h
+++ b/include/xact3wb.h
@@ -18,6 +18,8 @@
#ifndef __XACT3WB_H__
#define __XACT3WB_H__
+#define WAVEBANK_ENTRYNAME_LENGTH 64
+
typedef union WAVEBANKMINIWAVEFORMAT
{
struct
--
2.25.1
2.27.0

26
patches/xactengine-initial/0017-include-Correct-the-name-of-WAVEBANKMINIWAVEFORMAT.patch Normal file
View File

@@ -0,0 +1,26 @@
From e8e4434d2a8edf0b964ed0e93500b20718ba961d Mon Sep 17 00:00:00 2001
From: Zebediah Figura <z.figura12@gmail.com>
Date: Fri, 12 Jun 2020 17:59:11 -0500
Subject: [PATCH] include: Correct the name of WAVEBANKMINIWAVEFORMAT.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
---
include/xact3wb.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/xact3wb.h b/include/xact3wb.h
index c68d7a30fad..81b1518930d 100644
--- a/include/xact3wb.h
+++ b/include/xact3wb.h
@@ -138,7 +138,7 @@ typedef struct WAVEBANKDATA
DWORD dwEntryMetaDataElementSize;
DWORD dwEntryNameElementSize;
DWORD dwAlignment;
- WAVEBANKMINIFORMAT CompactFormat;
+ WAVEBANKMINIWAVEFORMAT CompactFormat;
FILETIME BuildTime;
} WAVEBANKDATA, *LPWAVEBANKDATA;
typedef const WAVEBANKDATA *LPCWAVEBANKDATA;
--
2.27.0