Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-30 14:37:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SPEC2DEF] Fix decorated exports on non-x86

Browse source
This commit is contained in:
Timo Kreuzer 2019-08-29 18:16:06 +02:00
parent 824e08c710
commit 9cff65970f
1 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -448,8 +448,21 @@ OutputLine_asmstub(FILE *fileDest, EXPORT *pexp)
} }
else if (giArch != ARCH_X86) else if (giArch != ARCH_X86)
{ {
sprintf(szNameBuffer, "_stub_%.*s", /* Does the string already have stdcall decoration? */
pexp->strName.len, pexp->strName.buf); const char *pcAt = ScanToken(pexp->strName.buf, '@');
if (pcAt && (pcAt < (pexp->strName.buf + pexp->strName.len)) &&
(pexp->strName.buf[0] == '_'))
{
/* Skip leading underscore and remove trailing decoration */
sprintf(szNameBuffer, "_stub_%.*s",
(int)(pcAt - pexp->strName.buf - 1),
pexp->strName.buf + 1);
}
else
{
sprintf(szNameBuffer, "_stub_%.*s",
pexp->strName.len, pexp->strName.buf);
}
} }
else if (pexp->nCallingConvention == CC_STDCALL) else if (pexp->nCallingConvention == CC_STDCALL)
{ {
@ -670,7 +683,9 @@ OutputLine_def_GCC(FILE *fileDest, EXPORT *pexp)
{ {
/* Is the name in the spec file decorated? */ /* Is the name in the spec file decorated? */
const char* pcDeco = ScanToken(pexp->strName.buf, '@'); const char* pcDeco = ScanToken(pexp->strName.buf, '@');
if (pcDeco && (pcDeco < pexp->strName.buf + pexp->strName.len)) if (pcDeco &&
(pexp->strName.len > 1) &&
(pcDeco < pexp->strName.buf + pexp->strName.len))
{ {
/* Write the name including the leading @ */ /* Write the name including the leading @ */
fprintf(fileDest, "==%.*s", pexp->strName.len, pexp->strName.buf); fprintf(fileDest, "==%.*s", pexp->strName.len, pexp->strName.buf);