VirtualBox

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


Ignore:
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
Files:
24 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/common/xpdm/VBoxVideoPortAPI.h

    r37423 r42154  
    2727/*Basic datatypes*/
    2828typedef long VBOXVP_STATUS;
     29#ifndef VBOX_USING_W2K3DDK
     30typedef struct _ENG_EVENT *VBOXPEVENT;
     31#else
    2932typedef struct _VIDEO_PORT_EVENT *VBOXPEVENT;
     33#endif
    3034typedef struct _VIDEO_PORT_SPIN_LOCK *VBOXPSPIN_LOCK;
    3135typedef union _LARGE_INTEGER *VBOXPLARGE_INTEGER;

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk

    r41485 r42154  
    2222# VBoxDisp - Windows Guest Additions XPDM Display Driver
    2323#
    24 # Note. This has to run on NT4!
    25 #       (VBOX_LIB_IPRT_GUEST_R0_NT4 == VBOX_LIB_IPRT_GUEST_R0 on 64-bit)
     24# Note. This has to run on NT4! (*_NT4 => *_W2K3 when targetting 64-bit.)
    2625#
    2726SYSMODS += VBoxDisp
    2827VBoxDisp_TEMPLATE      = VBOXGUESTR0
    2928VBoxDisp_SYSSUFF       = .dll
     29VBoxDisp_SDKS          = ReorderCompilerIncs $(VBOX_WINDDK_GST_NT4)
    3030VBoxDisp_DEFS          = _WIN32_WINNT=0x0501 VBOX_WITH_DDRAW
    3131VBoxDisp_DEFS         += LOG_TO_BACKDOOR #LOG_ENABLED
    … …  
    6363endif
    6464VBoxDisp_LIBS = \
    65         $(PATH_SDK_W2K3DDK_LIB)/win32k.lib \
     65        $(PATH_SDK_$(VBOX_WINDDK_GST_NT4)_LIB)/win32k.lib \
    6666        $(VBOX_LIB_IPRT_GUEST_R0_NT4) \
    6767        $(VBOX_PATH_ADDITIONS_LIB)/HGSMIGuestR0Lib$(VBOX_SUFF_LIB)
    … …  
    8484DLLS += VBoxDispD3D
    8585VBoxDispD3D_TEMPLATE = VBOXGUESTR3DLL
     86VBoxDispD3D_SDKS     = ReorderCompilerIncs $(VBOX_WINDDK_GST_WLH)
    8687VBoxDispD3D_DEFS     = UNICODE _UNICODE VBOX_WITH_WDDM VBOXWDDMDISP LOG_TO_BACKDOOR LOG_TO_BACKDOOR_DRV VBOX_WITH_HGCM
    8788ifdef DEBUG_misha
    … …  
    103104 VBoxDispD3D_DEFS   += VBOX_WITH_CROGL
    104105endif
    105 VBoxDispD3D_INCS     = ../../../include ..
     106VBoxDispD3D_INCS     = \
     107        ../../../include \
     108        ..
    106109VBoxDispD3D_SOURCES  = \
    107110        wddm/VBoxDispD3D.cpp \
    … …  
    121124#VBoxDispD3D_DEFS   += VBOX_WITH_CRHGSMI
    122125#endif
    123 VBoxDispD3D_SDKS     = WINDDKWLH
    124126VBoxDispD3D_LIBS     = \
    125127        $(VBOX_LIB_IPRT_GUEST_R3) \
    … …  
    147149LIBRARIES += VBoxCrHgsmi
    148150VBoxCrHgsmi_TEMPLATE    = VBOXGUESTR3LIB
     151VBoxCrHgsmi_SDKS        = ReorderCompilerIncs $(VBOX_WINDDK_GST_WLH)
    149152VBoxCrHgsmi_DEFS        = UNICODE _UNICODE VBOX_WITH_CRHGSMI IN_VBOXCRHGSMI VBOX_WITH_WDDM VBOX_WITH_VDMA VBOX_WITH_HGCM
    150153VBoxCrHgsmi_INCS        = ../../../include ..
    … …  
    154157        wddm/VBoxDispDbg.cpp \
    155158        wddm/VBoxUhgsmiKmt.cpp
    156 VBoxCrHgsmi_SDKS        = WINDDKWLH
    157159
    158160#
    … …  
    171173LIBRARIES += VBoxDispMpLogger
    172174VBoxDispMpLogger_TEMPLATE    = VBOXGUESTR3LIB
     175VBoxDispMpLogger_SDKS        = ReorderCompilerIncs $(VBOX_WINDDK_GST_WLH)
    173176VBoxDispMpLogger_DEFS        = UNICODE _UNICODE VBOX_WITH_CRHGSMI IN_VBOXCRHGSMI VBOX_WITH_WDDM VBOX_WITH_VDMA VBOX_WITH_HGCM
    174177VBoxDispMpLogger_INCS        = ../../../include ..
    175178VBoxDispMpLogger_SOURCES     = \
    176179    wddm/VBoxDispMpLogger.cpp
    177 VBoxDispMpLogger_SDKS        = WINDDKWLH
    178180
    179181#
    … …  
    191193DLLS += vbvdbg
    192194vbvdbg_TEMPLATE = VBOXR3STATIC
     195vbvdbg_SDKS     = ReorderCompilerIncs $(VBOX_WINDDK_GST_WLH)
    193196vbvdbg_DEFS     = UNICODE _UNICODE
    194197vbvdbg_SOURCES  = \
    195198        wddm/dbg/VBoxVideoWinDbg.cpp \
    196199        wddm/dbg/VBoxVideoWinDbg.def
    197 vbvdbg_SDKS     = WINDDKWLH
    198200
    199201PROGRAMS += tstMvWnd
    200202tstMvWnd_TEMPLATE = VBOXR3EXE
    201 tstMvWnd_DEFS = UNICODE _UNICODE
     203tstMvWnd_DEFS     = UNICODE _UNICODE
    202204tstMvWnd_SOURCES  = \
    203205        wddm/dbg/tstMvWnd.cpp
    204 tstMvWnd_LIBS  = $(LIB_RUNTIME)
     206tstMvWnd_LIBS     = $(LIB_RUNTIME)
    205207tstMvWnd_LDFLAGS.win = /SUBSYSTEM:windows
    206208
    207209PROGRAMS += DumpD3DCaps9
    208210DumpD3DCaps9_TEMPLATE = VBOXR3EXE
    209 DumpD3DCaps9_DEFS = UNICODE _UNICODE
     211DumpD3DCaps9_SDKS     = ReorderCompilerIncs $(VBOX_WINDDK_GST_WLH)
     212DumpD3DCaps9_DEFS     = UNICODE _UNICODE
    210213DumpD3DCaps9_SOURCES  = \
    211214        wddm/dbg/DumpD3DCaps9.cpp
    212 DumpD3DCaps9_LIBS  = $(LIB_RUNTIME)
     215DumpD3DCaps9_LIBS     = $(LIB_RUNTIME)
    213216DumpD3DCaps9_LDFLAGS.win = /SUBSYSTEM:CONSOLE
    214 DumpD3DCaps9_SDKS     = WINDDKWLH
    215217
    216218endif #VBOXVIDEOWINDBG

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispD3DCmn.h

    r42101 r42154  
    11/* $Id$ */
    2 
    32/** @file
    43 * VBoxVideo Display D3D User mode dll

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/Makefile.kmk

    r42101 r42154  
    2222# VBoxVideo - Windows Guest Additions XPDM Miniport Video Driver
    2323#
    24 # Note. This has to run on NT4!
    25 #       (VBOX_LIB_IPRT_GUEST_R0_NT4 == VBOX_LIB_IPRT_GUEST_R0 on 64-bit)
     24# Note. This has to run on NT4! (*_NT4 => *_W2K3 when targetting 64-bit.)
    2625#
    2726SYSMODS += VBoxVideo
    2827VBoxVideo_TEMPLATE      = VBOXGUESTR0
    29 VBoxVideo_DEFS          = VBOX_XPDM_MINIPORT VBOX_WITH_8BPP_MODES
     28VBoxVideo_SDKS          = ReorderCompilerIncs $(VBOX_WINDDK_GST_NT4)
     29VBoxVideo_DEFS          = VBOX_XPDM_MINIPORT VBOX_WITH_8BPP_MODES VBOX_USING_$(VBOX_WINDDK_GST_NT4)
    3030VBoxVideo_DEFS         += LOG_TO_BACKDOOR #LOG_ENABLED
    3131ifdef VBOX_WITH_VIDEOHWACCEL
    … …  
    3939        xpdm/VBoxMP.def \
    4040        xpdm/VBoxMP.rc \
    41     xpdm/VBoxMPVideoPortAPI.cpp \
    42     xpdm/VBoxMPInternal.cpp \
    43     xpdm/VBoxMPRegistry.cpp \
    44     xpdm/VBoxMPIOCTL.cpp \
     41        xpdm/VBoxMPVideoPortAPI.cpp \
     42        xpdm/VBoxMPInternal.cpp \
     43        xpdm/VBoxMPRegistry.cpp \
     44        xpdm/VBoxMPIOCTL.cpp \
    4545        common/VBoxMPUtils.cpp \
    4646        common/VBoxMPCommon.cpp \
    47     common/VBoxMPHGSMI.cpp \
    48     common/VBoxMPVidModes.cpp \
     47        common/VBoxMPHGSMI.cpp \
     48        common/VBoxMPVidModes.cpp \
    4949        $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp \
    5050        $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp
    5151VBoxVideo_LIBS          = \
    52         $(PATH_SDK_W2K3DDK_LIB)/videoprt.lib \
    53         $(PATH_SDK_W2K3DDK_LIB)/ntoskrnl.lib \
    54         $(PATH_SDK_W2K3DDK_LIB)/hal.lib \
     52        $(PATH_SDK_$(VBOX_WINDDK_GST_NT4)_LIB)/videoprt.lib \
     53        $(PATH_SDK_$(VBOX_WINDDK_GST_NT4)_LIB)/ntoskrnl.lib \
     54        $(PATH_SDK_$(VBOX_WINDDK_GST_NT4)_LIB)/hal.lib \
    5555        $(VBOX_LIB_VBGL_R0) \
    5656        $(VBOX_LIB_IPRT_GUEST_R0_NT4) \
    5757        $(VBOX_PATH_ADDITIONS_LIB)/HGSMIGuestR0Lib$(VBOX_SUFF_LIB)
    5858VBoxVideo_LIBS.x86      = \
    59         $(PATH_SDK_W2K3DDK_LIB)/exsup.lib
     59        $(PATH_SDK_$(VBOX_WINDDK_GST_NT4)_LIB)/exsup.lib
    6060
    6161ifdef VBOX_WITH_WDDM
    … …  
    6565 SYSMODS += VBoxVideoWddm
    6666 VBoxVideoWddm_TEMPLATE    = VBOXGUESTR0
     67 VBoxVideoWddm_SDKS        = ReorderCompilerIncs $(VBOX_WINDDK_GST_WLH)
    6768 VBoxVideoWddm_DEFS       += VBOX_WITH_8BPP_MODES
    6869 VBoxVideoWddm_DEFS       += VBOX_WDDM_MINIPORT VBOX_WITH_WDDM VBOX_WITH_HGCM
    … …  
    9596 
    9697 VBoxVideoWddm_INCS       += \
    97     ../../../include \
    98     .. \
    99     . \
    100     ../../../../common/VBoxGuestLib \
    101     $(VBOX_PATH_CROGL_INCLUDE) \
    102     $(VBOX_PATH_CROGL_GENFILES) \
    103     $(PATH_ROOT)/src/VBox/GuestHost/OpenGL/packer
     98        ../../../include \
     99        .. \
     100        . \
     101        ../../../../common/VBoxGuestLib \
     102        $(VBOX_PATH_CROGL_INCLUDE) \
     103        $(VBOX_PATH_CROGL_GENFILES) \
     104        $(PATH_ROOT)/src/VBox/GuestHost/OpenGL/packer
     105
    104106 VBoxVideoWddm_LDFLAGS.x86 += /Entry:DriverEntry@8
    105107 VBoxVideoWddm_LDFLAGS.amd64 += /Entry:DriverEntry
    106  VBoxVideoWddm_SDKS        = WINDDKWLH
     108
    107109 VBoxVideoWddm_SOURCES     = \
    108110        wddm/VBoxMPWddm.cpp \
    … …  
    137139    wddm/VBoxMPVhwa.cpp
    138140 endif
     141
    139142 VBoxVideoWddm_LIBS.x86   = \
    140         $(PATH_SDK_WINDDKWLH_LIB)/BufferOverflowK.lib
     143        $(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB)/BufferOverflowK.lib
    141144 #VBoxVideoWddm_LIBS.x86   += \
    142  #      $(PATH_SDK_WINDDKWLH_LIB)/exsup.lib
     145 #      $(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB)/exsup.lib
    143146 VBoxVideoWddm_LIBS        = \
    144         $(PATH_SDK_WINDDKWLH_LIB)/ntoskrnl.lib \
    145         $(PATH_SDK_WINDDKWLH_LIB)/hal.lib \
    146         $(PATH_SDK_WINDDKWLH_LIB)/displib.lib \
     147        $(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB)/ntoskrnl.lib \
     148        $(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB)/hal.lib \
     149        $(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB)/displib.lib \
    147150        $(VBOX_LIB_VBGL_R0) \
    148         $(VBOX_LIB_IPRT_GUEST_R0_NT4) \
     151        $(VBOX_LIB_IPRT_GUEST_R0) \
    149152        $(VBOX_PATH_ADDITIONS_LIB)/HGSMIGuestR0Lib$(VBOX_SUFF_LIB)
    150153
    … …  
    156159  VBoxVideoW8_EXTENDS    = VBoxVideoWddm
    157160  VBoxVideoW8_TEMPLATE   = VBOXGUESTWIN8R0
     161  VBoxVideoW8_SDKS       = ReorderCompilerIncs $(VBOX_WINDDK_GST_W8)
    158162  VBoxVideoW8_DEFS      += $(VBoxVideoWddm_DEFS) VBOX_WDDM_WIN8
    159   VBoxVideoW8_SDKS       = WINDDKW8
    160163  VBoxVideoW8_SOURCES    = $(subst VBoxMPWddm.rc,VBoxMPW8.rc,$(VBoxVideoWddm_SOURCES))
    161164  VBoxVideoW8_LIBS.x86   = \
    162     $(PATH_SDK_WINDDKW8_LIB)/BufferOverflowK.lib
    163   #VBoxVideoW8_LIBS.x86   += \
    164   #  $(PATH_SDK_WINDDKW8_LIB)/exsup.lib
     165        $(PATH_SDK_$(VBOX_WINDDK_GST_W8)_LIB)/BufferOverflowK.lib
    165166  VBoxVideoW8_LIBS        = \
    166      $(PATH_SDK_WINDDKW8_LIB)/ntoskrnl.lib \
    167      $(PATH_SDK_WINDDKW8_LIB)/hal.lib \
    168      $(PATH_SDK_WINDDKW8_LIB)/displib.lib \
    169      $(VBOX_LIB_VBGL_R0) \
    170      $(VBOX_LIB_IPRT_GUEST_R0_NT4) \
    171      $(VBOX_PATH_ADDITIONS_LIB)/HGSMIGuestR0Lib$(VBOX_SUFF_LIB)
    172   VBoxVideoW8_LIBS.amd64  = $(PATH_SDK_WINDDKW8_LIB)/BufferOverflowK.lib
     167        $(PATH_SDK_$(VBOX_WINDDK_GST_W8)_LIB)/ntoskrnl.lib \
     168        $(PATH_SDK_$(VBOX_WINDDK_GST_W8)_LIB)/hal.lib \
     169        $(PATH_SDK_$(VBOX_WINDDK_GST_W8)_LIB)/displib.lib \
     170        $(VBOX_LIB_VBGL_R0) \
     171        $(VBOX_LIB_IPRT_GUEST_R0) \
     172        $(VBOX_PATH_ADDITIONS_LIB)/HGSMIGuestR0Lib$(VBOX_SUFF_LIB)
     173  VBoxVideoW8_LIBS.amd64  = $(PATH_SDK_$(VBOX_WINDDK_GST_W8)_LIB)/BufferOverflowK.lib
    173174 endif # VBOX_WDDM_WIN8
    174175 

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPVdma.h

    r42081 r42154  
    11/* $Id$ */
    2 
    32/** @file
    43 * VBox WDDM Miniport driver

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.cpp

    r42151 r42154  
    11/* $Id$ */
    2 
    32/** @file
    43 * VBox WDDM Miniport driver

  • trunk/src/VBox/Additions/WINNT/Graphics/Wine/Makefile.kmk

    r42136 r42154  
    4646TEMPLATE_VBoxGuestWineD3DxDLL_EXTENDS    = VBOXGUESTR3NPDLL
    4747TEMPLATE_VBoxGuestWineD3DxDLL_EXTENDS_BY = appending
    48 TEMPLATE_VBoxGuestWineD3DxDLL_SDKS.amd64 = WINDDKWLH
     48TEMPLATE_VBoxGuestWineD3DxDLL_SDKS.amd64 = ReorderCompilerIncs $(VBOX_WINDDK_GST_WLH)
     49TEMPLATE_VBoxGuestWineD3DxDLL_DEFS.amd64 = $(if-expr $(VBOX_WINDDK_GST_WLH) != WINDDKWLH,VBOX_USING_WINDDK_W7_OR_LATER,)
    4950TEMPLATE_VBoxGuestWineD3DxDLL_DEFS.x86   = __i386__
    5051TEMPLATE_VBoxGuestWineD3DxDLL_INCS.x86   = include
    … …  
    154155DLLS += wined3d
    155156wined3d_TEMPLATE     = VBoxGuestWineDLL
    156 wined3d_SDKS         = WINDDKWLH
     157wined3d_SDKS         = ReorderCompilerIncs $(VBOX_WINDDK_GST_WLH)
    157158wined3d_DEFS         = \
    158159        _USE_MATH_DEFINES \
     160        $(if-expr $(VBOX_WINDDK_GST_WLH) != WINDDKWLH,VBOX_USING_WINDDK_W7_OR_LATER,) \
    159161        VBOX_WINE_WITHOUT_LIBWINE \
    160162        VBOX_WINE_WITH_SINGLE_SWAPCHAIN_CONTEXT \
    … …  
    164166 wined3d_DEFS       += WINE_NO_DEBUG_MSGS
    165167endif
    166 wined3d_INCS        := vbox/libWineStub/include
     168wined3d_INCS        := \
     169        vbox/libWineStub/include
    167170wined3d_SOURCES     := \
    168171        wined3d/arb_program_shader.c \
    … …  
    248251DLLS += VBoxD3D8
    249252VBoxD3D8_TEMPLATE     = VBoxGuestWineDLL
    250 VBoxD3D8_SDKS         = WINDDKWLH
     253VBoxD3D8_SDKS         = ReorderCompilerIncs $(VBOX_WINDDK_GST_WLH)
    251254VBoxD3D8_DEFS         = _USE_MATH_DEFINES \
     255        VBOX_USING_WINDDK \
    252256        VBOX_WINE_WITHOUT_LIBWINE
    253257if "$(KBUILD_TYPE)" != "debug" || defined(VBOX_WINE_NO_DEBUG_MSGS)
    … …  
    287291DLLS += VBoxD3D9
    288292VBoxD3D9_TEMPLATE     = VBoxGuestWineDLL
    289 VBoxD3D9_SDKS         = WINDDKWLH
     293VBoxD3D9_SDKS         = ReorderCompilerIncs $(VBOX_WINDDK_GST_WLH)
    290294VBoxD3D9_DEFS         = _USE_MATH_DEFINES \
     295        VBOX_USING_WINDDK \
    291296        VBOX_WINE_WITHOUT_LIBWINE
    292297if "$(KBUILD_TYPE)" != "debug" || defined(VBOX_WINE_NO_DEBUG_MSGS)

  • trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/directx.c

    r41320 r42154  
    30223022            if (DevModeW.dmFields&DM_DISPLAYFLAGS)
    30233023            {
    3024 #if 0 //defined(RT_ARCH_AMD64) && !defined(VBOX_WITH_WDDM)
    3025 # ifndef DM_INTERLACED
    3026 #  define DM_INTERLACED 0x00000002
    3027 # endif
     3024#ifdef VBOX_USING_WINDDK_W7_OR_LATER
    30283025                if (DevModeW.dmDisplayFlags&DM_INTERLACED)
    30293026#else
    … …  
    30413038            if (DevModeW.dmFields&DM_DISPLAYORIENTATION)
    30423039            {
    3043 #if 0 //defined(RT_ARCH_AMD64) && !defined(VBOX_WITH_WDDM)
     3040#ifdef VBOX_USING_WINDDK_W7_OR_LATER
    30443041                switch (DevModeW.dmDisplayOrientation)
    30453042#else
    … …  
    30603057                        break;
    30613058                    default:
    3062 #if 0 //defined(RT_ARCH_AMD64) && !defined(VBOX_WITH_WDDM)
     3059#ifdef VBOX_USING_WINDDK_W7_OR_LATER
    30633060                        WARN("Unexpected display orientation %#x", DevModeW.dmDisplayOrientation);
    30643061#else

  • trunk/src/VBox/Additions/WINNT/Installer/Loader/Makefile.kmk

    r41477 r42154  
    1919include $(KBUILD_PATH)/subheader.kmk
    2020
     21ifeq ($(KBUILD_TARGET_ARCH),x86)
     22
    2123# This has to be 32-bit, so don't include it in the 64-bit build.
    22 if "$(KBUILD_TARGET_ARCH)" == "x86"
    23  PROGRAMS.x86 += VBoxWindowsAdditions
    24  VBoxWindowsAdditions_TEMPLATE= VBOXGUESTR3EXE
    25  VBoxWindowsAdditions_DEFS    = _WIN32_WINNT=0x0400 _UNICODE UNICODE
    26  VBoxWindowsAdditions_SOURCES = \
    27         VBoxWindowsAdditions.cpp \
    28         VBoxWindowsAdditions.rc
     24PROGRAMS.x86 += VBoxWindowsAdditions
     25VBoxWindowsAdditions_TEMPLATE= VBOXGUESTR3EXE
     26VBoxWindowsAdditions_DEFS    = _WIN32_WINNT=0x0400 _UNICODE UNICODE
     27VBoxWindowsAdditions_SOURCES = \
     28        VBoxWindowsAdditions.cpp \
     29        VBoxWindowsAdditions.rc
    2930
    30  VBoxWindowsAdditions_LDFLAGS  = \
    31         /DISALLOWLIB:msvcrt.lib \
    32         /DISALLOWLIB:msvcprt.lib \
    33         /DISALLOWLIB:libcmt.lib
     31VBoxWindowsAdditions_LDFLAGS  = \
     32        /DISALLOWLIB:msvcrt.lib \
     33        /DISALLOWLIB:msvcprt.lib \
     34        /DISALLOWLIB:libcmt.lib
    3435
    35  VBoxWindowsAdditions_LIBS     = \
    36         $(PATH_TOOL_$(TEMPLATE_VBOXR3EXE_TOOL.win.$(KBUILD_TARGET_ARCH))_LIB)/oldnames.lib \
    37         $(PATH_TOOL_$(TEMPLATE_VBOXR3EXE_TOOL.win.$(KBUILD_TARGET_ARCH))_LIB)/libcmt.lib \
     36VBoxWindowsAdditions_LIBS     = \
     37        $(PATH_TOOL_$(TEMPLATE_VBOXR3EXE_TOOL.win.$(KBUILD_TARGET_ARCH))_LIB)/oldnames.lib \
     38        $(PATH_TOOL_$(TEMPLATE_VBOXR3EXE_TOOL.win.$(KBUILD_TARGET_ARCH))_LIB)/libcmt.lib \
    3839        $(PATH_TOOL_$(TEMPLATE_VBOXR3EXE_TOOL.win.$(KBUILD_TARGET_ARCH))_LIB)/libcpmt.lib
    3940
    40  # Version stuff.
    41  VBoxWindowsAdditions.cpp_DEFS += VBOX_SVN_REV=$(VBOX_SVN_REV)
    42  VBoxWindowsAdditions.cpp_DEPS = $(VBOX_SVN_REV_KMK)
     41# Version stuff.
     42VBoxWindowsAdditions.cpp_DEFS += VBOX_SVN_REV=$(VBOX_SVN_REV)
     43VBoxWindowsAdditions.cpp_DEPS = $(VBOX_SVN_REV_KMK)
    4344
    44  # The icon location is configurable.
    45  VBoxWindowsAdditions.rc_INCS += $(VBoxWindowsAdditions_0_OUTDIR)
    46  VBoxWindowsAdditions.rc_DEPS += $(VBoxWindowsAdditions_0_OUTDIR)/VBoxWindowsAdditions-icon.rc
    47  VBoxWindowsAdditions.rc_CLEAN = $(VBoxWindowsAdditions_0_OUTDIR)/VBoxWindowsAdditions-icon.rc
     45# The icon location is configurable.
     46VBoxWindowsAdditions.rc_INCS += $(VBoxWindowsAdditions_0_OUTDIR)
     47VBoxWindowsAdditions.rc_DEPS += $(VBoxWindowsAdditions_0_OUTDIR)/VBoxWindowsAdditions-icon.rc
     48VBoxWindowsAdditions.rc_CLEAN = $(VBoxWindowsAdditions_0_OUTDIR)/VBoxWindowsAdditions-icon.rc
    4849
    4950
    50  # Icon include file.
     51# Icon include file.
    5152$$(VBoxWindowsAdditions_0_OUTDIR)/VBoxWindowsAdditions-icon.rc: $(VBOX_WINDOWS_ADDITIONS_ICON_FILE) Makefile.kmk | $$(dir $$@)
    5253        $(RM) -f $@
    5354        $(APPEND) $@ 'IDI_VIRTUALBOX ICON DISCARDABLE "$(subst /,\\,$(VBOX_WINDOWS_ADDITIONS_ICON_FILE))"'
    5455
    55 endif # x86 only
     56endif # (x86 only because of the above rule)
     57
    5658
    5759include $(FILE_KBUILD_SUB_FOOTER)

  • trunk/src/VBox/Additions/WINNT/Installer/Makefile.kmk

    r42142 r42154  
    3838endif
    3939VBoxDrvInst_DEPS    = $(VBOX_SVN_REV_KMK)
    40 VBoxDrvInst_SDKS    = WINPSDK W2K3DDK
     40VBoxDrvInst_SDKS    = ReorderCompilerIncs $(VBOX_WINPSDK_GST) $(VBOX_WINDDK_GST)
    4141VBoxDrvInst_LIBS    = \
    42         $(PATH_SDK_W2K3DDK_LIB)/setupapi.lib \
    43         $(PATH_SDK_W2K3DDK_LIB)/newdev.lib
     42        $(PATH_SDK_$(VBOX_WINDDK_GST)_LIB)/setupapi.lib \
     43        $(PATH_SDK_$(VBOX_WINDDK_GST)_LIB)/newdev.lib
    4444VBoxDrvInst_SOURCES = \
    4545        VBoxDrvInst.cpp \

  • trunk/src/VBox/Additions/WINNT/Installer/VBoxDrvInst.cpp

    r35834 r42154  
    55
    66/*
    7  * Copyright (C) 2011 Oracle Corporation
     7 * Copyright (C) 2011-2012 Oracle Corporation
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    2020*   Header Files                                                               *
    2121*******************************************************************************/
    22 
    2322#ifndef UNICODE
    24 #define UNICODE
     23# define UNICODE
    2524#endif
    2625
    2726#include <VBox/version.h>
    2827
    29 #include <windows.h>
     28#include <Windows.h>
    3029#include <setupapi.h>
    3130#include <stdio.h>
    … …  
    7978
    8079/* DIFx error codes */
     80/** @todo any reason why we're not using difxapi.h instead of these redefinitions? */
     81#ifndef ERROR_DRIVER_STORE_ADD_FAILED
     82# define ERROR_DRIVER_STORE_ADD_FAILED \
     83    (APPLICATION_ERROR_MASK | ERROR_SEVERITY_ERROR | 0x0247L)
     84#endif
    8185#define ERROR_DEPENDENT_APPLICATIONS_EXIST \
    8286    (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x300)
    83 #define ERROR_DRIVER_STORE_ADD_FAILED \
    84     (APPLICATION_ERROR_MASK | ERROR_SEVERITY_ERROR | 0x0247L)
    8587#define ERROR_DRIVER_PACKAGE_NOT_IN_STORE \
    8688    (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x302)
    … …  
    9193
    9294#ifdef DEBUG
    93     #define VBOX_DRVINST_LOGFILE              "C:\\Temp\\VBoxDrvInstDIFx.log"
     95# define VBOX_DRVINST_LOGFILE                 "C:\\Temp\\VBoxDrvInstDIFx.log"
    9496#endif
    9597

  • trunk/src/VBox/Additions/WINNT/Mouse/NT4/Makefile.kmk

    r41477 r42154  
    1919include $(KBUILD_PATH)/subheader.kmk
    2020
    21 ifeq ($(KBUILD_TARGET_ARCH),x86)
    22 SYSMODS += VBoxMouseNT
     21SYSMODS.x86 += VBoxMouseNT
    2322VBoxMouseNT_TEMPLATE    = VBOXGUESTR0
    2423VBoxMouseNT_DEFS        = LOG_TO_BACKDOOR
     24VBoxMouseNT_SDKS        = ReorderCompilerIncs $(VBOX_WINDDK_GST_NT4)
    2525VBoxMouseNT_INCS        = \
    2626        $(VBoxMouseNT_0_OUTDIR)
    … …  
    3030        VBoxPS2NT.rc
    3131VBoxMouseNT_LIBS        = \
    32         $(PATH_SDK_W2K3DDK_LIB)/exsup.lib \
    33         $(PATH_SDK_W2K3DDK_LIB)/ntoskrnl.lib \
    34         $(PATH_SDK_W2K3DDK_LIB)/hal.lib \
     32        $(PATH_SDK_$(VBOX_WINDDK_GST_NT4)_LIB)/exsup.lib \
     33        $(PATH_SDK_$(VBOX_WINDDK_GST_NT4)_LIB)/ntoskrnl.lib \
     34        $(PATH_SDK_$(VBOX_WINDDK_GST_NT4)_LIB)/hal.lib \
    3535        $(VBOX_LIB_VBGL_R0) \
    3636        $(VBOX_LIB_IPRT_GUEST_R0_NT4)
    3737VBoxMouseNT_CLEAN       = \
    3838        $(VBoxMouseNT_0_OUTDIR)/VBoxMouseNT.pdb
    39 endif # x86
    4039
    4140include $(FILE_KBUILD_SUB_FOOTER)

  • trunk/src/VBox/Additions/WINNT/Mouse/NT4/VBoxPS2NT.cpp

    r40353 r42154  
    2525#include <string.h>
    2626RT_C_DECLS_BEGIN
     27#define _InterlockedAddLargeStatistic  _InterlockedAddLargeStatistic_StupidDDKVsCompilerCrap
    2728#undef PAGE_SIZE
    2829#undef PAGE_SHIFT
    … …  
    3031#include <ntddkbd.h>
    3132#include <ntddmou.h>
     33#undef _InterlockedAddLargeStatistic  _InterlockedAddLargeStatistic_StupidDDKVsCompilerCrap
    3234RT_C_DECLS_END
    3335

  • trunk/src/VBox/Additions/WINNT/Mouse/NT5/Makefile.kmk

    r41477 r42154  
    2525VBoxMouse_TEMPLATE      = VBOXGUESTR0
    2626VBoxMouse_DEFS          = LOG_TO_BACKDOOR
     27VBoxMouse_SDKS.x86      = ReorderCompilerIncs $(VBOX_WINDDK_GST_W2K)
    2728#VBoxMouse_DEFS         += LOG_ENABLED
    2829VBoxMouse_CXXFLAGS      = -Od
    … …  
    3031VBoxMouse_LDFLAGS.x86   = -Entry:DriverEntry@8
    3132VBoxMouse_LDFLAGS.amd64 = -Entry:DriverEntry
    32 VBoxMouse_SOURCES       = VBoxMFDriver.cpp \
    33                           VBoxMFInternal.cpp \
    34                           VBoxMF.rc
     33VBoxMouse_SOURCES       = \
     34        VBoxMFDriver.cpp \
     35        VBoxMFInternal.cpp \
     36        VBoxMF.rc
     37VBoxMouse_LIBS.x86      = \
     38        $(PATH_SDK_$(VBOX_WINDDK_GST_W2K)_LIB)/ntoskrnl.lib \
     39        $(PATH_SDK_$(VBOX_WINDDK_GST_W2K)_LIB)/hal.lib
     40VBoxMouse_LIBS.amd64    = \
     41        $(PATH_SDK_$(VBOX_WINDDK_GST)_LIB)/ntoskrnl.lib \
     42        $(PATH_SDK_$(VBOX_WINDDK_GST)_LIB)/hal.lib
    3543VBoxMouse_LIBS          = \
    36         $(PATH_SDK_W2K3DDK_LIB)/ntoskrnl.lib \
    37         $(PATH_SDK_W2K3DDK_LIB)/hal.lib \
    3844        $(VBOX_LIB_IPRT_GUEST_R0) \
    3945        $(VBOX_LIB_VBGL_R0)

  • trunk/src/VBox/Additions/WINNT/Mouse/NT5/VBoxMF.h

    r38932 r42154  
    11/* $Id$ */
    2 
    32/** @file
    43 * VBox Mouse filter header
    … …  
    2625#include <iprt/assert.h>
    2726#include "../common/VBoxMouseLog.h"
     27#ifdef RT_ARCH_X86
     28# define _InterlockedAddLargeStatistic  _InterlockedAddLargeStatistic_StupidDDKVsCompilerCrap
     29#endif
    2830RT_C_DECLS_BEGIN
    2931#include <ntddk.h>
    … …  
    3234#include <ntdd8042.h>
    3335RT_C_DECLS_END
     36#ifdef RT_ARCH_X86
     37# undef _InterlockedAddLargeStatistic
     38#endif
    3439#include <VBox/VMMDev.h>
    3540

  • trunk/src/VBox/Additions/WINNT/Mouse/NT5/VBoxMFInternal.cpp

    r41642 r42154  
    1717 */
    1818
     19#define WIN9X_COMPAT_SPINLOCK /* Avoid duplicate _KeInitializeSpinLock@4 error on x86. */
     20#include <iprt/asm.h>
    1921#include "VBoxMF.h"
    2022#include <VBox/VBoxGuestLib.h>
    2123#include <VBox/VBoxGuest.h>
    2224#include <iprt/assert.h>
    23 #include <iprt/asm.h>
    2425
    2526typedef struct VBOXGDC

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

    r41477 r42154  
    2727#VBoxSF_DEFS       += LOG_ENABLED
    2828
    29 VBoxSF_SDKS.x86    = WINDDKW2K
    30 VBoxSF_SDKS.amd64  = WINDDKWLH
     29ifeq ($(VBOX_WINDDK_GST),W2K3DDK)
     30VBoxSF_SDKS.x86    = ReorderCompilerIncs WINDDKW2K
     31else
     32VBoxSF_SDKS.x86    = ReorderCompilerIncs $(VBOX_WINDDK_GST_W2K)
     33endif
     34VBoxSF_SDKS.amd64  = ReorderCompilerIncs $(VBOX_WINDDK_GST_WLH)
    3135
    3236VBoxSF_INCS        = \
    … …  
    4448        VBoxSF.rc
    4549
    46 VBoxSF_LIBS.x86  = \
    47         $(PATH_SDK_WINDDKW2K_LIB.x86)/fre/rxce.lib \
    48         $(PATH_SDK_WINDDKW2K_LIB.x86)/fre/rdbsslib.lib \
    49         $(PATH_SDK_WINDDKW2K_LIB.x86)/fre/copysup.lib \
    50         $(PATH_SDK_WINDDKW2K_LIB.x86)/ntoskrnl.lib \
    51         $(PATH_SDK_WINDDKW2K_LIB.x86)/hal.lib \
    52         $(PATH_SDK_WINDDKW2K_LIB.x86)/ksecdd.lib \
    53         $(PATH_SDK_WINDDKW2K_LIB.x86)/BufferOverflowK.lib
     50ifeq ($(VBOX_WINDDK_GST),W2K3DDK)
     51 VBoxSF_LIBS.x86  = \
     52        $(PATH_SDK_WINDDKW2K_LIB.x86)/fre/rxce.lib \
     53        $(PATH_SDK_WINDDKW2K_LIB.x86)/fre/rdbsslib.lib \
     54        $(PATH_SDK_WINDDKW2K_LIB.x86)/fre/copysup.lib \
     55        $(PATH_SDK_WINDDKW2K_LIB.x86)/ntoskrnl.lib \
     56        $(PATH_SDK_WINDDKW2K_LIB.x86)/hal.lib \
     57        $(PATH_SDK_WINDDKW2K_LIB.x86)/ksecdd.lib \
     58        $(PATH_SDK_WINDDKW2K_LIB.x86)/BufferOverflowK.lib
     59else
     60 VBoxSF_LIBS.x86  = \
     61        $(PATH_SDK_$(VBOX_WINDDK_GST_W2K)_LIB.x86)/rxce.lib \
     62        $(PATH_SDK_$(VBOX_WINDDK_GST_W2K)_LIB.x86)/rdbsslib.lib \
     63        $(PATH_SDK_$(VBOX_WINDDK_GST_W2K)_LIB.x86)/copysup.lib \
     64        $(PATH_SDK_$(VBOX_WINDDK_GST_W2K)_LIB.x86)/ntoskrnl.lib \
     65        $(PATH_SDK_$(VBOX_WINDDK_GST_W2K)_LIB.x86)/hal.lib \
     66        $(PATH_SDK_$(VBOX_WINDDK_GST_W2K)_LIB.x86)/ksecdd.lib \
     67        $(PATH_SDK_$(VBOX_WINDDK_GST_W2K)_LIB.x86)/BufferOverflowK.lib
     68endif
    5469
    5570VBoxSF_LIBS.amd64  = \
    56         $(PATH_SDK_WINDDKWLH_LIB.amd64)/rxce.lib \
    57         $(PATH_SDK_WINDDKWLH_LIB.amd64)/rdbsslib.lib \
    58         $(PATH_SDK_WINDDKWLH_LIB.amd64)/copysup.lib \
    59         $(PATH_SDK_WINDDKWLH_LIB.amd64)/ntoskrnl.lib \
    60         $(PATH_SDK_WINDDKWLH_LIB.amd64)/hal.lib \
    61         $(PATH_SDK_WINDDKWLH_LIB.amd64)/ksecdd.lib \
    62         $(PATH_SDK_WINDDKWLH_LIB.amd64)/BufferOverflowK.lib
     71        $(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.amd64)/rxce.lib \
     72        $(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.amd64)/rdbsslib.lib \
     73        $(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.amd64)/copysup.lib \
     74        $(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.amd64)/ntoskrnl.lib \
     75        $(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.amd64)/hal.lib \
     76        $(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.amd64)/ksecdd.lib \
     77        $(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.amd64)/BufferOverflowK.lib
    6378
    6479VBoxSF_LIBS = \

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

    r40269 r42154  
    5555
    5656    /* @todo check if this is necessary. */
    57 #if (NTDDI_VERSION >= NTDDI_VISTA)      /* Correct spelling for Vista 6001 SDK. */
     57#ifdef FCB_STATE_READCACHING_ENABLED    /* Correct spelling for Vista 6001 SDK. */
    5858    if (!FlagOn(capFcb->FcbState, FCB_STATE_READCACHING_ENABLED))
    5959#else

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

    r40987 r42154  
    498498
    499499    /* Disable FastIO. It causes a verifier bugcheck. */
    500 #if (NTDDI_VERSION >= NTDDI_VISTA)
     500#ifdef SRVOPEN_FLAG_DONTUSE_READ_CACHING
    501501    SetFlag(SrvOpen->Flags, SRVOPEN_FLAG_DONTUSE_READ_CACHING | SRVOPEN_FLAG_DONTUSE_WRITE_CACHING);
    502502#else

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

    r40313 r42154  
     1/* $Id$ */
    12/** @file
    2  *
    3  * VirtualBox Windows Guest Shared Folders
     3 * VirtualBox Windows Guest Shared Folders.
    44 *
    55 * File System Driver initialization and generic routines
    … …  
    13821382 * WML stubs which are referenced by rdbsslib.
    13831383 */
    1384 NTSTATUS WmlTinySystemControl(void)
     1384NTSTATUS WmlTinySystemControl(IN OUT PVOID pWmiLibInfo, IN PVOID pDevObj, IN PVOID pIrp)
    13851385{
    13861386    return STATUS_WMI_GUID_NOT_FOUND;
    13871387}
    13881388
    1389 ULONG WmlTrace(void)
     1389ULONG WmlTrace(IN ULONG ulType, IN PVOID pTraceUuid, IN ULONG64 ullLogger, ...)
    13901390{
    13911391    return STATUS_SUCCESS;
    13921392}
     1393

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

    r41477 r42154  
    2121DLLS += VBoxMRXNP
    2222VBoxMRXNP_TEMPLATE    = VBOXGUESTR3DLL
    23 VBoxMRXNP_SDKS        = WINDDK
     23ifeq ($(VBOX_WINDDK_GST),W2K3DDK)
     24VBoxMRXNP_SDKS        = ReorderCompilerIncs WINDDK
     25else
     26VBoxMRXNP_SDKS        = ReorderCompilerIncs $(VBOX_WINDDK_GST_W2K)
     27endif
    2428VBoxMRXNP_DEFS        = LOG_TO_BACKDOOR _WIN32_WINNT=0x0500 UNICODE WIN32_LEAN_AND_MEAN=1
    2529#VBoxMRXNP_DEFS       += LOG_ENABLED

  • trunk/src/VBox/Additions/WINNT/VBoxTray/Makefile.kmk

    r42003 r42154  
    2525 VBoxTray_DEBUG_INSTTYPE = both
    2626endif
     27if defined(VBOX_USE_VCC100) || defined(VBOX_USE_VCC110)
     28 VBoxTray_SDKS = ReorderCompilerIncs $(VBOX_WINDDK_GST)
     29endif
    2730VBoxTray_DEFS     = VBOX_WITH_HGCM LOG_TO_BACKDOOR
    2831VBoxTray_INCS     = ../include
     32if !defined(VBOX_USE_VCC100) && !defined(VBOX_USE_VCC110)
     33 include $(KBUILD_PATH)/sdks/WINDDK.kmk # WTF is this about?
     34 VBoxTray_INCS   += $(PATH_SDK_WINDDK_INC_API) $(PATH_SDK_WINDDK_INC_DDK)
     35endif
    2936VBoxTray_SOURCES  = \
    3037        VBoxTray.cpp \
    … …  
    6168        $(VBOX_LIB_VBGL_R3)
    6269
    63 include $(KBUILD_PATH)/sdks/WINDDK.kmk
    64 VBoxTray_INCS   += $(PATH_SDK_WINDDK_INC_API) $(PATH_SDK_WINDDK_INC_DDK)
    65 
    6670ifdef VBOX_WITH_WDDM
    6771 VBoxTray_DEFS   += VBOX_WITH_WDDM

  • trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDispIf.h

    r34130 r42154  
    1818#include <windows.h>
    1919#ifdef VBOX_WITH_WDDM
     20# define D3DKMDT_SPECIAL_MULTIPLATFORM_TOOL
    2021# include <d3dkmthk.h>
    2122#endif

  • trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxSeamless.cpp

    r35863 r42154  
    1515 * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
    1616 */
     17
    1718#define _WIN32_WINNT 0x0500
    18 #include <windows.h>
     19#include <Windows.h>
    1920#include "VBoxTray.h"
    2021#include "VBoxHelpers.h"
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette