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 b2279ee2f9ccc14f8490ccb763c3e2699526d568..5666113671fb6d5a56e13912dda73fc78cd4d7d3 100644 (file)
--- a/src/threadengines/threadengine_win32.cpp
+++ b/src/threadengines/threadengine_win32.cpp
@@ -13,37 +13,48 @@
 
 #include "inspircd.h"
 #include "threadengines/threadengine_win32.h"
-#include <pthread.h>
 
 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("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)
@@ -69,10 +80,9 @@ void Win32ThreadEngine::FreeThread(Thread* thread)
        if (thread->GetExt("winthread", winthread))
        {
                thread->SetExitFlag();
-               int rc;
-               void* status;
                WaitForSingleObject(*winthread,INFINITE);
                delete winthread;
        }
 }
 
+