Changeset 4046 for branches/GRACE/src/win32k/ldr/myldrOpen.cpp

Timestamp:

Aug 19, 2000, 4:37:21 PM (25 years ago)

Author:

bird

Message:

More bugs corrected.
It's working now!

File:

• branches/GRACE/src/win32k/ldr/myldrOpen.cpp (modified) (4 diffs)

branches/GRACE/src/win32k/ldr/myldrOpen.cpp

@@ -1 @@
-/* $Id: myldrOpen.cpp,v 1.10.4.3 2000-08-17 08:23:33 bird Exp $
+/* $Id: myldrOpen.cpp,v 1.10.4.4 2000-08-19 14:37:15 bird Exp $
  *
  * myldrOpen - ldrOpen.
@@ -18 +18 @@
 #define INCL_OS2KRNL_IO
 #define INCL_OS2KRNL_TCB
+#define INCL_OS2KRNL_SEM
 
 /*******************************************************************************
@@ -115 +116 @@
         {
             kprintf(("myldrOpen-%d: rmalloc(640) failed\n", cNesting));
-            return NO_ERROR;
+            goto semcleanup;
         }
 
@@ -639 +640 @@
     #endif
 
+semcleanup:
+    /*
+     * We have to clean the smaphore which was taken by mytkExecPgm here
+     * because we might not return before the new child is finsished
+     * executing.
+     * It is not risk in releasing the semphore here since it's taken
+     * three times now. First by tkExecPgm then by LDROpenExe.
+     */
+    if (isLdrStateExecPgm() && fLdrSemTaken)
+    {
+        KSEMReleaseMutex((HKMTX)pLdrSem);
+        fLdrSemTaken = 0;
+    }
+
     /** @sketch
      *  Return rc.