Work around bug in VS2017 SDV

XENBUS commit 868cd40f (of the same name) introduced a workaround for a
quoting bug in SDV. This commit applies a similar workaround for XENVKBD.

Signed-off-by: Paul Durrant <paul.durrant@citrix.com>

diff --git a/src/coinst/coinst.c b/src/coinst/coinst.c
index dfa5105cd581d53ef9b4af897e04b033e9c75068..22f358a2056256e24665d1615c610ececc6477ae 100644 (file)
--- a/src/coinst/coinst.c
+++ b/src/coinst/coinst.c
@@ -40,6 +40,10 @@
 #include <version.h>
 #include <revision.h>
 
+#define stringify_literal(_text) #_text
+#define stringify(_text) stringify_literal(_text)
+#define __MODULE__ stringify(PROJECT)
+
 __user_code;
 
 #define MAXIMUM_BUFFER_SIZE 1024

diff --git a/src/xenvkbd/dbg_print.h b/src/xenvkbd/dbg_print.h
index 53a4d0110f8a12003d95497882cc0176d68cfbd9..751655bbd04bae9904cf101e459dee1024cb58c6 100644 (file)
--- a/src/xenvkbd/dbg_print.h
+++ b/src/xenvkbd/dbg_print.h
@@ -35,9 +35,9 @@
 #include <ntddk.h>
 #include <stdarg.h>
 
-#ifdef  _SDV_
-#define __MODULE__ ""
-#endif
+#define stringify_literal(_text) #_text
+#define stringify(_text) stringify_literal(_text)
+#define __MODULE__ stringify(PROJECT)
 
 #pragma warning(disable:4127)   // conditional expression is constant
 

diff --git a/vs2015/xenvkbd/xenvkbd.vcxproj b/vs2015/xenvkbd/xenvkbd.vcxproj
index 0814db203d82489d6e0a9bd8b34086596f0f3720..7e757a2c4c7b193aae591b86a5e9ba33a5c7aedd 100644 (file)
--- a/vs2015/xenvkbd/xenvkbd.vcxproj
+++ b/vs2015/xenvkbd/xenvkbd.vcxproj
@@ -21,7 +21,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>$(WindowsSdkDir)\include\km;..\..\include;..\..\include\xen;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>__MODULE__="XENVKBD";POOL_NX_OPTIN=1;NT_PROCESSOR_GROUPS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>PROJECT=$(ProjectName);POOL_NX_OPTIN=1;NT_PROCESSOR_GROUPS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WarningLevel>EnableAllWarnings</WarningLevel>
       <DisableSpecificWarnings>4464;4711;4548;4820;4668;4255;6001;6054;28196;30030;30029;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>

diff --git a/vs2015/xenvkbd_coinst/xenvkbd_coinst.vcxproj b/vs2015/xenvkbd_coinst/xenvkbd_coinst.vcxproj
index ad5c7b5ac1aa631634d48f78ff186fdc69aa3c08..3fd878edda8f1965b2d8eea3060b95e3aa0b808d 100644 (file)
--- a/vs2015/xenvkbd_coinst/xenvkbd_coinst.vcxproj
+++ b/vs2015/xenvkbd_coinst/xenvkbd_coinst.vcxproj
@@ -22,7 +22,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <PreprocessorDefinitions>__MODULE__="XENVKBD_COINST";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>PROJECT=$(ProjectName);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WarningLevel>EnableAllWarnings</WarningLevel>
       <DisableSpecificWarnings>4127;4548;4711;4820;4668;4255;6001;6054;28196;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>

diff --git a/vs2017/xenvkbd/xenvkbd.vcxproj b/vs2017/xenvkbd/xenvkbd.vcxproj
index 2aeb6efd4486958e6d945ff426b62ec0d9bc5942..1ced810b0333291ffe92511ad9e67e7d3fadfb20 100644 (file)
--- a/vs2017/xenvkbd/xenvkbd.vcxproj
+++ b/vs2017/xenvkbd/xenvkbd.vcxproj
@@ -21,7 +21,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>$(WindowsSdkDir)\include\km;..\..\include;..\..\include\xen;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>__MODULE__="XENVKBD";POOL_NX_OPTIN=1;NT_PROCESSOR_GROUPS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>PROJECT=$(ProjectName);POOL_NX_OPTIN=1;NT_PROCESSOR_GROUPS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <WarningLevel>EnableAllWarnings</WarningLevel>
       <DisableSpecificWarnings>4464;4711;4548;4770;4820;4668;4255;5045;6001;6054;28196;30030;30029;%(DisableSpecificWarnings)</DisableSpecificWarnings>

diff --git a/vs2017/xenvkbd_coinst/xenvkbd_coinst.vcxproj b/vs2017/xenvkbd_coinst/xenvkbd_coinst.vcxproj
index 79991e73d2aea77cc188821404636afa38b7471a..544afb96c9d722605323f752846c5f2f9589e99c 100644 (file)
--- a/vs2017/xenvkbd_coinst/xenvkbd_coinst.vcxproj
+++ b/vs2017/xenvkbd_coinst/xenvkbd_coinst.vcxproj
@@ -22,7 +22,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <PreprocessorDefinitions>__MODULE__="XENVKBD_COINST";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>PROJECT=$(ProjectName);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WarningLevel>EnableAllWarnings</WarningLevel>
       <DisableSpecificWarnings>4127;4548;4711;4820;4668;4255;5045;6001;6054;28196;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>