Changeset 9944 for ps

Timestamp:

07/31/11 11:42:57 (13 years ago)

Author:

Jan Wassenberg

Message:

pool - safely handle zero-sized allocations (fixes #909)
snd_mgr - remove no longer needed hacks for native OpenAL implementations
test_wdbg_sym.h - belated commit of warning fix

Location:

ps/trunk/source/lib

Files:

• allocators/pool.h (modified) (1 diff)
• res/sound/snd_mgr.cpp (modified) (3 diffs)
• sysdep/os/win/tests/test_wdbg_sym.h (modified) (1 diff)

ps/trunk/source/lib/allocators/pool.h

@@ -296 +296 @@
     pointer allocate(size_type n)
     {
+        // safely handle zero-sized allocations (happens with GCC STL - see ticket #909).
+        if(n == 0)
+            n = 1;
         return p.AllocateMemory<value_type> (n);
     }

ps/trunk/source/lib/res/sound/snd_mgr.cpp

@@ -55 +55 @@
 #include "ogg.h"
 
-// HACK: OpenAL loads and unloads certain DLLs several times on Windows.
-// that looks unnecessary and wastes 100..400 ms on startup.
-// we hold a reference to prevent the actual unload. everything works ATM;
-// hopefully, OpenAL doesn't rely on them actually being unloaded.
-#if OS_WIN
-# define WIN_LOADLIBRARY_HACK 0
-#else
-# define WIN_LOADLIBRARY_HACK 0
-#endif
 
 static const size_t maxBufferSize = 64*KiB;
@@ -223 +214 @@
     Status ret = INFO::OK;
 
-#if WIN_LOADLIBRARY_HACK
-    HMODULE dlls[3];
-    dlls[0] = LoadLibrary("wrap_oal.dll");
-    dlls[1] = LoadLibrary("setupapi.dll");
-    dlls[2] = LoadLibrary("wdmaud.drv");
-#endif
-
-    // for reasons unknown, the NV native OpenAL implementation
-    // causes an "invalid handle" exception internally when loaded
-    // (it's not caused by the DLL load hack above). everything works and
-    // we can continue normally; we just need to catch it to prevent the
-    // unhandled exception filter from reporting it.
-#if OS_WIN
-    __try
-    {
-        alc_dev = alcOpenDevice((alcString)alc_dev_name);
-    }
-    // if invalid handle, handle it; otherwise, continue handler search.
-    __except(GetExceptionCode() == EXCEPTION_INVALID_HANDLE)
-    {
-        // ignore
-    }
-#else
     alc_dev = alcOpenDevice((alcString)alc_dev_name);
-#endif
-
     if(alc_dev)
     {
@@ -277 +243 @@
     swprintf_s(buf, ARRAY_SIZE(buf), L"SND| alc_init: success, using %hs\n", dev_name);
     ah_log(buf);
-
-#if WIN_LOADLIBRARY_HACK
-    // release DLL references, so BoundsChecker doesn't complain at exit.
-    for(int i = 0; i < ARRAY_SIZE(dlls); i++)
-        if(dlls[i] != INVALID_HANDLE_VALUE)
-            FreeLibrary(dlls[i]);
-#endif
 
     return ret;

ps/trunk/source/lib/sysdep/os/win/tests/test_wdbg_sym.h

@@ -51 +51 @@
 
 #pragma optimize("", off)
+#pragma warning(disable:4748)   // /GS can not protect [..] from local buffer overrun because optimizations are disabled
 
 // (these must be outside of TestWdbgSym so that we can simply