April 2016 - Wine-Commits - list.winehq.org

Józef Kucia : d3d11: Fix return values returned by D3D11CreateDevice functions.
by Alexandre Julliard April 5, 2016

April 5, 2016

Module: wine Branch: master Commit: 1b3399ce07cce26df01b0027e0169927678c764a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b3399ce07cce26df01b0027e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 5 10:22:11 2016 +0200 d3d11: Fix return values returned by D3D11CreateDevice functions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/d3d11_main.c b/dlls/d3d11/d3d11_main.c index 3c21037..b4a00c8 100644 --- a/dlls/d3d11/d3d11_main.c +++ b/dlls/d3d11/d3d11_main.c @@ -295,7 +295,7 @@ HRESULT WINAPI D3D11CreateDevice(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_t else ID3D11Device_Release(device); - return S_OK; + return (device_out || immediate_context) ? S_OK : S_FALSE; } HRESULT WINAPI D3D11CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type, @@ -367,7 +367,7 @@ HRESULT WINAPI D3D11CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D_DRIVER_T else ID3D11Device_Release(device); - return S_OK; + return (swapchain || device_out || immediate_context) ? S_OK : S_FALSE; cleanup: ID3D11Device_Release(device);

1 0

Józef Kucia : d3d11: Allow to pass NULL as "predicate " to d3d10_device_CreatePredicate().
by Alexandre Julliard April 5, 2016

April 5, 2016

Module: wine Branch: master Commit: ccfda14c69f28ef769073f29dab2d9195c953bce URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccfda14c69f28ef769073f29d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 5 10:22:06 2016 +0200 d3d11: Allow to pass NULL as "predicate" to d3d10_device_CreatePredicate(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)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 5a5eeae..0e427a3 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -4627,9 +4627,14 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreatePredicate(ID3D10Device1 *ifa if (FAILED(hr = d3d_query_create(device, (const D3D11_QUERY_DESC *)desc, TRUE, &object))) return hr; - *predicate = (ID3D10Predicate *)&object->ID3D10Query_iface; + if (predicate) + { + *predicate = (ID3D10Predicate *)&object->ID3D10Query_iface; + return S_OK; + } - return S_OK; + ID3D10Query_Release(&object->ID3D10Query_iface); + return S_FALSE; } static HRESULT STDMETHODCALLTYPE d3d10_device_CreateCounter(ID3D10Device1 *iface,

1 0

Józef Kucia : d3d11: Allow to pass NULL as "predicate " to d3d11_device_CreatePredicate().
by Alexandre Julliard April 5, 2016

April 5, 2016

Module: wine Branch: master Commit: 82391da9607573f2361469eb2d9f8269db06acfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=82391da9607573f2361469eb2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 5 10:22:05 2016 +0200 d3d11: Allow to pass NULL as "predicate" to d3d11_device_CreatePredicate(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)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 d1b817b..5a5eeae 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2508,9 +2508,14 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreatePredicate(ID3D11Device *ifac if (FAILED(hr = d3d_query_create(device, desc, TRUE, &object))) return hr; - *predicate = (ID3D11Predicate *)&object->ID3D11Query_iface; + if (predicate) + { + *predicate = (ID3D11Predicate *)&object->ID3D11Query_iface; + return S_OK; + } - return S_OK; + ID3D11Query_Release(&object->ID3D11Query_iface); + return S_FALSE; } static HRESULT STDMETHODCALLTYPE d3d11_device_CreateCounter(ID3D11Device *iface, const D3D11_COUNTER_DESC *desc,

1 0

Józef Kucia : d3d11: Allow to pass NULL as "query" to d3d11_device_CreateQuery().
by Alexandre Julliard April 5, 2016

April 5, 2016

Module: wine Branch: master Commit: 72e079d7a6c3c2a1d61b90c9427516db4d451684 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72e079d7a6c3c2a1d61b90c94… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 5 10:22:04 2016 +0200 d3d11: Allow to pass NULL as "query" to d3d11_device_CreateQuery(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)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 4e84dad..d1b817b 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2486,9 +2486,14 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateQuery(ID3D11Device *iface, if (FAILED(hr = d3d_query_create(device, desc, FALSE, &object))) return hr; - *query = &object->ID3D11Query_iface; + if (query) + { + *query = &object->ID3D11Query_iface; + return S_OK; + } - return S_OK; + ID3D11Query_Release(&object->ID3D11Query_iface); + return S_FALSE; } static HRESULT STDMETHODCALLTYPE d3d11_device_CreatePredicate(ID3D11Device *iface, const D3D11_QUERY_DESC *desc,

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard April 5, 2016

April 5, 2016

Module: wine Branch: master Commit: 1a938ceb879f0d6d30a94362c7908680ec421cda URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a938ceb879f0d6d30a94362c… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Mon Apr 4 22:30:33 2016 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/po/lt.po b/po/lt.po index a5ded30..06d414f 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-03-01 22:44+0300\n" +"PO-Revision-Date: 2016-04-04 22:30+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -11643,6 +11643,7 @@ msgid "" "reg: Unable to delete all registry values in '%1'. An unexpected error " "occurred.\n" msgstr "" +"reg: Nepavyko pašalinti visų „%1“ registro reikšmių. Įvyko netikėta klaida.\n" #: regedit.rc:34 msgid "&Registry"

1 0

Henri Verbeet : wined3d: Avoid surface_from_resource() in surface_load_ds_location().
by Alexandre Julliard April 5, 2016

April 5, 2016

Module: wine Branch: master Commit: 4f3648705ed1914ee34951c7c07bdd49fb314f7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f3648705ed1914ee34951c7c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 4 18:43:01 2016 +0200 wined3d: Avoid surface_from_resource() in surface_load_ds_location(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2b8db06..16d03e8 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2861,7 +2861,7 @@ static void surface_load_ds_location(struct wined3d_surface *surface, struct win /* Note that we use depth_blt here as well, rather than glCopyTexImage2D * directly on the FBO texture. That's because we need to flip. */ context_apply_fbo_state_blit(context, GL_FRAMEBUFFER, - surface_from_resource(wined3d_texture_get_sub_resource(context->swapchain->front_buffer, 0)), + wined3d_texture_get_sub_resource(context->swapchain->front_buffer, 0)->u.surface, NULL, WINED3D_LOCATION_DRAWABLE); if (surface->texture_target == GL_TEXTURE_RECTANGLE_ARB) { @@ -2907,7 +2907,7 @@ static void surface_load_ds_location(struct wined3d_surface *surface, struct win TRACE("Copying depth texture to onscreen depth buffer.\n"); context_apply_fbo_state_blit(context, GL_FRAMEBUFFER, - surface_from_resource(wined3d_texture_get_sub_resource(context->swapchain->front_buffer, 0)), + wined3d_texture_get_sub_resource(context->swapchain->front_buffer, 0)->u.surface, NULL, WINED3D_LOCATION_DRAWABLE); surface_depth_blt(surface, context, texture->texture_rgb.name, 0, surface->pow2Height - h, w, h, surface->texture_target);

1 0

Jacek Caban : mshtml: Event tests code clean up.
by Alexandre Julliard April 5, 2016

April 5, 2016

Module: wine Branch: master Commit: 529a7ed55fa63b48afb27f7f454696c880a3039b URL: http://source.winehq.org/git/wine.git/?a=commit;h=529a7ed55fa63b48afb27f7f4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 4 18:02:04 2016 +0200 mshtml: Event tests code clean up. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/events.c | 51 ++++++++++++++++++---------------------------- 1 file changed, 20 insertions(+), 31 deletions(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index c3aa352..ad0547e 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -295,6 +295,7 @@ static IHTMLElement *_get_elem_id(unsigned line, IHTMLDocument2 *doc, const char SysFreeString(str); IHTMLDocument3_Release(doc3); ok_(__FILE__,line) (hres == S_OK, "getElementById failed: %08x\n", hres); + ok_(__FILE__,line) (elem != NULL, "elem == NULL\n"); return elem; } @@ -2206,48 +2207,36 @@ static void test_timeout(IHTMLDocument2 *doc) IHTMLWindow3_Release(win3); } -static IHTMLElement* find_element_by_id(IHTMLDocument2 *doc, const char *id) +static IHTMLWindow2 *get_iframe_window(IHTMLIFrameElement *iframe) { + IHTMLWindow2 *window; + IHTMLFrameBase2 *base; HRESULT hres; - IHTMLDocument3 *doc3; - IHTMLElement *result; - BSTR idW = a2bstr(id); - hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument3, (void**)&doc3); - ok(hres == S_OK, "QueryInterface(IID_IHTMLDocument3) failed: %08x\n", hres); + hres = IHTMLIFrameElement_QueryInterface(iframe, &IID_IHTMLFrameBase2, (void**)&base); + ok(hres == S_OK, "QueryInterface(IID_IHTMLFrameBase2) failed: %08x\n", hres); - hres = IHTMLDocument3_getElementById(doc3, idW, &result); - ok(hres == S_OK, "getElementById failed: %08x\n", hres); - ok(result != NULL, "result == NULL\n"); - SysFreeString(idW); + hres = IHTMLFrameBase2_get_contentWindow(base, &window); + ok(hres == S_OK, "get_contentWindow failed: %08x\n", hres); + ok(window != NULL, "window == NULL\n"); - IHTMLDocument3_Release(doc3); - return result; + if(base) IHTMLFrameBase2_Release(base); + return window; } -static IHTMLDocument2* get_iframe_doc(IHTMLIFrameElement *iframe) +static IHTMLDocument2 *get_iframe_doc(IHTMLIFrameElement *iframe) { - HRESULT hres; - IHTMLFrameBase2 *base; IHTMLDocument2 *result = NULL; + IHTMLWindow2 *window; + HRESULT hres; - hres = IHTMLIFrameElement_QueryInterface(iframe, &IID_IHTMLFrameBase2, (void**)&base); - ok(hres == S_OK, "QueryInterface(IID_IHTMLFrameBase2) failed: %08x\n", hres); - if(hres == S_OK) { - IHTMLWindow2 *window; + window = get_iframe_window(iframe); - hres = IHTMLFrameBase2_get_contentWindow(base, &window); - ok(hres == S_OK, "get_contentWindow failed: %08x\n", hres); - ok(window != NULL, "window == NULL\n"); - if(window) { - hres = IHTMLWindow2_get_document(window, &result); - ok(hres == S_OK, "get_document failed: %08x\n", hres); - ok(result != NULL, "result == NULL\n"); - IHTMLWindow2_Release(window); - } - } - if(base) IHTMLFrameBase2_Release(base); + hres = IHTMLWindow2_get_document(window, &result); + ok(hres == S_OK, "get_document failed: %08x\n", hres); + ok(result != NULL, "result == NULL\n"); + IHTMLWindow2_Release(window); return result; } @@ -2263,7 +2252,7 @@ static void test_iframe_connections(IHTMLDocument2 *doc) trace("iframe tests...\n"); - element = find_element_by_id(doc, "ifr"); + element = get_elem_id(doc, "ifr"); iframe = get_iframe_iface((IUnknown*)element); IHTMLElement_Release(element);

1 0

Jacek Caban : mshtml: Added IHTMLWindow6:: postMessage semi-stub implementation.
by Alexandre Julliard April 5, 2016

April 5, 2016

Module: wine Branch: master Commit: 6fd383e8dfd7d2253f26a7a6462fd06e10c0c1c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fd383e8dfd7d2253f26a7a64… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 4 18:01:57 2016 +0200 mshtml: Added IHTMLWindow6::postMessage semi-stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 12 ++++++++++-- dlls/mshtml/tests/jstest.html | 10 ++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index ec333bc..9092b47 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2134,8 +2134,16 @@ static HRESULT WINAPI HTMLWindow6_get_maxConnectionsPerServer(IHTMLWindow6 *ifac static HRESULT WINAPI HTMLWindow6_postMessage(IHTMLWindow6 *iface, BSTR msg, VARIANT targetOrigin) { HTMLWindow *This = impl_from_IHTMLWindow6(iface); - FIXME("(%p)->(%s %s)\n", This, debugstr_w(msg), debugstr_variant(&targetOrigin)); - return E_NOTIMPL; + + FIXME("(%p)->(%s %s) semi-stub\n", This, debugstr_w(msg), debugstr_variant(&targetOrigin)); + + if(!This->inner_window->doc) { + FIXME("No document\n"); + return E_FAIL; + } + + fire_event(This->inner_window->doc, EVENTID_MESSAGE, TRUE, &This->inner_window->doc->node, NULL, NULL); + return S_OK; } static HRESULT WINAPI HTMLWindow6_toStaticHTML(IHTMLWindow6 *iface, BSTR bstrHTML, BSTR *pbstrStaticHTML) diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index 2a5a447..00dd35d 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -362,6 +362,15 @@ function test_xhr() { ok(typeof(xhr) === "object", "typeof(xhr) = " + typeof(xhr)); } +function test_sendMessage() { + var onmessage_called = false; + window.onmessage = function() { + onmessage_called = true; + } + window.postMessage("test", "*"); + ok(onmessage_called, "onmessage not called"); +} + var globalVar = false; function runTests() { @@ -388,6 +397,7 @@ function runTests() { test_language_attribute(); test_text_node(); test_xhr(); + test_sendMessage(); var r = window.execScript("globalVar = true;"); ok(r === undefined, "execScript returned " + r);

1 0

Józef Kucia : d3d11/tests: Add test for ID3D11Device_CreateQuery().
by Alexandre Julliard April 5, 2016

April 5, 2016

Module: wine Branch: master Commit: 9e4388f6ec1ededee1ee0048ce06f34c5e50a898 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e4388f6ec1ededee1ee0048c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 5 10:22:09 2016 +0200 d3d11/tests: Add test for ID3D11Device_CreateQuery(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 96 +++++++++++++++++++++++++++++++++++------------- 1 file changed, 70 insertions(+), 26 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 548636a..a38afc9 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -2887,46 +2887,96 @@ static void test_create_rasterizer_state(void) ok(!refcount, "Device has %u references left.\n", refcount); } -static void test_create_predicate(void) +static void test_create_query(void) { - static const D3D11_QUERY other_queries[] = - { - D3D11_QUERY_EVENT, - D3D11_QUERY_OCCLUSION, - D3D11_QUERY_TIMESTAMP, - D3D11_QUERY_TIMESTAMP_DISJOINT, - D3D11_QUERY_PIPELINE_STATISTICS, - D3D11_QUERY_SO_STATISTICS, - D3D11_QUERY_SO_STATISTICS_STREAM0, - D3D11_QUERY_SO_STATISTICS_STREAM1, - D3D11_QUERY_SO_STATISTICS_STREAM2, - D3D11_QUERY_SO_STATISTICS_STREAM3, + static const struct + { + D3D11_QUERY query; + D3D_FEATURE_LEVEL required_feature_level; + BOOL is_predicate; + BOOL can_use_create_predicate; + BOOL todo; + } + tests[] = + { + {D3D11_QUERY_EVENT, D3D_FEATURE_LEVEL_10_0, FALSE, FALSE, FALSE}, + {D3D11_QUERY_OCCLUSION, D3D_FEATURE_LEVEL_10_0, FALSE, FALSE, FALSE}, + {D3D11_QUERY_TIMESTAMP, D3D_FEATURE_LEVEL_10_0, FALSE, FALSE, FALSE}, + {D3D11_QUERY_TIMESTAMP_DISJOINT, D3D_FEATURE_LEVEL_10_0, FALSE, FALSE, FALSE}, + {D3D11_QUERY_PIPELINE_STATISTICS, D3D_FEATURE_LEVEL_10_0, FALSE, FALSE, TRUE}, + {D3D11_QUERY_OCCLUSION_PREDICATE, D3D_FEATURE_LEVEL_10_0, TRUE, TRUE, FALSE}, + {D3D11_QUERY_SO_STATISTICS, D3D_FEATURE_LEVEL_10_0, FALSE, FALSE, TRUE}, + {D3D11_QUERY_SO_OVERFLOW_PREDICATE, D3D_FEATURE_LEVEL_10_0, TRUE, TRUE, TRUE}, + {D3D11_QUERY_SO_STATISTICS_STREAM0, D3D_FEATURE_LEVEL_11_0, FALSE, FALSE, TRUE}, + {D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM0, D3D_FEATURE_LEVEL_11_0, TRUE, FALSE, TRUE}, + {D3D11_QUERY_SO_STATISTICS_STREAM1, D3D_FEATURE_LEVEL_11_0, FALSE, FALSE, TRUE}, + {D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM1, D3D_FEATURE_LEVEL_11_0, TRUE, FALSE, TRUE}, + {D3D11_QUERY_SO_STATISTICS_STREAM2, D3D_FEATURE_LEVEL_11_0, FALSE, FALSE, TRUE}, + {D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM2, D3D_FEATURE_LEVEL_11_0, TRUE, FALSE, TRUE}, + {D3D11_QUERY_SO_STATISTICS_STREAM3, D3D_FEATURE_LEVEL_11_0, FALSE, FALSE, TRUE}, + {D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM3, D3D_FEATURE_LEVEL_11_0, TRUE, FALSE, TRUE}, }; ULONG refcount, expected_refcount; + D3D_FEATURE_LEVEL feature_level; D3D11_QUERY_DESC query_desc; ID3D11Predicate *predicate; ID3D11Device *device, *tmp; + HRESULT hr, expected_hr; + ID3D11Query *query; IUnknown *iface; unsigned int i; - HRESULT hr; if (!(device = create_device(NULL))) { skip("Failed to create device.\n"); return; } + feature_level = ID3D11Device_GetFeatureLevel(device); + hr = ID3D11Device_CreateQuery(device, NULL, &query); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = ID3D11Device_CreatePredicate(device, NULL, &predicate); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - query_desc.MiscFlags = 0; - - for (i = 0; i < sizeof(other_queries) / sizeof(*other_queries); ++i) + for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) { - query_desc.Query = other_queries[i]; + if (tests[i].required_feature_level > feature_level) + { + skip("Query type %u requires feature level %#x.\n", tests[i].query, tests[i].required_feature_level); + continue; + } + + query_desc.Query = tests[i].query; + query_desc.MiscFlags = 0; + + hr = ID3D11Device_CreateQuery(device, &query_desc, NULL); + todo_wine_if(tests[i].todo) + ok(hr == S_FALSE, "Got unexpected hr %#x for query type %u.\n", hr, query_desc.Query); + + query_desc.Query = tests[i].query; + hr = ID3D11Device_CreateQuery(device, &query_desc, &query); + todo_wine_if(tests[i].todo) + ok(hr == S_OK, "Got unexpected hr %#x for query type %u.\n", hr, query_desc.Query); + if (FAILED(hr)) + continue; + + expected_hr = tests[i].is_predicate ? S_OK : E_NOINTERFACE; + hr = ID3D11Query_QueryInterface(query, &IID_ID3D11Predicate, (void **)&predicate); + ID3D11Query_Release(query); + ok(hr == expected_hr, "Got unexpected hr %#x for query type %u.\n", hr, query_desc.Query); + if (SUCCEEDED(hr)) + ID3D11Predicate_Release(predicate); + + expected_hr = tests[i].can_use_create_predicate ? S_FALSE : E_INVALIDARG; + hr = ID3D11Device_CreatePredicate(device, &query_desc, NULL); + ok(hr == expected_hr, "Got unexpected hr %#x for query type %u.\n", hr, query_desc.Query); + + expected_hr = tests[i].can_use_create_predicate ? S_OK : E_INVALIDARG; hr = ID3D11Device_CreatePredicate(device, &query_desc, &predicate); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x for query type %u.\n", hr, other_queries[i]); + ok(hr == expected_hr, "Got unexpected hr %#x for query type %u.\n", hr, query_desc.Query); + if (SUCCEEDED(hr)) + ID3D11Predicate_Release(predicate); } query_desc.Query = D3D11_QUERY_OCCLUSION_PREDICATE; @@ -2948,12 +2998,6 @@ static void test_create_predicate(void) if (SUCCEEDED(hr)) IUnknown_Release(iface); ID3D11Predicate_Release(predicate); - query_desc.Query = D3D11_QUERY_SO_OVERFLOW_PREDICATE; - hr = ID3D11Device_CreatePredicate(device, &query_desc, &predicate); - todo_wine ok(SUCCEEDED(hr), "Failed to create predicate, hr %#x.\n", hr); - if (SUCCEEDED(hr)) - ID3D11Predicate_Release(predicate); - refcount = ID3D11Device_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); } @@ -5878,7 +5922,7 @@ START_TEST(d3d11) test_create_blend_state(); test_create_depthstencil_state(); test_create_rasterizer_state(); - test_create_predicate(); + test_create_query(); test_device_removed_reason(); test_private_data(); test_blend();

1 0

Józef Kucia : d3d10core/tests: Add test for ID3D10Device_CreateQuery().
by Alexandre Julliard April 5, 2016

April 5, 2016

Module: wine Branch: master Commit: f0766c49efa6579bb40afd4a685be8b3c3a510af URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0766c49efa6579bb40afd4a6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 5 10:22:08 2016 +0200 d3d10core/tests: Add test for ID3D10Device_CreateQuery(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 74 ++++++++++++++++++++++++++++++------------- 1 file changed, 52 insertions(+), 22 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index dd63a64..45b0fd2 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -2267,25 +2267,34 @@ static void test_create_rasterizer_state(void) ok(!refcount, "Device has %u references left.\n", refcount); } -static void test_create_predicate(void) +static void test_create_query(void) { - static const D3D10_QUERY other_queries[] = - { - D3D10_QUERY_EVENT, - D3D10_QUERY_OCCLUSION, - D3D10_QUERY_TIMESTAMP, - D3D10_QUERY_TIMESTAMP_DISJOINT, - D3D10_QUERY_PIPELINE_STATISTICS, - D3D10_QUERY_SO_STATISTICS, + static const struct + { + D3D10_QUERY query; + BOOL is_predicate; + BOOL todo; + } + tests[] = + { + {D3D10_QUERY_EVENT, FALSE, FALSE}, + {D3D10_QUERY_OCCLUSION, FALSE, FALSE}, + {D3D10_QUERY_TIMESTAMP, FALSE, FALSE}, + {D3D10_QUERY_TIMESTAMP_DISJOINT, FALSE, FALSE}, + {D3D10_QUERY_PIPELINE_STATISTICS, FALSE, TRUE}, + {D3D10_QUERY_OCCLUSION_PREDICATE, TRUE, FALSE}, + {D3D10_QUERY_SO_STATISTICS, FALSE, TRUE}, + {D3D10_QUERY_SO_OVERFLOW_PREDICATE, TRUE, TRUE}, }; ULONG refcount, expected_refcount; D3D10_QUERY_DESC query_desc; ID3D10Predicate *predicate; ID3D10Device *device, *tmp; + HRESULT hr, expected_hr; + ID3D10Query *query; IUnknown *iface; unsigned int i; - HRESULT hr; if (!(device = create_device())) { @@ -2293,16 +2302,43 @@ static void test_create_predicate(void) return; } + hr = ID3D10Device_CreateQuery(device, NULL, &query); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = ID3D10Device_CreatePredicate(device, NULL, &predicate); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - query_desc.MiscFlags = 0; - - for (i = 0; i < sizeof(other_queries) / sizeof(*other_queries); ++i) + for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) { - query_desc.Query = other_queries[i]; + query_desc.Query = tests[i].query; + query_desc.MiscFlags = 0; + + hr = ID3D10Device_CreateQuery(device, &query_desc, NULL); + todo_wine_if(tests[i].todo) + ok(hr == S_FALSE, "Got unexpected hr %#x for query type %u.\n", hr, query_desc.Query); + + query_desc.Query = tests[i].query; + hr = ID3D10Device_CreateQuery(device, &query_desc, &query); + todo_wine_if(tests[i].todo) + ok(hr == S_OK, "Got unexpected hr %#x for query type %u.\n", hr, query_desc.Query); + if (FAILED(hr)) + continue; + + expected_hr = tests[i].is_predicate ? S_OK : E_NOINTERFACE; + hr = ID3D10Query_QueryInterface(query, &IID_ID3D10Predicate, (void **)&predicate); + ID3D10Query_Release(query); + ok(hr == expected_hr, "Got unexpected hr %#x for query type %u.\n", hr, query_desc.Query); + if (SUCCEEDED(hr)) + ID3D10Predicate_Release(predicate); + + expected_hr = tests[i].is_predicate ? S_FALSE : E_INVALIDARG; + hr = ID3D10Device_CreatePredicate(device, &query_desc, NULL); + ok(hr == expected_hr, "Got unexpected hr %#x for query type %u.\n", hr, query_desc.Query); + + expected_hr = tests[i].is_predicate ? S_OK : E_INVALIDARG; hr = ID3D10Device_CreatePredicate(device, &query_desc, &predicate); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x for query type %u.\n", hr, other_queries[i]); + ok(hr == expected_hr, "Got unexpected hr %#x for query type %u.\n", hr, query_desc.Query); + if (SUCCEEDED(hr)) + ID3D10Predicate_Release(predicate); } query_desc.Query = D3D10_QUERY_OCCLUSION_PREDICATE; @@ -2324,12 +2360,6 @@ static void test_create_predicate(void) if (SUCCEEDED(hr)) IUnknown_Release(iface); ID3D10Predicate_Release(predicate); - query_desc.Query = D3D10_QUERY_SO_OVERFLOW_PREDICATE; - hr = ID3D10Device_CreatePredicate(device, &query_desc, &predicate); - todo_wine ok(SUCCEEDED(hr), "Failed to create predicate, hr %#x.\n", hr); - if (SUCCEEDED(hr)) - ID3D10Predicate_Release(predicate); - refcount = ID3D10Device_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); } @@ -6248,7 +6278,7 @@ START_TEST(device) test_create_blend_state(); test_create_depthstencil_state(); test_create_rasterizer_state(); - test_create_predicate(); + test_create_query(); test_device_removed_reason(); test_scissor(); test_clear_state();

1 0