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

Timestamp:

Oct 27, 1999, 4:03:01 AM (26 years ago)

Author:

bird

Message:

Corrections to make win32k work.
(And now it does work, at least at my test machine...)

File:

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

trunk/src/win32k/dev16/probkrnl.c

@@ -1 @@
-/* $Id: probkrnl.c,v 1.1 1999-09-06 02:19:55 bird Exp $
+/* $Id: probkrnl.c,v 1.2 1999-10-27 02:02:53 bird Exp $
  *
  * Description:   Autoprobes the os2krnl file and os2krnl[*].sym files.
@@ -13 +13 @@
  *                How this works:
  *                1. parses the device-line parameters and collects some "SysInfo".
- *                2. gets the kernel object table. (win32i$)
+ *                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.
- *                5. the entry points are verified. (win32i$)
+ *                5. the entry points are verified. (elf$)
  *                6. finished.
  *
@@ -29 +29 @@
 #ifdef DEBUGR3
     #if 1
+        int printf(const char *, ...);
         #define dprintf(a) printf a
     #else
@@ -35 +36 @@
 #else
     #define dprintf(a)
+    #define static
 #endif
 
@@ -125 +127 @@
 static char szMsg1[]     = "\n\r\tFound kernel: ";
 static char szMsg1a[]    = "\n\r\tBuild: ";
-static char szMsg2[]     = "\n\r\n\r\tFound symbolfile: ";
+static char szMsg2[]     = "\n\r\tFound symbolfile: ";
 static char szMsg4[]     = "\n\r\tFailed to find symbolfile!\n\r";
 static char szMsgfailed[]= "failed!";
@@ -311 +313 @@
 
 /**
- * kstrlen - String length
- * @returns   length of string
- * @param     p  Pointer to string
- */
-static int kstrlen(const char * p)
-{
-    int len = 0;
-    while ( p[len++] != '\0');
-    return len-1;
+ * kstrlen - String length.
+ * @returns   Length of the string.
+ * @param     psz  Pointer to string.
+ * @status    completely implemented and tested.
+ * @author    knut st. osmundsen
+ */
+static int kstrlen(const char * psz)
+{
+    int cch = 0;
+    while (psz[cch] != '\0')
+        cch++;
+    return cch;
 }
 
@@ -381 +386 @@
     USHORT          usAction = 0;
 
-    rc = DosOpen("\\dev\\win32i$", &hDev0, &usAction, 0UL, FILE_NORMAL,
+    rc = DosOpen("\\dev\\elf$", &hDev0, &usAction, 0UL, FILE_NORMAL,
                  OPEN_ACTION_FAIL_IF_NEW | OPEN_ACTION_OPEN_IF_EXISTS,
                  OPEN_SHARE_DENYNONE | OPEN_ACCESS_READONLY,
@@ -430 +435 @@
     /* read header and display it */
     rc = fread(&MapDef, sizeof(MAPDEF), 1, SymFile);
-    if ( rc )
+    if (rc)
     {
         Buffer[0] = MapDef.achModName[0];
@@ -591 +596 @@
 }
 
-/* Worker function for ReadOS2Krnl */
+/**
+ * Worker function for ReadOS2Krnl
+ * @returns   0 on success.
+ *            errorcodes on failure. (-1 >= rc >= -14)
+ * @param
+ * @equiv
+ * @time
+ * @sketch
+ * @status
+ * @author    knut st. osmundsen
+ * @remark
+ */
 static int ReadOS2Krnl2(HFILE krnl, unsigned long  cbKrnl)
 {
@@ -722 +738 @@
             if (pObj->o32_size < KrnlOTEs.aObjects[i].ote_size)
                 return -12;
+
+            #if 0 /* don't work! */
             if ((pObj->o32_flags & 0xffffUL) != (KrnlOTEs.aObjects[i].ote_flags & 0xffffUL))
                 return -14;
+            #endif
         }
     }
@@ -764 +783 @@
     USHORT          usAction = 0;
 
-    rc = DosOpen("\\dev\\win32i$", &hDev0, &usAction, 0UL, FILE_NORMAL,
+    rc = DosOpen("\\dev\\elf$", &hDev0, &usAction, 0UL, FILE_NORMAL,
                  OPEN_ACTION_FAIL_IF_NEW | OPEN_ACTION_OPEN_IF_EXISTS,
                  OPEN_SHARE_DENYNONE | OPEN_ACCESS_READONLY,
@@ -779 +798 @@
     return rc;
 #else
+    KrnlOTEs.cObjects = 23;
     return 0;
 #endif
@@ -857 +877 @@
 
         /* functions */
-        if (rc > -50)
+        if (rc == 0)
         {
             puts(szMsg2);