Changeset 867 for trunk/tools/impdef/ImpDef.cpp

Timestamp:

Sep 8, 1999, 9:30:10 AM (26 years ago)

Author:

bird

Message:

New options. Will now handle 'internal' functions correctly.

File:

• trunk/tools/impdef/ImpDef.cpp (modified) (10 diffs)

trunk/tools/impdef/ImpDef.cpp

@@ -1 @@
-/* $Id: ImpDef.cpp,v 1.2 1999-09-05 22:10:26 bird Exp $ */
+/* $Id: ImpDef.cpp,v 1.3 1999-09-08 07:30:09 bird Exp $ */
 /*
  * ImpDef - Create export file which use internal names and ordinals.
@@ -13 +13 @@
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 #include "ImpDef.h"
 #include "kFileFormatBase.h"
@@ -39 +40 @@
     char   *pszInput = NULL;
     char   *pszOutput = NULL;
-    OPTIONS options = {TRUE, FALSE};
+    OPTIONS options = {TRUE, ORD_START_INTERNAL_FUNCTIONS, FALSE, TRUE};
 
     /**************************************************************************
@@ -46 +47 @@
     *           -S<[+]|->    Similar to exported. (stdcall)
     *           -O<[+]|->    Remove OS2 prefix on APIs.
+    *           -I:<num>     Start ordinal number of internal functions.
+    *           -F<[+]|->    Export intname for internal stdcall functions.
     **************************************************************************/
     if (argc == 1)
@@ -64 +67 @@
                 case 'O':
                     options.fRemoveOS2APIPrefix = argv[argi][2] != '-';
+                    break;
+
+                case 'i':
+                case 'I':
+                    if (strlen(argv[argi]) >= 3)
+                    {
+                        options.ulOrdStartInternalFunctions = atol(&argv[argi][3]);
+                        if (options.ulOrdStartInternalFunctions == 0)
+                            fprintf(stderr, "warning: internal functions starts at ordinal 0!\n");
+                    }
+                    else
+                    {
+                        fprintf(stderr, "incorrect parameter -I:<ord>. (argi=%d, argv[argi]=%s)\n", argi, argv[argi]);
+                        fFatal = TRUE;
+                    }
+                    break;
+
+                case 'f':
+                case 'F':
+                    options.fInternalFnExportStdCallsIntName = argv[argi][2] != '-';
                     break;
 
@@ -123 +146 @@
            "syntax: ImpDef.exe [-h|-?] [-S] <infile> <outfile>\n"
            "    -h or -?      Syntax help. (this)\n"
-           "    -O<[+]|->     Remove OS2 prefix on APIs.  default: O-\n"
-           "    -S<[+]|->     Similar to exported name.   default: S+\n"
+           "    -F<[+]|->     Fix! Export int.name for int.functions. default: F+\n"
+           "    -I:<ord>      Start of internal function.  default: I:%d\n"
+           "    -O<[+]|->     Remove OS2 prefix on APIs.   default: O-\n"
+           "    -S<[+]|->     Similar to exported name.    default: S+\n"
            "    infile        Name of input file\n"
            "    outfile       Name of output file\n"
@@ -134 +159 @@
            "   -O+ has no effect on stdcall functions when -S+ is set. -S+ has higher\n"
            "   precedence than -O+.\n"
-           "   -O+ only removes the OS2 prefix from internal names.\n"
+           "   -O+ only removes the OS2 prefix from internal names.\n",
+           ORD_START_INTERNAL_FUNCTIONS
            );
 }
@@ -201 +227 @@
 
                         /* real work */
-                        if (pOptions->fSimilarToExported || pOptions->fRemoveOS2APIPrefix)
-                            pszName = generateExportName(&export, &szName[0], pOptions);
-                        else if (export.achIntName[0] != '\0')
-                            pszName = &export.achIntName[0];
-                        else if (export.achName[0] != '\0')
-                            pszName = &export.achName[0];
+                        pszName = generateExportName(&export, &szName[0], pOptions);
 
                         fprintf(phOutput, "    %-*s  @%ld\n", 40, pszName, export.ulOrdinal);
@@ -238 +259 @@
 /**
  * Generate export names according to options defines.
- * fSimilarToExported only applies to stdcall functions.
+ * fSimilarToExported only applies to stdcall API functions.
  * fRemoveOS2APIPrefix only applies to APIs.
  * fRemoveOS2APIPrefix have no effect on stdcall functions when fSimilarToExported is set.
@@ -252 +273 @@
 static char *generateExportName(const PEXPORTENTRY pExport, char *pszBuffer, const POPTIONS pOptions)
 {
-    if (pOptions->fSimilarToExported)
-    {
-        if (pExport->achIntName[0] != '\0')
-        {
-            char *pszAt = strchr(&pExport->achIntName[0], '@');
-            if (pszAt != NULL && pExport->achIntName[0] == '_' && pExport->achName[0] != '"')
-            {   /* stdcall - merge */
-                strcpy(pszBuffer, "_");
-                /* test for "reserved" definition file names (like HeapSize) in original def-file. */
-                if (pExport->achName[0] != '"')
-                    strcat(pszBuffer, &pExport->achName[0]);
-                else
-                {
-                    strcat(pszBuffer, &pExport->achName[1]);
-                    pszBuffer[strlen(pszBuffer)-1] = '\0'; //remove tail '"'
-                }
-
-                strcat(pszBuffer, pszAt);
-            }
-            else
-            {   /* not a stdcall - no merge but check for OS2prefix */
-                if (pOptions->fRemoveOS2APIPrefix && pExport->ulOrdinal < ORD_START_INTERNAL_FUNCTIONS)
-                {
-                    int i = 0;
-                    char *psz = pszBuffer;
-                    if (pExport->achIntName[i] == '_')
-                        *psz++ = pExport->achIntName[i++];
-                    if (strncmp(&pExport->achIntName[i], "OS2", 3) == 0)
-                        i += 3;
-                    strcpy(psz, &pExport->achIntName[i]);
+    if (pExport->ulOrdinal < pOptions->ulOrdStartInternalFunctions)
+    {
+        /* API */
+        if (pOptions->fSimilarToExported)
+        {
+            if (pExport->achIntName[0] != '\0')
+            {
+                char *pszAt = strchr(&pExport->achIntName[0], '@');
+                if (pszAt != NULL && pExport->achIntName[0] == '_' && pExport->achName[0] != '"')
+                {   /* stdcall - merge */
+                    strcpy(pszBuffer, "_");
+                    /* test for "reserved" definition file names (like HeapSize) in original def-file. */
+                    if (pExport->achName[0] != '"')
+                        strcat(pszBuffer, &pExport->achName[0]);
+                    else
+                    {
+                        strcat(pszBuffer, &pExport->achName[1]);
+                        pszBuffer[strlen(pszBuffer)-1] = '\0'; //remove tail '"'
+                    }
+
+                    strcat(pszBuffer, pszAt);
                 }
                 else
-                    strcpy(pszBuffer, &pExport->achIntName[0]);
-            }
+                {   /* not a stdcall - no merge but check for OS2prefix */
+                    if (pOptions->fRemoveOS2APIPrefix)
+                    {
+                        int i = 0;
+                        char *psz = pszBuffer;
+                        if (pExport->achIntName[i] == '_')
+                            *psz++ = pExport->achIntName[i++];
+                        if (strncmp(&pExport->achIntName[i], "OS2", 3) == 0)
+                            i += 3;
+                        strcpy(psz, &pExport->achIntName[i]);
+                    }
+                    else
+                        strcpy(pszBuffer, &pExport->achIntName[0]);
+                }
+            }
+            else
+                strcpy(pszBuffer, &pExport->achName[0]);
+        }
+        else if (pOptions->fRemoveOS2APIPrefix)
+        {   /* removes OS2 prefix */
+            if (pExport->achIntName[0] != '\0')
+            {
+                int i = 0;
+                char *psz = pszBuffer;
+                if (pExport->achIntName[i] == '_')
+                    *psz++ = pExport->achIntName[i++];
+                if (strncmp(&pExport->achIntName[i], "OS2", 3) == 0)
+                    i += 3;
+                strcpy(psz, &pExport->achIntName[i]);
+            }
+            else
+                strcpy(pszBuffer, &pExport->achName[0]);
         }
         else
-            strcpy(pszBuffer, &pExport->achName[0]);
-    }
-    else if (pOptions->fRemoveOS2APIPrefix && pExport->ulOrdinal < ORD_START_INTERNAL_FUNCTIONS)
-    {   /* removes OS2 prefix */
-        if (pExport->achIntName[0] != '\0')
-        {
-            int i = 0;
-            char *psz = pszBuffer;
-            if (pExport->achIntName[i] == '_')
-                *psz++ = pExport->achIntName[i++];
-            if (strncmp(&pExport->achIntName[i], "OS2", 3) == 0)
-                i += 3;
-            strcpy(psz, &pExport->achIntName[i]);
-        }
-        else
-            strcpy(pszBuffer, &pExport->achName[0]);
+            if (pExport->achIntName[0] != '\0')
+                strcpy(pszBuffer, &pExport->achIntName[0]);
+            else
+                strcpy(pszBuffer, &pExport->achName[0]);
     }
     else
-        if (pExport->achIntName[0] != '\0')
+    {   /* non-API functions */
+        if ((pExport->achName[0] == '\0' || (pOptions->fInternalFnExportStdCallsIntName && strchr(&pExport->achIntName[0], '@')))
+            && pExport->achIntName[0] != '\0'
+            )
             strcpy(pszBuffer, &pExport->achIntName[0]);
         else
             strcpy(pszBuffer, &pExport->achName[0]);
+    }
 
     return pszBuffer;