[MKHIVE] Remove key name in our custom registry tree; use cell index instead

[reactos.git] / reactos / tools / spec2def / spec2def.c

diff --git a/reactos/tools/spec2def/spec2def.c b/reactos/tools/spec2def/spec2def.c
index b6c29cc..117daf9 100644 (file)
--- a/reactos/tools/spec2def/spec2def.c
+++ b/reactos/tools/spec2def/spec2def.c
@@ -385,7 +385,7 @@ OutputHeader_asmstub(FILE *file, char *libname)
 }
 
 void
-Output_symbol(FILE *fileDest, char* pszSymbolName)
+Output_stublabel(FILE *fileDest, char* pszSymbolName)
 {
     if (giArch == ARCH_ARM)
     {
@@ -429,19 +429,21 @@ OutputLine_asmstub(FILE *fileDest, EXPORT *pexp)
         sprintf(szNameBuffer, "@_stub_%.*s@%d",
                 pexp->strName.len, pexp->strName.buf, pexp->nStackBytes);
     }
-    else if (pexp->nCallingConvention == CC_CDECL ||
-             pexp->nCallingConvention == CC_STUB)
+    else if ((pexp->nCallingConvention == CC_CDECL) ||
+             (pexp->nCallingConvention == CC_THISCALL) ||
+             (pexp->nCallingConvention == CC_EXTERN) ||
+             (pexp->nCallingConvention == CC_STUB))
     {
         sprintf(szNameBuffer, "__stub_%.*s",
                 pexp->strName.len, pexp->strName.buf);
     }
-    else if (pexp->nCallingConvention == CC_EXTERN)
+    else
     {
-        sprintf(szNameBuffer, "__stub_%.*s",
-                pexp->strName.len, pexp->strName.buf);
+        fprintf(stderr, "Invalid calling convention");
+        return 0;
     }
 
-    Output_symbol(fileDest, szNameBuffer);
+    Output_stublabel(fileDest, szNameBuffer);
 
     return 1;
 }
@@ -602,7 +604,8 @@ OutputLine_def_GCC(FILE *fileDest, EXPORT *pexp)
         /* C++ stubs are forwarded to C stubs */
         fprintf(fileDest, "=stub_function%d", pexp->nNumber);
     }
-    else if (gbTracing && ((pexp->uFlags & FL_NORELAY) == 0) && (pexp->nCallingConvention == CC_STDCALL) &&
+    else if (gbTracing && ((pexp->uFlags & FL_NORELAY) == 0) &&
+             (pexp->nCallingConvention == CC_STDCALL) &&
             (pexp->strName.buf[0] != '?'))
     {
         /* Redirect it to the relay-tracing trampoline */