Andrew Eikum : openal32: Prefer native version.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 7d6c6025923c039ac6a2458ca466290621238c36
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=7d6c6025923c039ac6a2458ca466290621238c36

Author: Andrew Eikum <aeikum at codeweavers.com>
Date:   Fri Oct  2 09:02:56 2015 -0500

openal32: Prefer native version.

Because openal contexts are global per-process, applications that use
openal will conflict with Wine DLLs that use openal like xaudio2_7 now
does. Windows does not ship an openal32, so all applications that use
openal will ship their own copy of it. According to Chris Robinson,
Windows native openal32 works fine in Wine, so we should just use that
to avoid the problem.

Signed-off-by: Andrew Eikum <aeikum at codeweavers.com>

---

 dlls/openal32/openal.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dlls/openal32/openal.c b/dlls/openal32/openal.c
index 5a4e1e7..cd49b92 100644
--- a/dlls/openal32/openal.c
+++ b/dlls/openal32/openal.c
@@ -99,6 +99,8 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
 {
     switch(reason)
     {
+    case DLL_WINE_PREATTACH:
+        return FALSE;    /* prefer native version */
     case DLL_PROCESS_ATTACH:
         DisableThreadLibraryCalls(hinst);
 #define LOADFUNC(x) x = alcGetProcAddress(NULL, #x)