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

Timestamp:

Oct 8, 2002, 11:49:08 AM (23 years ago)

Author:

sandervl

Message:

Updates for shared critical sections

File:

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

trunk/src/odincrt/critsect.cpp

@@ -1 @@
-/* $Id: critsect.cpp,v 1.6 2002-10-07 16:28:13 sandervl Exp $ */
+/* $Id: critsect.cpp,v 1.7 2002-10-08 09:49:06 sandervl Exp $ */
 /*
  * Critical sections in the Win32 sense
@@ -72 +72 @@
  *           DosInitializeCriticalSection
  */
-ULONG WIN32API DosInitializeCriticalSection(CRITICAL_SECTION_OS2 *crit, PSZ pszSemName)
+ULONG WIN32API DosInitializeCriticalSection(CRITICAL_SECTION_OS2 *crit, 
+                                            PSZ pszSemName, BOOL fShared)
 {
     APIRET rc;
@@ -81 +82 @@
     crit->OwningThread   = 0;
 
-    rc = DosCreateEventSem(pszSemName, &crit->hmtxLock, (pszSemName) ? DC_SEM_SHARED : 0, 0);
+    rc = DosCreateEventSem(pszSemName, &crit->hmtxLock, (pszSemName || fShared) ? DC_SEM_SHARED : 0, 0);
     if(rc != NO_ERROR) {
         DebugInt3();
@@ -87 +88 @@
         return rc;
     }
+    crit->CreationCount  = 1;
     crit->Reserved       = GetCurrentProcessId();
     return NO_ERROR;
@@ -95 +97 @@
  *           DosAccessCriticalSection
  */
-ULONG WIN32API DosAccessCriticalSection(CRITICAL_SECTION_OS2 *, PSZ pszSemName)
+ULONG WIN32API DosAccessCriticalSection(CRITICAL_SECTION_OS2 *crit, PSZ pszSemName)
 {
     HMTX   hmtxLock = 0;
     APIRET rc;
 
+    if(pszSemName == NULL && crit->hmtxLock == 0) {
+        DebugInt3();
+        return ERROR_INVALID_PARAMETER;
+    }
     if(pszSemName == NULL) {
-        DebugInt3();
-        return ERROR_INVALID_PARAMETER;
+        hmtxLock = crit->hmtxLock;
     }
 
@@ -110 +115 @@
         return rc;
     }
+    DosInterlockedIncrement(&crit->CreationCount);
     return NO_ERROR;
 }
@@ -123 +129 @@
            DebugInt3();
         }
-        crit->LockCount      = -1;
-        crit->RecursionCount = 0;
-        crit->OwningThread   = 0;
         DosCloseEventSem(crit->hmtxLock);
-        crit->hmtxLock       = 0;
-        crit->Reserved       = (DWORD)-1;
+        if(DosInterlockedDecrement(&crit->CreationCount) == 0)
+        {
+            crit->LockCount      = -1;
+            crit->RecursionCount = 0;
+            crit->OwningThread   = 0;
+            crit->hmtxLock       = 0;
+            crit->Reserved       = (DWORD)-1;
+        }
     }
     return NO_ERROR;