[PATCH 1/2] ntdll: Fix RtlDeleteGrowableFunctionTable() calling convention.

[Zhiyi Zhang]

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com>
---
  dlls/ntdll/ntdll.spec        | 2 +-
  dlls/ntdll/tests/exception.c | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
index 415a43ab53..0a017185ee 100644
--- a/dlls/ntdll/ntdll.spec
+++ b/dlls/ntdll/ntdll.spec
@@ -572,7 +572,7 @@
  @ stdcall RtlDeleteAce(ptr long)
  @ stdcall RtlDeleteAtomFromAtomTable(ptr long)
  @ stdcall RtlDeleteCriticalSection(ptr)
-@ cdecl -arch=arm,arm64,x86_64 RtlDeleteGrowableFunctionTable(ptr)
+@ stdcall -arch=arm,arm64,x86_64 RtlDeleteGrowableFunctionTable(ptr)
  @ stub RtlDeleteElementGenericTable
  @ stub RtlDeleteElementGenericTableAvl
  @ cdecl -arch=arm,arm64,x86_64 RtlDeleteFunctionTable(ptr)
diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c
index 7b77cbb795..c016527e92 100644
--- a/dlls/ntdll/tests/exception.c
+++ b/dlls/ntdll/tests/exception.c
@@ -152,7 +152,7 @@ static BOOLEAN   (CDECL 
*pRtlInstallFunctionTableCallback)(DWORD64, DWORD64, DWO
  static PRUNTIME_FUNCTION (WINAPI *pRtlLookupFunctionEntry)(ULONG64, 
ULONG64*, UNWIND_HISTORY_TABLE*);
  static DWORD     (CDECL *pRtlAddGrowableFunctionTable)(void**, 
RUNTIME_FUNCTION*, DWORD, DWORD, ULONG_PTR, ULONG_PTR);
  static void      (CDECL *pRtlGrowFunctionTable)(void*, DWORD);
-static void      (CDECL *pRtlDeleteGrowableFunctionTable)(void*);
+static void      (WINAPI *pRtlDeleteGrowableFunctionTable)(void*);
  static EXCEPTION_DISPOSITION (WINAPI 
*p__C_specific_handler)(EXCEPTION_RECORD*, ULONG64, CONTEXT*, 
DISPATCHER_CONTEXT*);
  static VOID      (WINAPI *pRtlCaptureContext)(CONTEXT*);
  static VOID      (CDECL *pRtlRestoreContext)(CONTEXT*, EXCEPTION_RECORD*);
-- 
2.20.1

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=63278

Your paranoid android.


=== build (build log) ===

error: corrupt patch at line 25
Task: Patch failed to apply

=== debian10 (build log) ===

error: corrupt patch at line 25
Task: Patch failed to apply

=== debian10 (build log) ===

error: corrupt patch at line 25
Task: Patch failed to apply