wine-commits April 2016

wine-commits@winehq.org

2 participants
750 discussions

Józef Kucia : d3d11: Fix return values returned by D3D11CreateDevice functions.
by Alexandre Julliard 05 Apr '16

05 Apr '16

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/tests: Also trace feature level when HAL device cannot be created.
by Alexandre Julliard 05 Apr '16

05 Apr '16

Module: wine Branch: master Commit: dad14241887bb3495972d86402b046a9df76e469 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dad14241887bb3495972d8640… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 5 10:22:10 2016 +0200 d3d11/tests: Also trace feature level when HAL device cannot be created. 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 | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index a38afc9..ff2d56d 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -498,11 +498,15 @@ static void test_create_device(void) HWND window; HRESULT hr; - hr = D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, NULL, 0, D3D11_SDK_VERSION, &device, - NULL, NULL); - if (FAILED(hr)) + if (FAILED(hr = D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, NULL, 0, D3D11_SDK_VERSION, + &device, NULL, NULL))) { skip("Failed to create HAL device.\n"); + if ((device = create_device(NULL))) + { + trace("Feature level %#x.\n", ID3D11Device_GetFeatureLevel(device)); + ID3D11Device_Release(device); + } return; }

1 0

Józef Kucia : d3d11/tests: Add test for ID3D11Device_CreateQuery().
by Alexandre Julliard 05 Apr '16

05 Apr '16

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 05 Apr '16

05 Apr '16

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

Józef Kucia : d3d11: Allow to pass NULL as "query" to d3d10_device_CreateQuery().
by Alexandre Julliard 05 Apr '16

05 Apr '16

Module: wine Branch: master Commit: 94ec23b8cde429b20094bb56f2daac9f7d4cfc7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=94ec23b8cde429b20094bb56f… Author: Józef Kucia <jkucia(a)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(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 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,

1 0

Józef Kucia : d3d11: Allow to pass NULL as "predicate " to d3d10_device_CreatePredicate().
by Alexandre Julliard 05 Apr '16

05 Apr '16

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 05 Apr '16

05 Apr '16

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 05 Apr '16

05 Apr '16

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

Józef Kucia : d3d11: Allow to query ID3D11Predicate interface when predicate was created by CreateQuery ().
by Alexandre Julliard 05 Apr '16

05 Apr '16

Module: wine Branch: master Commit: 24e8cf64f1ce1b51d58be50515d6ae743e99af65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24e8cf64f1ce1b51d58be5051… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 5 10:22:03 2016 +0200 d3d11: Allow to query ID3D11Predicate interface when predicate was created by 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/async.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/d3d11/async.c b/dlls/d3d11/async.c index 66640a2..c100e73 100644 --- a/dlls/d3d11/async.c +++ b/dlls/d3d11/async.c @@ -364,23 +364,28 @@ HRESULT d3d_query_create(struct d3d_device *device, const D3D11_QUERY_DESC *desc struct d3d_query **query) { struct d3d_query *object; + BOOL is_predicate_type; HRESULT hr; if (!desc) return E_INVALIDARG; - if (predicate - && desc->Query != D3D11_QUERY_OCCLUSION_PREDICATE - && desc->Query != D3D11_QUERY_SO_OVERFLOW_PREDICATE - && desc->Query != D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM0 - && desc->Query != D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM1 - && desc->Query != D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM2 - && desc->Query != D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM3) + is_predicate_type = desc->Query == D3D11_QUERY_OCCLUSION_PREDICATE + || desc->Query == D3D11_QUERY_SO_OVERFLOW_PREDICATE + || desc->Query == D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM0 + || desc->Query == D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM1 + || desc->Query == D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM2 + || desc->Query == D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM3; + + if (!is_predicate_type && predicate) { WARN("Query type %u is not a predicate.\n", desc->Query); return E_INVALIDARG; } + if (is_predicate_type) + predicate = TRUE; + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY;

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 05 Apr '16

05 Apr '16

Module: wine Branch: master Commit: 87f34ee566d9d2f99279b384fce0ca32d3c38f5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=87f34ee566d9d2f99279b384f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 5 11:33:06 2016 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/ru.po b/po/ru.po index a0df2f1..e5b6689 100644 --- a/po/ru.po +++ b/po/ru.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-03 11:25+0300\n" +"PO-Revision-Date: 2016-04-05 11:31+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -11639,6 +11639,8 @@ msgid "" "reg: Unable to delete all registry values in '%1'. An unexpected error " "occurred.\n" msgstr "" +"reg: не удалось удалить все значения в «%1». Произошла непредвиденная " +"ошибка.\n" #: regedit.rc:34 msgid "&Registry"

1 0

← Newer
1
...
64
65
66
67
68
69
70
...
75
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2016