Andrew Eikum : xapofx1_3: Use shared source.
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Jan 14 11:10:27 CST 2016
Module: wine
Branch: master
Commit: 1559b715a834bff7109b3970ecfc740e9933d6eb
URL: http://source.winehq.org/git/wine.git/?a=commit;h=1559b715a834bff7109b3970ecfc740e9933d6eb
Author: Andrew Eikum <aeikum at codeweavers.com>
Date: Thu Jan 14 08:10:02 2016 -0600
xapofx1_3: Use shared source.
Signed-off-by: Andrew Eikum <aeikum at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at 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
More information about the wine-cvs
mailing list