Fixes for tests in release-mode

frendguo · Feb 25, 2023 · d2400ce · d2400ce
1 parent e232c02
commit d2400ce
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/HookLib/HookLib.vcxproj b/HookLib/HookLib.vcxproj
@@ -53,7 +53,7 @@
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
-    <TargetVersion>Windows7</TargetVersion>
+    <TargetVersion>Windows10</TargetVersion>
     <DriverTargetPlatform>Desktop</DriverTargetPlatform>
     <SupportsPackaging>false</SupportsPackaging>
     <DriverType>WDM</DriverType>
@@ -72,7 +72,7 @@
     <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <TargetVersion>Windows7</TargetVersion>
+    <TargetVersion>Windows10</TargetVersion>
     <DriverTargetPlatform>Desktop</DriverTargetPlatform>
     <SupportsPackaging>false</SupportsPackaging>
     <DriverType>WDM</DriverType>
@@ -108,7 +108,7 @@
     <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <TargetVersion>Windows7</TargetVersion>
+    <TargetVersion>Windows10</TargetVersion>
     <DriverTargetPlatform>Desktop</DriverTargetPlatform>
     <SupportsPackaging>false</SupportsPackaging>
     <DriverType>WDM</DriverType>

diff --git a/HookLibDrvTests/HookLibDrvTests.vcxproj b/HookLibDrvTests/HookLibDrvTests.vcxproj
@@ -26,6 +26,7 @@
     <Configuration>Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
     <RootNamespace>HookLibDrvTests</RootNamespace>
+    <WindowsTargetPlatformVersion>$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -118,6 +119,9 @@
       <WholeProgramOptimization>true</WholeProgramOptimization>
       <AdditionalOptions>/Ob3 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
+    <Link>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+    </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <DriverSign>
@@ -157,6 +161,9 @@
       <WholeProgramOptimization>true</WholeProgramOptimization>
       <AdditionalOptions>/Ob3 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
+    <Link>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+    </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
     <FilesToPackage Include="$(TargetPath)" />

diff --git a/HookLibDrvTests/Main.cpp b/HookLibDrvTests/Main.cpp
@@ -3,29 +3,33 @@
 
 #define hk_assert(cond) if (!(cond)) { __int2c(); } __assume((cond))
 
+extern "C" NTSTATUS NTAPI ZwYieldExecution();
+
 namespace
 {
     template <unsigned int index>
-    constexpr unsigned int validFunc(int a, int b)
+    constexpr inline unsigned int validFunc(int a, int b)
     {
         return 0x1ee7c0de * (a + b + index);
     }
 
     template <unsigned int index>
-    constexpr unsigned int validHandler(int a, int b)
+    constexpr inline unsigned int validHandler(int a, int b)
     {
         return 0xc0ffee * (a + b + index);
     }
 
     template <unsigned int index>
-    __declspec(noinline) unsigned int func(int a, int b)
+    __declspec(noinline) __declspec(dllexport) unsigned int func(int a, int b)
     {
+        ZwYieldExecution();
         return validFunc<index>(a, b);
     }
 
     template <unsigned int index>
-    __declspec(noinline) unsigned int handler(int a, int b)
+    __declspec(noinline) __declspec(dllexport) unsigned int handler(int a, int b)
     {
+        ZwYieldExecution();
         return validHandler<index>(a, b);
     }
 
@@ -87,7 +91,6 @@ namespace
         testHookOnce();
         testMultihook();
     }
-
 } // namespace