Skip to content

Commit 596f370

Browse files
committed
phlib: Update headers for RS2
1 parent 0448a7c commit 596f370

File tree

5 files changed

+23
-7
lines changed

5 files changed

+23
-7
lines changed

ProcessHacker/include/procprv.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ typedef struct _PH_PROCESS_ITEM
168168
ULONG AddedEventSent : 1;
169169
ULONG IsProtectedProcess : 1;
170170
ULONG IsSecureProcess : 1;
171-
ULONG IsPicoProcess : 1;
171+
ULONG IsSubsystemProcess : 1;
172172

173173
ULONG Spare : 15;
174174
};

ProcessHacker/procprv.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ typedef struct _PH_PROCESS_QUERY_S1_DATA
107107
ULONG IsWow64Valid : 1;
108108
ULONG IsProtectedProcess : 1;
109109
ULONG IsSecureProcess : 1;
110-
ULONG IsPicoProcess : 1;
110+
ULONG IsSubsystemProcess : 1;
111111

112112
ULONG Spare : 23;
113113
};
@@ -1002,7 +1002,7 @@ VOID PhpProcessQueryStage1(
10021002
{
10031003
Data->IsProtectedProcess = basicInfo.IsProtectedProcess;
10041004
Data->IsSecureProcess = basicInfo.IsSecureProcess;
1005-
Data->IsPicoProcess = basicInfo.IsPicoProcess;
1005+
Data->IsSubsystemProcess = basicInfo.IsSubsystemProcess;
10061006
Data->IsWow64 = basicInfo.IsWow64Process;
10071007
Data->IsWow64Valid = TRUE;
10081008
}
@@ -1316,7 +1316,7 @@ VOID PhpFillProcessItemStage1(
13161316
processItem->IsWow64Valid = Data->IsWow64Valid;
13171317
processItem->IsProtectedProcess = Data->IsProtectedProcess;
13181318
processItem->IsSecureProcess = Data->IsSecureProcess;
1319-
processItem->IsPicoProcess = Data->IsPicoProcess;
1319+
processItem->IsSubsystemProcess = Data->IsSubsystemProcess;
13201320

13211321
PhSwapReference(&processItem->Record->CommandLine, processItem->CommandLine);
13221322
}

ProcessHacker/proctree.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2805,7 +2805,7 @@ BOOLEAN NTAPI PhpProcessTreeNewCallback(
28052805
getNodeColor->BackColor = PhCsColorSuspended;
28062806
else if (PhCsUseColorElevatedProcesses && processItem->IsElevated)
28072807
getNodeColor->BackColor = PhCsColorElevatedProcesses;
2808-
else if (PhCsUseColorPicoProcesses && processItem->IsPicoProcess)
2808+
else if (PhCsUseColorPicoProcesses && processItem->IsSubsystemProcess)
28092809
getNodeColor->BackColor = PhCsColorPicoProcesses;
28102810
else if (PhCsUseColorImmersiveProcesses && processItem->IsImmersive)
28112811
getNodeColor->BackColor = PhCsColorImmersiveProcesses;

phnt/include/ntpsapi.h

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,14 @@ typedef enum _PROCESSINFOCLASS
172172
ProcessIumChallengeResponse,
173173
ProcessChildProcessInformation, // PROCESS_CHILD_PROCESS_INFORMATION
174174
ProcessHighGraphicsPriorityInformation,
175+
ProcessSubsystemInformation, // since REDSTONE2
176+
ProcessEnergyValues,
177+
ProcessActivityThrottleState,
178+
ProcessActivityThrottlePolicy,
179+
ProcessWin32kSyscallFilterInformation,
180+
ProcessDisableSystemAllowedCpuSets,
181+
ProcessWakeInformation,
182+
ProcessEnergyTrackingState,
175183
MaxProcessInfoClass
176184
} PROCESSINFOCLASS;
177185
#endif
@@ -224,6 +232,9 @@ typedef enum _THREADINFOCLASS
224232
ThreadDynamicCodePolicyInfo,
225233
ThreadExplicitCaseSensitivity,
226234
ThreadWorkOnBehalfTicket,
235+
ThreadSubsystemInformation, // since REDSTONE2
236+
ThreadDbgkWerReportActive,
237+
ThreadAttachContainer,
227238
MaxThreadInfoClass
228239
} THREADINFOCLASS;
229240
#endif
@@ -267,7 +278,7 @@ typedef struct _PROCESS_EXTENDED_BASIC_INFORMATION
267278
ULONG IsBackground : 1;
268279
ULONG IsStronglyNamed : 1;
269280
ULONG IsSecureProcess : 1;
270-
ULONG IsPicoProcess : 1;
281+
ULONG IsSubsystemProcess : 1;
271282
ULONG SpareBits : 23;
272283
};
273284
};
@@ -609,6 +620,7 @@ typedef enum _PS_PROTECTED_SIGNER
609620
PsProtectedSignerWindows,
610621
PsProtectedSignerWinTcb,
611622
PsProtectedSignerWinSystem,
623+
PsProtectedSignerApp,
612624
PsProtectedSignerMax
613625
} PS_PROTECTED_SIGNER;
614626

@@ -662,6 +674,8 @@ typedef struct _PROCESS_COMMIT_RELEASE_INFORMATION
662674
ULONG Spare : 31;
663675
};
664676
SIZE_T CommitDebt;
677+
SIZE_T CommittedMemResetSize;
678+
SIZE_T RepurposedMemResetSize;
665679
} PROCESS_COMMIT_RELEASE_INFORMATION, *PPROCESS_COMMIT_RELEASE_INFORMATION;
666680

667681
typedef struct _PROCESS_JOB_MEMORY_INFO
@@ -700,6 +714,8 @@ typedef struct _THREAD_LAST_SYSCALL_INFORMATION
700714
{
701715
PVOID FirstArgument;
702716
USHORT SystemCallNumber;
717+
USHORT Reserved; // since REDSTONE2
718+
ULONG64 WaitTime;
703719
} THREAD_LAST_SYSCALL_INFORMATION, *PTHREAD_LAST_SYSCALL_INFORMATION;
704720

705721
// private

tools/CustomSignTool/CustomSignTool.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<ProjectGuid>{E8CD0A41-1537-4EA6-98AC-E80CD59C478E}</ProjectGuid>
2323
<RootNamespace>CustomSignTool</RootNamespace>
2424
<Keyword>Win32Proj</Keyword>
25-
<WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
25+
<WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
2626
</PropertyGroup>
2727
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2828
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

0 commit comments

Comments
 (0)