Changeset 6853 for trunk/src

Timestamp:

Sep 28, 2001, 9:43:38 AM (24 years ago)

Author:

sandervl

Message:

header updates

Location:

trunk/src/win32k/include

Files:

• options.h (modified) (4 diffs)
• pe2lx.h (modified) (2 diffs)

trunk/src/win32k/include/options.h

@@ -1 @@
-/* $Id: options.h,v 1.22 2001-06-14 01:06:47 bird Exp $
+/* $Id: options.h,v 1.23 2001-09-28 07:43:38 sandervl Exp $
  *
  * Options.
@@ -98 +98 @@
             TRUE,                   /* fJava         */     \
             FALSE,                  /* fNoLoader     */     \
+            FALSE,                  /* fSkipFixups   */     \
+            NULL,                   /* pszCustomDll  */     \
+            NULL,                   /* pszCustomExports  */ \
             TRUE,                   /* fDllFixes     */     \
             TRUE,                   /* fExeFixes     */     \
@@ -126 +129 @@
 #define isJAVAEnabled()             (options.fJava)
 
+#define areFixupsEnabled()          (!options.fSkipFixups)
+#define areFixupsDisabled()         (options.fSkipFixups)
+
+#define hasCustomDll()              (options.pszCustomDll != NULL)
+#define hasCustomExports()          (options.pszCustomExports != NULL)
+
 #define isSMPKernel()               (options.fKernel & KF_SMP)
 #define isUNIKernel()               (!(options.fKernel & KF_SMP))
@@ -185 +194 @@
     ULONG       fNoLoader;              /* No loader stuff. !FIXME! We should import / functions even if this flag is set!!! */
 
+    ULONG       fSkipFixups;
+    PSZ         pszCustomDll;           /* pointer to custom odin dll name */
+    PSZ         pszCustomExports;       /* pointer to custom export table */
+
     /** @cat Options affecting the behaviour changes in the OS/2 loader */
     ULONG       fDllFixes;              /* Enables the long DLL name and non .DLL extention fixes. */

trunk/src/win32k/include/pe2lx.h

@@ -1 @@
-/* $Id: pe2lx.h,v 1.13 2001-07-08 02:59:21 bird Exp $
+/* $Id: pe2lx.h,v 1.14 2001-09-28 07:43:38 sandervl 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       addModule(PCSZ pszModuleName, PULONG pulModuleOrdinal);
     ULONG       addImportFunctionName(PCSZ pszFnName, PULONG poffFnName);