-
-# define lock_init(x) InitializeCriticalSection(x)
-# define lock_grab(x) EnterCriticalSection(x)
-# define lock_release(x) LeaveCriticalSection(x)
-# define lock_destroy(x) DeleteCriticalSection(x)
-# define cond_init(x) { *x = CreateEvent(0, FALSE, FALSE, 0); }
-# define cond_destroy(x) CloseHandle(*x)
-# define cond_signal(x) SetEvent(*x)
-# define cond_wait(x,y) { lock_release(y); WaitForSingleObject(*x, INFINITE); lock_grab(y); }
-#endif
+typedef HANDLE ThreadHandle;
+
+# define lock_init(x) InitializeCriticalSection(&(x))
+# define lock_grab(x) EnterCriticalSection(&(x))
+# define lock_release(x) LeaveCriticalSection(&(x))
+# define lock_destroy(x) DeleteCriticalSection(&(x))
+# define cond_init(x) { x = CreateEvent(0, FALSE, FALSE, 0); }
+# define cond_destroy(x) CloseHandle(x)
+# define cond_signal(x) SetEvent(x)
+# define cond_wait(x,y) { lock_release(y); WaitForSingleObject(x, INFINITE); lock_grab(y); }
+# define cond_timedwait(x,y,z) { lock_release(y); WaitForSingleObject(x,z); lock_grab(y); }
+# define thread_create(x,f,id) (x = CreateThread(NULL,0,f,&(id),0,NULL), x != NULL)
+# define thread_join(x) { WaitForSingleObject(x, INFINITE); CloseHandle(x); }