Microsoft, in their "infinite wisdom" decide to have no sensible naming convention...

[user/henk/code/inspircd.git] / src / threadengines / threadengine_win32.cpp

diff --git a/src/threadengines/threadengine_win32.cpp b/src/threadengines/threadengine_win32.cpp
index e426fe37383eb6ece91b263a3fb3157ef7405d00..5666113671fb6d5a56e13912dda73fc78cd4d7d3 100644 (file)
--- a/src/threadengines/threadengine_win32.cpp
+++ b/src/threadengines/threadengine_win32.cpp
@@ -18,31 +18,43 @@ CRITICAL_SECTION MyMutex;
 
 Win32ThreadEngine::Win32ThreadEngine(InspIRCd* Instance) : ThreadEngine(Instance)
 {
+       InitializeCriticalSection(&MyMutex);
 }
 
 void Win32ThreadEngine::Create(Thread* thread_to_init)
 {
+       Mutex(true);
        HANDLE* MyThread = new HANDLE;
        DWORD ThreadId = 0;
 
-       if (!(*MyThread = CreateThread(NULL,0,Win32ThreadEngine::Entry,this,0,&ThreadId)))
+       if (NULL == (*MyThread = CreateThread(NULL,0,Win32ThreadEngine::Entry,this,0,&ThreadId)))
        {
                delete MyThread;
-               throw CoreException(std::string("Unable to reate new Win32ThreadEngine: ") + dlerror());
+               Mutex(false);
+               throw CoreException(std::string("Unable to create new Win32ThreadEngine: ") + dlerror());
        }
 
        NewThread = thread_to_init;
        NewThread->Creator = this;
        NewThread->Extend("winthread", MyThread);
+       Mutex(false);
+
+       while (NewThread)
+               SleepEx(100, false);
 }
 
 Win32ThreadEngine::~Win32ThreadEngine()
 {
+       DeleteCriticalSection(&MyMutex);
 }
 
 void Win32ThreadEngine::Run()
 {
-       NewThread->Run();
+       Mutex(true);
+       Thread* nt = NewThread;
+       NewThread = NULL;
+       Mutex(false);
+       nt->Run();
 }
 
 bool Win32ThreadEngine::Mutex(bool enable)
@@ -73,3 +85,4 @@ void Win32ThreadEngine::FreeThread(Thread* thread)
        }
 }
 
+