[PATCH 05/10] d3d11: Allow to pass NULL as "query" to d3d10_device_CreateQuery().
Józef Kucia
jkucia at codeweavers.com
Tue Apr 5 03:22:07 CDT 2016
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
---
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,
--
2.4.10
More information about the wine-patches
mailing list