[PATCH 05/12] d3d9/query: Explicitly return sizeof(BOOL) in IDirect3DQuery9Impl_GetDataSize() for D3DQUERYTYPE_TIMESTAMPDISJOINT.
Adam Martinson
amartinson at codeweavers.com
Wed May 4 11:25:45 CDT 2011
---
dlls/d3d9/query.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/dlls/d3d9/query.c b/dlls/d3d9/query.c
index 4accc6a..562f2f7 100644
--- a/dlls/d3d9/query.c
+++ b/dlls/d3d9/query.c
@@ -110,11 +110,16 @@ static DWORD WINAPI IDirect3DQuery9Impl_GetDataSize(IDirect3DQuery9 *iface)
{
IDirect3DQuery9Impl *This = impl_from_IDirect3DQuery9(iface);
DWORD ret;
+ D3DQUERYTYPE type;
TRACE("iface %p.\n", iface);
wined3d_mutex_lock();
- ret = wined3d_query_get_data_size(This->wineD3DQuery);
+ type = wined3d_query_get_type(This->wineD3DQuery);
+ if (type == D3DQUERYTYPE_TIMESTAMPDISJOINT)
+ ret = sizeof(BOOL);
+ else
+ ret = wined3d_query_get_data_size(This->wineD3DQuery);
wined3d_mutex_unlock();
return ret;
--
1.7.1
--------------020407030507000107030307
Content-Type: text/x-patch;
name="0006-d3d9-tests-Add-tests-for-D3DQUERY_TIMESTAMP-queries.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename*0="0006-d3d9-tests-Add-tests-for-D3DQUERY_TIMESTAMP-queries.pat";
filename*1="ch"
More information about the wine-devel
mailing list