[PATCH 04/12] d3d9/query: Use D3DQUERYTYPE instead of HRESULT in IDirect3DQuery9Impl_GetType().

Adam Martinson amartinson at codeweavers.com
Wed May 4 11:12:28 CDT 2011


---
 dlls/d3d9/query.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/d3d9/query.c b/dlls/d3d9/query.c
index 5e1bf12..4accc6a 100644
--- a/dlls/d3d9/query.c
+++ b/dlls/d3d9/query.c
@@ -95,15 +95,15 @@ static HRESULT WINAPI IDirect3DQuery9Impl_GetDevice(IDirect3DQuery9 *iface,
 static D3DQUERYTYPE WINAPI IDirect3DQuery9Impl_GetType(IDirect3DQuery9 *iface)
 {
     IDirect3DQuery9Impl *This = impl_from_IDirect3DQuery9(iface);
-    HRESULT hr;
+    D3DQUERYTYPE type;
 
     TRACE("iface %p.\n", iface);
 
     wined3d_mutex_lock();
-    hr = wined3d_query_get_type(This->wineD3DQuery);
+    type = wined3d_query_get_type(This->wineD3DQuery);
     wined3d_mutex_unlock();
 
-    return hr;
+    return type;
 }
 
 static DWORD WINAPI IDirect3DQuery9Impl_GetDataSize(IDirect3DQuery9 *iface)
-- 
1.7.1


--------------020407030507000107030307
Content-Type: text/x-patch;
 name="0005-d3d9-query-Explicitly-return-sizeof-BOOL-in-IDirect3.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename*0="0005-d3d9-query-Explicitly-return-sizeof-BOOL-in-IDirect3.pa";
 filename*1="tch"



More information about the wine-devel mailing list