January 2016 - Wine-Commits

Andrew Eikum : xapofx1_5: Use shared source.
by Alexandre Julliard Jan. 14, 2016

Jan. 14, 2016

Module: wine Branch: master Commit: d8739d44334226487b7bdb02160bd0bd0b39f283 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8739d44334226487b7bdb021… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Jan 14 08:09:55 2016 -0600 xapofx1_5: Use shared source. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/xapofx1_5/Makefile.in | 4 ++- dlls/xapofx1_5/main.c | 59 --------------------------------------- dlls/xaudio2_7/xapofx.c | 58 ++++++++++++++++++++++++++++++++++++++ dlls/xaudio2_7/xaudio_classes.idl | 14 ---------- dlls/xaudio2_7/xaudio_dll.c | 7 +---- include/xapofx.h | 4 --- 8 files changed, 64 insertions(+), 84 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d8739d44334226487b7bd…

1 0

Piotr Caban : msvcp100: Add numeric_limits<*>::lowest implementation.
by Alexandre Julliard Jan. 14, 2016

Jan. 14, 2016

Module: wine Branch: master Commit: 2633496a7473baf4f0ae2f6a812f8a5e39e094ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=2633496a7473baf4f0ae2f6a8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 14 15:55:16 2016 +0100 msvcp100: Add numeric_limits<*>::lowest implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp100/msvcp100.spec | 32 +++++++++++++++--------------- dlls/msvcp90/math.c | 48 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 16 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index d2b75f4..357ca83 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -2113,22 +2113,22 @@ @ cdecl -arch=win64 ?length@?$codecvt(a)GDH@std@@QEBAHAEBHPEBD1_K(a)Z(ptr ptr str str long) codecvt_wchar_length @ thiscall -arch=win32 ?length@?$codecvt(a)_WDH@std@@QBEHABHPBD1I(a)Z(ptr ptr str str long) codecvt_wchar_length @ cdecl -arch=win64 ?length@?$codecvt(a)_WDH@std@@QEBAHAEBHPEBD1_K(a)Z(ptr ptr str str long) codecvt_wchar_length -@ stub ?lowest@?$numeric_limits(a)C@std@@SACXZ -@ stub ?lowest@?$numeric_limits(a)D@std@@SADXZ -@ stub ?lowest@?$numeric_limits(a)E@std@@SAEXZ -@ stub ?lowest@?$numeric_limits(a)F@std@@SAFXZ -@ stub ?lowest@?$numeric_limits(a)G@std@@SAGXZ -@ stub ?lowest@?$numeric_limits(a)H@std@@SAHXZ -@ stub ?lowest@?$numeric_limits(a)I@std@@SAIXZ -@ stub ?lowest@?$numeric_limits(a)J@std@@SAJXZ -@ stub ?lowest@?$numeric_limits(a)K@std@@SAKXZ -@ stub ?lowest@?$numeric_limits(a)M@std@@SAMXZ -@ stub ?lowest@?$numeric_limits(a)N@std@@SANXZ -@ stub ?lowest@?$numeric_limits(a)O@std@@SAOXZ -@ stub ?lowest@?$numeric_limits(a)_J@std@@SA_JXZ -@ stub ?lowest@?$numeric_limits(a)_K@std@@SA_KXZ -@ stub ?lowest@?$numeric_limits(a)_N@std@@SA_NXZ -@ stub ?lowest@?$numeric_limits(a)_W@std@@SA_WXZ +@ cdecl ?lowest@?$numeric_limits(a)C@std@@SACXZ() std_numeric_limits_signed_char_lowest +@ cdecl ?lowest@?$numeric_limits(a)D@std@@SADXZ() std_numeric_limits_char_lowest +@ cdecl ?lowest@?$numeric_limits(a)E@std@@SAEXZ() std_numeric_limits_unsigned_char_lowest +@ cdecl ?lowest@?$numeric_limits(a)F@std@@SAFXZ() std_numeric_limits_short_lowest +@ cdecl ?lowest@?$numeric_limits(a)G@std@@SAGXZ() std_numeric_limits_unsigned_short_lowest +@ cdecl ?lowest@?$numeric_limits(a)H@std@@SAHXZ() std_numeric_limits_int_lowest +@ cdecl ?lowest@?$numeric_limits(a)I@std@@SAIXZ() std_numeric_limits_unsigned_int_lowest +@ cdecl ?lowest@?$numeric_limits(a)J@std@@SAJXZ() std_numeric_limits_long_lowest +@ cdecl ?lowest@?$numeric_limits(a)K@std@@SAKXZ() std_numeric_limits_unsigned_long_lowest +@ cdecl ?lowest@?$numeric_limits(a)M@std@@SAMXZ() std_numeric_limits_float_lowest +@ cdecl ?lowest@?$numeric_limits(a)N@std@@SANXZ() std_numeric_limits_double_lowest +@ cdecl ?lowest@?$numeric_limits(a)O@std@@SAOXZ() std_numeric_limits_long_double_lowest +@ cdecl -ret64 ?lowest@?$numeric_limits(a)_J@std@@SA_JXZ() std_numeric_limits_int64_lowest +@ cdecl -ret64 ?lowest@?$numeric_limits(a)_K@std@@SA_KXZ() std_numeric_limits_unsigned_int64_lowest +@ cdecl ?lowest@?$numeric_limits(a)_N@std@@SA_NXZ() std_numeric_limits_bool_lowest +@ cdecl ?lowest@?$numeric_limits(a)_W@std@@SA_WXZ() std_numeric_limits_wchar_t_lowest @ cdecl ?max@?$numeric_limits(a)C@std@@SACXZ() std_numeric_limits_signed_char_max @ cdecl ?max@?$numeric_limits(a)D@std@@SADXZ() std_numeric_limits_char_max @ cdecl ?max@?$numeric_limits(a)E@std@@SAEXZ() std_numeric_limits_unsigned_char_max diff --git a/dlls/msvcp90/math.c b/dlls/msvcp90/math.c index 6c3a33a..99f6727 100644 --- a/dlls/msvcp90/math.c +++ b/dlls/msvcp90/math.c @@ -659,6 +659,54 @@ BOOLEAN __cdecl std_numeric_limits_bool_min(void) { return FALSE; } /* ?min@?$numeric_limits(a)_W@std@@SA_WXZ -> public: static wchar_t __cdecl std::numeric_limits<wchar_t>::min(void) */ WCHAR __cdecl std_numeric_limits_wchar_t_min(void) { return 0; } +/* ?lowest@?$numeric_limits(a)C@std@@SACXZ */ +signed char __cdecl std_numeric_limits_signed_char_lowest(void) { return SCHAR_MIN; } + +/* ?lowest@?$numeric_limits(a)D@std@@SADXZ */ +char __cdecl std_numeric_limits_char_lowest(void) { return CHAR_MIN; } + +/* ?lowest@?$numeric_limits(a)E@std@@SAEXZ */ +unsigned char __cdecl std_numeric_limits_unsigned_char_lowest(void) { return 0; } + +/* ?lowest@?$numeric_limits(a)F@std@@SAFXZ */ +short __cdecl std_numeric_limits_short_lowest(void) { return SHRT_MIN; } + +/* ?lowest@?$numeric_limits(a)G@std@@SAGXZ */ +unsigned short __cdecl std_numeric_limits_unsigned_short_lowest(void) { return 0; } + +/* ?lowest@?$numeric_limits(a)H@std@@SAHXZ */ +int __cdecl std_numeric_limits_int_lowest(void) { return INT_MIN; } + +/* ?lowest@?$numeric_limits(a)I@std@@SAIXZ */ +unsigned int __cdecl std_numeric_limits_unsigned_int_lowest(void) { return 0; } + +/* ?lowest@?$numeric_limits(a)J@std@@SAJXZ */ +LONG __cdecl std_numeric_limits_long_lowest(void) { return LONG_MIN; } + +/* ?lowest@?$numeric_limits(a)K@std@@SAKXZ */ +ULONG __cdecl std_numeric_limits_unsigned_long_lowest(void) { return 0; } + +/* ?lowest@?$numeric_limits(a)M@std@@SAMXZ */ +float __cdecl std_numeric_limits_float_lowest(void) { return -FLT_MAX; } + +/* ?lowest@?$numeric_limits(a)N@std@@SANXZ */ +double __cdecl std_numeric_limits_double_lowest(void) { return -DBL_MAX; } + +/* ?lowest@?$numeric_limits(a)O@std@@SAOXZ */ +LDOUBLE __cdecl std_numeric_limits_long_double_lowest(void) { return -LDBL_MAX; } + +/* ?lowest@?$numeric_limits(a)_J@std@@SA_JXZ */ +__int64 __cdecl std_numeric_limits_int64_lowest(void) { return I64_MIN; } + +/* ?lowest@?$numeric_limits(a)_K@std@@SA_KXZ */ +unsigned __int64 __cdecl std_numeric_limits_unsigned_int64_lowest(void) { return 0; } + +/* ?lowest@?$numeric_limits(a)_N@std@@SA_NXZ */ +BOOLEAN __cdecl std_numeric_limits_bool_lowest(void) { return FALSE; } + +/* ?lowest@?$numeric_limits(a)_W@std@@SA_WXZ */ +WCHAR __cdecl std_numeric_limits_wchar_t_lowest(void) { return 0; } + /* ?quiet_NaN@?$numeric_limits(a)C@std@@SACXZ -> public: static signed char __cdecl std::numeric_limits<signed char>::quiet_NaN(void) */ signed char __cdecl std_numeric_limits_signed_char_quiet_NaN(void) { return 0; }

1 0

Piotr Caban : msvcp60: Export more complex numbers operators.
by Alexandre Julliard Jan. 14, 2016

Jan. 14, 2016

Module: wine Branch: master Commit: 14529012da91580119c1712cd24fcf67c780789b URL: http://source.winehq.org/git/wine.git/?a=commit;h=14529012da91580119c1712cd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 14 15:55:27 2016 +0100 msvcp60: Export more complex numbers operators. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/msvcp60.spec | 240 +++++++++++++++++++++++----------------------- 1 file changed, 120 insertions(+), 120 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=14529012da91580119c17…

1 0

Andrew Eikum : xapofx1_1: Use shared source.
by Alexandre Julliard Jan. 14, 2016

Jan. 14, 2016

Module: wine Branch: master Commit: adc6281ea164a06f7dd7f32eb867dd6c6809db84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adc6281ea164a06f7dd7f32eb… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Jan 14 08:10:09 2016 -0600 xapofx1_1: Use shared source. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/xapofx1_1/Makefile.in | 4 ++- dlls/xapofx1_1/main.c | 64 --------------------------------------- dlls/xaudio2_7/xaudio_classes.idl | 14 --------- dlls/xaudio2_7/xaudio_dll.c | 11 ++----- include/xapofx.h | 12 -------- 7 files changed, 7 insertions(+), 100 deletions(-) diff --git a/configure b/configure index f116922..70c5ea9 100755 --- a/configure +++ b/configure @@ -13719,6 +13719,7 @@ fi if test "x$ac_cv_have_openalsoft" != xyes then as_fn_append wine_notices "|openal-soft ${notice_platform}development files not found (or too old), XAudio2 won't be supported" + enable_xapofx1_1=${enable_xapofx1_1:-no} enable_xapofx1_2=${enable_xapofx1_2:-no} enable_xapofx1_3=${enable_xapofx1_3:-no} enable_xapofx1_4=${enable_xapofx1_4:-no} diff --git a/configure.ac b/configure.ac index ec41ad9..8aca9a1 100644 --- a/configure.ac +++ b/configure.ac @@ -1662,6 +1662,7 @@ fi if test "x$ac_cv_have_openalsoft" != xyes then WINE_NOTICE([openal-soft ${notice_platform}development files not found (or too old), XAudio2 won't be supported]) + enable_xapofx1_1=${enable_xapofx1_1:-no} enable_xapofx1_2=${enable_xapofx1_2:-no} enable_xapofx1_3=${enable_xapofx1_3:-no} enable_xapofx1_4=${enable_xapofx1_4:-no} diff --git a/dlls/xapofx1_1/Makefile.in b/dlls/xapofx1_1/Makefile.in index 48bd79e..f69ff86 100644 --- a/dlls/xapofx1_1/Makefile.in +++ b/dlls/xapofx1_1/Makefile.in @@ -1,7 +1,9 @@ +EXTRADEFS = -DXAPOFX1_VER=1 -DXAUDIO2_VER=2 MODULE = xapofx1_1.dll IMPORTS = ole32 +PARENTSRC = ../xaudio2_7 C_SRCS = \ - main.c + xapofx.c RC_SRCS = version.rc diff --git a/dlls/xapofx1_1/main.c b/dlls/xapofx1_1/main.c deleted file mode 100644 index 00fe3ff..0000000 --- a/dlls/xapofx1_1/main.c +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright 2010 Louis Lenders - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" -#include <stdarg.h> - -#include "initguid.h" -#include "windef.h" -#include "winbase.h" -#include "compobj.h" -#include "xapofx.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(xapofx); - -/***************************************************** - * DllMain - */ -BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) -{ - TRACE("(%p, %d, %p)\n", hinst, reason, reserved); - - switch(reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinst); - break; - } - return TRUE; -} - -HRESULT CDECL CreateFX(REFCLSID clsid, IUnknown **out) -{ - const GUID *class = clsid; - - TRACE("%s %p\n", debugstr_guid(clsid), out); - - if(IsEqualGUID(clsid, &CLSID_FXReverb27) || - IsEqualGUID(clsid, &CLSID_FXReverb)) - class = &CLSID_WINE_FXReverb11; - else if(IsEqualGUID(clsid, &CLSID_FXEQ27) || - IsEqualGUID(clsid, &CLSID_FXEQ)) - class = &CLSID_WINE_FXEQ11; - - return CoCreateInstance(class, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)out); -} diff --git a/dlls/xaudio2_7/xaudio_classes.idl b/dlls/xaudio2_7/xaudio_classes.idl index 58301da..64e350f 100644 --- a/dlls/xaudio2_7/xaudio_classes.idl +++ b/dlls/xaudio2_7/xaudio_classes.idl @@ -48,20 +48,6 @@ coclass AudioReverb { interface IUnknown; } uuid(962f5027-99be-4692-a468-85802cf8de61) ] coclass XACT31 { interface IUnknown; } - -[ - helpstring("XAPOFX1.1 FXReverb Class (Wine)"), - threading(both), - uuid(a90bc001-e897-e897-7439-43FF02000101) -] -coclass FXReverb11 { interface IXAPO; } - -[ - helpstring("XAPOFX1.1 FXEQ Class (Wine)"), - threading(both), - uuid(a90bc001-e897-e897-7439-43FF00000101) -] -coclass FXEQ11 { interface IXAPO; } #endif /* XAUDIO2_VER == 7 */ #if XAUDIO2_VER == 6 diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 62c2d40..cc75099 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -2045,12 +2045,10 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) }else if(IsEqualGUID(rclsid, &CLSID_AudioReverb20)){ factory = make_xapo_factory(&CLSID_AudioReverb27, 20); - }else if(IsEqualGUID(rclsid, &CLSID_AudioReverb21) || - IsEqualGUID(rclsid, &CLSID_WINE_FXReverb10)){ + }else if(IsEqualGUID(rclsid, &CLSID_AudioReverb21)){ factory = make_xapo_factory(&CLSID_AudioReverb27, 21); - }else if(IsEqualGUID(rclsid, &CLSID_AudioReverb22) || - IsEqualGUID(rclsid, &CLSID_WINE_FXReverb11)){ + }else if(IsEqualGUID(rclsid, &CLSID_AudioReverb22)){ factory = make_xapo_factory(&CLSID_AudioReverb27, 22); }else if(IsEqualGUID(rclsid, &CLSID_AudioReverb23)){ @@ -2067,11 +2065,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) }else if(IsEqualGUID(rclsid, &CLSID_AudioReverb27)){ factory = make_xapo_factory(&CLSID_AudioReverb27, 27); - - }else if(IsEqualGUID(rclsid, &CLSID_WINE_FXEQ10)){ - factory = make_xapo_factory(&CLSID_FXEQ, 21); - }else if(IsEqualGUID(rclsid, &CLSID_WINE_FXEQ11)){ - factory = make_xapo_factory(&CLSID_FXEQ, 22); } if(!factory) return CLASS_E_CLASSNOTAVAILABLE; diff --git a/include/xapofx.h b/include/xapofx.h index 0f76df9..65292db 100644 --- a/include/xapofx.h +++ b/include/xapofx.h @@ -25,32 +25,20 @@ DEFINE_GUID(CLSID_FXEQ27, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0x55, 0x00, 0x00, 0x00, 0x00); /* xaudio >= 2.8 */ DEFINE_GUID(CLSID_FXEQ, 0xf5e01117, 0xd6c4, 0x485a, 0xa3, 0xf5, 0x69, 0x51, 0x96, 0xf3, 0xdb, 0xfa); -/* wine internal */ -DEFINE_GUID(CLSID_WINE_FXEQ10, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0xFF, 0x00, 0x00, 0x01, 0x00); -DEFINE_GUID(CLSID_WINE_FXEQ11, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0xFF, 0x00, 0x00, 0x01, 0x01); /* xapofx 1.0 through 1.5 */ DEFINE_GUID(CLSID_FXMasteringLimiter27, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0x55, 0x00, 0x00, 0x00, 0x01); /* xaudio >= 2.8 */ DEFINE_GUID(CLSID_FXMasteringLimiter, 0xc4137916, 0x2be1, 0x46fd, 0x85, 0x99, 0x44, 0x15, 0x36, 0xf4, 0x98, 0x56); -/* wine internal */ -DEFINE_GUID(CLSID_WINE_FXMasteringLimiter10, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0xFF, 0x01, 0x00, 0x01, 0x00); -DEFINE_GUID(CLSID_WINE_FXMasteringLimiter11, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0xFF, 0x01, 0x00, 0x01, 0x01); /* xapofx 1.0 through 1.5 */ DEFINE_GUID(CLSID_FXReverb27, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0x55, 0x00, 0x00, 0x00, 0x02); /* xaudio >= 2.8 */ DEFINE_GUID(CLSID_FXReverb, 0x7d9aca56, 0xcb68, 0x4807, 0xb6, 0x32, 0xb1, 0x37, 0x35, 0x2e, 0x85, 0x96); -/* wine internal */ -DEFINE_GUID(CLSID_WINE_FXReverb10, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0xFF, 0x02, 0x00, 0x01, 0x00); -DEFINE_GUID(CLSID_WINE_FXReverb11, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0xFF, 0x02, 0x00, 0x01, 0x01); /* xapofx 1.0 through 1.5 */ DEFINE_GUID(CLSID_FXEcho27, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0x55, 0x00, 0x00, 0x00, 0x03); /* xaudio >= 2.8 */ DEFINE_GUID(CLSID_FXEcho, 0x5039d740, 0xf736, 0x449a, 0x84, 0xd3, 0xa5, 0x62, 0x02, 0x55, 0x7b, 0x87); -/* wine internal */ -DEFINE_GUID(CLSID_WINE_FXEcho10, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0xFF, 0x03, 0x00, 0x01, 0x00); -DEFINE_GUID(CLSID_WINE_FXEcho11, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0xFF, 0x03, 0x00, 0x01, 0x01); #endif

1 0

Andrew Eikum : xapofx1_2: Use shared source.
by Alexandre Julliard Jan. 14, 2016

Jan. 14, 2016

Module: wine Branch: master Commit: 80de4ba64d3f8053904c1bfd10dde5d6af953c43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80de4ba64d3f8053904c1bfd1… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Jan 14 08:10:06 2016 -0600 xapofx1_2: Use shared source. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/xapofx1_2/Makefile.in | 4 ++- dlls/xapofx1_2/main.c | 64 --------------------------------------- dlls/xaudio2_7/xaudio_classes.idl | 14 --------- dlls/xaudio2_7/xaudio_dll.c | 5 +-- include/xapofx.h | 4 --- 7 files changed, 6 insertions(+), 87 deletions(-) diff --git a/configure b/configure index af4b8be..f116922 100755 --- a/configure +++ b/configure @@ -13719,6 +13719,7 @@ fi if test "x$ac_cv_have_openalsoft" != xyes then as_fn_append wine_notices "|openal-soft ${notice_platform}development files not found (or too old), XAudio2 won't be supported" + enable_xapofx1_2=${enable_xapofx1_2:-no} enable_xapofx1_3=${enable_xapofx1_3:-no} enable_xapofx1_4=${enable_xapofx1_4:-no} enable_xapofx1_5=${enable_xapofx1_5:-no} diff --git a/configure.ac b/configure.ac index 0216351..ec41ad9 100644 --- a/configure.ac +++ b/configure.ac @@ -1662,6 +1662,7 @@ fi if test "x$ac_cv_have_openalsoft" != xyes then WINE_NOTICE([openal-soft ${notice_platform}development files not found (or too old), XAudio2 won't be supported]) + enable_xapofx1_2=${enable_xapofx1_2:-no} enable_xapofx1_3=${enable_xapofx1_3:-no} enable_xapofx1_4=${enable_xapofx1_4:-no} enable_xapofx1_5=${enable_xapofx1_5:-no} diff --git a/dlls/xapofx1_2/Makefile.in b/dlls/xapofx1_2/Makefile.in index 21a2ca7..d56a2be 100644 --- a/dlls/xapofx1_2/Makefile.in +++ b/dlls/xapofx1_2/Makefile.in @@ -1,5 +1,7 @@ +EXTRADEFS = -DXAPOFX1_VER=2 -DXAUDIO2_VER=3 MODULE = xapofx1_2.dll IMPORTS = ole32 +PARENTSRC = ../xaudio2_7 C_SRCS = \ - main.c + xapofx.c diff --git a/dlls/xapofx1_2/main.c b/dlls/xapofx1_2/main.c deleted file mode 100644 index 6eeed22..0000000 --- a/dlls/xapofx1_2/main.c +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright 2015 Andrew Eikum for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" -#include <stdarg.h> - -#include "initguid.h" -#include "windef.h" -#include "winbase.h" -#include "compobj.h" -#include "xapofx.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(xapofx); - -/***************************************************** - * DllMain - */ -BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) -{ - TRACE("(%p, %d, %p)\n", hinst, reason, reserved); - - switch(reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinst); - break; - } - return TRUE; -} - -HRESULT CDECL CreateFX(REFCLSID clsid, IUnknown **out) -{ - const GUID *class = clsid; - - TRACE("%s %p\n", debugstr_guid(clsid), out); - - if(IsEqualGUID(clsid, &CLSID_FXReverb27) || - IsEqualGUID(clsid, &CLSID_FXReverb)) - class = &CLSID_WINE_FXReverb12; - else if(IsEqualGUID(clsid, &CLSID_FXEQ27) || - IsEqualGUID(clsid, &CLSID_FXEQ)) - class = &CLSID_WINE_FXEQ12; - - return CoCreateInstance(class, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)out); -} diff --git a/dlls/xaudio2_7/xaudio_classes.idl b/dlls/xaudio2_7/xaudio_classes.idl index 354b967..58301da 100644 --- a/dlls/xaudio2_7/xaudio_classes.idl +++ b/dlls/xaudio2_7/xaudio_classes.idl @@ -57,25 +57,11 @@ coclass XACT31 { interface IUnknown; } coclass FXReverb11 { interface IXAPO; } [ - helpstring("XAPOFX1.2 FXReverb Class (Wine)"), - threading(both), - uuid(a90bc001-e897-e897-7439-43FF02000102) -] -coclass FXReverb12 { interface IXAPO; } - -[ helpstring("XAPOFX1.1 FXEQ Class (Wine)"), threading(both), uuid(a90bc001-e897-e897-7439-43FF00000101) ] coclass FXEQ11 { interface IXAPO; } - -[ - helpstring("XAPOFX1.2 FXEQ Class (Wine)"), - threading(both), - uuid(a90bc001-e897-e897-7439-43FF00000102) -] -coclass FXEQ12 { interface IXAPO; } #endif /* XAUDIO2_VER == 7 */ #if XAUDIO2_VER == 6 diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index e793447..62c2d40 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -2053,8 +2053,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) IsEqualGUID(rclsid, &CLSID_WINE_FXReverb11)){ factory = make_xapo_factory(&CLSID_AudioReverb27, 22); - }else if(IsEqualGUID(rclsid, &CLSID_AudioReverb23) || - IsEqualGUID(rclsid, &CLSID_WINE_FXReverb12)){ + }else if(IsEqualGUID(rclsid, &CLSID_AudioReverb23)){ factory = make_xapo_factory(&CLSID_AudioReverb27, 23); }else if(IsEqualGUID(rclsid, &CLSID_AudioReverb24)){ @@ -2073,8 +2072,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) factory = make_xapo_factory(&CLSID_FXEQ, 21); }else if(IsEqualGUID(rclsid, &CLSID_WINE_FXEQ11)){ factory = make_xapo_factory(&CLSID_FXEQ, 22); - }else if(IsEqualGUID(rclsid, &CLSID_WINE_FXEQ12)){ - factory = make_xapo_factory(&CLSID_FXEQ, 23); } if(!factory) return CLASS_E_CLASSNOTAVAILABLE; diff --git a/include/xapofx.h b/include/xapofx.h index 512a511..0f76df9 100644 --- a/include/xapofx.h +++ b/include/xapofx.h @@ -28,7 +28,6 @@ DEFINE_GUID(CLSID_FXEQ, 0xf5e01117, 0xd6c4, 0x485a, 0xa3, 0xf5, 0x69, 0x51, 0x96 /* wine internal */ DEFINE_GUID(CLSID_WINE_FXEQ10, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0xFF, 0x00, 0x00, 0x01, 0x00); DEFINE_GUID(CLSID_WINE_FXEQ11, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0xFF, 0x00, 0x00, 0x01, 0x01); -DEFINE_GUID(CLSID_WINE_FXEQ12, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0xFF, 0x00, 0x00, 0x01, 0x02); /* xapofx 1.0 through 1.5 */ DEFINE_GUID(CLSID_FXMasteringLimiter27, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0x55, 0x00, 0x00, 0x00, 0x01); @@ -37,7 +36,6 @@ DEFINE_GUID(CLSID_FXMasteringLimiter, 0xc4137916, 0x2be1, 0x46fd, 0x85, 0x99, 0x /* wine internal */ DEFINE_GUID(CLSID_WINE_FXMasteringLimiter10, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0xFF, 0x01, 0x00, 0x01, 0x00); DEFINE_GUID(CLSID_WINE_FXMasteringLimiter11, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0xFF, 0x01, 0x00, 0x01, 0x01); -DEFINE_GUID(CLSID_WINE_FXMasteringLimiter12, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0xFF, 0x01, 0x00, 0x01, 0x02); /* xapofx 1.0 through 1.5 */ DEFINE_GUID(CLSID_FXReverb27, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0x55, 0x00, 0x00, 0x00, 0x02); @@ -46,7 +44,6 @@ DEFINE_GUID(CLSID_FXReverb, 0x7d9aca56, 0xcb68, 0x4807, 0xb6, 0x32, 0xb1, 0x37, /* wine internal */ DEFINE_GUID(CLSID_WINE_FXReverb10, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0xFF, 0x02, 0x00, 0x01, 0x00); DEFINE_GUID(CLSID_WINE_FXReverb11, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0xFF, 0x02, 0x00, 0x01, 0x01); -DEFINE_GUID(CLSID_WINE_FXReverb12, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0xFF, 0x02, 0x00, 0x01, 0x02); /* xapofx 1.0 through 1.5 */ DEFINE_GUID(CLSID_FXEcho27, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0x55, 0x00, 0x00, 0x00, 0x03); @@ -55,6 +52,5 @@ DEFINE_GUID(CLSID_FXEcho, 0x5039d740, 0xf736, 0x449a, 0x84, 0xd3, 0xa5, 0x62, 0x /* wine internal */ DEFINE_GUID(CLSID_WINE_FXEcho10, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0xFF, 0x03, 0x00, 0x01, 0x00); DEFINE_GUID(CLSID_WINE_FXEcho11, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0xFF, 0x03, 0x00, 0x01, 0x01); -DEFINE_GUID(CLSID_WINE_FXEcho12, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0xFF, 0x03, 0x00, 0x01, 0x02); #endif

1 0

Andrew Eikum : xapofx1_3: Use shared source.
by Alexandre Julliard Jan. 14, 2016

Jan. 14, 2016

Module: wine Branch: master Commit: 1559b715a834bff7109b3970ecfc740e9933d6eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1559b715a834bff7109b3970e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Jan 14 08:10:02 2016 -0600 xapofx1_3: Use shared source. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/xapofx1_3/Makefile.in | 4 ++- dlls/xapofx1_3/main.c | 59 --------------------------------------- dlls/xaudio2_7/xaudio_classes.idl | 14 ---------- dlls/xaudio2_7/xaudio_dll.c | 5 +--- include/xapofx.h | 4 --- 7 files changed, 6 insertions(+), 82 deletions(-) diff --git a/configure b/configure index e43a288..af4b8be 100755 --- a/configure +++ b/configure @@ -13719,6 +13719,7 @@ fi if test "x$ac_cv_have_openalsoft" != xyes then as_fn_append wine_notices "|openal-soft ${notice_platform}development files not found (or too old), XAudio2 won't be supported" + enable_xapofx1_3=${enable_xapofx1_3:-no} enable_xapofx1_4=${enable_xapofx1_4:-no} enable_xapofx1_5=${enable_xapofx1_5:-no} enable_xaudio2_0=${enable_xaudio2_0:-no} diff --git a/configure.ac b/configure.ac index 97313ab..0216351 100644 --- a/configure.ac +++ b/configure.ac @@ -1662,6 +1662,7 @@ fi if test "x$ac_cv_have_openalsoft" != xyes then WINE_NOTICE([openal-soft ${notice_platform}development files not found (or too old), XAudio2 won't be supported]) + enable_xapofx1_3=${enable_xapofx1_3:-no} enable_xapofx1_4=${enable_xapofx1_4:-no} enable_xapofx1_5=${enable_xapofx1_5:-no} enable_xaudio2_0=${enable_xaudio2_0:-no} diff --git a/dlls/xapofx1_3/Makefile.in b/dlls/xapofx1_3/Makefile.in index 31ef5b3..1139520 100644 --- a/dlls/xapofx1_3/Makefile.in +++ b/dlls/xapofx1_3/Makefile.in @@ -1,7 +1,9 @@ +EXTRADEFS = -DXAPOFX1_VER=3 -DXAUDIO2_VER=4 MODULE = xapofx1_3.dll IMPORTS = ole32 +PARENTSRC = ../xaudio2_7 C_SRCS = \ - main.c + xapofx.c RC_SRCS = version.rc diff --git a/dlls/xapofx1_3/main.c b/dlls/xapofx1_3/main.c deleted file mode 100644 index ba846a4..0000000 --- a/dlls/xapofx1_3/main.c +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright 2015 Andrey Gusev - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" -#include <stdarg.h> - -#include "initguid.h" -#include "windef.h" -#include "winbase.h" -#include "compobj.h" -#include "xapofx.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(xaudio2); - -BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) -{ - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(instance); - break; - } - - return TRUE; -} - -HRESULT CDECL CreateFX(REFCLSID clsid, IUnknown **out) -{ - const GUID *class = clsid; - - TRACE("%s %p\n", debugstr_guid(clsid), out); - - if(IsEqualGUID(clsid, &CLSID_FXReverb27) || - IsEqualGUID(clsid, &CLSID_FXReverb)) - class = &CLSID_WINE_FXReverb13; - else if(IsEqualGUID(clsid, &CLSID_FXEQ27) || - IsEqualGUID(clsid, &CLSID_FXEQ)) - class = &CLSID_WINE_FXEQ13; - - return CoCreateInstance(class, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)out); -} diff --git a/dlls/xaudio2_7/xaudio_classes.idl b/dlls/xaudio2_7/xaudio_classes.idl index 03b94e2..354b967 100644 --- a/dlls/xaudio2_7/xaudio_classes.idl +++ b/dlls/xaudio2_7/xaudio_classes.idl @@ -64,13 +64,6 @@ coclass FXReverb11 { interface IXAPO; } coclass FXReverb12 { interface IXAPO; } [ - helpstring("XAPOFX1.3 FXReverb Class (Wine)"), - threading(both), - uuid(a90bc001-e897-e897-7439-43FF02000103) -] -coclass FXReverb13 { interface IXAPO; } - -[ helpstring("XAPOFX1.1 FXEQ Class (Wine)"), threading(both), uuid(a90bc001-e897-e897-7439-43FF00000101) @@ -83,13 +76,6 @@ coclass FXEQ11 { interface IXAPO; } uuid(a90bc001-e897-e897-7439-43FF00000102) ] coclass FXEQ12 { interface IXAPO; } - -[ - helpstring("XAPOFX1.3 FXEQ Class (Wine)"), - threading(both), - uuid(a90bc001-e897-e897-7439-43FF00000103) -] -coclass FXEQ13 { interface IXAPO; } #endif /* XAUDIO2_VER == 7 */ #if XAUDIO2_VER == 6 diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index e43b5b4..e793447 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -2057,8 +2057,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) IsEqualGUID(rclsid, &CLSID_WINE_FXReverb12)){ factory = make_xapo_factory(&CLSID_AudioReverb27, 23); - }else if(IsEqualGUID(rclsid, &CLSID_AudioReverb24) || - IsEqualGUID(rclsid, &CLSID_WINE_FXReverb13)){ + }else if(IsEqualGUID(rclsid, &CLSID_AudioReverb24)){ factory = make_xapo_factory(&CLSID_AudioReverb27, 24); }else if(IsEqualGUID(rclsid, &CLSID_AudioReverb25)){ @@ -2076,8 +2075,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) factory = make_xapo_factory(&CLSID_FXEQ, 22); }else if(IsEqualGUID(rclsid, &CLSID_WINE_FXEQ12)){ factory = make_xapo_factory(&CLSID_FXEQ, 23); - }else if(IsEqualGUID(rclsid, &CLSID_WINE_FXEQ13)){ - factory = make_xapo_factory(&CLSID_FXEQ, 24); } if(!factory) return CLASS_E_CLASSNOTAVAILABLE; diff --git a/include/xapofx.h b/include/xapofx.h index 681ccf4..512a511 100644 --- a/include/xapofx.h +++ b/include/xapofx.h @@ -29,7 +29,6 @@ DEFINE_GUID(CLSID_FXEQ, 0xf5e01117, 0xd6c4, 0x485a, 0xa3, 0xf5, 0x69, 0x51, 0x96 DEFINE_GUID(CLSID_WINE_FXEQ10, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0xFF, 0x00, 0x00, 0x01, 0x00); DEFINE_GUID(CLSID_WINE_FXEQ11, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0xFF, 0x00, 0x00, 0x01, 0x01); DEFINE_GUID(CLSID_WINE_FXEQ12, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0xFF, 0x00, 0x00, 0x01, 0x02); -DEFINE_GUID(CLSID_WINE_FXEQ13, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0xFF, 0x00, 0x00, 0x01, 0x03); /* xapofx 1.0 through 1.5 */ DEFINE_GUID(CLSID_FXMasteringLimiter27, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0x55, 0x00, 0x00, 0x00, 0x01); @@ -39,7 +38,6 @@ DEFINE_GUID(CLSID_FXMasteringLimiter, 0xc4137916, 0x2be1, 0x46fd, 0x85, 0x99, 0x DEFINE_GUID(CLSID_WINE_FXMasteringLimiter10, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0xFF, 0x01, 0x00, 0x01, 0x00); DEFINE_GUID(CLSID_WINE_FXMasteringLimiter11, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0xFF, 0x01, 0x00, 0x01, 0x01); DEFINE_GUID(CLSID_WINE_FXMasteringLimiter12, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0xFF, 0x01, 0x00, 0x01, 0x02); -DEFINE_GUID(CLSID_WINE_FXMasteringLimiter13, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0xFF, 0x01, 0x00, 0x01, 0x03); /* xapofx 1.0 through 1.5 */ DEFINE_GUID(CLSID_FXReverb27, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0x55, 0x00, 0x00, 0x00, 0x02); @@ -49,7 +47,6 @@ DEFINE_GUID(CLSID_FXReverb, 0x7d9aca56, 0xcb68, 0x4807, 0xb6, 0x32, 0xb1, 0x37, DEFINE_GUID(CLSID_WINE_FXReverb10, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0xFF, 0x02, 0x00, 0x01, 0x00); DEFINE_GUID(CLSID_WINE_FXReverb11, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0xFF, 0x02, 0x00, 0x01, 0x01); DEFINE_GUID(CLSID_WINE_FXReverb12, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0xFF, 0x02, 0x00, 0x01, 0x02); -DEFINE_GUID(CLSID_WINE_FXReverb13, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0xFF, 0x02, 0x00, 0x01, 0x03); /* xapofx 1.0 through 1.5 */ DEFINE_GUID(CLSID_FXEcho27, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0x55, 0x00, 0x00, 0x00, 0x03); @@ -59,6 +56,5 @@ DEFINE_GUID(CLSID_FXEcho, 0x5039d740, 0xf736, 0x449a, 0x84, 0xd3, 0xa5, 0x62, 0x DEFINE_GUID(CLSID_WINE_FXEcho10, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0xFF, 0x03, 0x00, 0x01, 0x00); DEFINE_GUID(CLSID_WINE_FXEcho11, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0xFF, 0x03, 0x00, 0x01, 0x01); DEFINE_GUID(CLSID_WINE_FXEcho12, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0xFF, 0x03, 0x00, 0x01, 0x02); -DEFINE_GUID(CLSID_WINE_FXEcho13, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0xFF, 0x03, 0x00, 0x01, 0x03); #endif

1 0

Andrew Eikum : xapofx1_4: Use shared source.
by Alexandre Julliard Jan. 14, 2016

Jan. 14, 2016

Module: wine Branch: master Commit: 12d7ce689aed0daa08b1a7219ac810202169bdb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12d7ce689aed0daa08b1a7219… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Jan 14 08:09:59 2016 -0600 xapofx1_4: Use shared source. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/xapofx1_4/Makefile.in | 4 ++- dlls/xapofx1_4/main.c | 59 --------------------------------------- dlls/xaudio2_7/xaudio_classes.idl | 14 ---------- dlls/xaudio2_7/xaudio_dll.c | 5 +--- include/xapofx.h | 4 --- 7 files changed, 6 insertions(+), 82 deletions(-) diff --git a/configure b/configure index 2e82164..e43a288 100755 --- a/configure +++ b/configure @@ -13719,6 +13719,7 @@ fi if test "x$ac_cv_have_openalsoft" != xyes then as_fn_append wine_notices "|openal-soft ${notice_platform}development files not found (or too old), XAudio2 won't be supported" + enable_xapofx1_4=${enable_xapofx1_4:-no} enable_xapofx1_5=${enable_xapofx1_5:-no} enable_xaudio2_0=${enable_xaudio2_0:-no} enable_xaudio2_1=${enable_xaudio2_1:-no} diff --git a/configure.ac b/configure.ac index 06a534d..97313ab 100644 --- a/configure.ac +++ b/configure.ac @@ -1662,6 +1662,7 @@ fi if test "x$ac_cv_have_openalsoft" != xyes then WINE_NOTICE([openal-soft ${notice_platform}development files not found (or too old), XAudio2 won't be supported]) + enable_xapofx1_4=${enable_xapofx1_4:-no} enable_xapofx1_5=${enable_xapofx1_5:-no} enable_xaudio2_0=${enable_xaudio2_0:-no} enable_xaudio2_1=${enable_xaudio2_1:-no} diff --git a/dlls/xapofx1_4/Makefile.in b/dlls/xapofx1_4/Makefile.in index b65ea90..b49e464 100644 --- a/dlls/xapofx1_4/Makefile.in +++ b/dlls/xapofx1_4/Makefile.in @@ -1,5 +1,7 @@ +EXTRADEFS = -DXAPOFX1_VER=4 -DXAUDIO2_VER=6 MODULE = xapofx1_4.dll IMPORTS = ole32 +PARENTSRC = ../xaudio2_7 C_SRCS = \ - main.c + xapofx.c diff --git a/dlls/xapofx1_4/main.c b/dlls/xapofx1_4/main.c deleted file mode 100644 index 15219ce..0000000 --- a/dlls/xapofx1_4/main.c +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (C) 2015 Austin English - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" -#include <stdarg.h> - -#include "initguid.h" -#include "windef.h" -#include "winbase.h" -#include "compobj.h" -#include "xapofx.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(xaudio2); - -BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) -{ - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(instance); - break; - } - - return TRUE; -} - -HRESULT CDECL CreateFX(REFCLSID clsid, IUnknown **out) -{ - const GUID *class = clsid; - - TRACE("%s %p\n", debugstr_guid(clsid), out); - - if(IsEqualGUID(clsid, &CLSID_FXReverb27) || - IsEqualGUID(clsid, &CLSID_FXReverb)) - class = &CLSID_WINE_FXReverb14; - else if(IsEqualGUID(clsid, &CLSID_FXEQ27) || - IsEqualGUID(clsid, &CLSID_FXEQ)) - class = &CLSID_WINE_FXEQ14; - - return CoCreateInstance(class, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)out); -} diff --git a/dlls/xaudio2_7/xaudio_classes.idl b/dlls/xaudio2_7/xaudio_classes.idl index a4ad4ab..03b94e2 100644 --- a/dlls/xaudio2_7/xaudio_classes.idl +++ b/dlls/xaudio2_7/xaudio_classes.idl @@ -71,13 +71,6 @@ coclass FXReverb12 { interface IXAPO; } coclass FXReverb13 { interface IXAPO; } [ - helpstring("XAPOFX1.4 FXReverb Class (Wine)"), - threading(both), - uuid(a90bc001-e897-e897-7439-43FF02000104) -] -coclass FXReverb14 { interface IXAPO; } - -[ helpstring("XAPOFX1.1 FXEQ Class (Wine)"), threading(both), uuid(a90bc001-e897-e897-7439-43FF00000101) @@ -97,13 +90,6 @@ coclass FXEQ12 { interface IXAPO; } uuid(a90bc001-e897-e897-7439-43FF00000103) ] coclass FXEQ13 { interface IXAPO; } - -[ - helpstring("XAPOFX1.4 FXEQ Class (Wine)"), - threading(both), - uuid(a90bc001-e897-e897-7439-43FF00000104) -] -coclass FXEQ14 { interface IXAPO; } #endif /* XAUDIO2_VER == 7 */ #if XAUDIO2_VER == 6 diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 0c492f7..e43b5b4 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -2064,8 +2064,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) }else if(IsEqualGUID(rclsid, &CLSID_AudioReverb25)){ factory = make_xapo_factory(&CLSID_AudioReverb27, 25); - }else if(IsEqualGUID(rclsid, &CLSID_AudioReverb26) || - IsEqualGUID(rclsid, &CLSID_WINE_FXReverb14)){ + }else if(IsEqualGUID(rclsid, &CLSID_AudioReverb26)){ factory = make_xapo_factory(&CLSID_AudioReverb27, 26); }else if(IsEqualGUID(rclsid, &CLSID_AudioReverb27)){ @@ -2079,8 +2078,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) factory = make_xapo_factory(&CLSID_FXEQ, 23); }else if(IsEqualGUID(rclsid, &CLSID_WINE_FXEQ13)){ factory = make_xapo_factory(&CLSID_FXEQ, 24); - }else if(IsEqualGUID(rclsid, &CLSID_WINE_FXEQ14)){ - factory = make_xapo_factory(&CLSID_FXEQ, 26); } if(!factory) return CLASS_E_CLASSNOTAVAILABLE; diff --git a/include/xapofx.h b/include/xapofx.h index d7e1841..681ccf4 100644 --- a/include/xapofx.h +++ b/include/xapofx.h @@ -30,7 +30,6 @@ DEFINE_GUID(CLSID_WINE_FXEQ10, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0xF DEFINE_GUID(CLSID_WINE_FXEQ11, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0xFF, 0x00, 0x00, 0x01, 0x01); DEFINE_GUID(CLSID_WINE_FXEQ12, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0xFF, 0x00, 0x00, 0x01, 0x02); DEFINE_GUID(CLSID_WINE_FXEQ13, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0xFF, 0x00, 0x00, 0x01, 0x03); -DEFINE_GUID(CLSID_WINE_FXEQ14, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0xFF, 0x00, 0x00, 0x01, 0x04); /* xapofx 1.0 through 1.5 */ DEFINE_GUID(CLSID_FXMasteringLimiter27, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0x55, 0x00, 0x00, 0x00, 0x01); @@ -41,7 +40,6 @@ DEFINE_GUID(CLSID_WINE_FXMasteringLimiter10, 0xa90bc001, 0xe897, 0xe897, 0x74, 0 DEFINE_GUID(CLSID_WINE_FXMasteringLimiter11, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0xFF, 0x01, 0x00, 0x01, 0x01); DEFINE_GUID(CLSID_WINE_FXMasteringLimiter12, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0xFF, 0x01, 0x00, 0x01, 0x02); DEFINE_GUID(CLSID_WINE_FXMasteringLimiter13, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0xFF, 0x01, 0x00, 0x01, 0x03); -DEFINE_GUID(CLSID_WINE_FXMasteringLimiter14, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0xFF, 0x01, 0x00, 0x01, 0x04); /* xapofx 1.0 through 1.5 */ DEFINE_GUID(CLSID_FXReverb27, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0x55, 0x00, 0x00, 0x00, 0x02); @@ -52,7 +50,6 @@ DEFINE_GUID(CLSID_WINE_FXReverb10, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, DEFINE_GUID(CLSID_WINE_FXReverb11, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0xFF, 0x02, 0x00, 0x01, 0x01); DEFINE_GUID(CLSID_WINE_FXReverb12, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0xFF, 0x02, 0x00, 0x01, 0x02); DEFINE_GUID(CLSID_WINE_FXReverb13, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0xFF, 0x02, 0x00, 0x01, 0x03); -DEFINE_GUID(CLSID_WINE_FXReverb14, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0xFF, 0x02, 0x00, 0x01, 0x04); /* xapofx 1.0 through 1.5 */ DEFINE_GUID(CLSID_FXEcho27, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0x55, 0x00, 0x00, 0x00, 0x03); @@ -63,6 +60,5 @@ DEFINE_GUID(CLSID_WINE_FXEcho10, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0 DEFINE_GUID(CLSID_WINE_FXEcho11, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0xFF, 0x03, 0x00, 0x01, 0x01); DEFINE_GUID(CLSID_WINE_FXEcho12, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0xFF, 0x03, 0x00, 0x01, 0x02); DEFINE_GUID(CLSID_WINE_FXEcho13, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0xFF, 0x03, 0x00, 0x01, 0x03); -DEFINE_GUID(CLSID_WINE_FXEcho14, 0xa90bc001, 0xe897, 0xe897, 0x74, 0x39, 0x43, 0xFF, 0x03, 0x00, 0x01, 0x04); #endif

1 0

Hugh McMaster : user32/tests: Use 'start' and 'end' variables in test comparisons.
by Alexandre Julliard Jan. 14, 2016

Jan. 14, 2016

Module: wine Branch: master Commit: 1f37225a72d6809ab7038e0b840c431d8a9228f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f37225a72d6809ab7038e0b8… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jan 14 20:05:01 2016 +1100 user32/tests: Use 'start' and 'end' variables in test comparisons. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/combo.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/user32/tests/combo.c b/dlls/user32/tests/combo.c index 2704262..77eb678 100644 --- a/dlls/user32/tests/combo.c +++ b/dlls/user32/tests/combo.c @@ -477,6 +477,8 @@ static void test_editselection(void) /* Now what is the selection - still empty */ SendMessageA(hCombo, CB_GETEDITSEL, (WPARAM)&start, (WPARAM)&end); + ok(start==0, "Unexpected start position for selection %d\n", start); + ok(end==0, "Unexpected end position for selection %d\n", end); len = SendMessageA(hCombo, CB_GETEDITSEL, 0,0); ok(LOWORD(len)==0, "Unexpected start position for selection %d\n", LOWORD(len)); ok(HIWORD(len)==0, "Unexpected end position for selection %d\n", HIWORD(len)); @@ -484,6 +486,8 @@ static void test_editselection(void) /* Give it focus, and it gets selected */ SendMessageA(hCombo, WM_SETFOCUS, 0, (LPARAM)hEdit); SendMessageA(hCombo, CB_GETEDITSEL, (WPARAM)&start, (WPARAM)&end); + ok(start==0, "Unexpected start position for selection %d\n", start); + ok(end==6, "Unexpected end position for selection %d\n", end); len = SendMessageA(hCombo, CB_GETEDITSEL, 0,0); ok(LOWORD(len)==0, "Unexpected start position for selection %d\n", LOWORD(len)); ok(HIWORD(len)==6, "Unexpected end position for selection %d\n", HIWORD(len)); @@ -524,6 +528,8 @@ static void test_editselection(void) /* Now what is the selection */ SendMessageA(hCombo, CB_GETEDITSEL, (WPARAM)&start, (WPARAM)&end); + ok(start==0, "Unexpected start position for selection %d\n", start); + ok(end==6, "Unexpected end position for selection %d\n", end); len = SendMessageA(hCombo, CB_GETEDITSEL, 0,0); ok(LOWORD(len)==0, "Unexpected start position for selection %d\n", LOWORD(len)); ok(HIWORD(len)==6, "Unexpected end position for selection %d\n", HIWORD(len));

1 0

Piotr Caban : oleaut32: Set safearray pointer to NULL in LPSAFEARRAY_UserFree.
by Alexandre Julliard Jan. 14, 2016

Jan. 14, 2016

Module: wine Branch: master Commit: 3815eca2683766403aa80648b48d9c19894a2e8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3815eca2683766403aa80648b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 13 09:51:12 2016 +0100 oleaut32: Set safearray pointer to NULL in LPSAFEARRAY_UserFree. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/usrmarshal.c | 1 + dlls/oleaut32/usrmarshal.c | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index 24b382c..d4d7d53 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -277,6 +277,7 @@ static void test_marshal_LPSAFEARRAY(void) ok(lpsa2->cLocks == 0, "got lock count %u, expected 0\n", lpsa2->cLocks); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); LPSAFEARRAY_UserFree(&umcb.Flags, &lpsa2); + ok(!lpsa2, "lpsa2 was not set to 0 by LPSAFEARRAY_UserFree\n"); HeapFree(GetProcessHeap(), 0, buffer); lpsa->cLocks = 0; hr = SafeArrayDestroy(lpsa); diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 303ec69..d66d42a 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -1091,6 +1091,7 @@ void WINAPI LPSAFEARRAY_UserFree(ULONG *pFlags, LPSAFEARRAY *ppsa) TRACE("("); dump_user_flags(pFlags); TRACE(", &%p\n", *ppsa); SafeArrayDestroy(*ppsa); + *ppsa = NULL; }

1 0

Piotr Caban : oleaut32/tests: Show that VARIANT_UserUnmarshal may reuse passed in BSTR.
by Alexandre Julliard Jan. 14, 2016

Jan. 14, 2016

Module: wine Branch: master Commit: 1063623dfb23af70334aa688a5ae6aabdff0f48a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1063623dfb23af70334aa688a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 13 09:51:57 2016 +0100 oleaut32/tests: Show that VARIANT_UserUnmarshal may reuse passed in BSTR. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/usrmarshal.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index d04a366..b9478d1 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -767,7 +767,7 @@ static void test_marshal_VARIANT(void) double d; void *mem; DWORD *wirev; - BSTR b; + BSTR b, b2; WCHAR str[] = {'m','a','r','s','h','a','l',' ','t','e','s','t',0}; SAFEARRAYBOUND sab; LPSAFEARRAY lpsa, lpsa2, lpsa_copy; @@ -1237,15 +1237,21 @@ static void test_marshal_VARIANT(void) ok(*wirev, "wv[6] %08x\n", *wirev); /* win2k: this is b. winxp: this is (char*)b + 1 */ wirev++; check_bstr(wirev, b); + b2 = SysAllocString(str); + b2[0] = 0; + V_VT(&v2) = VT_BSTR | VT_BYREF; + V_BSTRREF(&v2) = &b2; + mem = b2; VariantInit(&v2); stubMsg.Buffer = buffer; next = VARIANT_UserUnmarshal(&umcb.Flags, buffer, &v2); ok(next == buffer + stubMsg.BufferLength, "got %p expect %p\n", next, buffer + stubMsg.BufferLength); + ok(mem == b2, "BSTR should be reused\n"); ok(V_VT(&v) == V_VT(&v2), "got vt %d expect %d\n", V_VT(&v), V_VT(&v2)); ok(SysStringByteLen(*V_BSTRREF(&v)) == SysStringByteLen(*V_BSTRREF(&v2)), "bstr string lens differ\n"); ok(!memcmp(*V_BSTRREF(&v), *V_BSTRREF(&v2), SysStringByteLen(*V_BSTRREF(&v))), "bstrs differ\n"); - VARIANT_UserFree(&umcb.Flags, &v2); + SysFreeString(b2); HeapFree(GetProcessHeap(), 0, oldbuffer); SysFreeString(b);

1 0