Changeset 15395

Timestamp:

Dec 17, 2000, 11:45:52 PM (24 years ago)

Author:

bird

Message:

Added option for EXE fixes.

Location:

tags/trunk/src/win32k

Files:

• dev32/d32init.c (modified) (2 diffs)
• include/options.h (modified) (4 diffs)

tags/trunk/src/win32k/dev32/d32init.c ¶

@@ -1 @@
-/* $Id: d32init.c,v 1.27 2000-12-12 14:50:09 bird Exp $
+/* $Id: d32init.c,v 1.28 2000-12-17 22:45:50 bird Exp $
  *
  * d32init.c - 32-bits init routines.
@@ -163 +163 @@
 
             case 'e':
-            case 'E':/* ELF */
+            case 'E':/* Elf or EXe */
                 pszTmp2 = strpbrk(pszTmp, ":=/- ");
-                if (pszTmp2 != NULL
-                    && (pszTmp2[1] == 'N' ||pszTmp2[1] == 'n' || pszTmp2[1] == 'D' || pszTmp2[1] == 'd')
-                    )
-                    options.fElf = FALSE;
+                if (pszTmp[1] != 'x' && pszTmp != 'X')
+                {
+                    options.fElf = !(pszTmp2 != NULL
+                                     && (   pszTmp2[1] == 'N' || pszTmp2[1] == 'n'
+                                         || pszTmp2[1] == 'D' || pszTmp2[1] == 'd'));
+                }
                 else
-                    options.fElf = TRUE;
+                {
+                    options.fExeFixes = !(pszTmp2 != NULL
+                                          && (   pszTmp2[1] == 'N' || pszTmp2[1] == 'n'
+                                              || pszTmp2[1] == 'D' || pszTmp2[1] == 'd'));
+                }
                 break;
 

tags/trunk/src/win32k/include/options.h ¶

@@ -1 @@
-/* $Id: options.h,v 1.13 2000-12-11 06:22:14 bird Exp $
+/* $Id: options.h,v 1.14 2000-12-17 22:45:52 bird Exp $
  *
  * Options.
@@ -63 +63 @@
             FALSE,                  /* fNoLoader     */     \
             TRUE,                   /* fDllFixes     */     \
+            TRUE,                   /* fExeFixes     */     \
             CB_SWP_INIT,            /* cbSwpHeapInit */     \
             CB_SWP_MAX,             /* cbSwpHeapMax  */     \
@@ -89 +90 @@
 #define isDllFixesEnabled()         (options.fDllFixes)
 #define isDllFixesDisabled()        (!options.fDllFixes)
+
+#define isExeFixesEnabled()         (options.fExeFixes)
+#define isExeFixesDisabled()        (!options.fExeFixes)
 
 /* INC */
@@ -133 +137 @@
     /** @cat Options affecting the behaviour changes in the OS/2 loader */
     ULONG       fDllFixes;              /* Enables the long DLL name and non .DLL extention fixes. */
+    ULONG       fExeFixes;              /* Enables EXE files to export entry points. */
 
     /** @cat Options affecting the heap. */