March 2021 - Wine-Devel - list.winehq.org

[PATCH 1/8] mshtml: Use single navigator instance per inner window.
by Jacek Caban March 15, 2021

March 15, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlwindow.c | 14 ++++++++++++-- dlls/mshtml/mshtml_private.h | 3 ++- dlls/mshtml/omnavigator.c | 9 +++++---- dlls/mshtml/tests/dom.c | 4 +++- dlls/mshtml/tests/dom.js | 10 ++++++++++ 5 files changed, 32 insertions(+), 8 deletions(-)

2 1

[PATCH 2/5] d3d11: Validate the feature level count in d3d11_device_CreateDeviceContextState().
by Henri Verbeet March 15, 2021

March 15, 2021

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/device.c | 22 +++++++++++++++++----- dlls/d3d11/tests/d3d11.c | 12 +++++------- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 4ae146b11a6..ff628eeaae1 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -4061,15 +4061,20 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRasterizerState1(ID3D11Devic } static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeviceContextState(ID3D11Device2 *iface, UINT flags, - const D3D_FEATURE_LEVEL *feature_levels, UINT feature_levels_count, UINT sdk_version, + const D3D_FEATURE_LEVEL *feature_levels, UINT feature_level_count, UINT sdk_version, REFIID emulated_interface, D3D_FEATURE_LEVEL *chosen_feature_level, ID3DDeviceContextState **state) { struct d3d_device *device = impl_from_ID3D11Device2(iface); struct d3d_device_context_state *state_impl; + HRESULT hr = E_INVALIDARG; FIXME("iface %p, flags %#x, feature_levels %p, feature_level_count %u, sdk_version %u, " - "emulated_interface %s, chosen_feature_level %p, state %p semi-stub!\n", iface, flags, feature_levels, - feature_levels_count, sdk_version, debugstr_guid(emulated_interface), chosen_feature_level, state); + "emulated_interface %s, chosen_feature_level %p, state %p semi-stub!\n", + iface, flags, feature_levels, feature_level_count, sdk_version, + debugstr_guid(emulated_interface), chosen_feature_level, state); + + if (!feature_level_count) + goto fail; if (chosen_feature_level) FIXME("Device context state feature level not implemented yet.\n"); @@ -4078,8 +4083,8 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeviceContextState(ID3D11Dev { if (!(state_impl = heap_alloc_zero(sizeof(*state_impl)))) { - *state = NULL; - return E_OUTOFMEMORY; + hr = E_OUTOFMEMORY; + goto fail; } d3d_device_context_state_init(state_impl, device, emulated_interface); @@ -4089,6 +4094,13 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeviceContextState(ID3D11Dev device->d3d11_only = FALSE; if (chosen_feature_level) *chosen_feature_level = ID3D11Device2_GetFeatureLevel(iface); return state ? S_OK : S_FALSE; + +fail: + if (chosen_feature_level) + *chosen_feature_level = 0; + if (state) + *state = NULL; + return hr; } static HRESULT STDMETHODCALLTYPE d3d11_device_OpenSharedResource1(ID3D11Device2 *iface, HANDLE handle, diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 1b35e8f4983..acbd1856b08 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -6876,19 +6876,17 @@ static void test_device_context_state(void) context_state = (void *)0xc0de0001; hr = ID3D11Device1_CreateDeviceContextState(device, 0, &feature_level, 0, D3D11_SDK_VERSION, &IID_ID3D11Device1, &selected_feature_level, &context_state); - todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - todo_wine ok(!selected_feature_level, "Got unexpected feature level %#x.\n", selected_feature_level); - todo_wine ok(!context_state, "Got unexpected context state %p.\n", context_state); - if (SUCCEEDED(hr)) - ID3DDeviceContextState_Release(context_state); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(!selected_feature_level, "Got unexpected feature level %#x.\n", selected_feature_level); + ok(!context_state, "Got unexpected context state %p.\n", context_state); hr = ID3D11Device1_CreateDeviceContextState(device, 0, &feature_level, 0, D3D11_SDK_VERSION, &IID_ID3D11Device1, NULL, NULL); - todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = ID3D11Device1_CreateDeviceContextState(device, 0, NULL, 0, D3D11_SDK_VERSION, &IID_ID3D11Device1, NULL, NULL); - todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = ID3D11Device1_CreateDeviceContextState(device, 0, &feature_level, 1, D3D11_SDK_VERSION, &IID_ID3D11Device1, NULL, &context_state); -- 2.20.1

2 1

[PATCH 1/5] d3d11/tests: Add some more device context state tests.
by Henri Verbeet March 15, 2021

March 15, 2021

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 46 ++++++++++++++++++++++++++++++---------- 1 file changed, 35 insertions(+), 11 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 1e69d827977..1b35e8f4983 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -6779,6 +6779,7 @@ static void test_device_context_state(void) ID3DDeviceContextState *context_state, *previous_context_state, *tmp_context_state, *context_state2; UINT ib_offset, vb_offset, vb_stride, so_offset, offset, stride, sample_mask, stencil_ref, count; ID3D11Buffer *cb, *srvb, *uavb, *ib, *vb, *sob, *tmp_cb, *tmp_ib, *tmp_vb, *tmp_sob; + D3D_FEATURE_LEVEL feature_level, selected_feature_level; ID3D11UnorderedAccessView *tmp_uav, *uav, *ps_uav; ID3D11Device *d3d11_device, *d3d11_device2; ID3D11SamplerState *sampler, *tmp_sampler; @@ -6800,7 +6801,6 @@ static void test_device_context_state(void) ID3D11Predicate *tmp_pred, *pred; ID3D11DomainShader *tmp_ds, *ds; D3D11_SAMPLER_DESC sampler_desc; - D3D_FEATURE_LEVEL feature_level; D3D11_QUERY_DESC predicate_desc; ID3D11Device1 *device, *device2; ID3D11InputLayout *il, *tmp_il; @@ -6860,17 +6860,41 @@ static void test_device_context_state(void) ok(SUCCEEDED(hr), "Failed to create sampler state, hr %#x.\n", hr); feature_level = min(feature_level, D3D_FEATURE_LEVEL_11_1); - hr = ID3D11Device1_CreateDeviceContextState(device, 0, &feature_level, 1, D3D11_SDK_VERSION, - &IID_ID3D11Device1, NULL, &context_state); - ok(SUCCEEDED(hr), "Failed to create device context state, hr %#x.\n", hr); - if (FAILED(hr)) - { - ID3D11SamplerState_Release(sampler); - ID3D11Device1_Release(device); - return; - } + + hr = ID3D11Device1_CreateDeviceContextState(device, 0, &feature_level, + 1, D3D11_SDK_VERSION, &IID_ID3D11Device1, NULL, NULL); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + + selected_feature_level = 0xc0de0000; + hr = ID3D11Device1_CreateDeviceContextState(device, 0, &feature_level, 1, + D3D11_SDK_VERSION, &IID_ID3D11Device1, &selected_feature_level, NULL); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + ok(selected_feature_level == feature_level, "Got unexpected feature level %#x, expected %#x.\n", + selected_feature_level, feature_level); + + selected_feature_level = 0xc0de0000; + context_state = (void *)0xc0de0001; + hr = ID3D11Device1_CreateDeviceContextState(device, 0, &feature_level, 0, + D3D11_SDK_VERSION, &IID_ID3D11Device1, &selected_feature_level, &context_state); + todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + todo_wine ok(!selected_feature_level, "Got unexpected feature level %#x.\n", selected_feature_level); + todo_wine ok(!context_state, "Got unexpected context state %p.\n", context_state); + if (SUCCEEDED(hr)) + ID3DDeviceContextState_Release(context_state); + + hr = ID3D11Device1_CreateDeviceContextState(device, 0, &feature_level, + 0, D3D11_SDK_VERSION, &IID_ID3D11Device1, NULL, NULL); + todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + hr = ID3D11Device1_CreateDeviceContextState(device, 0, NULL, + 0, D3D11_SDK_VERSION, &IID_ID3D11Device1, NULL, NULL); + todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + hr = ID3D11Device1_CreateDeviceContextState(device, 0, &feature_level, + 1, D3D11_SDK_VERSION, &IID_ID3D11Device1, NULL, &context_state); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); refcount = get_refcount(context_state); - ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); context_type = ID3D11DeviceContext1_GetType(context); ok(context_type == D3D11_DEVICE_CONTEXT_IMMEDIATE, "Unexpected context type %u.\n", context_type); -- 2.20.1

2 1

[PATCH 8/8] mshtml: Initialize HTMLStyleSheetRulesCollection object with compat mode.
by Jacek Caban March 15, 2021

March 15, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstylesheet.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-)

1 0

[PATCH 7/8] mshtml: Initialize HTMLStyleSheetRule object with compat mode.
by Jacek Caban March 15, 2021

March 15, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstylesheet.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-)

1 0

[PATCH 6/8] mshtml: Initialize HTMLStyleSheetsCollection object with compat mode.
by Jacek Caban March 15, 2021

March 15, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 9 +++++---- dlls/mshtml/htmlstylesheet.c | 21 +++++++++++++-------- dlls/mshtml/mshtml_private.h | 3 ++- 3 files changed, 20 insertions(+), 13 deletions(-)

1 0

[PATCH 5/8] mshtml: Initialize HTMLStyleSheet object with compat mode.
by Jacek Caban March 15, 2021

March 15, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 4 ++-- dlls/mshtml/htmlstyleelem.c | 7 ++++--- dlls/mshtml/htmlstylesheet.c | 30 ++++++++++++++++++++---------- dlls/mshtml/mshtml_private.h | 2 +- 4 files changed, 27 insertions(+), 16 deletions(-)

1 0

[PATCH 4/8] mshtml: Initialize HTMLNamespaceCollection object with compat mode.
by Jacek Caban March 15, 2021

March 15, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 3 ++- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/omnavigator.c | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-)

1 0

[PATCH 3/8] mshtml: Initialize HTMLPerformanceNavigation and HTMLPerformanceTiming objects with compat mode.
by Jacek Caban March 15, 2021

March 15, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/omnavigator.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

1 0

[PATCH 2/8] mshtml: Initialize HTMLPerformance object with compat mode.
by Jacek Caban March 15, 2021

March 15, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/omnavigator.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-)

1 0