actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hopefully fix init order in vc6

Browse Source
This commit is contained in:
Glenn Maynard
2004-09-08 06:33:07 +00:00
parent eb5e274128
commit 81f2f6460a
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/Threads/Threads_Win32.cpp
+14 -3
View File
@@ -5,7 +5,14 @@
const int MAX_THREADS=128; const int MAX_THREADS=128;
static MutexImpl_Win32 g_ThreadIdMutex(NULL); static MutexImpl_Win32 *g_pThreadIdMutex = NULL;
static void InitThreadIdMutex()
{
if( g_pThreadIdMutex != NULL )
return;
g_pThreadIdMutex = new MutexImpl_Win32(NULL);
}
static int g_ThreadIds[MAX_THREADS]; static int g_ThreadIds[MAX_THREADS];
static HANDLE g_ThreadHandles[MAX_THREADS]; static HANDLE g_ThreadHandles[MAX_THREADS];
@@ -71,7 +78,9 @@ static DWORD WINAPI StartThread( LPVOID pData )
static int GetOpenSlot( int iID ) static int GetOpenSlot( int iID )
{ {
g_ThreadIdMutex.Lock(); InitThreadIdMutex();
g_pThreadIdMutex->Lock();
/* Find an open slot in g_ThreadIds. */ /* Find an open slot in g_ThreadIds. */
int slot = 0; int slot = 0;
@@ -81,7 +90,7 @@ static int GetOpenSlot( int iID )
g_ThreadIds[slot] = iID; g_ThreadIds[slot] = iID;
g_ThreadIdMutex.Unlock(); g_pThreadIdMutex->Unlock();
return slot; return slot;
} }
@@ -143,6 +152,8 @@ MutexImpl_Win32::~MutexImpl_Win32()
static bool SimpleWaitForSingleObject( HANDLE h, DWORD ms ) static bool SimpleWaitForSingleObject( HANDLE h, DWORD ms )
{ {
ASSERT( h != NULL );
DWORD ret = WaitForSingleObject( h, ms ); DWORD ret = WaitForSingleObject( h, ms );
switch( ret ) switch( ret )
{ {