Changeset 6296 for trunk/src/win32k/dev32

Timestamp:

Jul 10, 2001, 6:41:10 PM (24 years ago)

Author:

bird

Message:

Use PTDA not PID and allways take loader sem.

File:

• trunk/src/win32k/dev32/d32Win32kOpenClose.c (modified) (4 diffs)

trunk/src/win32k/dev32/d32Win32kOpenClose.c

@@ -1 @@
-/* $Id: d32Win32kOpenClose.c,v 1.1 2001-07-08 02:53:18 bird Exp $
+/* $Id: d32Win32kOpenClose.c,v 1.2 2001-07-10 16:39:16 bird Exp $
  *
  * Open and Close handlers for the Win32k driver.
@@ -16 +16 @@
 #define INCL_NOPMAPI
 #define INCL_OS2KRNL_TK
+#define INCL_OS2KRNL_SEM
+#define INCL_OS2KRNL_LDR
 #define INCL_OS2KRNL_PTDA
 
@@ -52 +54 @@
 USHORT _loadds _Far32 _Pascal Win32kOpen(PRP32OPENCLOSE pRpOpen)
 {
-    PPTD pptd = GetTaskData(0);
+    APIRET  rc;
+    PPTD    pptd;
+
+    /*
+     * Take Loader semaphore as that currently protects everything in this driver...
+     */
+    rc = LDRRequestSem();
+    if (rc != NO_ERROR)
+    {
+        kprintf(("Win32kOpen: LDRRequestSem failed with rc = %d\n", rc));
+        //return rc;
+    }
+
+    pptd = GetTaskData(0, TRUE);
     if (pptd)
         pptd->cUsage++;
 
     pRpOpen = pRpOpen;
+    LDRClearSem();
     return STATUS_DONE;
 }
@@ -70 +86 @@
 USHORT _loadds _Far32 _Pascal Win32kClose(PRP32OPENCLOSE pRpClose)
 {
-    PPTD pptd = GetTaskData(0);
+    APIRET  rc;
+    PPTD    pptd;
+
+    /*
+     * Take Loader semaphore as that currently protects everything in this driver...
+     */
+    rc = LDRRequestSem();
+    if (rc != NO_ERROR)
+    {
+        kprintf(("Win32kClose: LDRRequestSem failed with rc = %d\n", rc));
+        //return rc;
+    }
+
+    pptd = GetTaskData(0, FALSE);
     if (pptd)
     {
         if (pptd->cUsage > 0)
-        {
-            APIRET  rc;
-            if (    pptd->pszzOdin32Env != NULL
-                && (rc = D32Hlp_VMUnLock(&pptd->lockOdin32Env)) != NO_ERROR
-                )
-            {
-                kprintf(("Win32kClose: VMUnLock failed with rc=%d\n", rc));
-            }
             pptd->cUsage--;
-        }
         if (pptd->cUsage == 0)
             RemoveTaskData(0);
     }
     pRpClose = pRpClose;
+
+    LDRClearSem();
     return STATUS_DONE;
 }