January 2019 - Wine-Commits

Dmitry Timoshkov : include: Fix a typo.
by Alexandre Julliard Jan. 17, 2019

Jan. 17, 2019

Module: wine Branch: master Commit: 25ced030687d3b7fe0f08abe89608c8566e937f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=25ced030687d3b7fe0f08abe… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 17 13:27:16 2019 +0800 include: Fix a typo. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wincrypt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index 5c0fb0f..a1b1305 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

1 0

Józef Kucia : vkd3d-shader: Rename vkd3d_shader_interface to vkd3d_shader_interface_info.
by Alexandre Julliard Jan. 17, 2019

Jan. 17, 2019

Module: vkd3d Branch: master Commit: 4c0692b2ef05dbdff0b19702603b296034b0862e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4c0692b2ef05dbdff0b1970… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jan 16 12:44:59 2019 +0100 vkd3d-shader: Rename vkd3d_shader_interface to vkd3d_shader_interface_info. For consistency with other vkd3d and vkd3d-shader structures. 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> --- include/vkd3d_shader.h | 8 ++++---- libs/vkd3d-shader/spirv.c | 14 +++++++------- libs/vkd3d-shader/vkd3d_shader_main.c | 12 ++++++------ libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- libs/vkd3d/state.c | 10 +++++----- 5 files changed, 23 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=4c0692b2ef05dbdff0b…

1 0

Józef Kucia : vkd3d: Require D3D12_ROOT_SIGNATURE_FLAG_ALLOW_STREAM_OUTPUT for stream output.
by Alexandre Julliard Jan. 17, 2019

Jan. 17, 2019

Module: vkd3d Branch: master Commit: 15713840b48922cfbbaf0dad9afe2df5a07b9ac4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=15713840b48922cfbbaf0da… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jan 16 12:44:57 2019 +0100 vkd3d: Require D3D12_ROOT_SIGNATURE_FLAG_ALLOW_STREAM_OUTPUT for stream output. 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> --- 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 a9a463d..e9f73e8 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 65fcd9f..c4b0a4c 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 5be8e0d..97af4c1 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);

1 0

Józef Kucia : vkd3d: Require D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT for input layout.
by Alexandre Julliard Jan. 17, 2019

Jan. 17, 2019

Module: vkd3d Branch: master Commit: 1a05563fc7827c1e682a8fb67fa5b5695b736658 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1a05563fc7827c1e682a8fb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jan 16 12:44:58 2019 +0100 vkd3d: Require D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT for input layout. 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> --- libs/vkd3d/state.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index e9f73e8..18addf3 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -904,7 +904,8 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa root_signature->static_sampler_count = 0; root_signature->static_samplers = NULL; - if (desc->Flags & ~D3D12_ROOT_SIGNATURE_FLAG_ALLOW_STREAM_OUTPUT) + if (desc->Flags & ~(D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT + | 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))) @@ -2282,6 +2283,14 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s graphics->attribute_count = ARRAY_SIZE(graphics->attributes); } + if (graphics->attribute_count + && !(root_signature->flags & D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT)) + { + WARN("Input layout is used without D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT.\n"); + hr = E_INVALIDARG; + goto fail; + } + if (FAILED(hr = compute_input_layout_offsets(&desc->InputLayout, aligned_offsets))) goto fail;

1 0

Józef Kucia : d3d8: Clamp index buffer upload range to buffer size.
by Alexandre Julliard Jan. 16, 2019

Jan. 16, 2019

Module: wine Branch: master Commit: a2829a6529ba67e7bf2c8e834b939e30cb2a3cca URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2829a6529ba67e7bf2c8e83… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 15 15:28:00 2019 +0100 d3d8: Clamp index buffer upload range to buffer size. 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/d3d8/device.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 9e82b1e..1d892ec 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"); }

1 0

Sven Baars : rpcrt4/tests: Fix some memory leaks (Valgrind).
by Alexandre Julliard Jan. 16, 2019

Jan. 16, 2019

Module: wine Branch: master Commit: ec921c2d152e25a12cf38b8d3060b9bd07dc8661 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec921c2d152e25a12cf38b8d… Author: Sven Baars <sven.wine(a)gmail.com> Date: Tue Jan 15 21:16:04 2019 +0100 rpcrt4/tests: Fix some memory leaks (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/ndr_marshall.c | 42 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 2187a08..e4a4c6a 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -431,7 +431,10 @@ static void test_pointer_marshal(const unsigned char *formattypes, if ((formattypes[1] & FC_ALLOCED_ON_STACK) && (formattypes[1] & FC_POINTER_DEREF)) ok(mem == mem_orig, "%s: mem has changed %p %p\n", msgpfx, mem, mem_orig); else + { ok(mem != mem_orig, "%s: mem has not changed\n", msgpfx); + HeapFree(GetProcessHeap(), 0, mem_orig); + } ok(!cmp(mem, memsrc, srcsize), "%s: incorrectly unmarshaled\n", msgpfx); ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %d\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); ok(StubMsg.MemorySize == 0, "%s: memorysize %d\n", msgpfx, StubMsg.MemorySize); @@ -465,7 +468,10 @@ static void test_pointer_marshal(const unsigned char *formattypes, if ((formattypes[1] & FC_ALLOCED_ON_STACK) && (formattypes[1] & FC_POINTER_DEREF)) ok(mem == mem_orig, "%s: mem has changed %p %p\n", msgpfx, mem, mem_orig); else + { ok(mem != mem_orig, "%s: mem has not changed\n", msgpfx); + HeapFree(GetProcessHeap(), 0, mem_orig); + } ok(!cmp(mem, memsrc, srcsize), "%s: incorrectly unmarshaled\n", msgpfx); ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %d\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); ok(StubMsg.MemorySize == 0, "%s: memorysize %d\n", msgpfx, StubMsg.MemorySize); @@ -806,6 +812,7 @@ static void test_nontrivial_pointer_types(void) /* Server */ my_alloc_called = 0; + my_free_called = 0; StubMsg.IsClient = 0; mem = NULL; StubMsg.Buffer = StubMsg.BufferStart; @@ -813,14 +820,19 @@ static void test_nontrivial_pointer_types(void) ok(mem != StubMsg.BufferStart, "mem pointing at buffer\n"); ok(my_alloc_called == 1, "alloc called %d\n", my_alloc_called); NdrPointerFree( &StubMsg, mem, &fmtstr_ref_unique_out[4] ); + ok(my_free_called == 0, "free called %d\n", my_free_called); + my_free(mem); my_alloc_called = 0; + my_free_called = 0; mem = NULL; StubMsg.Buffer = StubMsg.BufferStart; NdrPointerUnmarshall( &StubMsg, &mem, &fmtstr_ref_unique_out[4], 1); ok(mem != StubMsg.BufferStart, "mem pointing at buffer\n"); ok(my_alloc_called == 1, "alloc called %d\n", my_alloc_called); NdrPointerFree( &StubMsg, mem, &fmtstr_ref_unique_out[4] ); + ok(my_free_called == 0, "free called %d\n", my_free_called); + my_free(mem); my_alloc_called = 0; mem = mem_orig; @@ -917,7 +929,10 @@ static void test_simple_struct_marshal(const unsigned char *formattypes, ok(!cmp(mem, memsrc, srcsize), "%s: incorrectly unmarshaled\n", msgpfx); ok(my_alloc_called == num_additional_allocs, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called); my_alloc_called = 0; + my_free_called = 0; ok(StubMsg.MemorySize == 0, "%s: memorysize touched in unmarshal\n", msgpfx); + NdrSimpleStructFree(&StubMsg, mem, formattypes ); + ok(my_free_called == num_additional_allocs, "free called %d\n", my_free_called); /* If we're a server we still use the supplied memory */ StubMsg.Buffer = StubMsg.BufferStart; @@ -928,7 +943,10 @@ static void test_simple_struct_marshal(const unsigned char *formattypes, ok(!cmp(mem, memsrc, srcsize), "%s: incorrectly unmarshaled\n", msgpfx); ok(my_alloc_called == num_additional_allocs, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called); my_alloc_called = 0; + my_free_called = 0; ok(StubMsg.MemorySize == 0, "%s: memorysize touched in unmarshal\n", msgpfx); + NdrSimpleStructFree(&StubMsg, mem, formattypes ); + ok(my_free_called == num_additional_allocs, "free called %d\n", my_free_called); /* ...unless we pass a NULL ptr, then the buffer is used. Passing a NULL ptr while we're a client && !must_alloc @@ -946,6 +964,8 @@ static void test_simple_struct_marshal(const unsigned char *formattypes, ok(my_alloc_called == num_additional_allocs, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called); my_alloc_called = 0; ok(StubMsg.MemorySize == 0, "%s: memorysize touched in unmarshal\n", msgpfx); + NdrSimpleStructFree(&StubMsg, mem, formattypes ); + ok(my_free_called == num_additional_allocs, "free called %d\n", my_free_called); } /*** now must_alloc is true ***/ @@ -961,7 +981,11 @@ static void test_simple_struct_marshal(const unsigned char *formattypes, ok(!cmp(mem, memsrc, srcsize), "incorrectly unmarshaled\n"); ok(my_alloc_called == num_additional_allocs + 1, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called); my_alloc_called = 0; + my_free_called = 0; ok(StubMsg.MemorySize == 0, "memorysize touched in unmarshal\n"); + NdrSimpleStructFree(&StubMsg, mem, formattypes ); + ok(my_free_called == num_additional_allocs, "free called %d\n", my_free_called); + my_free(mem); mem = NULL; StubMsg.Buffer = StubMsg.BufferStart; @@ -970,8 +994,12 @@ static void test_simple_struct_marshal(const unsigned char *formattypes, ok(mem != mem_orig, "mem not changed %p %p\n", mem, mem_orig); ok(!cmp(mem, memsrc, srcsize), "incorrectly unmarshaled\n"); ok(my_alloc_called == num_additional_allocs + 1, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called); - my_alloc_called = 0; + my_alloc_called = 0; + my_free_called = 0; ok(StubMsg.MemorySize == 0, "memorysize touched in unmarshal\n"); + NdrSimpleStructFree(&StubMsg, mem, formattypes ); + ok(my_free_called == num_additional_allocs, "free called %d\n", my_free_called); + my_free(mem); mem = mem_orig; StubMsg.Buffer = StubMsg.BufferStart; @@ -984,7 +1012,11 @@ static void test_simple_struct_marshal(const unsigned char *formattypes, ok(!cmp(mem, memsrc, srcsize), "incorrectly unmarshaled\n"); ok(my_alloc_called == num_additional_allocs + 1, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called); my_alloc_called = 0; + my_free_called = 0; ok(StubMsg.MemorySize == 0, "memorysize touched in unmarshal\n"); + NdrSimpleStructFree(&StubMsg, mem, formattypes ); + ok(my_free_called == num_additional_allocs, "free called %d\n", my_free_called); + my_free(mem); mem = NULL; StubMsg.Buffer = StubMsg.BufferStart; @@ -996,7 +1028,11 @@ static void test_simple_struct_marshal(const unsigned char *formattypes, ok(!cmp(mem, memsrc, srcsize), "incorrectly unmarshaled\n"); ok(my_alloc_called == num_additional_allocs + 1, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called); my_alloc_called = 0; + my_free_called = 0; ok(StubMsg.MemorySize == 0, "memorysize touched in unmarshal\n"); + NdrSimpleStructFree(&StubMsg, mem, formattypes ); + ok(my_free_called == num_additional_allocs, "free called %d\n", my_free_called); + my_free(mem); HeapFree(GetProcessHeap(), 0, mem_orig); HeapFree(GetProcessHeap(), 0, StubMsg.BufferStart); @@ -1506,6 +1542,8 @@ static void test_iface_ptr(void) NdrInterfacePointerFree(&StubMsg, (unsigned char *)proxy, fmtstr_ip); ok(client_obj.ref == 1, "got %d references\n", client_obj.ref); + HeapFree(GetProcessHeap(), 0, StubMsg.BufferStart); + CoUninitialize(); } @@ -1867,6 +1905,8 @@ static void test_ndr_allocate(void) else win_skip("v1 mem list format\n"); } /* NdrFree isn't exported so we can't test free'ing */ + my_free(p1); + my_free(p2); } static void test_conformant_array(void)

1 0

Józef Kucia : d3d9: Clamp index buffer upload range to buffer size.
by Alexandre Julliard Jan. 16, 2019

Jan. 16, 2019

Module: wine Branch: master Commit: fcb705bdead48bb534be0d5c893fa9e60776f5d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcb705bdead48bb534be0d5c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 15 15:28:01 2019 +0100 d3d9: Clamp index buffer upload range to buffer size. 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/d3d9/device.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 8ade5be..a26d943 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"); }

1 0

Sven Baars : opcservices/tests: Fix some memory leaks (Valgrind).
by Alexandre Julliard Jan. 16, 2019

Jan. 16, 2019

Module: wine Branch: master Commit: 0b3e7115de6749262296518d659247168a202f5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b3e7115de6749262296518d… Author: Sven Baars <sven.wine(a)gmail.com> Date: Wed Jan 16 20:13:02 2019 +0100 opcservices/tests: Fix some memory leaks (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 9792302..cd683b0 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); + IUri_Release(uri); heap_free(inputW); heap_free(rawW);

1 0

Józef Kucia : d3d8: Clamp vertex buffer upload range to buffer size.
by Alexandre Julliard Jan. 16, 2019

Jan. 16, 2019

Module: wine Branch: master Commit: 58868304dc70c91958cc8a012869a5bec364a764 URL: https://source.winehq.org/git/wine.git/?a=commit;h=58868304dc70c91958cc8a01… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 15 15:27:58 2019 +0100 d3d8: Clamp vertex buffer upload range to buffer size. 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/d3d8/device.c | 8 ++++++-- dlls/d3d8/tests/visual.c | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index b2a6e48..9e82b1e 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2271,8 +2271,10 @@ static void d3d8_device_upload_sysmem_vertex_buffers(struct d3d8_device *device, { struct wined3d_box box = {0, 0, 0, 1, 0, 1}; struct d3d8_vertexbuffer *d3d8_buffer; + struct wined3d_resource *dst_resource; unsigned int i, offset, stride, map; struct wined3d_buffer *dst_buffer; + struct wined3d_resource_desc desc; HRESULT hr; map = device->sysmem_vb; @@ -2284,10 +2286,12 @@ static void d3d8_device_upload_sysmem_vertex_buffers(struct d3d8_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"); d3d8_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(d3d8_buffer->wined3d_buffer), 0, &box, 0))) ERR("Failed to update buffer.\n"); } diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 43b286b..cc59922 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -10687,7 +10687,7 @@ static void test_sysmem_draw(void) hr = IDirect3DDevice8_BeginScene(device); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice8_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 4, 0, 2); + hr = IDirect3DDevice8_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 5, 0, 2); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice8_EndScene(device); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);

1 0

Józef Kucia : d3d9: Clamp vertex buffer upload range to buffer size.
by Alexandre Julliard Jan. 16, 2019

Jan. 16, 2019

Module: wine Branch: master Commit: a382c7911c28a7add80192a446113ebc420defba URL: https://source.winehq.org/git/wine.git/?a=commit;h=a382c7911c28a7add80192a4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 15 15:27:59 2019 +0100 d3d9: Clamp vertex buffer upload range to buffer size. 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/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 9ebaeba..8ade5be 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 9a62f87..fb7c3e4 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);

1 0