Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-05 05:01:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SPEC2DEF] Fix imports of C++ stdcall exports

Browse source 
Too much mangling mangles it too much
This commit is contained in:
Jérôme Gardou 2021-04-29 15:30:59 +02:00 committed by Jérôme Gardou
parent ec68a3311f
commit a8255233f8
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
sdk/tools/spec2def/spec2def.c
View file

@ -244,10 +244,10 @@ OutputLine_stub(FILE *file, EXPORT *pexp)
int bRelay = 0; int bRelay = 0;
int bInPrototype = 0; int bInPrototype = 0;
/* Workaround for forwarded externs. See here for an explanation: /* Workaround for forwarded externs. See here for an explanation:
* https://stackoverflow.com/questions/4060143/forwarding-data-in-a-dll */ * https://stackoverflow.com/questions/4060143/forwarding-data-in-a-dll */
if (gbMSComp && if (gbMSComp &&
(pexp->nCallingConvention == CC_EXTERN) && (pexp->nCallingConvention == CC_EXTERN) &&
(pexp->strTarget.buf != NULL) && (pexp->strTarget.buf != NULL) &&
(!!ScanToken(pexp->strTarget.buf, '.'))) (!!ScanToken(pexp->strTarget.buf, '.')))
{ {
@ -576,6 +576,9 @@ PrintName(FILE *fileDest, EXPORT *pexp, PSTRING pstr, int fDeco)
((pexp->nCallingConvention == CC_STDCALL) || ((pexp->nCallingConvention == CC_STDCALL) ||
(pexp->nCallingConvention == CC_FASTCALL))) (pexp->nCallingConvention == CC_FASTCALL)))
{ {
/* Beware with C++ exports */
int is_cpp = pcName[0] == '?';
/* Scan for a dll forwarding dot */ /* Scan for a dll forwarding dot */
pcDot = ScanToken(pcName, '.'); pcDot = ScanToken(pcName, '.');
if (pcDot) if (pcDot)
@ -593,8 +596,8 @@ PrintName(FILE *fileDest, EXPORT *pexp, PSTRING pstr, int fDeco)
pcAt = ScanToken(pcName, '@'); pcAt = ScanToken(pcName, '@');
if (pcAt && (pcAt < (pcName + nNameLength))) if (pcAt && (pcAt < (pcName + nNameLength)))
{ {
/* On GCC, we need to remove the leading stdcall underscore */ /* On GCC, we need to remove the leading stdcall underscore, but not for C++ exports */
if (!gbMSComp && (pexp->nCallingConvention == CC_STDCALL)) if (!gbMSComp && !is_cpp && (pexp->nCallingConvention == CC_STDCALL))
{ {
pcName++; pcName++;
nNameLength--; nNameLength--;
@ -712,8 +715,9 @@ OutputLine_def_GCC(FILE *fileDest, EXPORT *pexp)
bTracing = 1; bTracing = 1;
} }
/* Special handling for stdcall and fastcall */ /* Special handling for stdcall and fastcall, but not C++ exports*/
if ((giArch == ARCH_X86) && if ((giArch == ARCH_X86) &&
(pexp->strName.buf[0] != '?') &&
((pexp->nCallingConvention == CC_STDCALL) || ((pexp->nCallingConvention == CC_STDCALL) ||
(pexp->nCallingConvention == CC_FASTCALL))) (pexp->nCallingConvention == CC_FASTCALL)))
{ {
@ -748,9 +752,9 @@ OutputLine_def(FILE *fileDest, EXPORT *pexp)
DbgPrint("OutputLine_def: skipping private export '%.*s'...\n", pexp->strName.len, pexp->strName.buf); DbgPrint("OutputLine_def: skipping private export '%.*s'...\n", pexp->strName.len, pexp->strName.buf);
return 1; return 1;
} }
/* For MS linker, forwarded externs are managed via #pragma comment(linker,"/export:_data=org.data,DATA") */ /* For MS linker, forwarded externs are managed via #pragma comment(linker,"/export:_data=org.data,DATA") */
if (gbMSComp && !gbImportLib && (pexp->nCallingConvention == CC_EXTERN) && if (gbMSComp && !gbImportLib && (pexp->nCallingConvention == CC_EXTERN) &&
(pexp->strTarget.buf != NULL) && !!ScanToken(pexp->strTarget.buf, '.')) (pexp->strTarget.buf != NULL) && !!ScanToken(pexp->strTarget.buf, '.'))
{ {
DbgPrint("OutputLine_def: skipping forwarded extern export '%.*s' ->'%.*s'...\n", DbgPrint("OutputLine_def: skipping forwarded extern export '%.*s' ->'%.*s'...\n",