Index: Config.kmk =================================================================== --- Config.kmk (revision 35966) +++ Config.kmk (working copy) @@ -3414,7 +3414,7 @@ TEMPLATE_VBOXMAINEXE_LIBS.kprofile = $(LIB_KPROFILE) ifeq ($(KBUILD_TARGET),win) - TEMPLATE_VBOXMAINEXE_SDKS = WINPSDK $(VBOX_WINDDK) + TEMPLATE_VBOXMAINEXE_SDKS = WINPSDK # Note: C4250 is the dominance warning, see r32789. # C4065 is about default only switches. # C4996 is about deprected function (CRT only?). @@ -4398,8 +4398,8 @@ TEMPLATE_VBOXGUESTR0 = VBox Guest Driver TEMPLATE_VBOXGUESTR0_EXTENDS = VBOXR0DRV TEMPLATE_VBOXGUESTR0_INST = $(INST_ADDITIONS) -TEMPLATE_VBOXGUESTR0_SDKS.win.x86 = WIN32SDK $(VBOX_WINDDK) -TEMPLATE_VBOXGUESTR0_SDKS.win.amd64 = $(VBOX_WINDDK) WINPSDKINCS +TEMPLATE_VBOXGUESTR0_SDKS.win.x86 = $(VBOX_WINDDK) +TEMPLATE_VBOXGUESTR0_SDKS.win.amd64 = $(VBOX_WINDDK) TEMPLATE_VBOXGUESTR0_LIBS.win.x86 = \ $(PATH_SDK_$(VBOX_WINDDK)_LIB)/int64.lib TEMPLATE_VBOXGUESTR0_DEFS = $(TEMPLATE_VBOXR0DRV_DEFS) IN_GUEST IN_GUEST_R0 Index: configure.vbs =================================================================== --- configure.vbs (revision 35966) +++ configure.vbs (working copy) @@ -56,10 +56,12 @@ ' Whether to try the new tools: Visual Studio 10.0, Windows 7 SDK and WDK. dim g_blnNewTools -g_blnNewTools = False 'True +g_blnNewTools = True +' Whether only build addition +dim g_bOnlyAddition +g_bOnlyAddition = False - '' ' Converts to unix slashes function UnixSlashes(str) @@ -706,11 +708,15 @@ FileDelete g_strCfgFile CfgPrint "# -*- Makefile -*-" CfgPrint "#" - CfgPrint "# Build configuration generated by " & GetCommandline() + CfgPrint "# Build configuration generated by" + CfgPrint "# " & GetCommandline() CfgPrint "#" if g_blnInternalMode = False then CfgPrint "VBOX_OSE := 1" end if + if g_bOnlyAddition = True then + CfgPrint "VBOX_ONLY_ADDITIONS := 1" + end if end sub @@ -2224,6 +2230,7 @@ Print " -h, --help" Print " --internal" Print " --internal-last" + Print " --only-addition" Print "" Print "Components:" Print " --disable-COM" @@ -2340,6 +2347,8 @@ g_blnInternalMode = True case "--internal-last" g_blnInternalFirst = False + case "--only-addition" + g_bOnlyAddition = True case "-h", "--help", "-?" usage Wscript.Quit(0) @@ -2382,8 +2391,8 @@ CheckForPlatformSDK strOptSDK CheckForMidl CheckForDirectXSDK strOptDXSDK - CheckForMingW strOptMingw, strOptW32API - CheckForlibSDL strOptlibSDL + if (Not g_bOnlyAddition) then CheckForMingW strOptMingw, strOptW32API end if + if (Not g_bOnlyAddition) then CheckForlibSDL strOptlibSDL end if ' Don't check for these libraries by default as they are part of OSE ' Using external libs can add a dependency to iconv if (strOptXml2 <> "") then @@ -2392,9 +2401,9 @@ if (strOptXslt <> "") then CheckForXslt strOptXslt end if - CheckForSsl strOptSsl - CheckForCurl strOptCurl - CheckForQt4 strOptQt4 + if (Not g_bOnlyAddition) then CheckForSsl strOptSsl end if + if (Not g_bOnlyAddition) then CheckForCurl strOptCurl end if + if (Not g_bOnlyAddition) then CheckForQt4 strOptQt4 end if if (strOptPython <> "") then CheckForPython strOptPython end if Index: src/VBox/Additions/common/VBoxGuest/Makefile.kmk =================================================================== --- src/VBox/Additions/common/VBoxGuest/Makefile.kmk (revision 35966) +++ src/VBox/Additions/common/VBoxGuest/Makefile.kmk (working copy) @@ -55,14 +55,13 @@ VBoxGuest_LDFLAGS.x86 = -Entry:DriverEntry@8 VBoxGuest_LDFLAGS.amd64 = -Entry:DriverEntry VBoxGuest_LIBS = \ - $(PATH_SDK_W2K3DDK_LIB)/ntoskrnl.lib \ - $(PATH_SDK_W2K3DDK_LIB)/hal.lib + ntoskrnl.lib \ + hal.lib ifdef VBOX_WITH_GUEST_BUGCHECK_DETECTION VBoxGuest_LIBS += \ - $(PATH_SDK_WINDDKWLH_LIB)/aux_klib.lib \ - $(PATH_SDK_WINDDKWLH_LIB)/ksecdd.lib \ - $(PATH_SDK_WINDDKWLH_LIB)/BufferOverflowK.lib - VBoxGuest.cpp_SDKS = WINDDKWLH + aux_klib.lib \ + ksecdd.lib \ + BufferOverflowK.lib endif endif # win ifn1of ($(KBUILD_TARGET), linux freebsd solaris) @@ -133,9 +132,8 @@ VBoxGuest-$(KBUILD_TARGET)-legacy.cpp \ win/VBoxGuest.rc VBoxGuestNT_LIBS = \ - $(PATH_SDK_W2K3DDK_LIB)/exsup.lib \ - $(PATH_SDK_W2K3DDK_LIB)/ntoskrnl.lib \ - $(PATH_SDK_W2K3DDK_LIB)/hal.lib \ + ntoskrnl.lib \ + hal.lib \ $(VBOX_LIB_VBGL_R0BASE) \ $(VBOX_LIB_IPRT_GUEST_R0_NT4) endif # win Index: src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.h =================================================================== --- src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.h (revision 35966) +++ src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.h (working copy) @@ -22,9 +22,28 @@ #include +#if (_MSC_VER >= 1400) && !defined(VBOX_WITH_PATCHED_DDK) +# include +# define _InterlockedExchange _InterlockedExchange_StupidDDKVsCompilerCrap +# define _InterlockedExchangeAdd _InterlockedExchangeAdd_StupidDDKVsCompilerCrap +# define _InterlockedCompareExchange _InterlockedCompareExchange_StupidDDKVsCompilerCrap +# define _InterlockedCompareExchange64 _InterlockedCompareExchange64_StupidDDKVsCompilerCrap +# define _InterlockedAddLargeStatistic _InterlockedAddLargeStatistic_StupidDDKVsCompilerCrap +# pragma warning(disable : 4163) RT_C_DECLS_BEGIN -#include +# include RT_C_DECLS_END +# pragma warning(default : 4163) +# undef _InterlockedExchange +# undef _InterlockedExchangeAdd +# undef _InterlockedCompareExchange +# undef _InterlockedCompareExchange64 +# undef _InterlockedAddLargeStatistic +#else +RT_C_DECLS_BEGIN +# include +RT_C_DECLS_END +#endif #include #include Index: src/VBox/Additions/common/VBoxGuestLib/SysHlp.h =================================================================== --- src/VBox/Additions/common/VBoxGuestLib/SysHlp.h (revision 35966) +++ src/VBox/Additions/common/VBoxGuestLib/SysHlp.h (working copy) @@ -33,6 +33,7 @@ # define _InterlockedExchange _InterlockedExchange_StupidDDKVsCompilerCrap # define _InterlockedExchangeAdd _InterlockedExchangeAdd_StupidDDKVsCompilerCrap # define _InterlockedCompareExchange _InterlockedCompareExchange_StupidDDKVsCompilerCrap +# define _InterlockedCompareExchange64 _InterlockedCompareExchange64_StupidDDKVsCompilerCrap # define _InterlockedAddLargeStatistic _InterlockedAddLargeStatistic_StupidDDKVsCompilerCrap # pragma warning(disable : 4163) RT_C_DECLS_BEGIN @@ -41,6 +42,7 @@ # pragma warning(default : 4163) # undef _InterlockedExchange # undef _InterlockedExchangeAdd +# undef _InterlockedCompareExchange64 # undef _InterlockedCompareExchange # undef _InterlockedAddLargeStatistic # else Index: src/VBox/Additions/common/VBoxService/testcase/tstUserInfo.cpp =================================================================== --- src/VBox/Additions/common/VBoxService/testcase/tstUserInfo.cpp (revision 35966) +++ src/VBox/Additions/common/VBoxService/testcase/tstUserInfo.cpp (working copy) @@ -20,6 +20,7 @@ * Header Files * *******************************************************************************/ #ifdef RT_OS_WINDOWS +# define _WIN32_WINNT 0x0500 # include # include # include Index: src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp =================================================================== --- src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp (revision 35966) +++ src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp (working copy) @@ -22,7 +22,9 @@ *******************************************************************************/ #ifdef RT_OS_WINDOWS # include -# include +# ifndef TARGET_NT4 +# include +# endif # include # include # include @@ -347,9 +349,9 @@ char szPropPath[256]; #ifdef RT_OS_WINDOWS - IP_ADAPTER_INFO *pAdpInfo = NULL; # ifndef TARGET_NT4 + IP_ADAPTER_INFO *pAdpInfo = NULL; ULONG cbAdpInfo = sizeof(*pAdpInfo); pAdpInfo = (IP_ADAPTER_INFO *)RTMemAlloc(cbAdpInfo); if (!pAdpInfo) @@ -389,8 +391,10 @@ } else VBoxServiceError("VMInfo/Network: Failed to get a socket: Error %d\n", wsaErr); +# ifndef TARGET_NT4 if (pAdpInfo) RTMemFree(pAdpInfo); +# endif return RTErrConvertFromWin32(wsaErr); } @@ -407,8 +411,6 @@ 0) == SOCKET_ERROR) { VBoxServiceError("VMInfo/Network: Failed to WSAIoctl() on socket: Error: %d\n", WSAGetLastError()); - if (pAdpInfo) - RTMemFree(pAdpInfo); return RTErrConvertFromWin32(WSAGetLastError()); } int cIfacesSystem = nBytesReturned / sizeof(INTERFACE_INFO); @@ -460,8 +462,10 @@ cIfacesReport++; } +# ifndef TARGET_NT4 if (pAdpInfo) RTMemFree(pAdpInfo); +# endif if (sd >= 0) closesocket(sd); Index: src/VBox/Additions/WINNT/Graphics/Display/Makefile.kmk =================================================================== --- src/VBox/Additions/WINNT/Graphics/Display/Makefile.kmk (revision 35966) +++ src/VBox/Additions/WINNT/Graphics/Display/Makefile.kmk (working copy) @@ -57,7 +57,7 @@ VBoxDisp_LDFLAGS.x86 = /Entry:DrvEnableDriver@12 VBoxDisp_LDFLAGS.amd64 = /Entry:DrvEnableDriver VBoxDisp_LIBS = \ - $(PATH_SDK_W2K3DDK_LIB)/win32k.lib \ + win32k.lib \ $(VBOX_LIB_IPRT_GUEST_R0) \ $(VBOX_PATH_ADDITIONS_LIB)/HGSMIGuestR0Lib$(VBOX_SUFF_LIB) Index: src/VBox/Additions/WINNT/Graphics/Display/Mirror/Makefile.kmk =================================================================== --- src/VBox/Additions/WINNT/Graphics/Display/Mirror/Makefile.kmk (revision 35966) +++ src/VBox/Additions/WINNT/Graphics/Display/Mirror/Makefile.kmk (working copy) @@ -20,7 +20,6 @@ SYSMODS += vrdpdd vrdpdd_TEMPLATE = VBOXW32GUESTR0 -vrdpdd_SDKS = W2K3DDKX86 vrdpdd_SYSSUFF = .dll vrdpdd_DEFS = _WIN32_WINNT=0x0501 #vrdpdd_DEFS += LOG_TO_BACKDOOR LOG_ENABLED @@ -31,9 +30,8 @@ vrdpdd.rc vrdpdd_LDFLAGS = /Entry:DrvEnableDriver@12 vrdpdd_LIBS = \ - $(PATH_SDK_W2K3DDKX86_LIB)/int64.lib \ $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/libcmt.lib \ - $(PATH_SDK_W2K3DDKX86_LIB)/win32k.lib \ + win32k.lib \ $(PATH_LIB)/additions/RuntimeW32GuestR0$(VBOXW32GUEST_SUFF_LIB) include $(KBUILD_PATH)/subfooter.kmk Index: src/VBox/Additions/WINNT/Graphics/Miniport/Makefile.kmk =================================================================== --- src/VBox/Additions/WINNT/Graphics/Miniport/Makefile.kmk (revision 35966) +++ src/VBox/Additions/WINNT/Graphics/Miniport/Makefile.kmk (working copy) @@ -46,12 +46,10 @@ VBoxVideoHGSMI.cpp \ $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp \ $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp -VBoxVideo_LIBS.x86 = \ - $(PATH_SDK_W2K3DDK_LIB)/exsup.lib VBoxVideo_LIBS = \ - $(PATH_SDK_W2K3DDK_LIB)/videoprt.lib \ - $(PATH_SDK_W2K3DDK_LIB)/ntoskrnl.lib \ - $(PATH_SDK_W2K3DDK_LIB)/hal.lib \ + videoprt.lib \ + ntoskrnl.lib \ + hal.lib \ $(VBOX_LIB_VBGL_R0) \ $(VBOX_LIB_IPRT_GUEST_R0_NT4) \ $(VBOX_PATH_ADDITIONS_LIB)/HGSMIGuestR0Lib$(VBOX_SUFF_LIB) @@ -121,9 +119,9 @@ #VBoxVideoWddm_LIBS.x86 += \ # $(PATH_SDK_WINDDKWLH_LIB)/exsup.lib VBoxVideoWddm_LIBS = \ - $(PATH_SDK_WINDDKWLH_LIB)/ntoskrnl.lib \ - $(PATH_SDK_WINDDKWLH_LIB)/hal.lib \ - $(PATH_SDK_WINDDKWLH_LIB)/displib.lib \ + ntoskrnl.lib \ + hal.lib \ + displib.lib \ $(VBOX_LIB_VBGL_R0) \ $(VBOX_LIB_IPRT_GUEST_R0_NT4) \ $(VBOX_PATH_ADDITIONS_LIB)/HGSMIGuestR0Lib$(VBOX_SUFF_LIB) Index: src/VBox/Additions/WINNT/Graphics/Miniport/Mirror/Makefile.kmk =================================================================== --- src/VBox/Additions/WINNT/Graphics/Miniport/Mirror/Makefile.kmk (revision 35966) +++ src/VBox/Additions/WINNT/Graphics/Miniport/Mirror/Makefile.kmk (working copy) @@ -28,9 +28,9 @@ helpers.c \ vrdpvd.rc vrdpvd_LIBS = \ - $(PATH_SDK_W2K3DDK_LIB)/videoprt.lib \ - $(PATH_SDK_W2K3DDK_LIB)/ntoskrnl.lib \ - $(PATH_SDK_W2K3DDK_LIB)/hal.lib \ + videoprt.lib \ + ntoskrnl.lib \ + hal.lib \ $(VBOX_LIB_IPRT_GUEST_R0) $(error Fix inf editing and driver signing) Index: src/VBox/Additions/WINNT/Graphics/Miniport/VBoxVideo-win.h =================================================================== --- src/VBox/Additions/WINNT/Graphics/Miniport/VBoxVideo-win.h (revision 35966) +++ src/VBox/Additions/WINNT/Graphics/Miniport/VBoxVideo-win.h (working copy) @@ -17,7 +17,6 @@ #include "VBoxVideo.h" -RT_C_DECLS_BEGIN #ifndef VBOX_WITH_WDDM #include "dderror.h" #include "devioctl.h" @@ -25,49 +24,38 @@ #include "ntddvdeo.h" #include "video.h" #else -# ifdef PAGE_SIZE -# undef PAGE_SIZE -# endif -# ifdef PAGE_SHIFT -# undef PAGE_SHIFT -# endif -# define VBOX_WITH_WORKAROUND_MISSING_PACK -# if (_MSC_VER >= 1400) && !defined(VBOX_WITH_PATCHED_DDK) -# define _InterlockedExchange _InterlockedExchange_StupidDDKVsCompilerCrap -# define _InterlockedExchangeAdd _InterlockedExchangeAdd_StupidDDKVsCompilerCrap -# define _InterlockedCompareExchange _InterlockedCompareExchange_StupidDDKVsCompilerCrap -# define _InterlockedAddLargeStatistic _InterlockedAddLargeStatistic_StupidDDKVsCompilerCrap -# define _interlockedbittestandset _interlockedbittestandset_StupidDDKVsCompilerCrap -# define _interlockedbittestandreset _interlockedbittestandreset_StupidDDKVsCompilerCrap -# define _interlockedbittestandset64 _interlockedbittestandset64_StupidDDKVsCompilerCrap -# define _interlockedbittestandreset64 _interlockedbittestandreset64_StupidDDKVsCompilerCrap -# pragma warning(disable : 4163) -# ifdef VBOX_WITH_WORKAROUND_MISSING_PACK -# pragma warning(disable : 4103) -# endif -# include -# pragma warning(default : 4163) -# ifdef VBOX_WITH_WORKAROUND_MISSING_PACK -# pragma pack() -# pragma warning(default : 4103) -# endif -# undef _InterlockedExchange -# undef _InterlockedExchangeAdd -# undef _InterlockedCompareExchange -# undef _InterlockedAddLargeStatistic -# undef _interlockedbittestandset -# undef _interlockedbittestandreset -# undef _interlockedbittestandset64 -# undef _interlockedbittestandreset64 -# else -# include -# endif +#if (_MSC_VER >= 1400) && !defined(VBOX_WITH_PATCHED_DDK) +# include +# define _InterlockedExchange _InterlockedExchange_StupidDDKVsCompilerCrap +# define _InterlockedExchangeAdd _InterlockedExchangeAdd_StupidDDKVsCompilerCrap +# define _InterlockedCompareExchange _InterlockedCompareExchange_StupidDDKVsCompilerCrap +# define _InterlockedCompareExchange64 _InterlockedCompareExchange64_StupidDDKVsCompilerCrap +# define _InterlockedAddLargeStatistic _InterlockedAddLargeStatistic_StupidDDKVsCompilerCrap +# pragma warning(disable : 4163) +RT_C_DECLS_BEGIN +# include +RT_C_DECLS_END +# pragma warning(default : 4163) +# undef _InterlockedExchange +# undef _InterlockedExchangeAdd +# undef _InterlockedCompareExchange +# undef _InterlockedCompareExchange64 +# undef _InterlockedAddLargeStatistic +#else +RT_C_DECLS_BEGIN +# include +RT_C_DECLS_END +#endif + +RT_C_DECLS_BEGIN + #include "dispmprt.h" #include "ntddvdeo.h" #include "dderror.h" -#endif RT_C_DECLS_END +#endif + /* common API types */ #ifdef VBOX_WITH_WDDM #define VBOX_WITH_GENERIC_MULTIMONITOR Index: src/VBox/Additions/WINNT/Graphics/Miniport/VBoxVideo.cpp =================================================================== --- src/VBox/Additions/WINNT/Graphics/Miniport/VBoxVideo.cpp (revision 35966) +++ src/VBox/Additions/WINNT/Graphics/Miniport/VBoxVideo.cpp (working copy) @@ -223,7 +223,7 @@ { PDEVICE_EXTENSION PrimaryExtension = commonToPrimaryExt(pCommon); #ifndef VBOX_WITH_WDDM - PEVENT pEvent = (PEVENT)pvEvent; + VBOXPEVENT pEvent = (VBOXPEVENT)pvEvent; PrimaryExtension->u.primary.VideoPortProcs.pfnSetEvent(PrimaryExtension, pEvent); #else @@ -4372,21 +4372,21 @@ return ERROR_INVALID_FUNCTION; } -LONG vboxSetEventVoid(IN PVOID HwDeviceExtension, IN PEVENT pEvent) +LONG vboxSetEventVoid(IN PVOID HwDeviceExtension, IN VBOXPEVENT pEvent) { return 0; } -VOID vboxClearEventVoid (IN PVOID HwDeviceExtension, IN PEVENT pEvent) +VOID vboxClearEventVoid (IN PVOID HwDeviceExtension, IN VBOXPEVENT pEvent) { } -VP_STATUS vboxCreateEventVoid(IN PVOID HwDeviceExtension, IN ULONG EventFlag, IN PVOID Unused, OUT PEVENT *ppEvent) +VP_STATUS vboxCreateEventVoid(IN PVOID HwDeviceExtension, IN ULONG EventFlag, IN PVOID Unused, OUT VBOXPEVENT *ppEvent) { return ERROR_INVALID_FUNCTION; } -VP_STATUS vboxDeleteEventVoid(IN PVOID HwDeviceExtension, IN PEVENT pEvent) +VP_STATUS vboxDeleteEventVoid(IN PVOID HwDeviceExtension, IN VBOXPEVENT pEvent) { return ERROR_INVALID_FUNCTION; } Index: src/VBox/Additions/WINNT/i8042prt/Makefile.kmk =================================================================== --- src/VBox/Additions/WINNT/i8042prt/Makefile.kmk (revision 35966) +++ src/VBox/Additions/WINNT/i8042prt/Makefile.kmk (working copy) @@ -37,9 +37,8 @@ moudep.c \ i8042prt.rc VBoxMouseNT_LIBS = \ - $(PATH_SDK_W2K3DDK_LIB)/exsup.lib \ - $(PATH_SDK_W2K3DDK_LIB)/ntoskrnl.lib \ - $(PATH_SDK_W2K3DDK_LIB)/hal.lib \ + ntoskrnl.lib \ + hal.lib \ $(VBOX_LIB_VBGL_R0) \ $(VBOX_LIB_IPRT_GUEST_R0_NT4) VBoxMouseNT_DEPS = \ Index: src/VBox/Additions/WINNT/Installer/Makefile.kmk =================================================================== --- src/VBox/Additions/WINNT/Installer/Makefile.kmk (revision 35966) +++ src/VBox/Additions/WINNT/Installer/Makefile.kmk (working copy) @@ -39,8 +39,8 @@ VBoxDrvInst_DEPS = $(VBOX_SVN_REV_KMK) VBoxDrvInst_SDKS = WINPSDK W2K3DDK VBoxDrvInst_LIBS = \ - $(PATH_SDK_W2K3DDK_LIB)/setupapi.lib \ - $(PATH_SDK_W2K3DDK_LIB)/newdev.lib + setupapi.lib \ + newdev.lib VBoxDrvInst_SOURCES = \ VBoxDrvInst.cpp \ VBoxDrvInst.rc Index: src/VBox/Additions/WINNT/MouseFilter/Makefile.kmk =================================================================== --- src/VBox/Additions/WINNT/MouseFilter/Makefile.kmk (revision 35966) +++ src/VBox/Additions/WINNT/MouseFilter/Makefile.kmk (working copy) @@ -29,8 +29,8 @@ VBoxMouse_SOURCES = VBoxMouse.cpp \ VBoxMouse.rc VBoxMouse_LIBS = \ - $(PATH_SDK_W2K3DDK_LIB)/ntoskrnl.lib \ - $(PATH_SDK_W2K3DDK_LIB)/hal.lib \ + ntoskrnl.lib \ + hal.lib \ $(VBOX_LIB_IPRT_GUEST_R0) \ $(VBOX_LIB_VBGL_R0) Index: src/VBox/Additions/WINNT/SharedFolders/redirector/sys/openclos.c =================================================================== --- src/VBox/Additions/WINNT/SharedFolders/redirector/sys/openclos.c (revision 35966) +++ src/VBox/Additions/WINNT/SharedFolders/redirector/sys/openclos.c (working copy) @@ -202,12 +202,8 @@ // SrvOpen->BufferingFlags |= (FCB_STATE_FILESIZECACHEING_ENABLED | FCB_STATE_FILETIMECACHEING_ENABLED | FCB_STATE_WRITEBUFFERING_ENABLED | FCB_STATE_LOCK_BUFFERING_ENABLED | FCB_STATE_READBUFFERING_ENABLED | -#if (NTDDI_VERSION >= NTDDI_VISTA) /* Correct spelling for Vista 6001 SDK. */ - FCB_STATE_WRITECACHING_ENABLED | FCB_STATE_READCACHING_ENABLED); -#else FCB_STATE_WRITECACHEING_ENABLED | FCB_STATE_READCACHEING_ENABLED); -#endif } NTSTATUS NulMRxCreateFileSuccessTail (PRX_CONTEXT RxContext, PBOOLEAN MustRegainExclusiveResource, RX_FILE_TYPE StorageType, ULONG CreateAction, FILE_BASIC_INFORMATION* pFileBasicInfo, Index: src/VBox/Additions/WINNT/SharedFolders/redirector/sys/read.c =================================================================== --- src/VBox/Additions/WINNT/SharedFolders/redirector/sys/read.c (revision 35966) +++ src/VBox/Additions/WINNT/SharedFolders/redirector/sys/read.c (working copy) @@ -67,11 +67,7 @@ // NB: This should be done by the wrapper ! It does this // only if READCACHING is enabled on the FCB !! // -#if (NTDDI_VERSION >= NTDDI_VISTA) /* Correct spelling for Vista 6001 SDK. */ - if (!FlagOn(capFcb->FcbState, FCB_STATE_READCACHING_ENABLED)) -#else if (!FlagOn(capFcb->FcbState,FCB_STATE_READCACHEING_ENABLED)) -#endif { // // If the read starts beyond End of File, return EOF. Index: src/VBox/Additions/WINNT/VBoxCredProv/Makefile.kmk =================================================================== --- src/VBox/Additions/WINNT/VBoxCredProv/Makefile.kmk (revision 35966) +++ src/VBox/Additions/WINNT/VBoxCredProv/Makefile.kmk (working copy) @@ -21,7 +21,6 @@ DLLS += VBoxCredProv VBoxCredProv_TEMPLATE = VBOXGUESTR3DLL VBoxCredProv_DEFS = LOG_TO_BACKDOOR VBGL_VBOXGUEST VBOX_WITH_HGCM UNICODE -VBoxCredProv_SDKS.x86 = WINDDK VBoxCredProv_SOURCES = \ dll.cpp \ guid.cpp \ @@ -32,28 +31,10 @@ VBoxCredProv.def \ VBoxCredProv.rc -# -# Since this is not the default SDK we have to navigate manually to it. -# -VBOX_PATH_PSDK_200702 := \ - $(PATH_DEVTOOLS)/win.x86/sdk/x200702/ - -VBoxCredProv_INCS := \ - $(VBOX_PATH_PSDK_200702)/Include -VBoxCredProv_LIBS.x86 := \ - $(VBOX_PATH_PSDK_200702)/Lib/Uuid.Lib \ - $(VBOX_PATH_PSDK_200702)/Lib/credui.lib \ - $(VBOX_PATH_PSDK_200702)/Lib/Secur32.Lib \ - $(VBOX_PATH_PSDK_200702)/Lib/ShLwApi.Lib \ - $(VBOX_PATH_PSDK_200702)/Lib/NetAPI32.Lib -VBoxCredProv_LIBS.amd64 := \ - $(VBOX_PATH_PSDK_200702)/Lib/x64/Uuid.Lib \ - $(VBOX_PATH_PSDK_200702)/Lib/x64/credui.lib \ - $(VBOX_PATH_PSDK_200702)/Lib/x64/Secur32.Lib \ - $(VBOX_PATH_PSDK_200702)/Lib/x64/ShLwApi.Lib \ - $(VBOX_PATH_PSDK_200702)/Lib/x64/NetAPI32.Lib - VBoxCredProv_LIBS += \ + Credui.Lib \ + NetAPI32.Lib \ + Secur32.Lib \ $(VBOX_LIB_IPRT_GUEST_R3) \ $(VBOX_LIB_VBGL_R3) Index: src/VBox/Makefile.kmk =================================================================== --- src/VBox/Makefile.kmk (revision 35966) +++ src/VBox/Makefile.kmk (working copy) @@ -21,11 +21,9 @@ ifdef VBOX_ONLY_ADDITIONS include $(PATH_SUB_CURRENT)/Runtime/Makefile.kmk - ifdef VBOX_WITH_CROGL if1of ($(KBUILD_TARGET),win linux solaris freebsd) include $(PATH_SUB_CURRENT)/GuestHost/Makefile.kmk endif - endif include $(PATH_SUB_CURRENT)/Additions/Makefile.kmk else ifdef VBOX_ONLY_DOCS Index: src/VBox/Runtime/r0drv/nt/the-nt-kernel.h =================================================================== --- src/VBox/Runtime/r0drv/nt/the-nt-kernel.h (revision 35966) +++ src/VBox/Runtime/r0drv/nt/the-nt-kernel.h (working copy) @@ -34,6 +34,7 @@ # define _InterlockedExchange _InterlockedExchange_StupidDDKVsCompilerCrap # define _InterlockedExchangeAdd _InterlockedExchangeAdd_StupidDDKVsCompilerCrap # define _InterlockedCompareExchange _InterlockedCompareExchange_StupidDDKVsCompilerCrap +# define _InterlockedCompareExchange64 _InterlockedCompareExchange64_StupidDDKVsCompilerCrap # define _InterlockedAddLargeStatistic _InterlockedAddLargeStatistic_StupidDDKVsCompilerCrap # pragma warning(disable : 4163) RT_C_DECLS_BEGIN @@ -43,6 +44,7 @@ # undef _InterlockedExchange # undef _InterlockedExchangeAdd # undef _InterlockedCompareExchange +# undef _InterlockedCompareExchange64 # undef _InterlockedAddLargeStatistic #else RT_C_DECLS_BEGIN