[PATCH v2 0/1] MR3096: ntdll: Add NtGetNextProcess stub.
The stub is enough for TokenViewer.exe to start up and display its user interface. Based on a patch by Nikolay Sivov. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45119 -- v2: ntdll: Add NtGetNextProcess stub. https://gitlab.winehq.org/wine/wine/-/merge_requests/3096
From: Alex Henrie <alexhenrie24(a)gmail.com> The stub is enough for TokenViewer.exe to start up and display its user interface. Based on a patch by Nikolay Sivov. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45119 --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/unix/loader.c | 1 + dlls/ntdll/unix/process.c | 12 ++++++++++++ dlls/wow64/process.c | 21 +++++++++++++++++++++ dlls/wow64/syscall.h | 1 + include/winternl.h | 1 + 6 files changed, 37 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 80277005672..55631a04652 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -230,6 +230,7 @@ @ stdcall -norelay -syscall NtGetContextThread(long ptr) @ stdcall -syscall NtGetCurrentProcessorNumber() # @ stub NtGetDevicePowerState +@ stdcall -syscall NtGetNextProcess(ptr long long long ptr) @ stdcall -syscall NtGetNextThread(ptr ptr long long long ptr) @ stdcall -syscall NtGetNlsSectionPtr(long long long ptr ptr) # @ stub NtGetPlugPlayEvent diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 28f0c4bf245..17e68a42030 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -192,6 +192,7 @@ static void * const syscalls[] = NtFsControlFile, NtGetContextThread, NtGetCurrentProcessorNumber, + NtGetNextProcess, NtGetNextThread, NtGetNlsSectionPtr, NtGetWriteWatch, diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index fa8022d9968..a349a850110 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -1776,6 +1776,18 @@ NTSTATUS WINAPI NtResumeProcess( HANDLE handle ) } +/********************************************************************** + * NtGetNextProcess (NTDLL.@) + */ +NTSTATUS WINAPI NtGetNextProcess( HANDLE process, ACCESS_MASK access, ULONG attributes, + ULONG flags, HANDLE *handle ) +{ + FIXME( "process %p, access %#x, attributes %#x, flags %#x, handle %p. stub!\n", + process, (int)access, (int)attributes, (int)flags, handle ); + return STATUS_NOT_IMPLEMENTED; +} + + /********************************************************************** * NtDebugActiveProcess (NTDLL.@) */ diff --git a/dlls/wow64/process.c b/dlls/wow64/process.c index 2182491bbfb..e4838d3d58d 100644 --- a/dlls/wow64/process.c +++ b/dlls/wow64/process.c @@ -449,6 +449,27 @@ NTSTATUS WINAPI wow64_NtFlushProcessWriteBuffers( UINT *args ) } +/********************************************************************** + * wow64_NtGetNextProcess + */ +NTSTATUS WINAPI wow64_NtGetNextProcess( UINT *args ) +{ + HANDLE process = get_handle( &args ); + ACCESS_MASK access = get_ulong( &args ); + ULONG attributes = get_ulong( &args ); + ULONG flags = get_ulong( &args ); + ULONG *handle_ptr = get_ptr( &args ); + + HANDLE handle = 0; + NTSTATUS status; + + *handle_ptr = 0; + status = NtGetNextProcess( process, access, attributes, flags, &handle ); + put_handle( handle_ptr, handle ); + return status; +} + + /********************************************************************** * wow64_NtGetNextThread */ diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index 59586d3fbfa..c586ab5b2bb 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -96,6 +96,7 @@ SYSCALL_ENTRY( NtFsControlFile ) \ SYSCALL_ENTRY( NtGetContextThread ) \ SYSCALL_ENTRY( NtGetCurrentProcessorNumber ) \ + SYSCALL_ENTRY( NtGetNextProcess ) \ SYSCALL_ENTRY( NtGetNextThread ) \ SYSCALL_ENTRY( NtGetNlsSectionPtr ) \ SYSCALL_ENTRY( NtGetWriteWatch ) \ diff --git a/include/winternl.h b/include/winternl.h index 455e199f3e1..b59b61e6b02 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4180,6 +4180,7 @@ NTSYSAPI NTSTATUS WINAPI NtFreeVirtualMemory(HANDLE,PVOID*,SIZE_T*,ULONG); NTSYSAPI NTSTATUS WINAPI NtFsControlFile(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,ULONG,PVOID,ULONG,PVOID,ULONG); NTSYSAPI NTSTATUS WINAPI NtGetContextThread(HANDLE,CONTEXT*); NTSYSAPI ULONG WINAPI NtGetCurrentProcessorNumber(void); +NTSYSAPI NTSTATUS WINAPI NtGetNextProcess(HANDLE,ACCESS_MASK,ULONG,ULONG,HANDLE*); NTSYSAPI NTSTATUS WINAPI NtGetNextThread(HANDLE,HANDLE,ACCESS_MASK,ULONG,ULONG,HANDLE*); NTSYSAPI NTSTATUS WINAPI NtGetNlsSectionPtr(ULONG,ULONG,void*,void**,SIZE_T*); NTSYSAPI NTSTATUS WINAPI NtGetPlugPlayEvent(ULONG,ULONG,PVOID,ULONG); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/3096
On Mon Jun 19 02:27:11 2023 +0000, Nikolay Sivov wrote:
I don't think this has to be a stub, we have NtGetNextThread() in already. Also this is missing corresponding wow64 changes. I've added the missing wow64 part (initially I only tested 32-bit, now I know that changes like this need 64-bit testing as well).
The app in the linked bug report definitely benefits from the stub. Is it going to hurt something to add a stub before adding a full implementation? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3096#note_36075
On Mon Jun 19 02:27:11 2023 +0000, Alex Henrie wrote:
I've added the missing wow64 part (initially I only tested 32-bit, now I know that changes like this need 64-bit testing as well). The app in the linked bug report definitely benefits from the stub. Is it going to hurt something to add a stub before adding a full implementation? it's not that tricky to add an implementation and a majority of it can be copied over from get_next_thread, so I think it's probably better just to add an implementation now rather than later
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/3096#note_36077
On Mon Jun 19 03:15:25 2023 +0000, Etaash Mathamsetty wrote:
it's not that tricky to add an implementation and a majority of it can be copied over from get_next_thread, so I think it's probably better just to add an implementation now rather than later If you want to add an implementation, by all means go for it. I was just trying to be nice and address a neglected bug report.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/3096#note_36078
participants (3)
-
Alex Henrie -
Alex Henrie (＠alexhenrie)
-
Etaash Mathamsetty (＠etaash.mathamsetty)