Changeset 6841 for branches/splittup/src/win32k/pe2lx/pe2lx.cpp

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/pe2lx/pe2lx.cpp (modified) (6 diffs)

branches/splittup/src/win32k/pe2lx/pe2lx.cpp

@@ -1 @@
-/* $Id: pe2lx.cpp,v 1.32 2001-08-08 17:24:45 bird Exp $
+/* $Id: pe2lx.cpp,v 1.32.2.1 2001-09-27 03:08:34 bird Exp $
  *
  * Pe2Lx class implementation. Ring 0 and Ring 3
@@ -19 +19 @@
 #define INCL_OS2KRNL_LDR                /* Loader definitions. */
 #define INCL_OS2KRNL_PTDA               /* PTDA definitions. */
+#define INCL_KKL_LOG
+#define INCL_KKL_AVL
+#define INCL_KKL_HEAP
 #ifdef RING0
     #define INCL_NOAPI                  /* RING0: No apis. */
+    #define Yield() D32Hlp_Yield()
 #else /*RING3*/
     #define INCL_DOSPROCESS             /* RING3: DosSleep. */
     #define INCL_OS2KRNL_LDR_NOAPIS     /* No apis */
+    #define Yield() DosSleep(0)
 #endif
 
@@ -83 +88 @@
 #include <newexe.h>                     /* OS/2 NE structs and definitions. */
 #include <exe386.h>                     /* OS/2 LX structs and definitions. */
+#include <OS2Krnl.h>                    /* kernel structs.  (SFN) */
+#include <kKrnlLib.h>
 
 #include "devSegDf.h"                   /* Win32k segment definitions. */
-
-#include "malloc.h"                     /* win32k malloc (resident). Not C library! */
-#include "smalloc.h"                    /* win32k swappable heap. */
-#include "rmalloc.h"                    /* win32k resident heap. */
 
 #include <string.h>                     /* C library string.h. */
@@ -95 +98 @@
 #include <stdarg.h>                     /* C library stdarg.h. */
 
-#include "vprintf.h"                    /* win32k printf and vprintf. Not C library! */
 #include "dev32.h"                      /* 32-Bit part of the device driver. (SSToDS) */
-#include "OS2Krnl.h"                    /* kernel structs.  (SFN) */
 #ifdef RING0
-    #include "avl.h"                    /* AVL tree. (ldr.h need it) */
     #include "ldr.h"                    /* ldr helpers. (ldrGetExePath) */
     #include "env.h"                    /* Environment helpers. */
@@ -108 +108 @@
 #include "pe2lx.h"                      /* Pe2Lx class definitions, ++. */
 #include <versionos2.h>                 /* Pe2Lx version. */
-#include "yield.h"                      /* Yield CPU. */
 #include "options.h"                    /* Win32k options. */
 
@@ -1791 +1790 @@
 
             case FINDDLL_LIBPATH:
-                pszPath = *pLdrLibPath;
+                pszPath = LdrLibPath;
                 break;