Changeset 2836 for trunk/src/win32k/dev16

Timestamp:

Feb 21, 2000, 5:45:47 AM (26 years ago)

Author:

bird

Message:

ProbKrnl and code for importing krnl symbols has been enhanched.
Now we'll lock 32-bit segments into memory too.
And some other fixes...

Location:

trunk/src/win32k/dev16

Files:

• d16init.c (modified) (8 diffs)
• d16strat.c (modified) (3 diffs)
• probkrnl.c (modified) (9 diffs)

trunk/src/win32k/dev16/d16init.c

@@ -1 @@
-/* $Id: d16init.c,v 1.4 1999-11-10 01:45:30 bird Exp $
+/* $Id: d16init.c,v 1.5 2000-02-21 04:45:45 bird Exp $
  *
  * d16init - init routines for both drivers.
@@ -48 +48 @@
  * @remark    pRpIn and pRpOut points to the same memory.
  */
-USHORT _near dev0Init(PRPINITIN pRpIn, PRPINITOUT pRpOut)
+USHORT NEAR dev0Init(PRPINITIN pRpIn, PRPINITOUT pRpOut)
 {
     Device_Help = pRpIn->DevHlpEP;
@@ -70 +70 @@
  * @remark    pRpIn and pRpOut points to the same memory.
  */
-USHORT _near dev1Init(PRPINITIN pRpIn, PRPINITOUT pRpOut)
+USHORT NEAR dev1Init(PRPINITIN pRpIn, PRPINITOUT pRpOut)
 {
     APIRET          rc;
@@ -103 +103 @@
             }
             else
-                npszErrMsg = "DosDevIOCtl failed.\n\r";
+            {
+                APIRET rc2 = rc;
+                NPSZ   npsz;
+                            /*0123456789012345678901234567890 1*/
+                npszErrMsg = "DosDevIOCtl failed. rc=       \n\r";
+
+                npsz  = &npszErrMsg[29];
+                do
+                {
+                    *npsz-- = (char)((rc2 % 10) + '0');
+                    rc2 = rc2/10;
+                } while (rc2 > 0);
+            }
+
             DosClose(hDev0);
         }
@@ -133 +146 @@
  * @param     pRp  Generic IO Control request packet.
  */
-USHORT R0Init16(PRP_GENIOCTL pRp)
+USHORT NEAR R0Init16(PRP_GENIOCTL pRp)
 {
     USHORT usRc = STATUS_DONE;
     APIRET rc;
-    PDOSTABLE  pDT;
-    PDOSTABLE2 pDT2;
 
     /* First we're to get the DosTable2 stuff. */
-    rc = DevHelp_GetDOSVar(9, 0, &pDT);
+    rc = initGetDosTableData();
     if (rc == NO_ERROR)
     {
@@ -150 +161 @@
         ULONG ulLinData;
 
-        pDT2 = (PDOSTABLE2)((char FAR *)pDT + pDT->cul*4 + 1);
-        TKSSBase16 = (ULONG)pDT2->pTKSSBase;
-        R0FlatCS16 = (USHORT)pDT2->R0FlatCS;
-        R0FlatDS16 = (USHORT)pDT2->R0FlatDS;
         if (!DevHelp_VirtToLin(SELECTOROF(pRp->ParmPacket), OFFSETOF(pRp->ParmPacket), &ulLinParm)
             &&
@@ -159 +166 @@
             )
         {
-            if (!(rc = DevHelp_VMLock(VMDHL_LONG | VMDHL_WRITE | VMDHL_VERIFY,
+            if (!(rc = DevHelp_VMLock(VMDHL_LONG | VMDHL_WRITE,
                                 ulLinParm, sizeof(D16R0INITPARAM),
                                 (LIN)~0UL, SSToDS_16(&hLockParm[0]), &cPages))
                 &&
-                !DevHelp_VMLock(VMDHL_LONG | VMDHL_WRITE | VMDHL_VERIFY,
+                !DevHelp_VMLock(VMDHL_LONG | VMDHL_WRITE,
                                 ulLinData, sizeof(D16R0INITDATA),
                                 (LIN)~0UL, SSToDS_16(&hLockData[0]), &cPages)
@@ -215 +222 @@
     return usRc;
 }
+
+
+
+/**
+ * Gets the data we need from the DosTables.
+ * This data is TKSSBase16, R0FlatCS16 and R0FlatDS16.
+ * @returns   Same as DevHelp_GetDosVar.
+ * @status    completely implemented.
+ * @author    knut st. osmundsen (knut.stange.osmundsen@pmsc.no)
+ * @remark    If you are not sure if TKSSBase16 is set or not, call this.
+ *            After R0Init16 is called TKSSBase16 _is_ set.
+ *            IMPORTANT! This function must _not_ be called after the initiation of the second device driver!!!
+ */
+USHORT NEAR initGetDosTableData(void)
+{
+    APIRET     rc;
+    PDOSTABLE  pDT;
+    PDOSTABLE2 pDT2;
+
+    if (TKSSBase16 != 0)
+        return NO_ERROR;
+
+    /* First we're to get the DosTable2 stuff. */
+    rc = DevHelp_GetDOSVar(9, 0, &pDT);
+    if (rc == NO_ERROR)
+    {
+        pDT2 = (PDOSTABLE2)((char FAR *)pDT + pDT->cul*4 + 1);
+        TKSSBase16 = (ULONG)pDT2->pTKSSBase;
+        R0FlatCS16 = (USHORT)pDT2->R0FlatCS;
+        R0FlatDS16 = (USHORT)pDT2->R0FlatDS;
+    }
+    return rc;
+}

trunk/src/win32k/dev16/d16strat.c

@@ -1 @@
-/* $Id: d16strat.c,v 1.5 2000-02-20 04:27:22 bird Exp $
+/* $Id: d16strat.c,v 1.6 2000-02-21 04:45:45 bird Exp $
  *
  * d16strat.c - 16-bit strategy routine, device headers, device_helper (ptr)
@@ -145 +145 @@
             {
                 ULONG ulLin;
+                if (fInitTime && TKSSBase16 == 0)
+                    initGetDosTableData();
                 if (DevHelp_VirtToLin(SELECTOROF(pRp->DataPacket), OFFSETOF(pRp->DataPacket),
                                       &ulLin) != NO_ERROR)
@@ -153 +155 @@
             case D16_IOCTL_VERIFYPROCTAB:
                 if (fInitTime)
+                {
+                    if (TKSSBase16 == 0)
+                        initGetDosTableData();
                     return CallVerifyImportTab32();
+                }
                 break;
         }

trunk/src/win32k/dev16/probkrnl.c

@@ -1 @@
-/* $Id: probkrnl.c,v 1.12 2000-02-20 04:27:23 bird Exp $
+/* $Id: probkrnl.c,v 1.13 2000-02-21 04:45:45 bird Exp $
  *
  * Description:   Autoprobes the os2krnl file and os2krnl[*].sym files.
@@ -157 +157 @@
 *   Internal Functions                                                         *
 *******************************************************************************/
+/* File an output replacements */
 static HFILE    fopen(const char * pszFilename, const char * pszIgnored);
 static int      fread(void * pvBuffer, USHORT cbBlock, USHORT cBlock,  HFILE hFile);
@@ -163 +164 @@
 static void     puts(char *psz);
 
+/* C-library replacements. */
 static void     kmemcpy(char *psz1, const char *psz2, int cch);
 static char *   kstrstr(const char *psz1, const char *psz2);
 static int      kstrcmp(const char *psz1, const char *psz2);
 static int      kstrncmp(const char *psz1, const char *psz2, int cch);
+static int      kstrnicmp(const char *psz1, const char *psz2, int cch);
 static int      kstrlen(const char *psz);
 static int      kargncpy(char *pszTarget, const char *pszArg, unsigned cchMaxlen);
 
+/* Workers */
 static int      VerifyPrologs(void);
 static int      ProbeSymFile(char *pszFilename);
@@ -177 +181 @@
 static int      GetKernelOTEs(void);
 
+/* Ouput */
 static void     ShowDecNumber(unsigned long ul);
 static void     ShowHexNumber(unsigned long ul);
@@ -338 +343 @@
 
 
-
 /**
  * kstrncmp - String 'n' compare.
@@ -360 +364 @@
 
 
+#if 0 /* not in use */
+/**
+ * kstrnicmp - String 'n' compare, case-insensitive.
+ * @returns   0 - equal else !0
+ * @param     p1  String 1
+ * @param     p2  String 2
+ * @param     len length
+ */
+static int      kstrnicmp(const char *psz1, const char *psz2, int cch)
+{
+    register char ch1, ch2;
+
+    do
+    {
+        ch1 = *psz1++;
+        if (ch1 >= 'A' && ch1 <= 'Z')
+            ch1 += 'a' - 'A';           /* to lower case */
+        ch2 = *psz2++;
+        if (ch2 >= 'A' && ch2 <= 'Z')
+            ch2 += 'a' - 'A';           /* to lower case */
+    } while (--cch > 0 && ch1 == ch2 && ch1 != '\0' && ch2 != '\0');
+
+    return ch1 - ch2;
+}
+#endif
+
+
 /**
  * kstrlen - String length.
@@ -431 +462 @@
 
 /*******************************************************************************
-*   Implementation Of The Important Function                                   *
+*   Implementation Of The Important Functions                                  *
 *******************************************************************************/
 
@@ -727 +758 @@
  * @param     filename   Filename of the OS/2 kernel.
  * @result    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]"
+ *            This would be much faster than reading the kernel file. It will also give us a more precise
+ *            answer to the question! This is currently a TODO issue. !FIXME!
  */
 static int ReadOS2Krnl(char * pszFilename)
@@ -1117 +1152 @@
                     case 'S': /* Symbol file */
                         i++;
-                        i += kargncpy(szUsrSym, &pReqPack->InitArgs[i], sizeof(szUsrSym));
+                        if (pReqPack->InitArgs[i] == 'Y' || pReqPack->InitArgs[i] == 'y')
+                            i += kargncpy(szUsrSym, &pReqPack->InitArgs[i], sizeof(szUsrSym));
                         break;