Jacek Caban : d3d10core: Use proper helpers for iface calls.

Alexandre Julliard julliard at winehq.org
Tue Aug 28 14:44:40 CDT 2012


Module: wine
Branch: master
Commit: 57074556d2d8512a827a788444b54f82131ed2cf
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=57074556d2d8512a827a788444b54f82131ed2cf

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Tue Aug 28 11:10:45 2012 +0200

d3d10core: Use proper helpers for iface calls.

---

 dlls/d3d10core/tests/device.c |    2 +-
 dlls/d3d10core/texture.c      |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c
index b0907ba..57a61c4 100644
--- a/dlls/d3d10core/tests/device.c
+++ b/dlls/d3d10core/tests/device.c
@@ -367,7 +367,7 @@ float4 main(const float4 color : COLOR) : SV_TARGET
     hr = ID3D10Device_CreatePixelShader(device, ps_4_0, sizeof(ps_4_0), &ps);
     ok(SUCCEEDED(hr), "Failed to create SM4 vertex shader, hr %#x\n", hr);
     if (ps)
-        ID3D10VertexShader_Release(ps);
+        ID3D10PixelShader_Release(ps);
 }
 
 START_TEST(device)
diff --git a/dlls/d3d10core/texture.c b/dlls/d3d10core/texture.c
index 718d019..41bd80f 100644
--- a/dlls/d3d10core/texture.c
+++ b/dlls/d3d10core/texture.c
@@ -50,7 +50,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture2d_QueryInterface(ID3D10Texture2D
     if (This->dxgi_surface)
     {
         TRACE("Forwarding to dxgi surface\n");
-        return IDXGISurface_QueryInterface(This->dxgi_surface, riid, object);
+        return IUnknown_QueryInterface(This->dxgi_surface, riid, object);
     }
 
     WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(riid));
@@ -76,7 +76,7 @@ static void STDMETHODCALLTYPE d3d10_texture2d_wined3d_object_released(void *pare
 {
     struct d3d10_texture2d *This = parent;
 
-    if (This->dxgi_surface) IDXGISurface_Release(This->dxgi_surface);
+    if (This->dxgi_surface) IUnknown_Release(This->dxgi_surface);
     HeapFree(GetProcessHeap(), 0, This);
 }
 
@@ -270,7 +270,7 @@ HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_devic
     {
         WARN("Failed to create wined3d texture, hr %#x.\n", hr);
         if (texture->dxgi_surface)
-            IDXGISurface_Release(texture->dxgi_surface);
+            IUnknown_Release(texture->dxgi_surface);
         return hr;
     }
 




More information about the wine-cvs mailing list