Changeset 4542 for trunk/src

Timestamp:

Oct 27, 2000, 12:59:13 PM (25 years ago)

Author:

bird

Message:

Fixed bug which prevented the symbolname to be copied to the szSymbolfile
global variable.

File:

• trunk/src/win32k/dev16/probkrnl.c (modified) (5 diffs)

trunk/src/win32k/dev16/probkrnl.c

@@ -1 @@
-/* $Id: probkrnl.c,v 1.27 2000-10-01 02:58:15 bird Exp $
+/* $Id: probkrnl.c,v 1.28 2000-10-27 10:59:13 bird Exp $
  *
  * Description:   Autoprobes the os2krnl file and os2krnl[*].sym files.
@@ -86 +86 @@
  * IMPORTANT: aImportTab has three sibling arrays, two in dev32\d32init.c (aulProc
  *            and aTstFakers), and the calltab.asm, which must match entry by entry.
+ *  - obsolete warning -
  *            When adding/removing/shuffling items in aImportTab, aulProc and
  *            calltab.asm has to be updated immediately!
  *            Use the mkcalltab.exe to generate calltab.asm and aTstFakers.
+ *  - obsolete warning -
+ *            We'll now generate both of these files from this table.
+ *
  */
 IMPORTKRNLSYM DATA16_GLOBAL aImportTab[NBR_OF_KRNLIMPORTS] =
@@ -632 +636 @@
 
             dprintf(("LookUpKrnlEntry - found entry for this kernel!\n"));
+            kstrcpy(szSymbolFile, "Win32k Symbol Database");
 
             /*
@@ -653 +658 @@
 
             /* set sym name on success or complain on error */
-            if (rc == 0)
-                kstrcpy(szSymbolFile, "Win32k Symbol Database");
-            else
+            if (rc != 0)
             {
                 printf16("Warning: The Win32k Symbol Database entry found.\n"
@@ -1258 +1261 @@
                         rc = rc2;
                 }
-                if (rc == NO_ERROR)
+                if (rc2 == NO_ERROR)
+                {
                     kstrcpy(szSymbolFile, apszSym[i]);
-                else if (rc == 1 || rc2 == NO_ERROR)
-                    rc = rc2;
+                    rc = NO_ERROR;
+                }
                 #endif
             }