-typedef CRITICAL_SECTION Lock;
-typedef HANDLE WaitCondition;
-
-# 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_destroy(x) CloseHandle(*x);
+typedef SRWLOCK Lock;
+typedef CONDITION_VARIABLE WaitCondition;
+
+# define lock_init(x) InitializeSRWLock(x)
+# define lock_grab(x) AcquireSRWLockExclusive(x)
+# define lock_release(x) ReleaseSRWLockExclusive(x)
+# define lock_destroy(x) (x)
+# define cond_destroy(x) (x);
+# define cond_init(x) InitializeConditionVariable(x);
+# define cond_signal(x) WakeConditionVariable(x);
+# define cond_wait(x,y) SleepConditionVariableSRW(x, y, INFINITE,0);