diff --git a/deps/reflect b/deps/reflect index c21a4483..2104e3cc 160000 --- a/deps/reflect +++ b/deps/reflect @@ -1 +1 @@ -Subproject commit c21a44839db947f3a6bd0c5a113191b18198c8cf +Subproject commit 2104e3cc951bea8fb61835b39e5b42f6d2de17da diff --git a/src/analyzer/reflect_type_info.hpp b/src/analyzer/reflect_type_info.hpp index 001c6e58..d9733bb0 100644 --- a/src/analyzer/reflect_type_info.hpp +++ b/src/analyzer/reflect_type_info.hpp @@ -15,6 +15,7 @@ #pragma warning(push) #pragma warning(disable : 4189) #pragma warning(disable : 4308) +#pragma warning(disable : 4715) #endif #include "reflect_extension.hpp" diff --git a/src/common/platform/kernel_mapped.hpp b/src/common/platform/kernel_mapped.hpp index 18599c17..10876cfe 100644 --- a/src/common/platform/kernel_mapped.hpp +++ b/src/common/platform/kernel_mapped.hpp @@ -811,13 +811,15 @@ typedef struct _XSTATE_CONFIGURATION #endif +#define ORIGINALLY_VOLATILE /*volatile*/ + typedef struct _KUSER_SHARED_DATA64 { ULONG TickCountLowDeprecated; ULONG TickCountMultiplier; - volatile KSYSTEM_TIME InterruptTime; - volatile KSYSTEM_TIME SystemTime; - volatile KSYSTEM_TIME TimeZoneBias; + ORIGINALLY_VOLATILE KSYSTEM_TIME InterruptTime; + ORIGINALLY_VOLATILE KSYSTEM_TIME SystemTime; + ORIGINALLY_VOLATILE KSYSTEM_TIME TimeZoneBias; USHORT ImageNumberLow; USHORT ImageNumberHigh; ARRAY_CONTAINER NtSystemRoot; @@ -829,7 +831,7 @@ typedef struct _KUSER_SHARED_DATA64 ULONG AppCompatFlag; ULONGLONG RNGSeedVersion; ULONG GlobalValidationRunlevel; - volatile LONG TimeZoneBiasStamp; + ORIGINALLY_VOLATILE LONG TimeZoneBiasStamp; ULONG NtBuildNumber; NT_PRODUCT_TYPE NtProductType; BOOLEAN ProductTypeIsValid; @@ -840,7 +842,7 @@ typedef struct _KUSER_SHARED_DATA64 ARRAY_CONTAINER ProcessorFeatures; ULONG Reserved1; ULONG Reserved3; - volatile ULONG TimeSlip; + ORIGINALLY_VOLATILE ULONG TimeSlip; ALTERNATIVE_ARCHITECTURE_TYPE AlternativeArchitecture; ULONG BootId; LARGE_INTEGER SystemExpirationDate; @@ -848,8 +850,8 @@ typedef struct _KUSER_SHARED_DATA64 BOOLEAN KdDebuggerEnabled; KUSD_MITIGATION_POLICIES_UNION MitigationPolicies; USHORT CyclesPerYield; - volatile ULONG ActiveConsoleId; - volatile ULONG DismountCount; + ORIGINALLY_VOLATILE ULONG ActiveConsoleId; + ORIGINALLY_VOLATILE ULONG DismountCount; ULONG ComPlusPackage; ULONG LastSystemRITEventTickCount; ULONG NumberOfPhysicalPages; @@ -882,10 +884,10 @@ typedef struct _KUSER_SHARED_DATA64 ULONG ImageFileExecutionOptions; ULONG LangGenerationCount; ULONGLONG Reserved4; - volatile ULONGLONG InterruptTimeBias; - volatile ULONGLONG QpcBias; + ORIGINALLY_VOLATILE ULONGLONG InterruptTimeBias; + ORIGINALLY_VOLATILE ULONGLONG QpcBias; ULONG ActiveProcessorCount; - volatile UCHAR ActiveGroupCount; + ORIGINALLY_VOLATILE UCHAR ActiveGroupCount; UCHAR Reserved9; KUSD_QPC_DATA_UNION QpcData; LARGE_INTEGER TimeZoneBiasEffectiveStart;