VirtualBox

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


Ignore:
Timestamp:
Dec 24, 2010 3:42:36 PM (14 years ago)
Author:
vboxsync
Message:
  1. wddm: 64bit support 2. wddm: installation fixes (64bit support, unsigned driver warning) 3. propper fix for #5438 (compile with disabled CROGL)
Location:
trunk/src/VBox/Additions/WINNT
Files:
22 edited

Legend:

Unmodified
Added
Removed

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

    r34987 r35319  
    119119DLLS.amd64 += VBoxDispD3D-x86
    120120VBoxDispD3D-x86_EXTENDS = VBoxDispD3D
    121 VBoxDispD3D-x86_NAME = VBoxDispD3D32
    122121VBoxDispD3D-x86_BLD_TRG_ARCH = x86
    123122VBoxDispD3D-x86_LIBS = \
    124123        $(VBOX_LIB_IPRT_GUEST_R3_X86) \
    125124        $(VBOX_LIB_VBGL_R3_X86)
    126 
     125VBoxDispD3D-x86_DEFS = $(VBoxDispD3D_DEFS) VBOX_WDDM_WOW64
    127126 ifdef VBOX_WITH_CRHGSMI
    128127#
    129 # VBoxCrHgsmi
     128# VBoxCrHgsmi - Chromium HGSMI API library
    130129#
    131130LIBRARIES += VBoxCrHgsmi
    … …  
    136135        wddm/VBoxUhgsmiKmt.cpp
    137136VBoxCrHgsmi_SDKS        = WINDDKWLH
     137
     138LIBRARIES.amd64 += VBoxCrHgsmi-x86
     139VBoxCrHgsmi-x86_EXTENDS = VBoxCrHgsmi
     140VBoxCrHgsmi-x86_BLD_TRG_ARCH = x86
     141VBoxCrHgsmi-x86_DEFS = $(VBoxCrHgsmi_DEFS) VBOX_WDDM_WOW64
    138142 endif
    139143endif

  • trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxDispD3D.cpp

    r35121 r35319  
    55225522                    pAllocInfo->enmType = VBOXWDDM_ALLOC_TYPE_UMD_RC_GENERIC;
    55235523                    pAllocInfo->fFlags = pResource->Flags;
    5524                     pAllocInfo->hSharedHandle = pAllocation->hSharedHandle;
     5524                    pAllocInfo->hSharedHandle = (uint64_t)pAllocation->hSharedHandle;
    55255525                    pAllocInfo->SurfDesc.width = pSurf->Width;
    55265526                    pAllocInfo->SurfDesc.height = pSurf->Height;
    … …  
    74847484                    pAllocation->hAllocation = pOAI->hAllocation;
    74857485                    pAllocation->enmType = pAllocInfo->enmType;
    7486                     pAllocation->hSharedHandle = pAllocInfo->hSharedHandle;
     7486                    pAllocation->hSharedHandle = (HANDLE)pAllocInfo->hSharedHandle;
    74877487                    pAllocation->SurfDesc = pAllocInfo->SurfDesc;
    74887488                    Assert(pAllocation->hSharedHandle);

  • trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxDispD3D.def

    r33116 r35319  
    1515; */
    1616
    17 LIBRARY VBoxDispD3D
    18 
    1917EXPORTS
    2018        OpenAdapter

  • trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxDispD3D.rc

    r34987 r35319  
    4949         VALUE "InternalName",     "VBoxDispD3D\0"
    5050         VALUE "LegalCopyright",   VBOX_RC_LEGAL_COPYRIGHT
     51#ifdef VBOX_WDDM_WOW64
     52         VALUE "OriginalFilename", "VBoxDispD3D-x86.dll\0"
     53#else
    5154         VALUE "OriginalFilename", "VBoxDispD3D.dll\0"
     55#endif
    5256         VALUE "ProductName",      VBOX_PRODUCT " Guest Additions\0"
    5357         VALUE "ProductVersion",   VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0"

  • trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxDispD3DIf.cpp

    r33836 r35319  
    2727HRESULT VBoxDispD3DOpen(VBOXDISPD3D *pD3D)
    2828{
     29#ifdef VBOX_WDDM_WOW64
     30    pD3D->hD3DLib = LoadLibraryW(L"VBoxD3D9wddm-x86.dll");
     31#else
    2932    pD3D->hD3DLib = LoadLibraryW(L"VBoxD3D9wddm.dll");
     33#endif
    3034    Assert(pD3D->hD3DLib);
    3135    if (pD3D->hD3DLib)

  • trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxUhgsmiKmt.cpp

    r34987 r35319  
    143143        Buf.AllocInfo.enmType = VBOXWDDM_ALLOC_TYPE_UMD_HGSMI_BUFFER;
    144144        Buf.AllocInfo.cbBuffer = cbBuf;
    145         Buf.AllocInfo.hSynch = hSynch;
     145        Buf.AllocInfo.hSynch = (uint64_t)hSynch;
    146146        Buf.AllocInfo.enmSynchType = enmSynchType;
    147147
    … …  
    226226{
    227227    PVBOXUHGSMI_BUFFER_PRIVATE_KMT_ESC pBuffer = VBOXUHGSMIKMTESC_GET_BUFFER(pBuf);
    228     *pvLock = pBuffer->Alloc.pvData + offLock;
     228    *pvLock = (void*)(pBuffer->Alloc.pvData + offLock);
    229229    return VINF_SUCCESS;
    230230}
    … …  
    306306        Buf.AllocInfo.EscapeHdr.escapeCode = VBOXESC_UHGSMI_ALLOCATE;
    307307        Buf.AllocInfo.Alloc.cbData = cbBuf;
    308         Buf.AllocInfo.Alloc.hSynch = hSynch;
     308        Buf.AllocInfo.Alloc.hSynch = (uint64_t)hSynch;
    309309        Buf.AllocInfo.Alloc.enmSynchType = enmSynchType;
    310310
    … …  
    612612        {
    613613            DWORD winEr = GetLastError();
     614#ifdef DEBUG_misha
    614615            Assert(0);
     616#endif
     617            Log((__FUNCTION__": EnumDisplayDevices failed, winEr (%d)\n", winEr));
    615618            hr = HRESULT_FROM_WIN32(winEr);
    616619            Assert(FAILED(hr));

  • trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/dbg/VBoxVideoWinDbg.cpp

    r31885 r35319  
    9999    ULONG64 u64Height;
    100100    ULONG64 u64Bpp = 32;
     101    ULONG64 u64NumColors = 3;
    101102    ULONG64 u64Pitch;
    102103    ULONG64 u64DefaultPitch;
    … …  
    114115    if (!GetExpressionEx(pExpr, &u64Height, &pExpr)) { dprintf("error evaluating height\n"); return; }
    115116    if (!u64Height) { dprintf("height value can not be NULL\n"); return; }
     117
     118    if (pExpr && GetExpressionEx(pExpr, &u64NumColors, &pExpr))
     119    {
     120        if (!u64NumColors) { dprintf("Num Colors value can not be NULL\n"); return; }
     121    }
    116122
    117123    if (pExpr && GetExpressionEx(pExpr, &u64Bpp, &pExpr))
    … …  
    180186        if (uRc)
    181187        {
     188            switch (u64Bpp)
     189            {
     190                case 32:
     191                case 24:
     192                case 16:
     193                    if (u64NumColors != 3)
     194                    {
     195                        dprintf("WARNING: unsupported number colors: (%d)\n", u64NumColors);
     196                    }
     197                    break;
     198                case 8:
     199                    {
     200                        if (u64NumColors == 1)
     201                        {
     202                            ULONG64 cbSize32 = u64DefaultPitch * 4 * u64Height;
     203                            PVOID pvBuf32 = malloc(cbSize32);
     204                            if (pvBuf32)
     205                            {
     206                                byte* pByteBuf32 = (byte*)pvBuf32;
     207                                byte* pByteBuf = (byte*)pvBuf;
     208                                memset(pvBuf32, 0, cbSize32);
     209                                for (UINT i = 0; i < u64Height; ++i)
     210                                {
     211                                    for (UINT j = 0; j < u64Width; ++j)
     212                                    {
     213                                        pByteBuf32[0] = pByteBuf[0];
     214                                        pByteBuf32[1] = pByteBuf[0];
     215                                        pByteBuf32[2] = pByteBuf[0];
     216                                        pByteBuf32 += 4;
     217                                        pByteBuf += 1;
     218                                    }
     219                                }
     220                                free(pvBuf);
     221                                pvBuf = pvBuf32;
     222                                u64DefaultPitch *= 4;
     223                                u64Bpp *= 4;
     224                            }
     225                        }
     226                        else
     227                        {
     228                            dprintf("WARNING: unsupported number colors: (%d)\n", u64NumColors);
     229                        }
     230                    }
     231                    break;
     232            }
    182233            BITMAP Bmp = {0};
    183234            HBITMAP hBmp;

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

    r34987 r35319  
    6565ifdef VBOX_WITH_WDDM
    6666VBOXWDDM_WITH_DISPD3D = 1
    67 ifeq ($(KBUILD_TARGET_ARCH), x86)
    68 VBOXWDDM_WITH_GL = 1
    69 endif
     67 ifdef VBOX_WITH_CROGL
     68  VBOXWDDM_WITH_GL = 1
     69 endif
    7070
    7171#
    … …  
    8888 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D.dll
    8989VBoxVideoWddm-inf_SOURCES.amd64 += \
    90  $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D32.dll
     90 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D-x86.dll
    9191endif
    9292
    … …  
    9696 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxD3D9wddm.dll \
    9797 $(PATH_TARGET)/VBoxVideoWddmCat.dir/wined3dwddm.dll \
    98  $(PATH_TARGET)/VBoxVideoWddmCat.dir/libWine.dll \
    9998 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu.dll \
    10099 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil.dll \
    … …  
    104103 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu.dll
    105104VBoxVideoWddm-inf_SOURCES.amd64 += \
    106  $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL32.dll \
    107  $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxD3D9wddm32.dll \
    108  $(PATH_TARGET)/VBoxVideoWddmCat.dir/wined3dwddm32.dll \
    109  $(PATH_TARGET)/VBoxVideoWddmCat.dir/libWine32.dll \
    110  $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu32.dll \
    111  $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil32.dll \
    112  $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLerrorspu32.dll \
    113  $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLfeedbackspu32.dll \
    114  $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpackspu32.dll \
    115  $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu32.dll
     105 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL-x86.dll \
     106 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxD3D9wddm-x86.dll \
     107 $(PATH_TARGET)/VBoxVideoWddmCat.dir/wined3dwddm-x86.dll \
     108 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu-x86.dll \
     109 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil-x86.dll \
     110 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLerrorspu-x86.dll \
     111 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLfeedbackspu-x86.dll \
     112 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpackspu-x86.dll \
     113 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu-x86.dll
    116114endif
    117115
    … …  
    136134
    137135 ifeq ($(KBUILD_TARGET_ARCH),amd64)
    138 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D32.dll: $$(TARGET_VBoxDispD3D-x86) | $$(call DIRDEP,$$(@D))
     136$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D-x86.dll: $$(TARGET_VBoxDispD3D-x86) | $$(call DIRDEP,$$(@D))
    139137        $(INSTALL) -m 644 $< $(@D)
    140138 endif
    … …  
    151149        $(INSTALL) -m 644 $< $(@D)
    152150
    153 $(PATH_TARGET)/VBoxVideoWddmCat.dir/libWine.dll: $$(TARGET_libWine) | $$(call DIRDEP,$$(@D))
    154         $(INSTALL) -m 644 $< $(@D)
    155 
    156151$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu.dll: $$(TARGET_VBoxOGLarrayspu) | $$(call DIRDEP,$$(@D))
    157152        $(INSTALL) -m 644 $< $(@D)
    … …  
    173168
    174169 ifeq ($(KBUILD_TARGET_ARCH), amd64)
    175 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL64.dll: $$(TARGET_VBoxOGL64) | $$(call DIRDEP,$$(@D))
    176         $(INSTALL) -m 644 $< $(@D)
    177 
    178 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxD3D964.dll: $$(TARGET_VBoxD3D964) | $$(call DIRDEP,$$(@D))
    179         $(INSTALL) -m 644 $< $(@D)
    180 
    181 $(PATH_TARGET)/VBoxVideoWddmCat.dir/wined3dwddm32.dll: $$(TARGET_wined3dwddm32) | $$(call DIRDEP,$$(@D))
    182         $(INSTALL) -m 644 $< $(@D)
    183 
    184 $(PATH_TARGET)/VBoxVideoWddmCat.dir/libWine64.dll: $$(TARGET_libWine64) | $$(call DIRDEP,$$(@D))
    185         $(INSTALL) -m 644 $< $(@D)
    186 
    187 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu64.dll: $$(TARGET_VBoxOGLarrayspu64) | $$(call DIRDEP,$$(@D))
    188         $(INSTALL) -m 644 $< $(@D)
    189 
    190 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil64.dll: $$(TARGET_VBoxOGLcrutil64) | $$(call DIRDEP,$$(@D))
    191         $(INSTALL) -m 644 $< $(@D)
    192 
    193 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLerrorspu64.dll: $$(TARGET_VBoxOGLerrorspu64) | $$(call DIRDEP,$$(@D))
    194         $(INSTALL) -m 644 $< $(@D)
    195 
    196 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLfeedbackspu64.dll: $$(TARGET_VBoxOGLfeedbackspu64) | $$(call DIRDEP,$$(@D))
    197         $(INSTALL) -m 644 $< $(@D)
    198 
    199 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpackspu64.dll: $$(TARGET_VBoxOGLpackspu64) | $$(call DIRDEP,$$(@D))
    200         $(INSTALL) -m 644 $< $(@D)
    201 
    202 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu64.dll: $$(TARGET_VBoxOGLpassthroughspu64) | $$(call DIRDEP,$$(@D))
     170$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL-x86.dll: $$(TARGET_VBoxOGL-x86) | $$(call DIRDEP,$$(@D))
     171        $(INSTALL) -m 644 $< $(@D)
     172
     173$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxD3D9wddm-x86.dll: $$(TARGET_VBoxD3D9wddm-x86) | $$(call DIRDEP,$$(@D))
     174        $(INSTALL) -m 644 $< $(@D)
     175
     176$(PATH_TARGET)/VBoxVideoWddmCat.dir/wined3dwddm-x86.dll: $$(TARGET_wined3dwddm-x86) | $$(call DIRDEP,$$(@D))
     177        $(INSTALL) -m 644 $< $(@D)
     178
     179$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu-x86.dll: $$(TARGET_VBoxOGLarrayspu-x86) | $$(call DIRDEP,$$(@D))
     180        $(INSTALL) -m 644 $< $(@D)
     181
     182$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil-x86.dll: $$(TARGET_VBoxOGLcrutil-x86) | $$(call DIRDEP,$$(@D))
     183        $(INSTALL) -m 644 $< $(@D)
     184
     185$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLerrorspu-x86.dll: $$(TARGET_VBoxOGLerrorspu-x86) | $$(call DIRDEP,$$(@D))
     186        $(INSTALL) -m 644 $< $(@D)
     187
     188$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLfeedbackspu-x86.dll: $$(TARGET_VBoxOGLfeedbackspu-x86) | $$(call DIRDEP,$$(@D))
     189        $(INSTALL) -m 644 $< $(@D)
     190
     191$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpackspu-x86.dll: $$(TARGET_VBoxOGLpackspu-x86) | $$(call DIRDEP,$$(@D))
     192        $(INSTALL) -m 644 $< $(@D)
     193
     194$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu-x86.dll: $$(TARGET_VBoxOGLpassthroughspu-x86) | $$(call DIRDEP,$$(@D))
    203195        $(INSTALL) -m 644 $< $(@D)
    204196 endif
    … …  
    209201                $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxVideoWddm.sys \
    210202                $(if $(VBOXWDDM_WITH_DISPD3D), $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D.dll, ) \
    211                 $(if $(VBOXWDDM_WITH_DISPD3D), $(if-expr "$(KBUILD_TARGET_ARCH)" == "amd64", $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D32.dll, ), ) \
     203                $(if $(VBOXWDDM_WITH_DISPD3D), $(if-expr "$(KBUILD_TARGET_ARCH)" == "amd64", $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D-x86.dll, ), ) \
    212204                $(if $(VBOXWDDM_WITH_GL),  $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL.dll \
    213205                                           $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxD3D9wddm.dll \
    214206                                           $(PATH_TARGET)/VBoxVideoWddmCat.dir/wined3dwddm.dll \
    215                                            $(PATH_TARGET)/VBoxVideoWddmCat.dir/libWine.dll \
    216207                                           $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu.dll \
    217208                                           $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil.dll \
    … …  
    221212                                           $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu.dll, ) \
    222213                $(if $(VBOXWDDM_WITH_GL), $(if-expr "$(KBUILD_TARGET_ARCH)" == "amd64", \
    223                                            $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL32.dll \
    224                                            $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxD3D9wddm32.dll \
    225                                            $(PATH_TARGET)/VBoxVideoWddmCat.dir/wined3dwddm32.dll \
    226                                            $(PATH_TARGET)/VBoxVideoWddmCat.dir/libWine32.dll \
    227                                            $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu32.dll \
    228                                            $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil32.dll \
    229                                            $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLerrorspu32.dll \
    230                                            $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLfeedbackspu32.dll \
    231                                            $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpackspu32.dll \
    232                                            $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu32.dll, ), )
     214                                           $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL-x86.dll \
     215                                           $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxD3D9wddm-x86.dll \
     216                                           $(PATH_TARGET)/VBoxVideoWddmCat.dir/wined3dwddm-x86.dll \
     217                                           $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu-x86.dll \
     218                                           $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil-x86.dll \
     219                                           $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLerrorspu-x86.dll \
     220                                           $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLfeedbackspu-x86.dll \
     221                                           $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpackspu-x86.dll \
     222                                           $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu-x86.dll, ), )
    233223        $(call MSG_TOOL,Inf2Cat,VBoxVideoWddm-inf,$@,$<)
    234224        $(call VBOX_MAKE_CAT_FN, $(@D),$@)

  • trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoIf.h

    r34345 r35319  
    3030
    3131/* One would increase this whenever definitions in this file are changed */
    32 #define VBOXVIDEOIF_VERSION 8
     32#define VBOXVIDEOIF_VERSION 9
    3333
    3434/* create allocation func */
    … …  
    7676        {
    7777            D3DDDI_RESOURCEFLAGS fFlags;
    78             HANDLE hSharedHandle;
     78            uint64_t hSharedHandle;
    7979            VBOXWDDM_SURFACE_DESC SurfDesc;
    8080        };
    … …  
    8383        {
    8484            uint32_t cbBuffer;
    85             HANDLE hSynch;
     85            uint64_t hSynch;
    8686            VBOXUHGSMI_SYNCHOBJECT_TYPE enmSynchType;
    8787        };
    … …  
    231231} VBOXWDDM_CREATECONTEXT_INFO, *PVBOXWDDM_CREATECONTEXT_INFO;
    232232
    233 typedef void *VBOXDISP_UMHANDLE;
     233typedef uint64_t VBOXDISP_UMHANDLE;
    234234typedef uint32_t VBOXDISP_KMHANDLE;
    235235
    … …  
    355355    VBOXDISP_KMHANDLE hAlloc;
    356356    uint32_t cbData;
    357     uint8_t *pvData;
    358     HANDLE hSynch;
     357    uint64_t pvData;
     358    uint64_t hSynch;
    359359    VBOXUHGSMI_SYNCHOBJECT_TYPE enmSynchType;
    360360} VBOXVIDEOCM_UM_ALLOC, *PVBOXVIDEOCM_UM_ALLOC;

  • trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoMisc.cpp

    r34345 r35319  
    965965    {
    966966        case VBOXUHGSMI_SYNCHOBJECT_TYPE_EVENT:
    967             Status = ObReferenceObjectByHandle(pUmAlloc->hSynch, EVENT_MODIFY_STATE, *ExEventObjectType, UserMode,
     967            Status = ObReferenceObjectByHandle((HANDLE)pUmAlloc->hSynch, EVENT_MODIFY_STATE, *ExEventObjectType, UserMode,
    968968                    (PVOID*)&pSynchEvent,
    969969                    NULL);
    … …  
    971971            break;
    972972        case VBOXUHGSMI_SYNCHOBJECT_TYPE_SEMAPHORE:
    973             Status = ObReferenceObjectByHandle(pUmAlloc->hSynch, EVENT_MODIFY_STATE, *ExSemaphoreObjectType, UserMode,
     973            Status = ObReferenceObjectByHandle((HANDLE)pUmAlloc->hSynch, EVENT_MODIFY_STATE, *ExSemaphoreObjectType, UserMode,
    974974                    (PVOID*)&pSynchSemaphore,
    975975                    NULL);
    … …  
    10251025                        pUmAlloc->hAlloc = pAllocRef->hSessionHandle;
    10261026                        pUmAlloc->cbData = pAlloc->cbData;
    1027                         pUmAlloc->pvData = (uint8_t*)pvUm;
     1027                        pUmAlloc->pvData = (uint64_t)pvUm;
    10281028                        return STATUS_SUCCESS;
    10291029                    }
    … …  
    11391139}
    11401140
    1141 #ifdef VBOX_WITH_VDMA
     1141#ifdef VBOX_WITH_CRHGSMI
    11421142static DECLCALLBACK(VOID) vboxVideoAMgrAllocSubmitCompletion(PDEVICE_EXTENSION pDevExt, PVBOXVDMADDI_CMD pCmd, PVOID pvContext)
    11431143{

  • trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoMisc.h

    r33531 r35319  
    141141NTSTATUS vboxVideoAMgrCtxAllocDestroy(PVBOXVIDEOCM_ALLOC_CONTEXT pContext, VBOXDISP_KMHANDLE hSesionHandle);
    142142
    143 #ifdef VBOX_WITH_VDMA
     143#ifdef VBOX_WITH_CRHGSMI
    144144NTSTATUS vboxVideoAMgrCtxAllocSubmit(PDEVICE_EXTENSION pDevExt, PVBOXVIDEOCM_ALLOC_CONTEXT pContext, UINT cBuffers, VBOXWDDM_UHGSMI_BUFFER_UI_INFO_ESCAPE *paBuffers);
    145145#endif

  • trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoWddm.cpp

    r34987 r35319  
    16471647                    {
    16481648                        case VBOXUHGSMI_SYNCHOBJECT_TYPE_EVENT:
    1649                             Status = ObReferenceObjectByHandle(pAllocInfo->hSynch, EVENT_MODIFY_STATE, *ExEventObjectType, UserMode,
     1649                            Status = ObReferenceObjectByHandle((HANDLE)pAllocInfo->hSynch, EVENT_MODIFY_STATE, *ExEventObjectType, UserMode,
    16501650                                    (PVOID*)&pAllocation->pSynchEvent,
    16511651                                    NULL);
    … …  
    16531653                            break;
    16541654                        case VBOXUHGSMI_SYNCHOBJECT_TYPE_SEMAPHORE:
    1655                             Status = ObReferenceObjectByHandle(pAllocInfo->hSynch, EVENT_MODIFY_STATE, *ExSemaphoreObjectType, UserMode,
     1655                            Status = ObReferenceObjectByHandle((HANDLE)pAllocInfo->hSynch, EVENT_MODIFY_STATE, *ExSemaphoreObjectType, UserMode,
    16561656                                    (PVOID*)&pAllocation->pSynchSemaphore,
    16571657                                    NULL);
    … …  
    22252225}
    22262226
    2227 #ifdef VBOX_WITH_VDMA
     2227#ifdef VBOX_WITH_CRHGSMI
    22282228DECLCALLBACK(VOID) vboxWddmDmaCompleteChromiumCmd(PDEVICE_EXTENSION pDevExt, PVBOXVDMADDI_CMD pCmd, PVOID pvContext)
    22292229{
    … …  
    24432443        case VBOXVDMACMD_TYPE_CHROMIUM_CMD:
    24442444        {
    2445 #ifdef VBOX_WITH_VDMA
     2445#ifdef VBOX_WITH_CRHGSMI
    24462446            VBOXWDDM_DMA_PRIVATEDATA_CHROMIUM_CMD *pChromiumCmd = (VBOXWDDM_DMA_PRIVATEDATA_CHROMIUM_CMD*)pPrivateDataBase;
    24472447            UINT cbCmd = VBOXVDMACMD_SIZE_FROMBODYSIZE(RT_OFFSETOF(VBOXVDMACMD_CHROMIUM_CMD, aBuffers[pChromiumCmd->Base.u32CmdReserved]));
    … …  
    27972797                    else
    27982798                    {
    2799                         UINT index = pBuildPagingBuffer->Transfer.MdlOffset + (cbTransfered>>12);
     2799                        UINT index = pBuildPagingBuffer->Transfer.MdlOffset + (UINT)(cbTransfered>>12);
    28002800                        pBody->Src.phBuf = MmGetMdlPfnArray(pBuildPagingBuffer->Transfer.Source.pMdl)[index] << 12;
    28012801                        PFN_NUMBER num = MmGetMdlPfnArray(pBuildPagingBuffer->Transfer.Source.pMdl)[index];
    … …  
    28212821                    else
    28222822                    {
    2823                         UINT index = pBuildPagingBuffer->Transfer.MdlOffset + (cbTransfered>>12);
     2823                        UINT index = pBuildPagingBuffer->Transfer.MdlOffset + (UINT)(cbTransfered>>12);
    28242824                        pBody->Dst.phBuf = MmGetMdlPfnArray(pBuildPagingBuffer->Transfer.Destination.pMdl)[index] << 12;
    28252825                        PFN_NUMBER num = MmGetMdlPfnArray(pBuildPagingBuffer->Transfer.Destination.pMdl)[index];
    … …  
    28402840                    cbCurTransfer = RT_MIN(cbCurTransfer, cDstPages << 12);
    28412841
    2842                     pBody->cbTransferSize = cbCurTransfer;
     2842                    pBody->cbTransferSize = (UINT)cbCurTransfer;
    28432843                    Assert(!(cbCurTransfer & 0xfff));
    28442844
    … …  
    32773277        switch (pEscapeHdr->escapeCode)
    32783278        {
    3279 #ifdef VBOX_WITH_VDMA
     3279#ifdef VBOX_WITH_CRHGSMI
    32803280            case VBOXESC_UHGSMI_SUBMIT:
    32813281            {

  • trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoWddm.inf

    r34987 r35319  
    4141Include = msdv.inf
    4242;x86   CopyFiles = VBoxVideo.Miniport, VBoxVideo.Display, VBoxVideo.GL
    43 ;amd64 CopyFiles = VBoxVideo.Miniport, VBoxVideo.Display, VBoxVideo.Display_wow64, VBoxVideo.GL, VBoxVideo.GL_wow64 
     43;amd64 CopyFiles = VBoxVideo.Miniport, VBoxVideo.Display, VBoxVideo.Display_wow64, VBoxVideo.GL, VBoxVideo.GL_wow64
    4444AddReg = VBoxVideo_SoftwareDeviceSettings
    4545;todo: clear XPDM driver settings: DelReg = VBoxVideo_RemoveDeviceSettings
    … …  
    5353
    5454;amd64 [VBoxVideo.Display_wow64]
    55 ;amd64 ;dispd3d VBoxDispD3D32.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
     55;amd64 ;dispd3d VBoxDispD3D-x86.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
    5656
    5757[VBoxVideo.GL]
    … …  
    5959;gl VBoxD3D9wddm.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
    6060;gl wined3dwddm.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
    61 ;gl libWine.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
    6261;gl VBoxOGLarrayspu.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
    6362;gl VBoxOGLcrutil.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
    … …  
    6867
    6968;amd64 [VBoxVideo.GL_wow64]
    70 ;amd64 ;gl VBoxOGL32.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
    71 ;amd64 ;gl VBoxD3D9wddm32.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
    72 ;amd64 ;gl wined3dwddm32.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
    73 ;amd64 ;gl libWine32.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
    74 ;amd64 ;gl VBoxOGLarrayspu32.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
    75 ;amd64 ;gl VBoxOGLcrutil32.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
    76 ;amd64 ;gl VBoxOGLerrorspu32.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
    77 ;amd64 ;gl VBoxOGLfeedbackspu32.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
    78 ;amd64 ;gl VBoxOGLpackspu32.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
    79 ;amd64 ;gl VBoxOGLpassthroughspu32.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
     69;amd64 ;gl VBoxOGL-x86.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
     70;amd64 ;gl VBoxD3D9wddm-x86.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
     71;amd64 ;gl wined3dwddm-x86.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
     72;amd64 ;gl VBoxOGLarrayspu-x86.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
     73;amd64 ;gl VBoxOGLcrutil-x86.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
     74;amd64 ;gl VBoxOGLerrorspu-x86.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
     75;amd64 ;gl VBoxOGLfeedbackspu-x86.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
     76;amd64 ;gl VBoxOGLpackspu-x86.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
     77;amd64 ;gl VBoxOGLpassthroughspu-x86.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
    8078
    8179[VBoxVideo_SoftwareDeviceSettings]
    8280;dispd3d HKR,, InstalledDisplayDrivers, %REG_MULTI_SZ%, VBoxDispD3D
    8381;dispd3d HKR,, UserModeDriverName,    %REG_MULTI_SZ%, VBoxDispD3D.dll
    84 ;amd64 ;dispd3d HKR,, UserModeDriverNameWow,    %REG_MULTI_SZ%, VBoxDispD3D32.dll
     82;amd64 ;dispd3d HKR,, UserModeDriverNameWow,    %REG_MULTI_SZ%, VBoxDispD3D-x86.dll
    8583;gl HKR,, OpenGLDriverName,    %REG_MULTI_SZ%, VBoxOGL.dll
    86 ;amd64 ;gl HKR,, OpenGLDriverNameWoW, %REG_MULTI_SZ%, VBoxOGL32.dll
     84;amd64 ;gl HKR,, OpenGLDriverNameWoW, %REG_MULTI_SZ%, VBoxOGL-x86.dll
    8785;gl        HKR,, OpenGLFlags,         %REG_DWORD%,    0x00000001
    8886;amd64 ;gl HKR,, OpenGLFlagsWoW,      %REG_DWORD%,    0x00000001
    … …  
    9391[VBoxVideo_RegisterDlls]
    9492;dispd3d 11,,VBoxDispD3D.dll,1
    95 ;amd64 ;dispd3d 11,,VBoxDispD3D32.dll,1
    96 ;amd64 ;gl 11,,VBoxOGL32.dll,1
     93;amd64 ;dispd3d 11,,VBoxDispD3D-x86.dll,1
     94;amd64 ;gl 11,,VBoxOGL-x86.dll,1
    9795;gl 11,,VBoxOGL.dll,1
    98 ;amd64 ;gl 11,,VBoxD3D9wddm32.dll,1
     96;amd64 ;gl 11,,VBoxD3D9wddm-x86.dll,1
    9997;gl 11,,VBoxD3D9wddm.dll,1
    100 ;amd64 ;gl 11,,wined3dwddm32.dll,1
     98;amd64 ;gl 11,,wined3dwddm-x86.dll,1
    10199;gl 11,,wined3dwddm.dll,1
    102 ;amd64 ;gl 11,,libWine32.dll,1
    103 ;gl 11,,libWine.dll,1
    104 ;amd64 ;gl 11,,VBoxOGLarrayspu32.dll,1
     100;amd64 ;gl 11,,VBoxOGLarrayspu-x86.dll,1
    105101;gl 11,,VBoxOGLarrayspu.dll,1
    106 ;amd64 ;gl 11,,VBoxOGLcrutil32.dll,1
     102;amd64 ;gl 11,,VBoxOGLcrutil-x86.dll,1
    107103;gl 11,,VBoxOGLcrutil.dll,1
    108 ;amd64 ;gl 11,,VBoxOGLerrorspu32.dll,1
     104;amd64 ;gl 11,,VBoxOGLerrorspu-x86.dll,1
    109105;gl 11,,VBoxOGLerrorspu.dll,1
    110 ;amd64 ;gl 11,,VBoxOGLfeedbackspu32.dll,1
     106;amd64 ;gl 11,,VBoxOGLfeedbackspu-x86.dll,1
    111107;gl 11,,VBoxOGLfeedbackspu.dll,1
    112 ;amd64 ;gl 11,,VBoxOGLpackspu32.dll,1
     108;amd64 ;gl 11,,VBoxOGLpackspu-x86.dll,1
    113109;gl 11,,VBoxOGLpackspu.dll,1
    114 ;amd64 ;gl 11,,VBoxOGLpassthroughspu32.dll,1
     110;amd64 ;gl 11,,VBoxOGLpassthroughspu-x86.dll,1
    115111;gl 11,,VBoxOGLpassthroughspu.dll,1
    116112
    … …  
    138134[SourceDisksFiles]
    139135VBoxVideoWddm.sys = 1
    140 ;amd64 ;dispd3d VBoxDispD3D32.dll = 1
     136;amd64 ;dispd3d VBoxDispD3D-x86.dll = 1
    141137;dispd3d VBoxDispD3D.dll = 1
    142 ;amd64 ;gl VBoxOGL32.dll = 1
     138;amd64 ;gl VBoxOGL-x86.dll = 1
    143139;gl VBoxOGL.dll = 1
    144 ;amd64 ;gl VBoxD3D9wddm32.dll = 1
     140;amd64 ;gl VBoxD3D9wddm-x86.dll = 1
    145141;gl VBoxD3D9wddm.dll = 1
    146 ;amd64 ;gl wined3dwddm32.dll = 1
     142;amd64 ;gl wined3dwddm-x86.dll = 1
    147143;gl wined3dwddm.dll = 1
    148 ;amd64 ;gl libWine32.dll = 1
    149 ;gl libWine.dll = 1
    150 ;amd64 ;gl VBoxOGLarrayspu32.dll = 1
     144;amd64 ;gl VBoxOGLarrayspu-x86.dll = 1
    151145;gl VBoxOGLarrayspu.dll = 1
    152 ;amd64 ;gl VBoxOGLcrutil32.dll = 1
     146;amd64 ;gl VBoxOGLcrutil-x86.dll = 1
    153147;gl VBoxOGLcrutil.dll = 1
    154 ;amd64 ;gl VBoxOGLerrorspu32.dll = 1
     148;amd64 ;gl VBoxOGLerrorspu-x86.dll = 1
    155149;gl VBoxOGLerrorspu.dll = 1
    156 ;amd64 ;gl VBoxOGLfeedbackspu32.dll = 1
     150;amd64 ;gl VBoxOGLfeedbackspu-x86.dll = 1
    157151;gl VBoxOGLfeedbackspu.dll = 1
    158 ;amd64 ;gl VBoxOGLpackspu32.dll = 1
     152;amd64 ;gl VBoxOGLpackspu-x86.dll = 1
    159153;gl VBoxOGLpackspu.dll = 1
    160 ;amd64 ;gl VBoxOGLpassthroughspu32.dll = 1
     154;amd64 ;gl VBoxOGLpassthroughspu-x86.dll = 1
    161155;gl VBoxOGLpassthroughspu.dll = 1
    162156

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

    r34987 r35319  
    2323
    2424libWine_TEMPLATE     = VBOXGUESTR3NPDLL
    25 if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_WDDM)
    26  libWine_NOINST.win.x86 = true
    27 endif
    2825libWine_DEFS         = __WINESRC__ WINE_UNICODE_API="" _REENTRANT WINE_NOWINSOCK USE_WIN32_OPENGL __i386__ \
    2926    DLLDIR=\"\" \
    … …  
    176173wined3dwddm_EXTENDS  = wined3d
    177174if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_WDDM)
    178  wined3dwddm_NOINST.win.x86 = true
     175 wined3dwddm_NOINST.win = true
    179176endif
    180177wined3dwddm_INCS     = vbox/libWineStub/include
    … …  
    187184DLLS.amd64 += wined3dwddm-x86
    188185wined3dwddm-x86_EXTENDS = wined3dwddm
    189 wined3dwddm-x86_NAME = wined3dwddm32
    190186wined3dwddm-x86_BLD_TRG_ARCH = x86
    191187#wined3dwddm-x86_LIBS = \
    192188        $(VBOX_LIB_IPRT_GUEST_R3_X86) \
    193189        $(VBOX_LIB_VBGL_R3_X86)
     190wined3dwddm-x86_DEFS = $(wined3dwddm_DEFS) VBOX_WDDM_WOW64
    194191endif
    195192
    … …  
    272269VBoxD3D9wddm_EXTENDS  = VBoxD3D9
    273270if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_WDDM)
    274  VBoxD3D9wddm_NOINST.win.x86 = true
     271 VBoxD3D9wddm_NOINST.win = true
    275272endif
    276273
    … …  
    285282DLLS.amd64 += VBoxD3D9wddm-x86
    286283VBoxD3D9wddm-x86_EXTENDS = VBoxD3D9wddm
    287 VBoxD3D9wddm-x86_NAME = VBoxD3D9wddm32
    288284VBoxD3D9wddm-x86_BLD_TRG_ARCH = x86
    289 VBoxD3D9wddm-x86_LIBS = $(PATH_LIB)/wined3dwddm32$(VBOX_SUFF_LIB)
     285VBoxD3D9wddm-x86_LIBS = $(PATH_LIB)/wined3dwddm-x86$(VBOX_SUFF_LIB)
    290286#VBoxD3D9wddm-x86_LIBS += \
    291287        $(VBOX_LIB_IPRT_GUEST_R3_X86) \
    292288        $(VBOX_LIB_VBGL_R3_X86)
     289VBoxD3D9wddm-x86_DEFS = $(VBoxD3D9wddm_DEFS) VBOX_WDDM_WOW64
    293290endif
    294291

  • trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/d3d9wddm.def

    r33836 r35319  
    1 LIBRARY VBoxD3D9wddm.dll
    21
    32EXPORTS
    4   Direct3DShaderValidatorCreate9@0=Direct3DShaderValidatorCreate9
    5   D3DPERF_BeginEvent@8=D3DPERF_BeginEvent
    6   D3DPERF_EndEvent@0=D3DPERF_EndEvent
    7   D3DPERF_GetStatus@0=D3DPERF_GetStatus
    8   D3DPERF_QueryRepeatFrame@0=D3DPERF_QueryRepeatFrame
    9   D3DPERF_SetMarker@8=D3DPERF_SetMarker
    10   D3DPERF_SetOptions@4=D3DPERF_SetOptions
    11   D3DPERF_SetRegion@8=D3DPERF_SetRegion
    12   DebugSetMute@0=DebugSetMute
    13   Direct3DCreate9@4=Direct3DCreate9
    14   Direct3DCreate9Ex@8=Direct3DCreate9Ex
     3  Direct3DShaderValidatorCreate9
     4  D3DPERF_BeginEvent
     5  D3DPERF_EndEvent
     6  D3DPERF_GetStatus
     7  D3DPERF_QueryRepeatFrame
     8  D3DPERF_SetMarker
     9  D3DPERF_SetOptions
     10  D3DPERF_SetRegion
     11  DebugSetMute
     12  Direct3DCreate9
     13  Direct3DCreate9Ex
    1514  VBoxWineExD3DDev9Flush
    1615  VBoxWineExD3DDev9CreateTexture

  • trunk/src/VBox/Additions/WINNT/Graphics/Wine/switcher/d3d9_main.c

    r28800 r35319  
    5050} D3D9Export;
    5151
     52#ifdef VBOX_WDDM_WOW64
     53static D3D9Export g_swd3d9 = {0, "VBoxD3D9-x86.dll", "MSD3D9.dll",};
     54#else
    5255static D3D9Export g_swd3d9 = {0, "VBoxD3D9.dll", "MSD3D9.dll",};
     56#endif
    5357
    5458void FillD3DExports(HANDLE hDLL)

  • trunk/src/VBox/Additions/WINNT/Graphics/Wine/switcher/sw_common.c

    r28800 r35319  
    2929    BOOL result = FALSE;
    3030
     31#ifdef VBOX_WDDM_WOW64
     32    hDLL = LoadLibrary("VBoxOGL-x86.dll");
     33#else
    3134    hDLL = LoadLibrary("VBoxOGL.dll");
     35#endif
    3236
    3337    /* note: this isn't really needed as our library will refuse to load if it can't connect to host.

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

    r33656 r35319  
    51035103#ifdef VBOX_WITH_WDDM
    51045104        BOOL (APIENTRY *pDrvValidateVersion)(DWORD) DECLSPEC_HIDDEN;
     5105#ifdef VBOX_WDDM_WOW64
     5106        mod_gl = LoadLibraryA("VBoxOGL-x86.dll");
     5107#else
    51055108        mod_gl = LoadLibraryA("VBoxOGL.dll");
     5109#endif
    51065110#else
    51075111        mod_gl = LoadLibraryA("opengl32.dll");

  • trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/wined3dwddm.def

    r32305 r35319  
    1 ; File generated automatically from ../../../dlls/wined3d/wined3d.spec; do not edit!
    2 
    3 LIBRARY wined3dwddm.dll
    41
    52EXPORTS

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

    r34677 r35319  
    133133 endif
    134134endif
    135 if 0 #def VBOX_WITH_WDDM
    136  ifeq ($(KBUILD_TARGET_ARCH),x86)
     135ifdef VBOX_WITH_WDDM_ENABLED
    137136DRIVER_FILES += \
    138137        $(PATH_BIN)/additions/VBoxVideoWddm.sys \
    139138        $(PATH_BIN)/additions/VBoxVideoWddm.inf \
    140         $(PATH_BIN)/additions/VBoxDispD3D.dll \
     139        $(PATH_BIN)/additions/VBoxDispD3D.dll
     140 ifdef VBOX_WITH_CROGL
     141DRIVER_FILES += \
    141142        $(PATH_BIN)/additions/wined3dwddm.dll \
    142143        $(PATH_BIN)/additions/VBoxD3D9wddm.dll
    143   ifdef VBOX_SIGN_ADDITIONS
     144 endif
     145 ifdef VBOX_SIGN_ADDITIONS
    144146DRIVER_FILES += \
    145147        $(PATH_BIN)/additions/VBoxVideoWddm.cat
     148 endif
     149 ifeq ($(KBUILD_TARGET_ARCH),amd64)
     150DRIVER_FILES += \
     151        $(PATH_BIN)/additions/VBoxDispD3D-x86.dll
     152  ifdef VBOX_WITH_CROGL
     153DRIVER_FILES += \
     154        $(PATH_BIN)/additions/wined3dwddm-x86.dll \
     155        $(PATH_BIN)/additions/VBoxD3D9wddm-x86.dll \
     156        $(PATH_BIN)/additions/VBoxOGL-x86.dll \
     157        $(PATH_BIN)/additions/VBoxOGLarrayspu-x86.dll \
     158        $(PATH_BIN)/additions/VBoxOGLcrutil-x86.dll \
     159        $(PATH_BIN)/additions/VBoxOGLerrorspu-x86.dll \
     160        $(PATH_BIN)/additions/VBoxOGLfeedbackspu-x86.dll \
     161        $(PATH_BIN)/additions/VBoxOGLpackspu-x86.dll \
     162        $(PATH_BIN)/additions/VBoxOGLpassthroughspu-x86.dll
    146163  endif
    147164 endif
    … …  
    166183        -E 'VBOX_WITH_CROGL=$(if $(VBOX_WITH_CROGL),1,0)' \
    167184        -E 'VBOX_WITH_GUEST_INSTALL_HELPER=$(if $(VBOX_WITH_GUEST_INSTALL_HELPER),1,0)' \
    168         -E 'VBOX_WITH_WDDM=$(if $(VBOX_WITH_WDDM),0,0)' \
     185        -E 'VBOX_WITH_WDDM=$(if $(VBOX_WITH_WDDM_ENABLED),1,0)' \
    169186        -E 'VBOX_BRAND_WIN_ADD_INST_DLGBMP=$(subst /,\,$(VBOX_BRAND_WIN_ADD_INST_DLGBMP))' \
    170187        -E 'VBOX_BRAND_LICENSE_RTF=$(subst /,\,$(VBOX_BRAND_LICENSE_RTF))' \

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

    r34745 r35319  
    6262!endif
    6363
     64!if $%VBOX_WITH_WDDM% == "1"
     65  ; WDDM Video driver
     66  SetOutPath "$0\VBoxVideoWddm"
     67   
     68  !ifdef VBOX_SIGN_ADDITIONS
     69    FILE "$%PATH_OUT%\bin\additions\VBoxVideoWddm.cat"
     70  !endif
     71  FILE "$%PATH_OUT%\bin\additions\VBoxVideoWddm.sys"
     72  FILE "$%PATH_OUT%\bin\additions\VBoxVideoWddm.inf"
     73  FILE "$%PATH_OUT%\bin\additions\VBoxDispD3D.dll"
     74
     75  !if $%VBOX_WITH_CROGL% == "1"
     76    FILE "$%PATH_OUT%\bin\additions\VBoxOGLarrayspu.dll"
     77    FILE "$%PATH_OUT%\bin\additions\VBoxOGLcrutil.dll"
     78    FILE "$%PATH_OUT%\bin\additions\VBoxOGLerrorspu.dll"
     79    FILE "$%PATH_OUT%\bin\additions\VBoxOGLpackspu.dll"
     80    FILE "$%PATH_OUT%\bin\additions\VBoxOGLpassthroughspu.dll"
     81    FILE "$%PATH_OUT%\bin\additions\VBoxOGLfeedbackspu.dll"
     82    FILE "$%PATH_OUT%\bin\additions\VBoxOGL.dll"
     83
     84    FILE "$%PATH_OUT%\bin\additions\VBoxD3D9wddm.dll"
     85    FILE "$%PATH_OUT%\bin\additions\wined3dwddm.dll"
     86  !endif ; $%VBOX_WITH_CROGL% == "1"
     87     
     88  !if $%BUILD_TARGET_ARCH% == "amd64"
     89    FILE "$%PATH_OUT%\bin\additions\VBoxDispD3D-x86.dll"
     90
     91    !if $%VBOX_WITH_CROGL% == "1"
     92      FILE "$%PATH_OUT%\bin\additions\VBoxOGLarrayspu-x86.dll"
     93      FILE "$%PATH_OUT%\bin\additions\VBoxOGLcrutil-x86.dll"
     94      FILE "$%PATH_OUT%\bin\additions\VBoxOGLerrorspu-x86.dll"
     95      FILE "$%PATH_OUT%\bin\additions\VBoxOGLpackspu-x86.dll"
     96      FILE "$%PATH_OUT%\bin\additions\VBoxOGLpassthroughspu-x86.dll"
     97      FILE "$%PATH_OUT%\bin\additions\VBoxOGLfeedbackspu-x86.dll"
     98      FILE "$%PATH_OUT%\bin\additions\VBoxOGL-x86.dll"
     99
     100      FILE "$%PATH_OUT%\bin\additions\VBoxD3D9wddm-x86.dll"
     101      FILE "$%PATH_OUT%\bin\additions\wined3dwddm-x86.dll"
     102    !endif ; $%VBOX_WITH_CROGL% == "1"
     103  !endif ; $%BUILD_TARGET_ARCH% == "amd64"
     104!endif ; $%VBOX_WITH_WDDM% == "1"
     105
    64106  ; Mouse driver
    65107  SetOutPath "$0\VBoxMouse"
    … …  
    451493
    452494!if $%VBOX_WITH_WDDM% == "1"
    453   !if $%BUILD_TARGET_ARCH% == "x86"
    454     ; If we're on a 32-bit Windows Vista / 7 we can use the WDDM driver
    455     ${If} $g_strWinVersion == "Vista"
    456     ${OrIf} $g_strWinVersion == "7"
    457       StrCpy $g_bCapWDDM "true"
    458     ${EndIf}
    459   !endif
     495  ; If we're on a 32-bit Windows Vista / 7 we can use the WDDM driver
     496  ${If} $g_strWinVersion == "Vista"
     497  ${OrIf} $g_strWinVersion == "7"
     498    StrCpy $g_bCapWDDM "true"
     499  ${EndIf}
    460500!endif
    461501

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

    r35006 r35319  
    189189  FILE "$%PATH_OUT%\bin\additions\VBoxService.exe" ; Only used by W2K and up (for Shared Folders at the moment)
    190190
     191!if $%VBOX_WITH_WDDM% == "1"
     192  ${If} $g_bWithWDDM == "true"
     193    ; WDDM Video driver
     194    SetOutPath "$INSTDIR"
     195   
     196    !ifdef VBOX_SIGN_ADDITIONS
     197      FILE "$%PATH_OUT%\bin\additions\VBoxVideoWddm.cat"
     198    !endif
     199    FILE "$%PATH_OUT%\bin\additions\VBoxVideoWddm.sys"
     200    FILE "$%PATH_OUT%\bin\additions\VBoxVideoWddm.inf"
     201    FILE "$%PATH_OUT%\bin\additions\VBoxDispD3D.dll"
     202
     203    !if $%VBOX_WITH_CROGL% == "1"
     204      FILE "$%PATH_OUT%\bin\additions\VBoxOGLarrayspu.dll"
     205      FILE "$%PATH_OUT%\bin\additions\VBoxOGLcrutil.dll"
     206      FILE "$%PATH_OUT%\bin\additions\VBoxOGLerrorspu.dll"
     207      FILE "$%PATH_OUT%\bin\additions\VBoxOGLpackspu.dll"
     208      FILE "$%PATH_OUT%\bin\additions\VBoxOGLpassthroughspu.dll"
     209      FILE "$%PATH_OUT%\bin\additions\VBoxOGLfeedbackspu.dll"
     210      FILE "$%PATH_OUT%\bin\additions\VBoxOGL.dll"
     211
     212      FILE "$%PATH_OUT%\bin\additions\VBoxD3D9wddm.dll"
     213      FILE "$%PATH_OUT%\bin\additions\wined3dwddm.dll"
     214    !endif ; $%VBOX_WITH_CROGL% == "1"
     215     
     216    !if $%BUILD_TARGET_ARCH% == "amd64"
     217      FILE "$%PATH_OUT%\bin\additions\VBoxDispD3D-x86.dll"
     218
     219      !if $%VBOX_WITH_CROGL% == "1"
     220        FILE "$%PATH_OUT%\bin\additions\VBoxOGLarrayspu-x86.dll"
     221        FILE "$%PATH_OUT%\bin\additions\VBoxOGLcrutil-x86.dll"
     222        FILE "$%PATH_OUT%\bin\additions\VBoxOGLerrorspu-x86.dll"
     223        FILE "$%PATH_OUT%\bin\additions\VBoxOGLpackspu-x86.dll"
     224        FILE "$%PATH_OUT%\bin\additions\VBoxOGLpassthroughspu-x86.dll"
     225        FILE "$%PATH_OUT%\bin\additions\VBoxOGLfeedbackspu-x86.dll"
     226        FILE "$%PATH_OUT%\bin\additions\VBoxOGL-x86.dll"
     227
     228        FILE "$%PATH_OUT%\bin\additions\VBoxD3D9wddm-x86.dll"
     229        FILE "$%PATH_OUT%\bin\additions\wined3dwddm-x86.dll"
     230      !endif ; $%VBOX_WITH_CROGL% == "1"
     231    !endif ; $%BUILD_TARGET_ARCH% == "amd64"
     232     
     233    Goto doneCr
     234  ${EndIf}
     235!endif ; $%VBOX_WITH_WDDM% == "1"
     236
    191237!if $%VBOX_WITH_CROGL% == "1"
    192   !if $%VBOX_WITH_WDDM% == "1"
    193     !if $%BUILD_TARGET_ARCH% == "x86"
    194       ${If} $g_bWithWDDM == "true"
    195         ; WDDM Video driver
    196         StrCpy $0 "$TEMP\VBoxGuestAdditions\WDDM"
    197         CreateDirectory "$0"
    198         !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%PATH_OUT%\bin\additions\VBoxVideoWddm.sys"         "$INSTDIR\VBoxVideoWddm.sys"         "$0"
    199         !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%PATH_OUT%\bin\additions\VBoxVideoWddm.inf"         "$INSTDIR\VBoxVideoWddm.inf"         "$0"
    200         !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%PATH_OUT%\bin\additions\VBoxDispD3D.dll"           "$INSTDIR\VBoxDispD3D.dll"           "$0"
    201 
    202         !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%PATH_OUT%\bin\additions\VBoxOGLarrayspu.dll"       "$INSTDIR\VBoxOGLarrayspu.dll"       "$0"
    203         !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%PATH_OUT%\bin\additions\VBoxOGLcrutil.dll"         "$INSTDIR\VBoxOGLcrutil.dll"         "$0"
    204         !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%PATH_OUT%\bin\additions\VBoxOGLerrorspu.dll"       "$INSTDIR\VBoxOGLerrorspu.dll"       "$0"
    205         !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%PATH_OUT%\bin\additions\VBoxOGLpackspu.dll"        "$INSTDIR\VBoxOGLpackspu.dll"        "$0"
    206         !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%PATH_OUT%\bin\additions\VBoxOGLpassthroughspu.dll" "$INSTDIR\VBoxOGLpassthroughspu.dll" "$0"
    207         !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%PATH_OUT%\bin\additions\VBoxOGLfeedbackspu.dll"    "$INSTDIR\VBoxOGLfeedbackspu.dll"    "$0"
    208         !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%PATH_OUT%\bin\additions\VBoxOGL.dll"               "$INSTDIR\VBoxOGL.dll"               "$0"
    209 
    210         !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%PATH_OUT%\bin\additions\libWine.dll"               "$INSTDIR\libWine.dll"               "$0"
    211         !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%PATH_OUT%\bin\additions\VBoxD3D9wddm.dll"          "$INSTDIR\VBoxD3D9wddm.dll"          "$0"
    212         !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%PATH_OUT%\bin\additions\wined3dwddm.dll"           "$INSTDIR\wined3dwddm.dll"           "$0"
    213 
    214         Goto doneCr
    215       ${EndIf}
    216     !endif ; $%BUILD_TARGET_ARCH% == "x86"
    217   !endif ; $%VBOX_WITH_WDDM% == "1"
    218238  ; crOpenGL
    219239  !if $%BUILD_TARGET_ARCH% == "amd64"
    … …  
    250270  !endif
    251271
     272!endif ; VBOX_WITH_CROGL
     273
    252274doneCr:
    253 
    254 !endif ; VBOX_WITH_CROGL
    255275
    256276  Pop $0
    … …  
    452472  Delete /REBOOTOK "$INSTDIR\VBoxControl.exe"
    453473  Delete /REBOOTOK "$INSTDIR\VBoxService.exe" ; File from an older installation maybe, not present here anymore
     474 
     475!if $%VBOX_WITH_WDDM% == "1"
     476  Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxVideoWddm.cat"
     477  Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxVideoWddm.sys"
     478  Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxVideoWddm.inf"
     479  Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxDispD3D.dll"
     480
     481    Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLarrayspu.dll"
     482    Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLcrutil.dll"
     483    Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLerrorspu.dll"
     484    Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLpackspu.dll"
     485    Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLpassthroughspu.dll"
     486    Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLfeedbackspu.dll"
     487    Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGL.dll"
     488
     489    Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxD3D9wddm.dll"
     490    Delete /REBOOTOK "$%PATH_OUT%\bin\additions\wined3dwddm.dll"
     491    ; try to delete libWine in case it is there from old installation
     492    Delete /REBOOTOK "$%PATH_OUT%\bin\additions\libWine.dll"
     493     
     494  !if $%BUILD_TARGET_ARCH% == "amd64"
     495    Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxDispD3D-x86.dll"
     496
     497      Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLarrayspu-x86.dll"
     498      Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLcrutil-x86.dll"
     499      Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLerrorspu-x86.dll"
     500      Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLpackspu-x86.dll"
     501      Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLpassthroughspu-x86.dll"
     502      Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLfeedbackspu-x86.dll"
     503      Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGL-x86.dll"
     504
     505      Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxD3D9wddm-x86.dll"
     506      Delete /REBOOTOK "$%PATH_OUT%\bin\additions\wined3dwddm-x86.dll"
     507  !endif ; $%BUILD_TARGET_ARCH% == "amd64"
     508!endif ; $%VBOX_WITH_WDDM% == "1"
    454509
    455510  ; WHQL fake
    … …  
    471526
    472527  Push $0
    473 !if $%VBOX_WITH_WDDM% == "1"
    474   ; First check whether WDDM driver is installed
    475   nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" /matchdrv "PCI\VEN_80EE&DEV_BEEF&SUBSYS_00000000&REV_00" "WDDM"'
    476   Pop $0    ; Ret value
    477   ${If} $0 == "0"
    478     DetailPrint "WDDM display driver is installed"
    479     StrCpy $g_bWithWDDM "true"
    480   ${ElseIf} $0 == "4"
    481     DetailPrint "Non-WDDM display driver is installed"
    482   ${Else}
    483     DetailPrint "Error occured"
    484     ; @todo Add error handling here!
    485   ${Endif}
    486 !endif
    487528
    488529  ; Remove VirtualBox graphics adapter & PCI base drivers
    … …  
    498539
    499540  ; Remove video driver
    500   ${If} $g_bWithWDDM == "true"
    501     nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" /delsvc VBoxVideoWddm'
    502     Delete /REBOOTOK "$g_strSystemDir\drivers\VBoxVideoWddm.sys"
    503     Delete /REBOOTOK "$g_strSystemDir\VBoxDispD3D.dll"
    504   ${Else}
    505     nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" /delsvc VBoxVideo'
    506     Delete /REBOOTOK "$g_strSystemDir\drivers\VBoxVideo.sys"
    507     Delete /REBOOTOK "$g_strSystemDir\VBoxDisp.dll"
    508   ${Endif}
     541!if $%VBOX_WITH_WDDM% == "1"
     542  ; always try to remove both VBoxVideoWddm & VBoxVideo services no matter what is installed currently
     543  nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" /delsvc VBoxVideoWddm'
     544  ;misha> @todo driver file removal (as well as service removal) should be done as driver package uninstall
     545  ;       could be done with "VBoxDrvInst.exe /u", e.g. by passing additional arg to it denoting that driver package is to be uninstalled
     546  Delete /REBOOTOK "$g_strSystemDir\drivers\VBoxVideoWddm.sys"
     547  Delete /REBOOTOK "$g_strSystemDir\VBoxDispD3D.dll"
     548!endif ; $%VBOX_WITH_WDDM% == "1"
     549  nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" /delsvc VBoxVideo'
     550  Delete /REBOOTOK "$g_strSystemDir\drivers\VBoxVideo.sys"
     551  Delete /REBOOTOK "$g_strSystemDir\VBoxDisp.dll"
    509552
    510553  ; Remove mouse driver
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