=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: d3d11: Allow to pass NULL as "query" to d3d10_device_CreateQuery().
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Apr 5 11:07:33 CDT 2016
Module: wine
Branch: master
Commit: 94ec23b8cde429b20094bb56f2daac9f7d4cfc7c
URL: http://source.winehq.org/git/wine.git/?a=commit;h=94ec23b8cde429b20094bb56f2daac9f7d4cfc7c
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Tue Apr 5 10:22:07 2016 +0200
d3d11: Allow to pass NULL as "query" to d3d10_device_CreateQuery().
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/d3d11/device.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
index 0e427a3..f0bb52e 100644
--- a/dlls/d3d11/device.c
+++ b/dlls/d3d11/device.c
@@ -4610,9 +4610,14 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateQuery(ID3D10Device1 *iface,
if (FAILED(hr = d3d_query_create(device, (const D3D11_QUERY_DESC *)desc, FALSE, &object)))
return hr;
- *query = &object->ID3D10Query_iface;
+ if (query)
+ {
+ *query = &object->ID3D10Query_iface;
+ return S_OK;
+ }
- return S_OK;
+ ID3D10Query_Release(&object->ID3D10Query_iface);
+ return S_FALSE;
}
static HRESULT STDMETHODCALLTYPE d3d10_device_CreatePredicate(ID3D10Device1 *iface,
More information about the wine-cvs
mailing list