[ros-diffs] [reactos] 01/02: [SPEC2DEF] Check whether OLE-specific exports do not have assigned ordinals, as they should be.

[Hermès Bélusca-Maïto]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2becb000c8944e3b62cf3…

commit 2becb000c8944e3b62cf3d1a50c2c44f83b0613d
Author:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
AuthorDate: Sun Jun 2 00:11:18 2019 +0200
Commit:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
CommitDate: Sun Jul 28 15:50:30 2019 +0200

    [SPEC2DEF] Check whether OLE-specific exports do not have assigned ordinals, as they
should be.
    
    The check is done at the same time as when we check also that these
    exports are marked PRIVATE or not.
    
    This permits us to check for the same conditions as MS' LINK.EXE, but
    here on GCC builds as well.
    
    See the following pages for more details:
   
https://docs.microsoft.com/en-us/cpp/error-messages/tool-errors/linker-tool…
   
https://docs.microsoft.com/en-us/cpp/error-messages/tool-errors/linker-tool…
    
    In this last page (LNK4222), the specified list of exports is incomplete.
    Manual tests showed that the very same list as for LNK4104 is checked.
---
 sdk/tools/spec2def/spec2def.c | 41 ++++++++++++++++++++++++++++++++++-------
 1 file changed, 34 insertions(+), 7 deletions(-)

diff --git a/sdk/tools/spec2def/spec2def.c b/sdk/tools/spec2def/spec2def.c
index fe89a128156..65fa07cc6a2 100644
--- a/sdk/tools/spec2def/spec2def.c
+++ b/sdk/tools/spec2def/spec2def.c
@@ -95,7 +95,12 @@ const char* astrCallingConventions[] =
     "EXTERN"
 };
 
-static const char* astrShouldBePrivate[] =
+/*
+ * List of OLE exports that should be PRIVATE and not be assigned an ordinal.
+ * In case these conditions are not met when linking with MS LINK.EXE, warnings
+ * LNK4104 and LNK4222 respectively are emitted.
+ */
+static const char* astrOlePrivateExports[] =
 {
     "DllCanUnloadNow",
     "DllGetClassObject",
@@ -1087,15 +1092,37 @@ ParseFile(char* pcStart, FILE *fileDest, PFNOUTLINE OutputLine)
             return -1;
         }
 
-        if (!gbMSComp && !gbNotPrivateNoWarn && gbImportLib &&
!(exp.uFlags & FL_PRIVATE))
+        /*
+         * Check for special handling of OLE exports, only when MSVC
+         * is not used, since otherwise this is handled by MS LINK.EXE.
+         */
+        if (!gbMSComp)
         {
-            for (i = 0; i < ARRAYSIZE(astrShouldBePrivate); i++)
+            /* Check whether the current export is not PRIVATE, or has an ordinal */
+            int bIsNotPrivate = (!gbNotPrivateNoWarn && /*gbImportLib
&&*/ !(exp.uFlags & FL_PRIVATE));
+            int bHasOrdinal = (exp.uFlags & FL_ORDINAL);
+
+            /* Check whether the current export is an OLE export, in case any of these
tests pass */
+            if (bIsNotPrivate || bHasOrdinal)
             {
-                if (strlen(astrShouldBePrivate[i]) == exp.strName.len &&
-                    strncmp(exp.strName.buf, astrShouldBePrivate[i], exp.strName.len) ==
0)
+                for (i = 0; i < ARRAYSIZE(astrOlePrivateExports); ++i)
                 {
-                    fprintf(stderr, "%s line %d: warning: export of '%.*s'
should be PRIVATE\n",
-                            pszSourceFileName, nLine, exp.strName.len, exp.strName.buf);
+                    if (strlen(astrOlePrivateExports[i]) == exp.strName.len &&
+                        strncmp(exp.strName.buf, astrOlePrivateExports[i],
exp.strName.len) == 0)
+                    {
+                        /* The current export is an OLE export: display the corresponding
warning */
+                        if (bIsNotPrivate)
+                        {
+                            fprintf(stderr, "%s line %d: warning: exported symbol
'%.*s' should be PRIVATE\n",
+                                    pszSourceFileName, nLine, exp.strName.len,
exp.strName.buf);
+                        }
+                        if (bHasOrdinal)
+                        {
+                            fprintf(stderr, "%s line %d: warning: exported symbol
'%.*s' should not be assigned an ordinal\n",
+                                    pszSourceFileName, nLine, exp.strName.len,
exp.strName.buf);
+                        }
+                        break;
+                    }
                 }
             }
         }