Changeset 1467 for trunk/src/win32k/dev32/d32init.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/dev32/d32init.c (modified) (19 diffs)

trunk/src/win32k/dev32/d32init.c

@@ -1 @@
-/* $Id: d32init.c,v 1.1 1999-09-06 02:19:56 bird Exp $
+/* $Id: d32init.c,v 1.2 1999-10-27 02:02:54 bird Exp $
  *
  * d32init.c - 32-bits init routines.
@@ -12 +12 @@
 #define MAXSIZE_PROLOG 0x10             /* Note that this must be synced with */
                                         /* the one used in calltab.asm.       */
+#define static
 
 #define INCL_DOSERRORS
@@ -31 +32 @@
 #include "log.h"
 #include "asmutils.h"
-#include "cout.h"
 #include "malloc.h"
 #include "ldr.h"
@@ -58 +58 @@
  * @returns   Status word.
  * @param     pRpInit  Pointer init request packet.
+ * @sketch    Set TKSSBase32.
+ *            Set default parameters.
+ *            Parse command line options.
+ *            Show (kprint) configuration.
+ *            Init heap.
+ *            Init ldr.
+ *            Init procs. (overloaded ldr procedures)
+ * @status    completely implemented.
+ * @author    knut st. osmundsen
  */
 USHORT _loadds _Far32 _Pascal R0Init32(RP32INIT *pRpInit)
@@ -64 +73 @@
     char *pszTmp;
 
-    TKSSBase32 = _TKSSBase16;
+    pulTKSSBase32 = (PULONG)_TKSSBase16;
 
     SET_OPTIONS_TO_DEFAULT(options);
@@ -80 +89 @@
         switch (*pszTmp)
         {
-            case 'C': /* -C[1|2] - com-port no */
+            case 'C': /* -C[1|2] - com-port no, def:-C2 */
                 switch (pszTmp[1])
                 {
@@ -86 +95 @@
                         options.usCom = OUTPUT_COM1;
                         break;
+
                     case '2':
+                    default:
                         options.usCom = OUTPUT_COM2;
-                        break;
                 }
                 break;
 
-            case 'L': /*-L:[Y|N or ]*/
+            case 'L': /* -L[..]<:|=| >[<Y..|E..| > | <N..|D..>] */
                 pszTmp2 = strpbrk(pszTmp, ":=/- ");
-                if (pszTmp2 != NULL && (int)(pszTmp2-pszTmp) < cch-1 && (*pszTmp2 == '=' || *pszTmp2 == ':' || *pszTmp2 == ' ' && (pszTmp2[1] != '-' || pszTmp2[1] != '/')))
-                {
-                    switch (pszTmp2[1])
-                    {
-                        case 'D': /*disable*/
-                            options.fLogging = FALSE;
-                            break;
-                        case 'E': /*enable*/
-                            options.fLogging = TRUE;
-                            break;
-                        case 'Y': /*yes*/
-                            options.fLogging = TRUE;
-                            break;
-                        case 'N': /*no*/
-                            options.fLogging = FALSE;
-                            break;
-                    }
-                }
+                if (pszTmp2 != NULL && (int)(pszTmp2-pszTmp) < cch-1
+                    && (pszTmp2[1] == 'N' ||pszTmp2[1] == 'n' || pszTmp2[1] == 'D' || pszTmp2[1] == 'd')
+                    )
+                    options.fLogging = FALSE;
                 else
                     options.fLogging = TRUE;
@@ -126 +122 @@
 
             case 'V': /* verbose initialization */
-                options.fQuiet = TRUE;
+                options.fQuiet = FALSE;
                 break;
 
@@ -164 +160 @@
      * init sub-parts
      */
-
     /* heap */
     if (heapInit(HEAP_SIZE) != NO_ERROR)
         return STATUS_DONE | STERR | ERROR_I24_QUIET_INIT_FAIL;
-
-    /* cout init */
-    coutInit(options.usCom);
 
     /* loader */
@@ -201 +193 @@
         {
             kprintf(("VerifyProcTab32: procedure no.%d was not found!\n", i));
-            return 1;
-        }
-
-        /* verify read/writeable. - NOT IMPLEMENTED (yet) */
+            return STATUS_DONE | STERR | 1;
+        }
+
+        /* verify read/writeable. - FIXME */
+        if (_aProcTab[i].ulAddress < 0xffe00000UL)
+        {
+            kprintf(("VerifyProcTab32: procedure no.%d has an invlalid address, %#08x!\n",
+                     i, _aProcTab[i].ulAddress));
+            return STATUS_DONE | STERR | 2;
+        }
 
         /* verify known function prolog. (only EPT_PROC) */
@@ -212 +210 @@
             {
                 kprintf(("VerifyProcTab32: verify failed for procedure no.%d\n",i));
-                return 2;
+                return STATUS_DONE | STERR | 3;
             }
         }
@@ -218 +216 @@
         {
             kprintf(("VerifyProcTab32: only EPT_PROC is implemented\n",i));
-            return 3;
-        }
-    }
-
-    return 0;
+            return STATUS_DONE | STERR | 4;
+        }
+    }
+
+    return STATUS_DONE;
 }
 
@@ -228 +226 @@
 /**
  * Get kernel OTEs
- * @returns   0 if ok. !0 on failiure.
+ * @returns   Strategy return code:
+ *            STATUS_DONE on success.
+ *            STATUS_DONE | STERR | errorcode on failure.
  * @param     pOTEBuf  Pointer to output buffer.
+ * @status    completely implemented and tested.
+ * @author    knut st. osmundsen
  * @remark    Called from IOCtl.
  */
@@ -271 +273 @@
         kprintf(("GetOTEs32: failed. usRc = %d\n", usRc));
 
-    return usRc;
+    return usRc | (usRc != 0 ? STATUS_DONE | STERR : STATUS_DONE);
 }
 
@@ -292 +294 @@
      *     push ebp
      *     mov ebp,esp
+     *  or
+     *     push ebp
+     *     mov ecx, dword ptr [123407452]
      */
 
-    if (p[0] == 0x55 && p[1] == 0x8b && p[2] == 0xec)
-    {
-        rc = 3;
+    if (p[0] == 0x55 && p[1] == 0x8b)
+    {
+        if (p[2] == 0xec)
+            rc = 3;
+        else
+            rc = 1;
         while (rc < 5)
         {
@@ -308 +316 @@
                 case 0x33: /* xor (ldrClose, ldrOpen) */
                     rc +=2;
+                    break;
+                case 0x8b:
+                    if (p[rc+1] == 0x0d)
+                        rc += 6;
+                    else
+                        rc += 2; /*????!*/
                     break;
                 case 0x8d: /* lea (ldrRead) */
@@ -341 +355 @@
     for (i = 0; i < NUMBER_OF_PROCS; i++)
     {
-        if ((cb = interpretFunctionProlog((char*)_aProcTab[i].ulAddress)) <= 0 && cb + 5 >= MAXSIZE_PROLOG)
-        {
-            kprintf(("rehookFunctions: verify failed for procedure no.%d\n", i));
+        cb = interpretFunctionProlog((char*)_aProcTab[i].ulAddress);
+        if (cb <= 0 || cb + 5 >= MAXSIZE_PROLOG)
+        {
+            kprintf(("rehookFunctions: verify failed for procedure no.%d, cb=%d\n", i, cb));
             return 1;
         }
@@ -369 +384 @@
 
             /* copy function prolog */
-            memcpy(callTab[i], (char*)_aProcTab[i].ulAddress, cb);
+            memcpy(callTab[i], (void*)_aProcTab[i].ulAddress, (size_t)cb);
 
             /* jump from calltab to original function */
@@ -386 +401 @@
             return 1;
         }
-        i++;
     }