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

Timestamp:

Dec 13, 2010 10:41:08 AM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

68810

Message:

wddm/wine/3d: get rid of libWine, 64bit wine build (not tested yet), bugfixing

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm

Files:

• VBoxDispD3D.rc (modified) (1 diff)
• VBoxUhgsmiKmt.cpp (modified) (2 diffs)

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

@@ -38 +38 @@
          VALUE "FileDescription",  "VirtualBox Video Usermode D3D 64bit Driver\0"
          VALUE "FileVersion",      VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0"
-         VALUE "InternalName",     "VBoxDispD3D64\0"
+         VALUE "InternalName",     "VBoxDispD3D\0"
          VALUE "LegalCopyright",   VBOX_RC_LEGAL_COPYRIGHT
-         VALUE "OriginalFilename", "VBoxDispD3D64.dll\0"
+         VALUE "OriginalFilename", "VBoxDispD3D.dll\0"
          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/VBoxUhgsmiKmt.cpp

@@ -583 +583 @@
     memset(&DDev, 0, sizeof (DDev));
     DDev.cb = sizeof (DDev);
+
+    *phDc = NULL;
 
     for (int i = 0; ; ++i)
@@ -623 +625 @@
 {
     D3DKMT_OPENADAPTERFROMHDC OpenAdapterData = {0};
-    OpenAdapterData.hDc = GetWindowDC(NULL);
     HRESULT hr = vboxDispKmtAdpHdcCreate(&OpenAdapterData.hDc);
-    if (OpenAdapterData.hDc)
-    {
+    if (hr == S_OK)
+    {
+        Assert(OpenAdapterData.hDc);
         NTSTATUS Status = pCallbacks->pfnD3DKMTOpenAdapterFromHdc(&OpenAdapterData);
 #ifdef DEBUG_misha