[PATCH 1/3] ntdll: Return sufficient info size at once from NtQuerySystemInformation(SystemProcessInformation).
Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/tests/info.c | 43 ++++++++++++++++++++++++++++------------ dlls/ntdll/unix/system.c | 17 ++++++++++++---- server/process.c | 4 ++++ server/protocol.def | 2 ++ 4 files changed, 49 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 6e71f0848ec..635c551383c 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -470,25 +470,30 @@ static void test_query_process(void) SYSTEM_THREAD_INFORMATION ti[1]; } SYSTEM_PROCESS_INFORMATION_PRIVATE; - ULONG SystemInformationLength = sizeof(SYSTEM_PROCESS_INFORMATION_PRIVATE); - SYSTEM_PROCESS_INFORMATION_PRIVATE *spi, *spi_buf = HeapAlloc(GetProcessHeap(), 0, SystemInformationLength); + SYSTEM_PROCESS_INFORMATION_PRIVATE *spi, *spi_buf; + BOOL current_process_found = FALSE; /* test ReturnLength */ ReturnLength = 0; status = pNtQuerySystemInformation(SystemProcessInformation, NULL, 0, &ReturnLength); ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH got %08x\n", status); - ok( ReturnLength > 0, "got 0 length\n"); + ok( ReturnLength > 0, "got 0 length\n" ); - /* W2K3 and later returns the needed length, the rest returns 0, so we have to loop */ - for (;;) + /* W2K3 and later returns the needed length, the rest returns 0. */ + if (!ReturnLength) { - status = pNtQuerySystemInformation(SystemProcessInformation, spi_buf, SystemInformationLength, &ReturnLength); - - if (status != STATUS_INFO_LENGTH_MISMATCH) break; - - spi_buf = HeapReAlloc(GetProcessHeap(), 0, spi_buf , SystemInformationLength *= 2); + win_skip( "Zero return length, skipping tests." ); + return; } - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + + spi_buf = HeapAlloc(GetProcessHeap(), 0, ReturnLength); + status = pNtQuerySystemInformation(SystemProcessInformation, spi_buf, ReturnLength, &ReturnLength); + + /* Sometimes new process or threads appear between the call and increase the size, + * otherwise the previously returned buffer size should be sufficient. */ + ok( status == STATUS_SUCCESS || status == STATUS_INFO_LENGTH_MISMATCH, + "Expected STATUS_SUCCESS, got %08x\n", status ); + spi = spi_buf; for (;;) @@ -496,9 +501,16 @@ static void test_query_process(void) DWORD_PTR tid; DWORD j; + winetest_push_context( "i %u (%s)", i, debugstr_w(spi->ProcessName.Buffer) ); + i++; last_pid = (DWORD_PTR)spi->UniqueProcessId; + ok( !(last_pid & 3), "Unexpected PID low bits: %p\n", spi->UniqueProcessId ); + + if (last_pid == GetCurrentProcessId()) + current_process_found = TRUE; + ok(!(last_pid & 3), "Unexpected PID low bits: %p\n", spi->UniqueProcessId); for (j = 0; j < spi->dwThreadCount; j++) { @@ -511,12 +523,17 @@ static void test_query_process(void) ok(!(tid & 3), "Unexpected TID low bits: %p\n", spi->ti[j].ClientId.UniqueThread); } - if (!spi->NextEntryOffset) break; - + if (!spi->NextEntryOffset) + { + winetest_pop_context(); + break; + } one_before_last_pid = last_pid; spi = (SYSTEM_PROCESS_INFORMATION_PRIVATE*)((char*)spi + spi->NextEntryOffset); + winetest_pop_context(); } + ok( current_process_found, "Test process not found.\n" ); if (winetest_debug > 1) trace("%u processes, %u threads\n", i, k); if (one_before_last_pid == 0) one_before_last_pid = last_pid; diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index c6bbabd85c5..33e7083d18b 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2446,10 +2446,13 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, case SystemProcessInformation: /* 5 */ { - unsigned int process_count, i, j; + unsigned int process_count, total_thread_count, total_name_len, i, j; char *buffer = NULL; unsigned int pos = 0; +C_ASSERT( sizeof(struct thread_info) <= sizeof(SYSTEM_THREAD_INFORMATION) ); +C_ASSERT( sizeof(struct process_info) <= sizeof(SYSTEM_PROCESS_INFORMATION) ); + if (size && !(buffer = malloc( size ))) { ret = STATUS_NO_MEMORY; @@ -2460,19 +2463,25 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, { wine_server_set_reply( req, buffer, size ); ret = wine_server_call( req ); - len = reply->info_size; + total_thread_count = reply->total_thread_count; + total_name_len = reply->total_name_len; process_count = reply->process_count; } SERVER_END_REQ; + len = 0; + if (ret) { + if (ret == STATUS_INFO_LENGTH_MISMATCH) + len = sizeof(SYSTEM_PROCESS_INFORMATION) * process_count + + (total_name_len + process_count) * sizeof(WCHAR) + + total_thread_count * sizeof(SYSTEM_THREAD_INFORMATION); + free( buffer ); break; } - len = 0; - for (i = 0; i < process_count; i++) { SYSTEM_PROCESS_INFORMATION *nt_process = (SYSTEM_PROCESS_INFORMATION *)((char *)info + len); diff --git a/server/process.c b/server/process.c index d8d09698558..b6ad4e47bd4 100644 --- a/server/process.c +++ b/server/process.c @@ -1868,6 +1868,8 @@ DECL_HANDLER(list_processes) char *buffer; reply->process_count = 0; + reply->total_thread_count = 0; + reply->total_name_len = 0; reply->info_size = 0; LIST_FOR_EACH_ENTRY( process, &process_list, struct process, entry ) @@ -1877,6 +1879,8 @@ DECL_HANDLER(list_processes) reply->info_size = (reply->info_size + 7) & ~7; reply->info_size += process->running_threads * sizeof(struct thread_info); reply->process_count++; + reply->total_thread_count += process->running_threads; + reply->total_name_len += process->imagelen; } if (reply->info_size > get_reply_max_size()) diff --git a/server/protocol.def b/server/protocol.def index 0f58dc7c85a..7d27fa382d2 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1624,6 +1624,8 @@ struct process_info @REPLY data_size_t info_size; int process_count; + int total_thread_count; + data_size_t total_name_len; VARARG(data,process_info,info_size); @END -- 2.31.1
Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/unix/system.c | 220 +++++++++++++++++++-------------------- 1 file changed, 110 insertions(+), 110 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 33e7083d18b..e216d2b2aa5 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2359,6 +2359,115 @@ static void read_dev_urandom( void *buf, ULONG len ) else WARN( "can't open /dev/urandom\n" ); } +static NTSTATUS get_system_process_info( void *info, ULONG size, ULONG *len ) +{ + unsigned int process_count, total_thread_count, total_name_len, i, j; + unsigned int pos = 0; + char *buffer = NULL; + NTSTATUS ret; + +C_ASSERT( sizeof(struct thread_info) <= sizeof(SYSTEM_THREAD_INFORMATION) ); +C_ASSERT( sizeof(struct process_info) <= sizeof(SYSTEM_PROCESS_INFORMATION) ); + + *len = 0; + if (size && !(buffer = malloc( size ))) return STATUS_NO_MEMORY; + + SERVER_START_REQ( list_processes ) + { + wine_server_set_reply( req, buffer, size ); + ret = wine_server_call( req ); + total_thread_count = reply->total_thread_count; + total_name_len = reply->total_name_len; + process_count = reply->process_count; + } + SERVER_END_REQ; + + if (ret) + { + if (ret == STATUS_INFO_LENGTH_MISMATCH) + *len = sizeof(SYSTEM_PROCESS_INFORMATION) * process_count + + (total_name_len + process_count) * sizeof(WCHAR) + + total_thread_count * sizeof(SYSTEM_THREAD_INFORMATION); + + free( buffer ); + return ret; + } + + for (i = 0; i < process_count; i++) + { + SYSTEM_PROCESS_INFORMATION *nt_process = (SYSTEM_PROCESS_INFORMATION *)((char *)info + *len); + const struct process_info *server_process; + const WCHAR *server_name, *file_part; + ULONG proc_len; + ULONG name_len = 0; + + pos = (pos + 7) & ~7; + server_process = (const struct process_info *)(buffer + pos); + pos += sizeof(*server_process); + + server_name = (const WCHAR *)(buffer + pos); + file_part = server_name + (server_process->name_len / sizeof(WCHAR)); + pos += server_process->name_len; + while (file_part > server_name && file_part[-1] != '\\') + { + file_part--; + name_len++; + } + + proc_len = sizeof(*nt_process) + server_process->thread_count * sizeof(SYSTEM_THREAD_INFORMATION) + + (name_len + 1) * sizeof(WCHAR); + *len += proc_len; + + if (*len <= size) + { + memset(nt_process, 0, sizeof(*nt_process)); + if (i < process_count - 1) + nt_process->NextEntryOffset = proc_len; + nt_process->CreationTime.QuadPart = server_process->start_time; + nt_process->dwThreadCount = server_process->thread_count; + nt_process->dwBasePriority = server_process->priority; + nt_process->UniqueProcessId = UlongToHandle(server_process->pid); + nt_process->ParentProcessId = UlongToHandle(server_process->parent_pid); + nt_process->SessionId = server_process->session_id; + nt_process->HandleCount = server_process->handle_count; + get_thread_times( server_process->unix_pid, -1, &nt_process->KernelTime, &nt_process->UserTime ); + fill_vm_counters( &nt_process->vmCounters, server_process->unix_pid ); + } + + pos = (pos + 7) & ~7; + for (j = 0; j < server_process->thread_count; j++) + { + const struct thread_info *server_thread = (const struct thread_info *)(buffer + pos); + + if (*len <= size) + { + nt_process->ti[j].CreateTime.QuadPart = server_thread->start_time; + nt_process->ti[j].ClientId.UniqueProcess = UlongToHandle(server_process->pid); + nt_process->ti[j].ClientId.UniqueThread = UlongToHandle(server_thread->tid); + nt_process->ti[j].dwCurrentPriority = server_thread->current_priority; + nt_process->ti[j].dwBasePriority = server_thread->base_priority; + get_thread_times( server_process->unix_pid, server_thread->unix_tid, + &nt_process->ti[j].KernelTime, &nt_process->ti[j].UserTime ); + } + + pos += sizeof(*server_thread); + } + + if (*len <= size) + { + nt_process->ProcessName.Buffer = (WCHAR *)&nt_process->ti[server_process->thread_count]; + nt_process->ProcessName.Length = name_len * sizeof(WCHAR); + nt_process->ProcessName.MaximumLength = (name_len + 1) * sizeof(WCHAR); + memcpy(nt_process->ProcessName.Buffer, file_part, name_len * sizeof(WCHAR)); + nt_process->ProcessName.Buffer[name_len] = 0; + } + } + + if (*len > size) ret = STATUS_INFO_LENGTH_MISMATCH; + free( buffer ); + return ret; +} + /****************************************************************************** * NtQuerySystemInformation (NTDLL.@) */ @@ -2445,117 +2554,8 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, } case SystemProcessInformation: /* 5 */ - { - unsigned int process_count, total_thread_count, total_name_len, i, j; - char *buffer = NULL; - unsigned int pos = 0; - -C_ASSERT( sizeof(struct thread_info) <= sizeof(SYSTEM_THREAD_INFORMATION) ); -C_ASSERT( sizeof(struct process_info) <= sizeof(SYSTEM_PROCESS_INFORMATION) ); - - if (size && !(buffer = malloc( size ))) - { - ret = STATUS_NO_MEMORY; - break; - } - - SERVER_START_REQ( list_processes ) - { - wine_server_set_reply( req, buffer, size ); - ret = wine_server_call( req ); - total_thread_count = reply->total_thread_count; - total_name_len = reply->total_name_len; - process_count = reply->process_count; - } - SERVER_END_REQ; - - len = 0; - - if (ret) - { - if (ret == STATUS_INFO_LENGTH_MISMATCH) - len = sizeof(SYSTEM_PROCESS_INFORMATION) * process_count - + (total_name_len + process_count) * sizeof(WCHAR) - + total_thread_count * sizeof(SYSTEM_THREAD_INFORMATION); - - free( buffer ); - break; - } - - for (i = 0; i < process_count; i++) - { - SYSTEM_PROCESS_INFORMATION *nt_process = (SYSTEM_PROCESS_INFORMATION *)((char *)info + len); - const struct process_info *server_process; - const WCHAR *server_name, *file_part; - ULONG proc_len; - ULONG name_len = 0; - - pos = (pos + 7) & ~7; - server_process = (const struct process_info *)(buffer + pos); - pos += sizeof(*server_process); - - server_name = (const WCHAR *)(buffer + pos); - file_part = server_name + (server_process->name_len / sizeof(WCHAR)); - pos += server_process->name_len; - while (file_part > server_name && file_part[-1] != '\\') - { - file_part--; - name_len++; - } - - proc_len = sizeof(*nt_process) + server_process->thread_count * sizeof(SYSTEM_THREAD_INFORMATION) - + (name_len + 1) * sizeof(WCHAR); - len += proc_len; - - if (len <= size) - { - memset(nt_process, 0, sizeof(*nt_process)); - if (i < process_count - 1) - nt_process->NextEntryOffset = proc_len; - nt_process->CreationTime.QuadPart = server_process->start_time; - nt_process->dwThreadCount = server_process->thread_count; - nt_process->dwBasePriority = server_process->priority; - nt_process->UniqueProcessId = UlongToHandle(server_process->pid); - nt_process->ParentProcessId = UlongToHandle(server_process->parent_pid); - nt_process->SessionId = server_process->session_id; - nt_process->HandleCount = server_process->handle_count; - get_thread_times( server_process->unix_pid, -1, &nt_process->KernelTime, &nt_process->UserTime ); - fill_vm_counters( &nt_process->vmCounters, server_process->unix_pid ); - } - - pos = (pos + 7) & ~7; - for (j = 0; j < server_process->thread_count; j++) - { - const struct thread_info *server_thread = (const struct thread_info *)(buffer + pos); - - if (len <= size) - { - nt_process->ti[j].CreateTime.QuadPart = server_thread->start_time; - nt_process->ti[j].ClientId.UniqueProcess = UlongToHandle(server_process->pid); - nt_process->ti[j].ClientId.UniqueThread = UlongToHandle(server_thread->tid); - nt_process->ti[j].dwCurrentPriority = server_thread->current_priority; - nt_process->ti[j].dwBasePriority = server_thread->base_priority; - get_thread_times( server_process->unix_pid, server_thread->unix_tid, - &nt_process->ti[j].KernelTime, &nt_process->ti[j].UserTime ); - } - - pos += sizeof(*server_thread); - } - - if (len <= size) - { - nt_process->ProcessName.Buffer = (WCHAR *)&nt_process->ti[server_process->thread_count]; - nt_process->ProcessName.Length = name_len * sizeof(WCHAR); - nt_process->ProcessName.MaximumLength = (name_len + 1) * sizeof(WCHAR); - memcpy(nt_process->ProcessName.Buffer, file_part, name_len * sizeof(WCHAR)); - nt_process->ProcessName.Buffer[name_len] = 0; - } - } - - if (len > size) ret = STATUS_INFO_LENGTH_MISMATCH; - free( buffer ); + ret = get_system_process_info( info, size, &len ); break; - } case SystemProcessorPerformanceInformation: /* 8 */ { -- 2.31.1
Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/tests/info.c | 87 +++++++++++++++++++++++++++++++++++----- dlls/ntdll/unix/system.c | 42 ++++++++++++------- include/winternl.h | 12 ++++++ server/process.c | 2 + server/protocol.def | 2 + 5 files changed, 120 insertions(+), 25 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 635c551383c..319f86db9e2 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -438,7 +438,7 @@ static void test_query_timeofday(void) if (winetest_debug > 1) trace("uCurrentTimeZoneId : (%d)\n", sti.uCurrentTimeZoneId); } -static void test_query_process(void) +static void test_query_process( BOOL extended ) { NTSTATUS status; DWORD last_pid; @@ -470,12 +470,27 @@ static void test_query_process(void) SYSTEM_THREAD_INFORMATION ti[1]; } SYSTEM_PROCESS_INFORMATION_PRIVATE; + BOOL is_process_wow64 = FALSE, current_process_found = FALSE; SYSTEM_PROCESS_INFORMATION_PRIVATE *spi, *spi_buf; - BOOL current_process_found = FALSE; + SYSTEM_EXTENDED_THREAD_INFORMATION *ti; + SYSTEM_INFORMATION_CLASS info_class; + void *expected_address; + ULONG thread_info_size; + + if (extended) + { + info_class = SystemExtendedProcessInformation; + thread_info_size = sizeof(SYSTEM_EXTENDED_THREAD_INFORMATION); + } + else + { + info_class = SystemProcessInformation; + thread_info_size = sizeof(SYSTEM_THREAD_INFORMATION); + } /* test ReturnLength */ ReturnLength = 0; - status = pNtQuerySystemInformation(SystemProcessInformation, NULL, 0, &ReturnLength); + status = pNtQuerySystemInformation( info_class, NULL, 0, &ReturnLength); ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH got %08x\n", status); ok( ReturnLength > 0, "got 0 length\n" ); @@ -486,8 +501,10 @@ static void test_query_process(void) return; } + winetest_push_context( "extended %d", extended ); + spi_buf = HeapAlloc(GetProcessHeap(), 0, ReturnLength); - status = pNtQuerySystemInformation(SystemProcessInformation, spi_buf, ReturnLength, &ReturnLength); + status = pNtQuerySystemInformation(info_class, spi_buf, ReturnLength, &ReturnLength); /* Sometimes new process or threads appear between the call and increase the size, * otherwise the previously returned buffer size should be sufficient. */ @@ -511,16 +528,64 @@ static void test_query_process(void) if (last_pid == GetCurrentProcessId()) current_process_found = TRUE; - ok(!(last_pid & 3), "Unexpected PID low bits: %p\n", spi->UniqueProcessId); + if (extended && is_wow64 && spi->UniqueProcessId) + { + InitializeObjectAttributes( &attr, NULL, 0, NULL, NULL ); + cid.UniqueProcess = spi->UniqueProcessId; + cid.UniqueThread = 0; + status = NtOpenProcess( &handle, PROCESS_QUERY_LIMITED_INFORMATION, &attr, &cid ); + ok( status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED, + "Got unexpected status %#x, pid %p.\n", status, spi->UniqueProcessId ); + + if (!status) + { + ULONG_PTR info; + + status = NtQueryInformationProcess( handle, ProcessWow64Information, &info, sizeof(info), NULL ); + ok( status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status ); + is_process_wow64 = !!info; + NtClose( handle ); + } + } + for (j = 0; j < spi->dwThreadCount; j++) { + ti = (SYSTEM_EXTENDED_THREAD_INFORMATION *)((BYTE *)spi->ti + j * thread_info_size); + k++; - ok ( spi->ti[j].ClientId.UniqueProcess == spi->UniqueProcessId, + ok ( ti->ThreadInfo.ClientId.UniqueProcess == spi->UniqueProcessId, "The owning pid of the thread (%p) doesn't equal the pid (%p) of the process\n", - spi->ti[j].ClientId.UniqueProcess, spi->UniqueProcessId); + ti->ThreadInfo.ClientId.UniqueProcess, spi->UniqueProcessId ); + + tid = (DWORD_PTR)ti->ThreadInfo.ClientId.UniqueThread; + ok( !(tid & 3), "Unexpected TID low bits: %p\n", ti->ThreadInfo.ClientId.UniqueThread ); - tid = (DWORD_PTR)spi->ti[j].ClientId.UniqueThread; - ok(!(tid & 3), "Unexpected TID low bits: %p\n", spi->ti[j].ClientId.UniqueThread); + if (extended) + { + todo_wine ok( !!ti->StackBase, "Got NULL StackBase.\n" ); + todo_wine ok( !!ti->StackLimit, "Got NULL StackLimit.\n" ); + ok( !!ti->Win32StartAddress, "Got NULL Win32StartAddress.\n" ); + + cid.UniqueProcess = 0; + cid.UniqueThread = ti->ThreadInfo.ClientId.UniqueThread; + + InitializeObjectAttributes( &attr, NULL, 0, NULL, NULL ); + status = NtOpenThread( &handle, THREAD_QUERY_INFORMATION, &attr, &cid ); + if (!status) + { + THREAD_BASIC_INFORMATION tbi; + + status = pNtQueryInformationThread( handle, ThreadBasicInformation, &tbi, sizeof(tbi), NULL ); + ok( status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status ); + expected_address = tbi.TebBaseAddress; + if (is_wow64 && is_process_wow64) + expected_address = (BYTE *)expected_address - 0x2000; + ok( ti->TebBase == expected_address || (is_wow64 && !expected_address && !!ti->TebBase), + "Got unexpected TebBase %p, expected %p.\n", ti->TebBase, expected_address ); + + NtClose( handle ); + } + } } if (!spi->NextEntryOffset) @@ -577,6 +642,7 @@ static void test_query_process(void) NtClose( handle ); } + winetest_pop_context(); } static void test_query_procperf(void) @@ -3317,7 +3383,8 @@ START_TEST(info) test_query_cpu(); test_query_performance(); test_query_timeofday(); - test_query_process(); + test_query_process( TRUE ); + test_query_process( FALSE ); test_query_procperf(); test_query_module(); test_query_handle(); diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index e216d2b2aa5..c37fc360f3e 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2359,9 +2359,10 @@ static void read_dev_urandom( void *buf, ULONG len ) else WARN( "can't open /dev/urandom\n" ); } -static NTSTATUS get_system_process_info( void *info, ULONG size, ULONG *len ) +static NTSTATUS get_system_process_info( SYSTEM_INFORMATION_CLASS class, void *info, ULONG size, ULONG *len ) { unsigned int process_count, total_thread_count, total_name_len, i, j; + unsigned int thread_info_size; unsigned int pos = 0; char *buffer = NULL; NTSTATUS ret; @@ -2369,6 +2370,11 @@ static NTSTATUS get_system_process_info( void *info, ULONG size, ULONG *len ) C_ASSERT( sizeof(struct thread_info) <= sizeof(SYSTEM_THREAD_INFORMATION) ); C_ASSERT( sizeof(struct process_info) <= sizeof(SYSTEM_PROCESS_INFORMATION) ); + if (class == SystemExtendedProcessInformation) + thread_info_size = sizeof(SYSTEM_EXTENDED_THREAD_INFORMATION); + else + thread_info_size = sizeof(SYSTEM_THREAD_INFORMATION); + *len = 0; if (size && !(buffer = malloc( size ))) return STATUS_NO_MEMORY; @@ -2387,7 +2393,7 @@ C_ASSERT( sizeof(struct process_info) <= sizeof(SYSTEM_PROCESS_INFORMATION) ); if (ret == STATUS_INFO_LENGTH_MISMATCH) *len = sizeof(SYSTEM_PROCESS_INFORMATION) * process_count + (total_name_len + process_count) * sizeof(WCHAR) - + total_thread_count * sizeof(SYSTEM_THREAD_INFORMATION); + + total_thread_count * thread_info_size; free( buffer ); return ret; @@ -2414,13 +2420,13 @@ C_ASSERT( sizeof(struct process_info) <= sizeof(SYSTEM_PROCESS_INFORMATION) ); name_len++; } - proc_len = sizeof(*nt_process) + server_process->thread_count * sizeof(SYSTEM_THREAD_INFORMATION) + proc_len = sizeof(*nt_process) + server_process->thread_count * thread_info_size + (name_len + 1) * sizeof(WCHAR); *len += proc_len; if (*len <= size) { - memset(nt_process, 0, sizeof(*nt_process)); + memset(nt_process, 0, proc_len); if (i < process_count - 1) nt_process->NextEntryOffset = proc_len; nt_process->CreationTime.QuadPart = server_process->start_time; @@ -2438,16 +2444,23 @@ C_ASSERT( sizeof(struct process_info) <= sizeof(SYSTEM_PROCESS_INFORMATION) ); for (j = 0; j < server_process->thread_count; j++) { const struct thread_info *server_thread = (const struct thread_info *)(buffer + pos); + SYSTEM_EXTENDED_THREAD_INFORMATION *ti; if (*len <= size) { - nt_process->ti[j].CreateTime.QuadPart = server_thread->start_time; - nt_process->ti[j].ClientId.UniqueProcess = UlongToHandle(server_process->pid); - nt_process->ti[j].ClientId.UniqueThread = UlongToHandle(server_thread->tid); - nt_process->ti[j].dwCurrentPriority = server_thread->current_priority; - nt_process->ti[j].dwBasePriority = server_thread->base_priority; + ti = (SYSTEM_EXTENDED_THREAD_INFORMATION *)((BYTE *)nt_process->ti + j * thread_info_size); + ti->ThreadInfo.CreateTime.QuadPart = server_thread->start_time; + ti->ThreadInfo.ClientId.UniqueProcess = UlongToHandle(server_process->pid); + ti->ThreadInfo.ClientId.UniqueThread = UlongToHandle(server_thread->tid); + ti->ThreadInfo.dwCurrentPriority = server_thread->current_priority; + ti->ThreadInfo.dwBasePriority = server_thread->base_priority; get_thread_times( server_process->unix_pid, server_thread->unix_tid, - &nt_process->ti[j].KernelTime, &nt_process->ti[j].UserTime ); + &ti->ThreadInfo.KernelTime, &ti->ThreadInfo.UserTime ); + if (class == SystemExtendedProcessInformation) + { + ti->Win32StartAddress = wine_server_get_ptr( server_thread->entry_point ); + ti->TebBase = wine_server_get_ptr( server_thread->teb ); + } } pos += sizeof(*server_thread); @@ -2455,7 +2468,8 @@ C_ASSERT( sizeof(struct process_info) <= sizeof(SYSTEM_PROCESS_INFORMATION) ); if (*len <= size) { - nt_process->ProcessName.Buffer = (WCHAR *)&nt_process->ti[server_process->thread_count]; + nt_process->ProcessName.Buffer = (WCHAR *)((BYTE *)nt_process->ti + + server_process->thread_count * thread_info_size); nt_process->ProcessName.Length = name_len * sizeof(WCHAR); nt_process->ProcessName.MaximumLength = (name_len + 1) * sizeof(WCHAR); memcpy(nt_process->ProcessName.Buffer, file_part, name_len * sizeof(WCHAR)); @@ -2554,7 +2568,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, } case SystemProcessInformation: /* 5 */ - ret = get_system_process_info( info, size, &len ); + ret = get_system_process_info( class, info, size, &len ); break; case SystemProcessorPerformanceInformation: /* 8 */ @@ -2858,9 +2872,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, } case SystemExtendedProcessInformation: /* 57 */ - FIXME("SystemExtendedProcessInformation, size %u, info %p, stub!\n", size, info); - memset( info, 0, size ); - ret = STATUS_SUCCESS; + ret = get_system_process_info( class, info, size, &len ); break; case SystemRecommendedSharedDataAlignment: /* 58 */ diff --git a/include/winternl.h b/include/winternl.h index 13bfc40e482..a209d1a7df9 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2005,6 +2005,18 @@ typedef struct _SYSTEM_THREAD_INFORMATION DWORD dwUnknown; /* 3c/4c */ } SYSTEM_THREAD_INFORMATION, *PSYSTEM_THREAD_INFORMATION; +typedef struct _SYSTEM_EXTENDED_THREAD_INFORMATION +{ + SYSTEM_THREAD_INFORMATION ThreadInfo; /* 00/00 */ + void *StackBase; /* 40/50 */ + void *StackLimit; /* 44/58 */ + void *Win32StartAddress; /* 48/60 */ + void *TebBase; /* 4c/68 */ + ULONG_PTR Reserved2; /* 50/70 */ + ULONG_PTR Reserved3; /* 54/78 */ + ULONG_PTR Reserved4; /* 58/80 */ +} SYSTEM_EXTENDED_THREAD_INFORMATION, *PSYSTEM_EXTENDED_THREAD_INFORMATION; + typedef struct _IO_STATUS_BLOCK { union { NTSTATUS Status; diff --git a/server/process.c b/server/process.c index b6ad4e47bd4..6eda0bb0191 100644 --- a/server/process.c +++ b/server/process.c @@ -1920,6 +1920,8 @@ DECL_HANDLER(list_processes) thread_info->base_priority = thread->priority; thread_info->current_priority = thread->priority; /* FIXME */ thread_info->unix_tid = thread->unix_tid; + thread_info->entry_point = thread->entry_point; + thread_info->teb = thread->teb; pos += sizeof(*thread_info); } } diff --git a/server/protocol.def b/server/protocol.def index 7d27fa382d2..6a25db0326f 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1602,6 +1602,8 @@ struct thread_info int base_priority; int current_priority; int unix_tid; + client_ptr_t teb; + client_ptr_t entry_point; }; struct process_info -- 2.31.1
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=100714 Your paranoid android. === w1064_2qxl (64 bit report) === ntdll: info.c:583: Test failed: extended 1: i 126 (L"MusNotificationUx.exe"): Got unexpected TebBase 0000002E82DD4000, expected 0000000000000000.
participants (2)
-
Marvin -
Paul Gofman