Changeset 6278 for trunk/src

Timestamp:

Jul 10, 2001, 7:18:04 AM (24 years ago)

Author:

bird

Message:

New hybrid 16-bit import proc. New import prologs.

File:

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

trunk/src/win32k/dev32/d32init.c

@@ -1 @@
-/* $Id: d32init.c,v 1.40 2001-07-08 02:56:27 bird Exp $
+/* $Id: d32init.c,v 1.41 2001-07-10 05:18:04 bird Exp $
  *
  * d32init.c - 32-bits init routines.
@@ -18 +18 @@
 #define OVERLOAD32_ENTRY    0x14
 #define IMPORT16_ENTRY      0x08
+#define IMPORTH16_ENTRY     0x08
 #define IMPORT32_ENTRY      0x08
 #define VARIMPORT_ENTRY     0x10
@@ -514 +515 @@
     USHORT  usRc;
 
-    /* VerifyImporTab32 is called before the initroutine! */
+    /* VerifyImportTab32 is called before the initroutine! */
     pulTKSSBase32 = (PULONG)_TKSSBase16;
 
@@ -834 +835 @@
         (pach[0] == 0x0f &&  pach[1] == 0xb7 && pach[2] == 0xe4 && !fOverload) /* the next prolog */
         ||
-        (pach[0] == 0xe8 &&  pach[5] == 0x9d && !fOverload) /* the last prolog */
+        (pach[0] == 0xe8 &&  pach[5] == 0x9d && !fOverload) /* the next prolog */
+        /*      push ebx
+         *      push edi
+         *      push imm32
+         */
+        || (pach[0] == 0x53 &&  pach[1] == 0x57 &&  pach[2] == 0x68 && !fOverload)
+        /*      push ebx
+         *      push edi
+         *      push esi
+         *      mov /r
+         */
+        || (pach[0] == 0x53 &&  pach[1] == 0xe8 && !fOverload)
+        /*      push ebx
+         *      push edi
+         *      push esi
+         *      mov /r
+         */
+        || (pach[0] == 0x53 &&  pach[1] == 0x57 &&  pach[2] == 0x56 &&  pach[3] == 0x8b  && !fOverload)
+        /*      pop  eax
+         *      push imm8
+         *      push eax
+         *      jmp  imm32
+         */
+        ||  (pach[0] == 0x58 &&  pach[1] == 0x6a &&  pach[3] == 0x50 &&  pach[4] == 0xe9  && !fOverload)
+        /*      push imm32
+         *      call imm32
+         */
+        || (pach[0] == 0x68 && pach[5] == 0xe8 && !fOverload)
         )
     {
@@ -874 +902 @@
                     break;
 
-                /* simple one byte instructions */
-                case 0x50:              /* push ax */
-                case 0x51:              /* push cx */
-                case 0x52:              /* push dx */
-                case 0x53:              /* push bx */
-                case 0x54:              /* push sp */
-                case 0x55:              /* push bp */
-                case 0x56:              /* push si */
-                case 0x57:              /* push di */
+                /* simple one byte instructions e*/
+                case 0x50:              /* push eax */
+                case 0x51:              /* push ecx */
+                case 0x52:              /* push edx */
+                case 0x53:              /* push ebx */
+                case 0x54:              /* push esp */
+                case 0x55:              /* push ebp */
+                case 0x56:              /* push esi */
+                case 0x57:              /* push edi */
+                case 0x58:              /* pop  eax */
+                case 0x59:              /* pop  ecx */
+                case 0x5a:              /* pop  edx */
+                case 0x5b:              /* pop  ebx */
                 case 0x06:              /* push es */
                 case 0x0e:              /* push cs */
@@ -917 +949 @@
                 case 0xbe:              /* mov esi, imm32 */
                 case 0xbf:              /* mov edi, imm32 */
+                case 0xe9:              /* jmp rel32 */
                 case 0x2d:              /* sub eax, imm32 */
                 case 0x35:              /* xor eax, imm32 */
@@ -1013 +1046 @@
     else
     {
-        kprintf(("interpretFunctionProlog32: unknown prolog start. 0x%x 0x%x 0x%x 0x%x 0x%x\n",
-                 pach[0], pach[1], pach[2], pach[3], pach[4]));
+        kprintf(("interpretFunctionProlog32: unknown prolog start. 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x\n",
+                 pach[0], pach[1], pach[2], pach[3], pach[4], pach[5]));
         cb = 0;
     }
@@ -1181 +1214 @@
                     break;
 
+                case 0x9a:              /* call ptr16:16 */
+                    cb += cb2 = 4;
+                    pach += cb2;
+                    break;
 
                 default:
@@ -1273 +1310 @@
         #endif
 
-        switch (aImportTab[i].fType & ~(EPT_BIT_MASK | EPT_NOT_REQ | EPT_WRAPPED))
+        switch (aImportTab[i].fType & ~(EPT_BIT_MASK | EPT_NOT_REQ | EPT_WRAPPED | EPT_PROCIMPORTH))
         {
             case EPT_PROC:
@@ -1552 +1589 @@
 
             /*
+             * 16-bit imported hybrid procedure.
+             * This is called by issuing a far call to the 16-bit calltab entry.
+             */
+            case EPT_PROCIMPORTH16:
+            {
+                cb = interpretFunctionProlog16((char*)aImportTab[i].ulAddress, FALSE);
+                aImportTab[i].cbProlog = (char)cb;
+                if (cb > 0) /* Since no prolog part is copied to the function table, it's ok as long as the prolog has been recognzied. */
+                {
+                    /*
+                     * Create far jump from calltab to original function.
+                     * 0xEA <four byte target address> <two byte target selector>
+                     */
+                    pchCTEntry16[0] = 0xEA; /* jmp far ptr */
+                    *(unsigned short*)(void*)&pchCTEntry16[1] = aImportTab[i].offObject;
+                    *(unsigned short*)(void*)&pchCTEntry16[3] = aImportTab[i].usSel;
+                }
+                else
+                {   /* !fatal! - this should never really happen... */
+                    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;
+                }
+                pchCTEntry16 += IMPORTH16_ENTRY;
+                break;
+            }
+
+
+            /*
              * 16/32-bit importe variable.
              * This is used by accessing the 32-bit flat address in the callTab.