[PATCH 0/1] MR5683: ntdll: Fill object pointer in NtQueryInformation( SystemHandleInformation / SystemExtendedHandleInformation ).
From: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/tests/info.c | 37 +++++++++++++++++++++++++++++++------ dlls/ntdll/unix/system.c | 4 ++-- server/handle.c | 2 ++ server/protocol.def | 2 ++ tools/make_requests | 2 +- 5 files changed, 38 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 8e8abbfb467..db45a9c451b 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -852,12 +852,17 @@ static void test_query_handle(void) ULONG ExpectedLength, ReturnLength; ULONG SystemInformationLength = sizeof(SYSTEM_HANDLE_INFORMATION); SYSTEM_HANDLE_INFORMATION* shi = HeapAlloc(GetProcessHeap(), 0, SystemInformationLength); - HANDLE EventHandle; + HANDLE EventHandle, handle_dup; + void *obj1, *obj2; BOOL found, ret; INT i; EventHandle = CreateEventA(NULL, FALSE, FALSE, NULL); ok( EventHandle != NULL, "CreateEventA failed %lu\n", GetLastError() ); + + ret = DuplicateHandle(GetCurrentProcess(), EventHandle, GetCurrentProcess(), &handle_dup, 0, TRUE, DUPLICATE_SAME_ACCESS); + ok(ret, "got error %lu\n", GetLastError()); + ret = SetHandleInformation(EventHandle, HANDLE_FLAG_INHERIT | HANDLE_FLAG_PROTECT_FROM_CLOSE, HANDLE_FLAG_INHERIT | HANDLE_FLAG_PROTECT_FROM_CLOSE); ok(ret, "got error %lu\n", GetLastError()); @@ -881,6 +886,7 @@ static void test_query_handle(void) memset(shi, 0x55, SystemInformationLength); status = pNtQuerySystemInformation(SystemHandleInformation, shi, SystemInformationLength, &ReturnLength); } + CloseHandle(handle_dup); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status ); ExpectedLength = FIELD_OFFSET(SYSTEM_HANDLE_INFORMATION, Handle[shi->Count]); ok( ReturnLength == ExpectedLength || broken(ReturnLength == ExpectedLength - sizeof(DWORD)), /* Vista / 2008 */ @@ -895,19 +901,37 @@ static void test_query_handle(void) goto done; } - found = FALSE; + obj1 = obj2 = (void *)0xdeadbeef; for (i = 0; i < shi->Count; i++) { if (shi->Handle[i].OwnerPid == GetCurrentProcessId() && (HANDLE)(ULONG_PTR)shi->Handle[i].HandleValue == EventHandle) { + ok(obj1 == (void *)0xdeadbeef, "Found duplicate.\n"); ok(shi->Handle[i].HandleFlags == (OBJ_INHERIT | OBJ_PROTECT_CLOSE), "got attributes %#x\n", shi->Handle[i].HandleFlags); - found = TRUE; - break; + obj1 = shi->Handle[i].ObjectPointer; + } + if (shi->Handle[i].OwnerPid == GetCurrentProcessId() && + (HANDLE)(ULONG_PTR)shi->Handle[i].HandleValue == handle_dup) + { + ok(obj2 == (void *)0xdeadbeef, "Found duplicate.\n"); + ok(shi->Handle[i].HandleFlags == OBJ_INHERIT, "got attributes %#x\n", shi->Handle[i].HandleFlags); + obj2 = shi->Handle[i].ObjectPointer; } + ok((ULONG_PTR)shi->Handle[i].ObjectPointer > (ULONG_PTR)0xffff000000000000, "got %p.\n", + shi->Handle[i].ObjectPointer); + } + ok(obj1 != (void *)0xdeadbeef, "Didn't find %p (pid %lx).\n", EventHandle, GetCurrentProcessId()); + ok(obj1 == obj2, "got %p, %p.\n", obj1, obj2); + + for (i = 0; i < shi->Count; i++) + { + if (!(shi->Handle[i].OwnerPid == GetCurrentProcessId() + && ((HANDLE)(ULONG_PTR)shi->Handle[i].HandleValue == EventHandle + || (HANDLE)(ULONG_PTR)shi->Handle[i].HandleValue == handle_dup))) + ok(shi->Handle[i].ObjectPointer != obj1, "Got same object.\n"); } - ok( found, "Expected to find event handle %p (pid %lx) in handle list\n", EventHandle, GetCurrentProcessId() ); ret = SetHandleInformation(EventHandle, HANDLE_FLAG_PROTECT_FROM_CLOSE, 0); ok(ret, "got error %lu\n", GetLastError()); @@ -997,11 +1021,12 @@ static void test_query_handle_ex(void) found = FALSE; for (i = 0; i < info->NumberOfHandles; ++i) { + ok((ULONG_PTR)info->Handles[i].Object > (ULONG_PTR)0xffff000000000000, "got %p.\n", info->Handles[i].Object); if (info->Handles[i].UniqueProcessId == GetCurrentProcessId() && (HANDLE)info->Handles[i].HandleValue == event) { + ok(!found, "Found duplicate.\n"); found = TRUE; - break; } } ok(!found, "event handle found\n"); diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index b7c424b6548..05fb21f8acf 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2922,7 +2922,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, shi->Handle[i].AccessMask = handle_info[i].access; shi->Handle[i].HandleFlags = handle_info[i].attributes; shi->Handle[i].ObjectType = handle_info[i].type; - /* FIXME: Fill out ObjectPointer */ + shi->Handle[i].ObjectPointer = wine_server_get_ptr( handle_info[i].object ); } } else if (ret == STATUS_BUFFER_TOO_SMALL) @@ -3143,7 +3143,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, shi->Handles[i].GrantedAccess = handle_info[i].access; shi->Handles[i].HandleAttributes = handle_info[i].attributes; shi->Handles[i].ObjectTypeIndex = handle_info[i].type; - /* FIXME: Fill out Object */ + shi->Handles[i].Object = wine_server_get_ptr( handle_info[i].object ); } } else if (ret == STATUS_BUFFER_TOO_SMALL) diff --git a/server/handle.c b/server/handle.c index ef243e06e0b..167834fccc0 100644 --- a/server/handle.c +++ b/server/handle.c @@ -27,6 +27,7 @@ #include <stdio.h> #include <stdlib.h> #include <sys/types.h> +#include <stdint.h> #include "ntstatus.h" #define WIN32_NO_STATUS @@ -857,6 +858,7 @@ static int enum_handles( struct process *process, void *user ) handle->access = entry->access & ~RESERVED_ALL; handle->type = entry->ptr->ops->type->index; handle->attributes = 0; + handle->object = (client_ptr_t)(uintptr_t)entry->ptr | (client_ptr_t)0xffff000000000000; if (entry->access & RESERVED_INHERIT) handle->attributes |= OBJ_INHERIT; if (entry->access & RESERVED_CLOSE_PROTECT) handle->attributes |= OBJ_PROTECT_CLOSE; info->count--; diff --git a/server/protocol.def b/server/protocol.def index 37a39206ca4..b67a704be73 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3361,11 +3361,13 @@ enum caret_state struct handle_info { + client_ptr_t object; process_id_t owner; obj_handle_t handle; unsigned int access; unsigned int attributes; unsigned int type; + unsigned int __pad; }; /* Return a list of all opened handles */ diff --git a/tools/make_requests b/tools/make_requests index 419b1264ea4..6a84da1ee22 100755 --- a/tools/make_requests +++ b/tools/make_requests @@ -64,7 +64,7 @@ my %formats = "startup_info_t" => [ 96, 4 ], "user_apc_t" => [ 40, 8 ], "struct filesystem_event" => [ 12, 4 ], - "struct handle_info" => [ 20, 4 ], + "struct handle_info" => [ 32, 8 ], "struct luid_attr" => [ 12, 4 ], "struct object_attributes" => [ 16, 4 ], "struct object_type_info" => [ 44, 4 ], -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5683
The Finals now depends on that. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5683#note_70789
For consistency with x86-64 canonical addresses ```suggestion:-0+0 handle->object = (client_ptr_t)(uintptr_t)entry->ptr | (client_ptr_t)0xffff800000000000; ``` -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5683#note_71035
```suggestion:-0+0 ok((ULONG_PTR)info->Handles[i].Object > (ULONG_PTR)0xffff800000000000, "got %p.\n", info->Handles[i].Object); ``` -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5683#note_71036
```suggestion:-0+0 ok((ULONG_PTR)shi->Handle[i].ObjectPointer > (ULONG_PTR)0xffff800000000000, "got %p.\n", ``` -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5683#note_71037
participants (3)
-
Jinoh Kang (＠iamahuman) -
Paul Gofman
-
Paul Gofman (＠gofman)