Module: wine Branch: master Commit: b321834d56d197aa21ed89143674917239dc3810 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b321834d56d197aa21ed891436...
Author: Andrew Eikum aeikum@codeweavers.com Date: Fri Oct 30 09:42:50 2015 -0500
xaudio2: For legacy xaudio2, prefer native version.
Signed-off-by: Andrew Eikum aeikum@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/xaudio2_0/xaudio_dll.c | 2 ++ dlls/xaudio2_1/xaudio_dll.c | 2 ++ dlls/xaudio2_2/xaudio_dll.c | 2 ++ dlls/xaudio2_3/xaudio_dll.c | 2 ++ dlls/xaudio2_4/xaudio_dll.c | 2 ++ dlls/xaudio2_5/xaudio_dll.c | 2 ++ dlls/xaudio2_6/xaudio_dll.c | 2 ++ 7 files changed, 14 insertions(+)
diff --git a/dlls/xaudio2_0/xaudio_dll.c b/dlls/xaudio2_0/xaudio_dll.c index 7c95c28..e55861c 100644 --- a/dlls/xaudio2_0/xaudio_dll.c +++ b/dlls/xaudio2_0/xaudio_dll.c @@ -28,6 +28,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved) { switch (reason) { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: instance = hinstance; DisableThreadLibraryCalls(hinstance); diff --git a/dlls/xaudio2_1/xaudio_dll.c b/dlls/xaudio2_1/xaudio_dll.c index 7c95c28..e55861c 100644 --- a/dlls/xaudio2_1/xaudio_dll.c +++ b/dlls/xaudio2_1/xaudio_dll.c @@ -28,6 +28,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved) { switch (reason) { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: instance = hinstance; DisableThreadLibraryCalls(hinstance); diff --git a/dlls/xaudio2_2/xaudio_dll.c b/dlls/xaudio2_2/xaudio_dll.c index 7c95c28..e55861c 100644 --- a/dlls/xaudio2_2/xaudio_dll.c +++ b/dlls/xaudio2_2/xaudio_dll.c @@ -28,6 +28,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved) { switch (reason) { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: instance = hinstance; DisableThreadLibraryCalls(hinstance); diff --git a/dlls/xaudio2_3/xaudio_dll.c b/dlls/xaudio2_3/xaudio_dll.c index 7c95c28..e55861c 100644 --- a/dlls/xaudio2_3/xaudio_dll.c +++ b/dlls/xaudio2_3/xaudio_dll.c @@ -28,6 +28,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved) { switch (reason) { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: instance = hinstance; DisableThreadLibraryCalls(hinstance); diff --git a/dlls/xaudio2_4/xaudio_dll.c b/dlls/xaudio2_4/xaudio_dll.c index 7c95c28..e55861c 100644 --- a/dlls/xaudio2_4/xaudio_dll.c +++ b/dlls/xaudio2_4/xaudio_dll.c @@ -28,6 +28,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved) { switch (reason) { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: instance = hinstance; DisableThreadLibraryCalls(hinstance); diff --git a/dlls/xaudio2_5/xaudio_dll.c b/dlls/xaudio2_5/xaudio_dll.c index 7c95c28..e55861c 100644 --- a/dlls/xaudio2_5/xaudio_dll.c +++ b/dlls/xaudio2_5/xaudio_dll.c @@ -28,6 +28,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved) { switch (reason) { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: instance = hinstance; DisableThreadLibraryCalls(hinstance); diff --git a/dlls/xaudio2_6/xaudio_dll.c b/dlls/xaudio2_6/xaudio_dll.c index 7c95c28..e55861c 100644 --- a/dlls/xaudio2_6/xaudio_dll.c +++ b/dlls/xaudio2_6/xaudio_dll.c @@ -28,6 +28,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved) { switch (reason) { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: instance = hinstance; DisableThreadLibraryCalls(hinstance);