Changeset 5103 for trunk/src

Timestamp:

Feb 11, 2001, 4:16:49 PM (25 years ago)

Author:

bird

Message:

Added import name length check. Added support for revision up to 'E'. For Not-Required entries blank object number.

File:

• trunk/src/win32k/dev16/extract.c (modified) (8 diffs)

trunk/src/win32k/dev16/extract.c

@@ -1 @@
-/* $Id: extract.c,v 1.4 2001-01-19 02:27:32 bird Exp $
+/* $Id: extract.c,v 1.5 2001-02-11 15:16:49 bird Exp $
  *
  * Description:     SymDB entry generator.
@@ -26 +26 @@
 #define INCL_DOS
 #define INCL_NOPMAPI
+#define INCL_OS2KRNL_LDR
 
 /*******************************************************************************
@@ -40 +41 @@
 #undef  CODE16_INIT
 #define CODE16_INIT
-#include "os2krnl.h"                    /* must be included before dev1632.h! */
+#include "os2Krnl.h"                    /* must be included before dev1632.h! */
 #include "probkrnl.h"
 #include "dev1632.h"
@@ -166 +167 @@
             case 'H':   printf16(" | KF_HALFSTRICT"); break;
         }
-        if (psz[cchNum + 2] == 'A')
-            printf16(" | KF_REV_A");
+        if (psz[cchNum + 2] >= 'A' && psz[cchNum + 2] <= 'E')
+            printf16(" | KF_REV_%c", psz[cchNum + 2]);
 
         printf16(", %d,\n"
@@ -177 +178 @@
             char *psz = aImportTab[i].achName;
             printf16("            {%-2d, 0x%08lx}, /* %s */\n",
-                     aImportTab[i].iObject,
+                     aImportTab[i].fFound ? aImportTab[i].iObject : 0,
                      aImportTab[i].fFound ? aImportTab[i].offObject : 0xFFFFFFFFUL,
                      (char *)&aImportTab[i].achName[0]
@@ -213 +214 @@
     APIRET  rc;
     const char *  psz;
+    int     i;
 
     /*
@@ -220 +222 @@
     paKrnlOTEs = &KrnlInfo.aObjects[0];
 
+    /*
+     * Check name lengths.
+     */
+    for (i = 0; i < NBR_OF_KRNLIMPORTS; i++)
+    {
+        if (kstrlen(aImportTab[i].achName) != (int)aImportTab[i].cchName)
+        {
+            printf16("internal error - bad length of entry %d - %s. %d should be %d.\n",
+                     i, aImportTab[i].achName, aImportTab[i].cchName, kstrlen(aImportTab[i].achName));
+            return -1;
+        }
+    }
+
+    /*
+     * Do work.
+     */
     if (argc > 1)
     {
@@ -252 +270 @@
         int         i;
 
-        printf16("/* $Id: extract.c,v 1.4 2001-01-19 02:27:32 bird Exp $\n"
+        printf16("/* $Id: extract.c,v 1.5 2001-02-11 15:16:49 bird Exp $\n"
                  "*\n"
                  "* Autogenerated kernel symbol database.\n"