Skip to content

Commit a51182f

Browse files
dmexdmex
committed
Merge remote-tracking branch 'refs/remotes/origin/master' into tracert
2 parents 7fd8ece + 69d0490 commit a51182f

File tree

8 files changed

+133
-31
lines changed

8 files changed

+133
-31
lines changed

‎phnt/include/ntexapi.h

Lines changed: 77 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1361,26 +1361,26 @@ typedef enum _SYSTEM_INFORMATION_CLASS
13611361
SystemVmGenerationCountInformation,
13621362
SystemTrustedPlatformModuleInformation, // q: SYSTEM_TPM_INFORMATION
13631363
SystemKernelDebuggerFlags,
1364-
SystemCodeIntegrityPolicyInformation,
1365-
SystemIsolatedUserModeInformation,
1364+
SystemCodeIntegrityPolicyInformation, // q: SYSTEM_CODEINTEGRITYPOLICY_INFORMATION
1365+
SystemIsolatedUserModeInformation, // q: SYSTEM_ISOLATED_USER_MODE_INFORMATION
13661366
SystemHardwareSecurityTestInterfaceResultsInformation,
13671367
SystemSingleModuleInformation, // q: SYSTEM_SINGLE_MODULE_INFORMATION
13681368
SystemAllowedCpuSetsInformation,
13691369
SystemDmaProtectionInformation, // q: SYSTEM_DMA_PROTECTION_INFORMATION
1370-
SystemInterruptCpuSetsInformation, // 170
1370+
SystemInterruptCpuSetsInformation, // q: SYSTEM_INTERRUPT_CPU_SET_INFORMATION // 170
13711371
SystemSecureBootPolicyFullInformation, // q: SYSTEM_SECUREBOOT_POLICY_FULL_INFORMATION
13721372
SystemCodeIntegrityPolicyFullInformation,
13731373
SystemAffinitizedInterruptProcessorInformation,
13741374
SystemRootSiloInformation, // q: SYSTEM_ROOT_SILO_INFORMATION
13751375
SystemCpuSetInformation, // q: SYSTEM_CPU_SET_INFORMATION // since THRESHOLD2
13761376
SystemCpuSetTagInformation, // q: SYSTEM_CPU_SET_TAG_INFORMATION
13771377
SystemWin32WerStartCallout,
1378-
SystemSecureKernelProfileInformation,
1378+
SystemSecureKernelProfileInformation, // q: SYSTEM_SECURE_KERNEL_HYPERGUARD_PROFILE_INFORMATION
13791379
SystemCodeIntegrityPlatformManifestInformation, // q: SYSTEM_SECUREBOOT_PLATFORM_MANIFEST_INFORMATION // since REDSTONE
1380-
SystemUnknownInformation180, // 180
1381-
SystemUnknownInformation181,
1380+
SystemInterruptSteeringInformation, // 180
1381+
SystemSupportedProcessorArchitectures,
13821382
SystemMemoryUsageInformation, // q: SYSTEM_MEMORY_USAGE_INFORMATION
1383-
SystemUnknownInformation183,
1383+
SystemCodeIntegrityCertificateInformation, // q: SYSTEM_CODEINTEGRITY_CERTIFICATE_INFORMATION
13841384
MaxSystemInfoClass
13851385
} SYSTEM_INFORMATION_CLASS;
13861386

@@ -2412,7 +2412,7 @@ typedef struct _SYSTEM_SECUREBOOT_INFORMATION
24122412
{
24132413
BOOLEAN SecureBootEnabled;
24142414
BOOLEAN SecureBootCapable;
2415-
} SYSTEM_SECUREBOOT_INFORMATION;
2415+
} SYSTEM_SECUREBOOT_INFORMATION, *PSYSTEM_SECUREBOOT_INFORMATION;
24162416

24172417
// private
24182418
typedef struct _PROCESS_DISK_COUNTERS
@@ -2548,13 +2548,45 @@ typedef struct _SYSTEM_DMA_PROTECTION_INFORMATION
25482548
BOOLEAN DmaProtectionsInUse;
25492549
} SYSTEM_DMA_PROTECTION_INFORMATION, *PSYSTEM_DMA_PROTECTION_INFORMATION;
25502550

2551+
// private
2552+
typedef struct _SYSTEM_CODEINTEGRITYPOLICY_INFORMATION
2553+
{
2554+
ULONG Options;
2555+
ULONG HVCIOptions;
2556+
ULONGLONG Version;
2557+
GUID PolicyGuid;
2558+
} SYSTEM_CODEINTEGRITYPOLICY_INFORMATION, *PSYSTEM_CODEINTEGRITYPOLICY_INFORMATION;
2559+
2560+
// private
2561+
typedef struct _SYSTEM_ISOLATED_USER_MODE_INFORMATION
2562+
{
2563+
BOOLEAN SecureKernelRunning : 1;
2564+
BOOLEAN HvciEnabled : 1;
2565+
BOOLEAN HvciStrictMode : 1;
2566+
BOOLEAN DebugEnabled : 1;
2567+
BOOLEAN FirmwarePageProtection : 1;
2568+
BOOLEAN SpareFlags : 1;
2569+
BOOLEAN TrustletRunning : 1;
2570+
BOOLEAN SpareFlags2 : 1;
2571+
BOOLEAN Spare0[6];
2572+
ULONGLONG Spare1;
2573+
} SYSTEM_ISOLATED_USER_MODE_INFORMATION, *PSYSTEM_ISOLATED_USER_MODE_INFORMATION;
2574+
25512575
// private
25522576
typedef struct _SYSTEM_SINGLE_MODULE_INFORMATION
25532577
{
25542578
PVOID TargetModuleAddress;
25552579
RTL_PROCESS_MODULE_INFORMATION_EX ExInfo;
25562580
} SYSTEM_SINGLE_MODULE_INFORMATION, *PSYSTEM_SINGLE_MODULE_INFORMATION;
25572581

2582+
// private
2583+
typedef struct _SYSTEM_INTERRUPT_CPU_SET_INFORMATION
2584+
{
2585+
ULONG Gsiv;
2586+
USHORT Group;
2587+
ULONGLONG CpuSets;
2588+
} SYSTEM_INTERRUPT_CPU_SET_INFORMATION, *PSYSTEM_INTERRUPT_CPU_SET_INFORMATION;
2589+
25582590
// private
25592591
typedef struct _SYSTEM_SECUREBOOT_POLICY_FULL_INFORMATION
25602592
{
@@ -2577,6 +2609,35 @@ typedef struct _SYSTEM_CPU_SET_TAG_INFORMATION
25772609
ULONGLONG CpuSets[1];
25782610
} SYSTEM_CPU_SET_TAG_INFORMATION, *PSYSTEM_CPU_SET_TAG_INFORMATION;
25792611

2612+
// private
2613+
typedef struct _SYSTEM_SECURE_KERNEL_HYPERGUARD_PROFILE_INFORMATION
2614+
{
2615+
ULONG ExtentCount;
2616+
ULONG ValidStructureSize;
2617+
ULONG NextExtentIndex;
2618+
ULONG ExtentRestart;
2619+
ULONG CycleCount;
2620+
ULONG TimeoutCount;
2621+
ULONGLONG CycleTime;
2622+
ULONGLONG CycleTimeMax;
2623+
ULONGLONG ExtentTime;
2624+
ULONG ExtentTimeIndex;
2625+
ULONG ExtentTimeMaxIndex;
2626+
ULONGLONG ExtentTimeMax;
2627+
ULONGLONG HyperFlushTimeMax;
2628+
ULONGLONG TranslateVaTimeMax;
2629+
ULONGLONG DebugExemptionCount;
2630+
ULONGLONG TbHitCount;
2631+
ULONGLONG TbMissCount;
2632+
ULONGLONG VinaPendingYield;
2633+
ULONGLONG HashCycles;
2634+
ULONG HistogramOffset;
2635+
ULONG HistogramBuckets;
2636+
ULONG HistogramShift;
2637+
ULONG Reserved1;
2638+
ULONGLONG PageNotPresentCount;
2639+
} SYSTEM_SECURE_KERNEL_HYPERGUARD_PROFILE_INFORMATION, *PSYSTEM_SECURE_KERNEL_HYPERGUARD_PROFILE_INFORMATION;
2640+
25802641
// private
25812642
typedef struct _SYSTEM_SECUREBOOT_PLATFORM_MANIFEST_INFORMATION
25822643
{
@@ -2596,6 +2657,12 @@ typedef struct _SYSTEM_MEMORY_USAGE_INFORMATION
25962657
ULONGLONG PeakCommitmentBytes;
25972658
} SYSTEM_MEMORY_USAGE_INFORMATION, *PSYSTEM_MEMORY_USAGE_INFORMATION;
25982659

2660+
// private
2661+
typedef struct _SYSTEM_CODEINTEGRITY_CERTIFICATE_INFORMATION
2662+
{
2663+
HANDLE ImageFile;
2664+
} SYSTEM_CODEINTEGRITY_CERTIFICATE_INFORMATION, *PSYSTEM_CODEINTEGRITY_CERTIFICATE_INFORMATION;
2665+
25992666
#if (PHNT_MODE != PHNT_MODE_KERNEL)
26002667

26012668
NTSYSCALLAPI
@@ -2672,7 +2739,8 @@ typedef enum _SYSDBG_COMMAND
26722739
SysDbgGetUmBreakPid,
26732740
SysDbgClearUmBreakPid,
26742741
SysDbgGetUmAttachPid,
2675-
SysDbgClearUmAttachPid
2742+
SysDbgClearUmAttachPid,
2743+
SysDbgGetLiveKernelDump
26762744
} SYSDBG_COMMAND, *PSYSDBG_COMMAND;
26772745

26782746
typedef struct _SYSDBG_VIRTUAL

‎phnt/include/ntlpcapi.h

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -579,9 +579,20 @@ typedef enum _ALPC_MESSAGE_INFORMATION_CLASS
579579
{
580580
AlpcMessageSidInformation, // q: out SID
581581
AlpcMessageTokenModifiedIdInformation, // q: out LUID
582+
AlpcMessageDirectStatusInformation,
583+
AlpcMessageHandleInformation, // ALPC_MESSAGE_HANDLE_INFORMATION
582584
MaxAlpcMessageInfoClass
583585
} ALPC_MESSAGE_INFORMATION_CLASS, *PALPC_MESSAGE_INFORMATION_CLASS;
584586

587+
typedef struct _ALPC_MESSAGE_HANDLE_INFORMATION
588+
{
589+
ULONG Index;
590+
ULONG Flags;
591+
ULONG Handle;
592+
ULONG ObjectType;
593+
ACCESS_MASK GrantedAccess;
594+
} ALPC_MESSAGE_HANDLE_INFORMATION, *PALPC_MESSAGE_HANDLE_INFORMATION;
595+
585596
// begin_private
586597

587598
#if (PHNT_VERSION >= PHNT_VISTA)

‎phnt/include/ntmmapi.h

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,9 @@ typedef enum _MEMORY_INFORMATION_CLASS
6464
MemoryRegionInformation, // MEMORY_REGION_INFORMATION
6565
MemoryWorkingSetExInformation, // MEMORY_WORKING_SET_EX_INFORMATION
6666
MemorySharedCommitInformation, // MEMORY_SHARED_COMMIT_INFORMATION
67-
MemoryImageInformation // MEMORY_IMAGE_INFORMATION
67+
MemoryImageInformation, // MEMORY_IMAGE_INFORMATION
68+
MemoryRegionInformationEx,
69+
MemoryPrivilegedBasicInformation
6870
} MEMORY_INFORMATION_CLASS;
6971

7072
#if (PHNT_MODE == PHNT_MODE_KERNEL)
@@ -105,8 +107,22 @@ typedef struct _MEMORY_REGION_INFORMATION
105107
{
106108
PVOID AllocationBase;
107109
ULONG AllocationProtect;
108-
ULONG RegionType;
110+
union
111+
{
112+
ULONG RegionType;
113+
struct
114+
{
115+
ULONG Private : 1;
116+
ULONG MappedDataFile : 1;
117+
ULONG MappedImage : 1;
118+
ULONG MappedPageFile : 1;
119+
ULONG MappedPhysical : 1;
120+
ULONG DirectMapped : 1;
121+
ULONG Reserved : 26;
122+
};
123+
};
109124
SIZE_T RegionSize;
125+
SIZE_T CommitSize;
110126
} MEMORY_REGION_INFORMATION, *PMEMORY_REGION_INFORMATION;
111127

112128
// private

‎phnt/include/ntobapi.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ typedef enum _OBJECT_INFORMATION_CLASS
3333
ObjectTypeInformation, // OBJECT_TYPE_INFORMATION
3434
ObjectTypesInformation, // OBJECT_TYPES_INFORMATION
3535
ObjectHandleFlagInformation, // OBJECT_HANDLE_FLAG_INFORMATION
36+
ObjectSessionInformation,
37+
ObjectSessionObjectInformation,
3638
MaxObjectInfoClass
3739
} OBJECT_INFORMATION_CLASS;
3840
#else

‎phnt/include/ntpnpapi.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ typedef enum _PLUGPLAY_CONTROL_CLASS
9595
PlugPlayControlResetDevice,
9696
PlugPlayControlHaltDevice,
9797
PlugPlayControlGetBlockedDriverList,
98+
PlugPlayControlGetDeviceInterfaceEnabled,
9899
MaxPlugPlayControl
99100
} PLUGPLAY_CONTROL_CLASS, *PPLUGPLAY_CONTROL_CLASS;
100101

‎phnt/include/ntpoapi.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ typedef enum
6262
PowerStateSleeping2 = 1,
6363
PowerStateSleeping3 = 2,
6464
PowerStateSleeping4 = 3,
65-
PowerStateSleeping4Firmware = 4,
65+
PowerStateShutdownOff = 4,
6666
PowerStateShutdownReset = 5,
67-
PowerStateShutdownOff = 6,
67+
PowerStateSleeping4Firmware = 6,
6868
PowerStateMaximum = 7
6969
} POWER_STATE_HANDLER_TYPE, *PPOWER_STATE_HANDLER_TYPE;
7070

‎phnt/include/ntpsapi.h

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -165,10 +165,13 @@ typedef enum _PROCESSINFOCLASS
165165
ProcessCommitReleaseInformation, // PROCESS_COMMIT_RELEASE_INFORMATION
166166
ProcessDefaultCpuSetsInformation,
167167
ProcessAllowedCpuSetsInformation,
168-
ProcessSubsystemProcess, // 68
168+
ProcessSubsystemProcess,
169169
ProcessJobMemoryInformation, // PROCESS_JOB_MEMORY_INFO
170-
ProcessInPrivate, // since THRESHOLD2
170+
ProcessInPrivate, // since THRESHOLD2 // 70
171171
ProcessRaiseUMExceptionOnInvalidHandleClose,
172+
ProcessIumChallengeResponse,
173+
ProcessChildProcessInformation, // PROCESS_CHILD_PROCESS_INFORMATION
174+
ProcessHighGraphicsPriorityInformation,
172175
MaxProcessInfoClass
173176
} PROCESSINFOCLASS;
174177
#endif
@@ -219,6 +222,8 @@ typedef enum _THREADINFOCLASS
219222
ThreadSystemThreadInformation, // q: SYSTEM_THREAD_INFORMATION // 40
220223
ThreadActualGroupAffinity, // since THRESHOLD2
221224
ThreadDynamicCodePolicyInfo,
225+
ThreadExplicitCaseSensitivity,
226+
ThreadWorkOnBehalfTicket,
222227
MaxThreadInfoClass
223228
} THREADINFOCLASS;
224229
#endif
@@ -668,6 +673,12 @@ typedef struct _PROCESS_JOB_MEMORY_INFO
668673
ULONGLONG TotalCommitLimit;
669674
} PROCESS_JOB_MEMORY_INFO, *PPROCESS_JOB_MEMORY_INFO;
670675

676+
typedef struct _PROCESS_CHILD_PROCESS_INFORMATION
677+
{
678+
BOOLEAN ProhibitChildProcesses;
679+
BOOLEAN EnableAutomaticOverride;
680+
} PROCESS_CHILD_PROCESS_INFORMATION, *PPROCESS_CHILD_PROCESS_INFORMATION;
681+
671682
// end_private
672683

673684
#endif
@@ -767,10 +778,10 @@ typedef struct _RTL_UMS_CONTEXT
767778
// private
768779
typedef enum _THREAD_UMS_INFORMATION_COMMAND
769780
{
770-
UmsInformationCommandQuery, // Index might be incorrect.
781+
UmsInformationCommandInvalid,
771782
UmsInformationCommandAttach,
772783
UmsInformationCommandDetach,
773-
UmsInformationCommandInvalid
784+
UmsInformationCommandQuery
774785
} THREAD_UMS_INFORMATION_COMMAND;
775786

776787
// private
@@ -1176,6 +1187,11 @@ typedef enum _PS_ATTRIBUTE_NUM
11761187
PsAttributeSecureProcess, // since THRESHOLD
11771188
PsAttributeJobList,
11781189
PsAttributeChildProcessPolicy, // since THRESHOLD2
1190+
PsAttributeAllApplicationPackagesPolicy, // since REDSTONE
1191+
PsAttributeWin32kFilter,
1192+
PsAttributeSafeOpenPromptOriginClaim,
1193+
PsAttributeBnoIsolation,
1194+
PsAttributeDesktopAppPolicy,
11791195
PsAttributeMax
11801196
} PS_ATTRIBUTE_NUM;
11811197

@@ -1226,11 +1242,11 @@ typedef enum _PS_ATTRIBUTE_NUM
12261242

12271243
typedef struct _PS_ATTRIBUTE
12281244
{
1229-
ULONG Attribute;
1245+
ULONG_PTR Attribute;
12301246
SIZE_T Size;
12311247
union
12321248
{
1233-
ULONG Value;
1249+
ULONG_PTR Value;
12341250
PVOID ValuePtr;
12351251
};
12361252
PSIZE_T ReturnLength;

‎plugins/Updater/updater.c

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -68,18 +68,6 @@ VOID FreeUpdateContext(
6868
PhClearReference(&Context->SetupFilePath);
6969
PhClearReference(&Context->SetupFileDownloadUrl);
7070

71-
if (Context->IconSmallHandle)
72-
{
73-
DeleteObject(Context->IconSmallHandle);
74-
Context->IconSmallHandle = NULL;
75-
}
76-
77-
if (Context->IconLargeHandle)
78-
{
79-
DestroyIcon(Context->IconLargeHandle);
80-
Context->IconLargeHandle = NULL;
81-
}
82-
8371
PhFree(Context);
8472
}
8573

0 commit comments

Comments
 (0)