Changeset 4010 for branches/GRACE/src/win32k/dev16

Timestamp:

Aug 14, 2000, 10:57:07 AM (25 years ago)

Author:

bird

Message:

Corrections...
Testing is now done with real kernel image!!!

Location:

branches/GRACE/src/win32k/dev16

Files:

• d16init.c (modified) (2 diffs)
• probkrnl.c (modified) (10 diffs)

branches/GRACE/src/win32k/dev16/d16init.c

@@ -1 @@
-/* $Id: d16init.c,v 1.6.4.2 2000-08-13 09:23:56 bird Exp $
+/* $Id: d16init.c,v 1.6.4.3 2000-08-14 08:57:03 bird Exp $
  *
  * d16init - init routines for both drivers.
@@ -249 +249 @@
     if (TKSSBase16 != 0)
         return NO_ERROR;
+    /*
     _asm {
         int 3;
     }
+    */
 
     /* First we're to get the DosTable2 stuff. */

branches/GRACE/src/win32k/dev16/probkrnl.c

@@ -1 @@
-/* $Id: probkrnl.c,v 1.20.4.2 2000-08-13 09:23:57 bird Exp $
+/* $Id: probkrnl.c,v 1.20.4.3 2000-08-14 08:57:03 bird Exp $
  *
  * Description:   Autoprobes the os2krnl file and os2krnl[*].sym files.
@@ -69 +69 @@
 #include "log.h"
 #include "options.h"
-
+#include "errors.h"
 
 /*******************************************************************************
@@ -196 +196 @@
     {ERROR_PROB_SYM_SEG_DEF_READ,       "Sym: Failed to read a segment definition."},
     {ERROR_PROB_SYM_IMPORTS_NOTFOUND,   "Sym: All the imports wasn't found."},
+    {ERROR_PROB_SYM_V_PROC_NOT_FND,     "Sym: Verify failed: Procedure not found."},
+    {ERROR_PROB_SYM_V_OBJ_OR_ADDR,      "Sym: Verify failed: Invalid object or address."},
+    {ERROR_PROB_SYM_V_ADDRESS,          "Sym: Verify failed: Invalid address."},
+    {ERROR_PROB_SYM_V_PROLOG,           "Sym: Verify failed: Invalid prolog."},
+    {ERROR_PROB_SYM_V_NOT_IMPL,         "Sym: Verify failed: Not implemented."},
 
     {ERROR_PROB_SYMDB_KRNL_NOT_FOUND,   "SymDB: Kernel was not found."}
@@ -204 +209 @@
  */
 #ifdef R3TST
-USHORT      usFakeVerMajor = 20;
-USHORT      usFakeVerMinor = 45;
+USHORT      usFakeVerMajor = 0;
+USHORT      usFakeVerMinor = 0;
 #ifdef R3TST
 static ach[11] =  {0}; /* works around compiler/linker bug */
@@ -642 +647 @@
         rc = DosDevIOCtl("", "", D16_IOCTL_VERIFYIMPORTTAB, D16_IOCTL_CAT, hDev0);
         DosClose(hDev0);
+        if (rc >= ERROR_D32_VERIFYIMPORTTAB_FIRST  && rc < ERROR_D32_VERIFYIMPORTTAB_LAST)
+            rc += ERROR_PROB_SYM_VERIFY_FIRST - ERROR_D32_VERIFYIMPORTTAB_FIRST;
     }
 
@@ -1048 +1055 @@
                 printf16("0x%08lx%s", aImportTab[i].ulAddress, (i % 2) == 0 ? "" : "\n");
             else
-                printf16("failed!%s", (i % 2) == 0 ? "" : "\n");
+                printf16("failed!%s", (i % 2) == 0 ? "   " : "\n");
         }
         if (i % 2) printf16("\n");
@@ -1146 +1153 @@
     options.usVerMinor  = pGIS->uchMinorVersion;
 #else
+    if (usFakeVerMajor == 0)
+    {
+        usFakeVerMajor = pGIS->uchMajorVersion;
+        usFakeVerMinor = pGIS->uchMinorVersion;
+    }
     options.usVerMajor  = usFakeVerMajor;
     options.usVerMinor  = usFakeVerMinor;
@@ -1194 +1206 @@
                 )
             {
+                #ifndef R3TST
                 /* search on disk */
                 i = 0;
@@ -1200 +1213 @@
                        )
                     i++;
+                #endif
             }
         }
@@ -1646 +1660 @@
         int         i;
 
-        printf16("/* $Id: probkrnl.c,v 1.20.4.2 2000-08-13 09:23:57 bird Exp $\n"
+        printf16("/* $Id: probkrnl.c,v 1.20.4.3 2000-08-14 08:57:03 bird Exp $\n"
                  "*\n"
                  "* Autogenerated kernel symbol database.\n"