Changeset 5224 for trunk/src/win32k/dev32/d32init.c

Timestamp:

Feb 21, 2001, 8:47:59 AM (25 years ago)

Author:

bird

Message:

CallGate changes.

File:

• trunk/src/win32k/dev32/d32init.c (modified) (14 diffs)

trunk/src/win32k/dev32/d32init.c

@@ -1 @@
-/* $Id: d32init.c,v 1.36 2001-02-20 04:58:33 bird Exp $
+/* $Id: d32init.c,v 1.37 2001-02-21 07:44:57 bird Exp $
  *
  * d32init.c - 32-bits init routines.
@@ -175 +175 @@
             case 'E':/* Elf or EXe */
                 pszTmp2 = strpbrk(pszTmp, ":=/- ");
-                if (pszTmp[1] != 'x' && pszTmp != 'X')
+                if (pszTmp[1] != 'x' && pszTmp[1] != 'X')
                 {
                     options.fElf = !(pszTmp2 != NULL
@@ -414 +414 @@
     #endif
 
+    /* callgate */
+    if ((rc = InitCallGate()) != NO_ERROR)
+    {
+        kprintf(("R0Init32: InitCallGate failed with rc=%d\n", rc));
+        return (USHORT)rc;
+    }
+
 
     /*
@@ -436 +443 @@
         kprintf(("data segment lock failed with with rc=%d\n", rc));
 
-    /* 16-bit data segment - is this really necessary? */
+    /* 16-bit data segment - is this really necessary? - no!!! */
+    #if 0 /* This should not be necessary!!! it's allocated from the kernel resident heap if I am not much mistaken. */
     memset(SSToDS(&lockhandle), 0, sizeof(lockhandle));
     rc = D32Hlp_VMLock2(&DATA16START,
@@ -444 +452 @@
     if (rc != NO_ERROR)
         kprintf(("16-bit data segment lock failed with with rc=%d\n", rc));
+    #endif
 
     return NO_ERROR;
@@ -592 +601 @@
                                 if ((*psz >= 'A' && *psz <= 'E') || (*psz >= 'a' && *psz <= 'e'))
                                 {
-                                    pKrnlInfo->fKernel = (*psz - (*psz >= 'a' ? 'a'-1 : 'A'-1)) << KF_REV_SHIFT;
+                                    pKrnlInfo->fKernel = (USHORT)((*psz - (*psz >= 'a' ? 'a'-1 : 'A'-1)) << KF_REV_SHIFT);
                                     psz++;
                                 }
@@ -904 +913 @@
                 /* fixed five byte instructions */
                 case 0xe8:              /* call imm32 */
-                    pach =+ 4;
-                    cb =+ 4;
+                    pach += 4;
+                    cb += 4;
                     break;
 
@@ -1273 +1282 @@
     int     cbmax;
     char *  pchCTEntry;                 /* Pointer to current calltab entry. */
+    ULONG   flWP;                       /* CR0 WP flag restore value. */
 
     /*
@@ -1327 +1337 @@
      */
     pchCTEntry = &callTab[0];
+    flWP = x86DisableWriteProtect();
     for (i = 0; i < NBR_OF_KRNLIMPORTS; i++)
     {
@@ -1366 +1377 @@
                     kprintf(("ImportTabInit: FATAL verify failed for procedure no.%d when rehooking it!\n", i));
                     Int3(); /* ipe - later! */
+                    x86RestoreWriteProtect(flWP);
                     return ERROR_D32_IPE | (i << ERROR_D32_PROC_SHIFT) | ERROR_D32_PROC_FLAG;
                 }
@@ -1412 +1424 @@
                     kprintf(("ImportTabInit: FATAL verify failed for procedure no.%d when rehooking it!\n", i));
                     Int3(); /* ipe - later! */
+                    x86RestoreWriteProtect(flWP);
                     return ERROR_D32_IPE | (i << ERROR_D32_PROC_SHIFT) | ERROR_D32_PROC_FLAG;
                 }
@@ -1444 +1457 @@
                     kprintf(("ImportTabInit: FATAL verify failed for procedure no.%d when importing it!\n", i));
                     Int3(); /* ipe - later! */
+                    x86RestoreWriteProtect(flWP);
                     return ERROR_D32_IPE | (i << ERROR_D32_PROC_SHIFT) | ERROR_D32_PROC_FLAG;
                 }
@@ -1480 +1494 @@
                     kprintf(("ImportTabInit: FATAL verify failed for procedure no.%d when importing it!\n", i));
                     Int3(); /* ipe - later! */
+                    x86RestoreWriteProtect(flWP);
                     return ERROR_D32_IPE | (i << ERROR_D32_PROC_SHIFT) | ERROR_D32_PROC_FLAG;
                 }
@@ -1517 +1532 @@
                 kprintf(("ImportTabInit: unsupported type. (procedure no.%d, cb=%d)\n", i, cb));
                 Int3(); /* ipe - later! */
+                x86RestoreWriteProtect(flWP);
                 return ERROR_D32_IPE | (i << ERROR_D32_PROC_SHIFT) | ERROR_D32_PROC_FLAG;
         } /* switch - type */
     }   /* for */
+
+    x86RestoreWriteProtect(flWP);
 
     return NO_ERROR;