https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bc62c17a7f96455419d4da4dadb08f537be74d1f

commit bc62c17a7f96455419d4da4dadb08f537be74d1f
Author:     Hermès Bélusca-Maïto <hermes.belusca-ma...@reactos.org>
AuthorDate: Tue Mar 4 18:07:06 2025 +0100
Commit:     Hermès Bélusca-Maïto <hermes.belusca-ma...@reactos.org>
CommitDate: Tue Mar 11 18:59:22 2025 +0100

    [KERNEL32][NTDLL][NTOS][WIN32K] Fix and sync the exports for RtlUnwindEx 
and RtlVirtualUnwind (#7749)
---
 dll/ntdll/def/ntdll.spec         | 4 ++--
 dll/win32/kernel32/kernel32.spec | 2 +-
 ntoskrnl/ntoskrnl.spec           | 4 ++--
 win32ss/win32k.spec              | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dll/ntdll/def/ntdll.spec b/dll/ntdll/def/ntdll.spec
index 0066bd352c4..fa2dabbcc93 100644
--- a/dll/ntdll/def/ntdll.spec
+++ b/dll/ntdll/def/ntdll.spec
@@ -1231,7 +1231,7 @@
 @ stdcall -stub -version=0x600+ RtlUnlockMemoryZone(long)
 @ stdcall -stub -version=0x600+ RtlUnlockModuleSection(long)
 @ stdcall -register RtlUnwind(ptr ptr ptr ptr)
-@ stdcall -arch=x86_64 RtlUnwindEx(long long ptr long ptr)
+@ stdcall -arch=x86_64 RtlUnwindEx(ptr ptr ptr ptr ptr ptr)
 @ stdcall RtlUpcaseUnicodeChar(long)
 @ stdcall RtlUpcaseUnicodeString(ptr ptr long)
 @ stdcall RtlUpcaseUnicodeStringToAnsiString(ptr ptr long)
@@ -1255,7 +1255,7 @@
 @ stdcall RtlValidateProcessHeaps()
 @ stdcall RtlValidateUnicodeString(long ptr)
 @ stdcall RtlVerifyVersionInfo(ptr long double)
-@ stdcall -arch=x86_64 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr)
+@ stdcall -arch=x86_64 RtlVirtualUnwind(long int64 int64 ptr ptr ptr ptr ptr)
 @ stdcall -version=0x600+ RtlWakeAllConditionVariable(ptr)
 @ stdcall -version=0x600+ RtlWakeConditionVariable(ptr)
 @ stdcall RtlWalkFrameChain(ptr long long)
diff --git a/dll/win32/kernel32/kernel32.spec b/dll/win32/kernel32/kernel32.spec
index 149a4f8f7ba..bed72eb2b99 100644
--- a/dll/win32/kernel32/kernel32.spec
+++ b/dll/win32/kernel32/kernel32.spec
@@ -981,7 +981,7 @@
 @ stdcall -arch=x86_64 RtlRestoreContext(ptr ptr) ntdll.RtlRestoreContext
 @ stdcall RtlUnwind(ptr ptr ptr ptr) ntdll.RtlUnwind
 @ stdcall -arch=x86_64 RtlUnwindEx(ptr ptr ptr ptr ptr ptr) ntdll.RtlUnwindEx
-@ stdcall -arch=x86_64 RtlVirtualUnwind(ptr ptr ptr long) 
ntdll.RtlVirtualUnwind
+@ stdcall -arch=x86_64 RtlVirtualUnwind(long int64 int64 ptr ptr ptr ptr ptr) 
ntdll.RtlVirtualUnwind
 @ stdcall RtlZeroMemory(ptr long) ntdll.RtlZeroMemory
 @ stdcall ScrollConsoleScreenBufferA(long ptr ptr ptr ptr)
 @ stdcall ScrollConsoleScreenBufferW(long ptr ptr ptr ptr)
diff --git a/ntoskrnl/ntoskrnl.spec b/ntoskrnl/ntoskrnl.spec
index 4d5bf883c60..6e44fb2c140 100644
--- a/ntoskrnl/ntoskrnl.spec
+++ b/ntoskrnl/ntoskrnl.spec
@@ -1309,7 +1309,7 @@
 @ stdcall RtlUnicodeToOemN(ptr long ptr wstr long)
 @ stdcall RtlUnlockBootStatusData(ptr)
 @ stdcall RtlUnwind(ptr ptr ptr ptr)
-@ cdecl -arch=x86_64 RtlUnwindEx(double double ptr ptr ptr ptr)
+@ stdcall -arch=x86_64,arm RtlUnwindEx(ptr ptr ptr ptr ptr ptr)
 @ stdcall RtlUpcaseUnicodeChar(long)
 @ stdcall RtlUpcaseUnicodeString(ptr ptr long)
 @ stdcall RtlUpcaseUnicodeStringToAnsiString(ptr ptr long)
@@ -1325,7 +1325,7 @@
 @ stdcall RtlValidSecurityDescriptor(ptr)
 @ stdcall RtlValidSid(ptr)
 @ stdcall RtlVerifyVersionInfo(ptr long long long)
-@ cdecl -arch=x86_64 RtlVirtualUnwind(long double double ptr ptr ptr ptr ptr)
+@ stdcall -arch=x86_64,arm RtlVirtualUnwind(long int64 int64 ptr ptr ptr ptr 
ptr)
 @ stdcall RtlVolumeDeviceToDosName(ptr ptr) IoVolumeDeviceToDosName
 @ stdcall RtlWalkFrameChain(ptr long long)
 @ stdcall RtlWriteRegistryValue(long wstr wstr long ptr long)
diff --git a/win32ss/win32k.spec b/win32ss/win32k.spec
index b0555c8e231..4db5c20288e 100644
--- a/win32ss/win32k.spec
+++ b/win32ss/win32k.spec
@@ -206,10 +206,10 @@
 @ stdcall RtlUnicodeToMultiByteN(ptr long ptr ptr long) 
NTOSKRNL.RtlUnicodeToMultiByteN
 @ stdcall RtlUnicodeToMultiByteSize(ptr ptr long) 
NTOSKRNL.RtlUnicodeToMultiByteSize
 @ stdcall RtlUnwind(ptr ptr ptr ptr) NTOSKRNL.RtlUnwind
-@ cdecl -arch=x86_64,arm RtlUnwindEx(double double ptr ptr ptr ptr) 
NTOSKRNL.RtlUnwindEx
+@ stdcall -arch=x86_64,arm RtlUnwindEx(ptr ptr ptr ptr ptr ptr) 
NTOSKRNL.RtlUnwindEx
 @ stdcall RtlUpcaseUnicodeChar(long) NTOSKRNL.RtlUpcaseUnicodeChar
 @ stdcall RtlUpcaseUnicodeToMultiByteN(ptr long ptr ptr long) 
NTOSKRNL.RtlUpcaseUnicodeToMultiByteN
-@ cdecl -arch=x86_64,arm RtlVirtualUnwind(long double double ptr ptr ptr ptr 
ptr) NTOSKRNL.RtlVirtualUnwind
+@ stdcall -arch=x86_64,arm RtlVirtualUnwind(long int64 int64 ptr ptr ptr ptr 
ptr) NTOSKRNL.RtlVirtualUnwind
 @ stdcall -arch=x86_64,arm RtlZeroMemory(ptr long) NTOSKRNL.RtlZeroMemory
 @ stdcall STROBJ_bEnum(ptr ptr ptr)
 @ stdcall STROBJ_bEnumPositionsOnly(ptr ptr ptr)

Reply via email to