From cf21c75bbf0490627e48c02c91460196ee5a3c1f Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Thu, 19 Oct 2023 17:14:21 +0200 Subject: [PATCH] ntdll: Simplify platform checks for exception handling functions. And sync the corresponding forwards. --- dlls/kernel32/kernel32.spec | 18 +++++++++--------- dlls/kernelbase/kernelbase.spec | 4 ++-- dlls/ntdll/ntdll.spec | 24 ++++++++++++------------ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 20 ++++++++++---------- 4 files changed, 33 insertions(+), 33 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 52a17bd7a8c..9e1095a45a3 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1310,22 +1310,22 @@ @ stdcall -import ResolveLocaleName(wstr ptr long) @ stdcall RestoreLastError(long) NTDLL.RtlRestoreLastWin32Error @ stdcall -import ResumeThread(long) -@ cdecl -arch=arm,arm64,x86_64 RtlAddFunctionTable(ptr long long) NTDLL.RtlAddFunctionTable +@ cdecl -arch=!i386 RtlAddFunctionTable(ptr long long) NTDLL.RtlAddFunctionTable @ stdcall -norelay -import RtlCaptureContext(ptr) @ stdcall RtlCaptureStackBackTrace(long long ptr ptr) NTDLL.RtlCaptureStackBackTrace -@ stdcall -arch=arm,arm64,x86_64 RtlCompareMemory(ptr ptr long) NTDLL.RtlCompareMemory +@ stdcall -arch=!i386 RtlCompareMemory(ptr ptr long) NTDLL.RtlCompareMemory @ stdcall -arch=x86_64 RtlCopyMemory(ptr ptr long) NTDLL.RtlCopyMemory -@ cdecl -arch=arm,arm64,x86_64 RtlDeleteFunctionTable(ptr) NTDLL.RtlDeleteFunctionTable +@ cdecl -arch=!i386 RtlDeleteFunctionTable(ptr) NTDLL.RtlDeleteFunctionTable @ stdcall RtlFillMemory(ptr long long) NTDLL.RtlFillMemory -@ cdecl -arch=arm,arm64,x86_64 RtlInstallFunctionTableCallback(long long long ptr ptr ptr) NTDLL.RtlInstallFunctionTableCallback -@ stdcall -arch=arm,arm64,x86_64 RtlLookupFunctionEntry(long ptr ptr) NTDLL.RtlLookupFunctionEntry +@ cdecl -arch=!i386 RtlInstallFunctionTableCallback(long long long ptr ptr ptr) NTDLL.RtlInstallFunctionTableCallback +@ stdcall -arch=!i386 RtlLookupFunctionEntry(long ptr ptr) NTDLL.RtlLookupFunctionEntry @ stdcall RtlMoveMemory(ptr ptr long) NTDLL.RtlMoveMemory @ stdcall RtlPcToFileHeader(ptr ptr) NTDLL.RtlPcToFileHeader -@ stdcall -arch=arm,arm64,x86_64 -norelay RtlRaiseException(ptr) NTDLL.RtlRaiseException +@ stdcall -arch=!i386 -norelay RtlRaiseException(ptr) NTDLL.RtlRaiseException @ cdecl -import RtlRestoreContext(ptr ptr) @ stdcall RtlUnwind(ptr ptr ptr long) NTDLL.RtlUnwind -@ stdcall -arch=arm,arm64,x86_64 RtlUnwindEx(long long ptr long ptr) NTDLL.RtlUnwindEx -@ stdcall -arch=arm,arm64,x86_64 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) NTDLL.RtlVirtualUnwind +@ stdcall -arch=!i386 RtlUnwindEx(long long ptr long ptr) NTDLL.RtlUnwindEx +@ stdcall -arch=!i386 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) NTDLL.RtlVirtualUnwind @ stdcall RtlZeroMemory(ptr long) NTDLL.RtlZeroMemory @ stdcall -i386 -private -norelay SMapLS() krnl386.exe16.SMapLS @ stdcall -i386 -private -norelay SMapLS_IP_EBP_12() krnl386.exe16.SMapLS_IP_EBP_12 @@ -1668,7 +1668,7 @@ @ stdcall WriteProfileStringW(wstr wstr wstr) @ stdcall WriteTapemark(ptr long long long) @ stdcall -import ZombifyActCtx(ptr) -@ stdcall -arch=x86_64 -private __C_specific_handler(ptr long ptr ptr) NTDLL.__C_specific_handler +@ stdcall -arch=arm,x86_64 -private __C_specific_handler(ptr long ptr ptr) NTDLL.__C_specific_handler @ cdecl -arch=arm,x86_64 -norelay __chkstk() NTDLL.__chkstk @ stub _DebugOut @ stub _DebugPrintf diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 104dd99d619..61c958fc428 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1781,8 +1781,8 @@ # @ stub _AddMUIStringToCache # @ stub _GetMUIStringFromCache # @ stub _OpenMuiStringCache -@ stdcall -arch=x86_64 -private __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler -@ cdecl -arch=arm,arm64,x86_64 -norelay __chkstk() ntdll.__chkstk +@ stdcall -arch=!i386 -private __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler +@ cdecl -arch=!i386 -norelay __chkstk() ntdll.__chkstk # @ stub __dllonexit3 @ stub __misaligned_access # @ stub __wgetmainargs diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 293a0ab290e..a90da6f36ef 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -483,8 +483,8 @@ @ stdcall RtlAddAuditAccessAceEx(ptr long long long ptr long long) @ stdcall RtlAddAuditAccessObjectAce(ptr long long long ptr ptr ptr long long) # @ stub RtlAddCompoundAce -@ cdecl -arch=arm,arm64,x86_64 RtlAddFunctionTable(ptr long long) -@ stdcall -arch=arm,arm64,x86_64 RtlAddGrowableFunctionTable(ptr ptr long long long long) +@ cdecl -arch=!i386 RtlAddFunctionTable(ptr long long) +@ stdcall -arch=!i386 RtlAddGrowableFunctionTable(ptr ptr long long long long) @ stdcall RtlAddMandatoryAce(ptr long long long long ptr) @ stdcall RtlAddProcessTrustLabelAce(ptr long long ptr long long) # @ stub RtlAddRange @@ -599,10 +599,10 @@ @ stdcall RtlDeleteAce(ptr long) @ stdcall RtlDeleteAtomFromAtomTable(ptr long) @ stdcall RtlDeleteCriticalSection(ptr) -@ stdcall -arch=arm,arm64,x86_64 RtlDeleteGrowableFunctionTable(ptr) +@ stdcall -arch=!i386 RtlDeleteGrowableFunctionTable(ptr) @ stub RtlDeleteElementGenericTable @ stub RtlDeleteElementGenericTableAvl -@ cdecl -arch=arm,arm64,x86_64 RtlDeleteFunctionTable(ptr) +@ cdecl -arch=!i386 RtlDeleteFunctionTable(ptr) @ stub RtlDeleteNoSplay @ stub RtlDeleteOwnersRanges @ stub RtlDeleteRange @@ -763,7 +763,7 @@ @ stdcall RtlGetUserInfoHeap(ptr long ptr ptr ptr) @ stdcall RtlGetUserPreferredUILanguages(long long ptr ptr ptr) @ stdcall RtlGetVersion(ptr) -@ stdcall -arch=arm,arm64,x86_64 RtlGrowFunctionTable(ptr long) +@ stdcall -arch=!i386 RtlGrowFunctionTable(ptr long) @ stub RtlGuidToPropertySetName @ stdcall RtlHashUnicodeString(ptr long long ptr) @ stdcall RtlIdentifierAuthoritySid(ptr) @@ -805,7 +805,7 @@ # @ stub RtlInitializeStackTraceDataBase @ stub RtlInsertElementGenericTable @ stdcall RtlInsertElementGenericTableAvl(ptr ptr long ptr) -@ cdecl -arch=arm,arm64,x86_64 RtlInstallFunctionTableCallback(long long long ptr ptr wstr) +@ cdecl -arch=!i386 RtlInstallFunctionTableCallback(long long long ptr ptr wstr) @ stdcall RtlInt64ToUnicodeString(int64 long ptr) @ stdcall RtlIntegerToChar(long long long ptr) @ stdcall RtlIntegerToUnicodeString(long long ptr) @@ -875,7 +875,7 @@ @ stdcall RtlLookupAtomInAtomTable(ptr wstr ptr) @ stdcall RtlLookupElementGenericTable(ptr ptr) # @ stub RtlLookupElementGenericTableAvl -@ stdcall -arch=arm,arm64,x86_64 RtlLookupFunctionEntry(long ptr ptr) +@ stdcall -arch=!i386 RtlLookupFunctionEntry(long ptr ptr) @ stdcall RtlMakeSelfRelativeSD(ptr ptr ptr) @ stdcall RtlMapGenericMask(ptr ptr) # @ stub RtlMapSecurityErrorToNtStatus @@ -1068,7 +1068,7 @@ @ stdcall RtlUnlockHeap(long) # @ stub RtlUnlockMemoryStreamRegion @ stdcall -norelay RtlUnwind(ptr ptr ptr ptr) -@ stdcall -arch=arm,arm64,x86_64 RtlUnwindEx(ptr ptr ptr ptr ptr ptr) +@ stdcall -arch=!i386 RtlUnwindEx(ptr ptr ptr ptr ptr ptr) @ stdcall RtlUpcaseUnicodeChar(long) @ stdcall RtlUpcaseUnicodeString(ptr ptr long) @ stdcall RtlUpcaseUnicodeStringToAnsiString(ptr ptr long) @@ -1091,7 +1091,7 @@ @ stub RtlValidateProcessHeaps # @ stub RtlValidateUnicodeString @ stdcall RtlVerifyVersionInfo(ptr long int64) -@ stdcall -arch=arm,arm64,x86_64 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) +@ stdcall -arch=!i386 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) @ stdcall RtlWaitOnAddress(ptr ptr long ptr) @ stdcall RtlWakeAddressAll(ptr) @ stdcall RtlWakeAddressSingle(ptr) @@ -1503,8 +1503,8 @@ @ cdecl -private -arch=i386 _CIpow() @ cdecl -private -arch=i386 _CIsin() @ cdecl -private -arch=i386 _CIsqrt() -@ stdcall -arch=x86_64,arm,arm64 __C_specific_handler(ptr long ptr ptr) -@ cdecl -arch=arm,arm64,x86_64 -norelay __chkstk() +@ stdcall -arch=!i386 __C_specific_handler(ptr long ptr ptr) +@ cdecl -arch=!i386 -norelay __chkstk() @ cdecl __isascii(long) @ cdecl __iscsym(long) @ cdecl __iscsymf(long) @@ -1537,7 +1537,7 @@ @ cdecl _itow(long ptr long) @ cdecl _itow_s(long ptr long long) @ cdecl _lfind(ptr ptr ptr long ptr) -@ stdcall -arch=x86_64,arm64 _local_unwind(ptr ptr) +@ stdcall -arch=win64 _local_unwind(ptr ptr) @ cdecl _ltoa(long ptr long) @ cdecl _ltoa_s(long ptr long long) @ cdecl _ltow(long ptr long) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 9791b01e237..6dc8e2d4465 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1200,7 +1200,7 @@ @ stub RtlLookupElementGenericTableAvl @ stub RtlLookupElementGenericTableFull @ stub RtlLookupElementGenericTableFullAvl -@ stdcall -arch=arm,arm64,x86_64 RtlLookupFunctionEntry(long ptr ptr) +@ stdcall -arch=!i386 RtlLookupFunctionEntry(long ptr ptr) @ stdcall RtlMapGenericMask(ptr ptr) @ stub RtlMapSecurityErrorToNtStatus @ stub RtlMergeRangeLists @@ -1240,7 +1240,7 @@ @ stub RtlRealSuccessor @ stub RtlRemoveUnicodePrefix @ stub RtlReserveChunk -@ cdecl -arch=x86_64 RtlRestoreContext(ptr ptr) +@ cdecl -arch=!i386 RtlRestoreContext(ptr ptr) @ stdcall RtlRunOnceBeginInitialize(ptr long ptr) @ stdcall RtlRunOnceComplete(ptr long ptr) @ stdcall RtlRunOnceExecuteOnce(ptr ptr ptr ptr) @@ -1296,7 +1296,7 @@ @ stdcall RtlUnicodeToUTF8N(ptr long ptr ptr long) @ stub RtlUnlockBootStatusData @ stdcall -norelay RtlUnwind(ptr ptr ptr ptr) -@ stdcall -arch=arm64,x86_64 RtlUnwindEx(ptr ptr ptr ptr ptr ptr) +@ stdcall -arch=!i386 RtlUnwindEx(ptr ptr ptr ptr ptr ptr) @ stdcall RtlUpcaseUnicodeChar(long) @ stdcall RtlUpcaseUnicodeString(ptr ptr long) @ stdcall RtlUpcaseUnicodeStringToAnsiString(ptr ptr long) @@ -1312,7 +1312,7 @@ @ stdcall RtlValidSecurityDescriptor(ptr) @ stdcall RtlValidSid(ptr) @ stdcall RtlVerifyVersionInfo(ptr long int64) -@ stdcall -arch=arm64,x86_64 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) +@ stdcall -arch=!i386 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) @ stub RtlVolumeDeviceToDosName @ stub RtlWalkFrameChain @ stdcall RtlWriteRegistryValue(long ptr ptr long ptr long) @@ -1540,8 +1540,8 @@ @ stdcall ZwWaitForSingleObject(long long ptr) NtWaitForSingleObject @ stdcall ZwWriteFile(long long ptr ptr ptr ptr long ptr ptr) NtWriteFile @ stdcall -private ZwYieldExecution() NtYieldExecution -@ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) -@ cdecl -arch=arm,arm64,x86_64 -norelay __chkstk() +@ stdcall -arch=!i386 __C_specific_handler(ptr long ptr ptr) +@ cdecl -arch=!i386 -norelay __chkstk() @ cdecl -private -arch=i386 _CIcos() @ cdecl -private -arch=i386 _CIsin() @ cdecl -private -arch=i386 _CIsqrt() @@ -1568,14 +1568,14 @@ @ cdecl _itoa_s(long ptr long long) @ cdecl _itow(long ptr long) @ cdecl _itow_s(long ptr long long) -@ cdecl -arch=x86_64 _local_unwind(ptr ptr) +@ cdecl -arch=win64 _local_unwind(ptr ptr) @ cdecl -arch=i386 _local_unwind2(ptr long) @ cdecl _ltoa_s(long ptr long long) @ cdecl _ltow_s(long ptr long long) @ cdecl _makepath_s(ptr long str str str str) @ cdecl _purecall() -@ cdecl -arch=i386,x86_64,arm,arm64 -norelay _setjmp(ptr) -@ cdecl -arch=x86_64,arm,arm64 -norelay _setjmpex(ptr ptr) +@ cdecl -norelay _setjmp(ptr) +@ cdecl -arch=!i386 -norelay _setjmpex(ptr ptr) @ varargs _snprintf(ptr long str) @ varargs _snprintf_s(ptr long long str) @ varargs _snscanf_s(str long str) @@ -1628,7 +1628,7 @@ @ cdecl iswdigit(long) @ cdecl iswspace(long) @ cdecl isxdigit(long) -@ cdecl -arch=i386,x86_64,arm,arm64 longjmp(ptr long) +@ cdecl longjmp(ptr long) @ cdecl mbstowcs(ptr str long) @ cdecl mbtowc(ptr str long) @ cdecl memchr(ptr long long)