Changeset 1467 for trunk/src/win32k/dev16

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...)

Location:

trunk/src/win32k/dev16

Files:

• d16init.c (modified) (6 diffs)
• d16strat.c (modified) (7 diffs)
• probkrnl.c (modified) (13 diffs)

trunk/src/win32k/dev16/d16init.c

@@ -1 @@
-/* $Id: d16init.c,v 1.1 1999-09-06 02:19:55 bird Exp $
+/* $Id: d16init.c,v 1.2 1999-10-27 02:02:53 bird Exp $
  *
  * d16init - init routines for both drivers.
@@ -33 +33 @@
 #include <memory.h>
 
+#include "probkrnl.h"
 #include "dev1632.h"
 #include "dev16.h"
-
 
 /**
@@ -61 +61 @@
 /**
  * init function - device 1.
- * We will send an IOCtl request to the win32i$ (device 0) which will
+ * We will send an IOCtl request to the elf$ (device 0) which will
  * perform the Ring-0 initiation of the driver.
  * @returns   Status word.
@@ -77 +77 @@
     NPSZ            npszErrMsg = NULL;
 
-    rc = DosOpen("\\dev\\win32i$", &hDev0, &usAction, 0UL, FILE_NORMAL,
-                 OPEN_ACTION_FAIL_IF_NEW | OPEN_ACTION_OPEN_IF_EXISTS,
-                 OPEN_SHARE_DENYNONE | OPEN_ACCESS_READONLY,
-                 0UL);
+    rc = ProbeKernel(pRpIn);
     if (rc == NO_ERROR)
     {
-        param.pRpInitIn = pRpIn;
-        rc = DosDevIOCtl(&data, &param, D16_IOCTL_RING0INIT, D16_IOCTL_CAT, hDev0);
-/*        _asm int 3; */
+        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,
+                     0UL);
         if (rc == NO_ERROR)
         {
-            if (data.Status != STATUS_DONE)
-                npszErrMsg = "Ring-0 initiation failed\n\r";
+            param.pRpInitIn = pRpIn;
+            rc = DosDevIOCtl(&data, &param, D16_IOCTL_RING0INIT, D16_IOCTL_CAT, hDev0);
+            if (rc == NO_ERROR)
+            {
+                if (data.Status != STATUS_DONE)
+                    npszErrMsg = "Ring-0 initiation failed\n\r";
+                else
+                {
+                    register NPSZ npsz = "Win32k.sys succesfully initiated!\n\r";
+                    DosPutMessage(1, strlen(npsz)+1, npsz);
+                    pRpOut->Status = data.Status;
+                }
+            }
             else
-            {
-                register NPSZ npsz = "Test.sys succesfully initiated!\n\r";
-                DosPutMessage(1, strlen(npsz)+1, npsz);
-                pRpOut->Status = data.Status;
-            }
+                npszErrMsg = "DosDevIOCtl failed.\n\r";
+            DosClose(hDev0);
         }
         else
-            npszErrMsg = "DosDevIOCtl failed\n\r";
-        DosClose(hDev0);
+            npszErrMsg = "DosOpen failed.\n\r";
     }
     else
-        npszErrMsg = "DosOpen failed\n\r";
-
+        npszErrMsg = "ProbeKernel failed.\n\r";
     pRpOut->BPBArray = NULL;
     pRpOut->CodeEnd = (USHORT)&CODE16END;
@@ -144 +148 @@
 
         pDT2 = (PDOSTABLE2)((char FAR *)pDT + pDT->cul*4 + 1);
-        TKSSBase16 = pDT2->TKSSBase;
+        TKSSBase16 = (ULONG)pDT2->pTKSSBase;
         R0FlatCS16 = (USHORT)pDT2->R0FlatCS;
         R0FlatDS16 = (USHORT)pDT2->R0FlatDS;
@@ -169 +173 @@
                    )
                 {
-                    /*_asm int 3;*/
                     usRc = CallR0Init32(SSToDS_16(&rp32init));
-                    /*_asm int 3;*/
                 }
                 else
                     usRc |= ERROR_I24_INVALID_PARAMETER;
 
-             ((PD16R0INITDATA)pRp->DataPacket)->Status = usRc;
+                ((PD16R0INITDATA)pRp->DataPacket)->Status = usRc;
 
                 /* finished - unlock data and parm */

trunk/src/win32k/dev16/d16strat.c

@@ -1 @@
-/* $Id: d16strat.c,v 1.1 1999-09-06 02:19:55 bird Exp $
+/* $Id: d16strat.c,v 1.2 1999-10-27 02:02:53 bird Exp $
  *
  * d16strat.c - 16-bit strategy routine, device headers, device_helper (ptr)
@@ -36 +36 @@
 {
     {
-        (unsigned long)(void _far *)(&aDevHdrs[1]),    /* NextHeader */
+        (unsigned long)(void _far *)(&aDevHdrs[1]), /* NextHeader */
         DEVLEV_3 | DEV_30 | DEV_CHAR_DEV,           /* SDevAtt */
         (unsigned short)(void _near *)strategyAsm0, /* StrategyEP */
         0,                                          /* InterruptEP */
-        "win32i$ ", /* Later: elf ?*/               /* DevName */
+        "elf$    ",                                 /* DevName */
         0,                                          /* SDevProtCS */
         0,                                          /* SDevProtDS */
@@ -67 +67 @@
 USHORT  R0FlatCS16  = 0;
 USHORT  R0FlatDS16  = 0;
+BOOL    fInitTime   = TRUE;
 
 
@@ -79 +80 @@
  * Strategy routine.
  * @returns   Status word.
- * @param     pRpH   Pointer to request packed header.
+ * @param     pRpH   Pointer to request packed header. (Do not change the pointer!)
  * @parma     usDev  Device number.
  * @remark    This function is called from the entrypoint in dev1st.asm
@@ -85 +86 @@
 USHORT NEAR strategy(PRPH pRpH, unsigned short usDev)
 {
+
     switch (pRpH->Cmd)
     {
         case CMDInit:                   /* INIT command */
-            if (usDev == 0)
-                return dev0Init((PRPINITIN)pRpH, (PRPINITOUT)pRpH);
-            else
-                return dev1Init((PRPINITIN)pRpH, (PRPINITOUT)pRpH);
+            if (fInitTime)
+            {
+                if (usDev == 0)
+                    return dev0Init((PRPINITIN)pRpH, (PRPINITOUT)pRpH);
+                else
+                    return dev1Init((PRPINITIN)pRpH, (PRPINITOUT)pRpH);
+            }
+            break;
 
         case CMDGenIOCTL:               /* Generic IOCTL */
@@ -104 +110 @@
         case CMDShutdown:
             return STATUS_DONE;
+    }
 
-        default:
-            return STATUS_DONE | STATUS_ERR_UNKCMD;
-    }
+    return STATUS_DONE | STATUS_ERR_UNKCMD;
 }
 
@@ -121 +126 @@
 USHORT dev0GenIOCtl(PRP_GENIOCTL pRp)
 {
-/*    _asm int 3;*/
-    if (pRp->Category == D16_IOCTL_CAT && pRp->Function == D16_IOCTL_RING0INIT)
-        return R0Init16(pRp);
+    USHORT rc;
+    if (pRp->Category == D16_IOCTL_CAT)
+    {
+        switch (pRp->Function)
+        {
+            case D16_IOCTL_RING0INIT:
+                if (fInitTime)
+                {
+                    rc = R0Init16(pRp);
+                    fInitTime = FALSE;
+                    return rc;
+                }
+                break;
+
+            case D16_IOCTL_GETKRNLOTES:
+            {
+                ULONG ulLin;
+                if (DevHelp_VirtToLin(SELECTOROF(pRp->DataPacket), OFFSETOF(pRp->DataPacket), &ulLin) != NO_ERROR)
+                    return STATUS_DONE | STERR | ERROR_I24_INVALID_PARAMETER;
+                return CallGetOTEs32(ulLin);
+            }
+
+            case D16_IOCTL_VERIFYPROCTAB:
+                if (fInitTime)
+                    return CallVerifyProcTab32();
+                break;
+        }
+    }
 
     return STATUS_DONE | STERR | ERROR_I24_INVALID_PARAMETER;

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);