Changeset 6277 for trunk/src

Timestamp:

Jul 10, 2001, 7:17:37 AM (24 years ago)

Author:

bird

Message:

New hybrid 16-bit import proc.

File:

• trunk/src/win32k/dev16/mkcalltab.c (modified) (11 diffs)

trunk/src/win32k/dev16/mkcalltab.c

@@ -1 @@
-/* $Id: mkcalltab.c,v 1.6 2001-02-23 02:57:52 bird Exp $
+/* $Id: mkcalltab.c,v 1.7 2001-07-10 05:17:37 bird Exp $
  *
  * Description:     Generates the calltab.asm from aImportTab.
@@ -113 +113 @@
      * Write Start of file.
      */
-    printf16("; $Id: mkcalltab.c,v 1.6 2001-02-23 02:57:52 bird Exp $\n"
+    printf16("; $Id: mkcalltab.c,v 1.7 2001-07-10 05:17:37 bird Exp $\n"
              ";\n"
              "; Autogenerated calltab file.\n"
@@ -149 +149 @@
              "IMPORT16_PROLOG       EQU 08h\n"
              "NRIMPORT16_PROLOG     EQU 07h\n"
+             "IMPORTH16_PROLOG      EQU 08h\n"
+             "IMPORTHNR16_PROLOG    EQU 07h\n"
              "\n"
              "\n"
@@ -197 +199 @@
              "    fnname proc near\n"
              "        db IMPORT16_PROLOG dup(0cch)\n"
+             "    fnname endp\n"
+             "endm\n"
+             "\n"
+             "; Macro which makes a function calltable entry\n"
+             "FnHybrid16Entry macro fnname\n"
+             "    public fnname\n"
+             "    fnname proc near\n"
+             "        db IMPORTH16_PROLOG dup(0cch)\n"
              "    fnname endp\n"
              "endm\n"
@@ -240 +250 @@
     for (i = 0; i < NBR_OF_KRNLIMPORTS; i++)
     {
-        if (!EPT16Proc(aImportTab[i]))
+        if (!EPT16Proc(aImportTab[i]) && !EPTProcImportHybrid(aImportTab[i]))
         {
             char *pszMacro = (aImportTab[i].fType & EPT_VARIMPORT) ?
@@ -291 +301 @@
         if (EPT16Proc(aImportTab[i]))
         {
-
             printf16("FnOverload16Entry<%s>%*.s;%d\n",
                      aImportTab[i].achName,
@@ -298 +307 @@
                      i);
         }
+        else if (EPT16ProcImportH(aImportTab[i]))
+        {
+            printf16("FnHybrid16Entry<%s>%*.s;%d\n",
+                     aImportTab[i].achName,
+                     45 - 2 - 17 - aImportTab[i].cchName,
+                     "",
+                     i);
+        }
     }
 
@@ -327 +344 @@
         char *  pszName     = (*pszPrefix != '\0' ? &aImportTab[i].achName[1] : &aImportTab[i].achName[0]);
 
-        if (EPT16Proc(aImportTab[i]))
+        if (EPT16Proc(aImportTab[i]) && !EPTProcImportHybrid(aImportTab[i]))
         {   /* Overload procedure (Overloader function) */
             #if 1
@@ -356 +373 @@
             #endif
         }
-        else if (!(aImportTab[i].fType & (EPT_PROCIMPORT | EPT_VARIMPORT | EPT_NOT_REQ)))
+        else if (!(aImportTab[i].fType & (EPT_PROCIMPORT | EPT_PROCIMPORTH |EPT_VARIMPORT | EPT_NOT_REQ)))
         {   /* Overload procedure (Overloader function) */
             printf16("    extrn %smy%s%s : NEAR\n"
@@ -368 +385 @@
                      aImportTab[i].achExtra);
         }
-        else if ((aImportTab[i].fType & (EPT_NOT_REQ | EPT_VARIMPORT | EPT_PROCIMPORT)) == (EPT_NOT_REQ | EPT_PROCIMPORT))
+        else if ((aImportTab[i].fType & (EPT_NOT_REQ | EPT_VARIMPORT | EPT_PROCIMPORT | EPT_PROCIMPORTH)) == (EPT_NOT_REQ | EPT_PROCIMPORT))
         {   /* Not required imported function (NOP function) */
             printf16("    extrn %snop%s%s : NEAR\n"
@@ -408 +425 @@
      * Write Start of file.
      */
-    printf16("/* $Id: mkcalltab.c,v 1.6 2001-02-23 02:57:52 bird Exp $\n"
+    printf16("/* $Id: mkcalltab.c,v 1.7 2001-07-10 05:17:37 bird Exp $\n"
              " *\n"
              " * Autogenerated TstFakers.c file.\n"