mirror of
https://github.com/reactos/reactos.git
synced 2025-04-19 12:08:55 +00:00
[SPEC2DEF]
Improve the previous fix. svn path=/trunk/; revision=63218
This commit is contained in:
parent
fda4b225f8
commit
2e1ac56d1c
1 changed files with 16 additions and 10 deletions
|
@ -325,7 +325,22 @@ PrintName(FILE *fileDest, EXPORT *pexp, PSTRING pstr, int fDeco)
|
|||
int nNameLength = pstr->len;
|
||||
const char* pcDot, *pcAt;
|
||||
|
||||
if ((giArch == ARCH_X86) && fDeco &&
|
||||
/* Check for non-x86 first */
|
||||
if (giArch != ARCH_X86)
|
||||
{
|
||||
/* Does the string already have stdcall decoration? */
|
||||
pcAt = ScanToken(pcName, '@');
|
||||
if ((pcAt < (pcName + nNameLength)) && (pcName[0] == '_'))
|
||||
{
|
||||
/* Skip leading underscore and remove trailing decoration */
|
||||
pcName++;
|
||||
nNameLength = pcAt - pcName;
|
||||
}
|
||||
|
||||
/* Print the undecorated function name */
|
||||
fprintf(fileDest, "%.*s", nNameLength, pcName);
|
||||
}
|
||||
else if (fDeco &&
|
||||
((pexp->nCallingConvention == CC_STDCALL) ||
|
||||
(pexp->nCallingConvention == CC_FASTCALL)))
|
||||
{
|
||||
|
@ -370,15 +385,6 @@ PrintName(FILE *fileDest, EXPORT *pexp, PSTRING pstr, int fDeco)
|
|||
}
|
||||
else
|
||||
{
|
||||
/* Does the string already have stdcall decoration? */
|
||||
pcAt = ScanToken(pcName, '@');
|
||||
if (pcAt && (pcAt < (pcName + nNameLength)) && pcName[0] == '_')
|
||||
{
|
||||
/* Skip leading underscore and remove trailing decoration */
|
||||
pcName++;
|
||||
nNameLength = pcAt - pcName;
|
||||
}
|
||||
|
||||
/* Print the undecorated function name */
|
||||
fprintf(fileDest, "%.*s", nNameLength, pcName);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue