Resolve warnings with code analysis

Author: tandasat

SimpleSvmHook/Common.hpp

@@ -33,7 +33,7 @@
 //
 // The pool tag.
 //
-static const ULONG k_PoolTag = 'MVSS';
+static constexpr ULONG k_PoolTag = 'MVSS';
 
 //
 // The handy macros to specify at which section the code placed.

SimpleSvmHook/HookCommon.hpp

@@ -5,7 +5,7 @@
 
     @author Satoshi Tanda
 
-    @copyright Copyright (c) 2018, Satoshi Tanda. All rights reserved.
+    @copyright Copyright (c) 2018-2021, Satoshi Tanda. All rights reserved.
  */
 #pragma once
 #include <fltKernel.h>
@@ -129,19 +129,19 @@ typedef struct _HOOK_DATA
 
 
 // Get the highest 25 bits
-static const ULONGLONG k_PxiShift = 39;
+static constexpr ULONGLONG k_PxiShift = 39;
 
 // Get the highest 34 bits
-static const ULONGLONG k_PpiShift = 30;
+static constexpr ULONGLONG k_PpiShift = 30;
 
 // Get the highest 43 bits
-static const ULONGLONG k_PdiShift = 21;
+static constexpr ULONGLONG k_PdiShift = 21;
 
 // Get the highest 52 bits
-static const ULONGLONG k_PtiShift = 12;
+static constexpr ULONGLONG k_PtiShift = 12;
 
 // Use 9 bits; 0b0000_0000_0000_0000_0000_0000_0001_1111_1111
-static const ULONGLONG k_PtxMask = 0x1ff;
+static constexpr ULONGLONG k_PtxMask = 0x1ff;
 
 /*!
     @brief Returns the index of PML4 entry for the specified physical address.
@@ -319,7 +319,7 @@ GetVaFromPfn (
     return GetVaFromPa(GetPaFromPfn(PageFrameNumber));
 }
 
-_When_(HookData == nullptr, __drv_allocatesMem(Mem) _Post_maybenull_)
+_When_(HookData == nullptr, _Post_maybenull_)
 _Post_writable_byte_size_(PAGE_SIZE)
 PVOID
 AllocateNptEntry (

SimpleSvmHook/HookKernelProcessorData.cpp

@@ -24,7 +24,7 @@ static
 _IRQL_requires_max_(DISPATCH_LEVEL)
 VOID
 DestructNestedPageTablesInternal (
-    _In_reads_(512) _Frees_ptr_ TableType* Table,
+    _In_reads_(512) TableType* Table,
     _In_ ULONG TableLevel
     )
 {
@@ -79,7 +79,7 @@ static
 _IRQL_requires_max_(DISPATCH_LEVEL)
 VOID
 DestructNestedPageTables (
-    _In_reads_(512) _Frees_ptr_ PPML4_ENTRY_4KB Pml4Table
+    _In_reads_(512) PPML4_ENTRY_4KB Pml4Table
     )
 {
     DestructNestedPageTablesInternal(Pml4Table, 4);
@@ -115,7 +115,7 @@ BuildNestedPageTables (
     _Out_ PULONG MaxPpeIndex
     )
 {
-    static const ULONG oneGigabyte = 1024 * 1024 * 1024;
+    static constexpr ULONG oneGigabyte = 1024 * 1024 * 1024;
 
     NTSTATUS status;
     PPML4_ENTRY_4KB pml4Table;

SimpleSvmHook/Performance.cpp

@@ -5,7 +5,7 @@
 
     @author Satoshi Tanda
 
-    @copyright Copyright (c) 2018-2019, Satoshi Tanda. All rights reserved.
+    @copyright Copyright (c) 2018-2021, Satoshi Tanda. All rights reserved.
  */
 #include "Performance.hpp"
 #include "Logging.hpp"
@@ -16,7 +16,7 @@
 //
 #pragma prefast(disable : __WARNING_ERROR, "This is completely bogus.")
 
-static const ULONG k_PerformancePoolTag = 'freP';
+static constexpr ULONG k_PerformancePoolTag = 'freP';
 
 /*!
     @brief Responsible for collecting and saving data supplied by PerfCounter.

SimpleSvmHook/Virtualization.cpp

@@ -708,9 +708,9 @@ BuildMsrPermissionsMap (
     _Inout_ PVOID MsrPermissionsMap
     )
 {
-    static const UINT32 bitsPerMsr = 2;
-    static const UINT32 secondMsrRangeBase = 0xc0000000;
-    static const UINT32 secondMsrpmOffset = 0x800 * CHAR_BIT;
+    static constexpr UINT32 bitsPerMsr = 2;
+    static constexpr UINT32 secondMsrRangeBase = 0xc0000000;
+    static constexpr UINT32 secondMsrpmOffset = 0x800 * CHAR_BIT;
 
     RTL_BITMAP bitmapHeader;
     ULONG offsetFrom2ndBase, offset;

SimpleSvmHook/x86_64.hpp

@@ -5,12 +5,12 @@
 
     @author Satoshi Tanda
 
-    @copyright Copyright (c) 2018, Satoshi Tanda. All rights reserved.
+    @copyright Copyright (c) 2018-2021, Satoshi Tanda. All rights reserved.
  */
 #pragma once
 #include <basetsd.h>
 
-static const ULONG k_MaxInsturctionLength = 15;
+static constexpr ULONG k_MaxInsturctionLength = 15;
 
 #define IA32_APIC_BASE  0x0000001b
 #define IA32_MSR_PAT    0x00000277