Changeset 27458 in vbox for trunk/src/VBox

Timestamp:

Mar 17, 2010 4:46:14 PM (15 years ago)

Author:

vboxsync

Message:

wddm: some um display driver prototyping to make logon more happy

Location:

trunk/src/VBox/Additions/WINNT/Graphics

Files:

• Display/wddm/VBoxDispD3D.cpp (modified) (5 diffs)
• Display/wddm/VBoxDispD3D.h (added)
• Miniport/wddm/VBoxVideoWddm.cpp (modified) (11 diffs)

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

@@ -1 +1 @@
 /** @file
  *
- * VBoxVideo D3D
+ * VBoxVideo Display D3D User mode dll
  *
  * Copyright (C) 2010 Sun Microsystems, Inc.
@@ -23 +23 @@
 #include <iprt/initterm.h>
 #include <iprt/log.h>
+#include <iprt/mem.h>
+
 #include <VBox/Log.h>
 
 #include <VBox/VBoxGuestLib.h>
+
+#include "VBoxDispD3D.h"
+
+#ifdef VBOXWDDMDISP_DEBUG
+# include <stdio.h>
+#endif
 
 /**
@@ -38 +46 @@
         case DLL_PROCESS_ATTACH:
         {
-            RTR3Init();
-            VbglR3Init();
-
-            AssertBreakpoint();
-            LogRel(("VBoxDispD3D: DLL loaded.\n"));
-
-//            DisableThreadLibraryCalls(hInstance);
-//            hDllInstance = hInstance;
+            /* there __try __except are just to ensure the library does not assertion fail in case VBoxGuest is not present
+             * and VbglR3Init / VbglR3Term assertion fail */
+            __try
+            {
+//                LogRel(("VBoxDispD3D: DLL loaded.\n"));
+                RTR3Init();
+//                VbglR3Init();
+            }
+            __except (EXCEPTION_CONTINUE_EXECUTION)
+            {
+            }
+
             break;
         }
@@ -51 +63 @@
         case DLL_PROCESS_DETACH:
         {
-            LogRel(("VBoxDispD3D: DLL unloaded.\n"));
-            VbglR3Term();
+            /* there __try __except are just to ensure the library does not assertion fail in case VBoxGuest is not present
+             * and VbglR3Init / VbglR3Term assertion fail */
+//            __try
+//            {
+//                LogRel(("VBoxDispD3D: DLL unloaded.\n"));
+//                VbglR3Term();
+//            }
+//            __except (EXCEPTION_CONTINUE_EXECUTION)
+//            {
+//            }
             /// @todo RTR3Term();
             break;
@@ -63 +83 @@
 }
 
-__checkReturn HRESULT APIENTRY OpenAdapter(__inout D3DDDIARG_OPENADAPTER*  pOpenData)
-{
-    AssertBreakpoint();
+static HRESULT APIENTRY vboxWddmDispGetCaps (HANDLE hAdapter, CONST D3DDDIARG_GETCAPS* pData)
+{
+    vboxVDbgPrint(("==>"__FUNCTION__", hAdapter(0x%p), caps type(%d)\n", hAdapter, pData->Type));
+    AssertBreakpoint();
+
+    switch (pData->Type)
+    {
+        case D3DDDICAPS_DDRAW:
+        case D3DDDICAPS_DDRAW_MODE_SPECIFIC:
+        case D3DDDICAPS_GETFORMATCOUNT:
+        case D3DDDICAPS_GETFORMATDATA:
+        case D3DDDICAPS_GETMULTISAMPLEQUALITYLEVELS:
+        case D3DDDICAPS_GETD3DQUERYCOUNT:
+        case D3DDDICAPS_GETD3DQUERYDATA:
+        case D3DDDICAPS_GETD3D3CAPS:
+        case D3DDDICAPS_GETD3D5CAPS:
+        case D3DDDICAPS_GETD3D6CAPS:
+        case D3DDDICAPS_GETD3D7CAPS:
+        case D3DDDICAPS_GETD3D8CAPS:
+        case D3DDDICAPS_GETD3D9CAPS:
+        case D3DDDICAPS_GETDECODEGUIDCOUNT:
+        case D3DDDICAPS_GETDECODEGUIDS:
+        case D3DDDICAPS_GETDECODERTFORMATCOUNT:
+        case D3DDDICAPS_GETDECODERTFORMATS:
+        case D3DDDICAPS_GETDECODECOMPRESSEDBUFFERINFOCOUNT:
+        case D3DDDICAPS_GETDECODECOMPRESSEDBUFFERINFO:
+        case D3DDDICAPS_GETDECODECONFIGURATIONCOUNT:
+        case D3DDDICAPS_GETDECODECONFIGURATIONS:
+        case D3DDDICAPS_GETVIDEOPROCESSORDEVICEGUIDCOUNT:
+        case D3DDDICAPS_GETVIDEOPROCESSORDEVICEGUIDS:
+        case D3DDDICAPS_GETVIDEOPROCESSORRTFORMATCOUNT:
+        case D3DDDICAPS_GETVIDEOPROCESSORRTFORMATS:
+        case D3DDDICAPS_GETVIDEOPROCESSORRTSUBSTREAMFORMATCOUNT:
+        case D3DDDICAPS_GETVIDEOPROCESSORRTSUBSTREAMFORMATS:
+        case D3DDDICAPS_GETVIDEOPROCESSORCAPS:
+        case D3DDDICAPS_GETPROCAMPRANGE:
+        case D3DDDICAPS_FILTERPROPERTYRANGE:
+        case D3DDDICAPS_GETEXTENSIONGUIDCOUNT:
+        case D3DDDICAPS_GETEXTENSIONGUIDS:
+        case D3DDDICAPS_GETEXTENSIONCAPS:
+        case D3DDDICAPS_GETGAMMARAMPCAPS:
+            break;
+        default:
+            AssertBreakpoint();
+    }
+
+    vboxVDbgPrint(("<=="__FUNCTION__", hAdapter(0x%p), caps type(%d)\n", hAdapter, pData->Type));
+
     return S_OK;
 }
+
+static HRESULT APIENTRY vboxWddmDispCreateDevice (IN HANDLE hAdapter, IN D3DDDIARG_CREATEDEVICE* pCreateData)
+{
+    vboxVDbgPrint(("==>"__FUNCTION__", hAdapter(0x%p)\n", hAdapter));
+
+    AssertBreakpoint();
+
+    vboxVDbgPrint(("<=="__FUNCTION__", hAdapter(0x%p)\n", hAdapter));
+
+    return E_FAIL;
+}
+
+static HRESULT APIENTRY vboxWddmDispCloseAdapter (IN HANDLE hAdapter)
+{
+    vboxVDbgPrint(("==>"__FUNCTION__", hAdapter(0x%p)\n", hAdapter));
+
+    AssertBreakpoint();
+
+    RTMemFree(hAdapter);
+
+    vboxVDbgPrint(("<=="__FUNCTION__", hAdapter(0x%p)\n", hAdapter));
+
+    return S_OK;
+}
+
+HRESULT APIENTRY OpenAdapter (__inout D3DDDIARG_OPENADAPTER*  pOpenData)
+{
+    vboxVDbgPrint(("==>"__FUNCTION__"\n"));
+
+    AssertBreakpoint();
+
+    PVBOXWDDMDISP_ADAPTER pAdapter = (PVBOXWDDMDISP_ADAPTER)RTMemAllocZ(sizeof (VBOXWDDMDISP_ADAPTER));
+    Assert(pAdapter);
+    if (!pAdapter)
+    {
+        vboxVDbgPrintR((__FUNCTION__": RTMemAllocZ returned NULL\n"));
+        return E_OUTOFMEMORY;
+    }
+
+    pAdapter->hAdapter = pOpenData->hAdapter;
+    pAdapter->uIfVersion = pOpenData->Interface;
+    pAdapter->uRtVersion= pOpenData->Version;
+    pAdapter->RtCallbacks = *pOpenData->pAdapterCallbacks;
+
+    pOpenData->hAdapter = pAdapter;
+    pOpenData->pAdapterFuncs->pfnGetCaps = vboxWddmDispGetCaps;
+    pOpenData->pAdapterFuncs->pfnCreateDevice = vboxWddmDispCreateDevice;
+    pOpenData->pAdapterFuncs->pfnCloseAdapter = vboxWddmDispCloseAdapter;
+    pOpenData->DriverVersion = D3D_UMD_INTERFACE_VERSION;
+
+    vboxVDbgPrint(("<=="__FUNCTION__", pAdapter(0x%p)\n", pAdapter));
+
+    return S_OK;
+}
+
+#ifdef VBOXWDDMDISP_DEBUG
+VOID vboxVDbgDoPrint(LPCSTR szString, ...)
+{
+    char szBuffer[1024] = {0};
+    va_list pArgList;
+    va_start(pArgList, szString);
+    _vsnprintf(szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0]), szString, pArgList);
+    va_end(pArgList);
+
+    OutputDebugStringA(szBuffer);
+}
+#endif

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

@@ -770 +770 @@
     )
 {
-    dfprintf(("==> "__FUNCTION__ ", context(0x%p), msg(0x%x)\n", MiniportDeviceContext, MessageNumber));
+//    dfprintf(("==> "__FUNCTION__ ", context(0x%p), msg(0x%x)\n", MiniportDeviceContext, MessageNumber));
 
     vboxVDbgBreakFv();
@@ -865 +865 @@
     }
 
-    dfprintf(("<== "__FUNCTION__ ", context(0x%p), bOur(0x%x)\n", MiniportDeviceContext, (ULONG)bOur));
+//    dfprintf(("<== "__FUNCTION__ ", context(0x%p), bOur(0x%x)\n", MiniportDeviceContext, (ULONG)bOur));
 
     return bOur;
@@ -899 +899 @@
     )
 {
-    dfprintf(("==> "__FUNCTION__ ", context(0x%p)\n", MiniportDeviceContext));
+//    dfprintf(("==> "__FUNCTION__ ", context(0x%p)\n", MiniportDeviceContext));
 
     vboxVDbgBreakFv();
@@ -934 +934 @@
         pDevExt->u.primary.DxgkInterface.DxgkCbNotifyDpc(pDevExt->u.primary.DxgkInterface.DeviceHandle);
 
-    dfprintf(("<== "__FUNCTION__ ", context(0x%p)\n", MiniportDeviceContext));
+//    dfprintf(("<== "__FUNCTION__ ", context(0x%p)\n", MiniportDeviceContext));
 }
 
@@ -1695 +1695 @@
     NTSTATUS Status = STATUS_SUCCESS;
 
-    dfprintf(("==> "__FUNCTION__ ", context(0x%x)\n", hAdapter));
+//    dfprintf(("==> "__FUNCTION__ ", context(0x%x)\n", hAdapter));
 
     vboxVDbgBreakFv();
@@ -1737 +1737 @@
     vboxVdmaCBufDrSubmit (pDevExt, &pDevExt->u.primary.Vdma, pDr);
 
-    dfprintf(("<== "__FUNCTION__ ", context(0x%x)\n", hAdapter));
+//    dfprintf(("<== "__FUNCTION__ ", context(0x%x)\n", hAdapter));
 
     return Status;
@@ -1791 +1791 @@
         case DXGK_OPERATION_DISCARD_CONTENT:
         {
-            AssertBreakpoint();
+//            AssertBreakpoint();
             break;
         }
@@ -1833 +1833 @@
     dfprintf(("==> "__FUNCTION__ ", hAdapter(0x%x)\n", hAdapter));
 
-    AssertBreakpoint();
+    vboxVDbgBreakFv();
     /* @todo: fixme: implement */
 
@@ -1847 +1847 @@
     CONST DXGKARG_SETPOINTERSHAPE*  pSetPointerShape)
 {
-    dfprintf(("==> "__FUNCTION__ ", hAdapter(0x%x)\n", hAdapter));
-
-    AssertBreakpoint();
+//    dfprintf(("==> "__FUNCTION__ ", hAdapter(0x%x)\n", hAdapter));
+
+    vboxVDbgBreakFv();
     /* @todo: fixme: implement */
 
-    dfprintf(("<== "__FUNCTION__ ", hAdapter(0x%x)\n", hAdapter));
+//    dfprintf(("<== "__FUNCTION__ ", hAdapter(0x%x)\n", hAdapter));
 
     return STATUS_NOT_SUPPORTED;
@@ -2665 +2665 @@
     PAGED_CODE();
 
-    dfprintf(("==> "__FUNCTION__ ", hContext(0x%x)\n", hContext));
+//    dfprintf(("==> "__FUNCTION__ ", hContext(0x%x)\n", hContext));
 
     vboxVDbgBreakFv();
@@ -2783 +2783 @@
     }
 
-    dfprintf(("<== "__FUNCTION__ ", hContext(0x%x), Status(0x%x)\n", hContext, Status));
+//    dfprintf(("<== "__FUNCTION__ ", hContext(0x%x), Status(0x%x)\n", hContext, Status));
 
     return Status;