Changeset 1535 for trunk/src/win32k/dev32

Timestamp:

Nov 1, 1999, 12:57:09 AM (26 years ago)

Author:

bird

Message:

Updated option/argument handling.
Corrected a few bugs.

Location:

trunk/src/win32k/dev32

Files:

• d32hlp.asm (modified) (4 diffs)
• d32init.c (modified) (6 diffs)

trunk/src/win32k/dev32/d32hlp.asm

@@ -1 @@
-; $Id: d32hlp.asm,v 1.2 1999-10-27 02:02:54 bird Exp $
+; $Id: d32hlp.asm,v 1.3 1999-10-31 23:57:02 bird Exp $
 ;
 ; d32hlp - 32-bit Device Driver Helper Function.
@@ -39 +39 @@
 CODE32 segment dword public 'CODE' use32
     assume cs:CODE32, ds:flat, ss:nothing, es:nothing
-
+    .386p
 
 ;PVOID  D32HLPCALL D32Hlp_VirtToLin(ULONG  ulPtr16); /* eax */
@@ -101 +101 @@
 D32Hlp_GetDOSVar proc near
     push    bx
-
-    mov     cx, ax
-    mov     al, dl
-
+    mov     ecx, edx
     mov     dl, DevHlp_GetDOSVar
     jmp     far ptr CODE16:Thunk16_GetDOSVar
@@ -116 +113 @@
 
 Error:
-    mov     ax, 87
+    xor     eax, eax
 
 Finished:

trunk/src/win32k/dev32/d32init.c

@@ -1 @@
-/* $Id: d32init.c,v 1.2 1999-10-27 02:02:54 bird Exp $
+/* $Id: d32init.c,v 1.3 1999-10-31 23:57:02 bird Exp $
  *
  * d32init.c - 32-bits init routines.
@@ -89 +89 @@
         switch (*pszTmp)
         {
+            case 'c':
             case 'C': /* -C[1|2] - com-port no, def:-C2 */
                 switch (pszTmp[1])
@@ -102 +103 @@
                 break;
 
+            case 'e':
+            case 'E':/* ELF */
+                pszTmp2 = strpbrk(pszTmp, ":=/- ");
+                if (pszTmp2 != NULL && (int)(pszTmp2-pszTmp) < cch-1
+                    && (pszTmp2[1] == 'N' ||pszTmp2[1] == 'n' || pszTmp2[1] == 'D' || pszTmp2[1] == 'd')
+                    )
+                    options.fElf = FALSE;
+                else
+                    options.fElf = TRUE;
+                break;
+
+            case 'l':
             case 'L': /* -L[..]<:|=| >[<Y..|E..| > | <N..|D..>] */
                 pszTmp2 = strpbrk(pszTmp, ":=/- ");
@@ -112 +125 @@
                 break;
 
-
+            case 'n':
+            case 'N': /* NoLoader */
+                options.fNoLoader = TRUE;
+                break;
+
+            case 'p':
+            case 'P': /* PE */
+                pszTmp2 = strpbrk(pszTmp, ":=/- ");
+                if (pszTmp2 != NULL && (*pszTmp == ':' || *pszTmp == '='))
+                {
+                    pszTmp++;
+                    if (strnicmp(pszTmp, "pe2lx", 5) == 0)
+                        options.fPE = FLAGS_PE_PE2LX;
+                    else if (strnicmp(pszTmp, "pe", 2) == 0)
+                        options.fPE = FLAGS_PE_PE;
+                    else if (strnicmp(pszTmp, "mixed", 2) == 0)
+                        options.fPE = FLAGS_PE_MIXED;
+                    else if (strnicmp(pszTmp, "not", 2) == 0)
+                        options.fPE = FLAGS_PE_NOT;
+                    else
+                        kprintf(("R0Init32: invalid parameter -PE:...\n"));
+                }
+                else
+                    kprintf(("R0Init32: invalid parameter -PE...\n"));
+                break;
+
+            case 'q':
             case 'Q': /* quiet initialization */
                 options.fQuiet = TRUE;
                 break;
 
+            case 's':
             case 'S': /* SMP kernel */
                 options.fKernel = KF_SMP;
                 break;
 
+            case 'v':
             case 'V': /* verbose initialization */
                 options.fQuiet = FALSE;
                 break;
 
+            case 'u':
             case 'U': /* UNI kernel */
                 options.fKernel = KF_SMP;
@@ -161 +203 @@
      */
     /* heap */
-    if (heapInit(HEAP_SIZE) != NO_ERROR)
+    if (heapInit(options.cbHeap) != NO_ERROR)
         return STATUS_DONE | STERR | ERROR_I24_QUIET_INIT_FAIL;
 
     /* loader */
-    if (ldrInit() != NO_ERROR)
-        return STATUS_DONE | STERR | ERROR_I24_QUIET_INIT_FAIL;
+    if (!options.fNoLoader)
+        if (ldrInit() != NO_ERROR)
+            return STATUS_DONE | STERR | ERROR_I24_QUIET_INIT_FAIL;
 
     /* functionoverrides */
-    if (procInit() != NO_ERROR)
-        return STATUS_DONE | STERR | ERROR_I24_QUIET_INIT_FAIL;
+    if (!options.fNoLoader)
+        if (procInit() != NO_ERROR)
+            return STATUS_DONE | STERR | ERROR_I24_QUIET_INIT_FAIL;
 
     return STATUS_DONE;
@@ -296 +340 @@
      *  or
      *     push ebp
-     *     mov ecx, dword ptr [123407452]
+     *     mov ecx, dword ptr [xxxxxxxx]
      */