Changeset 6841 for branches/splittup/src/win32k/misc/PerTaskW32kData.c

Timestamp:

Sep 27, 2001, 5:08:35 AM (24 years ago)

Author:

bird

Message:

Win32k/kKrnlLib splittup: done the major stuff.

File:

• branches/splittup/src/win32k/misc/PerTaskW32kData.c (modified) (7 diffs)

branches/splittup/src/win32k/misc/PerTaskW32kData.c

@@ -1 @@
-/* $Id: PerTaskW32kData.c,v 1.2 2001-07-10 16:39:19 bird Exp $
+/* $Id: PerTaskW32kData.c,v 1.2.2.1 2001-09-27 03:08:30 bird Exp $
  *
  * Per Task (Win32k) Data.
@@ -18 +18 @@
 #define INCL_OS2KRNL_TK                 /* OS2KRNL: Task Stuff */
 #define INCL_OS2KRNL_PTDA
+#define INCL_KKL_AVL
+#define INCL_KKL_LOG
+#define INCL_KKL_HEAP
 
 /*******************************************************************************
@@ -23 +26 @@
 *******************************************************************************/
 #include <os2.h>
+#include <OS2Krnl.h>
+#include <kKrnlLib.h>
 
 #include "devSegDf.h"                   /* Win32k segment definitions. */
 #include "dev32.h"
 #include "dev32hlp.h"
-#include "log.h"
-#include "OS2Krnl.h"
 #include <string.h>
-#include "macros.h"
-#include "avl.h"
 #include "PerTaskW32kData.h"
-#include "rmalloc.h"
 
 
@@ -39 +39 @@
 *   Global Variables                                                           *
 *******************************************************************************/
-/*static*/ PAVLNODECORE pPTDTree;       /* Pointer to PTD tree */
+/*static*/ PAVLPVNODECORE pPTDTree;     /* Pointer to PTD tree */
                                         /* Currently assumed protected by ldrSem. */
 
@@ -65 +65 @@
     if (pPTDA == 0)
         pPTDA = ptdaGetCur();
-    pptd = (PPTD)(void*)AVLGet(&pPTDTree, (AVLKEY)pPTDA);
+    pptd = (PPTD)(void*)AVLPVGet(&pPTDTree, pPTDA);
     if (!pptd && fCreate)
     {
@@ -75 +75 @@
         }
         memset(pptd, 0, sizeof(*pptd));
-        pptd->core.Key = (AVLKEY)pPTDA;
-        AVLInsert(&pPTDTree, &pptd->core);
+        pptd->core.Key = pPTDA;
+        AVLPVInsert(&pPTDTree, &pptd->core);
     }
     return pptd;
@@ -93 +93 @@
     if (pPTDA == 0)
         pPTDA = ptdaGetCur();
-    pptd = (PPTD)(void*)AVLRemove(&pPTDTree, (AVLKEY)pPTDA);
+    pptd = (PPTD)(void*)AVLPVRemove(&pPTDTree, pPTDA);
     if (pptd)
     {