From: Gabriel Ivăncescu gabrielopcode@gmail.com
It conflicts with __chkstk from kernelbase.
Signed-off-by: Gabriel Ivăncescu gabrielopcode@gmail.com --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 ++++---- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 45b8e1ab1c1..993b98426f3 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -4148,9 +4148,9 @@ NTSTATUS WINAPI IoCreateFile(HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBUT */ #ifdef __x86_64__ /* Supposed to touch all the stack pages, but we shouldn't need that. */ -__ASM_GLOBAL_FUNC( __chkstk, "ret" ); +__ASM_GLOBAL_FUNC( NTOSKRNL___chkstk, "ret" ); #elif defined(__i386__) -__ASM_GLOBAL_FUNC( _chkstk, +__ASM_GLOBAL_FUNC( NTOSKRNL__chkstk, "negl %eax\n\t" "addl %esp,%eax\n\t" "xchgl %esp,%eax\n\t" @@ -4159,11 +4159,11 @@ __ASM_GLOBAL_FUNC( _chkstk, "ret" ) #elif defined(__arm__) /* Incoming r4 contains words to allocate, converting to bytes then return */ -__ASM_GLOBAL_FUNC( __chkstk, "lsl r4, r4, #2\n\t" +__ASM_GLOBAL_FUNC( NTOSKRNL___chkstk, "lsl r4, r4, #2\n\t" "bx lr" ) #elif defined(__aarch64__) /* Supposed to touch all the stack pages, but we shouldn't need that. */ -__ASM_GLOBAL_FUNC( __chkstk, "ret" ); +__ASM_GLOBAL_FUNC( NTOSKRNL___chkstk, "ret" ); #endif
/********************************************************************* diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index aa7831eac5f..dbdc83dee2a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1543,7 +1543,7 @@ @ stdcall ZwWriteFile(long long ptr ptr ptr ptr long ptr ptr) NtWriteFile @ stdcall -private ZwYieldExecution() NtYieldExecution @ stdcall -arch=!i386 __C_specific_handler(ptr long ptr ptr) -@ cdecl -arch=!i386 -norelay __chkstk() +@ cdecl -arch=!i386 -norelay __chkstk() NTOSKRNL___chkstk @ cdecl -private -arch=i386 _CIcos() @ cdecl -private -arch=i386 _CIsin() @ cdecl -private -arch=i386 _CIsqrt() @@ -1559,7 +1559,7 @@ @ cdecl -arch=i386 -norelay _aulldvrm(int64 int64) @ cdecl -arch=i386 -norelay -ret64 _aullrem(int64 int64) @ cdecl -arch=i386 -norelay -ret64 _aullshr(int64 long) -@ cdecl -arch=i386 -norelay _chkstk() +@ cdecl -arch=i386 -norelay _chkstk() NTOSKRNL__chkstk @ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr) @ cdecl -arch=i386 _except_handler3(ptr ptr ptr ptr) @ cdecl _finite(double)