Skip to content

W
wine-winehq
Commit 7e521b4d authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

ntdll: Fix returned length for some info classes in NtQueryInformationProcess().

parent 7107a9b1
Hide whitespace changes
Inline Side-by-side
Showing with 81 additions and 58 deletions
dlls/ntdll/tests/info.c
View file @ 7e521b4d
......@@ -1760,7 +1760,7 @@ static void test_query_process_wow64(void)
ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
ok( pbi[0] == dummy, "pbi[0] changed to %Ix\n", pbi[0]);
ok( pbi[1] == dummy, "pbi[1] changed to %Ix\n", pbi[1]);
todo_wine ok( ReturnLength == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", ReturnLength);
ok( ReturnLength == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", ReturnLength);
/* Everything is correct except a too large buffer size */
pbi[0] = pbi[1] = dummy;
......@@ -1769,7 +1769,7 @@ static void test_query_process_wow64(void)
ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
ok( pbi[0] == dummy, "pbi[0] changed to %Ix\n", pbi[0]);
ok( pbi[1] == dummy, "pbi[1] changed to %Ix\n", pbi[1]);
todo_wine ok( ReturnLength == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", ReturnLength);
ok( ReturnLength == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", ReturnLength);
}
static void test_query_process_basic(void)
......@@ -2041,6 +2041,7 @@ static void test_query_process_debug_port(int argc, char **argv)
STARTUPINFOA si = { 0 };
NTSTATUS status;
BOOL ret;
ULONG len;
sprintf(cmdline, "%s %s %s", argv[0], argv[1], "debuggee");
......@@ -2061,27 +2062,40 @@ static void test_query_process_debug_port(int argc, char **argv)
NULL, sizeof(debug_port), NULL);
ok(status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %#lx.\n", status);
len = 0xdeadbeef;
status = NtQueryInformationProcess(NULL, ProcessDebugPort,
&debug_port, sizeof(debug_port), NULL);
&debug_port, sizeof(debug_port), &len);
ok(status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %#lx.\n", status);
ok(len == 0xdeadbeef || broken(len == 0xfffffffc || len == 0xffc), /* wow64 */
"len set to %lx\n", len );
len = 0xdeadbeef;
status = NtQueryInformationProcess(GetCurrentProcess(), ProcessDebugPort,
&debug_port, sizeof(debug_port) - 1, NULL);
&debug_port, sizeof(debug_port) - 1, &len);
ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %#lx.\n", status);
ok(len == 0xdeadbeef || broken(len == 0xfffffffc || len == 0xffc), /* wow64 */
"len set to %lx\n", len );
len = 0xdeadbeef;
status = NtQueryInformationProcess(GetCurrentProcess(), ProcessDebugPort,
&debug_port, sizeof(debug_port) + 1, NULL);
&debug_port, sizeof(debug_port) + 1, &len);
ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %#lx.\n", status);
ok(len == 0xdeadbeef || broken(len == 0xfffffffc || len == 0xffc), /* wow64 */
"len set to %lx\n", len );
len = 0xdeadbeef;
status = NtQueryInformationProcess(GetCurrentProcess(), ProcessDebugPort,
&debug_port, sizeof(debug_port), NULL);
&debug_port, sizeof(debug_port), &len);
ok(!status, "NtQueryInformationProcess failed, status %#lx.\n", status);
ok(debug_port == 0, "Expected port 0, got %#Ix.\n", debug_port);
ok(len == sizeof(debug_port), "len set to %lx\n", len );
len = 0xdeadbeef;
status = NtQueryInformationProcess(pi.hProcess, ProcessDebugPort,
&debug_port, sizeof(debug_port), NULL);
&debug_port, sizeof(debug_port), &len);
ok(!status, "NtQueryInformationProcess failed, status %#lx.\n", status);
ok(debug_port == ~(DWORD_PTR)0, "Expected port %#Ix, got %#Ix.\n", ~(DWORD_PTR)0, debug_port);
ok(len == sizeof(debug_port), "len set to %lx\n", len );
for (;;)
{
......@@ -2398,6 +2412,7 @@ static void test_query_process_debug_object_handle(int argc, char **argv)
BOOL ret;
HANDLE debug_object;
NTSTATUS status;
ULONG len;
sprintf(cmdline, "%s %s %s", argv[0], argv[1], "debuggee");
......@@ -2407,57 +2422,71 @@ static void test_query_process_debug_object_handle(int argc, char **argv)
ok(ret, "CreateProcess failed with last error %lu\n", GetLastError());
if (!ret) return;
status = NtQueryInformationProcess(NULL, ProcessDebugObjectHandle, NULL,
0, NULL);
len = 0xdeadbeef;
status = NtQueryInformationProcess(NULL, ProcessDebugObjectHandle, NULL, 0, &len);
ok(status == STATUS_INFO_LENGTH_MISMATCH,
"Expected NtQueryInformationProcess to return STATUS_INFO_LENGTH_MISMATCH, got 0x%08lx\n",
status);
ok(len == 0xdeadbeef || broken(len == 0xfffffffc || len == 0xffc), /* wow64 */
"len set to %lx\n", len );
status = NtQueryInformationProcess(NULL, ProcessDebugObjectHandle, NULL,
sizeof(debug_object), NULL);
len = 0xdeadbeef;
status = NtQueryInformationProcess(NULL, ProcessDebugObjectHandle, NULL, sizeof(debug_object), &len);
ok(status == STATUS_INVALID_HANDLE ||
status == STATUS_ACCESS_VIOLATION, /* XP */
"Expected NtQueryInformationProcess to return STATUS_INVALID_HANDLE, got 0x%08lx\n", status);
ok(len == 0xdeadbeef || broken(len == 0xfffffffc || len == 0xffc), /* wow64 */
"len set to %lx\n", len );
status = NtQueryInformationProcess(GetCurrentProcess(),
ProcessDebugObjectHandle, NULL, sizeof(debug_object), NULL);
ProcessDebugObjectHandle, NULL, sizeof(debug_object), &len);
ok(status == STATUS_ACCESS_VIOLATION,
"Expected NtQueryInformationProcess to return STATUS_ACCESS_VIOLATION, got 0x%08lx\n", status);
ok(len == 0xdeadbeef || broken(len == 0xfffffffc || len == 0xffc), /* wow64 */
"len set to %lx\n", len );
status = NtQueryInformationProcess(NULL, ProcessDebugObjectHandle,
&debug_object, sizeof(debug_object), NULL);
ok(status == STATUS_INVALID_HANDLE,
"Expected NtQueryInformationProcess to return STATUS_ACCESS_VIOLATION, got 0x%08lx\n", status);
len = 0xdeadbeef;
status = NtQueryInformationProcess(GetCurrentProcess(),
ProcessDebugObjectHandle, &debug_object,
sizeof(debug_object) - 1, NULL);
ProcessDebugObjectHandle, &debug_object, sizeof(debug_object) - 1, &len);
ok(status == STATUS_INFO_LENGTH_MISMATCH,
"Expected NtQueryInformationProcess to return STATUS_INFO_LENGTH_MISMATCH, got 0x%08lx\n", status);
ok(len == 0xdeadbeef || broken(len == 0xfffffffc || len == 0xffc), /* wow64 */
"len set to %lx\n", len );
len = 0xdeadbeef;
status = NtQueryInformationProcess(GetCurrentProcess(),
ProcessDebugObjectHandle, &debug_object,
sizeof(debug_object) + 1, NULL);
ProcessDebugObjectHandle, &debug_object, sizeof(debug_object) + 1, &len);
ok(status == STATUS_INFO_LENGTH_MISMATCH,
"Expected NtQueryInformationProcess to return STATUS_INFO_LENGTH_MISMATCH, got 0x%08lx\n", status);
ok(len == 0xdeadbeef || broken(len == 0xfffffffc || len == 0xffc), /* wow64 */
"len set to %lx\n", len );
len = 0xdeadbeef;
debug_object = (HANDLE)0xdeadbeef;
status = NtQueryInformationProcess(GetCurrentProcess(),
ProcessDebugObjectHandle, &debug_object,
sizeof(debug_object), NULL);
sizeof(debug_object), &len);
ok(status == STATUS_PORT_NOT_SET,
"Expected NtQueryInformationProcess to return STATUS_PORT_NOT_SET, got 0x%08lx\n", status);
ok(debug_object == NULL ||
broken(debug_object == (HANDLE)0xdeadbeef), /* Wow64 */
"Expected debug object handle to be NULL, got %p\n", debug_object);
ok(len == sizeof(debug_object), "len set to %lx\n", len );
len = 0xdeadbeef;
debug_object = (HANDLE)0xdeadbeef;
status = NtQueryInformationProcess(pi.hProcess, ProcessDebugObjectHandle,
&debug_object, sizeof(debug_object), NULL);
&debug_object, sizeof(debug_object), &len);
ok(status == STATUS_SUCCESS,
"Expected NtQueryInformationProcess to return STATUS_SUCCESS, got 0x%08lx\n", status);
ok(debug_object != NULL,
"Expected debug object handle to be non-NULL, got %p\n", debug_object);
ok(len == sizeof(debug_object), "len set to %lx\n", len );
status = NtClose( debug_object );
ok( !status, "NtClose failed %lx\n", status );
......
dlls/ntdll/unix/process.c
View file @ 7e521b4d
......@@ -1301,33 +1301,31 @@ NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class
case ProcessDebugPort:
len = sizeof(DWORD_PTR);
if (size == len)
if (size != len) return STATUS_INFO_LENGTH_MISMATCH;
if (!info) ret = STATUS_ACCESS_VIOLATION;
else
{
if (!info) ret = STATUS_ACCESS_VIOLATION;
else
{
HANDLE debug;
HANDLE debug;
SERVER_START_REQ(get_process_debug_info)
{
req->handle = wine_server_obj_handle( handle );
ret = wine_server_call( req );
debug = wine_server_ptr_handle( reply->debug );
}
SERVER_END_REQ;
if (ret == STATUS_SUCCESS)
{
*(DWORD_PTR *)info = ~0ul;
NtClose( debug );
}
else if (ret == STATUS_PORT_NOT_SET)
{
*(DWORD_PTR *)info = 0;
ret = STATUS_SUCCESS;
}
SERVER_START_REQ(get_process_debug_info)
{
req->handle = wine_server_obj_handle( handle );
ret = wine_server_call( req );
debug = wine_server_ptr_handle( reply->debug );
}
SERVER_END_REQ;
if (ret == STATUS_SUCCESS)
{
*(DWORD_PTR *)info = ~0ul;
NtClose( debug );
}
else if (ret == STATUS_PORT_NOT_SET)
{
*(DWORD_PTR *)info = 0;
ret = STATUS_SUCCESS;
}
else return ret;
}
else ret = STATUS_INFO_LENGTH_MISMATCH;
break;
case ProcessDebugFlags:
......@@ -1362,21 +1360,14 @@ NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class
case ProcessDebugObjectHandle:
len = sizeof(HANDLE);
if (size == len)
if (size != len) return STATUS_INFO_LENGTH_MISMATCH;
SERVER_START_REQ(get_process_debug_info)
{
if (!info) ret = STATUS_ACCESS_VIOLATION;
else
{
SERVER_START_REQ(get_process_debug_info)
{
req->handle = wine_server_obj_handle( handle );
ret = wine_server_call( req );
*(HANDLE *)info = wine_server_ptr_handle( reply->debug );
}
SERVER_END_REQ;
}
req->handle = wine_server_obj_handle( handle );
ret = wine_server_call( req );
*(HANDLE *)info = wine_server_ptr_handle( reply->debug );
}
else ret = STATUS_INFO_LENGTH_MISMATCH;
SERVER_END_REQ;
break;
case ProcessHandleCount:
......@@ -1418,7 +1409,7 @@ NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class
}
SERVER_END_REQ;
}
else ret = STATUS_INFO_LENGTH_MISMATCH;
else return STATUS_INFO_LENGTH_MISMATCH;
break;
case ProcessSessionInformation:
......@@ -1438,7 +1429,7 @@ NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class
case ProcessWow64Information:
len = sizeof(ULONG_PTR);
if (size != len) ret = STATUS_INFO_LENGTH_MISMATCH;
if (size != len) return STATUS_INFO_LENGTH_MISMATCH;
else if (!info) ret = STATUS_ACCESS_VIOLATION;
else if (!handle) ret = STATUS_INVALID_HANDLE;
else if (handle == GetCurrentProcess()) *(ULONG_PTR *)info = is_wow64();
......
dlls/wow64/process.c
View file @ 7e521b4d
......@@ -611,10 +611,13 @@ NTSTATUS WINAPI wow64_NtQueryInformationProcess( UINT *args )
*(ULONG *)ptr = data;
if (retlen) *retlen = sizeof(ULONG);
}
else if (status == STATUS_PORT_NOT_SET) *(ULONG *)ptr = 0;
else if (status == STATUS_PORT_NOT_SET)
{
*(ULONG *)ptr = 0;
if (retlen) *retlen = sizeof(ULONG);
}
return status;
}
if (retlen) *retlen = sizeof(ULONG);
return STATUS_INFO_LENGTH_MISMATCH;
case ProcessImageFileName:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment