Changeset 9331 for trunk/src/odincrt/critsect.cpp

Timestamp:

Oct 7, 2002, 6:28:15 PM (23 years ago)

Author:

sandervl

Message:

Minor updates for critical section functions

File:

• trunk/src/odincrt/critsect.cpp (modified) (13 diffs)

trunk/src/odincrt/critsect.cpp

@@ -1 @@
-/* $Id: critsect.cpp,v 1.5 2002-07-22 05:58:02 achimha Exp $ */
+/* $Id: critsect.cpp,v 1.6 2002-10-07 16:28:13 sandervl Exp $ */
 /*
  * Critical sections in the Win32 sense
@@ -72 +72 @@
  *           DosInitializeCriticalSection
  */
-VOID WIN32API DosInitializeCriticalSection(CRITICAL_SECTION_OS2 *crit, PSZ pszSemName)
+ULONG WIN32API DosInitializeCriticalSection(CRITICAL_SECTION_OS2 *crit, PSZ pszSemName)
 {
     APIRET rc;
@@ -85 +85 @@
         DebugInt3();
         crit->hmtxLock = 0;
+        return rc;
     }
     crit->Reserved       = GetCurrentProcessId();
+    return NO_ERROR;
 }
 
@@ -93 +95 @@
  *           DosAccessCriticalSection
  */
-VOID WIN32API DosAccessCriticalSection(CRITICAL_SECTION_OS2 *, PSZ pszSemName)
+ULONG WIN32API DosAccessCriticalSection(CRITICAL_SECTION_OS2 *, PSZ pszSemName)
 {
     HMTX   hmtxLock = 0;
@@ -100 +102 @@
     if(pszSemName == NULL) {
         DebugInt3();
-        return;
+        return ERROR_INVALID_PARAMETER;
     }
 
@@ -106 +108 @@
     if(rc != NO_ERROR) {
         DebugInt3();
-    }
+        return rc;
+    }
+    return NO_ERROR;
 }
 /***********************************************************************
  *           DosDeleteCriticalSection
  */
-void WIN32API DosDeleteCriticalSection( CRITICAL_SECTION_OS2 *crit )
+ULONG WIN32API DosDeleteCriticalSection( CRITICAL_SECTION_OS2 *crit )
 {
     if (crit->hmtxLock)
@@ -126 +130 @@
         crit->Reserved       = (DWORD)-1;
     }
+    return NO_ERROR;
 }
 
@@ -132 +137 @@
  *           DosEnterCriticalSection
  */
-void WIN32API DosEnterCriticalSection( CRITICAL_SECTION_OS2 *crit )
+ULONG WIN32API DosEnterCriticalSection( CRITICAL_SECTION_OS2 *crit, ULONG ulTimeout )
 {
     DWORD res;
@@ -151 +156 @@
         {
             crit->RecursionCount++;
-            return;
+            return NO_ERROR;
         }
         // do an atomic operation where we compare the owning thread id with 0
@@ -162 +167 @@
 
             /* Now wait for it */
-            APIRET rc = DosWaitEventSem(crit->hmtxLock, SEM_INDEFINITE_WAIT);
+            APIRET rc = DosWaitEventSem(crit->hmtxLock, ulTimeout);
             if(rc != NO_ERROR) {
                 DebugInt3();
-                return;
+                return rc;
             }
             DosResetEventSem(crit->hmtxLock, &ulnrposts);
@@ -175 +180 @@
     crit->OwningThread   = GetCurrentThreadId();
     crit->RecursionCount = 1;
+    return NO_ERROR;
 }
 
@@ -202 +208 @@
  *           DosLeaveCriticalSection
  */
-void WIN32API DosLeaveCriticalSection( CRITICAL_SECTION_OS2 *crit )
-{
-    if (crit->OwningThread != GetCurrentThreadId()) return;
+ULONG WIN32API DosLeaveCriticalSection( CRITICAL_SECTION_OS2 *crit )
+{
+    if (crit->OwningThread != GetCurrentThreadId()) {
+        DebugInt3();
+        return ERROR_INVALID_PARAMETER;
+    }
        
     if (--crit->RecursionCount)
     {
         DosInterlockedDecrement( &crit->LockCount );
-        return;
+        return NO_ERROR;
     }
     crit->OwningThread = 0;
@@ -217 +226 @@
         DosPostEventSem(crit->hmtxLock);
     }
-}
+    return NO_ERROR;
+}