Changeset 4880 for trunk/src

Timestamp:

Jan 8, 2001, 7:05:26 PM (25 years ago)

Author:

bird

Message:

Changed PE loading to default to using pe.exe - for the time being.

Location:

trunk/src/win32k

Files:

• include/options.h (modified) (2 diffs)
• utils/Win32kCC.c (modified) (2 diffs)

trunk/src/win32k/include/options.h

@@ -1 @@
-/* $Id: options.h,v 1.14 2000-12-17 22:45:52 bird Exp $
+/* $Id: options.h,v 1.15 2001-01-08 18:05:26 bird Exp $
  *
  * Options.
@@ -55 +55 @@
             (unsigned short)~0,     /* usVerMajor    */     \
             (unsigned short)~0,     /* usVerMinor    */     \
-            FLAGS_PE_MIXED,         /* fPE           */     \
+            FLAGS_PE_PE,            /* fPE           */     \
             INFOLEVEL_QUIET,        /* ulInfoLevel   */     \
             FALSE,                  /* fElf          */     \

trunk/src/win32k/utils/Win32kCC.c

@@ -1 @@
-/* $Id: Win32kCC.c,v 1.9 2000-12-12 15:34:17 bird Exp $
+/* $Id: Win32kCC.c,v 1.10 2001-01-08 18:05:26 bird Exp $
  *
  * Win32CC - Win32k Control Center.
@@ -352 +352 @@
                     if (pThis->NewOptions.usCom == 0x2e8)       strcat(szArgs, " -C4");
                     if (pThis->NewOptions.fPE == FLAGS_PE_PE2LX)strcat(szArgs, " -P:pe2lx");
-                    /*if (pThis->NewOptions.fPE == FLAGS_PE_MIXED)strcat(szArgs, " -P:mixed"); - default */
-                    if (pThis->NewOptions.fPE == FLAGS_PE_PE)   strcat(szArgs, " -P:pe");
+                    /*if (pThis->NewOptions.fPE == FLAGS_PE_MIXED)strcat(szArgs, " -P:mixed"); - old default */
+                    if (pThis->NewOptions.fPE == FLAGS_PE_MIXED)strcat(szArgs, " -P:mixed");
+                    /* if (pThis->NewOptions.fPE == FLAGS_PE_PE)   strcat(szArgs, " -P:pe"); - default */
                     if (pThis->NewOptions.fPE == FLAGS_PE_NOT)  strcat(szArgs, " -P:not");
                     if (pThis->NewOptions.ulInfoLevel != 0) /* -W0 is default */