Changeset 9957 for trunk/src/win32k/include

Timestamp:

Mar 31, 2003, 4:53:32 AM (23 years ago)

Author:

bird

Message:

Cleaned up Customb Dll handling, pluss exclude dll feature. Added support for all object RW.

Location:

trunk/src/win32k/include

Files:

• options.h (modified) (6 diffs)
• pe2lx.h (modified) (3 diffs)

trunk/src/win32k/include/options.h

@@ -1 @@
-/* $Id: options.h,v 1.25 2003-03-31 01:22:45 bird Exp $
+/* $Id: options.h,v 1.26 2003-03-31 02:53:31 bird Exp $
  *
  * Options.
@@ -92 +92 @@
             FLAGS_PE_PE,            /* fPE           */     \
             FLAGS_PEOO_FORCED,      /* fPEOneObject  */     \
+            FALSE,                  /* fAllRWObjects */     \
+            FALSE,                  /* fSkipFixups   */     \
             INFOLEVEL_QUIET,        /* ulInfoLevel   */     \
             FALSE,                  /* fElf          */     \
@@ -98 +100 @@
             TRUE,                   /* fJava         */     \
             FALSE,                  /* fNoLoader     */     \
-            FALSE,                  /* fSkipFixups   */     \
             NULL,                   /* pszCustomDll  */     \
             NULL,                   /* pszCustomExports  */ \
@@ -121 +122 @@
 #define isPEOneObjectForced()       (options.fPEOneObject == FLAGS_PEOO_FORCED)
 
+#define isAllRWObjectsEnabled()     (options.fAllRWObjects)
+#define isAllRWObjectsDisabled()    (!options.fAllRWObjects)
+
 #define isELFDisabled()             (!options.fElf)
 #define isELFEnabled()              (options.fElf)
@@ -178 +182 @@
     ULONG       fPE;                    /* Flags set the type of conversion. */
     ULONG       fPEOneObject;           /* All in one object. */
+    ULONG       fAllRWObjects;          /* All objects are writable. */
+    ULONG       fSkipFixups;            /* Base the image stripping of fixups. (Exe only please.) */
     ULONG       ulInfoLevel;            /* Pe2Lx InfoLevel. */
 
@@ -195 +201 @@
     ULONG       fNoLoader;              /* No loader stuff. !FIXME! We should import / functions even if this flag is set!!! */
 
-    ULONG       fSkipFixups;
     char *      pszCustomDll;           /* Pointer to custom odin dll name */
     char *      pszCustomExports;       /* Pointer to custom export table */

trunk/src/win32k/include/pe2lx.h

@@ -1 @@
-/* $Id: pe2lx.h,v 1.15 2003-03-31 01:23:14 bird Exp $
+/* $Id: pe2lx.h,v 1.16 2003-03-31 02:53:32 bird Exp $
  *
  * Pe2Lx class declarations. Ring 0 and Ring 3
@@ -110 +110 @@
     ULONG       addPageFixupEntry(BOOL fLast = FALSE);
     ULONG       add32OffsetFixup(WORD offSource, ULONG ulTarget);
-    #ifndef RING0
-    ULONG       add32OrdImportFixup(WORD offSource, ULONG ulModuleOrdinal, ULONG ulFunctionOrdinal, PSZ pszModuleName);
-    ULONG       add32NameImportFixup(WORD offSource, ULONG ulModuleOrdinal, PCSZ pszFnName, PSZ pszModuleName);
-    #else
-    ULONG       add32OrdImportFixup(WORD offSource, ULONG ulModuleOrdinal, ULONG ulFunctionOrdinal);
-    ULONG       add32NameImportFixup(WORD offSource, ULONG ulModuleOrdinal, PCSZ pszFnName);
-    #endif
+    ULONG       add32OrdImportFixup(WORD offSource, ULONG ulModuleOrdinal, ULONG ulFunctionOrdinal, PCSZ pszModuleName);
+    ULONG       add32NameImportFixup(WORD offSource, ULONG ulModuleOrdinal, PCSZ pszFnName, PCSZ pszModuleName);
     ULONG       addModule(PCSZ pszModuleName, PULONG pulModuleOrdinal);
     ULONG       addImportFunctionName(PCSZ pszFnName, PULONG poffFnName);
@@ -140 +135 @@
     static BOOL setOdin32Path(const char *psz);
     #ifndef RING0
-    static BOOL isCustomDllExcluded(const char *pszModuleName);
+    static BOOL isCustomDllExcluded(PCSZ pszModuleName);
     #endif