January 2019 - Wine-Devel - list.winehq.org

[PATCH vkd3d 1/3] vkd3d: Require D3D12_ROOT_SIGNATURE_FLAG_ALLOW_STREAM_OUTPUT for stream output.
by Józef Kucia Jan. 17, 2019

Jan. 17, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/state.c | 12 ++++++++++-- libs/vkd3d/vkd3d_private.h | 2 ++ tests/d3d12.c | 16 ++++++++++++++++ 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index a9a463de97e2..e9f73e82b44f 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -899,11 +899,12 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa root_signature->vk_push_set_layout = VK_NULL_HANDLE; root_signature->vk_set_layout = VK_NULL_HANDLE; root_signature->parameters = NULL; + root_signature->flags = desc->Flags; root_signature->descriptor_mapping = NULL; root_signature->static_sampler_count = 0; root_signature->static_samplers = NULL; - if (desc->Flags) + if (desc->Flags & ~D3D12_ROOT_SIGNATURE_FLAG_ALLOW_STREAM_OUTPUT) FIXME("Ignoring root signature flags %#x.\n", desc->Flags); if (FAILED(hr = d3d12_root_signature_info_from_desc(&info, desc))) @@ -2168,10 +2169,17 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s graphics->xfb_enabled = false; if (so_desc->NumEntries) { + if (!(root_signature->flags & D3D12_ROOT_SIGNATURE_FLAG_ALLOW_STREAM_OUTPUT)) + { + WARN("Stream output is used without D3D12_ROOT_SIGNATURE_FLAG_ALLOW_STREAM_OUTPUT.\n"); + hr = E_INVALIDARG; + goto fail; + } + if (!vk_info->EXT_transform_feedback) { - hr = E_NOTIMPL; FIXME("Transform feedback is not supported by Vulkan implementation.\n"); + hr = E_NOTIMPL; goto fail; } diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 65fcd9f5ce11..c4b0a4c06513 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -568,6 +568,8 @@ struct d3d12_root_signature unsigned int parameter_count; uint32_t main_set; + D3D12_ROOT_SIGNATURE_FLAGS flags; + unsigned int descriptor_count; struct vkd3d_shader_resource_binding *descriptor_mapping; struct vkd3d_shader_descriptor_binding dummy_sampler; diff --git a/tests/d3d12.c b/tests/d3d12.c index 5be8e0d9b967..97af4c1a9f67 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2425,6 +2425,12 @@ static void test_create_graphics_pipeline_state(void) unsigned int i; HRESULT hr; + static const D3D12_SO_DECLARATION_ENTRY so_declaration[] = + { + {0, "SV_Position", 0, 0, 4, 0}, + }; + static const unsigned int strides[] = {16}; + if (!(device = create_device())) { skip("Failed to create device.\n"); @@ -2537,6 +2543,16 @@ static void test_create_graphics_pipeline_state(void) &IID_ID3D12PipelineState, (void **)&pipeline_state); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + /* Stream output without D3D12_ROOT_SIGNATURE_FLAG_ALLOW_STREAM_OUTPUT. */ + init_pipeline_state_desc(&pso_desc, root_signature, DXGI_FORMAT_R8G8B8A8_UNORM, NULL, NULL, NULL); + pso_desc.StreamOutput.NumEntries = ARRAY_SIZE(so_declaration); + pso_desc.StreamOutput.pSODeclaration = so_declaration; + pso_desc.StreamOutput.pBufferStrides = strides; + pso_desc.StreamOutput.NumStrides = ARRAY_SIZE(strides); + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&pipeline_state); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + refcount = ID3D12RootSignature_Release(root_signature); ok(!refcount, "ID3D12RootSignature has %u references left.\n", (unsigned int)refcount); refcount = ID3D12Device_Release(device); -- 2.19.2

2 1

[PATCH] oleaut32/tests: Fix a memory leak (Valgrind).
by Sven Baars Jan. 17, 2019

Jan. 17, 2019

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/oleaut32/tests/usrmarshal.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index 97c05024e5..f49f439f4f 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -1283,6 +1283,7 @@ static void test_marshal_VARIANT(void) ok(!memcmp(*V_BSTRREF(&v), *V_BSTRREF(&v2), SysStringByteLen(*V_BSTRREF(&v))), "bstrs differ\n"); SysFreeString(b2); + VARIANT_UserFree(&umcb.Flags, &v2); HeapFree(GetProcessHeap(), 0, oldbuffer); SysFreeString(b); -- 2.17.1

1 0

[PATCH v2] comctl32/tests: Fix a memory leak (Valgrind).
by Gijs Vermeulen Jan. 17, 2019

Jan. 17, 2019

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/comctl32/tests/edit.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index bc44d0c240..307835ce24 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -2957,6 +2957,7 @@ static void test_paste(void) ok(strlen(str2) == len, "got %d\n", len); /* Cleanup */ + GlobalFree(hmem); DestroyWindow(hEdit); DestroyWindow(hMultilineEdit); } -- 2.20.1

2 1

[PATCH 1/2] riched20/tests: Fix a memory leak (Valgrind).
by Sven Baars Jan. 17, 2019

Jan. 17, 2019

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/riched20/tests/txtsrv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 0415be8b80..20d411afcb 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -705,6 +705,8 @@ static void test_TxSetText(void) ok(memcmp(rettext,settext,SysStringByteLen(rettext)) == 0, "String returned differs\n"); + SysFreeString(rettext); + /* Null-pointer should behave the same as empty-string */ hres = ITextServices_TxSetText(txtserv, 0); -- 2.17.1

2 2

[PATCH] include: Fix a typo.
by Dmitry Timoshkov Jan. 16, 2019

Jan. 16, 2019

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- include/wincrypt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index 5c0fb0fc0b..a1b1305902 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -2541,7 +2541,7 @@ static const WCHAR CERT_PHYSICAL_STORE_AUTH_ROOT_NAME[] = #define CERT_SIGNATURE_HASH_PROP_ID 15 #define CERT_SMART_CARD_DATA_PROP_ID 16 #define CERT_EFS_PROP_ID 17 -#define CERT_FORTEZZA_DATA_PROP 18 +#define CERT_FORTEZZA_DATA_PROP_ID 18 #define CERT_ARCHIVED_PROP_ID 19 #define CERT_KEY_IDENTIFIER_PROP_ID 20 #define CERT_AUTO_ENROLL_PROP_ID 21 -- 2.20.1

1 0

[PATCH] atl100/tests: Fix a memory leak (Valgrind).
by Gijs Vermeulen Jan. 16, 2019

Jan. 16, 2019

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/atl100/tests/atl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index bdd3c57eb0..d23c53c104 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -964,6 +964,8 @@ static void test_AtlAxCreateControl(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(container != NULL, "returned %p!\n", container); ok(control != NULL, "returned %p\n", control); + IUnknown_Release(container); + IUnknown_Release(control); DestroyWindow(hwnd); container = NULL; -- 2.20.1

2 2

[PATCH] opcservices/tests: Fix some memory leaks (Valgrind).
by Sven Baars Jan. 16, 2019

Jan. 16, 2019

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/opcservices/tests/opcservices.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/opcservices/tests/opcservices.c b/dlls/opcservices/tests/opcservices.c index 9792302f7e..939a118387 100644 --- a/dlls/opcservices/tests/opcservices.c +++ b/dlls/opcservices/tests/opcservices.c @@ -356,7 +356,10 @@ static void test_relationship(void) hr = IOpcFactory_CreatePackage(factory, &package); ok(SUCCEEDED(hr) || broken(hr == E_NOTIMPL) /* Vista */, "Failed to create a package, hr %#x.\n", hr); if (FAILED(hr)) + { + IOpcFactory_Release(factory); return; + } hr = CreateUri(targetW, Uri_CREATE_ALLOW_RELATIVE, 0, &target_uri); ok(SUCCEEDED(hr), "Failed to create target uri, hr %#x.\n", hr); @@ -1201,6 +1204,7 @@ static void test_create_part_uri(void) ok(!!ret, "%u: unexpected result %d.\n", i, ret); IOpcPartUri_Release(part_uri); + IOpcPartUri_Release(uri); heap_free(inputW); heap_free(rawW); -- 2.17.1

1 0

[PATCH 4/4] d3d9: Clamp index buffer upload range to buffer size.
by Józef Kucia Jan. 16, 2019

Jan. 16, 2019

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d9/device.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 8ade5beedb45..a26d943fa309 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2750,8 +2750,10 @@ static void d3d9_device_upload_sysmem_index_buffer(struct d3d9_device *device, unsigned int start_idx, unsigned int idx_count) { struct wined3d_box box = {0, 0, 0, 1, 0, 1}; - struct d3d9_vertexbuffer *d3d9_buffer; + struct wined3d_resource *dst_resource; + struct d3d9_indexbuffer *d3d9_buffer; struct wined3d_buffer *dst_buffer; + struct wined3d_resource_desc desc; enum wined3d_format_id format; unsigned int offset, idx_size; HRESULT hr; @@ -2762,11 +2764,13 @@ static void d3d9_device_upload_sysmem_index_buffer(struct d3d9_device *device, if (!(dst_buffer = wined3d_device_get_index_buffer(device->wined3d_device, &format, &offset))) ERR("Failed to get index buffer.\n"); d3d9_buffer = wined3d_buffer_get_parent(dst_buffer); + dst_resource = wined3d_buffer_get_resource(dst_buffer); + wined3d_resource_get_desc(dst_resource, &desc); idx_size = format == WINED3DFMT_R16_UINT ? 2 : 4; box.left = offset + start_idx * idx_size; - box.right = box.left + idx_count * idx_size; + box.right = min(box.left + idx_count * idx_size, desc.size); if (FAILED(hr = wined3d_device_copy_sub_resource_region(device->wined3d_device, - wined3d_buffer_get_resource(dst_buffer), 0, box.left, 0, 0, + dst_resource, 0, box.left, 0, 0, wined3d_buffer_get_resource(d3d9_buffer->wined3d_buffer), 0, &box, 0))) ERR("Failed to update buffer.\n"); } -- 2.19.2

3 2

[PATCH 3/4] d3d8: Clamp index buffer upload range to buffer size.
by Józef Kucia Jan. 16, 2019

Jan. 16, 2019

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d8/device.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 9e82b1e72763..1d892ecf8d31 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2301,8 +2301,10 @@ static void d3d8_device_upload_sysmem_index_buffer(struct d3d8_device *device, unsigned int start_idx, unsigned int idx_count) { struct wined3d_box box = {0, 0, 0, 1, 0, 1}; - struct d3d8_vertexbuffer *d3d8_buffer; + struct wined3d_resource *dst_resource; + struct d3d8_indexbuffer *d3d8_buffer; struct wined3d_buffer *dst_buffer; + struct wined3d_resource_desc desc; enum wined3d_format_id format; unsigned int offset, idx_size; HRESULT hr; @@ -2313,11 +2315,13 @@ static void d3d8_device_upload_sysmem_index_buffer(struct d3d8_device *device, if (!(dst_buffer = wined3d_device_get_index_buffer(device->wined3d_device, &format, &offset))) ERR("Failed to get index buffer.\n"); d3d8_buffer = wined3d_buffer_get_parent(dst_buffer); + dst_resource = wined3d_buffer_get_resource(dst_buffer); + wined3d_resource_get_desc(dst_resource, &desc); idx_size = format == WINED3DFMT_R16_UINT ? 2 : 4; box.left = offset + start_idx * idx_size; - box.right = box.left + idx_count * idx_size; + box.right = min(box.left + idx_count * idx_size, desc.size); if (FAILED(hr = wined3d_device_copy_sub_resource_region(device->wined3d_device, - wined3d_buffer_get_resource(dst_buffer), 0, box.left, 0, 0, + dst_resource, 0, box.left, 0, 0, wined3d_buffer_get_resource(d3d8_buffer->wined3d_buffer), 0, &box, 0))) ERR("Failed to update buffer.\n"); } -- 2.19.2

3 2

[PATCH 2/4] d3d9: Clamp vertex buffer upload range to buffer size.
by Józef Kucia Jan. 16, 2019

Jan. 16, 2019

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d9/device.c | 8 ++++++-- dlls/d3d9/tests/visual.c | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 9ebaebab969d..8ade5beedb45 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2712,8 +2712,10 @@ static void d3d9_device_upload_sysmem_vertex_buffers(struct d3d9_device *device, { struct wined3d_box box = {0, 0, 0, 1, 0, 1}; struct d3d9_vertexbuffer *d3d9_buffer; + struct wined3d_resource *dst_resource; unsigned int i, offset, stride, map; struct wined3d_buffer *dst_buffer; + struct wined3d_resource_desc desc; HRESULT hr; if (!device->sysmem_vb) @@ -2733,10 +2735,12 @@ static void d3d9_device_upload_sysmem_vertex_buffers(struct d3d9_device *device, if (FAILED(hr = wined3d_device_get_stream_source(device->wined3d_device, i, &dst_buffer, &offset, &stride))) ERR("Failed to get stream source.\n"); d3d9_buffer = wined3d_buffer_get_parent(dst_buffer); + dst_resource = wined3d_buffer_get_resource(dst_buffer); + wined3d_resource_get_desc(dst_resource, &desc); box.left = offset + start_vertex * stride; - box.right = box.left + vertex_count * stride; + box.right = min(box.left + vertex_count * stride, desc.size); if (FAILED(hr = wined3d_device_copy_sub_resource_region(device->wined3d_device, - wined3d_buffer_get_resource(dst_buffer), 0, box.left, 0, 0, + dst_resource, 0, box.left, 0, 0, wined3d_buffer_get_resource(d3d9_buffer->wined3d_buffer), 0, &box, 0))) ERR("Failed to update buffer.\n"); } diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 9a62f873dce3..fb7c3e4ea4ab 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -24510,7 +24510,7 @@ static void test_sysmem_draw(void) hr = IDirect3DDevice9_BeginScene(device); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, 4, 0, 4, 0, 2); + hr = IDirect3DDevice9_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, 4, 0, 5, 0, 2); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_EndScene(device); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); -- 2.19.2

3 2