From d1ba34a8ad7031c6e8362c8136366cf24d512d1f Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.gearz@googlemail.com>
Date: Sun, 17 Apr 2011 11:25:00 -0400
Subject: [PATCH] STORM-1088: corrected fix loading of winmm.dll
---
indra/media_plugins/winmmshim/winmm_shim.cpp | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/indra/media_plugins/winmmshim/winmm_shim.cpp b/indra/media_plugins/winmmshim/winmm_shim.cpp
index 6ba95e565ef..47a1e5c0187 100644
--- a/indra/media_plugins/winmmshim/winmm_shim.cpp
+++ b/indra/media_plugins/winmmshim/winmm_shim.cpp
@@ -39,7 +39,7 @@ BOOL APIENTRY DllMain( HMODULE hModule,
LPVOID lpReserved
)
{
- InitializeCriticalSectionAndSpinCount(&sCriticalSection, 0x00000400);
+ InitializeCriticalSection(&sCriticalSection);
return TRUE;
}
@@ -62,11 +62,12 @@ void ll_winmm_shim_initialize(){
initialized = true;
init_function_pointers(winmm_handle);
::OutputDebugStringA("WINMM_SHIM.DLL: real winmm.dll initialized successfully\n");
- return;
}
-
- // failed to initialize real winmm.dll
- ::OutputDebugStringA("WINMM_SHIM.DLL: Failed to initialize real winmm.dll\n");
+ else
+ {
+ // failed to initialize real winmm.dll
+ ::OutputDebugStringA("WINMM_SHIM.DLL: Failed to initialize real winmm.dll\n");
+ }
}
LeaveCriticalSection(&sCriticalSection);
}
--
GitLab