[PATCH 0/1] MR8955: ntdll: NtSetEventBoostPriority stub regression fixes for bug #58688
NtSetEventBoostPriority stub regression fixes for: https://bugs.winehq.org/show_bug.cgi?id=58688 Regressive commit: ed9f31120b68e7d684c1544c05d94c38b25cb759 Other stubs were also changed by regress commit and may still be broken. I'll test the other stubs and fix if necessary. In the meantime I'm submitting this merge for review in case I missed anything that may be needed for the other stub fixes. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/8955
From: Stian Low <wineryyyyy(a)gmail.com> --- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/ntsyscalls.h | 5 ++--- dlls/ntdll/unix/sync.c | 10 ++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 ++ dlls/wow64/sync.c | 13 +++++++++++++ include/winternl.h | 1 + 6 files changed, 30 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 604c342ba35..64f35d0b54d 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -386,7 +386,7 @@ @ stdcall -syscall NtSetDefaultUILanguage(long) @ stdcall -syscall NtSetEaFile(long ptr ptr long) @ stdcall -syscall=0x000e NtSetEvent(long ptr) -@ stub -syscall=0x002d NtSetEventBoostPriority +@ stdcall -syscall=0x002d NtSetEventBoostPriority(long) # @ stub NtSetHighEventPair # @ stub NtSetHighWaitLowEventPair @ stdcall -syscall NtSetInformationDebugObject(long long ptr long ptr) @@ -1454,7 +1454,7 @@ @ stdcall -private ZwSetDefaultUILanguage(long) NtSetDefaultUILanguage @ stdcall -private ZwSetEaFile(long ptr ptr long) NtSetEaFile @ stdcall -private ZwSetEvent(long ptr) NtSetEvent -@ stdcall -private ZwSetEventBoostPriority() NtSetEventBoostPriority +@ stdcall -private ZwSetEventBoostPriority(long) NtSetEventBoostPriority # @ stub ZwSetHighEventPair # @ stub ZwSetHighWaitLowEventPair @ stdcall -private ZwSetInformationDebugObject(long long ptr long ptr) NtSetInformationDebugObject diff --git a/dlls/ntdll/ntsyscalls.h b/dlls/ntdll/ntsyscalls.h index cc88ec87850..94ef1c52781 100644 --- a/dlls/ntdll/ntsyscalls.h +++ b/dlls/ntdll/ntsyscalls.h @@ -46,7 +46,7 @@ SYSCALL_ENTRY( 0x002a, NtUnmapViewOfSection, 8 ) \ SYSCALL_ENTRY( 0x002b, NtReplyWaitReceivePortEx, 20 ) \ SYSCALL_ENTRY( 0x002c, NtTerminateProcess, 8 ) \ - SYSCALL_ENTRY( 0x002d, NtSetEventBoostPriority, 0 ) \ + SYSCALL_ENTRY( 0x002d, NtSetEventBoostPriority, 4 ) \ SYSCALL_ENTRY( 0x002e, NtReadFileScatter, 36 ) \ SYSCALL_ENTRY( 0x002f, NtOpenThreadTokenEx, 20 ) \ SYSCALL_ENTRY( 0x0030, NtOpenProcessTokenEx, 16 ) \ @@ -311,7 +311,7 @@ SYSCALL_ENTRY( 0x002a, NtUnmapViewOfSection, 16 ) \ SYSCALL_ENTRY( 0x002b, NtReplyWaitReceivePortEx, 40 ) \ SYSCALL_ENTRY( 0x002c, NtTerminateProcess, 16 ) \ - SYSCALL_ENTRY( 0x002d, NtSetEventBoostPriority, 0 ) \ + SYSCALL_ENTRY( 0x002d, NtSetEventBoostPriority, 8 ) \ SYSCALL_ENTRY( 0x002e, NtReadFileScatter, 72 ) \ SYSCALL_ENTRY( 0x002f, NtOpenThreadTokenEx, 40 ) \ SYSCALL_ENTRY( 0x0030, NtOpenProcessTokenEx, 32 ) \ @@ -530,7 +530,6 @@ SYSCALL_STUB( NtApphelpCacheControl ) \ SYSCALL_STUB( NtCreateProcessEx ) \ SYSCALL_STUB( NtMapUserPhysicalPagesScatter ) \ - SYSCALL_STUB( NtSetEventBoostPriority ) \ SYSCALL_STUB( NtTraceEvent ) \ SYSCALL_STUB( NtWaitForMultipleObjects32 ) \ SYSCALL_STUB( NtWorkerFactoryWorkerReady ) diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index acdb7b3d9f8..e54a7f2ac25 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -644,6 +644,16 @@ NTSTATUS WINAPI NtSetEvent( HANDLE handle, LONG *prev_state ) } +/****************************************************************************** + * NtSetEventBoostPriority (NTDLL.@) + */ +NTSTATUS WINAPI NtSetEventBoostPriority( HANDLE handle ) +{ + FIXME( "(%p),stub!\n", handle ); + return STATUS_NOT_IMPLEMENTED; +} + + /****************************************************************************** * NtResetEvent (NTDLL.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 95ba78f6a24..bf13609cb19 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -829,6 +829,7 @@ @ stdcall NtRequestWaitReplyPort(ptr ptr ptr) @ stdcall NtSetEaFile(long ptr ptr long) @ stdcall NtSetEvent(long ptr) +@ stdcall NtSetEventBoostPriority(long) @ stdcall NtSetInformationFile(long ptr ptr long long) @ stdcall NtSetInformationProcess(long long ptr long) @ stdcall NtSetInformationThread(long long ptr long) @@ -1518,6 +1519,7 @@ @ stdcall -private ZwSetDefaultUILanguage(long) NtSetDefaultUILanguage @ stdcall -private ZwSetEaFile(long ptr ptr long) NtSetEaFile @ stdcall ZwSetEvent(long ptr) NtSetEvent +@ stdcall -private ZwNtSetEventBoostPriority(long) NtSetEventBoostPriority @ stdcall -private ZwSetInformationFile(long ptr ptr long long) NtSetInformationFile @ stdcall -private ZwSetInformationJobObject(long long ptr long) NtSetInformationJobObject @ stdcall -private ZwSetInformationKey(long long ptr long) NtSetInformationKey diff --git a/dlls/wow64/sync.c b/dlls/wow64/sync.c index 537e695cc87..466bccefad9 100644 --- a/dlls/wow64/sync.c +++ b/dlls/wow64/sync.c @@ -1392,6 +1392,19 @@ NTSTATUS WINAPI wow64_NtSetEvent( UINT *args ) } +/********************************************************************** + * wow64_NtSetEventBoostPriority + */ +NTSTATUS WINAPI wow64_NtSetEventBoostPriority( UINT *args ) +{ + + HANDLE handle = get_handle( &args ); + + FIXME( "%p: stub\n", handle ); + return STATUS_NOT_IMPLEMENTED; +} + + /********************************************************************** * wow64_NtSetInformationDebugObject */ diff --git a/include/winternl.h b/include/winternl.h index 8c7ab65e20c..cc7d1a978a5 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4719,6 +4719,7 @@ NTSYSAPI NTSTATUS WINAPI NtSetDefaultLocale(BOOLEAN,LCID); NTSYSAPI NTSTATUS WINAPI NtSetDefaultUILanguage(LANGID); NTSYSAPI NTSTATUS WINAPI NtSetEaFile(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG); NTSYSAPI NTSTATUS WINAPI NtSetEvent(HANDLE,LONG*); +NTSYSAPI NTSTATUS WINAPI NtSetEventBoostPriority(HANDLE); NTSYSAPI NTSTATUS WINAPI NtSetHighEventPair(HANDLE); NTSYSAPI NTSTATUS WINAPI NtSetHighWaitLowEventPair(HANDLE); NTSYSAPI NTSTATUS WINAPI NtSetHighWaitLowThread(VOID); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8955
It's not clear, but I think this should actually set the event (i.e. it's "set while boosting priority", not "set the event's boost priority"). Tests would be helpful to confirm or refute this. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/8955#note_115702
participants (3)
-
Elizabeth Figura (＠zfigura) -
Stian Low
-
Stian Low (＠stianlow)