update build_create_analyze_test.cmd to use msbuild configuration to …

…allow different project configurations for different tests. Revert fail_driver1.c to fix build issues caused by previous change
microsoft · Dec 4, 2023 · cc864c0 · cc864c0
1 parent 28135c6
commit cc864c0
Show file tree

Hide file tree

Showing 7 changed files with 317 additions and 235 deletions.
diff --git a/src/drivers/general/queries/experimental/UnicodeStringFreed/driver_snippet.c b/src/drivers/general/queries/experimental/UnicodeStringFreed/driver_snippet.c
@@ -3,11 +3,12 @@
 //
 // driver_snippet.c
 //
-#include "ntifs.h"
 
+#include "ntifs.h"
 #define SET_DISPATCH 1
 // Template. Not called in this test.
 void top_level_call() {}
+
 PUNICODE_STRING unicodeStringGlobal;
 void free_unicode_string(PUNICODE_STRING unicodeStr)
 {

diff --git a/src/drivers/test/WDMTestTemplate/WDMTestTemplate.sln b/src/drivers/test/WDMTestTemplate/WDMTestTemplate.sln
@@ -1,28 +1,36 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0
-MinimumVisualStudioVersion = 12.0
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fail_driver1", "driver\fail_driver1.vcxproj", "{7F88D5C5-F05F-4817-89F5-C811053277A0}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-		Debug|x64 = Debug|x64
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{7F88D5C5-F05F-4817-89F5-C811053277A0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7F88D5C5-F05F-4817-89F5-C811053277A0}.Debug|Win32.Build.0 = Debug|Win32
-		{7F88D5C5-F05F-4817-89F5-C811053277A0}.Release|Win32.ActiveCfg = Release|Win32
-		{7F88D5C5-F05F-4817-89F5-C811053277A0}.Release|Win32.Build.0 = Release|Win32
-		{7F88D5C5-F05F-4817-89F5-C811053277A0}.Debug|x64.ActiveCfg = Debug|x64
-		{7F88D5C5-F05F-4817-89F5-C811053277A0}.Debug|x64.Build.0 = Debug|x64
-		{7F88D5C5-F05F-4817-89F5-C811053277A0}.Release|x64.ActiveCfg = Release|x64
-		{7F88D5C5-F05F-4817-89F5-C811053277A0}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.7.34302.85
+MinimumVisualStudioVersion = 12.0
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fail_driver1", "driver\fail_driver1.vcxproj", "{7F88D5C5-F05F-4817-89F5-C811053277A0}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		NTIFS|Win32 = NTIFS|Win32
+		NTIFS|x64 = NTIFS|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{7F88D5C5-F05F-4817-89F5-C811053277A0}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7F88D5C5-F05F-4817-89F5-C811053277A0}.Debug|Win32.Build.0 = Debug|Win32
+		{7F88D5C5-F05F-4817-89F5-C811053277A0}.Debug|x64.ActiveCfg = Debug|x64
+		{7F88D5C5-F05F-4817-89F5-C811053277A0}.Debug|x64.Build.0 = Debug|x64
+		{7F88D5C5-F05F-4817-89F5-C811053277A0}.NTIFS|Win32.ActiveCfg = NTIFS|Win32
+		{7F88D5C5-F05F-4817-89F5-C811053277A0}.NTIFS|Win32.Build.0 = NTIFS|Win32
+		{7F88D5C5-F05F-4817-89F5-C811053277A0}.NTIFS|Win32.Deploy.0 = NTIFS|Win32
+		{7F88D5C5-F05F-4817-89F5-C811053277A0}.NTIFS|x64.ActiveCfg = NTIFS|x64
+		{7F88D5C5-F05F-4817-89F5-C811053277A0}.NTIFS|x64.Build.0 = NTIFS|x64
+		{7F88D5C5-F05F-4817-89F5-C811053277A0}.NTIFS|x64.Deploy.0 = NTIFS|x64
+		{7F88D5C5-F05F-4817-89F5-C811053277A0}.Release|Win32.ActiveCfg = Release|Win32
+		{7F88D5C5-F05F-4817-89F5-C811053277A0}.Release|Win32.Build.0 = Release|Win32
+		{7F88D5C5-F05F-4817-89F5-C811053277A0}.Release|x64.ActiveCfg = Release|x64
+		{7F88D5C5-F05F-4817-89F5-C811053277A0}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/src/drivers/test/WDMTestTemplate/driver/fail_driver1.c b/src/drivers/test/WDMTestTemplate/driver/fail_driver1.c
@@ -21,8 +21,8 @@ Module Name:
 
 --*/
 
-#include "driver_snippet.c"
 #include "fail_driver1.h"
+#include "driver_snippet.c"
 
 
 #define _DRIVER_NAME_ "fail_driver1"

diff --git a/src/drivers/test/WDMTestTemplate/driver/fail_driver1.h b/src/drivers/test/WDMTestTemplate/driver/fail_driver1.h
@@ -15,7 +15,13 @@ Module Name:
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+#ifdef USE_NTIFS
+#include "ntifs.h"
+#else
 #include <wdm.h>
+#endif
+
 #ifdef __cplusplus
 }
 #endif