summaryrefslogtreecommitdiff
path: root/indra/media_plugins/winmmshim
diff options
context:
space:
mode:
authorSiana Gearz <siana.gearz@googlemail.com>2011-04-17 11:25:00 -0400
committerSiana Gearz <siana.gearz@googlemail.com>2011-04-17 11:25:00 -0400
commitd1ba34a8ad7031c6e8362c8136366cf24d512d1f (patch)
tree0449788470ab32b7dfe7b81c91a828232176026e /indra/media_plugins/winmmshim
parent26b15973af5f5725e544866a7884bdbe0827c495 (diff)
STORM-1088: corrected fix loading of winmm.dll
Diffstat (limited to 'indra/media_plugins/winmmshim')
-rw-r--r--indra/media_plugins/winmmshim/winmm_shim.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/indra/media_plugins/winmmshim/winmm_shim.cpp b/indra/media_plugins/winmmshim/winmm_shim.cpp
index 6ba95e565e..47a1e5c018 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);
}