Changeset 25949 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/volume.c

Timestamp:

Jan 21, 2010 9:26:23 AM (15 years ago)

Author:

vboxsync

Message:

crOpenGL: update to wine 1.1.36 and disable unnecessary fbo state poll

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/volume.c (modified) (13 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/volume.c

@@ -38 +38 @@
     IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface;
 
+    TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj);
+
     if (IsEqualGUID(riid, &IID_IUnknown)
         || IsEqualGUID(riid, &IID_IDirect3DVolume9)) {
@@ -53 +55 @@
     IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface;
 
-    TRACE("(%p)\n", This);
+    TRACE("iface %p.\n", iface);
 
     if (This->forwardReference) {
@@ -62 +64 @@
         /* No container, handle our own refcounting */
         ULONG ref = InterlockedIncrement(&This->ref);
-        TRACE("(%p) : AddRef from %d\n", This, ref - 1);
+
+        TRACE("%p increasing refcount to %u.\n", iface, ref);
 
         if (ref == 1)
@@ -78 +81 @@
     IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface;
 
-    TRACE("(%p)\n", This);
+    TRACE("iface %p.\n", iface);
 
     if (This->forwardReference) {
@@ -87 +90 @@
         /* No container, handle our own refcounting */
         ULONG ref = InterlockedDecrement(&This->ref);
-        TRACE("(%p) : ReleaseRef to %d\n", This, ref);
+
+        TRACE("%p decreasing refcount to %u.\n", iface, ref);
 
         if (ref == 0) {
@@ -100 +104 @@
 
 /* IDirect3DVolume9 Interface follow: */
-static HRESULT WINAPI IDirect3DVolume9Impl_GetDevice(LPDIRECT3DVOLUME9 iface, IDirect3DDevice9** ppDevice) {
-    IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface;
-    IWineD3DDevice       *myDevice = NULL;
-
-    TRACE("iface %p, ppDevice %p\n", iface, ppDevice);
-
-    wined3d_mutex_lock();
-
-    IWineD3DVolume_GetDevice(This->wineD3DVolume, &myDevice);
-    IWineD3DDevice_GetParent(myDevice, (IUnknown **)ppDevice);
-    IWineD3DDevice_Release(myDevice);
-
-    wined3d_mutex_unlock();
-
-    return D3D_OK;
+static HRESULT WINAPI IDirect3DVolume9Impl_GetDevice(IDirect3DVolume9 *iface, IDirect3DDevice9 **device)
+{
+    IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface;
+    IDirect3DResource9 *resource;
+    HRESULT hr;
+
+    TRACE("iface %p, device %p.\n", iface, device);
+
+    hr = IUnknown_QueryInterface(This->forwardReference, &IID_IDirect3DResource9, (void **)&resource);
+    if (SUCCEEDED(hr))
+    {
+        hr = IDirect3DResource9_GetDevice(resource, device);
+        IDirect3DResource9_Release(resource);
+
+        TRACE("Returning device %p.\n", *device);
+    }
+
+    return hr;
 }
 
@@ -121 +128 @@
     HRESULT hr;
 
-    TRACE("(%p) Relay\n", This);
+    TRACE("iface %p, guid %s, data %p, data_size %u, flags %#x.\n",
+            iface, debugstr_guid(refguid), pData, SizeOfData, Flags);
 
     wined3d_mutex_lock();
@@ -136 +144 @@
     HRESULT hr;
 
-    TRACE("(%p) Relay\n", This);
+    TRACE("iface %p, guid %s, data %p, data_size %p.\n",
+            iface, debugstr_guid(refguid), pData, pSizeOfData);
 
     wined3d_mutex_lock();
@@ -151 +160 @@
     HRESULT hr;
 
-    TRACE("(%p) Relay\n", This);
+    TRACE("iface %p, guid %s.\n", iface, debugstr_guid(refguid));
 
     wined3d_mutex_lock();
@@ -166 +175 @@
     HRESULT res;
 
-    TRACE("(This %p, riid %s, ppContainer %p)\n", This, debugstr_guid(riid), ppContainer);
+    TRACE("iface %p, riid %s, container %p.\n", iface, debugstr_guid(riid), ppContainer);
 
     if (!This->container) return E_NOINTERFACE;
@@ -186 +195 @@
     HRESULT hr;
 
-    TRACE("(%p) Relay\n", This);
+    TRACE("iface %p, desc %p.\n", iface, pDesc);
 
     wined3d_mutex_lock();
@@ -212 +221 @@
     HRESULT hr;
 
-    TRACE("(%p) relay %p %p %p %d\n", This, This->wineD3DVolume, pLockedVolume, pBox, Flags);
+    TRACE("iface %p, locked_box %p, box %p, flags %#x.\n",
+            iface, pLockedVolume, pBox, Flags);
 
     wined3d_mutex_lock();
@@ -228 +238 @@
     HRESULT hr;
 
-    TRACE("(%p) relay %p\n", This, This->wineD3DVolume);
+    TRACE("iface %p.\n", iface);
 
     wined3d_mutex_lock();