From 6138369b4fce687a0d0582fa0a53c51c66245b15 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Tue, 3 Mar 2020 10:15:12 +1100 Subject: [PATCH] Updated xactengine-initial patchset Removed #if from idl. The generated header in xaudio2_7 takes preference over local file. --- ...-xaudio2-Add-support-for-xactengine3.patch | 70 +++++++------------ 1 file changed, 27 insertions(+), 43 deletions(-) diff --git a/patches/xactengine-initial/0002-xaudio2-Add-support-for-xactengine3.patch b/patches/xactengine-initial/0002-xaudio2-Add-support-for-xactengine3.patch index c796c2cf..83389a11 100644 --- a/patches/xactengine-initial/0002-xaudio2-Add-support-for-xactengine3.patch +++ b/patches/xactengine-initial/0002-xaudio2-Add-support-for-xactengine3.patch @@ -1,4 +1,4 @@ -From 4ed706183e0d82b3d60ccba9564d4b05d2441049 Mon Sep 17 00:00:00 2001 +From cdf9deda326fb237d9c895965e052a019ea54074 Mon Sep 17 00:00:00 2001 From: Ethan Lee Date: Wed, 13 Nov 2019 12:13:45 -0500 Subject: [PATCH] xaudio2: Add support for xactengine3 @@ -29,9 +29,9 @@ Signed-off-by: Ethan Lee dlls/xactengine3_7/Makefile.in | 12 + dlls/xactengine3_7/xactengine3_7.spec | 4 + dlls/xaudio2_7/Makefile.in | 5 +- - dlls/xaudio2_7/xact_classes.idl | 93 ++ + dlls/xaudio2_7/xact_classes.idl | 77 ++ dlls/xaudio2_7/xact_dll.c | 1387 +++++++++++++++++++++++++ - 20 files changed, 1628 insertions(+), 1 deletion(-) + 20 files changed, 1612 insertions(+), 1 deletion(-) create mode 100644 dlls/xactengine3_0/Makefile.in create mode 100644 dlls/xactengine3_0/xactengine3_0.spec create mode 100644 dlls/xactengine3_1/Makefile.in @@ -52,10 +52,10 @@ Signed-off-by: Ethan Lee create mode 100644 dlls/xaudio2_7/xact_dll.c diff --git a/configure.ac b/configure.ac -index 47d2b750c0..1feca3c8e0 100644 +index cb6eedcdc95..0a3fce01de8 100644 --- a/configure.ac +++ b/configure.ac -@@ -1917,6 +1917,14 @@ then +@@ -1979,6 +1979,14 @@ then enable_x3daudio1_5=${enable_x3daudio1_5:-no} enable_x3daudio1_6=${enable_x3daudio1_6:-no} enable_x3daudio1_7=${enable_x3daudio1_7:-no} @@ -70,7 +70,7 @@ index 47d2b750c0..1feca3c8e0 100644 enable_xapofx1_1=${enable_xapofx1_1:-no} enable_xapofx1_2=${enable_xapofx1_2:-no} enable_xapofx1_3=${enable_xapofx1_3:-no} -@@ -3845,6 +3853,14 @@ WINE_CONFIG_MAKEFILE(dlls/x3daudio1_4) +@@ -3962,6 +3970,14 @@ WINE_CONFIG_MAKEFILE(dlls/x3daudio1_4) WINE_CONFIG_MAKEFILE(dlls/x3daudio1_5) WINE_CONFIG_MAKEFILE(dlls/x3daudio1_6) WINE_CONFIG_MAKEFILE(dlls/x3daudio1_7) @@ -87,7 +87,7 @@ index 47d2b750c0..1feca3c8e0 100644 WINE_CONFIG_MAKEFILE(dlls/xapofx1_3) diff --git a/dlls/xactengine3_0/Makefile.in b/dlls/xactengine3_0/Makefile.in new file mode 100644 -index 0000000000..0353039913 +index 00000000000..03530399135 --- /dev/null +++ b/dlls/xactengine3_0/Makefile.in @@ -0,0 +1,12 @@ @@ -105,7 +105,7 @@ index 0000000000..0353039913 +IDL_SRCS = xact_classes.idl diff --git a/dlls/xactengine3_0/xactengine3_0.spec b/dlls/xactengine3_0/xactengine3_0.spec new file mode 100644 -index 0000000000..b16365d0c9 +index 00000000000..b16365d0c9f --- /dev/null +++ b/dlls/xactengine3_0/xactengine3_0.spec @@ -0,0 +1,4 @@ @@ -115,7 +115,7 @@ index 0000000000..b16365d0c9 +@ stdcall -private DllUnregisterServer() diff --git a/dlls/xactengine3_1/Makefile.in b/dlls/xactengine3_1/Makefile.in new file mode 100644 -index 0000000000..b065b92d9a +index 00000000000..b065b92d9a9 --- /dev/null +++ b/dlls/xactengine3_1/Makefile.in @@ -0,0 +1,12 @@ @@ -133,7 +133,7 @@ index 0000000000..b065b92d9a +IDL_SRCS = xact_classes.idl diff --git a/dlls/xactengine3_1/xactengine3_1.spec b/dlls/xactengine3_1/xactengine3_1.spec new file mode 100644 -index 0000000000..b16365d0c9 +index 00000000000..b16365d0c9f --- /dev/null +++ b/dlls/xactengine3_1/xactengine3_1.spec @@ -0,0 +1,4 @@ @@ -143,7 +143,7 @@ index 0000000000..b16365d0c9 +@ stdcall -private DllUnregisterServer() diff --git a/dlls/xactengine3_2/Makefile.in b/dlls/xactengine3_2/Makefile.in new file mode 100644 -index 0000000000..6e4e065534 +index 00000000000..6e4e0655348 --- /dev/null +++ b/dlls/xactengine3_2/Makefile.in @@ -0,0 +1,12 @@ @@ -161,7 +161,7 @@ index 0000000000..6e4e065534 +IDL_SRCS = xact_classes.idl diff --git a/dlls/xactengine3_2/xactengine3_2.spec b/dlls/xactengine3_2/xactengine3_2.spec new file mode 100644 -index 0000000000..b16365d0c9 +index 00000000000..b16365d0c9f --- /dev/null +++ b/dlls/xactengine3_2/xactengine3_2.spec @@ -0,0 +1,4 @@ @@ -171,7 +171,7 @@ index 0000000000..b16365d0c9 +@ stdcall -private DllUnregisterServer() diff --git a/dlls/xactengine3_3/Makefile.in b/dlls/xactengine3_3/Makefile.in new file mode 100644 -index 0000000000..a8eebc03b2 +index 00000000000..a8eebc03b28 --- /dev/null +++ b/dlls/xactengine3_3/Makefile.in @@ -0,0 +1,12 @@ @@ -189,7 +189,7 @@ index 0000000000..a8eebc03b2 +IDL_SRCS = xact_classes.idl diff --git a/dlls/xactengine3_3/xactengine3_3.spec b/dlls/xactengine3_3/xactengine3_3.spec new file mode 100644 -index 0000000000..b16365d0c9 +index 00000000000..b16365d0c9f --- /dev/null +++ b/dlls/xactengine3_3/xactengine3_3.spec @@ -0,0 +1,4 @@ @@ -199,7 +199,7 @@ index 0000000000..b16365d0c9 +@ stdcall -private DllUnregisterServer() diff --git a/dlls/xactengine3_4/Makefile.in b/dlls/xactengine3_4/Makefile.in new file mode 100644 -index 0000000000..967acb7bcc +index 00000000000..967acb7bcce --- /dev/null +++ b/dlls/xactengine3_4/Makefile.in @@ -0,0 +1,12 @@ @@ -217,7 +217,7 @@ index 0000000000..967acb7bcc +IDL_SRCS = xact_classes.idl diff --git a/dlls/xactengine3_4/xactengine3_4.spec b/dlls/xactengine3_4/xactengine3_4.spec new file mode 100644 -index 0000000000..b16365d0c9 +index 00000000000..b16365d0c9f --- /dev/null +++ b/dlls/xactengine3_4/xactengine3_4.spec @@ -0,0 +1,4 @@ @@ -227,7 +227,7 @@ index 0000000000..b16365d0c9 +@ stdcall -private DllUnregisterServer() diff --git a/dlls/xactengine3_5/Makefile.in b/dlls/xactengine3_5/Makefile.in new file mode 100644 -index 0000000000..16e8b00b5e +index 00000000000..16e8b00b5ef --- /dev/null +++ b/dlls/xactengine3_5/Makefile.in @@ -0,0 +1,12 @@ @@ -245,7 +245,7 @@ index 0000000000..16e8b00b5e +IDL_SRCS = xact_classes.idl diff --git a/dlls/xactengine3_5/xactengine3_5.spec b/dlls/xactengine3_5/xactengine3_5.spec new file mode 100644 -index 0000000000..b16365d0c9 +index 00000000000..b16365d0c9f --- /dev/null +++ b/dlls/xactengine3_5/xactengine3_5.spec @@ -0,0 +1,4 @@ @@ -255,7 +255,7 @@ index 0000000000..b16365d0c9 +@ stdcall -private DllUnregisterServer() diff --git a/dlls/xactengine3_6/Makefile.in b/dlls/xactengine3_6/Makefile.in new file mode 100644 -index 0000000000..d226331aaf +index 00000000000..d226331aafc --- /dev/null +++ b/dlls/xactengine3_6/Makefile.in @@ -0,0 +1,12 @@ @@ -273,7 +273,7 @@ index 0000000000..d226331aaf +IDL_SRCS = xact_classes.idl diff --git a/dlls/xactengine3_6/xactengine3_6.spec b/dlls/xactengine3_6/xactengine3_6.spec new file mode 100644 -index 0000000000..b16365d0c9 +index 00000000000..b16365d0c9f --- /dev/null +++ b/dlls/xactengine3_6/xactengine3_6.spec @@ -0,0 +1,4 @@ @@ -283,7 +283,7 @@ index 0000000000..b16365d0c9 +@ stdcall -private DllUnregisterServer() diff --git a/dlls/xactengine3_7/Makefile.in b/dlls/xactengine3_7/Makefile.in new file mode 100644 -index 0000000000..080bc8a13b +index 00000000000..080bc8a13b7 --- /dev/null +++ b/dlls/xactengine3_7/Makefile.in @@ -0,0 +1,12 @@ @@ -301,7 +301,7 @@ index 0000000000..080bc8a13b +IDL_SRCS = xact_classes.idl diff --git a/dlls/xactengine3_7/xactengine3_7.spec b/dlls/xactengine3_7/xactengine3_7.spec new file mode 100644 -index 0000000000..b16365d0c9 +index 00000000000..b16365d0c9f --- /dev/null +++ b/dlls/xactengine3_7/xactengine3_7.spec @@ -0,0 +1,4 @@ @@ -310,7 +310,7 @@ index 0000000000..b16365d0c9 +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/xaudio2_7/Makefile.in b/dlls/xaudio2_7/Makefile.in -index 294f841b01..f27ce9f87e 100644 +index 294f841b019..f27ce9f87e4 100644 --- a/dlls/xaudio2_7/Makefile.in +++ b/dlls/xaudio2_7/Makefile.in @@ -7,9 +7,12 @@ EXTRAINCL = $(FAUDIO_CFLAGS) @@ -329,10 +329,10 @@ index 294f841b01..f27ce9f87e 100644 + xaudio_classes.idl diff --git a/dlls/xaudio2_7/xact_classes.idl b/dlls/xaudio2_7/xact_classes.idl new file mode 100644 -index 0000000000..89418dbe1a +index 00000000000..bee4bcb5875 --- /dev/null +++ b/dlls/xaudio2_7/xact_classes.idl -@@ -0,0 +1,93 @@ +@@ -0,0 +1,77 @@ +/* + * COM Classes for xactengine + * @@ -355,80 +355,64 @@ index 0000000000..89418dbe1a + +#pragma makedep register + -+#if XACT3_VER == 0x0307 +[ + helpstring("XACT3 Class"), + threading(both), + uuid(bcc782bc-6492-4c22-8c35-f5d72fe73c6e) +] +coclass XACTEngine37 { interface IXACT37Engine; } -+#endif /* XACT3_VER == 0x0307 */ + -+#if XACT3_VER == 0x0306 +[ + helpstring("XACT3.6 Class"), + threading(both), + uuid(248d8a3b-6256-44d3-a018-2ac96c459f47) +] +coclass XACTEngine36 { interface IXACT37Engine; } -+#endif /* XACT3_VER == 0x0306 */ + -+#if XACT3_VER == 0x0305 +[ + helpstring("XACT3.5 Class"), + threading(both), + uuid(074b110f-7f58-4743-aea5-12f15b5074ed) +] +coclass XACTEngine35 { interface IXACT37Engine; } -+#endif /* XACT3_VER == 0x0305 */ + -+#if XACT3_VER == 0x0304 +[ + helpstring("XACT3.4 Class"), + threading(both), + uuid(0977d092-2d95-4e43-8d42-9ddcc2545ed5) +] +coclass XACTEngine34 { interface IXACT37Engine; } -+#endif /* XACT3_VER == 0x0304 */ + -+#if XACT3_VER == 0x0303 +[ + helpstring("XACT3.3 Class"), + threading(both), + uuid(94c1affa-66e7-4961-9521-cfdef3128d4f) +] +coclass XACTEngine33 { interface IXACT37Engine; } -+#endif /* XACT3_VER == 0x0303 */ + -+#if XACT3_VER == 0x0302 +[ + helpstring("XACT3.2 Class"), + threading(both), + uuid(d3332f02-3dd0-4de9-9aec-20d85c4111b6) +] +coclass XACTEngine32 { interface IXACT32Engine; } -+#endif /* XACT3_VER == 0x0302 */ + -+#if XACT3_VER == 0x0301 +[ + helpstring("XACT3.1 Class"), + threading(both), + uuid(962f5027-99be-4692-a468-85802cf8de61) +] +coclass XACTEngine31 { interface IXACT32Engine; } -+#endif /* XACT3_VER == 0x0301 */ + -+#if XACT3_VER == 0x0300 +[ + helpstring("XACT3.0 Class"), + threading(both), + uuid(3b80ee2a-b0f5-4780-9e30-90cb39685b03) +] +coclass XACTEngine30 { interface IXACT30Engine; } -+#endif /* XACT3_VER == 0x0300 */ diff --git a/dlls/xaudio2_7/xact_dll.c b/dlls/xaudio2_7/xact_dll.c new file mode 100644 -index 0000000000..07f866606d +index 00000000000..07f866606d2 --- /dev/null +++ b/dlls/xaudio2_7/xact_dll.c @@ -0,0 +1,1387 @@ @@ -1820,5 +1804,5 @@ index 0000000000..07f866606d + +#endif -- -2.25.1 +2.17.1