FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Mathias Froehlich, "Tha attached change adapt previous attemps to get our application using osg

Browse Source 
through microsofts application verifier. The current change should work a
little better ...
The change is based on rev 10605."
This commit is contained in:
Robert Osfield 2009-10-10 11:00:35 +00:00
parent 972e68113d
commit 058d31d7b5
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/OpenThreads/win32/Win32Thread.cpp
View File

@ -205,7 +205,10 @@ namespace OpenThreads {
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);
}
//----------------------------------------------------------------------------

7
src/OpenThreads/win32/Win32ThreadPrivateData.h
View File

@ -71,18 +71,21 @@ public:
struct TlsHolder{ // thread local storage slot
DWORD getId()
{
static bool initialized = false;
if (!initialized) {
ID = TlsAlloc();
initialized = true;
}
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;
};
static TlsHolder TLS;