Changeset 5086 for trunk/src/win32k/pe2lx/pe2lx.cpp

Timestamp:

Feb 10, 2001, 12:11:48 PM (25 years ago)

Author:

bird

Message:

Moved ldrCalls.h into the OS2Krnl.h tree as OS2KLDR.h.
Also moved the Ldr definitions from OS2Krnl.h and into OS2KLDR.h.

File:

• trunk/src/win32k/pe2lx/pe2lx.cpp (modified) (4 diffs)

trunk/src/win32k/pe2lx/pe2lx.cpp

@@ -1 @@
-/* $Id: pe2lx.cpp,v 1.24 2001-02-02 08:35:54 bird Exp $
+/* $Id: pe2lx.cpp,v 1.25 2001-02-10 11:11:47 bird Exp $
  *
  * Pe2Lx class implementation. Ring 0 and Ring 3
@@ -17 +17 @@
 #define FOR_EXEHDR 1                    /* To make all object flags OBJ???. */
 #define INCL_DOSERRORS                  /* DOS Error codes. */
+#define INCL_OS2KRNL_LDR                /* Loader definitions. */
 #ifdef RING0
     #define INCL_NOAPI                  /* RING0: No apis. */
 #else /*RING3*/
     #define INCL_DOSPROCESS             /* RING3: DosSleep. */
+    #define INCL_OS2KRNL_LDR_NOAPIS     /* No apis */
 #endif
 
@@ -96 +98 @@
 #include "OS2Krnl.h"                    /* kernel structs.  (SFN) */
 #ifdef RING0
-    #include "ldrCalls.h"               /* ldr* calls. (ldrRead) */
     #include "avl.h"                    /* AVL tree. (ldr.h need it) */
     #include "ldr.h"                    /* ldr helpers. (ldrGetExePath) */
@@ -558 +559 @@
      *    alignment which is not a multiple of 64Kb. The sections are concatenated into one big object. */
     /* TODO! this test has to be enhanced a bit. WWPack32, new Borland++ depends on image layout. */
-    fAllInOneObject =  !isPEOneObjectDisabled() 
+    fAllInOneObject =  !isPEOneObjectDisabled()
                        && (   isPEOneObjectForced()
                            || (pNtHdrs->FileHeader.Characteristics & IMAGE_FILE_RELOCS_STRIPPED) == IMAGE_FILE_RELOCS_STRIPPED