Changeset 5051 for trunk/src/win32k/include/options.h

Timestamp:

Feb 2, 2001, 9:41:31 AM (25 years ago)

Author:

bird

Message:

Added new option for the All-in-one-object fix.

File:

• trunk/src/win32k/include/options.h (modified) (6 diffs)

trunk/src/win32k/include/options.h

@@ -1 @@
-/* $Id: options.h,v 1.18 2001-01-21 07:54:37 bird Exp $
+/* $Id: options.h,v 1.19 2001-02-02 08:39:52 bird Exp $
  *
  * Options.
@@ -39 +39 @@
 #define FLAGS_PE_MIXED      0x00000003UL
 
+/* fPEOneObject */
+#define FLAGS_PEOO_DISABLED 0x00000000UL
+#define FLAGS_PEOO_ENABLED  0x00000001UL
+#define FLAGS_PEOO_FORCED   0x00000002UL
+
 /* ulInfoLevel */
 #define INFOLEVEL_QUIET     0x00000000UL
@@ -63 +68 @@
             (unsigned short)~0,     /* usVerMinor    */     \
             FLAGS_PE_PE,            /* fPE           */     \
+            FLAGS_PEOO_FORCED,      /* fPEOneObject  */     \
             INFOLEVEL_QUIET,        /* ulInfoLevel   */     \
             FALSE,                  /* fElf          */     \
@@ -83 +89 @@
 #define isPe2LxLoaderEnabled()      (options.fPE == FLAGS_PE_PE2LX)
 #define isMixedPeLoaderEnabled()    (options.fPE == FLAGS_PE_MIXED)
+#define isPEOneObjectEnabled()      (options.fPEOneObject == FLAGS_PEOO_ENABLED)
+#define isPEOneObjectDisabled()     (options.fPEOneObject == FLAGS_PEOO_DISABLED)
+#define isPEOneObjectForced()       (options.fPEOneObject == FLAGS_PEOO_FORCED)
 
 #define isELFDisabled()             (!options.fElf)
@@ -129 +138 @@
     /** @cat Options affecting the generated LX executables */
     ULONG       fPE;                    /* Flags set the type of conversion. */
+    ULONG       fPEOneObject;           /* All in one object. */
     ULONG       ulInfoLevel;            /* Pe2Lx InfoLevel. */
 
@@ -165 +175 @@
 extern struct options DATA16_GLOBAL options;    /* defined in d16globals.c */
 extern char   szWin32kIni[160];                 /* defined in d16globals.c */
+#ifdef RING0
 #if defined(__IBMC__) || defined(__IBMCPP__)
     #pragma map( options , "_options"  )
     #pragma map( szWin32kIni, "_szWin32kIni" )
+#endif
 #endif
 /* INC */