From 08ae0d09bbbeab580bb08d6f50cad9ccc07ff755 Mon Sep 17 00:00:00 2001 From: Paul Vriens <Paul.Vriens@xs4all.nl> Date: Thu, 21 Apr 2005 17:14:22 +0000 Subject: [PATCH] Remove THREAD_INFO struct. Rename THREADINFO into SYSTEM_THREAD_INFORMATION. --- dlls/ntdll/nt.c | 6 +++--- include/winternl.h | 23 ++++------------------- 2 files changed, 7 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index ff3c122dc9a..7fd2ffc9331 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -701,13 +701,13 @@ NTSTATUS WINAPI NtQuerySystemInformation( if (ret == STATUS_NO_MORE_FILES) ret = STATUS_SUCCESS; break; } - if (Length >= len + wlen + spi->dwThreadCount * sizeof(THREAD_INFO)) + if (Length >= len + wlen + spi->dwThreadCount * sizeof(SYSTEM_THREAD_INFORMATION)) { int i, j; /* set thread info */ - spi->dwOffset += spi->dwThreadCount * sizeof(THREAD_INFO); - len += spi->dwThreadCount * sizeof(THREAD_INFO); + spi->dwOffset += spi->dwThreadCount * sizeof(SYSTEM_THREAD_INFORMATION); + len += spi->dwThreadCount * sizeof(SYSTEM_THREAD_INFORMATION); i = j = 0; while (ret == STATUS_SUCCESS) { diff --git a/include/winternl.h b/include/winternl.h index 5045bd56d6a..b16efa498da 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -712,8 +712,7 @@ typedef struct _UNWIND_HISTORY_TABLE { */ /* This is used by NtQuerySystemInformation */ -/* FIXME: Isn't THREAD_INFO and THREADINFO the same structure? */ -typedef struct { +typedef struct _SYSTEM_THREAD_INFORMATION{ FILETIME ftKernelTime; FILETIME ftUserTime; FILETIME ftCreateTime; @@ -726,21 +725,7 @@ typedef struct { DWORD dwContextSwitches; DWORD dwThreadState; DWORD dwWaitReason; -} THREADINFO, *PTHREADINFO; - -/* FIXME: Isn't THREAD_INFO and THREADINFO the same structure? */ -typedef struct _THREAD_INFO{ - DWORD Unknown1[6]; - DWORD ThreadID; - DWORD Unknown2[3]; - DWORD Status; - DWORD WaitReason; - DWORD Unknown3[4]; -} THREAD_INFO, PTHREAD_INFO; - -/*********************************************************************** - * Types and data structures - */ +} SYSTEM_THREAD_INFORMATION, *PSYSTEM_THREAD_INFORMATION; typedef struct _IO_STATUS_BLOCK { union { @@ -873,7 +858,7 @@ typedef struct _PROCESS_INFO { ULONG PeakPagefileUsage; DWORD PrivateBytes; DWORD Unknown6[4]; - THREAD_INFO ati[ANYSIZE_ARRAY]; /* 94 size=0x40*/ + SYSTEM_THREAD_INFORMATION ati[ANYSIZE_ARRAY]; /* 94 size=0x40*/ } PROCESS_INFO, PPROCESS_INFO; typedef struct _RTL_HEAP_DEFINITION { @@ -1062,7 +1047,7 @@ typedef struct _SYSTEM_PROCESS_INFORMATION { DWORD dwPrivateBytes; DWORD dwPageFileBytes; DWORD dwUnknown7[4]; - THREADINFO ti[1]; + SYSTEM_THREAD_INFORMATION ti[1]; #else ULONG NextEntryOffset; BYTE Reserved1[52]; -- GitLab