Skip to content
Snippets Groups Projects
Commit 08ae0d09 authored by Paul Vriens's avatar Paul Vriens Committed by Alexandre Julliard
Browse files

Remove THREAD_INFO struct.

Rename THREADINFO into SYSTEM_THREAD_INFORMATION.
parent 250a8aec
No related branches found
No related tags found
No related merge requests found
...@@ -701,13 +701,13 @@ NTSTATUS WINAPI NtQuerySystemInformation( ...@@ -701,13 +701,13 @@ NTSTATUS WINAPI NtQuerySystemInformation(
if (ret == STATUS_NO_MORE_FILES) ret = STATUS_SUCCESS; if (ret == STATUS_NO_MORE_FILES) ret = STATUS_SUCCESS;
break; break;
} }
if (Length >= len + wlen + spi->dwThreadCount * sizeof(THREAD_INFO)) if (Length >= len + wlen + spi->dwThreadCount * sizeof(SYSTEM_THREAD_INFORMATION))
{ {
int i, j; int i, j;
/* set thread info */ /* set thread info */
spi->dwOffset += spi->dwThreadCount * sizeof(THREAD_INFO); spi->dwOffset += spi->dwThreadCount * sizeof(SYSTEM_THREAD_INFORMATION);
len += spi->dwThreadCount * sizeof(THREAD_INFO); len += spi->dwThreadCount * sizeof(SYSTEM_THREAD_INFORMATION);
i = j = 0; i = j = 0;
while (ret == STATUS_SUCCESS) while (ret == STATUS_SUCCESS)
{ {
......
...@@ -712,8 +712,7 @@ typedef struct _UNWIND_HISTORY_TABLE { ...@@ -712,8 +712,7 @@ typedef struct _UNWIND_HISTORY_TABLE {
*/ */
/* This is used by NtQuerySystemInformation */ /* This is used by NtQuerySystemInformation */
/* FIXME: Isn't THREAD_INFO and THREADINFO the same structure? */ typedef struct _SYSTEM_THREAD_INFORMATION{
typedef struct {
FILETIME ftKernelTime; FILETIME ftKernelTime;
FILETIME ftUserTime; FILETIME ftUserTime;
FILETIME ftCreateTime; FILETIME ftCreateTime;
...@@ -726,21 +725,7 @@ typedef struct { ...@@ -726,21 +725,7 @@ typedef struct {
DWORD dwContextSwitches; DWORD dwContextSwitches;
DWORD dwThreadState; DWORD dwThreadState;
DWORD dwWaitReason; DWORD dwWaitReason;
} THREADINFO, *PTHREADINFO; } SYSTEM_THREAD_INFORMATION, *PSYSTEM_THREAD_INFORMATION;
/* 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
*/
typedef struct _IO_STATUS_BLOCK { typedef struct _IO_STATUS_BLOCK {
union { union {
...@@ -873,7 +858,7 @@ typedef struct _PROCESS_INFO { ...@@ -873,7 +858,7 @@ typedef struct _PROCESS_INFO {
ULONG PeakPagefileUsage; ULONG PeakPagefileUsage;
DWORD PrivateBytes; DWORD PrivateBytes;
DWORD Unknown6[4]; DWORD Unknown6[4];
THREAD_INFO ati[ANYSIZE_ARRAY]; /* 94 size=0x40*/ SYSTEM_THREAD_INFORMATION ati[ANYSIZE_ARRAY]; /* 94 size=0x40*/
} PROCESS_INFO, PPROCESS_INFO; } PROCESS_INFO, PPROCESS_INFO;
typedef struct _RTL_HEAP_DEFINITION { typedef struct _RTL_HEAP_DEFINITION {
...@@ -1062,7 +1047,7 @@ typedef struct _SYSTEM_PROCESS_INFORMATION { ...@@ -1062,7 +1047,7 @@ typedef struct _SYSTEM_PROCESS_INFORMATION {
DWORD dwPrivateBytes; DWORD dwPrivateBytes;
DWORD dwPageFileBytes; DWORD dwPageFileBytes;
DWORD dwUnknown7[4]; DWORD dwUnknown7[4];
THREADINFO ti[1]; SYSTEM_THREAD_INFORMATION ti[1];
#else #else
ULONG NextEntryOffset; ULONG NextEntryOffset;
BYTE Reserved1[52]; BYTE Reserved1[52];
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment