Changeset 84849 in vbox for trunk/src/VBox/Devices

Timestamp:

Jun 16, 2020 2:23:39 PM (5 years ago)

Author:

vboxsync

Message:

DevVGA-SVGA3d: Jettison the titlebar and border of the window we pass to CreateDeviceEx, as things goes sideways if we don't have any pixels in the client area. The titlebar size and stuff changes with the subsystem/os version number in the PE header, so when the new linker started putting 6.00 there instead of 5.02, things stopped working on a bunch of W10 systems. bugref:8489

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA-SVGA3d-shared.cpp (modified) (8 diffs)
• DevVGA-SVGA3d-win.cpp (modified) (4 diffs)
• DevVGA-SVGA3d.h (modified) (1 diff)

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-shared.cpp

@@ -45 +45 @@
 
 #ifdef RT_OS_WINDOWS
-# define VMSVGA3D_WNDCLASSNAME  "VMSVGA3DWNDCLS"
+# define VMSVGA3D_WNDCLASSNAME  L"VMSVGA3DWNDCLS"
 
 static LONG WINAPI vmsvga3dWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
@@ -85 +85 @@
     RT_NOREF(hThreadSelf);
     RTSEMEVENT      WndRequestSem = (RTSEMEVENT)pvUser;
-    WNDCLASSEX      wc;
+    WNDCLASSEXW     wc;
 
     /* Register our own window class. */
     wc.cbSize           = sizeof(wc);
     wc.style            = CS_OWNDC;
-    wc.lpfnWndProc      = (WNDPROC) vmsvga3dWndProc;
+    wc.lpfnWndProc      = (WNDPROC)vmsvga3dWndProc;
     wc.cbClsExtra       = 0;
     wc.cbWndExtra       = 0;
@@ -101 +101 @@
     wc.hIconSm          = NULL;
 
-    if (!RegisterClassEx(&wc))
+    if (!RegisterClassExW(&wc))
     {
         Log(("RegisterClass failed with %x\n", GetLastError()));
@@ -127 +127 @@
             if (msg.message == WM_VMSVGA3D_CREATEWINDOW)
             {
-                HWND          *pHwnd = (HWND *)msg.wParam;
-                LPCREATESTRUCT pCS = (LPCREATESTRUCT) msg.lParam;
-
-                *pHwnd = CreateWindowEx(pCS->dwExStyle,
-                                        VMSVGA3D_WNDCLASSNAME,
-                                        pCS->lpszName,
-                                        pCS->style,
-                                        pCS->x,
-                                        pCS->y,
-                                        pCS->cx,
-                                        pCS->cy,
-                                        pCS->hwndParent,
-                                        pCS->hMenu,
-                                        pCS->hInstance,
-                                        NULL);
-                AssertMsg(*pHwnd, ("CreateWindowEx %x %s %s %x (%d,%d)(%d,%d), %x %x %x error=%x\n", pCS->dwExStyle, pCS->lpszName, VMSVGA3D_WNDCLASSNAME, pCS->style, pCS->x,
-                                    pCS->y, pCS->cx, pCS->cy,pCS->hwndParent, pCS->hMenu, pCS->hInstance, GetLastError()));
+                HWND            hWnd;
+                HWND           *phWnd = (HWND *)msg.wParam;
+                LPCREATESTRUCTW pCS = (LPCREATESTRUCTW)msg.lParam;
+
+                *phWnd = hWnd = CreateWindowExW(pCS->dwExStyle,
+                                                VMSVGA3D_WNDCLASSNAME,
+                                                pCS->lpszName,
+                                                pCS->style,
+                                                pCS->x,
+                                                pCS->y,
+                                                pCS->cx,
+                                                pCS->cy,
+                                                pCS->hwndParent,
+                                                pCS->hMenu,
+                                                pCS->hInstance,
+                                                NULL);
+                AssertMsg(hWnd, ("CreateWindowEx %x %ls %ls %x (%d,%d)(%d,%d), %x %x %x error=%x\n", pCS->dwExStyle,
+                                 pCS->lpszName, VMSVGA3D_WNDCLASSNAME, pCS->style, pCS->x, pCS->y, pCS->cx, pCS->cy,
+                                 pCS->hwndParent, pCS->hMenu, pCS->hInstance, GetLastError()));
+
+#ifdef VBOX_STRICT
+                /* Must have a non-zero client rectangle! */
+                RECT ClientRect;
+                GetClientRect(hWnd, &ClientRect);
+                Assert(ClientRect.right > ClientRect.left);
+                Assert(ClientRect.bottom > ClientRect.top);
+#endif
 
                 /* Signal to the caller that we're done. */
@@ -159 +169 @@
                 continue;
             }
+
+#if 0 /* in case CreateDeviceEx fails again and we want to eliminat wrong-thread. */
+            if (msg.message == WM_VMSVGA3D_CREATE_DEVICE)
+            {
+                VMSVGA3DCREATEDEVICEPARAMS *pParams = (VMSVGA3DCREATEDEVICEPARAMS *)msg.lParam;
+                pParams->hrc = pParams->pState->pD3D9->CreateDeviceEx(D3DADAPTER_DEFAULT,
+                                                                      D3DDEVTYPE_HAL,
+                                                                      pParams->pContext->hwnd,
+                                                                      D3DCREATE_MULTITHREADED | D3DCREATE_MIXED_VERTEXPROCESSING, //D3DCREATE_HARDWARE_VERTEXPROCESSING,
+                                                                      pParams->pPresParams,
+                                                                      NULL,
+                                                                      &pParams->pContext->pDevice);
+                AssertMsg(pParams->hrc == D3D_OK, ("WM_VMSVGA3D_CREATE_DEVICE: CreateDevice failed with %x\n", pParams->hrc));
+
+                RTSemEventSignal(WndRequestSem);
+                continue;
+            }
+#endif
 
             TranslateMessage(&msg);
@@ -179 +207 @@
     switch (uMsg)
     {
+        case WM_CREATE:
+        {
+            /* Ditch the title bar (caption) to avoid having a zero height
+               client area as that makes IDirect3D9Ex::CreateDeviceEx fail.
+               For the style adjustment to take place, we must apply the
+               SWP_FRAMECHANGED thru SetWindowPos. */
+            LONG flStyle = GetWindowLongW(hwnd, GWL_STYLE);
+            flStyle &= ~WS_CAPTION /* both titlebar and border. Some paranoia: */ | WS_THICKFRAME | WS_SYSMENU;
+            SetWindowLong(hwnd, GWL_STYLE, flStyle);
+            SetWindowPos(hwnd, NULL, 0, 0, 0, 0,
+                         SWP_FRAMECHANGED | SWP_NOZORDER | SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOOWNERZORDER);
+            break;
+        }
+
         case WM_CLOSE:
             Log7(("vmsvga3dWndProc(%p): WM_CLOSE\n", hwnd));
@@ -237 +279 @@
      * system memory in the guest VRAM.
      */
-    CREATESTRUCT cs;
+    CREATESTRUCTW cs;
     cs.lpCreateParams   = NULL;
     cs.hInstance        = hInstance;
@@ -251 +293 @@
     cs.dwExStyle        = WS_EX_NOACTIVATE | WS_EX_NOPARENTNOTIFY;
 
-    int rc = vmsvga3dSendThreadMessage(pWindowThread, WndRequestSem, WM_VMSVGA3D_CREATEWINDOW, (WPARAM)pHwnd, (LPARAM)&cs);
-    return rc;
+    return vmsvga3dSendThreadMessage(pWindowThread, WndRequestSem, WM_VMSVGA3D_CREATEWINDOW, (WPARAM)pHwnd, (LPARAM)&cs);
 }
 

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-win.cpp

@@ -2564 +2564 @@
     PVMSVGA3DCONTEXT        pContext;
     HRESULT                 hr;
-    D3DPRESENT_PARAMETERS   PresParam;
     PVMSVGA3DSTATE          pState = pThisCC->svga.p3dState;
 
@@ -2611 +2610 @@
 
     /* Changed when the function returns. */
+    D3DPRESENT_PARAMETERS PresParam;
     PresParam.BackBufferWidth               = 0;
     PresParam.BackBufferHeight              = 0;
@@ -2628 +2628 @@
     PresParam.PresentationInterval          = D3DPRESENT_INTERVAL_IMMEDIATE;
 
-#ifdef VBOX_VMSVGA3D_WITH_WINE_OPENGL
+#if 0
+    VMSVGA3DCREATEDEVICEPARAMS Params = { pState, pContext, &PresParam, 0 };
+    rc = vmsvga3dSendThreadMessage(pState->pWindowThread, pState->WndRequestSem, WM_VMSVGA3D_CREATE_DEVICE, 0, (LPARAM)&Params);
+    AssertRCReturn(rc, rc);
+    hr = Params.hrc;
+
+#elif defined(VBOX_VMSVGA3D_WITH_WINE_OPENGL)
     hr = pState->pD3D9->CreateDevice(D3DADAPTER_DEFAULT,
                                      D3DDEVTYPE_HAL,
@@ -2636 +2642 @@
                                      &pContext->pDevice);
 #else
+    /** @todo Docs indicates that we should be using
+     * D3DCREATE_HARDWARE_VERTEXPROCESSING with W10 1607 and higher. 
+     * https://docs.microsoft.com/en-us/windows/win32/direct3d9/d3dcreate */ 
     hr = pState->pD3D9->CreateDeviceEx(D3DADAPTER_DEFAULT,
                                        D3DDEVTYPE_HAL,

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d.h

@@ -118 +118 @@
 # define WM_VMSVGA3D_DESTROYWINDOW              (WM_APP+3)
 # define WM_VMSVGA3D_EXIT                       (WM_APP+5)
+# if 0
+#  define WM_VMSVGA3D_CREATE_DEVICE             (WM_APP+6)
+typedef struct VMSVGA3DCREATEDEVICEPARAMS
+{
+    struct VMSVGA3DSTATE   *pState;
+    struct VMSVGA3DCONTEXT *pContext;
+    struct _D3DPRESENT_PARAMETERS_ *pPresParams;
+    HRESULT                 hrc;
+} VMSVGA3DCREATEDEVICEPARAMS;
+# endif
 
 DECLCALLBACK(int) vmsvga3dWindowThread(RTTHREAD ThreadSelf, void *pvUser);