Define NT_PROCESSOR_GROUPS for VS2012 project

Previous patch missed the obvious compatability macros provided
and used by xenbus.
Also fixes a few badly formed ASSERTions

Signed-off-by: Owen Smith <owen.smith@citrix.com>
Signed-off-by: Paul Durrant <paul.durrant@citrix.com>

diff --git a/src/xeniface/driver.c b/src/xeniface/driver.c
index f4e82401514d6bf2a438700f07f64e3094a0fa65..a843d00e19f13cbf29ca123b69cc618c44c5ca74 100644 (file)
--- a/src/xeniface/driver.c
+++ b/src/xeniface/driver.c
@@ -30,6 +30,7 @@
  */
 
 #include <ntifs.h>
+#include <procgrp.h>
 #include <version.h>
 
 #include "fdo.h"
@@ -149,6 +150,7 @@ DriverEntry(
     ASSERT3P(DriverObject, ==, NULL);
 
     ExInitializeDriverRuntime(DrvRtPoolNxOptIn);
+    WdmlibProcgrpInitialize();
 
     Trace("====>\n");
 

diff --git a/src/xeniface/fdo.c b/src/xeniface/fdo.c
index 71ffbe265915b03563197718d9090950dc64cbbc..fdb3edf90b941b12b0773d79ed86444fb861cef3 100644 (file)
--- a/src/xeniface/fdo.c
+++ b/src/xeniface/fdo.c
@@ -31,6 +31,7 @@
 
 
 #include <ntifs.h>
+#include <procgrp.h>
 #include <wdmguid.h>
 #include <ntstrsafe.h>
 #include <stdlib.h>

diff --git a/src/xeniface/ioctl_evtchn.c b/src/xeniface/ioctl_evtchn.c
index 93f193105863e9a309b24bdf49894db1eed4e58f..3b8ecb564a8e5a763ad03b074ca2704260b33e91 100644 (file)
--- a/src/xeniface/ioctl_evtchn.c
+++ b/src/xeniface/ioctl_evtchn.c
@@ -29,6 +29,8 @@
  * SUCH DAMAGE.
  */
 
+#include <ntifs.h>
+#include <procgrp.h>
 #include "driver.h"
 #include "ioctls.h"
 #include "xeniface_ioctls.h"
@@ -51,7 +53,7 @@ EvtchnNotificationDpc(
     UNREFERENCED_PARAMETER(_Context);
     UNREFERENCED_PARAMETER(Argument2);
 
-    ASSERT(Context);
+    ASSERT(Context != NULL);
 
 #if DBG
     XenIfaceDebugPrint(INFO, "Channel %p, LocalPort %d, Cpu %lu\n",
@@ -80,7 +82,7 @@ EvtchnInterruptHandler(
     ULONG ProcIndex;
 
     UNREFERENCED_PARAMETER(Interrupt);
-    ASSERT(Context);
+    ASSERT(Context != NULL);
 
     KeGetCurrentProcessorNumberEx(&ProcNumber);
     ProcIndex = KeGetProcessorIndexFromNumber(&ProcNumber);

diff --git a/src/xeniface/ioctls.c b/src/xeniface/ioctls.c
index b306a45616d3758acb1f12ce83aee6d5abf2599e..e1e3b6df1adaf124a2948e2110be68d06a9a7672 100644 (file)
--- a/src/xeniface/ioctls.c
+++ b/src/xeniface/ioctls.c
@@ -30,6 +30,8 @@
  * SUCH DAMAGE.
  */
 
+#include <ntifs.h>
+#include <procgrp.h>
 #include "driver.h"
 #include "ioctls.h"
 #include "xeniface_ioctls.h"

diff --git a/vs2012/xeniface/xeniface.vcxproj b/vs2012/xeniface/xeniface.vcxproj
index fadc1d1333e048df17ccb274e318f32b757a21c1..c57e2a250b0baded5a8c4e4004923b0d535e1f2f 100644 (file)
--- a/vs2012/xeniface/xeniface.vcxproj
+++ b/vs2012/xeniface/xeniface.vcxproj
@@ -32,7 +32,7 @@
        
     <ItemDefinitionGroup>       
                <ClCompile>
-                       <PreprocessorDefinitions>__MODULE__="XENIFACE";POOL_NX_OPTIN=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+                       <PreprocessorDefinitions>__MODULE__="XENIFACE";POOL_NX_OPTIN=1;NT_PROCESSOR_GROUPS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
                        <WarningLevel>EnableAllWarnings</WarningLevel>
                        <DisableSpecificWarnings>4711;4548;4820;4668;4255;6001;6054;%(DisableSpecificWarnings)</DisableSpecificWarnings>
                        <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -40,7 +40,7 @@
                </ClCompile>
                <Link>
                        <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-                       <AdditionalDependencies>$(DDK_LIB_PATH)\ntstrsafe.lib;%(AdditionalDependencies)</AdditionalDependencies>
+                       <AdditionalDependencies>$(DDK_LIB_PATH)\ntstrsafe.lib;$(DDK_LIB_PATH)\procgrp.lib;%(AdditionalDependencies)</AdditionalDependencies>
                        <EnableCOMDATFolding>false</EnableCOMDATFolding>
                </Link>
                <Inf>