Changeset 4164 for trunk/src/win32k/dev16/probkrnl.c

Timestamp:

Sep 2, 2000, 11:08:23 PM (25 years ago)

Author:

bird

Message:

Merged in the Grace branch. New Win32k!

File:

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

trunk/src/win32k/dev16/probkrnl.c

@@ -1 @@
-/* $Id: probkrnl.c,v 1.20 2000-04-17 01:56:48 bird Exp $
+/* $Id: probkrnl.c,v 1.21 2000-09-02 21:07:56 bird Exp $
  *
  * Description:   Autoprobes the os2krnl file and os2krnl[*].sym files.
@@ -14 +14 @@
  *                How this works:
  *                1. parses the device-line parameters and collects some "SysInfo".
- *                2. gets the kernel object table. (elf$)
- *                3. finds the kernel image and scans it for a build number.
- *                4. locates and scans the symbol-file(s) for the entrypoints which are wanted.
+ *                2. gets the kernel object table and kernel info like build no. (elf$)
+ *                3. if non-debug kernel the symbol database is scanned to get the syms
+ *                4. if Syms not found THEN locates and scans the symbol-file(s) for the
+ *                   entrypoints which are wanted.
  *                5. the entry points are verified. (elf$)
  *                6. finished.
  *
- * Copyright (c) 1998-2000 knut st. osmundsen
+ * Copyright (c) 1998-2000 knut st. osmundsen (knut.stange.osmundsen@mynd.no)
  *
  * Project Odin Software License can be found in LICENSE.TXT
@@ -51 +52 @@
 #define INCL_NOPMAPI
 
-
 /*******************************************************************************
 *   Header Files                                                               *
@@ -61 +61 @@
 #include <reqpkt.h>
 
+#include "devSegDf.h"
+#undef  DATA16_INIT
+#define DATA16_INIT
+#undef  CODE16_INIT
+#define CODE16_INIT
 #include "os2krnl.h"                    /* must be included before dev1632.h! */
 #include "sym.h"
@@ -68 +73 @@
 #include "vprntf16.h"
 #include "log.h"
-
+#include "options.h"
+#include "errors.h"
 
 /*******************************************************************************
@@ -74 +80 @@
 *   Note: must be inited or else we'll get BSS segment                         *
 *******************************************************************************/
-/*
- * kernel data - !only valid during init!
- */
+
 
 /*
  * aImportTab defines the imported and overloaded OS/2 kernel functions.
- * IMPORTANT: aImportTab has a sibling array in d32init.c, aulProc, which must
- *            match entry by entry. Adding/removing/shuffling aImportTab, aulProc
- *            has to be updated immediately!
- */
-IMPORTKRNLSYM aImportTab[NBR_OF_KRNLIMPORTS] =
+ * IMPORTANT: aImportTab has two sibling arrays, one in d32init.c, aulProc, and
+ *            the calltab.asm, which must match entry by entry.
+ *            When adding/removing/shuffling items in aImportTab, aulProc and
+ *            calltab.asm has to be updated immediately!
+ */
+IMPORTKRNLSYM DATA16_GLOBAL aImportTab[NBR_OF_KRNLIMPORTS] =
 {/* iFound     cchName                  offObject    usSel     fType    */
  /*      iObject      achName                 ulAddress  cProlog        */
@@ -101 +106 @@
     {FALSE, -1, 11, "_VMGetOwner",          -1,  -1,  -1,  -1, EPT_PROCIMPORT32},  /* 12 */
     {FALSE, -1, 11, "g_tkExecPgm",          -1,  -1,  -1,  -1, EPT_PROC32},        /* 13 */
-    {FALSE, -1, 11, "f_FuStrLenZ",          -1,  -1,  -1,  -1, EPT_PROCIMPORT16},  /* 14 */
-    {FALSE, -1, 10, "f_FuStrLen",           -1,  -1,  -1,  -1, EPT_PROCIMPORT16},  /* 15 */
-    {FALSE, -1,  8, "f_FuBuff",             -1,  -1,  -1,  -1, EPT_PROCIMPORT16},  /* 16 */
-    {FALSE, -1, 16, "_VMObjHandleInfo",     -1,  -1,  -1,  -1, EPT_PROCIMPORT}     /* 17 */
-/*    {FALSE, -1, 11, "",          -1,  -1, -1, EPT_PROCIMPORT16} */ /* 16 */
+    {FALSE, -1, 15, "_tkStartProcess",      -1,  -1,  -1,  -1, EPT_PROC32},        /* 14 */
+    {FALSE, -1, 11, "f_FuStrLenZ",          -1,  -1,  -1,  -1, EPT_PROCIMPORT16},  /* 15 */
+    {FALSE, -1, 10, "f_FuStrLen",           -1,  -1,  -1,  -1, EPT_PROCIMPORT16},  /* 16 */
+    {FALSE, -1,  8, "f_FuBuff",             -1,  -1,  -1,  -1, EPT_PROCIMPORT16},  /* 17 */
+    {FALSE, -1, 16, "_VMObjHandleInfo",     -1,  -1,  -1,  -1, EPT_PROCIMPORT32},  /* 18 */
+    {FALSE, -1, 21, "_ldrASMpMTEFromHandle",-1,  -1,  -1,  -1, EPT_PROCIMPORT32},  /* 19 */
+    {FALSE, -1, 12, "_ldrOpenPath",         -1,  -1,  -1,  -1, EPT_PROC32},        /* 20 */
+    {FALSE, -1, 12, "_LDRClearSem",         -1,  -1,  -1,  -1, EPT_PROCIMPORT32},  /* 21 */
+    {FALSE, -1, 14, "_ldrFindModule",       -1,  -1,  -1,  -1, EPT_PROCIMPORT32},  /* 22 */
+    {FALSE, -1, 17, "_KSEMRequestMutex",    -1,  -1,  -1,  -1, EPT_PROCIMPORT32},  /* 23 */
+    {FALSE, -1, 17, "_KSEMReleaseMutex",    -1,  -1,  -1,  -1, EPT_PROCIMPORT32},  /* 24 */
+    {FALSE, -1, 15, "_KSEMQueryMutex",      -1,  -1,  -1,  -1, EPT_PROCIMPORT32},  /* 25 */
+    {FALSE, -1,  9, "_KSEMInit",            -1,  -1,  -1,  -1, EPT_PROCIMPORT32},  /* 26 */
+    {FALSE, -1,  7, "_LdrSem",              -1,  -1,  -1,  -1, EPT_VARIMPORT32},   /* 27 */
+    {FALSE, -1, 11, "_LDRLibPath",          -1,  -1,  -1,  -1, EPT_VARIMPORT32},   /* 28 */
+    {FALSE, -1,  9, "_TKSuBuff",            -1,  -1,  -1,  -1, EPT_PROCIMPORT32},  /* 29 */
+    {FALSE, -1,  9, "_TKFuBuff",            -1,  -1,  -1,  -1, EPT_PROCIMPORT32},  /* 30 */
+    {FALSE, -1, 11, "_TKFuBufLen",          -1,  -1,  -1,  -1, EPT_PROCIMPORT32},  /* 31 */
+    {FALSE, -1, 21, "_ldrValidateMteHandle",-1,  -1,  -1,  -1, EPT_PROCIMPORT32},  /* 32 */
+    {FALSE, -1,  8, "_pTCBCur",             -1,  -1,  -1,  -1, EPT_VARIMPORT16},   /* 33 */
+    {FALSE, -1,  9, "_pPTDACur",            -1,  -1,  -1,  -1, EPT_VARIMPORT16},   /* 34 */
+    {FALSE, -1, 10, "ptda_start",           -1,  -1,  -1,  -1, EPT_VARIMPORT16},   /* 35 */
+    {FALSE, -1, 12, "ptda_environ",         -1,  -1,  -1,  -1, EPT_VARIMPORT16},   /* 36 */
+    {FALSE, -1, 12, "ptda_ptdasem",         -1,  -1,  -1,  -1, EPT_VARIMPORT16},   /* 37 */
+    {FALSE, -1, 11, "ptda_module",          -1,  -1,  -1,  -1, EPT_VARIMPORT16},   /* 38 */
+    {FALSE, -1, 18, "ptda_pBeginLIBPATH",   -1,  -1,  -1,  -1, EPT_VARIMPORT16},   /* 39 */
+    {FALSE, -1, 16, "_ldrpFileNameBuf",     -1,  -1,  -1,  -1, EPT_VARIMPORT32},   /* 40 */
+    {FALSE, -1, 14, "SecPathFromSFN",       -1,  -1,  -1,  -1, EPT_PROCIMPORTNR32},/* 41 */
+
 };
 
-unsigned short int  usBuild          = 0;
-unsigned short      usVerMajor       = 0;
-unsigned short      usVerMinor       = 0;
-unsigned char       fchType          = TYPE_UNI;        /* TYPE_SMP, TYPE_UNI, TYPE_W4 */
-unsigned char       fDebug           = FALSE;
+char DATA16_GLOBAL  szUsrSym[50] = {0};
+
 
 
@@ -118 +144 @@
  * privat data
  */
-static int          fQuiet           = 0;
-static char         szUsrOS2Krnl[50] = {0};
-static char         szOS2Krnl[]      = {"c:\\os2krnl"};
-
-static char         szUsrSym[50]     = {0};
-static char *       apszSym[]        =
+#if defined(DEBUGR3)
+static char     DATA16_INIT szUsrOS2Krnl[50] = {0};
+static char     DATA16_INIT szOS2Krnl[]      = {"c:\\os2krnl"};
+#endif
+static char *   DATA16_INIT apszSym[]        =
 {
     {"c:\\os2krnl.sym"},                              /* usual for debugkernel */
@@ -144 +169 @@
 
 /* Result from GetKernelInfo/ReadOS2Krnl. */
-static unsigned char  cObjects = 0;
-static POTE           paKrnlOTEs = NULL;
-
+static unsigned char DATA16_INIT  cObjects = 0;
+static POTE          DATA16_INIT  paKrnlOTEs = NULL;
+
+
+/*
+ *
+ */
+static struct
+{
+    short       sErr;
+    const char *pszMsg;
+} DATA16_INIT aErrorMsgs[] =
+{
+    {ERROR_PROB_KRNL_OPEN_FAILED,       "Krnl: Failed to open kernel file."},
+    {ERROR_PROB_KRNL_SEEK_SIZE,         "Krnl: Failed to seek to end to of file."},
+    {ERROR_PROB_KRNL_SEEK_FIRST,        "Krnl: Failed to start of file."},
+    {ERROR_PROB_KRNL_READ_FIRST,        "Krnl: Failed to read (first)."},
+    {ERROR_PROB_KRNL_READ_NEXT,         "Krnl: Failed to read."},
+    {ERROR_PROB_KRNL_TAG_NOT_FOUND,     "Krnl: Build level tag was not found."},
+    {ERROR_PROB_KRNL_INV_SIGANTURE,     "Krnl: Invalid build level signature."},
+    {ERROR_PROB_KRNL_INV_BUILD_NBR,     "Krnl: Invalid build level number."},
+    {ERROR_PROB_KRNL_BUILD_VERSION,     "Krnl: Invalid build level version."},
+    {ERROR_PROB_KRNL_MZ_SEEK,           "Krnl: Failed to seek to start of file. (MZ)"},
+    {ERROR_PROB_KRNL_MZ_READ,           "Krnl: Failed to read MZ header."},
+    {ERROR_PROB_KRNL_NEOFF_INVALID,     "Krnl: Invalid new-header offset in MZ header."},
+    {ERROR_PROB_KRNL_NEOFF_SEEK,        "Krnl: Failed to seek to new-header offset."},
+    {ERROR_PROB_KRNL_LX_READ,           "Krnl: Failed to read LX header."},
+    {ERROR_PROB_KRNL_LX_SIGNATURE,      "Krnl: Invalid LX header signature."},
+    {ERROR_PROB_KRNL_OBJECT_CNT,        "Krnl: Object count don't match the running kernel."},
+    {ERROR_PROB_KRNL_OBJECT_CNR_10,     "Krnl: Less than 10 objects - not a valid kernel file!"},
+    {ERROR_PROB_KRNL_OTE_SEEK,          "Krnl: Failed to seek to OTEs."},
+    {ERROR_PROB_KRNL_OTE_READ,          "Krnl: Failed to read OTEs."},
+    {ERROR_PROB_KRNL_OTE_SIZE_MIS,      "Krnl: Size of a OTE didn't match the running kernel."},
+
+    /*
+     * ProbeSymFile error messages
+     */
+    {ERROR_PROB_SYM_FILE_NOT_FOUND,     "Sym: Symbol file was not found."},
+    {ERROR_PROB_SYM_READERROR,          "Sym: Read failed."},
+    {ERROR_PROB_SYM_INVALID_MOD_NAME,   "Sym: Invalid module name (not OS2KRNL)."},
+    {ERROR_PROB_SYM_SEGS_NE_OBJS,       "Sym: Number of segments don't match the object count of the kernel."},
+    {ERROR_PROB_SYM_SEG_DEF_SEEK,       "Sym: Failed to seek to a segment definition."},
+    {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."}
+};
+
+/*
+ * Fake data for Ring-3 testing.
+ */
+#ifdef R3TST
+USHORT DATA16_INIT usFakeVerMajor = 0;
+USHORT DATA16_INIT usFakeVerMinor = 0;
+#ifdef R3TST
+static DATA16_INIT ach[11] =  {0}; /* works around compiler/linker bug */
+#endif
+#endif
 
 
@@ -157 +242 @@
 static int      fseek(HFILE hfile, signed long off, int iOrg);
 static unsigned long fsize(HFILE hFile);
-static void     puts(char *psz);
-
-/* C-library replacements. */
+
+/* C-library replacements and additions. */
 static void     kmemcpy(char *psz1, const char *psz2, int cch);
 static char *   kstrstr(const char *psz1, const char *psz2);
@@ -169 +253 @@
 static int      kargncpy(char *pszTarget, const char *pszArg, unsigned cchMaxlen);
 
+static const char * GetErrorMsg(short sErr);
+
 /* Workers */
-static int      LookupKrnlEntry(unsigned uBuild, unsigned char chType,
-                                unsigned char fchType, unsigned char cObjects);
+static int      LookupKrnlEntry(unsigned short usBuild, unsigned short fKernel, unsigned char cObjects);
 static int      VerifyPrologs(void);
 static int      ProbeSymFile(const char *pszFilename);
@@ -177 +262 @@
 
 /* Ouput */
-static void     ShowDecNumber(unsigned long ul);
-static void     ShowHexNumber(unsigned long ul);
 static void     ShowResult(int rc, int iSym);
 
@@ -187 +270 @@
 static int      processFile(const char *pszFilename);
 
+#if 0 /*ndef CODE16_INIT*/
+#pragma alloc_text(CODE16_INIT, fopen, fread, fseek, fsize)
+#pragma alloc_text(CODE16_INIT, kmemcpy, kstrstr, kstrcmp, kstrncmp, kstrnicmp, kstrlen, kstrcpy, kargncpy)
+#pragma alloc_text(CODE16_INIT, GetErrorMsg)
+#pragma alloc_text(CODE16_INIT, LookupKrnlEntry, VerifyPrologs, ProbeSymFile, GetKernelInfo)
+#pragma alloc_text(CODE16_INIT, ShowResult)
+#pragma alloc_text(CODE16_INIT, VerifyKernelVer, ReadOS2Krnl, ReadOS2Krnl2, processFile)
+#endif
 
 
@@ -277 +368 @@
 
 /**
- * puts lookalike
- */
-static void puts(char * psz)
-{
-    DosPutMessage(0, kstrlen(psz), psz);
-}
-
-
-/**
  * kmemcpy - memory copy - slow!
  * @param     psz1  target
@@ -421 +503 @@
     while (*pszSource != '\0')
         *psz++ = *pszSource++;
-
+    *psz = '\0';
     return pszTarget;
 }
@@ -478 +560 @@
 
     return i;
+}
+
+
+/**
+ * Get the message text for an error message.
+ * @returns Pointer to error text. NULL if not found.
+ * @param   sErr  Error code id.
+ * @status  completely implemented.
+ * @author    knut st. osmundsen (knut.stange.osmundsen@pmsc.no)
+ */
+static const char * GetErrorMsg(short sErr)
+{
+    int i;
+    for (i = 0; i < sizeof(aErrorMsgs) / sizeof(aErrorMsgs[0]); i++)
+    {
+        if (aErrorMsgs[i].sErr == sErr)
+            return aErrorMsgs[i].pszMsg;
+    }
+    return NULL;
 }
 
@@ -493 +594 @@
  *            1 if not found.
  *            Error code on error.
- * @param     uBuild        Build level.
- * @param     fchBldType    'A' all strict
- *                          'H' half strict
- *                          'R' retail
- * @param     fchType       TYPE_SMP, TYPE_UNI, TYPE_W4
+ * @param     usBuild       Build level.
+ * @param     fKernel       Kernel (type) flags. (KF_* from options.h)
  * @param     cObjects      Count of object in the running kernel.
  * @sketch    Loop thru the table.
@@ -503 +601 @@
  * @author    knut st. osmundsen (knut.stange.osmundsen@pmsc.no)
  */
-static int LookupKrnlEntry(unsigned uBuild, unsigned char fchBldType, unsigned char fchType, unsigned char cObjects)
+static int LookupKrnlEntry(unsigned short usBuild, unsigned short fKernel, unsigned char cObjects)
 {
     int i;
@@ -512 +610 @@
     for (i = 0; aKrnlSymDB[i].usBuild != 0; i++)
     {
-        if (aKrnlSymDB[i].usBuild       == uBuild
-            && aKrnlSymDB[i].fchBldType == fchBldType
-            && aKrnlSymDB[i].fchType    == fchType
-            && aKrnlSymDB[i].cObjects   == cObjects)
+        if (   aKrnlSymDB[i].usBuild  == usBuild
+            && aKrnlSymDB[i].fKernel  == fKernel
+            && aKrnlSymDB[i].cObjects == cObjects)
         {   /* found matching entry! */
             int j;
@@ -533 +630 @@
                                            + pEntry->aSyms[j].offObject;
                 aImportTab[j].usSel      = paKrnlOTEs[pEntry->aSyms[j].iObject].ote_sel;
-                aImportTab[j].fFound     = TRUE;
+                aImportTab[j].fFound     = (char)((aImportTab[j].offObject != 0xFFFFFFFFUL) ? 1 : 0);
                 dprintf(("  %-3d addr=0x%08lx off=0x%08lx  %s\n",
                          j, aImportTab[j].ulAddress, aImportTab[j].offObject,
@@ -550 +647 @@
 
     /* not found */
-    return 1;
+    return ERROR_PROB_SYMDB_KRNL_NOT_FOUND;
 }
 #endif /* !EXTRACT */
+
 
 /**
@@ -574 +672 @@
         rc = DosDevIOCtl("", "", D16_IOCTL_VERIFYIMPORTTAB, D16_IOCTL_CAT, hDev0);
         DosClose(hDev0);
+        if (rc != NO_ERROR)
+        {
+            register APIRET rc2 = rc & STECODE;
+            if (rc2 >= ERROR_D32_VERIFYIMPORTTAB_FIRST && rc2 <= ERROR_D32_VERIFYIMPORTTAB_LAST)
+                rc = rc2 + ERROR_PROB_SYM_VERIFY_FIRST - ERROR_D32_VERIFYIMPORTTAB_FIRST;
+        }
+    }
+    else
+    {
+        dprintf(("DosOpen Failed with rc=%d\n", rc));
+        DosSleep(2000);
     }
 
@@ -616 +725 @@
     {
         dprintf(("Error opening file %s\n", pszFilename));
-        return -50;
+        return ERROR_PROB_SYM_FILE_NOT_FOUND;
     }
     dprintf(("\nSuccessfully opened symbolfile: %s\n", pszFilename));
@@ -629 +738 @@
     {   /* oops! read failed, close file and fail. */
         fclose(hSym);
-        return -51;
+        return ERROR_PROB_SYM_READERROR;
     }
     achBuffer[0] = MapDef.achModName[0];
@@ -646 +755 @@
         dprintf(("Modulename verify failed\n"));
         fclose(hSym);
-        return -51;
+        return ERROR_PROB_SYM_INVALID_MOD_NAME;
     }
 
@@ -658 +767 @@
         dprintf(("Segment No. verify failed\n"));
         fclose(hSym);
-        return -52;
+        return ERROR_PROB_SYM_SEGS_NE_OBJS;
     }
     #endif /* !EXTRACT */
@@ -701 +810 @@
         {   /* Failed to seek to the segment definition, fail! */
             fclose(hSym);
-            return -53;
+            return ERROR_PROB_SYM_SEG_DEF_SEEK;
         }
         rc = fread(&SegDef, sizeof(SEGDEF), 1, hSym);
@@ -707 +816 @@
         {   /* Failed to read the segment definition, fail! */
             fclose(hSym);
-            return -53;
+            return ERROR_PROB_SYM_SEG_DEF_READ;
         }
 
@@ -731 +840 @@
         for (iSym = 0; iSym < SegDef.cSymbols && cLeftToFind; iSym++)
         {
+            IMPORTKRNLSYM * pImport;
             unsigned cchName;
+
             /*
              * Fileoffset of the current symbol.
@@ -784 +895 @@
              * Search proctable.
              */
-            for (i = 0; i < NBR_OF_KRNLIMPORTS; i++)
+            for (i = 0, pImport = &aImportTab[0]; i < NBR_OF_KRNLIMPORTS; i++, pImport++)
             {
-                if (!aImportTab[i].fFound                                     /* Not allready found */
-                    && (aImportTab[i].fType & EPT_BIT_MASK) == fSegEPTBitType /* Equal bittype */
-                    && (fCode || (aImportTab[i].fType & EPT_VARIMPORT))       /* Don't look for code in a data segment and vice versa */
-                    && aImportTab[i].cchName == cchName                       /* Equal name length */
-                    && kstrncmp(aImportTab[i].achName, achBuffer, cchName) == 0  /* Equal name */
+                if (!pImport->fFound                                       /* Not allready found */
+                    && (pImport->fType & EPT_VARIMPORT ? !fCode : fCode)   /* Don't look for code in a data segment */
+                    && pImport->cchName == cchName                         /* Equal name length */
+                    && kstrncmp(pImport->achName, achBuffer, cchName) == 0 /* Equal name */
                     )
                 {   /* Symbol was found */
-                    aImportTab[i].offObject = (SegDef.bFlags & 0x01 ? SymDef32.wSymVal : SymDef16.wSymVal);
-                    aImportTab[i].ulAddress = aImportTab[i].offObject + paKrnlOTEs[iSeg].ote_base;
-                    aImportTab[i].iObject   = (unsigned char)iSeg;
-                    aImportTab[i].usSel     = paKrnlOTEs[iSeg].ote_sel;
+                    pImport->offObject = (SegDef.bFlags & 0x01 ? SymDef32.wSymVal : SymDef16.wSymVal);
+                    pImport->ulAddress = pImport->offObject + paKrnlOTEs[iSeg].ote_base;
+                    pImport->iObject   = (unsigned char)iSeg;
+                    pImport->usSel     = paKrnlOTEs[iSeg].ote_sel;
                     dprintf(("debug: base=%lx, size=%lx iSeg=%d\n", paKrnlOTEs[iSeg].ote_base, paKrnlOTEs[iSeg].ote_size, iSeg));
 
                     /* Paranoia test! */
                     #ifndef EXTRACT
-                    if (aImportTab[i].offObject < paKrnlOTEs[iSeg].ote_size)
+                    if (pImport->offObject < paKrnlOTEs[iSeg].ote_size)
                     {
-                        aImportTab[i].fFound = TRUE;
+                        pImport->fFound = TRUE;
                         cLeftToFind--;
                         dprintf(("Found: %s at off 0x%lx addr 0x%lx, sel=0x%x\n",
-                                 aImportTab[i].achName, aImportTab[i].offObject,
-                                 aImportTab[i].ulAddress, aImportTab[i].usSel));
+                                 pImport->achName, pImport->offObject,
+                                 pImport->ulAddress, pImport->usSel));
                     }
                     else/* test failed, continue on next symbol*/
-                        dprintf(("Error: Paranoia test failed for %s\n", aImportTab[i].achName));;
+                        dprintf(("Error: Paranoia test failed for %s\n", pImport->achName));;
                     #else
-                    aImportTab[i].fFound = TRUE;
+                    pImport->fFound = TRUE;
                     cLeftToFind--;
                     #endif /* !EXTRACT */
@@ -832 +942 @@
      * If not all procedures were found fail.
      */
-    if (cLeftToFind != 0)
-        return -57;
+    for (i = 0; i < NBR_OF_KRNLIMPORTS; i++)
+        if (!aImportTab[i].fFound && !(aImportTab[i].fType & EPT_NOT_REQ))
+            return ERROR_PROB_SYM_IMPORTS_NOTFOUND;
 
     /*
@@ -843 +954 @@
 
 /**
- * Gets the os/2 kernel OTE's (object table entries).
- * @returns   0 on success. Not 0 on error.
+ * Get kernelinformation (OTEs (object table entries), build, type, debug...)
+ * @returns 0 on success.
+ *              options.ulBuild, fchType, fDebug, cObjects and paKrnlOTEs is set on successful return.
+ *          Not 0 on error.
  */
 static int   GetKernelInfo(void)
 {
-#if !defined(DEBUGR3) && !defined(EXTRACT) /* IOCtl not available after inittime! */
-    static KRNLINFO KrnlInfo = {0};
+#if !defined(DEBUGR3) && !defined(EXTRACT) /* This IOCtl is not available after inittime! */
+    static KRNLINFO DATA16_INIT KrnlInfo = {0};
     APIRET          rc;
     HFILE           hDev0 = 0;
     USHORT          usAction = 0;
 
+    /*
+     * Issue an IOCtl to elf$ to query kernel information.
+     */
     rc = DosOpen("\\dev\\elf$", &hDev0, &usAction, 0UL, FILE_NORMAL,
                  OPEN_ACTION_FAIL_IF_NEW | OPEN_ACTION_OPEN_IF_EXISTS,
@@ -863 +979 @@
         if (rc == NO_ERROR)
         {
-            int i;
-
-            /* Set the exported parameters */
-            usBuild  = KrnlInfo.usBuild;
-            fchType  = KrnlInfo.fchType;
-            fDebug   = KrnlInfo.fDebug;
-            cObjects = KrnlInfo.cObjects;
-            paKrnlOTEs = &KrnlInfo.aObjects[0];
             #ifdef DEBUG
-            for (i = 0; i < NBR_OF_KRNLIMPORTS; i++)
+            unsigned i;
+            #endif
+
+            /*
+             * Set the exported parameters
+             */
+            options.ulBuild = KrnlInfo.ulBuild;
+            options.fKernel = KrnlInfo.fKernel;
+            cObjects        = KrnlInfo.cObjects;
+            paKrnlOTEs      = &KrnlInfo.aObjects[0];
+
+            /*
+             * If debugging probkrnl dump kernel OTEs.
+             */
+            #ifdef DEBUG
+            dprintf(("debug: kernel OTE:\n"));
+            for (i = 0; i < cObjects; i++)
                 dprintf(("debug: no.%2d base=%lx size=%lx sel=%x\n",
                          i,
@@ -879 +1003 @@
                          paKrnlOTEs[i].ote_sel));
             #endif
-
         }
         DosClose(hDev0);
@@ -885 +1008 @@
 
     if (rc != NO_ERROR)
-        printf16("Failed to get kernel OTEs\r\n");
+        printf16("Failed to get kernel OTEs. rc=%d\n", rc);
 
     return rc;
@@ -899 +1022 @@
         {
             rc = ReadOS2Krnl(szUsrOS2Krnl);
-            if (rc != 0)
+            if (rc != NO_ERROR)
             {
-                puts("Warning: Invalid kernel file specified. Tries defaults.\n\r");
+                printf16("Warning: Invalid kernel file specified. Tries defaults.\n");
                 szUsrOS2Krnl[0] = '\0';
                 rc = ReadOS2Krnl(szOS2Krnl);
@@ -918 +1041 @@
 /**
  * Shows result of kernelprobing if not quiet or on error.
- * @param     rc          Return code.
- * @param     iSym        index of .sym-file into static struct.
+ * @param   rc      Return code.
+ * @param   iSym    index of .sym-file into static struct.
  */
 #ifndef EXTRACT
@@ -929 +1052 @@
      * Complain even if quiet on error
      */
-    if (!fQuiet || rc != 0)
+    if (!options.fQuiet || rc != NO_ERROR)
     {
         printf16("Win32k - Odin32 support driver.\n");
@@ -936 +1059 @@
          * kernel stuff
          */
-        if (rc <= -50 || rc == 0)
+        if (rc == NO_ERROR || rc > ERROR_PROB_KRNL_LAST)
         {
             #ifdef DEBUGR3
             printf16("    Found kernel:     %s\n", szOS2Krnl);
             #endif
-            printf16("    Build:            %d - v%d.%d\n",
-                     usBuild, usVerMajor, usVerMinor);
-        }
+            printf16("    Build:            %ld - v%d.%d\n",
+                     options.ulBuild, options.usVerMajor, options.usVerMinor);
+        }
+        else if (rc >= ERROR_PROB_KRNL_FIRST)
+            printf16("    Kernel probing failed with rc=%d.\n", rc);
         else
-            printf16("    Kernel probing failed with rc=%d.\n", rc);
+            printf16("    Failed before probing kernel.\n");
 
         /*
          * symbol-file
          */
-        if (rc == 0)
+        if (rc == NO_ERROR || (rc > ERROR_PROB_SYM_LAST && (szUsrSym[0] != '\0' || apszSym[iSym] != NULL)))
             printf16("    Found symbolfile: %s\n",
                      szUsrSym[0] == '\0' ? apszSym[iSym] : szUsrSym);
+        else if (rc >= ERROR_PROB_SYM_FIRST)
+            printf16("    Failed to find symbolfile!\n");
         else
-            printf16("    Failed to find symbolfile! rc=%d\n", rc);
+            printf16("    Failed before searching for symbolfile.\n");
 
         /*
          * function listing
          */
-        for (i = 0; i < NBR_OF_KRNLIMPORTS; i++)
-        {
-            printf16("  %-20s at ",aImportTab[i].achName);
-            if (aImportTab[i].fFound)
-                printf16("0x%08lx%s", aImportTab[i].ulAddress, (i % 2) == 0 ? "" : "\n");
-            else
-                printf16("failed!%s", (i % 2) == 0 ? "" : "\n");
-        }
-        if (i % 2) printf16("\n");
+        if (options.fLogging || rc != NO_ERROR)
+        {
+            for (i = 0; i < NBR_OF_KRNLIMPORTS; i++)
+            {
+                printf16("  %-21s at ", aImportTab[i].achName);
+                if (aImportTab[i].fFound)
+                    printf16("0x%08lx%s", aImportTab[i].ulAddress, (i % 2) == 0 ? "" : "\n");
+                else
+                    printf16("not found!%s", (i % 2) == 0 ? "" : "\n");
+            }
+            if (i % 2) printf16("\n");
+        }
+
+        /*
+         * Display error code.
+         */
+        if (rc != NO_ERROR)
+        {
+            const char *psz = GetErrorMsg(rc);
+            printf16("ProbeKernel failed with rc=%d.\n", rc);
+            if (psz) printf16("%s\n", psz);
+        }
     }
 }
@@ -1003 +1143 @@
                 switch (pReqPack->InitArgs[i])
                 {
+                    #if defined(DEBUGR3)
                     case 'k':
                     case 'K': /* Kernel file */
@@ -1008 +1149 @@
                         i += kargncpy(szUsrOS2Krnl, &pReqPack->InitArgs[i], sizeof(szUsrOS2Krnl));
                         break;
+                    #endif
 
                     case 'n':
                     case 'N': /* NoLoader */
+                        options.fNoLoader = TRUE;
                         return 0;
 
                     case 'q':
                     case 'Q': /* Quiet */
-                        fQuiet = 1;
+                        options.fQuiet = TRUE;
                         break;
 
@@ -1021 +1164 @@
                     case 'S': /* Symbol file */
                         i++;
-                        if (pReqPack->InitArgs[i] == 'Y' || pReqPack->InitArgs[i] == 'y')
+                        if (   pReqPack->InitArgs[i] != 'c' && pReqPack->InitArgs[i] != 'C'
+                            && pReqPack->InitArgs[i] != 'm' && pReqPack->InitArgs[i] != 'M'
+                            ) /* -script and -smp is ignored */
                             i += kargncpy(szUsrSym, &pReqPack->InitArgs[i], sizeof(szUsrSym));
                         break;
@@ -1027 +1172 @@
                     case 'v':
                     case 'V': /* Verbose */
-                        fQuiet = 0;
+                        options.fQuiet = FALSE;
                         break;
                 }
@@ -1044 +1189 @@
     pGIS = MAKEPGINFOSEG(selGIS);
     usBootDrive = pGIS->bootdrive;
-    usVerMajor  = pGIS->uchMajorVersion;
-    usVerMinor  = pGIS->uchMinorVersion;
+#ifndef R3TST
+    options.usVerMajor  = pGIS->uchMajorVersion;
+    options.usVerMinor  = pGIS->uchMinorVersion;
+#else
+    if (usFakeVerMajor == 0)
+    {
+        usFakeVerMajor = pGIS->uchMajorVersion;
+        usFakeVerMinor = pGIS->uchMinorVersion;
+    }
+    options.usVerMajor  = usFakeVerMajor;
+    options.usVerMinor  = usFakeVerMinor;
+#endif
     dprintf(("BootDrive: %d\n", usBootDrive));
 
     /* set driveletter in constants strings */
     usBootDrive = (char)usBootDrive + (char)'a' - 1;
+    #if defined(DEBUGR3)
     szOS2Krnl[0] = (char)usBootDrive;
+    #endif
     for (i = 0; apszSym[i] != NULL; i++)
         apszSym[i][0] = (char)usBootDrive;
@@ -1058 +1215 @@
     /*-----------------*/
     rc = GetKernelInfo();
-    if (rc != NO_ERROR)
-        return rc;
 
     /*--------------*/
@@ -1072 +1227 @@
             if (rc)
             {
-                puts("Warning: Invalid symbol file specified. Tries defaults.\n\r");
+                printf16("Warning: Invalid symbol file specified. Tries defaults.\n");
                 szUsrSym[0] = '\0';
             }
         }
-        if (rc != 0) /* if user sym failed or don't exists. */
+        if (rc != NO_ERROR) /* if user sym failed or don't exists. */
         {
             /*
              * Check database - only if not a debug kernel!
              * You usually have a .sym-file when using a debug kernel.
-             * (Currently I am not able to distinguish between half and all strict kernels...)
+             * (This is because I am unable to distinguish between half and
+             *  all strict kernels...)
              */
-            if (fDebug ||
-                (rc = LookupKrnlEntry((unsigned short)usBuild, 'R', fchType, cObjects)) != 0
+            if ((options.fKernel & KF_DEBUG) ||
+                (rc = LookupKrnlEntry((unsigned short)options.ulBuild,
+                                      (unsigned short)options.fKernel,
+                                      cObjects)
+                 ) != NO_ERROR
                 )
             {
+                #if 1 /* ndef R3TST */
+                APIRET rc2;
                 /* search on disk */
                 i = 0;
-                while (apszSym[i] != NULL && (rc = ProbeSymFile(apszSym[i])) != 0)
+                while (apszSym[i] != NULL
+                       && (rc2 = ProbeSymFile(apszSym[i])) != NO_ERROR
+                       )
+                {
                     i++;
+                    if (rc2 >= ERROR_PROB_SYM_VERIFY_FIRST)
+                        rc = rc2;
+                }
+                if (rc == 1 || rc2 == NO_ERROR)
+                    rc = rc2;
+                #endif
             }
         }
@@ -1099 +1269 @@
     ShowResult(rc, i);
 
+    /* Copy the symbol file name to szUsrSym. */
+    if (szUsrSym[0] == '\0' && apszSym[i] != NULL)
+        kstrcpy(szUsrSym, apszSym[i]);
+
     return rc;
 }
@@ -1113 +1287 @@
     int VerMinor, VerMajor;
 
-    VerMajor = usBuild < 20000 ? 20 : 30/*?*/;
-    VerMinor = usBuild <  6600 ? 10 :  usBuild <  8000 ? 11 : usBuild < 9000 ? 30 :
-               usBuild < 10000 ? 40 :  usBuild < 15000 ? 45 : 50;
-
-    return VerMajor - (int)usVerMajor | VerMinor - (int)usVerMinor;
+    VerMajor = options.ulBuild < 20000 ? 20 : 30/*?*/;
+    VerMinor = options.ulBuild <  6600 ? 10 :  options.ulBuild <  8000 ? 11 : options.ulBuild < 9000 ? 30 :
+               options.ulBuild < 10000 ? 40 :  options.ulBuild < 15000 ? 45 : 50;
+
+    return VerMajor - (int)options.usVerMajor | VerMinor - (int)options.usVerMinor;
 }
 
@@ -1123 +1297 @@
 /**
  * Reads and verifies OS/2 kernel.
- * @returns   0 on success, not 0 on failure.
- * @param     filename   Filename of the OS/2 kernel.
- * @result    usBuild is set.
+ * @returns   0 on success.
+ *            One of the ERROR_PROB_KRNL_* defines on error.
+ * @param     pszFilename   Filename of the OS/2 kernel.
+ * @result    options.ulBuild is set.
  * @remark    This step will be eliminated by searching thru the DOSGROUP datasegment
  *            in the kernel memory. This segment have a string "Internal revision 9.034[smp|uni]"
@@ -1140 +1315 @@
     if (hKrnl != 0)
     {
+        /*
+         * Get size of kernel file.
+         */
         cbKrnl = fsize(hKrnl);
         if (!fseek(hKrnl, 0, SEEK_SET))
+        {
+            /*
+             * Call worker with filehandle and size.
+             */
             rc = ReadOS2Krnl2(hKrnl, cbKrnl);
+        }
         else
-            rc = -2;
+            rc = ERROR_PROB_KRNL_SEEK_SIZE;
         fclose(hKrnl);
     }
@@ -1150 +1333 @@
     {
         dprintf(("Could not open file\n"));
-        rc = -1;
+        rc = ERROR_PROB_KRNL_OPEN_FAILED;
     }
     return rc;
@@ -1159 +1342 @@
  * Worker function for ReadOS2Krnl
  * @returns   0 on success.
- *            errorcodes on failure. (-1 >= rc >= -14)
+ *            One of the ERROR_PROB_KRNL_* defines on error.
  * @param     hKrnl   Handle to the kernel file.
  * @param     cbKrnl  Size of the kernel file.
@@ -1167 +1350 @@
 {
     #if defined(DEBUGR3) || !defined(EXTRACT)
-    static KRNLINFO KrnlInfo = {0};
+    static KRNLINFO DATA16_INIT KrnlInfo = {0};
     #endif
     int            i, j;
@@ -1176 +1359 @@
 
 
-    /* find bldlevel string - "@#IBM:14.020#@  IBM OS/2 Kernel - 14.020F" */
+    /*
+     * Find bldlevel string - for example: "@#IBM:14.020#@  IBM OS/2 Kernel - 14.020F"
+     * Searching the entire file lineary from the start.
+     */
     if (fseek(hKrnl, 0, SEEK_SET))
-        return -2;
+        return ERROR_PROB_KRNL_SEEK_FIRST;
 
     if (!fread(&achBuffer[KERNEL_ID_STRING_LENGTH], 1, KERNEL_READ_SIZE, hKrnl))
-        return -3;
+        return ERROR_PROB_KRNL_READ_FIRST;
 
     i = KERNEL_ID_STRING_LENGTH;
@@ -1191 +1377 @@
             kmemcpy(achBuffer, &achBuffer[KERNEL_READ_SIZE], KERNEL_ID_STRING_LENGTH);
             if (!fread(&achBuffer[KERNEL_ID_STRING_LENGTH], 1, cbKrnl > KERNEL_READ_SIZE ? KERNEL_READ_SIZE : (int)cbKrnl, hKrnl))
-                return -3;
+                return ERROR_PROB_KRNL_READ_NEXT;
 
             i = 0;
@@ -1204 +1390 @@
     }
 
+    /* found it? */
     if (cbKrnl == 0)
     {
         fclose(hKrnl);
-        return -4;
-    }
+        return ERROR_PROB_KRNL_TAG_NOT_FOUND;
+    }
+
+
+    /*
+     * We've found the @#IBM: tag. So now we'll try read it.
+     */
 
     /* displacement */
@@ -1217 +1409 @@
     /* verify signature */
     if (kstrncmp(&achBuffer[i+10+j], "#@  IBM OS/2 Kernel", 19) != 0)
-        return -5;
-
-    /* read usBuild */
-    usBuild  = (char)(achBuffer[i+6] - '0') * 1000;
+        return ERROR_PROB_KRNL_INV_SIGANTURE;
+
+    /*
+     * read options.ulBuild
+     */
+    options.ulBuild  = (char)(achBuffer[i+6] - '0') * 1000;
     if (achBuffer[i+7] != '.')
     {
         /* this code is for Warp5 */
-        usBuild *= 10;
-        usBuild += (char)(achBuffer[i+7] - '0') * 1000;
+        options.ulBuild *= 10;
+        options.ulBuild += (char)(achBuffer[i+7] - '0') * 1000;
         i++;
         j--;
         if (achBuffer[i+7] != '.')
         {
-            usBuild = usBuild * 10;
-            usBuild = usBuild + (unsigned short)(achBuffer[i+7] - '0') * 1000;
+            options.ulBuild *= 10;
+            options.ulBuild += (unsigned long)(achBuffer[i+7] - '0') * 1000;
             i++;
             j--;
@@ -1239 +1433 @@
     if (j == 0)
     {
-        usBuild += (achBuffer[i+ 8] - '0') * 10;
-        usBuild += (achBuffer[i+ 9] - '0') * 1;
+        options.ulBuild += (achBuffer[i+ 8] - '0') * 10;
+        options.ulBuild += (achBuffer[i+ 9] - '0') * 1;
     }
     else
     {
         if (j == 3)
-            return -9;
-        usBuild += (achBuffer[i+ 8] - '0') * 100;
-        usBuild += (achBuffer[i+ 9] - '0') * 10;
-        usBuild += (achBuffer[i+10] - '0');
-    }
-
+            return ERROR_PROB_KRNL_INV_BUILD_NBR;
+        options.ulBuild += (achBuffer[i+ 8] - '0') * 100;
+        options.ulBuild += (achBuffer[i+ 9] - '0') * 10;
+        options.ulBuild += (achBuffer[i+10] - '0');
+    }
+
+    /*
+     * We've read the build number. Let's check that it matches the OS/2
+     * version reported by DosGetInfoSeg.
+     */
     if (VerifyKernelVer())
-        return -9;
-    dprintf(("usBuild: %d\n", usBuild));
+        return ERROR_PROB_KRNL_BUILD_VERSION;
+    dprintf(("options.ulBuild: %d\n", options.ulBuild));
 
     /* get segment number */
     /* read-MZheader */
     if (fseek(hKrnl,0,SEEK_SET))
-        return -2;
+        return ERROR_PROB_KRNL_MZ_SEEK;
 
     if (!fread(achBuffer, 1, 0x40, hKrnl))
-        return -3;
+        return ERROR_PROB_KRNL_MZ_READ;
 
     offLXHdr = *(unsigned long int *)&achBuffer[0x3c];
 
     if (offLXHdr > 0x2000 && offLXHdr < 0x80) /* just to detect garbage */
-        return -6;
+        return ERROR_PROB_KRNL_NEOFF_INVALID;
 
     if (fseek(hKrnl, offLXHdr, SEEK_SET))
-        return -2;
+        return ERROR_PROB_KRNL_NEOFF_SEEK;
 
     if (!fread(achBuffer, 1, sizeof(struct e32_exe), hKrnl))
-        return -3;
+        return ERROR_PROB_KRNL_LX_READ;
 
     /* check LX-magic */
     if (achBuffer[0] != 'L' || achBuffer[1] != 'X')
-        return -7;
+        return ERROR_PROB_KRNL_LX_SIGNATURE;
 
 #if !defined(DEBUGR3) && !defined(EXTRACT)
@@ -1282 +1480 @@
     pLXHdr = (struct e32_exe *)achBuffer;
     if ((UCHAR)pLXHdr->e32_objcnt != cObjects)
-        return -8;
+        return ERROR_PROB_KRNL_OBJECT_CNT;
 
     if (pLXHdr->e32_objcnt < 10)
-        return -9;
-
-    /* check objects (sizes and flags(?)) */
+        return ERROR_PROB_KRNL_OBJECT_CNR_10;
+
+    /* check objects sizes. */
     if (!fseek(hKrnl, (LONG)offLXHdr + (LONG)pLXHdr->e32_objtab, SEEK_SET))
     {
@@ -1294 +1492 @@
         {
             if (!fread(achBuffer, 1, sizeof(OTE), hKrnl))
-                return -11;
+                return ERROR_PROB_KRNL_OTE_READ;
             if (pObj->o32_size < paKrnlOTEs[i].ote_size)
-                return -12;
-
-            #if 0 /* don't work! */
-            if ((pObj->o32_flags & 0xffffUL) != (paKrnlOTEs[i].ote_flags & 0xffffUL))
-                return -14;
-            #endif
+                return ERROR_PROB_KRNL_OTE_SIZE_MIS;
         }
     }
     else
-        return -10;
+        return ERROR_PROB_KRNL_OTE_SEEK;
 #else
     /* Since we can't get the OTEs from the kernel when debugging in RING-3,
@@ -1322 +1515 @@
         for (i = 0; i < (int)cObjects; i++)
             if (!fread(&paKrnlOTEs[i], 1, sizeof(struct o32_obj), hKrnl))
-                return -11;
+                return ERROR_PROB_KRNL_OTE_READ;
     }
     else
-        return -10;
+        return ERROR_PROB_KRNL_OTE_SEEK;
 #endif
 
-    return 0;
+    return NO_ERROR;
 }
 
@@ -1370 +1563 @@
  * Where: n - are the build number 4 or 5 digits.
  *        t - kernel type. R = retail, H = half strict, A = all strict.
- *        m - UNI or SMP.  U = UNI processor kernel. S = SMP processor kernel.
+ *        m - UNI or SMP.  U = UNI processor kernel. S = SMP processor kernel. 4 = Warp 4 FP13+
  * @returns   NO_ERROR on success. Untracable error code on error.
  * @param     pszFilename  Pointer to read only filename of the .sym-file.
@@ -1381 +1574 @@
     APIRET   rc;
     int      cch = kstrlen(pszFilename);
+
+    DosWrite(2, (char*)pszFilename, cch, &rc);
+    DosWrite(2, "\r\n", 2, &rc);
 
     /* Filename check */
@@ -1397 +1593 @@
     }
 
-    /** @remark
-     * All a/h-strict files are currently ignored.
-     * When a debug kernel is used we'll have to use the
-     * .sym-file for it. This is so because I can't distinguish
-     * between a all-strick and a half-strick kernel (yet).
-     */
-    if (pszFilename[cch-6] != 'R')
-        return 0;
-
     /*
      * Probe kernelfile
@@ -1419 +1606 @@
         int i;
 
+        /** @remark
+         * Currently information for retail kernels are usable, but we'll
+         * generate it for the debug kernels too, but this information
+         * is enclaved within an "#ifdef ALLKERNELS ... #endif".
+         */
+        if (pszFilename[cch-6] != 'R')
+            printf16("#ifdef ALLKERNELS\n");
+
         printf16("    { /* %s */\n"
-                 "        %.*s, \'%c\', %s, %d,\n"
+                 "        %.*s, ",
+                 pszFilename,
+                 cch - 6, &pszFilename[0]              /* build number */
+                 );
+
+        switch (pszFilename[cch - 5])
+        {
+            case 'S':   printf16("KF_SMP"); break;
+            case '4':   printf16("KF_UNI | KF_W4"); break;
+            case 'U':   printf16("KF_UNI"); break;
+        }
+        switch (pszFilename[cch - 6])
+        {
+            case 'A':   printf16(" | KF_ALLSTRICT"); break;
+            case 'H':   printf16(" | KF_HALFSTRICT"); break;
+        }
+        printf16(", %d,\n"
                  "        {\n",
-                 pszFilename,
-                 cch - 6, &pszFilename[0],              /* build number */
-                 pszFilename[cch - 6],                  /* Type, A=astrict, H=halfstrict, R=Retail */
-                 pszFilename[cch - 5] == 'S' ?          /* UNI: TYPE_UNI  SMP: TYPE_SMP  W4: TYPE_W4 */
-                    "TYPE_SMP" :  pszFilename[cch - 5] == '4' ? "TYPE_W4" : "TYPE_UNI",
                  aImportTab[0].iObject + 1); /* ASSUMES that DOSCODE32 is the last object. */
 
@@ -1432 +1638 @@
         {
             char *psz = aImportTab[i].achName;
-            printf16("            {%2d, 0x%08lx}, /* %s */\n",
+            printf16("            {%-2d, 0x%08lx}, /* %s */\n",
                      aImportTab[i].iObject,
-                     aImportTab[i].offObject,
+                     aImportTab[i].fFound ? aImportTab[i].offObject : 0xFFFFFFFFUL,
                      (char *)&aImportTab[i].achName[0]
                      );
@@ -1440 +1646 @@
         printf16("        }\n"
                  "    },\n");
+
+        /** @remark
+         * Currently information for retail kernels are usable, but we'll
+         * generate it for the debug kernels too, but this information
+         * is enclaved within an "#ifdef ALLKERNELS ... #endif".
+         */
+        if (pszFilename[cch-6] != 'R')
+            printf16("#endif\n");
     }
     else
@@ -1460 +1674 @@
 {
     APIRET  rc;
-
+    const char *  psz;
 
     /*
      * Set paKrnlOTEs to point to an zeroed array of OTEs.
      */
-    static KRNLINFO KrnlInfo = {0};
+    static KRNLINFO DATA16_INIT  KrnlInfo = {0};
     paKrnlOTEs = &KrnlInfo.aObjects[0];
 
@@ -1474 +1688 @@
          */
         int i;
-        for (i = 0; i < argc; i++)
+        for (i = 1; i < argc; i++)
         {
             rc = processFile(argv[i]);
@@ -1480 +1694 @@
             {
                 printf16("processFile failed with rc=%d for file %s\n",
-                          rc, argv[i]);
+                         rc, argv[i]);
+                if (psz = GetErrorMsg(rc))
+                    printf16("%s\n", psz);
                 return rc;
             }
@@ -1498 +1714 @@
         int         i;
 
-        printf16("/* $Id: probkrnl.c,v 1.20 2000-04-17 01:56:48 bird Exp $\n"
+        printf16("/* $Id: probkrnl.c,v 1.21 2000-09-02 21:07:56 bird Exp $\n"
                  "*\n"
                  "* Autogenerated kernel symbol database.\n"
@@ -1512 +1728 @@
                  "#define INCL_NOBASEAPI\n"
                  "#include <os2.h>\n"
+                 "#include \"DevSegDf.h\"\n"
                  "#include \"probkrnl.h\"\n"
+                 "#include \"options.h\"\n"
                  "\n");
 
-        printf16("KRNLDBENTRY aKrnlSymDB[] = \n"
+        printf16("KRNLDBENTRY DATA16_INIT aKrnlSymDB[] = \n"
                  "{\n");
 
@@ -1528 +1746 @@
                 printf16("processFile failed with rc=%d for file %s\n",
                          rc, &ffb.achName[0]);
+                if (psz = GetErrorMsg(rc))
+                    printf16("%s\n", psz);
                 return rc;
             }
@@ -1537 +1757 @@
 
         printf16("    { /* Terminating entry */\n"
-                 "        0,0,0,0,\n"
+                 "        0,0,0,\n"
                  "        {\n");
         for (i = 0; i < NBR_OF_KRNLIMPORTS; i++)