wine-commits August 2020

wine-commits@winehq.org

2 participants
692 discussions

Michael Müller : fsutil: Print out usage message.
by Alexandre Julliard 06 Aug '20

06 Aug '20

1 0

Alistair Leslie-Hughes : xactengine3_0: New DLL.
by Alexandre Julliard 06 Aug '20

06 Aug '20

Module: wine Branch: master Commit: 54222446aabb0920e9d268c229f8460eeb224dc0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54222446aabb0920e9d268c2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Aug 6 16:09:35 2020 +1000 xactengine3_0: New DLL. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 +++ configure.ac | 2 ++ dlls/xactengine3_0/Makefile.in | 11 +++++++++++ dlls/xactengine3_0/xactengine3_0.spec | 4 ++++ dlls/xactengine3_7/xact_classes.idl | 9 ++++++++- 5 files changed, 28 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 5c88de3e11..0493e2a653 100755 --- a/configure +++ b/configure @@ -1707,6 +1707,7 @@ enable_x3daudio1_4 enable_x3daudio1_5 enable_x3daudio1_6 enable_x3daudio1_7 +enable_xactengine3_0 enable_xactengine3_1 enable_xactengine3_2 enable_xactengine3_3 @@ -16639,6 +16640,7 @@ then enable_x3daudio1_5=${enable_x3daudio1_5:-no} enable_x3daudio1_6=${enable_x3daudio1_6:-no} enable_x3daudio1_7=${enable_x3daudio1_7:-no} + enable_xactengine3_0=${enable_xactengine3_0:-no} enable_xactengine3_1=${enable_xactengine3_1:-no} enable_xactengine3_2=${enable_xactengine3_2:-no} enable_xactengine3_3=${enable_xactengine3_3:-no} @@ -21375,6 +21377,7 @@ wine_fn_config_makefile dlls/x3daudio1_4 enable_x3daudio1_4 wine_fn_config_makefile dlls/x3daudio1_5 enable_x3daudio1_5 wine_fn_config_makefile dlls/x3daudio1_6 enable_x3daudio1_6 wine_fn_config_makefile dlls/x3daudio1_7 enable_x3daudio1_7 +wine_fn_config_makefile dlls/xactengine3_0 enable_xactengine3_0 wine_fn_config_makefile dlls/xactengine3_1 enable_xactengine3_1 wine_fn_config_makefile dlls/xactengine3_2 enable_xactengine3_2 wine_fn_config_makefile dlls/xactengine3_3 enable_xactengine3_3 diff --git a/configure.ac b/configure.ac index bd8b6b2d5a..0a556635a2 100644 --- a/configure.ac +++ b/configure.ac @@ -1958,6 +1958,7 @@ then enable_x3daudio1_5=${enable_x3daudio1_5:-no} enable_x3daudio1_6=${enable_x3daudio1_6:-no} enable_x3daudio1_7=${enable_x3daudio1_7:-no} + enable_xactengine3_0=${enable_xactengine3_0:-no} enable_xactengine3_1=${enable_xactengine3_1:-no} enable_xactengine3_2=${enable_xactengine3_2:-no} enable_xactengine3_3=${enable_xactengine3_3:-no} @@ -3911,6 +3912,7 @@ WINE_CONFIG_MAKEFILE(dlls/x3daudio1_4) WINE_CONFIG_MAKEFILE(dlls/x3daudio1_5) WINE_CONFIG_MAKEFILE(dlls/x3daudio1_6) WINE_CONFIG_MAKEFILE(dlls/x3daudio1_7) +WINE_CONFIG_MAKEFILE(dlls/xactengine3_0) WINE_CONFIG_MAKEFILE(dlls/xactengine3_1) WINE_CONFIG_MAKEFILE(dlls/xactengine3_2) WINE_CONFIG_MAKEFILE(dlls/xactengine3_3) diff --git a/dlls/xactengine3_0/Makefile.in b/dlls/xactengine3_0/Makefile.in new file mode 100644 index 0000000000..e5c77dcccd --- /dev/null +++ b/dlls/xactengine3_0/Makefile.in @@ -0,0 +1,11 @@ +MODULE = xactengine3_0.dll +IMPORTS = ole32 uuid +EXTRADEFS = -DXACT3_VER=0x0300 +PARENTSRC = ../xactengine3_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) + +C_SRCS = \ + xact_dll.c + +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 --- /dev/null +++ b/dlls/xactengine3_0/xactengine3_0.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/xactengine3_7/xact_classes.idl b/dlls/xactengine3_7/xact_classes.idl index aeac5d4cd3..2ed8d337ac 100644 --- a/dlls/xactengine3_7/xact_classes.idl +++ b/dlls/xactengine3_7/xact_classes.idl @@ -20,7 +20,14 @@ #pragma makedep register -#if XACT3_VER == 0x0301 +#if XACT3_VER == 0x0300 +[ + helpstring("XACT3.0 Class"), + threading(both), + uuid(3b80ee2a-b0f5-4780-9e30-90cb39685b03) +] +coclass XACTEngine30 { interface IXACT30Engine; } +#elif XACT3_VER == 0x0301 [ helpstring("XACT3.1 Class"), threading(both),

1 0

Alistair Leslie-Hughes : xactengine3_1: New DLL.
by Alexandre Julliard 06 Aug '20

06 Aug '20

Module: wine Branch: master Commit: a87a889dca024f1af6a1c547587e23f600e3f643 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a87a889dca024f1af6a1c547… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Aug 6 16:09:34 2020 +1000 xactengine3_1: New DLL. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 +++ configure.ac | 2 ++ dlls/xactengine3_1/Makefile.in | 11 +++++++++++ dlls/xactengine3_1/xactengine3_1.spec | 4 ++++ dlls/xactengine3_7/xact_classes.idl | 9 ++++++++- 5 files changed, 28 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 494ba36e68..5c88de3e11 100755 --- a/configure +++ b/configure @@ -1707,6 +1707,7 @@ enable_x3daudio1_4 enable_x3daudio1_5 enable_x3daudio1_6 enable_x3daudio1_7 +enable_xactengine3_1 enable_xactengine3_2 enable_xactengine3_3 enable_xactengine3_4 @@ -16638,6 +16639,7 @@ then enable_x3daudio1_5=${enable_x3daudio1_5:-no} enable_x3daudio1_6=${enable_x3daudio1_6:-no} enable_x3daudio1_7=${enable_x3daudio1_7:-no} + enable_xactengine3_1=${enable_xactengine3_1:-no} enable_xactengine3_2=${enable_xactengine3_2:-no} enable_xactengine3_3=${enable_xactengine3_3:-no} enable_xactengine3_4=${enable_xactengine3_4:-no} @@ -21373,6 +21375,7 @@ wine_fn_config_makefile dlls/x3daudio1_4 enable_x3daudio1_4 wine_fn_config_makefile dlls/x3daudio1_5 enable_x3daudio1_5 wine_fn_config_makefile dlls/x3daudio1_6 enable_x3daudio1_6 wine_fn_config_makefile dlls/x3daudio1_7 enable_x3daudio1_7 +wine_fn_config_makefile dlls/xactengine3_1 enable_xactengine3_1 wine_fn_config_makefile dlls/xactengine3_2 enable_xactengine3_2 wine_fn_config_makefile dlls/xactengine3_3 enable_xactengine3_3 wine_fn_config_makefile dlls/xactengine3_4 enable_xactengine3_4 diff --git a/configure.ac b/configure.ac index 32a6d3c71f..bd8b6b2d5a 100644 --- a/configure.ac +++ b/configure.ac @@ -1958,6 +1958,7 @@ then enable_x3daudio1_5=${enable_x3daudio1_5:-no} enable_x3daudio1_6=${enable_x3daudio1_6:-no} enable_x3daudio1_7=${enable_x3daudio1_7:-no} + enable_xactengine3_1=${enable_xactengine3_1:-no} enable_xactengine3_2=${enable_xactengine3_2:-no} enable_xactengine3_3=${enable_xactengine3_3:-no} enable_xactengine3_4=${enable_xactengine3_4:-no} @@ -3910,6 +3911,7 @@ WINE_CONFIG_MAKEFILE(dlls/x3daudio1_4) WINE_CONFIG_MAKEFILE(dlls/x3daudio1_5) WINE_CONFIG_MAKEFILE(dlls/x3daudio1_6) WINE_CONFIG_MAKEFILE(dlls/x3daudio1_7) +WINE_CONFIG_MAKEFILE(dlls/xactengine3_1) WINE_CONFIG_MAKEFILE(dlls/xactengine3_2) WINE_CONFIG_MAKEFILE(dlls/xactengine3_3) WINE_CONFIG_MAKEFILE(dlls/xactengine3_4) diff --git a/dlls/xactengine3_1/Makefile.in b/dlls/xactengine3_1/Makefile.in new file mode 100644 index 0000000000..f95ea04624 --- /dev/null +++ b/dlls/xactengine3_1/Makefile.in @@ -0,0 +1,11 @@ +MODULE = xactengine3_1.dll +IMPORTS = ole32 uuid +EXTRADEFS = -DXACT3_VER=0x0301 +PARENTSRC = ../xactengine3_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) + +C_SRCS = \ + xact_dll.c + +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 --- /dev/null +++ b/dlls/xactengine3_1/xactengine3_1.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/xactengine3_7/xact_classes.idl b/dlls/xactengine3_7/xact_classes.idl index aa8aede365..aeac5d4cd3 100644 --- a/dlls/xactengine3_7/xact_classes.idl +++ b/dlls/xactengine3_7/xact_classes.idl @@ -20,7 +20,14 @@ #pragma makedep register -#if XACT3_VER == 0x0302 +#if XACT3_VER == 0x0301 +[ + helpstring("XACT3.1 Class"), + threading(both), + uuid(962f5027-99be-4692-a468-85802cf8de61) +] +coclass XACTEngine31 { interface IXACT32Engine; } +#elif XACT3_VER == 0x0302 [ helpstring("XACT3.2 Class"), threading(both),

1 0

Alistair Leslie-Hughes : xactengine3_2: New DLL.
by Alexandre Julliard 06 Aug '20

06 Aug '20

Module: wine Branch: master Commit: ea2120b2b165875cada04ecc4ba09eb235e8d04b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea2120b2b165875cada04ecc… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Aug 6 16:09:33 2020 +1000 xactengine3_2: New DLL. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 +++ configure.ac | 2 ++ dlls/xactengine3_2/Makefile.in | 11 +++++++++++ dlls/xactengine3_2/xactengine3_2.spec | 4 ++++ dlls/xactengine3_7/xact_classes.idl | 9 ++++++++- 5 files changed, 28 insertions(+), 1 deletion(-) diff --git a/configure b/configure index a155ef4f25..494ba36e68 100755 --- a/configure +++ b/configure @@ -1707,6 +1707,7 @@ enable_x3daudio1_4 enable_x3daudio1_5 enable_x3daudio1_6 enable_x3daudio1_7 +enable_xactengine3_2 enable_xactengine3_3 enable_xactengine3_4 enable_xactengine3_5 @@ -16637,6 +16638,7 @@ then enable_x3daudio1_5=${enable_x3daudio1_5:-no} enable_x3daudio1_6=${enable_x3daudio1_6:-no} enable_x3daudio1_7=${enable_x3daudio1_7:-no} + enable_xactengine3_2=${enable_xactengine3_2:-no} enable_xactengine3_3=${enable_xactengine3_3:-no} enable_xactengine3_4=${enable_xactengine3_4:-no} enable_xactengine3_5=${enable_xactengine3_5:-no} @@ -21371,6 +21373,7 @@ wine_fn_config_makefile dlls/x3daudio1_4 enable_x3daudio1_4 wine_fn_config_makefile dlls/x3daudio1_5 enable_x3daudio1_5 wine_fn_config_makefile dlls/x3daudio1_6 enable_x3daudio1_6 wine_fn_config_makefile dlls/x3daudio1_7 enable_x3daudio1_7 +wine_fn_config_makefile dlls/xactengine3_2 enable_xactengine3_2 wine_fn_config_makefile dlls/xactengine3_3 enable_xactengine3_3 wine_fn_config_makefile dlls/xactengine3_4 enable_xactengine3_4 wine_fn_config_makefile dlls/xactengine3_5 enable_xactengine3_5 diff --git a/configure.ac b/configure.ac index 838b66df28..32a6d3c71f 100644 --- a/configure.ac +++ b/configure.ac @@ -1958,6 +1958,7 @@ then enable_x3daudio1_5=${enable_x3daudio1_5:-no} enable_x3daudio1_6=${enable_x3daudio1_6:-no} enable_x3daudio1_7=${enable_x3daudio1_7:-no} + enable_xactengine3_2=${enable_xactengine3_2:-no} enable_xactengine3_3=${enable_xactengine3_3:-no} enable_xactengine3_4=${enable_xactengine3_4:-no} enable_xactengine3_5=${enable_xactengine3_5:-no} @@ -3909,6 +3910,7 @@ WINE_CONFIG_MAKEFILE(dlls/x3daudio1_4) WINE_CONFIG_MAKEFILE(dlls/x3daudio1_5) WINE_CONFIG_MAKEFILE(dlls/x3daudio1_6) WINE_CONFIG_MAKEFILE(dlls/x3daudio1_7) +WINE_CONFIG_MAKEFILE(dlls/xactengine3_2) WINE_CONFIG_MAKEFILE(dlls/xactengine3_3) WINE_CONFIG_MAKEFILE(dlls/xactengine3_4) WINE_CONFIG_MAKEFILE(dlls/xactengine3_5) diff --git a/dlls/xactengine3_2/Makefile.in b/dlls/xactengine3_2/Makefile.in new file mode 100644 index 0000000000..911888ec6e --- /dev/null +++ b/dlls/xactengine3_2/Makefile.in @@ -0,0 +1,11 @@ +MODULE = xactengine3_2.dll +IMPORTS = ole32 uuid +EXTRADEFS = -DXACT3_VER=0x0302 +PARENTSRC = ../xactengine3_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) + +C_SRCS = \ + xact_dll.c + +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 --- /dev/null +++ b/dlls/xactengine3_2/xactengine3_2.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/xactengine3_7/xact_classes.idl b/dlls/xactengine3_7/xact_classes.idl index a8182a1552..aa8aede365 100644 --- a/dlls/xactengine3_7/xact_classes.idl +++ b/dlls/xactengine3_7/xact_classes.idl @@ -20,7 +20,14 @@ #pragma makedep register -#if XACT3_VER == 0x0303 +#if XACT3_VER == 0x0302 +[ + helpstring("XACT3.2 Class"), + threading(both), + uuid(d3332f02-3dd0-4de9-9aec-20d85c4111b6) +] +coclass XACTEngine32 { interface IXACT32Engine; } +#elif XACT3_VER == 0x0303 [ helpstring("XACT3.3 Class"), threading(both),

1 0

Alistair Leslie-Hughes : xactengine3_3: New DLL.
by Alexandre Julliard 06 Aug '20

06 Aug '20

Module: wine Branch: master Commit: cacbac0963586925ce21995cf7c27f663a059212 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cacbac0963586925ce21995c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Aug 6 16:09:32 2020 +1000 xactengine3_3: New DLL. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 +++ configure.ac | 2 ++ dlls/xactengine3_3/Makefile.in | 11 +++++++++++ dlls/xactengine3_3/xactengine3_3.spec | 4 ++++ dlls/xactengine3_7/xact_classes.idl | 9 ++++++++- 5 files changed, 28 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 12bfd8e07e..a155ef4f25 100755 --- a/configure +++ b/configure @@ -1707,6 +1707,7 @@ enable_x3daudio1_4 enable_x3daudio1_5 enable_x3daudio1_6 enable_x3daudio1_7 +enable_xactengine3_3 enable_xactengine3_4 enable_xactengine3_5 enable_xactengine3_6 @@ -16636,6 +16637,7 @@ then enable_x3daudio1_5=${enable_x3daudio1_5:-no} enable_x3daudio1_6=${enable_x3daudio1_6:-no} enable_x3daudio1_7=${enable_x3daudio1_7:-no} + enable_xactengine3_3=${enable_xactengine3_3:-no} enable_xactengine3_4=${enable_xactengine3_4:-no} enable_xactengine3_5=${enable_xactengine3_5:-no} enable_xactengine3_6=${enable_xactengine3_6:-no} @@ -21369,6 +21371,7 @@ wine_fn_config_makefile dlls/x3daudio1_4 enable_x3daudio1_4 wine_fn_config_makefile dlls/x3daudio1_5 enable_x3daudio1_5 wine_fn_config_makefile dlls/x3daudio1_6 enable_x3daudio1_6 wine_fn_config_makefile dlls/x3daudio1_7 enable_x3daudio1_7 +wine_fn_config_makefile dlls/xactengine3_3 enable_xactengine3_3 wine_fn_config_makefile dlls/xactengine3_4 enable_xactengine3_4 wine_fn_config_makefile dlls/xactengine3_5 enable_xactengine3_5 wine_fn_config_makefile dlls/xactengine3_6 enable_xactengine3_6 diff --git a/configure.ac b/configure.ac index af6513274c..838b66df28 100644 --- a/configure.ac +++ b/configure.ac @@ -1958,6 +1958,7 @@ then enable_x3daudio1_5=${enable_x3daudio1_5:-no} enable_x3daudio1_6=${enable_x3daudio1_6:-no} enable_x3daudio1_7=${enable_x3daudio1_7:-no} + enable_xactengine3_3=${enable_xactengine3_3:-no} enable_xactengine3_4=${enable_xactengine3_4:-no} enable_xactengine3_5=${enable_xactengine3_5:-no} enable_xactengine3_6=${enable_xactengine3_6:-no} @@ -3908,6 +3909,7 @@ WINE_CONFIG_MAKEFILE(dlls/x3daudio1_4) WINE_CONFIG_MAKEFILE(dlls/x3daudio1_5) WINE_CONFIG_MAKEFILE(dlls/x3daudio1_6) WINE_CONFIG_MAKEFILE(dlls/x3daudio1_7) +WINE_CONFIG_MAKEFILE(dlls/xactengine3_3) WINE_CONFIG_MAKEFILE(dlls/xactengine3_4) WINE_CONFIG_MAKEFILE(dlls/xactengine3_5) WINE_CONFIG_MAKEFILE(dlls/xactengine3_6) diff --git a/dlls/xactengine3_3/Makefile.in b/dlls/xactengine3_3/Makefile.in new file mode 100644 index 0000000000..cf0155f1be --- /dev/null +++ b/dlls/xactengine3_3/Makefile.in @@ -0,0 +1,11 @@ +MODULE = xactengine3_3.dll +IMPORTS = ole32 uuid +EXTRADEFS = -DXACT3_VER=0x0303 +PARENTSRC = ../xactengine3_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) + +C_SRCS = \ + xact_dll.c + +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 --- /dev/null +++ b/dlls/xactengine3_3/xactengine3_3.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/xactengine3_7/xact_classes.idl b/dlls/xactengine3_7/xact_classes.idl index 2a8eee8fac..a8182a1552 100644 --- a/dlls/xactengine3_7/xact_classes.idl +++ b/dlls/xactengine3_7/xact_classes.idl @@ -20,7 +20,14 @@ #pragma makedep register -#if XACT3_VER == 0x0304 +#if XACT3_VER == 0x0303 +[ + helpstring("XACT3.3 Class"), + threading(both), + uuid(94c1affa-66e7-4961-9521-cfdef3128d4f) +] +coclass XACTEngine33 { interface IXACT37Engine; } +#elif XACT3_VER == 0x0304 [ helpstring("XACT3.4 Class"), threading(both),

1 0

Alistair Leslie-Hughes : xactengine3_4: New DLL.
by Alexandre Julliard 06 Aug '20

06 Aug '20

Module: wine Branch: master Commit: 13f9a842c79fffd2437641bb7cf7cf1ba09ee423 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13f9a842c79fffd2437641bb… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Aug 6 16:09:31 2020 +1000 xactengine3_4: New DLL. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 +++ configure.ac | 2 ++ dlls/xactengine3_4/Makefile.in | 11 +++++++++++ dlls/xactengine3_4/xactengine3_4.spec | 4 ++++ dlls/xactengine3_7/xact_classes.idl | 9 ++++++++- 5 files changed, 28 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 69bdebbfba..12bfd8e07e 100755 --- a/configure +++ b/configure @@ -1707,6 +1707,7 @@ enable_x3daudio1_4 enable_x3daudio1_5 enable_x3daudio1_6 enable_x3daudio1_7 +enable_xactengine3_4 enable_xactengine3_5 enable_xactengine3_6 enable_xactengine3_7 @@ -16635,6 +16636,7 @@ then enable_x3daudio1_5=${enable_x3daudio1_5:-no} enable_x3daudio1_6=${enable_x3daudio1_6:-no} enable_x3daudio1_7=${enable_x3daudio1_7:-no} + enable_xactengine3_4=${enable_xactengine3_4:-no} enable_xactengine3_5=${enable_xactengine3_5:-no} enable_xactengine3_6=${enable_xactengine3_6:-no} enable_xactengine3_7=${enable_xactengine3_7:-no} @@ -21367,6 +21369,7 @@ wine_fn_config_makefile dlls/x3daudio1_4 enable_x3daudio1_4 wine_fn_config_makefile dlls/x3daudio1_5 enable_x3daudio1_5 wine_fn_config_makefile dlls/x3daudio1_6 enable_x3daudio1_6 wine_fn_config_makefile dlls/x3daudio1_7 enable_x3daudio1_7 +wine_fn_config_makefile dlls/xactengine3_4 enable_xactengine3_4 wine_fn_config_makefile dlls/xactengine3_5 enable_xactengine3_5 wine_fn_config_makefile dlls/xactengine3_6 enable_xactengine3_6 wine_fn_config_makefile dlls/xactengine3_7 enable_xactengine3_7 diff --git a/configure.ac b/configure.ac index dc4514e2ae..af6513274c 100644 --- a/configure.ac +++ b/configure.ac @@ -1958,6 +1958,7 @@ then enable_x3daudio1_5=${enable_x3daudio1_5:-no} enable_x3daudio1_6=${enable_x3daudio1_6:-no} enable_x3daudio1_7=${enable_x3daudio1_7:-no} + enable_xactengine3_4=${enable_xactengine3_4:-no} enable_xactengine3_5=${enable_xactengine3_5:-no} enable_xactengine3_6=${enable_xactengine3_6:-no} enable_xactengine3_7=${enable_xactengine3_7:-no} @@ -3907,6 +3908,7 @@ WINE_CONFIG_MAKEFILE(dlls/x3daudio1_4) WINE_CONFIG_MAKEFILE(dlls/x3daudio1_5) WINE_CONFIG_MAKEFILE(dlls/x3daudio1_6) WINE_CONFIG_MAKEFILE(dlls/x3daudio1_7) +WINE_CONFIG_MAKEFILE(dlls/xactengine3_4) WINE_CONFIG_MAKEFILE(dlls/xactengine3_5) WINE_CONFIG_MAKEFILE(dlls/xactengine3_6) WINE_CONFIG_MAKEFILE(dlls/xactengine3_7) diff --git a/dlls/xactengine3_4/Makefile.in b/dlls/xactengine3_4/Makefile.in new file mode 100644 index 0000000000..f90ca3d32c --- /dev/null +++ b/dlls/xactengine3_4/Makefile.in @@ -0,0 +1,11 @@ +MODULE = xactengine3_4.dll +IMPORTS = ole32 uuid +EXTRADEFS = -DXACT3_VER=0x0304 +PARENTSRC = ../xactengine3_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) + +C_SRCS = \ + xact_dll.c + +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 --- /dev/null +++ b/dlls/xactengine3_4/xactengine3_4.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/xactengine3_7/xact_classes.idl b/dlls/xactengine3_7/xact_classes.idl index 186bc06537..2a8eee8fac 100644 --- a/dlls/xactengine3_7/xact_classes.idl +++ b/dlls/xactengine3_7/xact_classes.idl @@ -20,7 +20,14 @@ #pragma makedep register -#if XACT3_VER == 0x0305 +#if XACT3_VER == 0x0304 +[ + helpstring("XACT3.4 Class"), + threading(both), + uuid(0977d092-2d95-4e43-8d42-9ddcc2545ed5) +] +coclass XACTEngine34 { interface IXACT37Engine; } +#elif XACT3_VER == 0x0305 [ helpstring("XACT3.5 Class"), threading(both),

1 0

Alistair Leslie-Hughes : xactengine3_5: New DLL.
by Alexandre Julliard 06 Aug '20

06 Aug '20

Module: wine Branch: master Commit: e736762f37df777cdc64bb3866ec6f751e692b60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e736762f37df777cdc64bb38… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Aug 6 16:09:30 2020 +1000 xactengine3_5: New DLL. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 +++ configure.ac | 2 ++ dlls/xactengine3_5/Makefile.in | 11 +++++++++++ dlls/xactengine3_5/xactengine3_5.spec | 4 ++++ dlls/xactengine3_7/xact_classes.idl | 9 ++++++++- 5 files changed, 28 insertions(+), 1 deletion(-) diff --git a/configure b/configure index fd67234faa..69bdebbfba 100755 --- a/configure +++ b/configure @@ -1707,6 +1707,7 @@ enable_x3daudio1_4 enable_x3daudio1_5 enable_x3daudio1_6 enable_x3daudio1_7 +enable_xactengine3_5 enable_xactengine3_6 enable_xactengine3_7 enable_xapofx1_1 @@ -16634,6 +16635,7 @@ then enable_x3daudio1_5=${enable_x3daudio1_5:-no} enable_x3daudio1_6=${enable_x3daudio1_6:-no} enable_x3daudio1_7=${enable_x3daudio1_7:-no} + enable_xactengine3_5=${enable_xactengine3_5:-no} enable_xactengine3_6=${enable_xactengine3_6:-no} enable_xactengine3_7=${enable_xactengine3_7:-no} enable_xapofx1_1=${enable_xapofx1_1:-no} @@ -21365,6 +21367,7 @@ wine_fn_config_makefile dlls/x3daudio1_4 enable_x3daudio1_4 wine_fn_config_makefile dlls/x3daudio1_5 enable_x3daudio1_5 wine_fn_config_makefile dlls/x3daudio1_6 enable_x3daudio1_6 wine_fn_config_makefile dlls/x3daudio1_7 enable_x3daudio1_7 +wine_fn_config_makefile dlls/xactengine3_5 enable_xactengine3_5 wine_fn_config_makefile dlls/xactengine3_6 enable_xactengine3_6 wine_fn_config_makefile dlls/xactengine3_7 enable_xactengine3_7 wine_fn_config_makefile dlls/xapofx1_1 enable_xapofx1_1 diff --git a/configure.ac b/configure.ac index 9c481d2b0a..dc4514e2ae 100644 --- a/configure.ac +++ b/configure.ac @@ -1958,6 +1958,7 @@ then enable_x3daudio1_5=${enable_x3daudio1_5:-no} enable_x3daudio1_6=${enable_x3daudio1_6:-no} enable_x3daudio1_7=${enable_x3daudio1_7:-no} + enable_xactengine3_5=${enable_xactengine3_5:-no} enable_xactengine3_6=${enable_xactengine3_6:-no} enable_xactengine3_7=${enable_xactengine3_7:-no} enable_xapofx1_1=${enable_xapofx1_1:-no} @@ -3906,6 +3907,7 @@ WINE_CONFIG_MAKEFILE(dlls/x3daudio1_4) WINE_CONFIG_MAKEFILE(dlls/x3daudio1_5) WINE_CONFIG_MAKEFILE(dlls/x3daudio1_6) WINE_CONFIG_MAKEFILE(dlls/x3daudio1_7) +WINE_CONFIG_MAKEFILE(dlls/xactengine3_5) WINE_CONFIG_MAKEFILE(dlls/xactengine3_6) WINE_CONFIG_MAKEFILE(dlls/xactengine3_7) WINE_CONFIG_MAKEFILE(dlls/xapofx1_1) diff --git a/dlls/xactengine3_5/Makefile.in b/dlls/xactengine3_5/Makefile.in new file mode 100644 index 0000000000..b9f3f09ff3 --- /dev/null +++ b/dlls/xactengine3_5/Makefile.in @@ -0,0 +1,11 @@ +MODULE = xactengine3_5.dll +IMPORTS = ole32 uuid +EXTRADEFS = -DXACT3_VER=0x0305 +PARENTSRC = ../xactengine3_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) + +C_SRCS = \ + xact_dll.c + +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 --- /dev/null +++ b/dlls/xactengine3_5/xactengine3_5.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/xactengine3_7/xact_classes.idl b/dlls/xactengine3_7/xact_classes.idl index a6abeb773c..186bc06537 100644 --- a/dlls/xactengine3_7/xact_classes.idl +++ b/dlls/xactengine3_7/xact_classes.idl @@ -20,7 +20,14 @@ #pragma makedep register -#if XACT3_VER == 0x0306 +#if XACT3_VER == 0x0305 +[ + helpstring("XACT3.5 Class"), + threading(both), + uuid(074b110f-7f58-4743-aea5-12f15b5074ed) +] +coclass XACTEngine35 { interface IXACT37Engine; } +#elif XACT3_VER == 0x0306 [ helpstring("XACT3.6 Class"), threading(both),

1 0

Alistair Leslie-Hughes : xactengine3_6: New DLL.
by Alexandre Julliard 06 Aug '20

06 Aug '20

Module: wine Branch: master Commit: 7362ebcaafc65658d155699b1f4c9c336ef6b8ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=7362ebcaafc65658d155699b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Aug 6 16:09:29 2020 +1000 xactengine3_6: New DLL. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 +++ configure.ac | 2 ++ dlls/xactengine3_6/Makefile.in | 11 +++++++++++ dlls/xactengine3_6/xactengine3_6.spec | 4 ++++ dlls/xactengine3_7/xact_classes.idl | 11 ++++++++++- 5 files changed, 30 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 13c2078221..fd67234faa 100755 --- a/configure +++ b/configure @@ -1707,6 +1707,7 @@ enable_x3daudio1_4 enable_x3daudio1_5 enable_x3daudio1_6 enable_x3daudio1_7 +enable_xactengine3_6 enable_xactengine3_7 enable_xapofx1_1 enable_xapofx1_2 @@ -16633,6 +16634,7 @@ then enable_x3daudio1_5=${enable_x3daudio1_5:-no} enable_x3daudio1_6=${enable_x3daudio1_6:-no} enable_x3daudio1_7=${enable_x3daudio1_7:-no} + enable_xactengine3_6=${enable_xactengine3_6:-no} enable_xactengine3_7=${enable_xactengine3_7:-no} enable_xapofx1_1=${enable_xapofx1_1:-no} enable_xapofx1_2=${enable_xapofx1_2:-no} @@ -21363,6 +21365,7 @@ wine_fn_config_makefile dlls/x3daudio1_4 enable_x3daudio1_4 wine_fn_config_makefile dlls/x3daudio1_5 enable_x3daudio1_5 wine_fn_config_makefile dlls/x3daudio1_6 enable_x3daudio1_6 wine_fn_config_makefile dlls/x3daudio1_7 enable_x3daudio1_7 +wine_fn_config_makefile dlls/xactengine3_6 enable_xactengine3_6 wine_fn_config_makefile dlls/xactengine3_7 enable_xactengine3_7 wine_fn_config_makefile dlls/xapofx1_1 enable_xapofx1_1 wine_fn_config_makefile dlls/xapofx1_2 enable_xapofx1_2 diff --git a/configure.ac b/configure.ac index d54857181e..9c481d2b0a 100644 --- a/configure.ac +++ b/configure.ac @@ -1958,6 +1958,7 @@ then enable_x3daudio1_5=${enable_x3daudio1_5:-no} enable_x3daudio1_6=${enable_x3daudio1_6:-no} enable_x3daudio1_7=${enable_x3daudio1_7:-no} + enable_xactengine3_6=${enable_xactengine3_6:-no} enable_xactengine3_7=${enable_xactengine3_7:-no} enable_xapofx1_1=${enable_xapofx1_1:-no} enable_xapofx1_2=${enable_xapofx1_2:-no} @@ -3905,6 +3906,7 @@ WINE_CONFIG_MAKEFILE(dlls/x3daudio1_4) WINE_CONFIG_MAKEFILE(dlls/x3daudio1_5) WINE_CONFIG_MAKEFILE(dlls/x3daudio1_6) WINE_CONFIG_MAKEFILE(dlls/x3daudio1_7) +WINE_CONFIG_MAKEFILE(dlls/xactengine3_6) WINE_CONFIG_MAKEFILE(dlls/xactengine3_7) WINE_CONFIG_MAKEFILE(dlls/xapofx1_1) WINE_CONFIG_MAKEFILE(dlls/xapofx1_2) diff --git a/dlls/xactengine3_6/Makefile.in b/dlls/xactengine3_6/Makefile.in new file mode 100644 index 0000000000..fad71a2fd5 --- /dev/null +++ b/dlls/xactengine3_6/Makefile.in @@ -0,0 +1,11 @@ +MODULE = xactengine3_6.dll +IMPORTS = ole32 uuid +EXTRADEFS = -DXACT3_VER=0x0306 +PARENTSRC = ../xactengine3_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) + +C_SRCS = \ + xact_dll.c + +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 --- /dev/null +++ b/dlls/xactengine3_6/xactengine3_6.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/xactengine3_7/xact_classes.idl b/dlls/xactengine3_7/xact_classes.idl index 24c792e2f0..a6abeb773c 100644 --- a/dlls/xactengine3_7/xact_classes.idl +++ b/dlls/xactengine3_7/xact_classes.idl @@ -20,9 +20,18 @@ #pragma makedep register +#if XACT3_VER == 0x0306 [ - helpstring("XACT3 Class"), + helpstring("XACT3.6 Class"), + threading(both), + uuid(248d8a3b-6256-44d3-a018-2ac96c459f47) +] +coclass XACTEngine36 { interface IXACT37Engine; } +#else /* XACT3_VER == 0x0307 or not defined */ +[ + helpstring("XACT3.7 Class"), threading(both), uuid(bcc782bc-6492-4c22-8c35-f5d72fe73c6e) ] coclass XACTEngine37 { interface IXACT37Engine; } +#endif

1 0

Vijay Kiran Kamuju : xactengine3_7: Implement IXACT3Engine::RegisterNotification and IXACT3Engine::UnRegisterNotification functions.
by Alexandre Julliard 06 Aug '20

06 Aug '20

Module: wine Branch: master Commit: 81b5e2d112c2c3680da268ab1afce1d2f6b08312 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81b5e2d112c2c3680da268ab… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Jul 18 22:59:25 2020 +0200 xactengine3_7: Implement IXACT3Engine::RegisterNotification and IXACT3Engine::UnRegisterNotification functions. Based on patches from Ethan Lee and Alistair Leslie-Hughes. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xactengine3_7/xact_dll.c | 100 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 96 insertions(+), 4 deletions(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index ce9059221a..cb8aed5f3a 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -967,22 +967,114 @@ static HRESULT WINAPI IXACT3EngineImpl_PrepareWave(IXACT3Engine *iface, return E_NOTIMPL; } +enum { + NOTIFY_SoundBank = 0x01, + NOTIFY_WaveBank = 0x02, + NOTIFY_Cue = 0x04, + NOTIFY_Wave = 0x08, + NOTIFY_cueIndex = 0x10, + NOTIFY_waveIndex = 0x20 +}; + +static inline void unwrap_notificationdesc(FACTNotificationDescription *fd, + const XACT_NOTIFICATION_DESCRIPTION *xd) +{ + DWORD flags = 0; + + TRACE("Type %d\n", xd->type); + + memset(fd, 0, sizeof(*fd)); + + /* Supports SoundBank, Cue index, Cue instance */ + if (xd->type == XACTNOTIFICATIONTYPE_CUEPREPARED || xd->type == XACTNOTIFICATIONTYPE_CUEPLAY || + xd->type == XACTNOTIFICATIONTYPE_CUESTOP || xd->type == XACTNOTIFICATIONTYPE_CUEDESTROYED || + xd->type == XACTNOTIFICATIONTYPE_MARKER || xd->type == XACTNOTIFICATIONTYPE_LOCALVARIABLECHANGED) + { + flags = NOTIFY_SoundBank | NOTIFY_cueIndex | NOTIFY_Cue; + } + /* Supports WaveBank */ + else if (xd->type == XACTNOTIFICATIONTYPE_WAVEBANKDESTROYED || xd->type == XACTNOTIFICATIONTYPE_WAVEBANKPREPARED || + xd->type == XACTNOTIFICATIONTYPE_WAVEBANKSTREAMING_INVALIDCONTENT) + { + flags = NOTIFY_WaveBank; + } + /* Supports NOTIFY_SoundBank */ + else if (xd->type == XACTNOTIFICATIONTYPE_SOUNDBANKDESTROYED) + { + flags = NOTIFY_SoundBank; + } + /* Supports WaveBank, Wave index, Wave instance */ + else if (xd->type == XACTNOTIFICATIONTYPE_WAVEPREPARED || xd->type == XACTNOTIFICATIONTYPE_WAVEDESTROYED) + { + flags = NOTIFY_WaveBank | NOTIFY_waveIndex | NOTIFY_Wave; + } + /* Supports SoundBank, SoundBank, Cue index, Cue instance, WaveBank, Wave instance */ + else if (xd->type == XACTNOTIFICATIONTYPE_WAVEPLAY || xd->type == XACTNOTIFICATIONTYPE_WAVESTOP || + xd->type == XACTNOTIFICATIONTYPE_WAVELOOPED) + { + flags = NOTIFY_SoundBank | NOTIFY_cueIndex | NOTIFY_Cue | NOTIFY_WaveBank | NOTIFY_Wave; + } + + /* We have to unwrap the FACT object first! */ + fd->type = xd->type; + fd->flags = xd->flags; + fd->pvContext = xd->pvContext; + if (flags & NOTIFY_cueIndex) + fd->cueIndex = xd->cueIndex; + if (flags & NOTIFY_waveIndex) + fd->waveIndex = xd->waveIndex; + + if (flags & NOTIFY_Cue && xd->pCue != NULL) + { + XACT3CueImpl *cue = impl_from_IXACT3Cue(xd->pCue); + if (cue) + fd->pCue = cue->fact_cue; + } + + if (flags & NOTIFY_SoundBank && xd->pSoundBank != NULL) + { + XACT3SoundBankImpl *sound = impl_from_IXACT3SoundBank(xd->pSoundBank); + if (sound) + fd->pSoundBank = sound->fact_soundbank; + } + + if (flags & NOTIFY_WaveBank && xd->pWaveBank != NULL) + { + XACT3WaveBankImpl *bank = impl_from_IXACT3WaveBank(xd->pWaveBank); + if (bank) + fd->pWaveBank = bank->fact_wavebank; + } + + if (flags & NOTIFY_Wave && xd->pWave != NULL) + { + XACT3WaveImpl *wave = impl_from_IXACT3Wave(xd->pWave); + if (wave) + fd->pWave = wave->fact_wave; + } +} + static HRESULT WINAPI IXACT3EngineImpl_RegisterNotification(IXACT3Engine *iface, const XACT_NOTIFICATION_DESCRIPTION *pNotificationDesc) { XACT3EngineImpl *This = impl_from_IXACT3Engine(iface); + FACTNotificationDescription fdesc; - FIXME("(%p)->(%p): stub!\n", This, pNotificationDesc); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, pNotificationDesc); + + unwrap_notificationdesc(&fdesc, pNotificationDesc); + return FACTAudioEngine_RegisterNotification(This->fact_engine, &fdesc); } static HRESULT WINAPI IXACT3EngineImpl_UnRegisterNotification(IXACT3Engine *iface, const XACT_NOTIFICATION_DESCRIPTION *pNotificationDesc) { XACT3EngineImpl *This = impl_from_IXACT3Engine(iface); + FACTNotificationDescription fdesc; - FIXME("(%p)->(%p): stub!\n", This, pNotificationDesc); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, pNotificationDesc); + + unwrap_notificationdesc(&fdesc, pNotificationDesc); + return FACTAudioEngine_UnRegisterNotification(This->fact_engine, &fdesc); } static XACTCATEGORY WINAPI IXACT3EngineImpl_GetCategory(IXACT3Engine *iface,

1 0

Vijay Kiran Kamuju : xactengine3_7: Implement IXACT3WaveBank::Play function.
by Alexandre Julliard 06 Aug '20

06 Aug '20

Module: wine Branch: master Commit: 00c5e09fafa51fe536b300eb02d17a7b9baded24 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00c5e09fafa51fe536b300eb… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Jul 18 22:54:07 2020 +0200 xactengine3_7: Implement IXACT3WaveBank::Play function. Based on patch from Ethan Lee. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xactengine3_7/xact_dll.c | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 2c7eff08fc..ce9059221a 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -559,9 +559,40 @@ static HRESULT WINAPI IXACT3WaveBankImpl_Play(IXACT3WaveBank *iface, XACTLOOPCOUNT nLoopCount, IXACT3Wave** ppWave) { XACT3WaveBankImpl *This = impl_from_IXACT3WaveBank(iface); - FIXME("(%p)->(0x%x, %u, 0x%x, %u, %p): stub!\n", This, nWaveIndex, dwFlags, dwPlayOffset, + XACT3WaveImpl *wave; + FACTWave *fwave; + HRESULT hr; + + TRACE("(%p)->(0x%x, %u, 0x%x, %u, %p)\n", This, nWaveIndex, dwFlags, dwPlayOffset, nLoopCount, ppWave); - return E_NOTIMPL; + + /* If the application doesn't want a handle, don't generate one at all. + * Let the engine handle that memory instead. + * -flibit + */ + if (ppWave == NULL){ + hr = FACTWaveBank_Play(This->fact_wavebank, nWaveIndex, dwFlags, + dwPlayOffset, nLoopCount, NULL); + }else{ + hr = FACTWaveBank_Play(This->fact_wavebank, nWaveIndex, dwFlags, + dwPlayOffset, nLoopCount, &fwave); + if(FAILED(hr)) + return hr; + + wave = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*wave)); + if (!wave) + { + FACTWave_Destroy(fwave); + ERR("Failed to allocate XACT3WaveImpl!"); + return E_OUTOFMEMORY; + } + + wave->IXACT3Wave_iface.lpVtbl = &XACT3Wave_Vtbl; + wave->fact_wave = fwave; + *ppWave = (IXACT3Wave*)wave; + } + + return hr; } static HRESULT WINAPI IXACT3WaveBankImpl_Stop(IXACT3WaveBank *iface,

1 0

← Newer
1
...
54
55
56
57
58
59
60
...
70
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2020