Cleanup jthread and fix win32 build

3 files changed, 47 insertions, 36 deletions

diff --git a/src/jthread/win32/jevent.cpp b/src/jthread/win32/jevent.cpp
new file mode 100644
index 000000000..67b468f01
--- /dev/null
+++ b/src/jthread/win32/jevent.cpp
@@ -0,0 +1,43 @@
+/*
+
+    This file is a part of the JThread package, which contains some object-
+    oriented thread wrappers for different thread implementations.
+
+    Copyright (c) 2000-2006  Jori Liesenborgs (jori.liesenborgs@gmail.com)
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+
+*/
+#include "jthread/jevent.h"
+
+Event::Event() {
+	hEvent = CreateEvent(NULL, 0, 0, NULL);
+}
+
+Event::~Event() {
+	CloseHandle(hEvent);
+}
+
+void Event::wait() {
+	WaitForSingleObject(hEvent, INFINITE);
+}
+
+void Event::signal() {
+	SetEvent(hEvent);
+}
diff --git a/src/jthread/win32/jmutex.cpp b/src/jthread/win32/jmutex.cpp
index 8a31495cd..b9f5e0e73 100644
--- a/src/jthread/win32/jmutex.cpp
+++ b/src/jthread/win32/jmutex.cpp
@@ -24,7 +24,7 @@
     DEALINGS IN THE SOFTWARE.
 
 */
-
+#include <assert.h>
 #include "jthread/jmutex.h"
 
 JMutex::JMutex()
@@ -33,31 +33,21 @@ JMutex::JMutex()
 	InitializeCriticalSection(&mutex);
 #else
 	mutex = CreateMutex(NULL,FALSE,NULL);
-	if (mutex == NULL)
-		return ERR_JMUTEX_CANTCREATEMUTEX;
+	assert(mutex != NULL);
 #endif // JMUTEX_CRITICALSECTION
-	initialized = true;
 }
 
 JMutex::~JMutex()
 {
-	if (initialized)
 #ifdef JMUTEX_CRITICALSECTION
-		DeleteCriticalSection(&mutex);
+	DeleteCriticalSection(&mutex);
 #else
-		CloseHandle(mutex);
+	CloseHandle(mutex);
 #endif // JMUTEX_CRITICALSECTION
 }
 
-int JMutex::Init()
-{
-	return 0;
-}
-
 int JMutex::Lock()
 {
-	if (!initialized)
-		return ERR_JMUTEX_NOTINIT;
 #ifdef JMUTEX_CRITICALSECTION
 	EnterCriticalSection(&mutex);
 #else
@@ -68,8 +58,6 @@ int JMutex::Lock()
 
 int JMutex::Unlock()
 {
-	if (!initialized)
-		return ERR_JMUTEX_NOTINIT;
 #ifdef JMUTEX_CRITICALSECTION
 	LeaveCriticalSection(&mutex);
 #else
diff --git a/src/jthread/win32/jthread.cpp b/src/jthread/win32/jthread.cpp
index fc1464064..3d897822e 100644
--- a/src/jthread/win32/jthread.cpp
+++ b/src/jthread/win32/jthread.cpp
@@ -34,7 +34,6 @@
 JThread::JThread()
 {
 	retval = NULL;
-	mutexinit = false;
 	requeststop = false;
 	running = false;
 }
@@ -52,25 +51,6 @@ void JThread::Stop() {
 
 int JThread::Start()
 {
-	if (!mutexinit)
-	{
-		if (!runningmutex.IsInitialized())
-		{
-			if (runningmutex.Init() < 0)
-				return ERR_JTHREAD_CANTINITMUTEX;
-		}
-		if (!continuemutex.IsInitialized())
-		{
-			if (continuemutex.Init() < 0)
-				return ERR_JTHREAD_CANTINITMUTEX;
-		}
-		if (!continuemutex2.IsInitialized())
-		{
-			if (continuemutex2.Init() < 0)
-				return ERR_JTHREAD_CANTINITMUTEX;
-		}		mutexinit = true;
-	}
-
 	runningmutex.Lock();
 	if (running)
 	{