From 1289a860de18934c31f5f60ffbe967fe0bf4e968 Mon Sep 17 00:00:00 2001 From: Nikolay Sivov Date: Tue, 29 Nov 2016 09:50:19 +0300 Subject: [PATCH] ntdll: Fix RtlAssert() prototype. Signed-off-by: Nikolay Sivov Signed-off-by: Alexandre Julliard --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/rtl.c | 5 +++-- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 4fd944ed113..57f00c00145 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -448,7 +448,7 @@ @ stdcall RtlAreBitsClear(ptr long long) @ stdcall RtlAreBitsSet(ptr long long) # @ stub RtlAssert2 -@ stdcall RtlAssert(ptr ptr long long) +@ stdcall RtlAssert(ptr ptr long str) # @ stub RtlCancelTimer @ stdcall -norelay RtlCaptureContext(ptr) @ stdcall RtlCaptureStackBackTrace(long long ptr ptr) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 3e985d5d266..c309e10df6b 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -564,9 +564,10 @@ void WINAPI RtlCopyMemory(void *dest, const void *src, SIZE_T len) * NOTES * Not implemented in non-debug versions. */ -void WINAPI RtlAssert(LPVOID x1,LPVOID x2,DWORD x3, DWORD x4) +void WINAPI RtlAssert(void *assertion, void *filename, ULONG linenumber, char *message) { - FIXME("(%p,%p,0x%08x,0x%08x),stub\n",x1,x2,x3,x4); + FIXME("(%s, %s, %u, %s): stub\n", debugstr_a((char*)assertion), debugstr_a((char*)filename), + linenumber, debugstr_a(message)); } /************************************************************************* diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index b379beb22a8..50c442ad077 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -945,7 +945,7 @@ @ stdcall RtlAreAnyAccessesGranted(long long) ntdll.RtlAreAnyAccessesGranted @ stdcall RtlAreBitsClear(ptr long long) ntdll.RtlAreBitsClear @ stdcall RtlAreBitsSet(ptr long long) ntdll.RtlAreBitsSet -@ stdcall RtlAssert(ptr ptr long long) ntdll.RtlAssert +@ stdcall RtlAssert(ptr ptr long str) ntdll.RtlAssert @ stdcall -norelay RtlCaptureContext(ptr) ntdll.RtlCaptureContext @ stdcall RtlCaptureStackBackTrace(long long ptr ptr) ntdll.RtlCaptureStackBackTrace @ stdcall RtlCharToInteger(ptr long ptr) ntdll.RtlCharToInteger -- 2.11.4.GIT