Changeset 6296 for trunk/src/win32k/misc/PerTaskW32kData.c

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/misc/PerTaskW32kData.c (modified) (5 diffs)

trunk/src/win32k/misc/PerTaskW32kData.c

@@ -1 @@
-/* $Id: PerTaskW32kData.c,v 1.1 2001-07-08 03:09:03 bird Exp $
+/* $Id: PerTaskW32kData.c,v 1.2 2001-07-10 16:39:19 bird Exp $
  *
  * Per Task (Win32k) Data.
@@ -17 +17 @@
 #define INCL_OS2KRNL_VM                 /* OS2KRNL: Virtual Memory Management */
 #define INCL_OS2KRNL_TK                 /* OS2KRNL: Task Stuff */
+#define INCL_OS2KRNL_PTDA
 
 /*******************************************************************************
@@ -52 +53 @@
  * If it doesn't exist we'll allocate a new one.
  * @returns Pointer to task data structure.
- * @param   pid     Process id. 0 means current pid.
+ *          Might be NULL (see fCreate).
+ * @param   pPTDA   Pointer to PTDA for the task.
+ * @param   fCreate TRUE:  Create structure if not found.
+ *                  FALSE: Return NULL if not found.
  * @status  completely implemented.
  * @author  knut st. osmundsen (kosmunds@csc.no)
- * @remark  Do we need a Get function which doesn't make a node if no data was found?
  */
-PPTD    GetTaskData(PID pid)
+PPTD    GetTaskData(PPTDA pPTDA, BOOL fCreate)
 {
     PPTD    pptd;
-    if (pid == 0)
-        pid = InternalGetPid();
-    pptd = (PPTD)(void*)AVLGet(&pPTDTree, pid);
-    if (!pptd)
+    if (pPTDA == 0)
+        pPTDA = ptdaGetCur();
+    pptd = (PPTD)(void*)AVLGet(&pPTDTree, (AVLKEY)pPTDA);
+    if (!pptd && fCreate)
     {
         pptd = rmalloc(sizeof(*pptd));
@@ -72 +75 @@
         }
         memset(pptd, 0, sizeof(*pptd));
-        pptd->core.Key = pid;
+        pptd->core.Key = (AVLKEY)pPTDA;
         AVLInsert(&pPTDTree, &pptd->core);
     }
@@ -81 +84 @@
 /**
  * Remove the give process id.
- * @param   pid     Process id to remove. 0 means current pid.
+ * @param   pPTDA   Pointer to PTDA for the task.
  * @status  completely implemented.
  * @author  knut st. osmundsen (kosmunds@csc.no)
  */
-void    RemoveTaskData(PID pid)
+void    RemoveTaskData(PPTDA pPTDA)
 {
     PPTD  pptd;
-    if (pid == 0)
-        pid = InternalGetPid();
-    pptd = (PPTD)(void*)AVLRemove(&pPTDTree, pid);
+    if (pPTDA == 0)
+        pPTDA = ptdaGetCur();
+    pptd = (PPTD)(void*)AVLRemove(&pPTDTree, (AVLKEY)pPTDA);
     if (pptd)
     {
         /* perhaps free data here... */
+        if (*(PULONG)(void*)&pptd->lockOdin32Env)
+        {
+            D32Hlp_VMUnLock(&pptd->lockOdin32Env);
+            memset(&pptd->lockOdin32Env, 0, sizeof(pptd->lockOdin32Env));
+        }
+        pptd->pszzOdin32Env = NULL;
         rfree(pptd);
     }