fix: cannot build for x64-release

xiaolou86 · Jul 4, 2019 · 85ebeaa · 85ebeaa
1 parent 59c0929
commit 85ebeaa
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 6 deletions.
diff --git a/driver/lib/dbgcode.c b/driver/lib/dbgcode.c
@@ -1,9 +1,9 @@
 #include "dbgcode.h"
 
-#include <ntstrsafe.h>
-
 #ifdef DBG
 
+#include <ntstrsafe.h>
+
 static namecode_t namecodes_ntstatus[] = {
 	K_V(STATUS_SUCCESS)
 	K_V(STATUS_PENDING)

diff --git a/driver/stub/stub_dbg.h b/driver/stub/stub_dbg.h
@@ -3,10 +3,10 @@
 #define DRVPREFIX	"usbip_stub"
 #include "dbgcommon.h"
 #include "dbgcode.h"
+#include "stub_dev.h"
 
 #ifdef DBG
 
-#include "stub_dev.h"
 #include "stub_devconf.h"
 
 #define DBG_GENERAL	0x00000001

diff --git a/driver/stub/stub_irp.c b/driver/stub/stub_irp.c
@@ -1,5 +1,6 @@
 #include "stub_driver.h"
 #include "stub_dbg.h"
+#include "stub_dev.h"
 
 NTSTATUS
 complete_irp(IRP *irp, NTSTATUS status, ULONG info)

diff --git a/driver/stub/stub_irp.h b/driver/stub/stub_irp.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <ntddk.h>
+#include "stub_dev.h"
 
 NTSTATUS complete_irp(IRP *irp, NTSTATUS status, ULONG info);
 NTSTATUS pass_irp_down(usbip_stub_dev_t *devstub, IRP *irp, PIO_COMPLETION_ROUTINE completion_routine, void *context);
diff --git a/driver/stub/stub_res.h b/driver/stub/stub_res.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "stub_dev.h"
+#include "usbip_proto.h"
 
 typedef struct stub_res {
 	PIRP	irp;

diff --git a/driver/stub/usbip_stub.vcxproj b/driver/stub/usbip_stub.vcxproj
@@ -183,6 +183,7 @@
       <WppScanConfigurationData Condition="'%(ClCompile.ScanConfigurationData)' == ''">trace.h</WppScanConfigurationData>
       <WppKernelMode>true</WppKernelMode>
       <AdditionalIncludeDirectories>..\..\include;..\lib;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <TreatWarningAsError>false</TreatWarningAsError>
     </ClCompile>
     <Link>
       <AdditionalDependencies>$(DDK_LIB_PATH)wdmsec.lib;$(DDK_LIB_PATH)ntstrsafe.lib;$(DDK_LIB_PATH)usbd.lib;$(DDK_LIB_PATH)usbdex.lib;%(AdditionalDependencies)</AdditionalDependencies>

diff --git a/driver/vhci/usbip_vhci.vcxproj b/driver/vhci/usbip_vhci.vcxproj
@@ -185,6 +185,7 @@
       <WppScanConfigurationData Condition="'%(ClCompile.ScanConfigurationData)' == ''">trace.h</WppScanConfigurationData>
       <WppKernelMode>true</WppKernelMode>
       <AdditionalIncludeDirectories>..\..\include;..\lib;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <TreatWarningAsError>false</TreatWarningAsError>
     </ClCompile>
     <Link>
       <AdditionalDependencies>$(DDK_LIB_PATH)wdmsec.lib;$(DDK_LIB_PATH)ntstrsafe.lib;usbd.lib;%(AdditionalDependencies)</AdditionalDependencies>

diff --git a/driver/vhci/vhci_devconf.c b/driver/vhci/vhci_devconf.c
@@ -1,7 +1,5 @@
 #include "vhci.h"
 
-#include <usbdlib.h>
-
 #include "vhci_devconf.h"
 #include "usbip_vhci_api.h"
 #include "usbip_proto.h"

diff --git a/userspace/lib/usbip_common.vcxproj b/userspace/lib/usbip_common.vcxproj
@@ -139,6 +139,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>HAVE_CONFIG_H</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>

diff --git a/userspace/src/usbip/usbip.vcxproj b/userspace/src/usbip/usbip.vcxproj
@@ -138,12 +138,13 @@
       <OmitFramePointers>true</OmitFramePointers>
       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
       <AdditionalIncludeDirectories>..\..\..\include; ..\..\lib; windows</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>HAVE_CONFIG_H</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>setupapi.lib;ws2_32.lib</AdditionalDependencies>
+      <AdditionalDependencies>setupapi.lib;advapi32.lib;ws2_32.lib;wintrust.lib;crypt32.lib;newdev.lib</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

diff --git a/userspace/src/usbipd/usbipd.vcxproj b/userspace/src/usbipd/usbipd.vcxproj
@@ -138,6 +138,7 @@
       <OmitFramePointers>true</OmitFramePointers>
       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
       <AdditionalIncludeDirectories>..\..\..\include; ..\..\lib; windows</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>HAVE_CONFIG_H</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>