-- v2: ntdll: Add extra logging for NtRaiseHardError(). ntdll: Fix params_mask type in NtRaiseHardError().
From: Aida Jonikienė aidas957@gmail.com
Real-world app testing reveals that parameter isn't used as a pointer (so change it to an integer). --- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/signal_arm64ec.c | 2 +- dlls/ntdll/unix/system.c | 2 +- include/winternl.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 80ed2d8f020..ad528964cad 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -340,7 +340,7 @@ @ stdcall -syscall NtQueueApcThread(long ptr long long long) @ stdcall -syscall NtQueueApcThreadEx(long long ptr long long long) @ stdcall -syscall NtRaiseException(ptr ptr long) -@ stdcall -syscall NtRaiseHardError(long long ptr ptr long ptr) +@ stdcall -syscall NtRaiseHardError(long long long ptr long ptr) @ stdcall -syscall NtReadFile(long long ptr ptr ptr ptr long ptr ptr) @ stdcall -syscall NtReadFileScatter(long long ptr ptr ptr ptr long ptr ptr) # @ stub NtReadRequestData @@ -1389,7 +1389,7 @@ @ stdcall -private -syscall ZwQueueApcThread(long ptr long long long) NtQueueApcThread @ stdcall -private -syscall ZwQueueApcThreadEx(long long ptr long long long) NtQueueApcThreadEx @ stdcall -private -syscall ZwRaiseException(ptr ptr long) NtRaiseException -@ stdcall -private -syscall ZwRaiseHardError(long long ptr ptr long ptr) NtRaiseHardError +@ stdcall -private -syscall ZwRaiseHardError(long long long ptr long ptr) NtRaiseHardError @ stdcall -private -syscall ZwReadFile(long long ptr ptr ptr ptr long ptr ptr) NtReadFile @ stdcall -private -syscall ZwReadFileScatter(long long ptr ptr ptr ptr long ptr ptr) NtReadFileScatter # @ stub ZwReadRequestData diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index 44b026fc044..393d5f7e697 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -270,7 +270,7 @@ DEFINE_SYSCALL(NtQueryVolumeInformationFile, (HANDLE handle, IO_STATUS_BLOCK *io DEFINE_SYSCALL(NtQueueApcThread, (HANDLE handle, PNTAPCFUNC func, ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3)) DEFINE_SYSCALL(NtQueueApcThreadEx, (HANDLE handle, HANDLE reserve_handle, PNTAPCFUNC func, ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3)) DEFINE_WRAPPED_SYSCALL(NtRaiseException, (EXCEPTION_RECORD *rec, ARM64_NT_CONTEXT *context, BOOL first_chance)) -DEFINE_SYSCALL(NtRaiseHardError, (NTSTATUS status, ULONG count, UNICODE_STRING *params_mask, void **params, HARDERROR_RESPONSE_OPTION option, HARDERROR_RESPONSE *response)) +DEFINE_SYSCALL(NtRaiseHardError, (NTSTATUS status, ULONG count, ULONG params_mask, void **params, HARDERROR_RESPONSE_OPTION option, HARDERROR_RESPONSE *response)) DEFINE_SYSCALL(NtReadFile, (HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, void *buffer, ULONG length, LARGE_INTEGER *offset, ULONG *key)) DEFINE_SYSCALL(NtReadFileScatter, (HANDLE file, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, FILE_SEGMENT_ELEMENT *segments, ULONG length, LARGE_INTEGER *offset, ULONG *key)) DEFINE_SYSCALL(NtReadVirtualMemory, (HANDLE process, const void *addr, void *buffer, SIZE_T size, SIZE_T *bytes_read)) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index eb5e60af7b9..3da5ed42358 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -4073,7 +4073,7 @@ NTSTATUS WINAPI NtDisplayString( UNICODE_STRING *string ) * NtRaiseHardError (NTDLL.@) */ NTSTATUS WINAPI NtRaiseHardError( NTSTATUS status, ULONG count, - UNICODE_STRING *params_mask, void **params, + ULONG params_mask, void **params, HARDERROR_RESPONSE_OPTION option, HARDERROR_RESPONSE *response ) { FIXME( "%08x stub\n", (int)status ); diff --git a/include/winternl.h b/include/winternl.h index 22cdceeaedb..8406d4b8d46 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4564,7 +4564,7 @@ NTSYSAPI NTSTATUS WINAPI NtQueryLicenseValue(const UNICODE_STRING *,ULONG *,PVO NTSYSAPI NTSTATUS WINAPI NtQueryVirtualMemory(HANDLE,LPCVOID,MEMORY_INFORMATION_CLASS,PVOID,SIZE_T,SIZE_T*); NTSYSAPI NTSTATUS WINAPI NtQueryVolumeInformationFile(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG,FS_INFORMATION_CLASS); NTSYSAPI NTSTATUS WINAPI NtRaiseException(PEXCEPTION_RECORD,PCONTEXT,BOOL); -NTSYSAPI NTSTATUS WINAPI NtRaiseHardError(NTSTATUS,ULONG,PUNICODE_STRING,PVOID*,HARDERROR_RESPONSE_OPTION,PHARDERROR_RESPONSE); +NTSYSAPI NTSTATUS WINAPI NtRaiseHardError(NTSTATUS,ULONG,ULONG,PVOID*,HARDERROR_RESPONSE_OPTION,PHARDERROR_RESPONSE); NTSYSAPI NTSTATUS WINAPI NtReadFile(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,PVOID,ULONG,PLARGE_INTEGER,PULONG); NTSYSAPI NTSTATUS WINAPI NtReadFileScatter(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,FILE_SEGMENT_ELEMENT*,ULONG,PLARGE_INTEGER,PULONG); NTSYSAPI NTSTATUS WINAPI NtReadRequestData(HANDLE,PLPC_MESSAGE,ULONG,PVOID,ULONG,PULONG);
From: Aida Jonikienė aidas957@gmail.com
wow64 already has this (also add the 0x prefix for hex values). --- dlls/ntdll/unix/system.c | 2 +- dlls/wow64/system.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 3da5ed42358..efb6e7f4579 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -4076,7 +4076,7 @@ NTSTATUS WINAPI NtRaiseHardError( NTSTATUS status, ULONG count, ULONG params_mask, void **params, HARDERROR_RESPONSE_OPTION option, HARDERROR_RESPONSE *response ) { - FIXME( "%08x stub\n", (int)status ); + FIXME( "%#08x %u %#x %p %u %p: stub\n", (int)status, (int)count, (int)params_mask, params, option, response ); return STATUS_NOT_IMPLEMENTED; }
diff --git a/dlls/wow64/system.c b/dlls/wow64/system.c index 6e78c462984..0fca81323b2 100644 --- a/dlls/wow64/system.c +++ b/dlls/wow64/system.c @@ -708,7 +708,7 @@ NTSTATUS WINAPI wow64_NtRaiseHardError( UINT *args ) HARDERROR_RESPONSE_OPTION option = get_ulong( &args ); HARDERROR_RESPONSE *response = get_ptr( &args );
- FIXME( "%08lx %lu %lx %p %u %p: stub\n", status, count, params_mask, params, option, response ); + FIXME( "%#08lx %lu %lx %p %u %p: stub\n", status, count, params_mask, params, option, response ); return STATUS_NOT_IMPLEMENTED; }
From https://chromium.googlesource.com/chromium/chromium/+/master/chrome/app/hard..., the third parameter is indeed a ULONG.
This merge request was approved by Zhiyi Zhang.
-
Aida Jonikienė -
Aida Jonikienė (＠DodoGTA)
-
Zhiyi Zhang (＠zhiyi)