Changeset 4117 for branches/GRACE/src/win32k/dev32

Timestamp:

Aug 30, 2000, 6:11:33 AM (25 years ago)

Author:

bird

Message:

Corrected more JAVA problems. (now working)
In that case an new function was imported. This wasn't present in SMP Warp 3
kernels, so a not requied, EPT_NOT_REQ, flag was introduced. (But, the
new function turned out to be unneeded.)

File:

• branches/GRACE/src/win32k/dev32/d32init.c (modified) (11 diffs)

branches/GRACE/src/win32k/dev32/d32init.c

@@ -1 @@
-/* $Id: d32init.c,v 1.19.4.11 2000-08-28 22:44:21 bird Exp $
+/* $Id: d32init.c,v 1.19.4.12 2000-08-30 04:11:28 bird Exp $
  *
  * d32init.c - 32-bits init routines.
@@ -76 +76 @@
 void            R3TstFixImportTab(void);
 #endif
+PSZ SECCALL     nopSecPathFromSFN(SFN hFile);
 
 
@@ -1054 +1055 @@
         if (!_aImportTab[i].fFound)
         {
-            kprintf(("VerifyImportTab32: procedure no.%d was not fFound!\n", i));
-            return STATUS_DONE | STERR | ERROR_D32_PROC_NOT_FOUND;
+            if (_aImportTab[i].fType & EPT_NOT_REQ)
+                continue;
+            else
+            {
+                kprintf(("VerifyImportTab32: procedure no.%d was not fFound!\n", i));
+                return STATUS_DONE | STERR | ERROR_D32_PROC_NOT_FOUND;
+            }
         }
 
@@ -1076 +1082 @@
 
         #ifndef R3TST
-        if (_aImportTab[i].ulAddress < 0xffc00000UL)
+        if (_aImportTab[i].ulAddress < 0xff400000UL)
         {
             kprintf(("VerifyImportTab32: procedure no.%d has an invalid address, %#08x!\n",
@@ -1084 +1090 @@
         #endif
 
-        switch (_aImportTab[i].fType & ~EPT_BIT_MASK)
+        switch (_aImportTab[i].fType & ~(EPT_BIT_MASK | EPT_NOT_REQ))
         {
             case EPT_PROC:
@@ -1135 +1141 @@
 int importTabInit(void)
 {
-    /* This table must be updated with the overloading functions. */
+    /* This table must be updated with the overloading functions.
+     * It should also hold NOP functions for functions which are of the
+     * not required type.
+     */
     static unsigned auFuncs[NBR_OF_KRNLIMPORTS] =
     {
@@ -1178 +1187 @@
         0,                              /* 38 */
         0,                              /* 39 */
-        0                               /* 40 */
+        0,                              /* 40 */
+        (unsigned)nopSecPathFromSFN,    /* 41 */
     };
     int i;
@@ -1196 +1206 @@
         if ((_aImportTab[i].fType & ~EPT_BIT_MASK) == EPT_VARIMPORT)
             continue;
+        /* EPT_NOT_REQ which is not found are set pointing to the nop function provided. */
+        if (!_aImportTab[i].fFound && (_aImportTab[i].fType & EPT_NOT_REQ))
+        {
+            _aImportTab[i].ulAddress = auFuncs[i];
+            continue;
+        }
 
         if (EPT32BitEntry(_aImportTab[i]))
@@ -1219 +1235 @@
     for (i = 0; i < NBR_OF_KRNLIMPORTS; i++)
     {
-        switch (_aImportTab[i].fType)
+        switch (_aImportTab[i].fType & ~EPT_NOT_REQ)
         {
             /*
@@ -1469 +1485 @@
         {(unsigned)&fakeptda_module,        4},
         {(unsigned)&fakeptda_pBeginLIBPATH, 4},
-        {(unsigned)&fakeldrpFileNameBuf,    3}
+        {(unsigned)&fakeldrpFileNameBuf,    3},
+        {(unsigned)&fakeSecPathFromSFN,     3}
     };
     int i;
@@ -1522 +1539 @@
 #endif
 
+/**
+ * Dummy nop function if SecPathFromSFN isn't found.
+ */
+PSZ SECCALL nopSecPathFromSFN(SFN hFile)
+{
+    NOREF(hFile);
+    return NULL;
+}