include: Add more SYSTEM_INFORMATION_CLASS definitions.
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
f2ac82b866
commit
afaf35b9e1
|
@ -715,21 +715,21 @@ static void test_query_cache(void)
|
|||
for (i = sizeof(buffer); i>= expected; i--)
|
||||
{
|
||||
ReturnLength = 0xdeadbeef;
|
||||
status = pNtQuerySystemInformation(SystemCacheInformation, sci, i, &ReturnLength);
|
||||
status = pNtQuerySystemInformation(SystemFileCacheInformation, sci, i, &ReturnLength);
|
||||
ok(!status && (ReturnLength == expected),
|
||||
"%d: got 0x%x and %u (expected STATUS_SUCCESS and %u)\n", i, status, ReturnLength, expected);
|
||||
}
|
||||
|
||||
/* buffer too small for the full result.
|
||||
Up to win7, the function succeeds with a partial result. */
|
||||
status = pNtQuerySystemInformation(SystemCacheInformation, sci, i, &ReturnLength);
|
||||
status = pNtQuerySystemInformation(SystemFileCacheInformation, sci, i, &ReturnLength);
|
||||
if (!status)
|
||||
{
|
||||
expected = offsetof(SYSTEM_CACHE_INFORMATION, MinimumWorkingSet);
|
||||
for (; i>= expected; i--)
|
||||
{
|
||||
ReturnLength = 0xdeadbeef;
|
||||
status = pNtQuerySystemInformation(SystemCacheInformation, sci, i, &ReturnLength);
|
||||
status = pNtQuerySystemInformation(SystemFileCacheInformation, sci, i, &ReturnLength);
|
||||
ok(!status && (ReturnLength == expected),
|
||||
"%d: got 0x%x and %u (expected STATUS_SUCCESS and %u)\n", i, status, ReturnLength, expected);
|
||||
}
|
||||
|
@ -737,7 +737,7 @@ static void test_query_cache(void)
|
|||
|
||||
/* buffer too small for the result, this call will always fail */
|
||||
ReturnLength = 0xdeadbeef;
|
||||
status = pNtQuerySystemInformation(SystemCacheInformation, sci, i, &ReturnLength);
|
||||
status = pNtQuerySystemInformation(SystemFileCacheInformation, sci, i, &ReturnLength);
|
||||
ok( status == STATUS_INFO_LENGTH_MISMATCH &&
|
||||
((ReturnLength == expected) || broken(!ReturnLength) || broken(ReturnLength == 0xfffffff0)),
|
||||
"%d: got 0x%x and %u (expected STATUS_INFO_LENGTH_MISMATCH and %u)\n", i, status, ReturnLength, expected);
|
||||
|
@ -745,7 +745,7 @@ static void test_query_cache(void)
|
|||
if (0) {
|
||||
/* this crashes on some vista / win7 machines */
|
||||
ReturnLength = 0xdeadbeef;
|
||||
status = pNtQuerySystemInformation(SystemCacheInformation, sci, 0, &ReturnLength);
|
||||
status = pNtQuerySystemInformation(SystemFileCacheInformation, sci, 0, &ReturnLength);
|
||||
ok( status == STATUS_INFO_LENGTH_MISMATCH &&
|
||||
((ReturnLength == expected) || broken(!ReturnLength) || broken(ReturnLength == 0xfffffff0)),
|
||||
"0: got 0x%x and %u (expected STATUS_INFO_LENGTH_MISMATCH and %u)\n", status, ReturnLength, expected);
|
||||
|
|
|
@ -282,7 +282,7 @@ static void test_RtlQueryTimeZoneInformation(void)
|
|||
wine_dbgstr_w(tzinfo.DaylightName));
|
||||
|
||||
memset(&tzinfo2, 0xcc, sizeof(tzinfo2));
|
||||
status = pNtQuerySystemInformation( SystemTimeZoneInformation, &tzinfo2,
|
||||
status = pNtQuerySystemInformation( SystemCurrentTimeZoneInformation, &tzinfo2,
|
||||
sizeof(RTL_TIME_ZONE_INFORMATION), &len );
|
||||
ok( !status, "NtQuerySystemInformation failed %x\n", status );
|
||||
ok( len == sizeof(RTL_TIME_ZONE_INFORMATION), "wrong len %u\n", len );
|
||||
|
|
|
@ -417,7 +417,7 @@ ULONG WINAPI DECLSPEC_HOTPATCH NtGetTickCount(void)
|
|||
*/
|
||||
NTSTATUS WINAPI RtlQueryTimeZoneInformation(RTL_TIME_ZONE_INFORMATION *ret)
|
||||
{
|
||||
return NtQuerySystemInformation( SystemTimeZoneInformation, ret, sizeof(*ret), NULL );
|
||||
return NtQuerySystemInformation( SystemCurrentTimeZoneInformation, ret, sizeof(*ret), NULL );
|
||||
}
|
||||
|
||||
/***********************************************************************
|
||||
|
|
|
@ -2603,7 +2603,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class,
|
|||
break;
|
||||
}
|
||||
|
||||
case SystemCacheInformation:
|
||||
case SystemFileCacheInformation:
|
||||
{
|
||||
SYSTEM_CACHE_INFORMATION sci = { 0 };
|
||||
|
||||
|
@ -2701,7 +2701,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class,
|
|||
break;
|
||||
}
|
||||
|
||||
case SystemTimeZoneInformation:
|
||||
case SystemCurrentTimeZoneInformation:
|
||||
{
|
||||
RTL_DYNAMIC_TIME_ZONE_INFORMATION tz;
|
||||
|
||||
|
|
|
@ -1472,54 +1472,57 @@ typedef enum _SYSTEM_INFORMATION_CLASS {
|
|||
SystemCpuInformation = 1,
|
||||
SystemPerformanceInformation = 2,
|
||||
SystemTimeOfDayInformation = 3, /* was SystemTimeInformation */
|
||||
Unknown4,
|
||||
SystemPathInformation = 4,
|
||||
SystemProcessInformation = 5,
|
||||
Unknown6,
|
||||
Unknown7,
|
||||
SystemCallCountInformation = 6,
|
||||
SystemDeviceInformation = 7,
|
||||
SystemProcessorPerformanceInformation = 8,
|
||||
Unknown9,
|
||||
Unknown10,
|
||||
SystemFlagsInformation = 9,
|
||||
SystemCallTimeInformation = 10,
|
||||
SystemModuleInformation = 11,
|
||||
Unknown12,
|
||||
Unknown13,
|
||||
Unknown14,
|
||||
Unknown15,
|
||||
SystemLocksInformation = 12,
|
||||
SystemStackTraceInformation = 13,
|
||||
SystemPagedPoolInformation = 14,
|
||||
SystemNonPagedPoolInformation = 15,
|
||||
SystemHandleInformation = 16,
|
||||
Unknown17,
|
||||
SystemObjectInformation = 17,
|
||||
SystemPageFileInformation = 18,
|
||||
Unknown19,
|
||||
Unknown20,
|
||||
SystemCacheInformation = 21,
|
||||
Unknown22,
|
||||
SystemVdmInstemulInformation = 19,
|
||||
SystemVdmBopInformation = 20,
|
||||
SystemFileCacheInformation = 21,
|
||||
SystemPoolTagInformation = 22,
|
||||
SystemInterruptInformation = 23,
|
||||
SystemDpcBehaviourInformation = 24,
|
||||
SystemDpcBehaviorInformation = 24,
|
||||
SystemFullMemoryInformation = 25,
|
||||
SystemNotImplemented6 = 25,
|
||||
SystemLoadImage = 26,
|
||||
SystemUnloadImage = 27,
|
||||
SystemLoadGdiDriverInformation = 26,
|
||||
SystemUnloadGdiDriverInformation = 27,
|
||||
SystemTimeAdjustmentInformation = 28,
|
||||
SystemTimeAdjustment = 28,
|
||||
SystemSummaryMemoryInformation = 29,
|
||||
SystemNotImplemented7 = 29,
|
||||
SystemNextEventIdInformation = 30,
|
||||
SystemNotImplemented8 = 30,
|
||||
SystemEventIdsInformation = 31,
|
||||
SystemCrashDumpInformation = 32,
|
||||
SystemMirrorMemoryInformation = 30,
|
||||
SystemPerformanceTraceInformation = 31,
|
||||
SystemObsolete0 = 32,
|
||||
SystemExceptionInformation = 33,
|
||||
SystemCrashDumpStateInformation = 34,
|
||||
SystemKernelDebuggerInformation = 35,
|
||||
SystemContextSwitchInformation = 36,
|
||||
SystemRegistryQuotaInformation = 37,
|
||||
SystemExtendServiceTableInformation = 38,
|
||||
SystemPrioritySeperation = 39,
|
||||
SystemVerifierAddDriverInformation = 40,
|
||||
SystemVerifierRemoveDriverInformation = 41,
|
||||
SystemProcessorIdleInformation = 42,
|
||||
SystemLegacyDriverInformation = 43,
|
||||
SystemCurrentTimeZoneInformation = 44,
|
||||
SystemTimeZoneInformation = 44,
|
||||
SystemLookasideInformation = 45,
|
||||
SystemSetTimeSlipEvent = 46,
|
||||
SystemCreateSession = 47,
|
||||
SystemDeleteSession = 48,
|
||||
SystemInvalidInfoClass4 = 49,
|
||||
SystemTimeSlipNotification = 46,
|
||||
SystemSessionCreate = 47,
|
||||
SystemSessionDetach = 48,
|
||||
SystemSessionInformation = 49,
|
||||
SystemRangeStartInformation = 50,
|
||||
SystemVerifierInformation = 51,
|
||||
SystemAddVerifier = 52,
|
||||
SystemVerifierThunkExtend = 52,
|
||||
SystemSessionProcessesInformation = 53,
|
||||
SystemLoadGdiDriverInSystemSpace = 54,
|
||||
SystemNumaProcessorMap = 55,
|
||||
|
@ -1541,7 +1544,7 @@ typedef enum _SYSTEM_INFORMATION_CLASS {
|
|||
SystemWatchdogTimerHandler = 71,
|
||||
SystemWatchdogTimerInformation = 72,
|
||||
SystemLogicalProcessorInformation = 73,
|
||||
SystemWow64SharedInformation = 74,
|
||||
SystemWow64SharedInformationObsolete = 74,
|
||||
SystemRegisterFirmwareTableInformationHandler = 75,
|
||||
SystemFirmwareTableInformation = 76,
|
||||
SystemModuleInformationEx = 77,
|
||||
|
@ -1549,10 +1552,147 @@ typedef enum _SYSTEM_INFORMATION_CLASS {
|
|||
SystemSuperfetchInformation = 79,
|
||||
SystemMemoryListInformation = 80,
|
||||
SystemFileCacheInformationEx = 81,
|
||||
SystemThreadPriorityClientIdInformation = 82,
|
||||
SystemProcessorIdleCycleTimeInformation = 83,
|
||||
SystemVerifierCancellationInformation = 84,
|
||||
SystemProcessorPowerInformationEx = 85,
|
||||
SystemRefTraceInformation = 86,
|
||||
SystemSpecialPoolInformation = 87,
|
||||
SystemProcessIdInformation = 88,
|
||||
SystemErrorPortInformation = 89,
|
||||
SystemBootEnvironmentInformation = 90,
|
||||
SystemHypervisorInformation = 91,
|
||||
SystemVerifierInformationEx = 92,
|
||||
SystemTimeZoneInformation = 93,
|
||||
SystemImageFileExecutionOptionsInformation = 94,
|
||||
SystemCoverageInformation = 95,
|
||||
SystemPrefetchPatchInformation = 96,
|
||||
SystemVerifierFaultsInformation = 97,
|
||||
SystemSystemPartitionInformation = 98,
|
||||
SystemSystemDiskInformation = 99,
|
||||
SystemProcessorPerformanceDistribution = 100,
|
||||
SystemNumaProximityNodeInformation = 101,
|
||||
SystemDynamicTimeZoneInformation = 102,
|
||||
SystemCodeIntegrityInformation = 103,
|
||||
SystemProcessorMicrocodeUpdateInformation = 104,
|
||||
SystemProcessorBrandString = 105,
|
||||
SystemVirtualAddressInformation = 106,
|
||||
SystemLogicalProcessorInformationEx = 107,
|
||||
SystemProcessorCycleTimeInformation = 108,
|
||||
SystemStoreInformation = 109,
|
||||
SystemRegistryAppendString = 110,
|
||||
SystemAitSamplingValue = 111,
|
||||
SystemVhdBootInformation = 112,
|
||||
SystemCpuQuotaInformation = 113,
|
||||
SystemNativeBasicInformation = 114,
|
||||
SystemErrorPortTimeouts = 115,
|
||||
SystemLowPriorityIoInformation = 116,
|
||||
SystemTpmBootEntropyInformation = 117,
|
||||
SystemVerifierCountersInformation = 118,
|
||||
SystemPagedPoolInformationEx = 119,
|
||||
SystemSystemPtesInformationEx = 120,
|
||||
SystemNodeDistanceInformation = 121,
|
||||
SystemAcpiAuditInformation = 122,
|
||||
SystemBasicPerformanceInformation = 123,
|
||||
SystemQueryPerformanceCounterInformation = 124,
|
||||
SystemSessionBigPoolInformation = 125,
|
||||
SystemBootGraphicsInformation = 126,
|
||||
SystemScrubPhysicalMemoryInformation = 127,
|
||||
SystemBadPageInformation = 128,
|
||||
SystemProcessorProfileControlArea = 129,
|
||||
SystemCombinePhysicalMemoryInformation = 130,
|
||||
SystemEntropyInterruptTimingInformation = 131,
|
||||
SystemConsoleInformation = 132,
|
||||
SystemPlatformBinaryInformation = 133,
|
||||
SystemPolicyInformation = 134,
|
||||
SystemHypervisorProcessorCountInformation = 135,
|
||||
SystemDeviceDataInformation = 136,
|
||||
SystemDeviceDataEnumerationInformation = 137,
|
||||
SystemMemoryTopologyInformation = 138,
|
||||
SystemMemoryChannelInformation = 139,
|
||||
SystemBootLogoInformation = 140,
|
||||
SystemProcessorPerformanceInformationEx = 141,
|
||||
SystemCriticalProcessErrorLogInformation = 142,
|
||||
SystemSecureBootPolicyInformation = 143,
|
||||
SystemPageFileInformationEx = 144,
|
||||
SystemSecureBootInformation = 145,
|
||||
SystemEntropyInterruptTimingRawInformation = 146,
|
||||
SystemPortableWorkspaceEfiLauncherInformation = 147,
|
||||
SystemFullProcessInformation = 148,
|
||||
SystemKernelDebuggerInformationEx = 149,
|
||||
SystemBootMetadataInformation = 150,
|
||||
SystemSoftRebootInformation = 151,
|
||||
SystemElamCertificateInformation = 152,
|
||||
SystemOfflineDumpConfigInformation = 153,
|
||||
SystemProcessorFeaturesInformation = 154,
|
||||
SystemRegistryReconciliationInformation = 155,
|
||||
SystemEdidInformation = 156,
|
||||
SystemManufacturingInformation = 157,
|
||||
SystemEnergyEstimationConfigInformation = 158,
|
||||
SystemHypervisorDetailInformation = 159,
|
||||
SystemProcessorCycleStatsInformation = 160,
|
||||
SystemVmGenerationCountInformation = 161,
|
||||
SystemTrustedPlatformModuleInformation = 162,
|
||||
SystemKernelDebuggerFlags = 163,
|
||||
SystemCodeIntegrityPolicyInformation = 164,
|
||||
SystemIsolatedUserModeInformation = 165,
|
||||
SystemHardwareSecurityTestInterfaceResultsInformation = 166,
|
||||
SystemSingleModuleInformation = 167,
|
||||
SystemAllowedCpuSetsInformation = 168,
|
||||
SystemVsmProtectionInformation = 169,
|
||||
SystemInterruptCpuSetsInformation = 170,
|
||||
SystemSecureBootPolicyFullInformation = 171,
|
||||
SystemCodeIntegrityPolicyFullInformation = 172,
|
||||
SystemAffinitizedInterruptProcessorInformation = 173,
|
||||
SystemRootSiloInformation = 174,
|
||||
SystemCpuSetInformation = 175,
|
||||
SystemCpuSetTagInformation = 176,
|
||||
SystemWin32WerStartCallout = 177,
|
||||
SystemSecureKernelProfileInformation = 178,
|
||||
SystemCodeIntegrityPlatformManifestInformation = 179,
|
||||
SystemInterruptSteeringInformation = 180,
|
||||
SystemSupportedProcessorArchitectures = 181,
|
||||
SystemMemoryUsageInformation = 182,
|
||||
SystemCodeIntegrityCertificateInformation = 183,
|
||||
SystemPhysicalMemoryInformation = 184,
|
||||
SystemControlFlowTransition = 185,
|
||||
SystemKernelDebuggingAllowed = 186,
|
||||
SystemActivityModerationExeState = 187,
|
||||
SystemActivityModerationUserSettings = 188,
|
||||
SystemCodeIntegrityPoliciesFullInformation = 189,
|
||||
SystemCodeIntegrityUnlockInformation = 190,
|
||||
SystemIntegrityQuotaInformation = 191,
|
||||
SystemFlushInformation = 192,
|
||||
SystemProcessorIdleMaskInformation = 193,
|
||||
SystemSecureDumpEncryptionInformation = 194,
|
||||
SystemWriteConstraintInformation = 195,
|
||||
SystemKernelVaShadowInformation = 196,
|
||||
SystemHypervisorSharedPageInformation = 197,
|
||||
SystemFirmwareBootPerformanceInformation = 198,
|
||||
SystemCodeIntegrityVerificationInformation = 199,
|
||||
SystemFirmwarePartitionInformation = 200,
|
||||
SystemSpeculationControlInformation = 201,
|
||||
SystemDmaGuardPolicyInformation = 202,
|
||||
SystemEnclaveLaunchControlInformation = 203,
|
||||
SystemWorkloadAllowedCpuSetsInformation = 204,
|
||||
SystemCodeIntegrityUnlockModeInformation = 205,
|
||||
SystemLeapSecondInformation = 206,
|
||||
SystemFlags2Information = 207,
|
||||
SystemSecurityModelInformation = 208,
|
||||
SystemCodeIntegritySyntheticCacheInformation = 209,
|
||||
SystemFeatureConfigurationInformation = 210,
|
||||
SystemFeatureConfigurationSectionInformation = 211,
|
||||
SystemFeatureUsageSubscriptionInformation = 212,
|
||||
SystemSecureSpeculationControlInformation = 213,
|
||||
SystemSpacesBootInformation = 214,
|
||||
SystemFwRamdiskInformation = 215,
|
||||
SystemWheaIpmiHardwareInformation = 216,
|
||||
SystemDifSetRuleClassInformation = 217,
|
||||
SystemDifClearRuleClassInformation = 218,
|
||||
SystemDifApplyPluginVerificationOnDriver = 219,
|
||||
SystemDifRemovePluginVerificationOnDriver = 220,
|
||||
SystemShadowStackInformation = 221,
|
||||
SystemBuildVersionInformation = 222,
|
||||
SystemInformationClassMax
|
||||
} SYSTEM_INFORMATION_CLASS, *PSYSTEM_INFORMATION_CLASS;
|
||||
|
||||
|
|
|
@ -100,7 +100,7 @@ void PerfDataRefresh(void)
|
|||
return;
|
||||
|
||||
/* Get system cache information */
|
||||
status = NtQuerySystemInformation(SystemCacheInformation, &SysCacheInfo, sizeof(SysCacheInfo), NULL);
|
||||
status = NtQuerySystemInformation(SystemFileCacheInformation, &SysCacheInfo, sizeof(SysCacheInfo), NULL);
|
||||
if (status != NO_ERROR)
|
||||
return;
|
||||
|
||||
|
|
Loading…
Reference in New Issue