Changeset 46661 in vbox for trunk/src/VBox/Additions/WINNT/Graphics

Timestamp:

Jun 19, 2013 2:21:36 PM (12 years ago)

Author:

vboxsync

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

86551

Message:

wine: uninit fix

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/d3d9/device.c (modified) (5 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/d3d9/device.c

@@ -288 +288 @@
     unsigned i;
     LONG refs = device->refcount;
+    LONG wined3d_refs;
     device->in_destruction = TRUE;
 
@@ -311 +312 @@
     wined3d_device_release_focus_window(device->wined3d_device);
 # endif
-    wined3d_device_decref(device->wined3d_device);
+    wined3d_refs = wined3d_device_decref(device->wined3d_device);
     wined3d_mutex_unlock();
 
@@ -318 +319 @@
     HeapFree(GetProcessHeap(), 0, device);
 
-    return refs - 1;
+    return wined3d_refs;
 }
 #endif
@@ -3912 +3913 @@
 {
     struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface);
+    struct wined3d_device *wined3d_device = device->wined3d_device;
     LONG wined3d_refs;
     if (device->refcount != 1)
@@ -3921 +3923 @@
     {
         ERR("unexpected wined3dRefs %d, destroying in anyway", wined3d_refs);
-        while (wined3d_device_decref(device->wined3d_device)) {}
+        while (wined3d_device_decref(wined3d_device)) {}
     }
     return D3D_OK;