VirtualBox

Changeset 32622 in vbox


Ignore:
Timestamp:
Sep 17, 2010 8:18:39 PM (14 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
66026
Message:

wddm: VBOXWDDM->VBOX_WITH_WDDM

Location:
trunk
Files:
58 edited

Legend:

Unmodified
Added
Removed

  • trunk/Config.kmk

    r32597 r32622  
    347347endif
    348348# Enable Wddm Video driver for Vista+ guests
    349 VBOXWDDM = 1
     349VBOX_WITH_WDDM = 1
    350350VBOXWDDM_WITH_VBVA=1
    351351# Enable VBVA lock

  • trunk/include/VBox/HGSMI/HGSMIChSetup.h

    r32241 r32622  
    4646#define HGSMIHOSTFLAGS_COMMANDS_PENDING 0x1
    4747#define HGSMIHOSTFLAGS_IRQ              0x2
    48 #ifdef VBOXWDDM
     48#ifdef VBOX_WITH_WDDM
    4949/* one or more guest commands is completed */
    5050# define HGSMIHOSTFLAGS_GCOMMAND_COMPLETED 0x4

  • trunk/include/VBox/VBoxVideo.h

    r32241 r32622  
    9595 * contain other data (for example HGSMIHOSTFLAGS structure).
    9696 */
    97 #ifdef VBOXWDDM
     97#ifdef VBOX_WITH_WDDM
    9898# define VBVA_ADAPTER_INFORMATION_SIZE (64*_1K)
    9999#else
    … …  
    282282    VBOXVHWACMD_TYPE_HH_CONSTRUCT,
    283283    VBOXVHWACMD_TYPE_HH_RESET
    284 #ifdef VBOXWDDM
     284#ifdef VBOX_WITH_WDDM
    285285    , VBOXVHWACMD_TYPE_SURF_GETINFO
    286286#endif
    … …  
    610610} VBOXVHWACMD_SURF_CREATE;
    611611
    612 #ifdef VBOXWDDM
     612#ifdef VBOX_WITH_WDDM
    613613typedef struct _VBOXVHWACMD_SURF_GETINFO
    614614{
    … …  
    10411041#endif /* VBOX_WITH_HGSMI */
    10421042
    1043 #ifdef VBOXWDDM
     1043#ifdef VBOX_WITH_WDDM
    10441044# pragma pack(1)
    10451045

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

    r32431 r32622  
    6565endif
    6666
    67 ifdef VBOXWDDM
     67ifdef VBOX_WITH_WDDM
    6868
    6969 ifeq ($(KBUILD_TARGET_ARCH), amd64)
    … …  
    7676 endif
    7777VBoxDispD3D_TEMPLATE = VBOXGUESTR3DLL
    78 VBoxDispD3D_DEFS     = UNICODE _UNICODE VBOXWDDM VBOXVDMA VBOXWDDMDISP
     78VBoxDispD3D_DEFS     = UNICODE _UNICODE VBOX_WITH_WDDM VBOXVDMA VBOXWDDMDISP
    7979# VBoxDispD3D_DEFS    += VBOXDISPMP_TEST
    8080ifdef VBOXWDDM_WITH_VBVA

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

    r32241 r32622  
    6565        $(call VBOX_MAKE_CAT_FN, $(@D),$@)
    6666
    67 ifdef VBOXWDDM
     67ifdef VBOX_WITH_WDDM
    6868VBOXWDDM_WITH_DISPD3D = 1
    6969ifeq ($(KBUILD_TARGET_ARCH), x86)

  • trunk/src/VBox/Additions/WINNT/Graphics/Miniport/Helper.cpp

    r29625 r32622  
    1616// enable backdoor logging
    1717//#define LOG_ENABLED
    18 #ifndef VBOXWDDM
     18#ifndef VBOX_WITH_WDDM
    1919extern "C"
    2020{
    … …  
    2929#include <VBox/VBoxGuestLib.h>
    3030
    31 #ifndef VBOXWDDM
     31#ifndef VBOX_WITH_WDDM
    3232/* the video miniport headers not compatible with the NT DDK headers */
    3333typedef struct _VIDEO_POINTER_ATTRIBUTES
    … …  
    4444#define VIDEO_MODE_COLOR_POINTER  0x04 // 1 if a color hardware pointer is
    4545                                       // supported.
    46 #endif /* #ifndef VBOXWDDM */
     46#endif /* #ifndef VBOX_WITH_WDDM */
    4747
    4848#include "Helper.h"

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

    r32496 r32622  
    6767
    6868
    69 ifdef VBOXWDDM
     69ifdef VBOX_WITH_WDDM
    7070 #
    7171 # VBoxVideoWddm
    … …  
    7979 VBoxVideoWddm_SDKS=WINDDKWLH
    8080 VBoxVideoWddm_DEFS       += VBOX_WITH_8BPP_MODES
    81  VBoxVideoWddm_DEFS       += VBOX_WITH_HGSMI VBOXWDDM
     81 VBoxVideoWddm_DEFS       += VBOX_WITH_HGSMI VBOX_WITH_WDDM
    8282 ifdef VBOX_WITH_VIDEOHWACCEL
    8383  VBoxVideoWddm_DEFS      += VBOX_WITH_VIDEOHWACCEL
    … …  
    124124        $(VBOX_LIB_IPRT_GUEST_R0_NT4) \
    125125        $(VBOX_PATH_ADDITIONS_LIB)/HGSMIGuestR0Lib$(VBOX_SUFF_LIB)
    126 endif # VBOXWDDM
     126endif # VBOX_WITH_WDDM
    127127
    128128include $(KBUILD_PATH)/subfooter.kmk

  • trunk/src/VBox/Additions/WINNT/Graphics/Miniport/VBoxVideo.cpp

    r32039 r32622  
    5858int vboxVbvaEnable (PDEVICE_EXTENSION pDevExt, ULONG ulEnable, VBVAENABLERESULT *pVbvaResult);
    5959
    60 #ifndef VBOXWDDM
     60#ifndef VBOX_WITH_WDDM
    6161ULONG DriverEntry(IN PVOID Context1, IN PVOID Context2)
    6262{
    … …  
    165165}
    166166
    167 #endif /* #ifndef VBOXWDDM */
     167#endif /* #ifndef VBOX_WITH_WDDM */
    168168
    169169/*
    … …  
    252252#endif /* VBOX_WITH_MULTIMONITOR_FIX */
    253253
    254 #ifdef VBOXWDDM
     254#ifdef VBOX_WITH_WDDM
    255255/* preferred mode index */
    256256static uint32_t gPreferredVideoMode = 0;
    … …  
    349349    /* size of the VRAM in bytes */
    350350
    351 #ifndef VBOXWDDM
     351#ifndef VBOX_WITH_WDDM
    352352    ULONG vramSize = DeviceExtension->pPrimary->u.primary.ulMaxFrameBufferSize;
    353353#else
    … …  
    442442                VideoModes[gNumVideoModes].BlueMask                     = 0xFF;
    443443                VideoModes[gNumVideoModes].AttributeFlags               = VIDEO_MODE_GRAPHICS | VIDEO_MODE_COLOR | VIDEO_MODE_NO_OFF_SCREEN;
    444 #ifdef VBOXWDDM
     444#ifdef VBOX_WITH_WDDM
    445445                gPreferredVideoMode = gNumVideoModes;
    446446#endif
    … …  
    487487
    488488        /* does the host like that mode? */
    489 #ifndef VBOXWDDM
     489#ifndef VBOX_WITH_WDDM
    490490        if (!vboxLikesVideoMode(DeviceExtension->iDevice, resolutionMatrix[matrixIndex].xRes, resolutionMatrix[matrixIndex].yRes - yOffset, 8))
    491491#else
    … …  
    553553
    554554        /* does the host like that mode? */
    555 #ifndef VBOXWDDM
     555#ifndef VBOX_WITH_WDDM
    556556        if (!vboxLikesVideoMode(DeviceExtension->iDevice, resolutionMatrix[matrixIndex].xRes, resolutionMatrix[matrixIndex].yRes - yOffset, 16))
    557557#else
    … …  
    618618
    619619        /* does the host like that mode? */
    620 #ifndef VBOXWDDM
     620#ifndef VBOX_WITH_WDDM
    621621        if (!vboxLikesVideoMode(DeviceExtension->iDevice, resolutionMatrix[matrixIndex].xRes, resolutionMatrix[matrixIndex].yRes - yOffset, 24))
    622622#else
    … …  
    682682
    683683        /* does the host like that mode? */
    684 #ifndef VBOXWDDM
     684#ifndef VBOX_WITH_WDDM
    685685        if (!vboxLikesVideoMode(DeviceExtension->iDevice, resolutionMatrix[matrixIndex].xRes, resolutionMatrix[matrixIndex].yRes - yOffset, 32))
    686686#else
    … …  
    724724     */
    725725    int curKeyNo = 0;
    726 #ifdef VBOXWDDM
     726#ifdef VBOX_WITH_WDDM
    727727    int fPreferredSet = 0;
    728728#endif
    … …  
    770770
    771771        /* third test: does the host like the video mode? */
    772 #ifndef VBOXWDDM
     772#ifndef VBOX_WITH_WDDM
    773773        if (!vboxLikesVideoMode(DeviceExtension->iDevice, xres, yres, bpp))
    774774#else
    … …  
    779779        dprintf(("VBoxVideo: adding mode from registry: xres = %d, yres = %d, bpp = %d\n", xres, yres, bpp));
    780780
    781 #ifdef VBOXWDDM
     781#ifdef VBOX_WITH_WDDM
    782782        if (!fPreferredSet)
    783783        {
    … …  
    825825                VideoModes[gNumVideoModes].GreenMask            = 0xFF00;
    826826                VideoModes[gNumVideoModes].BlueMask             = 0xFF;
    827 #ifdef VBOXWDDM
     827#ifdef VBOX_WITH_WDDM
    828828                /* 32-bit mode is more preferable, select it if not yet */
    829829                if (fPreferredSet < 2)
    … …  
    945945#endif /* VBOX_WITH_MULTIMONITOR_FIX */
    946946    {
    947 #ifndef VBOXWDDM
     947#ifndef VBOX_WITH_WDDM
    948948        dprintf(("VBoxVideo: adding custom video mode as #%d, current mode: %d \n", gNumVideoModes + 1, DeviceExtension->CurrentMode));
    949949        /* handle the startup case */
    … …  
    979979        xres &= 0xfff8;
    980980        /* take the current values for the fields that are not set */
    981 #ifndef VBOXWDDM
     981#ifndef VBOX_WITH_WDDM
    982982        if (DeviceExtension->CurrentMode != 0)
    983983        {
    … …  
    10061006
    10071007        /* does the host like that mode? */
    1008 #ifndef VBOXWDDM
     1008#ifndef VBOX_WITH_WDDM
    10091009        if (vboxLikesVideoMode(DeviceExtension->iDevice, xres, yres, bpp))
    10101010#else
    … …  
    10461046                BOOLEAN fAlternatedIndex = FALSE;
    10471047#endif /* VBOX_WITH_MULTIMONITOR_FIX */
    1048 #ifndef VBOXWDDM
     1048#ifndef VBOX_WITH_WDDM
    10491049                if (DeviceExtension->CurrentMode != 0)
    10501050#else
    … …  
    10801080                dprintf(("VBoxVideo: fNewInvocation = %d, fAlternatedIndex = %d\n", fNewInvocation, fAlternatedIndex));
    10811081#endif /* VBOX_WITH_MULTIMONITOR_FIX */
    1082 #ifdef VBOXWDDM
     1082#ifdef VBOX_WITH_WDDM
    10831083                /* assign host-supplied as the most preferable */
    10841084                gPreferredVideoMode = gNumVideoModes;
    … …  
    11521152
    11531153                /* for the startup case, we need this mode twice due to the alternating mode number */
    1154 #ifndef VBOXWDDM
     1154#ifndef VBOX_WITH_WDDM
    11551155                if (DeviceExtension->CurrentMode == 0)
    11561156#else
    … …  
    12391239    {
    12401240        int i;
    1241 #ifndef VBOXWDDM
     1241#ifndef VBOX_WITH_WDDM
    12421242        dprintf(("VBoxVideo: VideoModes (CurrentMode = %d, last #%d)\n", DeviceExtension->CurrentMode, gNumVideoModes));
    12431243#endif
    … …  
    12561256#endif
    12571257
    1258 #ifdef VBOXWDDM
     1258#ifdef VBOX_WITH_WDDM
    12591259    vboxWddmBuildResolutionTable();
    12601260#endif
    … …  
    12631263}
    12641264
    1265 #ifdef VBOXWDDM
     1265#ifdef VBOX_WITH_WDDM
    12661266static bool g_bModesTableInitialized = false;
    12671267/**
    … …  
    14211421    ULONG VideoRamLength = ulSize;
    14221422    VP_STATUS Status;
    1423 #ifndef VBOXWDDM
     1423#ifndef VBOX_WITH_WDDM
    14241424    ULONG inIoSpace = 0;
    14251425
    … …  
    14681468    if (ppv)
    14691469    {
    1470 #ifndef VBOXWDDM
     1470#ifndef VBOX_WITH_WDDM
    14711471        /* The pHostFlags field is mapped through pvAdapterInformation. It must be cleared first,
    14721472         * and it must be done in a way which avoids races with the interrupt handler.
    … …  
    14951495    if (*ppv)
    14961496    {
    1497 #ifndef VBOXWDDM
     1497#ifndef VBOX_WITH_WDDM
    14981498        VideoPortUnmapMemory(PrimaryExtension, *ppv, NULL);
    14991499#else
    … …  
    15091509#ifndef VBOX_WITH_HGSMI
    15101510
    1511 # ifdef VBOXWDDM
     1511# ifdef VBOX_WITH_WDDM
    15121512/* sanity check */
    15131513#  error WDDM is supported only for HGSMI-based driver
    … …  
    17971797#endif /* !VBOX_WITH_HGSMI */
    17981798
    1799 #ifndef VBOXWDDM
     1799#ifndef VBOX_WITH_WDDM
    18001800
    18011801VP_STATUS VBoxVideoFindAdapter(IN PVOID HwDeviceExtension,
    … …  
    21052105}
    21062106# endif /* #if defined(VBOX_WITH_HGSMI) && defined(VBOX_WITH_VIDEOHWACCEL) */
    2107 #endif  /* #ifndef VBOXWDDM */
     2107#endif  /* #ifndef VBOX_WITH_WDDM */
    21082108/**
    21092109 * Send a request to the host to make the absolute pointer visible
    … …  
    21152115    /* Use primary device extension, because the show pointer request should be processed
    21162116     * in vboxUpdatePointerShape regardless of the device. */
    2117 #ifndef VBOXWDDM
     2117#ifndef VBOX_WITH_WDDM
    21182118    PDEVICE_EXTENSION PrimaryExtension = ((PDEVICE_EXTENSION)HwDeviceExtension)->pPrimary;
    21192119#else
    … …  
    21452145}
    21462146
    2147 #ifndef VBOXWDDM
     2147#ifndef VBOX_WITH_WDDM
    21482148/**
    21492149 * VBoxVideoStartIO
    … …  
    29112911    return NO_ERROR;
    29122912}
    2913 #endif /* #ifndef VBOXWDDM */
     2913#endif /* #ifndef VBOX_WITH_WDDM */
    29142914
    29152915/**
    … …  
    29472947BOOLEAN FASTCALL VBoxVideoSetCurrentModePerform(PDEVICE_EXTENSION DeviceExtension,
    29482948        USHORT width, USHORT height, USHORT bpp
    2949 #ifdef VBOXWDDM
     2949#ifdef VBOX_WITH_WDDM
    29502950        , ULONG offDisplay
    29512951#endif
    … …  
    29622962    VBoxVideoCmnPortWriteUshort((PUSHORT)VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_ENABLE);
    29632963    VBoxVideoCmnPortWriteUshort((PUSHORT)VBE_DISPI_IOPORT_DATA, VBE_DISPI_ENABLED | VBE_DISPI_LFB_ENABLED);
    2964 #ifdef VBOXWDDM
     2964#ifdef VBOX_WITH_WDDM
    29652965    /* encode linear offDisplay to xOffset & yOffset to ensure offset fits USHORT */
    29662966    ULONG cbLine = VBOXWDDM_ROUNDBOUND(((width * bpp) + 7) / 8, 4);
    … …  
    29862986}
    29872987
    2988 #ifndef VBOXWDDM
     2988#ifndef VBOX_WITH_WDDM
    29892989
    29902990/**
    … …  
    31843184    return TRUE;
    31853185}
    3186 #endif /* ifndef VBOXWDDM */
     3186#endif /* ifndef VBOX_WITH_WDDM */
    31873187/*
    31883188 * VBoxVideoSetColorRegisters
    … …  
    32193219}
    32203220
    3221 #ifndef VBOXWDDM
     3221#ifndef VBOX_WITH_WDDM
    32223222
    32233223VP_STATUS VBoxVideoGetChildDescriptor(

  • trunk/src/VBox/Additions/WINNT/Graphics/Miniport/VBoxVideo.h

    r32496 r32622  
    2929
    3030RT_C_DECLS_BEGIN
    31 #ifndef VBOXWDDM
     31#ifndef VBOX_WITH_WDDM
    3232#include "dderror.h"
    3333#include "devioctl.h"
    … …  
    106106
    107107/* common API types */
    108 #ifndef VBOXWDDM
     108#ifndef VBOX_WITH_WDDM
    109109typedef PSPIN_LOCK VBOXVCMNSPIN_LOCK, *PVBOXVCMNSPIN_LOCK;
    110110typedef UCHAR VBOXVCMNIRQL, *PVBOXVCMNIRQL;
    … …  
    202202                                                * The primary extension is the first one.
    203203                                                */
    204 #ifndef VBOXWDDM
     204#ifndef VBOX_WITH_WDDM
    205205   struct _DEVICE_EXTENSION *pPrimary;         /* Pointer to the primary device extension. */
    206206
    … …  
    240240                                                * This is mapped by miniport separately.
    241241                                                */
    242 #ifdef VBOXWDDM
     242#ifdef VBOX_WITH_WDDM
    243243           VBOXVDMAINFO Vdma;
    244244# ifdef VBOXVDMA_WITH_VBVA
    … …  
    281281           /* The IO Port Number for guest commands. */
    282282           RTIOPORT IOPortGuest;
    283 # ifndef VBOXWDDM
     283# ifndef VBOX_WITH_WDDM
    284284           /* Video Port API dynamically picked up at runtime for binary backwards compatibility with older NT versions */
    285285           VBOXVIDEOPORTPROCS VideoPortProcs;
    … …  
    303303#endif /* VBOX_WITH_HGSMI */
    304304
    305 #ifdef VBOXWDDM
     305#ifdef VBOX_WITH_WDDM
    306306   PDEVICE_OBJECT pPDO;
    307307
    … …  
    331331} DEVICE_EXTENSION, *PDEVICE_EXTENSION;
    332332
    333 #ifndef VBOXWDDM
     333#ifndef VBOX_WITH_WDDM
    334334#define DEV_MOUSE_HIDDEN(dev) ((dev)->pPrimary->u.primary.fMouseHidden)
    335335#define DEV_SET_MOUSE_HIDDEN(dev)   \
    … …  
    354354extern "C"
    355355{
    356 #ifndef VBOXWDDM
     356#ifndef VBOX_WITH_WDDM
    357357/* XPDM-WDDM common API */
    358358
    … …  
    801801BOOLEAN FASTCALL VBoxVideoSetCurrentModePerform(PDEVICE_EXTENSION DeviceExtension,
    802802        USHORT width, USHORT height, USHORT bpp
    803 #ifdef VBOXWDDM
     803#ifdef VBOX_WITH_WDDM
    804804        , ULONG offDisplay
    805805#endif
    … …  
    864864DECLINLINE(void) VBoxHGSMIHostWrite(PDEVICE_EXTENSION PrimaryExtension, ULONG data)
    865865{
    866 #ifndef VBOXWDDM
     866#ifndef VBOX_WITH_WDDM
    867867    VBoxVideoCmnPortWriteUlong((PULONG)PrimaryExtension->pPrimary->u.primary.IOPortHost, data);
    868868#else
    … …  
    873873DECLINLINE(ULONG) VBoxHGSMIHostRead(PDEVICE_EXTENSION PrimaryExtension)
    874874{
    875 #ifndef VBOXWDDM
     875#ifndef VBOX_WITH_WDDM
    876876    return VBoxVideoCmnPortReadUlong((PULONG)PrimaryExtension->pPrimary->u.primary.IOPortHost);
    877877#else
    … …  
    882882DECLINLINE(void) VBoxHGSMIGuestWrite(PDEVICE_EXTENSION PrimaryExtension, ULONG data)
    883883{
    884 #ifndef VBOXWDDM
     884#ifndef VBOX_WITH_WDDM
    885885    VBoxVideoCmnPortWriteUlong((PULONG)PrimaryExtension->pPrimary->u.primary.IOPortGuest, data);
    886886#else
    … …  
    891891DECLINLINE(ULONG) VBoxHGSMIGuestRead(PDEVICE_EXTENSION PrimaryExtension)
    892892{
    893 #ifndef VBOXWDDM
     893#ifndef VBOX_WITH_WDDM
    894894    return VBoxVideoCmnPortReadUlong((PULONG)PrimaryExtension->pPrimary->u.primary.IOPortGuest);
    895895#else
    … …  
    901901
    902902VOID VBoxSetupDisplaysHGSMI (PDEVICE_EXTENSION PrimaryExtension,
    903 #ifndef VBOXWDDM
     903#ifndef VBOX_WITH_WDDM
    904904                             PVIDEO_PORT_CONFIG_INFO pConfigInfo,
    905905#endif
    … …  
    909909                                uint32_t cbLength);
    910910
    911 #ifdef VBOXWDDM
     911#ifdef VBOX_WITH_WDDM
    912912int VBoxFreeDisplaysHGSMI(PDEVICE_EXTENSION PrimaryExtension);
    913913#else

  • trunk/src/VBox/Additions/WINNT/Graphics/Miniport/VBoxVideoHGSMI.cpp

    r32241 r32622  
    187187                         uint16_t u16Op)
    188188{
    189 #ifdef VBOXWDDM
     189#ifdef VBOX_WITH_WDDM
    190190    /* @todo: add synchronization */
    191191#endif
    … …  
    195195void vboxHGSMIBufferFree (PDEVICE_EXTENSION PrimaryExtension, void *pvBuffer)
    196196{
    197 #ifdef VBOXWDDM
     197#ifdef VBOX_WITH_WDDM
    198198    /* @todo: add synchronization */
    199199#endif
    … …  
    228228
    229229    /* Allocate the IO buffer. */
    230 #ifndef VBOXWDDM
     230#ifndef VBOX_WITH_WDDM
    231231    if (PrimaryExtension->pPrimary != PrimaryExtension)
    232232    {
    … …  
    348348    return rc;
    349349}
    350 #ifndef VBOXWDDM
     350#ifndef VBOX_WITH_WDDM
    351351static int vbvaInitInfoDisplay (PDEVICE_EXTENSION PrimaryExtension, void *pvContext, void *pvData)
    352352{
    … …  
    439439    if(RT_SUCCESS (rc))
    440440    {
    441 #ifndef VBOXWDDM
     441#ifndef VBOX_WITH_WDDM
    442442        rc = vboxCallVBVA (PrimaryExtension,
    443443                               VBVA_INFO_VIEW,
    … …  
    481481}
    482482
    483 #ifndef VBOXWDDM
     483#ifndef VBOX_WITH_WDDM
    484484VP_STATUS vboxWaitForSingleObjectVoid(IN PVOID  HwDeviceExtension, IN PVOID  Object, IN PLARGE_INTEGER  Timeout  OPTIONAL)
    485485{
    … …  
    712712 */
    713713VOID VBoxSetupDisplaysHGSMI(PDEVICE_EXTENSION PrimaryExtension,
    714 #ifndef VBOXWDDM
     714#ifndef VBOX_WITH_WDDM
    715715        PVIDEO_PORT_CONFIG_INFO pConfigInfo,
    716716#endif
    … …  
    726726     */
    727727    PrimaryExtension->pNext                              = NULL;
    728 #ifndef VBOXWDDM
     728#ifndef VBOX_WITH_WDDM
    729729    PrimaryExtension->pPrimary                           = PrimaryExtension;
    730730    PrimaryExtension->iDevice                            = 0;
    … …  
    734734    PrimaryExtension->u.primary.ulVbvaEnabled            = 0;
    735735    PrimaryExtension->u.primary.bVBoxVideoSupported      = FALSE;
    736 #ifndef VBOXWDDM
     736#ifndef VBOX_WITH_WDDM
    737737    PrimaryExtension->u.primary.cDisplays                = 1;
    738738#endif
    … …  
    862862    if (PrimaryExtension->u.primary.bHGSMI)
    863863    {
    864 #ifndef VBOXWDDM
     864#ifndef VBOX_WITH_WDDM
    865865        typedef VP_STATUS (*PFNCREATESECONDARYDISPLAY)(PVOID, PVOID *, ULONG);
    866866        PFNCREATESECONDARYDISPLAY pfnCreateSecondaryDisplay = NULL;
    … …  
    891891            }
    892892
    893 #ifndef VBOXWDDM
     893#ifndef VBOX_WITH_WDDM
    894894            PDEVICE_EXTENSION pPrev = PrimaryExtension;
    895895
    … …  
    932932    }
    933933
    934 #ifndef VBOXWDDM
     934#ifndef VBOX_WITH_WDDM
    935935    /* Now when the number of monitors is known and extensions are created,
    936936     * calculate the layout of framebuffers.
    … …  
    950950    }
    951951
    952 #ifdef VBOXWDDM
     952#ifdef VBOX_WITH_WDDM
    953953    if (PrimaryExtension->u.primary.bHGSMI)
    954954    {
    … …  
    10611061}
    10621062
    1063 #ifdef VBOXWDDM
     1063#ifdef VBOX_WITH_WDDM
    10641064int VBoxFreeDisplaysHGSMI(PDEVICE_EXTENSION PrimaryExtension)
    10651065{
    … …  
    11751175                                uint32_t cbLength)
    11761176{
    1177 #ifndef VBOXWDDM
     1177#ifndef VBOX_WITH_WDDM
    11781178    PDEVICE_EXTENSION PrimaryExtension = DeviceExtension->pPrimary;
    11791179
    … …  
    13181318static int vboxVBVACreateChannelContexts(PDEVICE_EXTENSION PrimaryExtension, VBVA_CHANNELCONTEXTS ** ppContext)
    13191319{
    1320 #ifndef VBOXWDDM
     1320#ifndef VBOX_WITH_WDDM
    13211321    uint32_t cDisplays = (uint32_t)PrimaryExtension->u.primary.cDisplays;
    13221322#else
    … …  
    13491349}
    13501350
    1351 #ifndef VBOXWDDM
     1351#ifndef VBOX_WITH_WDDM
    13521352DECLCALLBACK(void) hgsmiHostCmdComplete (HVBOXVIDEOHGSMI hHGSMI, struct _VBVAHOSTCMD * pCmd)
    13531353{
    … …  
    14471447                        {
    14481448                            VBVAHOSTCMDEVENT *pEventCmd = VBVAHOSTCMD_BODY(pCur, VBVAHOSTCMDEVENT);
    1449 #ifndef VBOXWDDM
     1449#ifndef VBOX_WITH_WDDM
    14501450                            PEVENT pEvent = (PEVENT)pEventCmd->pEvent;
    14511451                            pCallbacks->PrimaryExtension->u.primary.VideoPortProcs.pfnSetEvent(

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

    r32594 r32622  
    2323
    2424libWine_TEMPLATE     = VBOXGUESTR3NPDLL
    25 if defined(VBOX_SIGNING_MODE) && defined(VBOXWDDM)
     25if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_WDDM)
    2626 libWine_NOINST.win.x86 = true
    2727endif
    … …  
    172172    $(PATH_LIB)/libWine$(VBOX_SUFF_LIB)
    173173   
    174 ifdef VBOXWDDM
     174ifdef VBOX_WITH_WDDM
    175175DLLS += wined3dwddm
    176176wined3dwddm_EXTENDS  = wined3d
    177 if defined(VBOX_SIGNING_MODE) && defined(VBOXWDDM)
     177if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_WDDM)
    178178 wined3dwddm_NOINST.win.x86 = true
    179179endif
    180 wined3dwddm_DEFS    += $(wined3d_DEFS) VBOXWDDM
     180wined3dwddm_DEFS    += $(wined3d_DEFS) VBOX_WITH_WDDM
    181181wined3dwddm_SOURCES  = $(subst wined3d.def,wined3dwddm.def,$(wined3d_SOURCES))
    182182endif
    … …  
    196196 VBoxD3D8_DEFS       += WINE_NO_DEBUG_MSGS
    197197endif
    198 #ifdef VBOXWDDM
    199 # VBoxD3D8_DEFS        += VBOXWDDM IN_VBOXWINEEX
     198#ifdef VBOX_WITH_WDDM
     199# VBoxD3D8_DEFS        += VBOX_WITH_WDDM IN_VBOXWINEEX
    200200#endif
    201201VBoxD3D8_INCS         := $(PATH_SUB_CURRENT)/include
    … …  
    256256    $(PATH_LIB)/wined3d$(VBOX_SUFF_LIB)
    257257
    258 ifdef VBOXWDDM
     258ifdef VBOX_WITH_WDDM
    259259DLLS += VBoxD3D9wddm
    260260VBoxD3D9wddm_EXTENDS  = VBoxD3D9
    261 if defined(VBOX_SIGNING_MODE) && defined(VBOXWDDM)
     261if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_WDDM)
    262262 VBoxD3D9wddm_NOINST.win.x86 = true
    263263endif
    264 VBoxD3D9wddm_DEFS += $(VBoxD3D9_DEFS) VBOXWDDM IN_VBOXWINEEX
     264VBoxD3D9wddm_DEFS += $(VBoxD3D9_DEFS) VBOX_WITH_WDDM IN_VBOXWINEEX
    265265VBoxD3D9wddm_SOURCES  = $(subst d3d9.def,d3d9wddm.def,$(VBoxD3D9_SOURCES))
    266266VBoxD3D9wddm_LIBS = $(subst wined3d$(VBOX_SUFF_LIB),wined3dwddm$(VBOX_SUFF_LIB),$(VBoxD3D9_LIBS))

  • trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/d3d9_private.h

    r30916 r32622  
    4848#include "wine/wined3d.h"
    4949
    50 #ifdef VBOXWDDM
     50#ifdef VBOX_WITH_WDDM
    5151#include "../vbox/VBoxWineEx.h"
    5252#endif
    … …  
    321321        UINT width, UINT height, D3DFORMAT format, BOOL lockable, BOOL discard, UINT level,
    322322        DWORD usage, D3DPOOL pool, D3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality
    323 #ifdef VBOXWDDM
     323#ifdef VBOX_WITH_WDDM
    324324        , HANDLE *shared_handle
    325325        , void *pvClientMem
    … …  
    438438HRESULT texture_init(IDirect3DTexture9Impl *texture, IDirect3DDevice9Impl *device,
    439439        UINT width, UINT height, UINT levels, DWORD usage, D3DFORMAT format, D3DPOOL pool
    440 #ifdef VBOXWDDM
     440#ifdef VBOX_WITH_WDDM
    441441        , HANDLE *shared_handle
    442442        , void *pvClientMem

  • trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/device.c

    r32461 r32622  
    462462    return ret;
    463463}
    464 #ifdef VBOXWDDM
     464#ifdef VBOX_WITH_WDDM
    465465static HRESULT IDirect3DDevice9Impl_DoCreateAdditionalSwapChain(IDirect3DDevice9Ex *iface,
    466466        D3DPRESENT_PARAMETERS *present_parameters, IDirect3DSwapChain9 **swapchain)
    … …  
    498498}
    499499
    500 #ifdef VBOXWDDM
     500#ifdef VBOX_WITH_WDDM
    501501static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_CreateAdditionalSwapChain(IDirect3DDevice9Ex *iface,
    502502        D3DPRESENT_PARAMETERS *present_parameters, IDirect3DSwapChain9 **swapchain)
    … …  
    746746}
    747747
    748 #ifdef VBOXWDDM
     748#ifdef VBOX_WITH_WDDM
    749749//#pragma comment(linker, "/export:VBoxWineExD3DDev9Flush=_VBoxWineExD3DDev9Flush@4")
    750750
    … …  
    815815        D3DPOOL pool, IDirect3DTexture9 **texture, HANDLE *shared_handle)
    816816{
    817 #ifdef VBOXWDDM
     817#ifdef VBOX_WITH_WDDM
    818818    return VBoxWineExD3DDev9CreateTexture(iface, width, height, levels, usage, format,
    819819            pool, texture, shared_handle, NULL);
    … …  
    979979        D3DFORMAT Format, BOOL Lockable, BOOL Discard, UINT Level, IDirect3DSurface9 **ppSurface,
    980980        UINT Usage, D3DPOOL Pool, D3DMULTISAMPLE_TYPE MultiSample, DWORD MultisampleQuality
    981 #ifdef VBOXWDDM
     981#ifdef VBOX_WITH_WDDM
    982982        , HANDLE *shared_handle
    983983        , void *pvClientMem
    … …  
    10031003    hr = surface_init(object, This, Width, Height, Format, Lockable, Discard,
    10041004            Level, Usage, Pool, MultiSample, MultisampleQuality
    1005 #ifdef VBOXWDDM
     1005#ifdef VBOX_WITH_WDDM
    10061006            , shared_handle
    10071007            , pvClientMem
    … …  
    10341034    hr = IDirect3DDevice9Impl_CreateSurface(iface, Width, Height, Format, Lockable, FALSE /* Discard */,
    10351035            0 /* Level */, ppSurface, D3DUSAGE_RENDERTARGET, D3DPOOL_DEFAULT, MultiSample, MultisampleQuality
    1036 #ifdef VBOXWDDM
     1036#ifdef VBOX_WITH_WDDM
    10371037            , pSharedHandle
    10381038            , NULL
    … …  
    10561056    hr = IDirect3DDevice9Impl_CreateSurface(iface, Width, Height, Format, TRUE /* Lockable */, Discard,
    10571057            0 /* Level */, ppSurface, D3DUSAGE_DEPTHSTENCIL, D3DPOOL_DEFAULT, MultiSample, MultisampleQuality
    1058 #ifdef VBOXWDDM
     1058#ifdef VBOX_WITH_WDDM
    10591059            , pSharedHandle
    10601060            , NULL
    … …  
    11961196            0 /* Level */, ppSurface, 0 /* Usage (undefined/none) */, (WINED3DPOOL)Pool, D3DMULTISAMPLE_NONE,
    11971197            0 /* MultisampleQuality */
    1198 #ifdef VBOXWDDM
     1198#ifdef VBOX_WITH_WDDM
    11991199            , pSharedHandle
    12001200            , NULL
    … …  
    27592759        IUnknown *superior, UINT width, UINT height, WINED3DFORMAT format, DWORD usage,
    27602760        WINED3DPOOL pool, UINT level, WINED3DCUBEMAP_FACES face, IWineD3DSurface **surface
    2761 #ifdef VBOXWDDM
     2761#ifdef VBOX_WITH_WDDM
    27622762        , HANDLE *shared_handle
    27632763        , void *pvClientMem
    … …  
    27802780            d3dformat_from_wined3dformat(format), lockable, FALSE /* Discard */, level,
    27812781            (IDirect3DSurface9 **)&d3d_surface, usage, pool, D3DMULTISAMPLE_NONE, 0 /* MultisampleQuality */
    2782 #ifdef VBOXWDDM
     2782#ifdef VBOX_WITH_WDDM
    27832783            , shared_handle
    27842784            , pvClientMem
    … …  
    29312931    local_parameters.PresentationInterval = present_parameters->PresentationInterval;
    29322932
    2933 #ifdef VBOXWDDM
     2933#ifdef VBOX_WITH_WDDM
    29342934    hr = IDirect3DDevice9Impl_DoCreateAdditionalSwapChain((IDirect3DDevice9Ex *)This,
    29352935            &local_parameters, (IDirect3DSwapChain9 **)&d3d_swapchain);

  • trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/surface.c

    r30916 r32622  
    382382        UINT width, UINT height, D3DFORMAT format, BOOL lockable, BOOL discard, UINT level,
    383383        DWORD usage, D3DPOOL pool, D3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality
    384 #ifdef VBOXWDDM
     384#ifdef VBOX_WITH_WDDM
    385385        , HANDLE *shared_handle
    386386        , void *pvClientMem
    … …  
    417417
    418418    wined3d_mutex_lock();
    419 #ifdef VBOXWDDM
     419#ifdef VBOX_WITH_WDDM
    420420    hr = IWineD3DDevice_CreateSurface(device->WineD3DDevice, width, height, wined3dformat_from_d3dformat(format),
    421421            lockable, discard, level, &surface->wineD3DSurface, usage & WINED3DUSAGE_MASK, (WINED3DPOOL)pool,

  • trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/texture.c

    r30916 r32622  
    399399HRESULT texture_init(IDirect3DTexture9Impl *texture, IDirect3DDevice9Impl *device,
    400400        UINT width, UINT height, UINT levels, DWORD usage, D3DFORMAT format, D3DPOOL pool
    401 #ifdef VBOXWDDM
     401#ifdef VBOX_WITH_WDDM
    402402        , HANDLE *shared_handle
    403403        , void *pvClientMem
    … …  
    411411
    412412    wined3d_mutex_lock();
    413 #ifdef VBOXWDDM
     413#ifdef VBOX_WITH_WDDM
    414414    hr = IWineD3DDevice_CreateTexture(device->WineD3DDevice, width, height, levels,
    415415            usage & WINED3DUSAGE_MASK, wined3dformat_from_d3dformat(format), pool,

  • trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/wined3d.h

    r32545 r32622  
    26902690        WINED3DCUBEMAP_FACES face,
    26912691        IWineD3DSurface **surface
    2692 #ifdef VBOXWDDM
     2692#ifdef VBOX_WITH_WDDM
    26932693        , HANDLE *shared_handle
    26942694        , void *pvClientMem
    … …  
    27472747/*** IWineD3DDeviceParent methods ***/
    27482748#define IWineD3DDeviceParent_WineD3DDeviceCreated(This,device) (This)->lpVtbl->WineD3DDeviceCreated(This,device)
    2749 #ifdef VBOXWDDM
     2749#ifdef VBOX_WITH_WDDM
    27502750#define IWineD3DDeviceParent_CreateSurface(This,superior,width,height,format,usage,pool,level,face,surface,shared_handle,pvClientMem) (This)->lpVtbl->CreateSurface(This,superior,width,height,format,usage,pool,level,face,surface,shared_handle,pvClientMem)
    27512751#else
    … …  
    61266126        WINED3DGAMMARAMP *ramp);
    61276127
    6128 #ifdef VBOXWDDM
     6128#ifdef VBOX_WITH_WDDM
    61296129    HRESULT (STDMETHODCALLTYPE *Flush)(
    61306130        IWineD3DSwapChain* This);
    … …  
    61556155#define IWineD3DSwapChain_SetGammaRamp(This,flags,ramp) (This)->lpVtbl->SetGammaRamp(This,flags,ramp)
    61566156#define IWineD3DSwapChain_GetGammaRamp(This,ramp) (This)->lpVtbl->GetGammaRamp(This,ramp)
    6157 #ifdef VBOXWDDM
     6157#ifdef VBOX_WITH_WDDM
    61586158#define IWineD3DSwapChain_Flush(This) (This)->lpVtbl->Flush(This)
    61596159#endif
    … …  
    73027302        ) = 0;
    73037303
    7304 #ifdef VBOXWDDM
     7304#ifdef VBOX_WITH_WDDM
    73057305    virtual HRESULT STDMETHODCALLTYPE Flush(
    73067306        ) = 0;
    … …  
    73837383        IUnknown *parent,
    73847384        const struct wined3d_parent_ops *parent_ops
    7385 #ifdef VBOXWDDM
     7385#ifdef VBOX_WITH_WDDM
    73867386        , HANDLE *shared_handle
    73877387        , void *pvClientMem
    … …  
    74067406        IUnknown *parent,
    74077407        const struct wined3d_parent_ops *parent_ops
    7408 #ifdef VBOXWDDM
     7408#ifdef VBOX_WITH_WDDM
    74097409        , HANDLE *shared_handle
    74107410        , void *pvClientMem
    … …  
    80728072        IWineD3DDevice* This);
    80738073
    8074 #ifdef VBOXWDDM
     8074#ifdef VBOX_WITH_WDDM
    80758075    HRESULT (STDMETHODCALLTYPE *Flush)(
    80768076        IWineD3DDevice* This);
    … …  
    81038103#define IWineD3DDevice_CreateIndexBuffer(This,length,usage,pool,index_buffer,parent,parent_ops) (This)->lpVtbl->CreateIndexBuffer(This,length,usage,pool,index_buffer,parent,parent_ops)
    81048104#define IWineD3DDevice_CreateStateBlock(This,type,stateblock,parent) (This)->lpVtbl->CreateStateBlock(This,type,stateblock,parent)
    8105 #ifdef VBOXWDDM
     8105#ifdef VBOX_WITH_WDDM
    81068106#define IWineD3DDevice_CreateSurface(This,width,height,format,lockable,discard,level,surface,usage,pool,multisample_type,multisample_quality,surface_type,parent,parent_ops,shared_handle,pvClientMem) (This)->lpVtbl->CreateSurface(This,width,height,format,lockable,discard,level,surface,usage,pool,multisample_type,multisample_quality,surface_type,parent,parent_ops,shared_handle,pvClientMem)
    81078107#else
    … …  
    81098109#endif
    81108110#define IWineD3DDevice_CreateRendertargetView(This,resource,parent,rendertarget_view) (This)->lpVtbl->CreateRendertargetView(This,resource,parent,rendertarget_view)
    8111 #ifdef VBOXWDDM
     8111#ifdef VBOX_WITH_WDDM
    81128112#define IWineD3DDevice_CreateTexture(This,width,height,levels,usage,format,pool,texture,parent,parent_ops,shared_handle,pvClientMem) (This)->lpVtbl->CreateTexture(This,width,height,levels,usage,format,pool,texture,parent,parent_ops,shared_handle,pvClientMem)
    81138113#else
    … …  
    82408240#define IWineD3DDevice_AcquireFocusWindow(This,window) (This)->lpVtbl->AcquireFocusWindow(This,window)
    82418241#define IWineD3DDevice_ReleaseFocusWindow(This) (This)->lpVtbl->ReleaseFocusWindow(This)
    8242 #ifdef VBOXWDDM
     8242#ifdef VBOX_WITH_WDDM
    82438243#define IWineD3DDevice_Flush(This) (This)->lpVtbl->Flush(This)
    82448244#define IWineD3DDevice_AddSwapChain(This,swapchain) (This)->lpVtbl->AddSwapChain(This,swapchain)

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

    r32545 r32622  
    586586static void shader_arb_load_constants(const struct wined3d_context *context, char usePixelShader, char useVertexShader)
    587587{
    588 #ifdef VBOXWDDM
     588#ifdef VBOX_WITH_WDDM
    589589    IWineD3DDeviceImpl *device = context->device;
    590590#else
    … …  
    620620    /* We don't want shader constant dirtification to be an O(contexts), so just dirtify the active
    621621     * context. On a context switch the old context will be fully dirtified */
    622 #ifdef VBOXWDDM
     622#ifdef VBOX_WITH_WDDM
    623623    if (!context || context->device != This) return;
    624624#else
    … …  
    637637    /* We don't want shader constant dirtification to be an O(contexts), so just dirtify the active
    638638     * context. On a context switch the old context will be fully dirtified */
    639 #ifdef VBOXWDDM
     639#ifdef VBOX_WITH_WDDM
    640640    if (!context || context->device != This) return;
    641641#else
    … …  
    43614361static void shader_arb_select(const struct wined3d_context *context, BOOL usePS, BOOL useVS)
    43624362{
    4363 #ifdef VBOXWDDM
     4363#ifdef VBOX_WITH_WDDM
    43644364    IWineD3DDeviceImpl *This = context->device;
    43654365#else
    … …  
    69696969    if (wined3d_settings.strict_draw_ordering || (dst_swapchain
    69706970            && ((IWineD3DSurface *)dst_surface == dst_swapchain->frontBuffer
    6971 #ifdef VBOXWDDM
     6971#ifdef VBOX_WITH_WDDM
    69726972            || dst_swapchain->device->numContexts > 1
    69736973#else

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

    r31828 r32622  
    4040        IWineD3DDeviceImpl *device, UINT size, DWORD usage, const struct wined3d_format_desc *format_desc,
    4141        WINED3DPOOL pool, IUnknown *parent, const struct wined3d_parent_ops *parent_ops
    42 #ifdef VBOXWDDM
     42#ifdef VBOX_WITH_WDDM
    4343        , HANDLE *shared_handle
    4444        , void *pvClientMem
    … …  
    5050    hr = resource_init((IWineD3DResource *)texture, resource_type, device,
    5151            size, usage, format_desc, pool, parent, parent_ops
    52 #ifdef VBOXWDDM
     52#ifdef VBOX_WITH_WDDM
    5353            , shared_handle, pvClientMem
    5454#endif
    … …  
    267267    if (gl_tex->name == 0) {
    268268        *set_surface_desc = TRUE;
    269 #ifdef VBOXWDDM
     269#ifdef VBOX_WITH_WDDM
    270270        if (VBOXSHRC_IS_SHARED_OPENED(This))
    271271        {
    … …  
    276276        {
    277277            glGenTextures(1, &gl_tex->name);
    278 #ifdef VBOXWDDM
     278#ifdef VBOX_WITH_WDDM
    279279            if (VBOXSHRC_IS_SHARED(This))
    280280            {

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

    r30916 r32622  
    14741474    hr = resource_init((IWineD3DResource *)buffer, WINED3DRTYPE_BUFFER,
    14751475            device, size, usage, format_desc, pool, parent, parent_ops
    1476 #ifdef VBOXWDDM
     1476#ifdef VBOX_WITH_WDDM
    14771477            , NULL, NULL /* <- no need this info here so far */
    14781478#endif

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

    r32577 r32622  
    331331{
    332332    const struct wined3d_gl_info *gl_info = context->gl_info;
    333 #ifdef VBOXWDDM
     333#ifdef VBOX_WITH_WDDM
    334334    IWineD3DDeviceImpl *device = context->device;
    335335#else
    … …  
    352352{
    353353    const struct wined3d_gl_info *gl_info = context->gl_info;
    354 #ifdef VBOXWDDM
     354#ifdef VBOX_WITH_WDDM
    355355    IWineD3DDeviceImpl *device = context->device;
    356356#else
    … …  
    385385{
    386386    const struct wined3d_gl_info *gl_info = context->gl_info;
    387 #ifdef VBOXWDDM
     387#ifdef VBOX_WITH_WDDM
    388388    IWineD3DDeviceImpl *device = context->device;
    389389#else
    … …  
    425425{
    426426    const struct wined3d_gl_info *gl_info = context->gl_info;
    427 #ifdef VBOXWDDM
     427#ifdef VBOX_WITH_WDDM
    428428    IWineD3DDeviceImpl *device = context->device;
    429429#else
    … …  
    751751
    752752static void context_update_window(struct wined3d_context *context
    753 #ifdef VBOXWDDM
     753#ifdef VBOX_WITH_WDDM
    754754        , IWineD3DSwapChainImpl *swapchain
    755755#endif
    756756        )
    757757{
    758 #ifdef VBOXWDDM
     758#ifdef VBOX_WITH_WDDM
    759759# ifdef DEBUG_misha
    760760    Assert(0);
    … …  
    777777    else context->valid = 1;
    778778
    779 #ifdef VBOXWDDM
     779#ifdef VBOX_WITH_WDDM
    780780    context->win_handle = swapchain->win_handle;
    781781    context->currentSwapchain = swapchain;
    … …  
    810810
    811811static void context_validate(struct wined3d_context *context
    812 #ifdef VBOXWDDM
     812#ifdef VBOX_WITH_WDDM
    813813        , IWineD3DSwapChainImpl *swapchain
    814814#endif
    … …  
    825825
    826826    if (
    827 #ifdef VBOXWDDM
     827#ifdef VBOX_WITH_WDDM
    828828            swapchain && context->win_handle != swapchain->win_handle
    829829#else
    … …  
    833833    {
    834834        context_update_window(context
    835 #ifdef VBOXWDDM
     835#ifdef VBOX_WITH_WDDM
    836836                , swapchain
    837837#endif
    … …  
    854854
    855855    context_validate(context
    856 #ifdef VBOXWDDM/* tmp work-around */
     856#ifdef VBOX_WITH_WDDM/* tmp work-around */
    857857            , (IWineD3DSwapChainImpl*)context->device->swapchains[context->device->NumberOfSwapChains-1]
    858858#endif
    … …  
    12931293    HDC hdc;
    12941294
    1295 #if defined(VBOXWDDM) && defined(DEBUG_misha)
     1295#if defined(VBOX_WITH_WDDM) && defined(DEBUG_misha)
    12961296    Assert(0);
    12971297#endif
    … …  
    14201420    }
    14211421
    1422 #ifdef VBOXWDDM
     1422#ifdef VBOX_WITH_WDDM
    14231423    ret->device = device;
    14241424    ret->currentSwapchain = swapchain;
    … …  
    15731573    }
    15741574
    1575 #ifdef VBOXWDDM
     1575#ifdef VBOX_WITH_WDDM
    15761576    GL_EXTCALL(glChromiumParameteriCR(GL_SHARE_CONTEXT_RESOURCES_CR, GL_TRUE));
    15771577#endif
    … …  
    15941594}
    15951595
    1596 #ifdef VBOXWDDM
     1596#ifdef VBOX_WITH_WDDM
    15971597static void context_setup_target(IWineD3DDeviceImpl *device, struct wined3d_context *context, IWineD3DSurface *target);
    15981598static void context_apply_state(struct wined3d_context *context, IWineD3DDeviceImpl *device, enum ContextUsage usage);
    … …  
    19671967{
    19681968    unsigned int i;
    1969 #ifdef VBOXWDDM
     1969#ifdef VBOX_WITH_WDDM
    19701970    IWineD3DDeviceImpl *device = ((IWineD3DSwapChainImpl*)swapchain)->device;
    19711971    for (i = 0; i < device->numContexts; ++i)
    … …  
    20112011        if (current_context
    20122012                && current_context->current_rt
    2013 #ifdef VBOXWDDM
     2013#ifdef VBOX_WITH_WDDM
    20142014                && current_context->device == This
    20152015#else
    … …  
    20222022        else
    20232023        {
    2024 #ifdef VBOXWDDM
     2024#ifdef VBOX_WITH_WDDM
    20252025            /* tmp work-around */
    20262026            IWineD3DSwapChainImpl *swapchain = (IWineD3DSwapChainImpl *)This->swapchains[This->NumberOfSwapChains-1];
    … …  
    20352035    if (current_context && current_context->current_rt == target)
    20362036    {
    2037 #ifdef VBOXWDDM
     2037#ifdef VBOX_WITH_WDDM
    20382038        IWineD3DSwapChain *swapchain = NULL;
    20392039        if (SUCCEEDED(IWineD3DSurface_GetContainer(target, &IID_IWineD3DSwapChain, (void **)&swapchain))) {
    … …  
    20552055
    20562056        context = findThreadContextForSwapChain(swapchain, tid);
    2057 #ifdef VBOXWDDM
     2057#ifdef VBOX_WITH_WDDM
    20582058        context_validate(context, (IWineD3DSwapChainImpl*)swapchain);
    20592059#endif
    … …  
    20662066        /* Stay with the currently active context. */
    20672067        if (current_context
    2068 #ifdef VBOXWDDM
     2068#ifdef VBOX_WITH_WDDM
    20692069                && current_context->device == This
    20702070#else
    … …  
    20832083             * Can also happen on thread switches - in that case findThreadContextForSwapChain
    20842084             * is perfect to call. */
    2085 #ifdef VBOXWDDM /* tmp work-around */
     2085#ifdef VBOX_WITH_WDDM /* tmp work-around */
    20862086            context = findThreadContextForSwapChain(This->swapchains[This->NumberOfSwapChains-1], tid);
    20872087#else
    … …  
    20892089#endif
    20902090        }
    2091 #ifdef VBOXWDDM
     2091#ifdef VBOX_WITH_WDDM
    20922092        context_validate(context,
    20932093                (IWineD3DSwapChainImpl*)This->swapchains[This->NumberOfSwapChains-1] /* tmp work-around */
    … …  
    20962096    }
    20972097
    2098 #ifndef VBOXWDDM
     2098#ifndef VBOX_WITH_WDDM
    20992099    context_validate(context);
    21002100#endif

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

    r31828 r32622  
    490490    hr = basetexture_init((IWineD3DBaseTextureImpl *)texture, levels, WINED3DRTYPE_CUBETEXTURE,
    491491            device, 0, usage, format_desc, pool, parent, parent_ops
    492 #ifdef VBOXWDDM
     492#ifdef VBOX_WITH_WDDM
    493493        , NULL
    494494        , NULL
    … …  
    540540            };
    541541
    542 #ifdef VBOXWDDM
     542#ifdef VBOX_WITH_WDDM
    543543            hr = IWineD3DDeviceParent_CreateSurface(device->device_parent, parent, tmp_w, tmp_w,
    544544                    format, usage, pool, i /* Level */, j, &texture->surfaces[j][i]

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

    r32577 r32622  
    803803        DWORD Usage, WINED3DPOOL Pool, WINED3DMULTISAMPLE_TYPE MultiSample, DWORD MultisampleQuality,
    804804        WINED3DSURFTYPE Impl, IUnknown *parent, const struct wined3d_parent_ops *parent_ops
    805 #ifdef VBOXWDDM
     805#ifdef VBOX_WITH_WDDM
    806806        , HANDLE *shared_handle
    807807        , void *pvClientMem
    … …  
    834834    hr = surface_init(object, Impl, This->surface_alignment, Width, Height, Level, Lockable,
    835835            Discard, MultiSample, MultisampleQuality, This, Usage, Format, Pool, parent, parent_ops
    836 #ifdef VBOXWDDM
     836#ifdef VBOX_WITH_WDDM
    837837            , shared_handle
    838838            , pvClientMem
    … …  
    879879        UINT Width, UINT Height, UINT Levels, DWORD Usage, WINED3DFORMAT Format, WINED3DPOOL Pool,
    880880        IWineD3DTexture **ppTexture, IUnknown *parent, const struct wined3d_parent_ops *parent_ops
    881 #ifdef VBOXWDDM
     881#ifdef VBOX_WITH_WDDM
    882882        , HANDLE *shared_handle
    883883        , void *pvClientMem
    … …  
    902902
    903903    hr = texture_init(object, Width, Height, Levels, This, Usage, Format, Pool, parent, parent_ops
    904 #ifdef VBOXWDDM
     904#ifdef VBOX_WITH_WDDM
    905905            , shared_handle
    906906            , pvClientMem
    … …  
    14401440    }
    14411441
    1442 #ifdef VBOXWDDM
     1442#ifdef VBOX_WITH_WDDM
    14431443    hr = IWineD3DDevice_CreateSurface((IWineD3DDevice *)This, bm.bmWidth, bm.bmHeight, WINED3DFMT_B5G6R5_UNORM, TRUE,
    14441444            FALSE, 0, &This->logo_surface, 0, WINED3DPOOL_DEFAULT, WINED3DMULTISAMPLE_NONE, 0, SURFACE_OPENGL,
    … …  
    62976297
    62986298static void delete_opengl_contexts(IWineD3DDevice *iface
    6299 #ifndef VBOXWDDM
     6299#ifndef VBOX_WITH_WDDM
    63006300        , IWineD3DSwapChainImpl *swapchain
    63016301#endif
    … …  
    63396339        context_destroy(This, This->contexts[0]);
    63406340    }
    6341 #ifndef VBOXWDDM
     6341#ifndef VBOX_WITH_WDDM
    63426342    HeapFree(GetProcessHeap(), 0, swapchain->context);
    63436343    swapchain->context = NULL;
    … …  
    63536353    IWineD3DSurfaceImpl *target;
    63546354
    6355 #ifndef VBOXWDDM
     6355#ifndef VBOX_WITH_WDDM
    63566356    /* Recreate the primary swapchain's context */
    63576357    swapchain->context = HeapAlloc(GetProcessHeap(), 0, sizeof(*swapchain->context));
    … …  
    63676367    {
    63686368        WARN("Failed to create context.\n");
    6369 #ifndef VBOXWDDM
     6369#ifndef VBOX_WITH_WDDM
    63706370        HeapFree(GetProcessHeap(), 0, swapchain->context);
    63716371#endif
    … …  
    63736373    }
    63746374
    6375 #ifndef VBOXWDDM
     6375#ifndef VBOX_WITH_WDDM
    63766376    swapchain->context[0] = context;
    63776377    swapchain->num_contexts = 1;
    … …  
    64116411    context_release(context);
    64126412    context_destroy(This, context);
    6413 #ifndef VBOXWDDM
     6413#ifndef VBOX_WITH_WDDM
    64146414    HeapFree(GetProcessHeap(), 0, swapchain->context);
    64156415    swapchain->num_contexts = 0;
    … …  
    64266426    TRACE("(%p)\n", This);
    64276427
    6428 #ifdef VBOXWDDM
     6428#ifdef VBOX_WITH_WDDM
    64296429    /* todo: implement multi-swapchain handlling!!! */
    64306430    Assert(0);
    … …  
    65196519
    65206520    delete_opengl_contexts(iface
    6521 #ifndef VBOXWDDM
     6521#ifndef VBOX_WITH_WDDM
    65226522            , swapchain
    65236523#endif
    … …  
    68606860}
    68616861
    6862 #ifdef VBOXWDDM
     6862#ifdef VBOX_WITH_WDDM
    68636863static HRESULT WINAPI IWineD3DDeviceImpl_Flush(IWineD3DDevice *iface)
    68646864{
    … …  
    70957095    IWineD3DDeviceImpl_AcquireFocusWindow,
    70967096    IWineD3DDeviceImpl_ReleaseFocusWindow,
    7097 #ifdef VBOXWDDM
     7097#ifdef VBOX_WITH_WDDM
    70987098    /* VBox WDDM extensions */
    70997099    IWineD3DDeviceImpl_Flush,
    … …  
    72077207void get_drawable_size_backbuffer(struct wined3d_context *context, UINT *width, UINT *height)
    72087208{
    7209 #ifdef VBOXWDDM
     7209#ifdef VBOX_WITH_WDDM
    72107210    IWineD3DSwapChainImpl *swapchain = context->currentSwapchain;
    72117211#else

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

    r31828 r32622  
    21822182    gl_info->supported[WINED3D_GL_EXT_NONE] = TRUE;
    21832183
    2184 #ifdef VBOXWDDM
     2184#ifdef VBOX_WITH_WDDM
    21852185    gl_info->supported[VBOX_SHARED_CONTEXTS] = TRUE;
    21862186#endif
    … …  
    50795079#ifdef USE_WIN32_OPENGL
    50805080#define USE_GL_FUNC(pfn) pfn = (void*)GetProcAddress(mod_gl, #pfn);
    5081 #ifdef VBOXWDDM
     5081#ifdef VBOX_WITH_WDDM
    50825082        BOOL (APIENTRY *pDrvValidateVersion)(DWORD) DECLSPEC_HIDDEN;
    50835083        mod_gl = LoadLibraryA("VBoxOGL.dll");
    … …  
    50895089            goto nogl_adapter;
    50905090        }
    5091 #ifdef VBOXWDDM
     5091#ifdef VBOX_WITH_WDDM
    50925092        /* init properly */
    50935093        pDrvValidateVersion = (void*)GetProcAddress(mod_gl, "DrvValidateVersion");

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

    r32461 r32622  
    126126    struct ps_compile_args      ps_args;
    127127    UINT                        constant_version;
    128 #ifdef VBOXWDDM
     128#ifdef VBOX_WITH_WDDM
    129129    UINT                        inp2Fixup_info;
    130130#else
    … …  
    133133};
    134134
    135 #ifdef VBOXWDDM
     135#ifdef VBOX_WITH_WDDM
    136136#define WINEFIXUPINFO_NOINDEX (~0UL)
    137137#define WINEFIXUPINFO_GET(_p) get_fixup_info((const IWineD3DPixelShaderImpl*)(_p)->pshader, (_p)->inp2Fixup_info)
    … …  
    688688}
    689689
    690 #ifdef VBOXWDDM
     690#ifdef VBOX_WITH_WDDM
    691691static const struct ps_np2fixup_info * get_fixup_info(const IWineD3DPixelShaderImpl *shader, UINT inp2fixup_info)
    692692{
    … …  
    773773{
    774774    const struct wined3d_gl_info *gl_info = context->gl_info;
    775 #ifdef VBOXWDDM
     775#ifdef VBOX_WITH_WDDM
    776776    IWineD3DDeviceImpl *device = context->device;
    777777#else
    … …  
    41834183        struct wined3d_shader_buffer *buffer, IWineD3DPixelShaderImpl *shader,
    41844184        const struct ps_compile_args *args,
    4185 #ifdef VBOXWDDM
     4185#ifdef VBOX_WITH_WDDM
    41864186        UINT *inp2fixup_info
    41874187#else
    … …  
    42154215        if(memcmp(&shader_data->gl_shaders[i].args, args, sizeof(*args)) == 0) {
    42164216            if(args->np2_fixup) {
    4217 #ifdef VBOXWDDM
     4217#ifdef VBOX_WITH_WDDM
    42184218                *inp2fixup_info = i;
    42194219#else
    … …  
    42554255    shader_buffer_clear(buffer);
    42564256    ret = shader_glsl_generate_pshader(context, buffer, shader, args, np2fixup);
    4257 #ifdef VBOXWDDM
     4257#ifdef VBOX_WITH_WDDM
    42584258    *inp2fixup_info = shader_data->num_gl_shaders;
    42594259#else
    … …  
    44344434        GLhandleARB pshader_id = find_glsl_pshader(context, &priv->shader_buffer,
    44354435                (IWineD3DPixelShaderImpl *)pshader, &ps_compile_args,
    4436 #ifdef VBOXWDDM
     4436#ifdef VBOX_WITH_WDDM
    44374437                &entry->inp2Fixup_info
    44384438#else
    … …  
    46204620{
    46214621    const struct wined3d_gl_info *gl_info = context->gl_info;
    4622 #ifdef VBOXWDDM
     4622#ifdef VBOX_WITH_WDDM
    46234623    IWineD3DDeviceImpl *device = context->device;
    46244624#else

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

    r31936 r32622  
    4040        IWineD3DDeviceImpl *device, UINT size, DWORD usage, const struct wined3d_format_desc *format_desc,
    4141        WINED3DPOOL pool, IUnknown *parent, const struct wined3d_parent_ops *parent_ops
    42 #ifdef VBOXWDDM
     42#ifdef VBOX_WITH_WDDM
    4343        , HANDLE *shared_handle
    4444        , void *pvClientMem
    … …  
    6060    list_init(&resource->privateData);
    6161
    62 #ifdef VBOXWDDM
     62#ifdef VBOX_WITH_WDDM
    6363    if (pool == WINED3DPOOL_SYSTEMMEM && pvClientMem)
    6464    {
    … …  
    6969#endif
    7070    {
    71 #ifdef VBOXWDDM
     71#ifdef VBOX_WITH_WDDM
    7272        if (pool == WINED3DPOOL_DEFAULT && shared_handle)
    7373        {

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

    r32545 r32622  
    357357        UINT multisample_quality, IWineD3DDeviceImpl *device, DWORD usage, WINED3DFORMAT format,
    358358        WINED3DPOOL pool, IUnknown *parent, const struct wined3d_parent_ops *parent_ops
    359 #ifdef VBOXWDDM
     359#ifdef VBOX_WITH_WDDM
    360360        , HANDLE *shared_handle
    361361        , void *pvClientMem
    … …  
    399399    hr = resource_init((IWineD3DResource *)surface, WINED3DRTYPE_SURFACE,
    400400            device, resource_size, usage, format_desc, pool, parent, parent_ops
    401 #ifdef VBOXWDDM
     401#ifdef VBOX_WITH_WDDM
    402402            , shared_handle
    403403            , pvClientMem
    … …  
    422422    /* Flags */
    423423    surface->Flags = SFLAG_NORMCOORD; /* Default to normalized coords. */
    424 #ifdef VBOXWDDM
     424#ifdef VBOX_WITH_WDDM
    425425    if (pool == WINED3DPOOL_SYSTEMMEM && pvClientMem)  surface->Flags |= SFLAG_CLIENTMEM;
    426426#endif
    … …  
    483483    }
    484484
    485 #ifdef VBOXWDDM
     485#ifdef VBOX_WITH_WDDM
    486486    if (VBOXSHRC_IS_SHARED(surface))
    487487    {
    … …  
    513513    IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface;
    514514
    515 #if defined(DEBUG_misha) && defined (VBOXWDDM)
     515#if defined(DEBUG_misha) && defined (VBOX_WITH_WDDM)
    516516    if (VBOXSHRC_IS_INITIALIZED(This))
    517517    {
    … …  
    551551    }
    552552
    553 #ifdef VBOXWDDM
     553#ifdef VBOX_WITH_WDDM
    554554    if (VBOXSHRC_IS_SHARED(This))
    555555    {
    … …  
    911911    }
    912912
    913 #ifdef VBOXWDDM
     913#ifdef VBOX_WITH_WDDM
    914914    if (!VBOXSHRC_IS_SHARED_OPENED(This))
    915915#endif
    … …  
    10201020}
    10211021
    1022 #ifdef VBOXWDDM
     1022#ifdef VBOX_WITH_WDDM
    10231023static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, DWORD flag, const RECT *rect);
    10241024#endif
    … …  
    20422042    ENTER_GL();
    20432043    glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE);
    2044 #ifdef VBOXWDDM
     2044#ifdef VBOX_WITH_WDDM
    20452045    if (!VBOXSHRC_IS_SHARED_OPENED(This))
    20462046#endif
    … …  
    21372137            IWineD3DSurfaceImpl *dds_primary;
    21382138            IWineD3DSwapChainImpl *swapchain;
    2139 #ifdef VBOXWDDM
     2139#ifdef VBOX_WITH_WDDM
    21402140            /* tmp work-around */
    21412141            swapchain = (IWineD3DSwapChainImpl *)This->resource.device->swapchains[This->resource.device->NumberOfSwapChains-1];
    … …  
    26572657        {
    26582658            if (!*name) {
    2659 #ifdef VBOXWDDM
     2659#ifdef VBOX_WITH_WDDM
    26602660                if (VBOXSHRC_IS_SHARED_OPENED(This))
    26612661                {
    … …  
    26662666                {
    26672667                    glGenTextures(1, name);
    2668 #ifdef VBOXWDDM
     2668#ifdef VBOX_WITH_WDDM
    26692669                    if (VBOXSHRC_IS_SHARED(This))
    26702670                    {
    … …  
    37923792        if (wined3d_settings.strict_draw_ordering || (dstSwapchain
    37933793                && ((IWineD3DSurface *)This == dstSwapchain->frontBuffer
    3794 #ifdef VBOXWDDM
     3794#ifdef VBOX_WITH_WDDM
    37953795                || dstSwapchain->device->numContexts > 1
    37963796#else
    … …  
    40284028}
    40294029
    4030 #ifdef VBOXWDDM
     4030#ifdef VBOX_WITH_WDDM
    40314031static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, DWORD flag, const RECT *rect);
    40324032#endif
    … …  
    43544354    }
    43554355
    4356 #ifdef VBOXWDDM
     4356#ifdef VBOX_WITH_WDDM
    43574357    if(VBOXSHRC_IS_INITIALIZED(This)) {
    43584358        /* with the shared resource only texture can be considered valid
    … …  
    44074407    if (wined3d_settings.strict_draw_ordering || (swapchain
    44084408            && ((IWineD3DSurface *)This == swapchain->frontBuffer
    4409 #ifdef VBOXWDDM
     4409#ifdef VBOX_WITH_WDDM
    44104410            || swapchain->device->numContexts > 1
    44114411#else
    … …  
    46734673    }
    46744674
    4675 #ifdef VBOXWDDM
     4675#ifdef VBOX_WITH_WDDM
    46764676    if (VBOXSHRC_IS_INITIALIZED(This))
    46774677    {

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

    r30916 r32622  
    849849    }
    850850
    851 #ifdef VBOXWDDM
     851#ifdef VBOX_WITH_WDDM
    852852    IWineD3DDevice_CreateSurface((IWineD3DDevice *)source->resource.device, source->currentDesc.Width,
    853853            source->currentDesc.Height, to_fmt, TRUE /* lockable */, TRUE /* discard  */, 0 /* level */, &ret,

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

    r32577 r32622  
    8383        This->backBuffer = NULL;
    8484    }
    85 #ifndef VBOXWDDM
     85#ifndef VBOX_WITH_WDDM
    8686    for (i = 0; i < This->num_contexts; ++i)
    8787    {
    … …  
    106106        }
    107107    }
    108 #ifdef VBOXWDDM
     108#ifdef VBOX_WITH_WDDM
    109109    if(This->device_window) {
    110110        ReleaseDC(This->device_window, This->hDC);
    … …  
    364364    }
    365365
    366 #ifdef VBOXWDDM
     366#ifdef VBOX_WITH_WDDM
    367367    if (This->device->numContexts > 1) wglFinish();
    368368#else
    … …  
    711711    swapchain->win_handle = window;
    712712    swapchain->device_window = window;
    713 #ifdef VBOXWDDM
     713#ifdef VBOX_WITH_WDDM
    714714    Assert(window);
    715715    swapchain->hDC = GetDC(window);
    … …  
    814814    }
    815815
    816 #ifndef VBOXWDDM
     816#ifndef VBOX_WITH_WDDM
    817817    swapchain->context = HeapAlloc(GetProcessHeap(), 0, sizeof(swapchain->context));
    818818    if (!swapchain->context)
    … …  
    848848        swapchain->ds_format = getFormatDescEntry(WINED3DFMT_D24_UNORM_S8_UINT, gl_info);
    849849
    850 #ifdef VBOXWDDM
     850#ifdef VBOX_WITH_WDDM
    851851        swapchainContext = context_find_create(device, swapchain, (IWineD3DSurfaceImpl *)swapchain->frontBuffer,
    852852                swapchain->ds_format);
    … …  
    862862            goto err;
    863863        }
    864 #ifdef VBOXWDDM
     864#ifdef VBOX_WITH_WDDM
    865865        context_release(swapchainContext);
    866866#else
    … …  
    870870    else
    871871    {
    872 #ifndef VBOXWDDM
     872#ifndef VBOX_WITH_WDDM
    873873        swapchain->context[0] = NULL;
    874874#endif
    … …  
    955955    }
    956956
    957 #ifdef VBOXWDDM
     957#ifdef VBOX_WITH_WDDM
    958958    if (!device->NumberOfSwapChains)
    959959    {
    … …  
    995995    }
    996996    context_release(ctx);
    997 #ifdef VBOXWDDM
     997#ifdef VBOX_WITH_WDDM
    998998    /* no need to do anything since context gets added to the device context list within the context_create call */
    999999#else

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

    r30657 r32622  
    103103    IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface;
    104104
    105 #ifdef VBOXWDDM
     105#ifdef VBOX_WITH_WDDM
    106106    if (iBackBuffer == ~0UL)
    107107    {

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

    r32577 r32622  
    8080    }
    8181
    82 #ifndef VBOXWDDM
     82#ifndef VBOX_WITH_WDDM
    8383    HeapFree(GetProcessHeap(), 0, This->context);
    8484#endif

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

    r32184 r32622  
    442442        IWineD3DDeviceImpl *device, DWORD usage, WINED3DFORMAT format, WINED3DPOOL pool,
    443443        IUnknown *parent, const struct wined3d_parent_ops *parent_ops
    444 #ifdef VBOXWDDM
     444#ifdef VBOX_WITH_WDDM
    445445        , HANDLE *shared_handle
    446446        , void *pvClientMem
    … …  
    514514    hr = basetexture_init((IWineD3DBaseTextureImpl *)texture, levels, WINED3DRTYPE_TEXTURE,
    515515            device, 0, usage, format_desc, pool, parent, parent_ops
    516 #ifdef VBOXWDDM
     516#ifdef VBOX_WITH_WDDM
    517517            , shared_handle, pvClientMem
    518518#endif
    … …  
    586586    for (i = 0; i < texture->baseTexture.levels; ++i)
    587587    {
    588 #ifdef VBOXWDDM
     588#ifdef VBOX_WITH_WDDM
    589589        /* Use the callback to create the texture surface. */
    590590        hr = IWineD3DDeviceParent_CreateSurface(device->device_parent, parent, tmp_w, tmp_h, format_desc->format,
    … …  
    618618    texture->baseTexture.internal_preload = texture_internal_preload;
    619619
    620 #ifdef VBOXWDDM
     620#ifdef VBOX_WITH_WDDM
    621621    if (VBOXSHRC_IS_SHARED(texture))
    622622    {

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

    r30916 r32622  
    409409    hr = resource_init((IWineD3DResource *)volume, WINED3DRTYPE_VOLUME, device,
    410410            width * height * depth * format_desc->byte_count, usage, format_desc, pool, parent, parent_ops
    411 #ifdef VBOXWDDM
     411#ifdef VBOX_WITH_WDDM
    412412            , NULL, NULL
    413413#endif

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

    r31828 r32622  
    411411    hr = basetexture_init((IWineD3DBaseTextureImpl *)texture, levels, WINED3DRTYPE_VOLUMETEXTURE,
    412412            device, 0, usage, format_desc, pool, parent, parent_ops
    413 #ifdef VBOXWDDM
     413#ifdef VBOX_WITH_WDDM
    414414        , NULL, NULL
    415415#endif

  • trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/wined3d_gl.h

    r31828 r32622  
    18431843    WGL_WINE_PIXEL_FORMAT_PASSTHROUGH,
    18441844
    1845 #ifdef VBOXWDDM
     1845#ifdef VBOX_WITH_WDDM
    18461846    VBOX_SHARED_CONTEXTS,
    18471847#endif
    … …  
    37733773        const PIXELFORMATDESCRIPTOR *ppfd);
    37743774
    3775 #ifdef VBOXWDDM
     3775#ifdef VBOX_WITH_WDDM
    37763776#define GL_SHARE_CONTEXT_RESOURCES_CR 0x8B27
    37773777typedef void (WINE_GLAPI *PGLFNCHROMIUMPARAMETERUCR)(GLenum param, GLint value);

  • trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/wined3d_private.h

    r32577 r32622  
    5454#include "wine/rbtree.h"
    5555
    56 #ifdef VBOXWDDM
     56#ifdef VBOX_WITH_WDDM
    5757# include "vboxsharedrc.h"
    5858#endif
    … …  
    10741074    DWORD isStateDirty[STATE_HIGHEST / (sizeof(DWORD) * CHAR_BIT) + 1]; /* Bitmap to find out quickly if a state is dirty */
    10751075
    1076 #ifdef VBOXWDDM
     1076#ifdef VBOX_WITH_WDDM
    10771077    IWineD3DDeviceImpl    *device;
    10781078    IWineD3DSwapChainImpl *currentSwapchain;
    … …  
    12461246struct wined3d_context *context_create(IWineD3DSwapChainImpl *swapchain, IWineD3DSurfaceImpl *target,
    12471247        const struct wined3d_format_desc *ds_format_desc) DECLSPEC_HIDDEN;
    1248 #ifdef VBOXWDDM
     1248#ifdef VBOX_WITH_WDDM
    12491249struct wined3d_context *context_find_create(IWineD3DDeviceImpl *device, IWineD3DSwapChainImpl *swapchain, IWineD3DSurfaceImpl *target,
    12501250        const struct wined3d_format_desc *ds_format_desc) DECLSPEC_HIDDEN;
    … …  
    18191819    BYTE                   *allocatedMemory; /* Pointer to the real data location */
    18201820    BYTE                   *heapMemory; /* Pointer to the HeapAlloced block of memory */
    1821 #ifdef VBOXWDDM
     1821#ifdef VBOX_WITH_WDDM
    18221822    DWORD                   sharerc_flags; /* shared resource flags */
    18231823    DWORD                   sharerc_handle;
    … …  
    18441844        IWineD3DDeviceImpl *device, UINT size, DWORD usage, const struct wined3d_format_desc *format_desc,
    18451845        WINED3DPOOL pool, IUnknown *parent, const struct wined3d_parent_ops *parent_ops
    1846 #ifdef VBOXWDDM
     1846#ifdef VBOX_WITH_WDDM
    18471847        , HANDLE *shared_handle
    18481848        , void *pvClientMem
    … …  
    19411941        IWineD3DDeviceImpl *device, UINT size, DWORD usage, const struct wined3d_format_desc *format_desc,
    19421942        WINED3DPOOL pool, IUnknown *parent, const struct wined3d_parent_ops *parent_ops
    1943 #ifdef VBOXWDDM
     1943#ifdef VBOX_WITH_WDDM
    19441944        , HANDLE *shared_handle
    19451945        , void *pvClientMem
    … …  
    19721972        IWineD3DDeviceImpl *device, DWORD usage, WINED3DFORMAT format, WINED3DPOOL pool,
    19731973        IUnknown *parent, const struct wined3d_parent_ops *parent_ops
    1974 #ifdef VBOXWDDM
     1974#ifdef VBOX_WITH_WDDM
    19751975        , HANDLE *shared_handle
    19761976        , void *pvClientMem
    … …  
    21662166        UINT multisample_quality, IWineD3DDeviceImpl *device, DWORD usage, WINED3DFORMAT format,
    21672167        WINED3DPOOL pool, IUnknown *parent, const struct wined3d_parent_ops *parent_ops
    2168 #ifdef VBOXWDDM
     2168#ifdef VBOX_WITH_WDDM
    21692169        , HANDLE *shared_handle
    21702170        , void *pvClientMem
    … …  
    22522252#define SFLAG_SWAPCHAIN     0x01000000 /* The surface is part of a swapchain */
    22532253
    2254 #ifdef VBOXWDDM
     2254#ifdef VBOX_WITH_WDDM
    22552255# define SFLAG_CLIENTMEM     0x10000000 /* SYSMEM surface using client-supplied memory buffer */
    22562256# define SFLAG_DONOTFREE_VBOXWDDM SFLAG_CLIENTMEM
    … …  
    26442644    unsigned int vSyncCounter;
    26452645
    2646 #ifndef VBOXWDDM
     2646#ifndef VBOX_WITH_WDDM
    26472647    struct wined3d_context **context;
    26482648    unsigned int            num_contexts;
    … …  
    26512651    HWND                    win_handle;
    26522652    HWND device_window;
    2653 #ifdef VBOXWDDM
     2653#ifdef VBOX_WITH_WDDM
    26542654    HDC hDC;
    26552655#endif

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

    r32620 r32622  
    4444VBoxDrvInst_DEFS    = _WIN32_WINNT=0x0400 _UNICODE UNICODE
    4545VBoxDrvInst_DEFS   += VBOX_SVN_REV=$(VBOX_SVN_REV)
    46 ifdef VBOXWDDM
    47  VBoxDrvInst_DEFS  += VBOXWDDM
     46ifdef VBOX_WITH_WDDM
     47 VBoxDrvInst_DEFS  += VBOX_WITH_WDDM
    4848endif
    4949VBoxDrvInst_DEPS    = $(VBOX_SVN_REV_KMK)
    … …  
    131131 endif
    132132endif
    133 ifdef VBOXWDDM
     133ifdef VBOX_WITH_WDDM
    134134 ifeq ($(KBUILD_TARGET_ARCH),x86)
    135135DRIVER_FILES += \
    … …  
    162162        -E 'VBOX_NSIS_ICON_FILE=$(subst /,\,$(VBOX_NSIS_ICON_FILE))' \
    163163        -E 'VBOX_WITH_CROGL=$(if $(VBOX_WITH_CROGL),1,0)' \
    164         -E 'VBOXWDDM=$(if $(VBOXWDDM),1,0)' \
     164        -E 'VBOX_WITH_WDDM=$(if $(VBOX_WITH_WDDM),1,0)' \
    165165        -E 'VBOX_BRAND_WIN_ADD_INST_DLGBMP=$(subst /,\,$(VBOX_BRAND_WIN_ADD_INST_DLGBMP))' \
    166166        -E 'VBOX_BRAND_LICENSE_RTF=$(subst /,\,$(VBOX_BRAND_LICENSE_RTF))' \

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

    r32250 r32622  
    6161#define EXIT_FAIL    (2)
    6262#define EXIT_USAGE   (3)
    63 #ifdef VBOXWDDM
     63#ifdef VBOX_WITH_WDDM
    6464#define EXIT_FALSE   (4)
    6565#endif
    … …  
    14651465}
    14661466
    1467 #ifdef VBOXWDDM
     1467#ifdef VBOX_WITH_WDDM
    14681468/*++
    14691469
    … …  
    22832283            }
    22842284        }
    2285 #ifdef VBOXWDDM
     2285#ifdef VBOX_WITH_WDDM
    22862286        else if (0 == _tcsicmp(argv[1], _T("/matchdrv")))
    22872287        {

  • trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditions.nsi

    r32503 r32622  
    692692Section /o $(VBOX_COMPONENT_D3D) SEC03
    693693
    694 !if $%VBOXWDDM% == "1"
     694!if $%VBOX_WITH_WDDM% == "1"
    695695  ${If} $g_bInstallWDDM == "true"
    696696    ; All D3D components are installed with WDDM driver package, nothing to be done here
    … …  
    892892  ${If} $0 == ${SF_SELECTED}
    893893
    894 !if $%VBOXWDDM% == "1"
     894!if $%VBOX_WITH_WDDM% == "1"
    895895  !if $%BUILD_TARGET_ARCH% == "x86"
    896896    ; If we're on a 32-bit Windows Vista / 7 also install the WDDM bits

  • trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsW2KXP.nsh

    r32603 r32622  
    185185
    186186!if $%VBOX_WITH_CROGL% == "1"
    187   !if $%VBOXWDDM% == "1"
     187  !if $%VBOX_WITH_WDDM% == "1"
    188188    !if $%BUILD_TARGET_ARCH% == "x86"
    189189      ${If} $g_bInstallWDDM == "true"
    … …  
    450450
    451451  Push $0
    452 !if $%VBOXWDDM% == "1"
     452!if $%VBOX_WITH_WDDM% == "1"
    453453  ; First check whether WDDM driver is installed
    454454  nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" /matchdrv "PCI\VEN_80EE&DEV_BEEF&SUBSYS_00000000&REV_00" "WDDM"'

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

    r31145 r32622  
    5555        $(VBOX_LIB_VBGL_R3)
    5656
    57 ifdef VBOXWDDM
    58  VBoxTray_DEFS   += VBOXWDDM
     57ifdef VBOX_WITH_WDDM
     58 VBoxTray_DEFS   += VBOX_WITH_WDDM
    5959 # VBoxTray_DEFS   += LOG_ENABLED
    6060 # we need only includes for PFND3DKMT stuff as all we link dynamicaly to it

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

    r31687 r32622  
    5151}
    5252
    53 #ifdef VBOXWDDM
     53#ifdef VBOX_WITH_WDDM
    5454static DWORD vboxDispIfSwitchToWDDM(PVBOXDISPIF pIf)
    5555{
    … …  
    264264        case VBOXDISPIF_MODE_XPDM:
    265265            return vboxDispIfEscapeXPDM(pIf, pEscape, cbData);
    266 #ifdef VBOXWDDM
     266#ifdef VBOX_WITH_WDDM
    267267        case VBOXDISPIF_MODE_WDDM:
    268268            return vboxDispIfEscapeWDDM(pIf, pEscape, cbData);
    … …  
    287287        case VBOXDISPIF_MODE_XPDM:
    288288            return vboxDispIfResizeXPDM(pIf, Id, Width, Height, BitsPerPixel);
    289 #ifdef VBOXWDDM
     289#ifdef VBOX_WITH_WDDM
    290290        case VBOXDISPIF_MODE_WDDM:
    291291            return vboxDispIfResizeWDDM(pIf, Id, Width, Height, BitsPerPixel);
    … …  
    375375                Log((__FUNCTION__": failed to switch to XPDM mode, err (%d)\n", err));
    376376            break;
    377 #ifdef VBOXWDDM
     377#ifdef VBOX_WITH_WDDM
    378378        case VBOXDISPIF_MODE_WDDM:
    379379        {

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

    r31145 r32622  
    1717
    1818#include <windows.h>
    19 #ifdef VBOXWDDM
     19#ifdef VBOX_WITH_WDDM
    2020# include <d3dkmthk.h>
    2121#endif
    … …  
    2828    VBOXDISPIF_MODE_XPDM_NT4 = 1,
    2929    VBOXDISPIF_MODE_XPDM
    30 #ifdef VBOXWDDM
     30#ifdef VBOX_WITH_WDDM
    3131    , VBOXDISPIF_MODE_WDDM
    3232#endif
    … …  
    5050            LONG (WINAPI * pfnChangeDisplaySettingsEx)(LPCSTR lpszDeviceName, LPDEVMODE lpDevMode, HWND hwnd, DWORD dwflags, LPVOID lParam);
    5151        } xpdm;
    52 #ifdef VBOXWDDM
     52#ifdef VBOX_WITH_WDDM
    5353        struct
    5454        {

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

    r32592 r32622  
    3939static VBOXDISPLAYCONTEXT gCtx = {0};
    4040
    41 #ifdef VBOXWDDM
     41#ifdef VBOX_WITH_WDDM
    4242static bool vboxWddmReinitVideoModes(VBOXDISPLAYCONTEXT *pCtx)
    4343{
    … …  
    8888        Log(("VBoxTray: VBoxDisplayInit: pfnEnumDisplayDevices = %p\n", gCtx.pfnEnumDisplayDevices));
    8989
    90 #ifdef VBOXWDDM
     90#ifdef VBOX_WITH_WDDM
    9191        if (OSinfo.dwMajorVersion >= 6)
    9292        {
    … …  
    129129}
    130130
    131 #ifdef VBOXWDDM
     131#ifdef VBOX_WITH_WDDM
    132132static VBOXDISPLAY_DRIVER_TYPE getVBoxDisplayDriverType(VBOXDISPLAYCONTEXT *pCtx)
    133133#else
    … …  
    135135#endif
    136136{
    137 #ifdef VBOXWDDM
     137#ifdef VBOX_WITH_WDDM
    138138    VBOXDISPLAY_DRIVER_TYPE enmType = VBOXDISPLAY_DRIVER_TYPE_UNKNOWN;
    139139#else
    … …  
    168168
    169169                if (strcmp(&dispDevice.DeviceString[0], "VirtualBox Graphics Adapter") == 0)
    170 #ifndef VBOXWDDM
     170#ifndef VBOX_WITH_WDDM
    171171                    result = true;
    172172#else
    … …  
    196196        /* Check for the short name, because all long stuff would be truncated */
    197197        if (strcmp((char*)&tempDevMode.dmDeviceName[0], "VBoxDisp") == 0)
    198 #ifndef VBOXWDDM
     198#ifndef VBOX_WITH_WDDM
    199199            result = true;
    200200#else
    … …  
    203203    }
    204204
    205 #ifndef VBOXWDDM
     205#ifndef VBOX_WITH_WDDM
    206206    return result;
    207207#else
    … …  
    532532                         * Only try to change video mode if the active display driver is VBox additions.
    533533                         */
    534 #ifdef VBOXWDDM
     534#ifdef VBOX_WITH_WDDM
    535535                        VBOXDISPLAY_DRIVER_TYPE enmDriverType = getVBoxDisplayDriverType (pCtx);
    536536
    … …  
    549549                                Log(("VBoxTray: VBoxDisplayThread: Detected W2K or later\n"));
    550550
    551 #ifdef  VBOXWDDM
     551#ifdef  VBOX_WITH_WDDM
    552552                                if (enmDriverType == VBOXDISPLAY_DRIVER_TYPE_WDDM)
    553553                                {

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

    r28800 r32622  
    2323void               VBoxDisplayDestroy (const VBOXSERVICEENV *pEnv, void *pInstance);
    2424
    25 #ifndef VBOXWDDM
     25#ifndef VBOX_WITH_WDDM
    2626static bool isVBoxDisplayDriverActive (void);
    2727#else

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

    r32588 r32622  
    421421    /* initializes disp-if to default (XPDM) mode */
    422422    status = VBoxDispIfInit(&svcEnv.dispIf);
    423 #ifdef VBOXWDDM
     423#ifdef VBOX_WITH_WDDM
    424424    /*
    425425     * For now the display mode will be adjusted to WDDM mode if needed

  • trunk/src/VBox/Additions/WINNT/include/VBoxDisplay.h

    r32425 r32622  
    2121#define VBOXESC_SETVISIBLEREGION            0xABCD9001
    2222#define VBOXESC_ISVRDPACTIVE                0xABCD9002
    23 #ifdef VBOXWDDM
     23#ifdef VBOX_WITH_WDDM
    2424# define VBOXESC_REINITVIDEOMODES           0xABCD9003
    2525# define VBOXESC_GETVBOXVIDEOCMCMD          0xABCD9004
    … …  
    4444#define VBOXWDDM_RECOMMENDVIDPN_SIZE(_c) (RT_OFFSETOF(VBOXWDDM_RECOMMENDVIDPN, aScreenInfos[_c]))
    4545
    46 #endif /* #ifdef VBOXWDDM */
     46#endif /* #ifdef VBOX_WITH_WDDM */
    4747
    4848typedef struct VBOXDISPIFESCAPE

  • trunk/src/VBox/Additions/common/crOpenGL/Makefile.kmk

    r32594 r32622  
    8686endif
    8787
    88 ifdef VBOXWDDM
     88ifdef VBOX_WITH_WDDM
    8989 VBoxOGL_DEFS.win += VBOX_WITH_WDDM
    9090 VBoxOGL_SDKS     += WINDDKWLH
    … …  
    9494#fixme?, INTERMEDIATES.win ain't working
    9595 VBoxOGL_INTERMEDIATES += $(VBOX_PATH_CROGL_GENFILES)/cr_gl.h
    96  if defined(VBOX_SIGNING_MODE) && defined(VBOXWDDM)
     96 if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_WDDM)
    9797  VBoxOGL_NOINST.win.x86 = true
    9898 endif
    … …  
    359359        $(VBOX_MESA_INCS)
    360360endif
    361 if defined(VBOX_SIGNING_MODE) && defined(VBOXWDDM)
     361if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_WDDM)
    362362 VBoxOGLarrayspu_NOINST.win.x86 = true
    363363endif
    … …  
    388388        $(VBOX_MESA_INCS)
    389389endif
    390 if defined(VBOX_SIGNING_MODE) && defined(VBOXWDDM)
     390if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_WDDM)
    391391 VBoxOGLpassthroughspu_NOINST.win.x86 = true
    392392endif
    … …  
    420420        $(VBOX_MESA_INCS)
    421421endif
    422 if defined(VBOX_SIGNING_MODE) && defined(VBOXWDDM)
     422if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_WDDM)
    423423 VBoxOGLpackspu_NOINST.win.x86 = true
    424424endif
    … …  
    493493        $(VBOX_MESA_INCS)
    494494endif
    495 if defined(VBOX_SIGNING_MODE) && defined(VBOXWDDM)
     495if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_WDDM)
    496496 VBoxOGLfeedbackspu_NOINST.win.x86 = true
    497497endif

  • trunk/src/VBox/Devices/Graphics/DevVGA.cpp

    r32502 r32622  
    56615661
    56625662    if (    uVersion != VGA_SAVEDSTATE_VERSION
    5663 #ifdef VBOXWDDM
     5663#ifdef VBOX_WITH_WDDM
    56645664        &&  uVersion != VGA_SAVEDSTATE_VERSION_PRE_WDDM
    56655665#endif

  • trunk/src/VBox/Devices/Graphics/DevVGA.h

    r32241 r32622  
    408408    /** Base port in the assigned PCI I/O space. */
    409409    RTIOPORT                    IOPortBase;
    410 #ifdef VBOXWDDM
     410#ifdef VBOX_WITH_WDDM
    411411    uint8_t                     Padding7[2];
    412412    /* specifies guest driver caps, i.e. whether it can handle IRQs from the adapter,

  • trunk/src/VBox/Devices/Graphics/DevVGASavedState.h

    r32241 r32622  
    2323#define ___Graphics_DevVGASavedState_h
    2424
    25 #ifdef VBOXWDDM
     25#ifdef VBOX_WITH_WDDM
    2626#define VGA_SAVEDSTATE_VERSION              7
    2727#define VGA_SAVEDSTATE_VERSION_PRE_WDDM     6

  • trunk/src/VBox/Devices/Graphics/DevVGA_VBVA.cpp

    r32585 r32622  
    12481248
    12491249        Assert(pCmd->Flags & VBOXVHWACMD_FLAG_HG_ASYNCH);
    1250 #ifdef VBOXWDDM
     1250#ifdef VBOX_WITH_WDDM
    12511251        if (pVGAState->fGuestCaps & VBVACAPS_COMPLETEGCMD_BY_IOREAD)
    12521252        {
    … …  
    13431343static DECLCALLBACK(void) vbvaNotifyGuest (void *pvCallback)
    13441344{
    1345 #if defined(VBOX_WITH_HGSMI) && (defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOXVDMA) || defined(VBOXWDDM))
     1345#if defined(VBOX_WITH_HGSMI) && (defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOXVDMA) || defined(VBOX_WITH_WDDM))
    13461346    PVGASTATE pVGAState = (PVGASTATE)pvCallback;
    13471347    PPDMDEVINS pDevIns = pVGAState->pDevInsR3;
    … …  
    16391639#endif
    16401640
    1641 #ifdef VBOXWDDM
     1641#ifdef VBOX_WITH_WDDM
    16421642        case VBVA_INFO_CAPS:
    16431643        {

  • trunk/src/VBox/Devices/Graphics/HGSMI/HGSMIHost.cpp

    r32260 r32622  
    148148    HGSMILIST hostFIFOProcessed;       /* Processed by the guest. */
    149149    HGSMILIST hostFIFOFree;            /* Buffers for reuse. */
    150 #ifdef VBOXWDDM
     150#ifdef VBOX_WITH_WDDM
    151151    HGSMILIST guestCmdCompleted;       /* list of completed guest commands to be returned to the guest*/
    152152#endif
    … …  
    210210static DECLCALLBACK(void) hgsmiHostCommandFreeCallback (void *pvCallback);
    211211
    212 #ifdef VBOXWDDM
     212#ifdef VBOX_WITH_WDDM
    213213
    214214typedef struct _HGSMIGUESTCOMPLENTRY
    … …  
    369369}
    370370
    371 #ifdef VBOXWDDM
     371#ifdef VBOX_WITH_WDDM
    372372static HGSMIOFFSET hgsmiProcessGuestCmdCompletion(HGSMIINSTANCE *pIns)
    373373{
    … …  
    414414    VM_ASSERT_EMT(pIns->pVM);
    415415
    416 #ifndef VBOXWDDM
     416#ifndef VBOX_WITH_WDDM
    417417    /* Currently there is no functionality here. */
    418418    NOREF(pIns);
    … …  
    12591259            rc = hgsmiHostSaveFifoLocked (&pIns->hostFIFORead, pSSM); AssertRC(rc);
    12601260            rc = hgsmiHostSaveFifoLocked (&pIns->hostFIFOProcessed, pSSM); AssertRC(rc);
    1261 #ifdef VBOXWDDM
     1261#ifdef VBOX_WITH_WDDM
    12621262            rc = hgsmiHostSaveFifoLocked (&pIns->guestCmdCompleted, pSSM); AssertRC(rc);
    12631263#endif
    … …  
    13251325                if (RT_SUCCESS(rc))
    13261326                    rc = hgsmiHostLoadFifoLocked (pIns, &pIns->hostFIFOProcessed, pSSM);
    1327 #ifdef VBOXWDDM
     1327#ifdef VBOX_WITH_WDDM
    13281328                if (RT_SUCCESS(rc) && u32Version > VGA_SAVEDSTATE_VERSION_PRE_WDDM)
    13291329                    rc = hgsmiHostLoadFifoLocked (pIns, &pIns->hostFIFOProcessed, pSSM);
    … …  
    16501650    while(hgsmiProcessHostCmdCompletion (pIns, 0, true)) {}
    16511651
    1652 #ifdef VBOXWDDM
     1652#ifdef VBOX_WITH_WDDM
    16531653    while(hgsmiProcessGuestCmdCompletion(pIns) != HGSMIOFFSET_VOID) {}
    16541654#endif
    … …  
    16881688}
    16891689
    1690 #ifdef VBOXWDDM
     1690#ifdef VBOX_WITH_WDDM
    16911691
    16921692static int hgsmiGuestCommandComplete (HGSMIINSTANCE *pIns, HGSMIOFFSET offMem)

  • trunk/src/VBox/Devices/Graphics/HGSMI/HGSMIHost.h

    r32241 r32622  
    132132int HGSMIHostSaveStateExec (PHGSMIINSTANCE pIns, PSSMHANDLE pSSM);
    133133
    134 #ifdef VBOXWDDM
     134#ifdef VBOX_WITH_WDDM
    135135int HGSMICompleteGuestCommand(PHGSMIINSTANCE pIns, void *pvMem, bool bDoIrq);
    136136#endif

  • trunk/src/VBox/Devices/Makefile.kmk

    r32536 r32622  
    342342
    343343endif
    344 ifdef VBOXWDDM
    345  DevicesR3_DEFS        += VBOXWDDM
     344ifdef VBOX_WITH_WDDM
     345 DevicesR3_DEFS        += VBOX_WITH_WDDM
    346346 DevicesR3_SOURCES      += \
    347347        Graphics/HGSMI/SHGSMIHost.cpp
    … …  
    571571  VBoxDDGC_DEFS        += VBOX_WITH_HGSMI
    572572 endif
    573  ifdef VBOXWDDM
    574   VBoxDDGC_DEFS        += VBOXWDDM
     573 ifdef VBOX_WITH_WDDM
     574  VBoxDDGC_DEFS        += VBOX_WITH_WDDM
    575575 endif
    576576 ifdef VBOXWDDM_WITH_VBVA
    … …  
    596596  VBoxDDGC_DEFS        += VBOX_WITH_HGSMI
    597597 endif
    598  ifdef VBOXWDDM
    599   VBoxDDGC_DEFS        += VBOXWDDM
     598 ifdef VBOX_WITH_WDDM
     599  VBoxDDGC_DEFS        += VBOX_WITH_WDDM
    600600 endif
    601601 ifdef VBOXWDDM_WITH_VBVA
    … …  
    682682 VBoxDDR0_DEFS         += VBOX_WITH_HGSMI
    683683endif
    684 ifdef VBOXWDDM
    685  VBoxDDR0_DEFS         += VBOXWDDM
     684ifdef VBOX_WITH_WDDM
     685 VBoxDDR0_DEFS         += VBOX_WITH_WDDM
    686686endif
    687687ifdef VBOXWDDM_WITH_VBVA
    … …  
    728728 VBoxDDR0_DEFS         += VBOX_WITH_VIDEOHWACCEL
    729729endif
    730 ifdef VBOXWDDM
    731  VBoxDDR0_DEFS         += VBOXWDDM
     730ifdef VBOX_WITH_WDDM
     731 VBoxDDR0_DEFS         += VBOX_WITH_WDDM
    732732endif
    733733ifdef VBOXWDDM_WITH_VBVA

  • trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

    r32483 r32622  
    145145 VirtualBox_DEFS        += VBOX_WITH_VIRTIO
    146146endif
    147 ifdef VBOXWDDM
    148  VirtualBox_DEFS        += VBOXWDDM
     147ifdef VBOX_WITH_WDDM
     148 VirtualBox_DEFS        += VBOX_WITH_WDDM
    149149endif
    150150ifdef VBOX_BLEEDING_EDGE

  • trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp

    r32150 r32622  
    24262426}
    24272427
    2428 #ifdef VBOXWDDM
     2428#ifdef VBOX_WITH_WDDM
    24292429int VBoxVHWAImage::vhwaSurfaceGetInfo(struct _VBOXVHWACMD_SURF_GETINFO *pCmd)
    24302430{
    … …  
    27262726    }
    27272727
    2728 #ifdef VBOXWDDM
     2728#ifdef VBOX_WITH_WDDM
    27292729    if(pCmd->u.in.xUpdatedSrcMemValid)
    27302730    {
    … …  
    39243924        case FOURCC_AYUV:
    39253925            mBitsPerPixel = 32;
    3926 #ifdef VBOXWDDM
     3926#ifdef VBOX_WITH_WDDM
    39273927            mBitsPerPixelMem = 32;
    39283928#endif
    … …  
    39323932        case FOURCC_YUY2:
    39333933            mBitsPerPixel = 16;
    3934 #ifdef VBOXWDDM
     3934#ifdef VBOX_WITH_WDDM
    39353935            mBitsPerPixelMem = 16;
    39363936#endif
    … …  
    39393939        case FOURCC_YV12:
    39403940            mBitsPerPixel = 8;
    3941 #ifdef VBOXWDDM
     3941#ifdef VBOX_WITH_WDDM
    39423942            mBitsPerPixelMem = 12;
    39433943#endif
    … …  
    39483948            mBitsPerPixel = 0;
    39493949            mBitsPerPixelTex = 0;
    3950 #ifdef VBOXWDDM
     3950#ifdef VBOX_WITH_WDDM
    39513951            mBitsPerPixelMem = 0;
    39523952#endif
    … …  
    39603960    mBitsPerPixel = bitsPerPixel;
    39613961    mBitsPerPixelTex = bitsPerPixel;
    3962 #ifdef VBOXWDDM
     3962#ifdef VBOX_WITH_WDDM
    39633963    mBitsPerPixelMem = bitsPerPixel;
    39643964#endif
    … …  
    40204020            mBitsPerPixel = 0;
    40214021            mBitsPerPixelTex = 0;
    4022 #ifdef VBOXWDDM
     4022#ifdef VBOX_WITH_WDDM
    40234023            mBitsPerPixelMem = 0;
    40244024#endif
    … …  
    46654665            pCmd->rc = vhwaConstruct(pBody);
    46664666        } break;
    4667 #ifdef VBOXWDDM
     4667#ifdef VBOX_WITH_WDDM
    46684668        case VBOXVHWACMD_TYPE_SURF_GETINFO:
    46694669        {

  • trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.h

    r31698 r32622  
    232232    uint32_t bitsPerPixel() const { return mBitsPerPixel; }
    233233    uint32_t bitsPerPixelTex() const { return mBitsPerPixelTex; }
    234 #ifdef VBOXWDDM
     234#ifdef VBOX_WITH_WDDM
    235235    uint32_t bitsPerPixelMem() const { return mBitsPerPixelMem; }
    236236#endif
    … …  
    270270    uint32_t mBitsPerPixel;
    271271    uint32_t mBitsPerPixelTex;
    272 #ifdef VBOXWDDM
     272#ifdef VBOX_WITH_WDDM
    273273    uint32_t mBitsPerPixelMem;
    274274#endif
    … …  
    14851485    int vhwaSurfaceCanCreate(struct _VBOXVHWACMD_SURF_CANCREATE *pCmd);
    14861486    int vhwaSurfaceCreate(struct _VBOXVHWACMD_SURF_CREATE *pCmd);
    1487 #ifdef VBOXWDDM
     1487#ifdef VBOX_WITH_WDDM
    14881488    int vhwaSurfaceGetInfo(struct _VBOXVHWACMD_SURF_GETINFO *pCmd);
    14891489#endif

  • trunk/src/VBox/GuestHost/OpenGL/Makefile.kmk

    r32612 r32622  
    4141#
    4242VBoxOGLcrutil_TEMPLATE      = VBOXCROGLR3GUESTDLL
    43 if defined(VBOX_SIGNING_MODE) && defined(VBOXWDDM)
     43if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_WDDM)
    4444# VBoxOGLcrutil_NOINST.win.x86 = true
    4545endif
    … …  
    100100VBoxOGLhostcrutil_EXTENDS  = VBoxOGLcrutil
    101101VBoxOGLhostcrutil_TEMPLATE = VBOXCROGLR3HOSTDLL
    102 if defined(VBOX_SIGNING_MODE) && defined(VBOXWDDM)
     102if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_WDDM)
    103103 # need to reset the NOINST flag
    104104 # VBoxOGLhostcrutil_NOINST.win.x86 = false
    … …  
    482482#
    483483VBoxOGLerrorspu_TEMPLATE = VBOXCROGLR3GUESTDLL
    484 if defined(VBOX_SIGNING_MODE) && defined(VBOXWDDM)
     484if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_WDDM)
    485485# VBoxOGLerrorspu_NOINST.win.x86 = true
    486486endif
    … …  
    507507VBoxOGLhosterrorspu_EXTENDS  = VBoxOGLerrorspu
    508508VBoxOGLhosterrorspu_TEMPLATE = VBOXCROGLR3HOSTDLL
    509 if defined(VBOX_SIGNING_MODE) && defined(VBOXWDDM)
     509if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_WDDM)
    510510 # need to reset the NOINST flag
    511511 # VBoxOGLhosterrorspu_NOINST.win.x86 = false
Note: See TracChangeset for help on using the changeset viewer.

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