Changeset 10635

Timestamp:

10/10/09 13:00:35 (4 years ago)

Author:

robert

Message:

From Mathias Froehlich, "Tha attached change adapt previous attemps to get our application using osg
through microsofts application verifier. The current change should work a
little better ...
The change is based on rev 10605."

Location:

OpenSceneGraph/trunk/src/OpenThreads/win32

Files:

• Win32Thread.cpp (modified) (1 diff)
• Win32ThreadPrivateData.h (modified) (2 diffs)

OpenSceneGraph/trunk/src/OpenThreads/win32/Win32Thread.cpp

@@ -206 +206 @@
 Thread* Thread::CurrentThread()
 {
-    return (Thread* )TlsGetValue(Win32ThreadPrivateData::TLS.getId());
+    DWORD ID = Win32ThreadPrivateData::TLS.getId();
+    if (ID == TLS_OUT_OF_INDEXES)
+        return 0;
+    return (Thread* )TlsGetValue(ID);
 }
 

OpenSceneGraph/trunk/src/OpenThreads/win32/Win32ThreadPrivateData.h

@@ -72 +72 @@
         DWORD getId()
         {
-            static bool initialized = false;
             if (!initialized) {
                 ID = TlsAlloc();
@@ -79 +78 @@
             return ID;
         }
+        TlsHolder() : ID(TLS_OUT_OF_INDEXES), initialized(false) {}
         ~TlsHolder(){
-            TlsFree(ID);
+            if (initialized)
+                TlsFree(ID);
+            ID = TLS_OUT_OF_INDEXES;
         }
     private:
         DWORD ID;
+        bool initialized;
     };