Changeset 42154 in vbox for trunk/src/VBox/Additions/WINNT/SharedFolders

Timestamp:

Jul 13, 2012 11:00:53 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

79125

Message:

VS2010 preps.

Location:

trunk/src/VBox/Additions/WINNT/SharedFolders

Files:

• driver/Makefile.kmk (modified) (2 diffs)
• driver/file.c (modified) (1 diff)
• driver/path.c (modified) (1 diff)
• driver/vbsf.c (modified) (2 diffs)
• np/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/SharedFolders/driver/Makefile.kmk

@@ -27 +27 @@
 #VBoxSF_DEFS       += LOG_ENABLED
 
-VBoxSF_SDKS.x86    = WINDDKW2K
-VBoxSF_SDKS.amd64  = WINDDKWLH
+ifeq ($(VBOX_WINDDK_GST),W2K3DDK)
+VBoxSF_SDKS.x86    = ReorderCompilerIncs WINDDKW2K
+else
+VBoxSF_SDKS.x86    = ReorderCompilerIncs $(VBOX_WINDDK_GST_W2K)
+endif
+VBoxSF_SDKS.amd64  = ReorderCompilerIncs $(VBOX_WINDDK_GST_WLH)
 
 VBoxSF_INCS        = \
@@ -44 +48 @@
         VBoxSF.rc
 
-VBoxSF_LIBS.x86  = \
-        $(PATH_SDK_WINDDKW2K_LIB.x86)/fre/rxce.lib \
-        $(PATH_SDK_WINDDKW2K_LIB.x86)/fre/rdbsslib.lib \
-        $(PATH_SDK_WINDDKW2K_LIB.x86)/fre/copysup.lib \
-        $(PATH_SDK_WINDDKW2K_LIB.x86)/ntoskrnl.lib \
-        $(PATH_SDK_WINDDKW2K_LIB.x86)/hal.lib \
-        $(PATH_SDK_WINDDKW2K_LIB.x86)/ksecdd.lib \
-        $(PATH_SDK_WINDDKW2K_LIB.x86)/BufferOverflowK.lib
+ifeq ($(VBOX_WINDDK_GST),W2K3DDK)
+ VBoxSF_LIBS.x86  = \
+        $(PATH_SDK_WINDDKW2K_LIB.x86)/fre/rxce.lib \
+        $(PATH_SDK_WINDDKW2K_LIB.x86)/fre/rdbsslib.lib \
+        $(PATH_SDK_WINDDKW2K_LIB.x86)/fre/copysup.lib \
+        $(PATH_SDK_WINDDKW2K_LIB.x86)/ntoskrnl.lib \
+        $(PATH_SDK_WINDDKW2K_LIB.x86)/hal.lib \
+        $(PATH_SDK_WINDDKW2K_LIB.x86)/ksecdd.lib \
+        $(PATH_SDK_WINDDKW2K_LIB.x86)/BufferOverflowK.lib
+else
+ VBoxSF_LIBS.x86  = \
+        $(PATH_SDK_$(VBOX_WINDDK_GST_W2K)_LIB.x86)/rxce.lib \
+        $(PATH_SDK_$(VBOX_WINDDK_GST_W2K)_LIB.x86)/rdbsslib.lib \
+        $(PATH_SDK_$(VBOX_WINDDK_GST_W2K)_LIB.x86)/copysup.lib \
+        $(PATH_SDK_$(VBOX_WINDDK_GST_W2K)_LIB.x86)/ntoskrnl.lib \
+        $(PATH_SDK_$(VBOX_WINDDK_GST_W2K)_LIB.x86)/hal.lib \
+        $(PATH_SDK_$(VBOX_WINDDK_GST_W2K)_LIB.x86)/ksecdd.lib \
+        $(PATH_SDK_$(VBOX_WINDDK_GST_W2K)_LIB.x86)/BufferOverflowK.lib
+endif
 
 VBoxSF_LIBS.amd64  = \
-        $(PATH_SDK_WINDDKWLH_LIB.amd64)/rxce.lib \
-        $(PATH_SDK_WINDDKWLH_LIB.amd64)/rdbsslib.lib \
-        $(PATH_SDK_WINDDKWLH_LIB.amd64)/copysup.lib \
-        $(PATH_SDK_WINDDKWLH_LIB.amd64)/ntoskrnl.lib \
-        $(PATH_SDK_WINDDKWLH_LIB.amd64)/hal.lib \
-        $(PATH_SDK_WINDDKWLH_LIB.amd64)/ksecdd.lib \
-        $(PATH_SDK_WINDDKWLH_LIB.amd64)/BufferOverflowK.lib
+        $(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.amd64)/rxce.lib \
+        $(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.amd64)/rdbsslib.lib \
+        $(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.amd64)/copysup.lib \
+        $(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.amd64)/ntoskrnl.lib \
+        $(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.amd64)/hal.lib \
+        $(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.amd64)/ksecdd.lib \
+        $(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.amd64)/BufferOverflowK.lib
 
 VBoxSF_LIBS = \

trunk/src/VBox/Additions/WINNT/SharedFolders/driver/file.c

@@ -55 +55 @@
 
     /* @todo check if this is necessary. */
-#if (NTDDI_VERSION >= NTDDI_VISTA)      /* Correct spelling for Vista 6001 SDK. */
+#ifdef FCB_STATE_READCACHING_ENABLED    /* Correct spelling for Vista 6001 SDK. */
     if (!FlagOn(capFcb->FcbState, FCB_STATE_READCACHING_ENABLED))
 #else

trunk/src/VBox/Additions/WINNT/SharedFolders/driver/path.c

@@ -498 +498 @@
 
     /* Disable FastIO. It causes a verifier bugcheck. */
-#if (NTDDI_VERSION >= NTDDI_VISTA)
+#ifdef SRVOPEN_FLAG_DONTUSE_READ_CACHING
     SetFlag(SrvOpen->Flags, SRVOPEN_FLAG_DONTUSE_READ_CACHING | SRVOPEN_FLAG_DONTUSE_WRITE_CACHING);
 #else

trunk/src/VBox/Additions/WINNT/SharedFolders/driver/vbsf.c

@@ +1 @@
+/* $Id$ */
 /** @file
- *
- * VirtualBox Windows Guest Shared Folders
+ * VirtualBox Windows Guest Shared Folders.
  *
  * File System Driver initialization and generic routines
@@ -1382 +1382 @@
  * WML stubs which are referenced by rdbsslib.
  */
-NTSTATUS WmlTinySystemControl(void)
+NTSTATUS WmlTinySystemControl(IN OUT PVOID pWmiLibInfo, IN PVOID pDevObj, IN PVOID pIrp)
 {
     return STATUS_WMI_GUID_NOT_FOUND;
 }
 
-ULONG WmlTrace(void)
+ULONG WmlTrace(IN ULONG ulType, IN PVOID pTraceUuid, IN ULONG64 ullLogger, ...)
 {
     return STATUS_SUCCESS;
 }
+

trunk/src/VBox/Additions/WINNT/SharedFolders/np/Makefile.kmk

@@ -21 +21 @@
 DLLS += VBoxMRXNP
 VBoxMRXNP_TEMPLATE    = VBOXGUESTR3DLL
-VBoxMRXNP_SDKS        = WINDDK
+ifeq ($(VBOX_WINDDK_GST),W2K3DDK)
+VBoxMRXNP_SDKS        = ReorderCompilerIncs WINDDK
+else
+VBoxMRXNP_SDKS        = ReorderCompilerIncs $(VBOX_WINDDK_GST_W2K)
+endif
 VBoxMRXNP_DEFS        = LOG_TO_BACKDOOR _WIN32_WINNT=0x0500 UNICODE WIN32_LEAN_AND_MEAN=1
 #VBoxMRXNP_DEFS       += LOG_ENABLED