4.46 beta

1 files changed, 18 insertions, 9 deletions

diff --git a/C/Threads.c b/C/Threads.c
index dcf63dcf..def48175 100755
--- a/C/Threads.c
+++ b/C/Threads.c
@@ -21,12 +21,12 @@ HRes MyCloseHandle(HANDLE *h)
   return SZ_OK;
 }
 
-HRes Thread_Create(CThread *thread, unsigned (StdCall *startAddress)(void *), LPVOID parameter)
+HRes Thread_Create(CThread *thread, THREAD_FUNC_RET_TYPE (THREAD_FUNC_CALL_TYPE *startAddress)(void *), LPVOID parameter)
 { 
-  /* DWORD threadId; */
+  unsigned threadId; /* Windows Me/98/95: threadId parameter may not be NULL in _beginthreadex/CreateThread functions */
   thread->handle = 
     /* CreateThread(0, 0, startAddress, parameter, 0, &threadId); */
-    (HANDLE)_beginthreadex(NULL, 0, startAddress, parameter, 0, NULL);
+    (HANDLE)_beginthreadex(NULL, 0, startAddress, parameter, 0, &threadId);
     /* maybe we must use errno here, but probably GetLastError() is also OK. */
   return BoolToHRes(thread->handle != 0);
 }
@@ -48,13 +48,22 @@ HRes Thread_Close(CThread *thread)
   return MyCloseHandle(&thread->handle);
 }
 
-HRes AutoResetEvent_Create(CAutoResetEvent *p, int initialSignaled)
+HRes Event_Create(CEvent *p, BOOL manualReset, int initialSignaled)
 {
-  p->handle = CreateEvent(NULL, FALSE, (initialSignaled ? TRUE : FALSE), NULL);
+  p->handle = CreateEvent(NULL, manualReset, (initialSignaled ? TRUE : FALSE), NULL);
   return BoolToHRes(p->handle != 0);
 }
 
-HRes AutoResetEvent_CreateNotSignaled(CAutoResetEvent *p) { return AutoResetEvent_Create(p, 0); }
+HRes ManualResetEvent_Create(CManualResetEvent *p, int initialSignaled)
+  { return Event_Create(p, TRUE, initialSignaled); }
+HRes ManualResetEvent_CreateNotSignaled(CManualResetEvent *p) 
+  { return ManualResetEvent_Create(p, 0); }
+
+HRes AutoResetEvent_Create(CAutoResetEvent *p, int initialSignaled)
+  { return Event_Create(p, FALSE, initialSignaled); }
+HRes AutoResetEvent_CreateNotSignaled(CAutoResetEvent *p) 
+  { return AutoResetEvent_Create(p, 0); }
+
 HRes Event_Set(CEvent *p) { return BOOLToHRes(SetEvent(p->handle)); }
 HRes Event_Reset(CEvent *p) { return BOOLToHRes(ResetEvent(p->handle)); }
 HRes Event_Wait(CEvent *p) { return WaitObject(p->handle); }
@@ -71,9 +80,9 @@ HRes Semaphore_Release(CSemaphore *p, LONG releaseCount, LONG *previousCount)
 { 
   return BOOLToHRes(ReleaseSemaphore(p->handle, releaseCount, previousCount)); 
 }
-HRes Semaphore_ReleaseN(CSemaphore *p, LONG releaseCount)
+HRes Semaphore_ReleaseN(CSemaphore *p, UInt32 releaseCount)
 {
-  return Semaphore_Release(p, releaseCount, NULL);
+  return Semaphore_Release(p, (LONG)releaseCount, NULL);
 }
 HRes Semaphore_Release1(CSemaphore *p)
 {
@@ -89,7 +98,7 @@ HRes CriticalSection_Init(CCriticalSection *p)
   __try 
   { 
     InitializeCriticalSection(p); 
-    // InitializeCriticalSectionAndSpinCount(p, 0);
+    /* InitializeCriticalSectionAndSpinCount(p, 0); */
   }  
   __except (EXCEPTION_EXECUTE_HANDLER) { return SZE_OUTOFMEMORY; }
   return SZ_OK;