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

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/Graphics/Display

Files:

• Makefile.kmk (modified) (2 diffs)
• wddm/VBoxDispD3D.cpp (modified) (2 diffs)
• wddm/VBoxDispD3D.def (modified) (1 diff)
• wddm/VBoxDispD3D.rc (modified) (1 diff)
• wddm/VBoxDispD3DIf.cpp (modified) (1 diff)
• wddm/VBoxUhgsmiKmt.cpp (modified) (4 diffs)
• wddm/dbg/VBoxVideoWinDbg.cpp (modified) (3 diffs)

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

@@ -119 +119 @@
 DLLS.amd64 += VBoxDispD3D-x86
 VBoxDispD3D-x86_EXTENDS = VBoxDispD3D
-VBoxDispD3D-x86_NAME = VBoxDispD3D32
 VBoxDispD3D-x86_BLD_TRG_ARCH = x86
 VBoxDispD3D-x86_LIBS = \
         $(VBOX_LIB_IPRT_GUEST_R3_X86) \
         $(VBOX_LIB_VBGL_R3_X86)
-
+VBoxDispD3D-x86_DEFS = $(VBoxDispD3D_DEFS) VBOX_WDDM_WOW64
  ifdef VBOX_WITH_CRHGSMI
 #
-# VBoxCrHgsmi
+# VBoxCrHgsmi - Chromium HGSMI API library
 #
 LIBRARIES += VBoxCrHgsmi
@@ -136 +135 @@
         wddm/VBoxUhgsmiKmt.cpp
 VBoxCrHgsmi_SDKS        = WINDDKWLH
+
+LIBRARIES.amd64 += VBoxCrHgsmi-x86
+VBoxCrHgsmi-x86_EXTENDS = VBoxCrHgsmi
+VBoxCrHgsmi-x86_BLD_TRG_ARCH = x86
+VBoxCrHgsmi-x86_DEFS = $(VBoxCrHgsmi_DEFS) VBOX_WDDM_WOW64
  endif
 endif

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

@@ -5522 +5522 @@
                     pAllocInfo->enmType = VBOXWDDM_ALLOC_TYPE_UMD_RC_GENERIC;
                     pAllocInfo->fFlags = pResource->Flags;
-                    pAllocInfo->hSharedHandle = pAllocation->hSharedHandle;
+                    pAllocInfo->hSharedHandle = (uint64_t)pAllocation->hSharedHandle;
                     pAllocInfo->SurfDesc.width = pSurf->Width;
                     pAllocInfo->SurfDesc.height = pSurf->Height;
@@ -7484 +7484 @@
                     pAllocation->hAllocation = pOAI->hAllocation;
                     pAllocation->enmType = pAllocInfo->enmType;
-                    pAllocation->hSharedHandle = pAllocInfo->hSharedHandle;
+                    pAllocation->hSharedHandle = (HANDLE)pAllocInfo->hSharedHandle;
                     pAllocation->SurfDesc = pAllocInfo->SurfDesc;
                     Assert(pAllocation->hSharedHandle);

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

@@ -15 +15 @@
 ; */
 
-LIBRARY VBoxDispD3D
-
 EXPORTS
         OpenAdapter

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

@@ -49 +49 @@
          VALUE "InternalName",     "VBoxDispD3D\0"
          VALUE "LegalCopyright",   VBOX_RC_LEGAL_COPYRIGHT
+#ifdef VBOX_WDDM_WOW64
+         VALUE "OriginalFilename", "VBoxDispD3D-x86.dll\0"
+#else
          VALUE "OriginalFilename", "VBoxDispD3D.dll\0"
+#endif
          VALUE "ProductName",      VBOX_PRODUCT " Guest Additions\0"
          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

@@ -27 +27 @@
 HRESULT VBoxDispD3DOpen(VBOXDISPD3D *pD3D)
 {
+#ifdef VBOX_WDDM_WOW64
+    pD3D->hD3DLib = LoadLibraryW(L"VBoxD3D9wddm-x86.dll");
+#else
     pD3D->hD3DLib = LoadLibraryW(L"VBoxD3D9wddm.dll");
+#endif
     Assert(pD3D->hD3DLib);
     if (pD3D->hD3DLib)

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

@@ -143 +143 @@
         Buf.AllocInfo.enmType = VBOXWDDM_ALLOC_TYPE_UMD_HGSMI_BUFFER;
         Buf.AllocInfo.cbBuffer = cbBuf;
-        Buf.AllocInfo.hSynch = hSynch;
+        Buf.AllocInfo.hSynch = (uint64_t)hSynch;
         Buf.AllocInfo.enmSynchType = enmSynchType;
 
@@ -226 +226 @@
 {
     PVBOXUHGSMI_BUFFER_PRIVATE_KMT_ESC pBuffer = VBOXUHGSMIKMTESC_GET_BUFFER(pBuf);
-    *pvLock = pBuffer->Alloc.pvData + offLock;
+    *pvLock = (void*)(pBuffer->Alloc.pvData + offLock);
     return VINF_SUCCESS;
 }
@@ -306 +306 @@
         Buf.AllocInfo.EscapeHdr.escapeCode = VBOXESC_UHGSMI_ALLOCATE;
         Buf.AllocInfo.Alloc.cbData = cbBuf;
-        Buf.AllocInfo.Alloc.hSynch = hSynch;
+        Buf.AllocInfo.Alloc.hSynch = (uint64_t)hSynch;
         Buf.AllocInfo.Alloc.enmSynchType = enmSynchType;
 
@@ -612 +612 @@
         {
             DWORD winEr = GetLastError();
+#ifdef DEBUG_misha
             Assert(0);
+#endif
+            Log((__FUNCTION__": EnumDisplayDevices failed, winEr (%d)\n", winEr));
             hr = HRESULT_FROM_WIN32(winEr);
             Assert(FAILED(hr));

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

@@ -99 +99 @@
     ULONG64 u64Height;
     ULONG64 u64Bpp = 32;
+    ULONG64 u64NumColors = 3;
     ULONG64 u64Pitch;
     ULONG64 u64DefaultPitch;
@@ -114 +115 @@
     if (!GetExpressionEx(pExpr, &u64Height, &pExpr)) { dprintf("error evaluating height\n"); return; }
     if (!u64Height) { dprintf("height value can not be NULL\n"); return; }
+
+    if (pExpr && GetExpressionEx(pExpr, &u64NumColors, &pExpr))
+    {
+        if (!u64NumColors) { dprintf("Num Colors value can not be NULL\n"); return; }
+    }
 
     if (pExpr && GetExpressionEx(pExpr, &u64Bpp, &pExpr))
@@ -180 +186 @@
         if (uRc)
         {
+            switch (u64Bpp)
+            {
+                case 32:
+                case 24:
+                case 16:
+                    if (u64NumColors != 3)
+                    {
+                        dprintf("WARNING: unsupported number colors: (%d)\n", u64NumColors);
+                    }
+                    break;
+                case 8:
+                    {
+                        if (u64NumColors == 1)
+                        {
+                            ULONG64 cbSize32 = u64DefaultPitch * 4 * u64Height;
+                            PVOID pvBuf32 = malloc(cbSize32);
+                            if (pvBuf32)
+                            {
+                                byte* pByteBuf32 = (byte*)pvBuf32;
+                                byte* pByteBuf = (byte*)pvBuf;
+                                memset(pvBuf32, 0, cbSize32);
+                                for (UINT i = 0; i < u64Height; ++i)
+                                {
+                                    for (UINT j = 0; j < u64Width; ++j)
+                                    {
+                                        pByteBuf32[0] = pByteBuf[0];
+                                        pByteBuf32[1] = pByteBuf[0];
+                                        pByteBuf32[2] = pByteBuf[0];
+                                        pByteBuf32 += 4;
+                                        pByteBuf += 1;
+                                    }
+                                }
+                                free(pvBuf);
+                                pvBuf = pvBuf32;
+                                u64DefaultPitch *= 4;
+                                u64Bpp *= 4;
+                            }
+                        }
+                        else
+                        {
+                            dprintf("WARNING: unsupported number colors: (%d)\n", u64NumColors);
+                        }
+                    }
+                    break;
+            }
             BITMAP Bmp = {0};
             HBITMAP hBmp;