Changeset 4774 for trunk/src

Timestamp:

Dec 11, 2000, 7:22:15 AM (25 years ago)

Author:

bird

Message:

Added option fDllFixes.

Location:

trunk/src/win32k

Files:

• dev32/d32init.c (modified) (6 diffs)
• include/options.h (modified) (4 diffs)
• k32/k32QueryOptionsStatus.cpp (modified) (2 diffs)
• k32/k32SetOptions.cpp (modified) (3 diffs)

trunk/src/win32k/dev32/d32init.c

@@ -1 @@
-/* $Id: d32init.c,v 1.25 2000-10-01 02:58:15 bird Exp $
+/* $Id: d32init.c,v 1.26 2000-12-11 06:22:14 bird Exp $
  *
  * d32init.c - 32-bits init routines.
@@ -151 +151 @@
                 break;
 
+            case 'd':
+            case 'D':
+                pszTmp2 = strpbrk(pszTmp, ":=/- ");
+                if (pszTmp2 != NULL
+                    && (pszTmp2[1] == 'N' ||pszTmp2[1] == 'n' || pszTmp2[1] == 'D' || pszTmp2[1] == 'd')
+                    )
+                    options.fDllFixes = FALSE;
+                else
+                    options.fDllFixes = TRUE;
+                break;
+
             case 'e':
             case 'E':/* ELF */
@@ -619 +630 @@
  * @param     bModRM  ModR/M byte.
  * @status    completely implemented.
- * @author    knut st. osmundsen (knut.stange.osmundsen@pmsc.no)
+ * @author    knut st. osmundsen (knut.stange.osmundsen@mynd.no)
  */
 int ModR_M_32bit(char bModRM)
@@ -642 +653 @@
  * @param     bModRM  ModR/M byte.
  * @status    completely implemented.
- * @author    knut st. osmundsen (knut.stange.osmundsen@pmsc.no)
+ * @author    knut st. osmundsen (knut.stange.osmundsen@mynd.no)
  */
 int ModR_M_16bit(char bModRM)
@@ -1426 +1437 @@
  * @returns Pointer to the fake kernel MTE.
  * @status  completely implemented.
- * @author  knut st. osmundsen (knut.stange.osmundsen@pmsc.no)
+ * @author  knut st. osmundsen (knut.stange.osmundsen@mynd.no)
  */
 PMTE GetOS2KrnlMTETst(void)
@@ -1446 +1457 @@
  * @param   void
  * @status  completely implemented.
- * @author  knut st. osmundsen (knut.stange.osmundsen@pmsc.no)
+ * @author  knut st. osmundsen (knut.stange.osmundsen@mynd.no)
  * @remark  Called before the aImportTab array is used/verified.
  */

trunk/src/win32k/include/options.h

@@ -1 @@
-/* $Id: options.h,v 1.12 2000-09-22 09:22:37 bird Exp $
+/* $Id: options.h,v 1.13 2000-12-11 06:22:14 bird Exp $
  *
  * Options.
@@ -62 +62 @@
             TRUE,                   /* fJava         */     \
             FALSE,                  /* fNoLoader     */     \
+            TRUE,                   /* fDllFixes     */     \
             CB_SWP_INIT,            /* cbSwpHeapInit */     \
             CB_SWP_MAX,             /* cbSwpHeapMax  */     \
@@ -84 +85 @@
 
 #define isSMPKernel()               (options.fKernel & KF_SMP)
-#define isUNIKernel()               !(options.fKernel & KF_SMP)
+#define isUNIKernel()               (!(options.fKernel & KF_SMP))
+
+#define isDllFixesEnabled()         (options.fDllFixes)
+#define isDllFixesDisabled()        (!options.fDllFixes)
+
 /* INC */
 
@@ -126 +131 @@
     ULONG       fNoLoader;              /* No loader stuff. !FIXME! We should import / functions even if this flag is set!!! */
 
+    /** @cat Options affecting the behaviour changes in the OS/2 loader */
+    ULONG       fDllFixes;              /* Enables the long DLL name and non .DLL extention fixes. */
+
     /** @cat Options affecting the heap. */
     ULONG       cbSwpHeapInit;          /* Initial heapsize. */

trunk/src/win32k/k32/k32QueryOptionsStatus.cpp

@@ -1 @@
-/* $Id: k32QueryOptionsStatus.cpp,v 1.3 2000-09-04 16:40:50 bird Exp $
+/* $Id: k32QueryOptionsStatus.cpp,v 1.4 2000-12-11 06:22:15 bird Exp $
  *
  * k32QueryOptionsStatus  - Queries the options and/or the status of
@@ -135 +135 @@
         TmpOptions.fJava        = options.fJava;
         TmpOptions.fNoLoader    = options.fNoLoader;
+        TmpOptions.fDllFixes    = options.fDllFixes;
         TmpOptions.cbSwpHeapMax = options.cbSwpHeapMax;
         TmpOptions.cbResHeapMax = options.cbResHeapMax;

trunk/src/win32k/k32/k32SetOptions.cpp

@@ -1 @@
-/* $Id: k32SetOptions.cpp,v 1.3 2000-09-22 09:22:38 bird Exp $
+/* $Id: k32SetOptions.cpp,v 1.4 2000-12-11 06:22:15 bird Exp $
  *
  * k32SetOptions - Sets the changable options of win32k.sys the options.
@@ -126 +126 @@
         if (TmpOptions.fREXXScript > 1)
             return ERROR_INVALID_PARAMETER;
+        if (TmpOptions.fDllFixes > 1)
+            return ERROR_INVALID_PARAMETER;
         if (TmpOptions.cbSwpHeapMax > (32768*1024) || TmpOptions.cbSwpHeapMax < options.cbSwpHeapInit)
             return ERROR_INVALID_PARAMETER;
@@ -154 +156 @@
         options.fJava       = TmpOptions.fJava;         /* Java flags. */
         options.fNoLoader   = TmpOptions.fNoLoader;     /* No loader stuff. !FIXME! We should import / functions even if this flag is set!!! */
+        options.fDllFixes   = TmpOptions.fDllFixes;     /* Enables the long DLL name and non .DLL extention fixes. */
 
         options.cbSwpHeapMax = TmpOptions.cbSwpHeapMax; /* Maximum heapsize. */