d3d9: Fix GetDevice() for surfaces that are part of a texture.

If the surface is part of a texture it doesn't keep its own reference to the device, but instead relies on the reference the texture has. This fixes a regression introduced by ff92e6eb.

d3d9: Fix GetDevice() for surfaces that are part of a texture.
89c96ca3 · Henri Verbeet · Alexandre Julliard · 179cee08 · 89c96ca3
Commit 89c96ca3 authored Dec 07, 2009 by Henri Verbeet Committed by Alexandre Julliard Dec 07, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 17 additions and 0 deletions

surface.c dlls/d3d9/surface.c +17 -0

No files found.
--- a/dlls/d3d9/surface.c
+++ b/dlls/d3d9/surface.c
@@ -108,6 +108,23 @@ static HRESULT WINAPI IDirect3DSurface9Impl_GetDevice(IDirect3DSurface9 *iface, 

    TRACE("iface %p, device %p.\n", iface, device);

+    if (This->forwardReference)
+    {
+        IDirect3DResource9 *resource;
+        HRESULT hr;
+
+        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;
+    }
+
    *device = (IDirect3DDevice9 *)This->parentDevice;
    IDirect3DDevice9_AddRef(*device);