From 62d3a010d430fadf99268498bee3cff3e16c608f Mon Sep 17 00:00:00 2001 From: Graham Madarasz Date: Mon, 3 Jun 2013 18:11:08 -0700 Subject: BUG-2707 disable sites calling OsOutputDebugString directly to identify which is tossing our errant exception --- indra/media_plugins/winmmshim/winmm_shim.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/media_plugins') diff --git a/indra/media_plugins/winmmshim/winmm_shim.cpp b/indra/media_plugins/winmmshim/winmm_shim.cpp index 47a1e5c018..aeadb53f31 100755 --- a/indra/media_plugins/winmmshim/winmm_shim.cpp +++ b/indra/media_plugins/winmmshim/winmm_shim.cpp @@ -61,12 +61,16 @@ void ll_winmm_shim_initialize(){ { // we have a dll, let's get out pointers! initialized = true; init_function_pointers(winmm_handle); +#if BUG_2707_HUNT ::OutputDebugStringA("WINMM_SHIM.DLL: real winmm.dll initialized successfully\n"); +#endif } else { // failed to initialize real winmm.dll +#if BUG_2707_HUNT ::OutputDebugStringA("WINMM_SHIM.DLL: Failed to initialize real winmm.dll\n"); +#endif } } LeaveCriticalSection(&sCriticalSection); -- cgit v1.2.3 From ea246125619aca35ac6672d6be4b8aa08123666f Mon Sep 17 00:00:00 2001 From: Graham Madarasz Date: Tue, 4 Jun 2013 07:51:27 -0700 Subject: BUG-2707 make use of OsOutputDebugString _DEBUG only on Windows to avoid throwing unhandlable exceptions in coroutines in RelWithDebInfo builds --- indra/media_plugins/winmmshim/winmm_shim.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'indra/media_plugins') diff --git a/indra/media_plugins/winmmshim/winmm_shim.cpp b/indra/media_plugins/winmmshim/winmm_shim.cpp index aeadb53f31..03095d137f 100755 --- a/indra/media_plugins/winmmshim/winmm_shim.cpp +++ b/indra/media_plugins/winmmshim/winmm_shim.cpp @@ -56,22 +56,23 @@ void ll_winmm_shim_initialize(){ // grab winmm.dll from system path, where it should live wsprintf(dll_path, "%s\\winmm.dll", system_path); HMODULE winmm_handle = ::LoadLibrary(dll_path); - + if (winmm_handle != NULL) { // we have a dll, let's get out pointers! initialized = true; init_function_pointers(winmm_handle); -#if BUG_2707_HUNT +#if defined(_DEBUG) ::OutputDebugStringA("WINMM_SHIM.DLL: real winmm.dll initialized successfully\n"); #endif } +#if defined(_DEBUG) else { // failed to initialize real winmm.dll -#if BUG_2707_HUNT ::OutputDebugStringA("WINMM_SHIM.DLL: Failed to initialize real winmm.dll\n"); -#endif } +#endif + } LeaveCriticalSection(&sCriticalSection); } -- cgit v1.2.3 From c38204f5e0a9130f0d4d4bfc997da107fd1017ce Mon Sep 17 00:00:00 2001 From: Graham Madarasz Date: Wed, 5 Jun 2013 14:26:27 -0700 Subject: Unwind cruft from hunting for 2707 they won't end up in vwr-dev-mat --- indra/media_plugins/winmmshim/winmm_shim.cpp | 5 ----- 1 file changed, 5 deletions(-) (limited to 'indra/media_plugins') diff --git a/indra/media_plugins/winmmshim/winmm_shim.cpp b/indra/media_plugins/winmmshim/winmm_shim.cpp index 03095d137f..aac349bf57 100755 --- a/indra/media_plugins/winmmshim/winmm_shim.cpp +++ b/indra/media_plugins/winmmshim/winmm_shim.cpp @@ -61,18 +61,13 @@ void ll_winmm_shim_initialize(){ { // we have a dll, let's get out pointers! initialized = true; init_function_pointers(winmm_handle); -#if defined(_DEBUG) ::OutputDebugStringA("WINMM_SHIM.DLL: real winmm.dll initialized successfully\n"); -#endif } -#if defined(_DEBUG) else { // failed to initialize real winmm.dll ::OutputDebugStringA("WINMM_SHIM.DLL: Failed to initialize real winmm.dll\n"); } -#endif - } LeaveCriticalSection(&sCriticalSection); } -- cgit v1.2.3