January 2019 - Wine-Commits

Alexandre Julliard : msi: Return an error code instead of a button id in msi_change_media().
by Alexandre Julliard Jan. 3, 2019

Jan. 3, 2019

Module: wine Branch: master Commit: a47343b97369e5f64bb78a7421f2d75258da282a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a47343b97369e5f64bb78a74… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 2 19:39:13 2019 +0100 msi: Return an error code instead of a button id in msi_change_media(). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/media.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 3d4a8c0..5f8c26a 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -97,7 +97,7 @@ static UINT msi_change_media(MSIPACKAGE *package, MSIMEDIAINFO *mi) msiobj_release(&record->hdr); msi_free(source_dir); - return r; + return r == IDRETRY ? ERROR_SUCCESS : ERROR_INSTALL_SOURCE_ABSENT; } static MSICABINETSTREAM *msi_get_cabinet_stream( MSIPACKAGE *package, UINT disk_id )

1 0

Józef Kucia : vkd3d: Implement private data for command queues.
by Alexandre Julliard Jan. 3, 2019

Jan. 3, 2019

Module: vkd3d Branch: master Commit: d18360a8b77d6f6be6d48f8207b18fdd70d7ff8f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d18360a8b77d6f6be6d48f8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 3 14:23:01 2019 +0100 vkd3d: Implement private data for command queues. 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_windows.h | 3 + libs/vkd3d/command.c | 22 ++++++-- libs/vkd3d/utils.c | 100 ++++++++++++++++++++++++++++++++ libs/vkd3d/vkd3d_private.h | 51 +++++++++++++++++ tests/d3d12.c | 138 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 308 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=d18360a8b77d6f6be6d…

1 0

Józef Kucia : tests: Modify ps_movc shader to avoid crashes on Windows.
by Alexandre Julliard Jan. 3, 2019

Jan. 3, 2019

Module: vkd3d Branch: master Commit: 1b07aae974b971edf13e9b227e13fafea190e03c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1b07aae974b971edf13e9b2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 3 16:18:14 2019 +0100 tests: Modify ps_movc shader to avoid crashes on Windows. 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> --- tests/d3d12.c | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 31c469b..534fd93 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -7215,18 +7215,21 @@ static void test_shader_instructions(void) dcl_globalFlags refactoringAllowed dcl_constantbuffer cb0[3], immediateIndexed dcl_output o0.xyzw - mov o0.xyzw, cb0[0].xyzw - movc o0.xyzw, o0.xyzw, cb0[1].xyzw, cb0[2].xyzw + dcl_temps 1 + mov r0.xyzw, cb0[0].xyzw + movc r0.xyzw, r0.xyzw, cb0[1].xyzw, cb0[2].xyzw + mov o0.xyzw, r0.xyzw ret #endif - 0x43425844, 0x317dec99, 0x3a8928ca, 0x5db9a8ea, 0xb4806d11, 0x00000001, 0x000000e8, 0x00000003, + 0x43425844, 0x59a5be58, 0x260c36c0, 0x7eadcff2, 0x947f4e9d, 0x00000001, 0x00000104, 0x00000003, 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000, - 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000070, 0x00000050, 0x0000001c, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x0000008c, 0x00000050, 0x00000023, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000003, 0x03000065, 0x001020f2, 0x00000000, - 0x06000036, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x0b000037, 0x001020f2, - 0x00000000, 0x00102e46, 0x00000000, 0x00208e46, 0x00000000, 0x00000001, 0x00208e46, 0x00000000, - 0x00000002, 0x0100003e, + 0x02000068, 0x00000001, 0x06000036, 0x001000f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, + 0x0b000037, 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, 0x00208e46, 0x00000000, 0x00000001, + 0x00208e46, 0x00000000, 0x00000002, 0x05000036, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, + 0x0100003e, }; static struct named_shader ps_movc = {"movc", ps_movc_code, sizeof(ps_movc_code)}; static const DWORD ps_swapc0_code[] = @@ -7474,7 +7477,7 @@ static void test_shader_instructions(void) {&ps_breakc_nz, {}, {{0.0f, 1.0f, 0.0f, 1.0f}}}, {&ps_breakc_z, {}, {{0.0f, 1.0f, 0.0f, 1.0f}}}, - {&ps_continue, {}, {{254.0f}}, TRUE}, + {&ps_continue, {}, {{254.0f}}, true}, {&ps_continuec_nz, {}, {{509.0f}}}, {&ps_retc_nz, {{ 0.0f}}, {{1.0f}}}, @@ -7834,12 +7837,12 @@ static void test_shader_instructions(void) {&ps_switch_no_default, {{{3}}}, {{2, 2, 2, 2}}}, {&ps_switch_no_default, {{{4}}}, {{3, 3, 3, 3}}}, - {&ps_movc, {{{0, 0, 0, 0}, {1, 2, 3, 4}, {5, 6, 7, 8}}}, {{5, 6, 7, 8}}, true}, - {&ps_movc, {{{0, 0, 0, 1}, {1, 2, 3, 4}, {5, 6, 7, 8}}}, {{5, 6, 7, 4}}, true}, - {&ps_movc, {{{1, 0, 0, 0}, {1, 2, 3, 4}, {5, 6, 7, 8}}}, {{1, 6, 7, 8}}, true}, - {&ps_movc, {{{1, 0, 0, 1}, {1, 2, 3, 4}, {5, 6, 7, 8}}}, {{1, 6, 7, 4}}, true}, - {&ps_movc, {{{0, 1, 1, 0}, {1, 2, 3, 4}, {5, 6, 7, 8}}}, {{5, 2, 3, 8}}, true}, - {&ps_movc, {{{1, 1, 1, 1}, {1, 2, 3, 4}, {5, 6, 7, 8}}}, {{1, 2, 3, 4}}, true}, + {&ps_movc, {{{0, 0, 0, 0}, {1, 2, 3, 4}, {5, 6, 7, 8}}}, {{5, 6, 7, 8}}}, + {&ps_movc, {{{0, 0, 0, 1}, {1, 2, 3, 4}, {5, 6, 7, 8}}}, {{5, 6, 7, 4}}}, + {&ps_movc, {{{1, 0, 0, 0}, {1, 2, 3, 4}, {5, 6, 7, 8}}}, {{1, 6, 7, 8}}}, + {&ps_movc, {{{1, 0, 0, 1}, {1, 2, 3, 4}, {5, 6, 7, 8}}}, {{1, 6, 7, 4}}}, + {&ps_movc, {{{0, 1, 1, 0}, {1, 2, 3, 4}, {5, 6, 7, 8}}}, {{5, 2, 3, 8}}}, + {&ps_movc, {{{1, 1, 1, 1}, {1, 2, 3, 4}, {5, 6, 7, 8}}}, {{1, 2, 3, 4}}}, { &ps_swapc0, @@ -8202,12 +8205,6 @@ static void test_shader_instructions(void) continue; } - if (uint_tests[i].ps == &ps_movc && is_amd_device(context.device)) - { - skip("ps_movc crashes on Windows with AMD GPUs.\n"); - continue; - } - if (current_ps != uint_tests[i].ps) { if (context.pipeline_state)

1 0

Józef Kucia : vkd3d: Implement private data for command lists.
by Alexandre Julliard Jan. 3, 2019

Jan. 3, 2019

Module: vkd3d Branch: master Commit: ec13f366810e6aa0349e10eff960571d23305ce5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ec13f366810e6aa0349e10e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 3 14:23:04 2019 +0100 vkd3d: Implement private data for command lists. 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/command.c | 22 ++++++++++++++++------ libs/vkd3d/vkd3d_private.h | 2 ++ tests/d3d12.c | 35 +++++++++++++++++++++-------------- 3 files changed, 39 insertions(+), 20 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index b947ad2..8708aaf 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1610,6 +1610,8 @@ static ULONG STDMETHODCALLTYPE d3d12_command_list_Release(ID3D12GraphicsCommandL { struct d3d12_device *device = list->device; + vkd3d_private_store_destroy(&list->private_store); + /* When command pool is destroyed, all command buffers are implicitly freed. */ if (list->allocator) d3d12_command_allocator_free_command_buffer(list->allocator, list); @@ -1625,25 +1627,31 @@ static ULONG STDMETHODCALLTYPE d3d12_command_list_Release(ID3D12GraphicsCommandL static HRESULT STDMETHODCALLTYPE d3d12_command_list_GetPrivateData(ID3D12GraphicsCommandList *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!", iface, debugstr_guid(guid), data_size, data); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return vkd3d_get_private_data(&list->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d12_command_list_SetPrivateData(ID3D12GraphicsCommandList *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return vkd3d_set_private_data(&list->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d12_command_list_SetPrivateDataInterface(ID3D12GraphicsCommandList *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return vkd3d_set_private_data_interface(&list->private_store, guid, data); } static HRESULT STDMETHODCALLTYPE d3d12_command_list_SetName(ID3D12GraphicsCommandList *iface, const WCHAR *name) @@ -4282,6 +4290,8 @@ static HRESULT d3d12_command_list_init(struct d3d12_command_list *list, struct d list->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); + vkd3d_private_store_init(&list->private_store); + list->allocator = allocator; if (SUCCEEDED(hr = d3d12_command_allocator_allocate_command_buffer(allocator, list))) diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 24d41e8..74e3432 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -765,6 +765,8 @@ struct d3d12_command_list struct d3d12_command_allocator *allocator; struct d3d12_device *device; + + struct vkd3d_private_store private_store; }; HRESULT d3d12_command_list_create(struct d3d12_device *device, diff --git a/tests/d3d12.c b/tests/d3d12.c index 70ee83e..38e6673 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2562,11 +2562,10 @@ static void test_private_data(void) D3D12_COMMAND_QUEUE_DESC queue_desc; ULONG refcount, expected_refcount; ID3D12CommandAllocator *allocator; - ID3D12CommandQueue *queue; IUnknown *test_object; ID3D12Device *device; ID3D12Object *object; - ID3D12Fence *fence; + IUnknown *unknown; unsigned int size; unsigned int i; IUnknown *ptr; @@ -2580,6 +2579,7 @@ static void test_private_data(void) static const GUID *tests[] = { &IID_ID3D12CommandAllocator, + &IID_ID3D12CommandList, &IID_ID3D12CommandQueue, &IID_ID3D12Fence, }; @@ -2592,15 +2592,22 @@ static void test_private_data(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { - object = NULL; if (IsEqualGUID(tests[i], &IID_ID3D12CommandAllocator)) { vkd3d_test_set_context("allocator"); hr = ID3D12Device_CreateCommandAllocator(device, D3D12_COMMAND_LIST_TYPE_DIRECT, + &IID_IUnknown, (void **)&unknown); + ok(hr == S_OK, "Failed to create command allocator, hr %#x.\n", hr); + } + else if (IsEqualGUID(tests[i], &IID_ID3D12CommandList)) + { + vkd3d_test_set_context("list"); + hr = ID3D12Device_CreateCommandAllocator(device, D3D12_COMMAND_LIST_TYPE_DIRECT, &IID_ID3D12CommandAllocator, (void **)&allocator); ok(hr == S_OK, "Failed to create command allocator, hr %#x.\n", hr); - hr = ID3D12CommandAllocator_QueryInterface(allocator, &IID_ID3D12Object, (void **)&object); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT, + allocator, NULL, &IID_IUnknown, (void **)&unknown); + ok(hr == S_OK, "Failed to create command list, hr %#x.\n", hr); ID3D12CommandAllocator_Release(allocator); } else if (IsEqualGUID(tests[i], &IID_ID3D12CommandQueue)) @@ -2611,27 +2618,27 @@ static void test_private_data(void) queue_desc.Flags = D3D12_COMMAND_QUEUE_FLAG_NONE; queue_desc.NodeMask = 0; hr = ID3D12Device_CreateCommandQueue(device, &queue_desc, - &IID_ID3D12CommandQueue, (void **)&queue); + &IID_IUnknown, (void **)&unknown); ok(hr == S_OK, "Failed to create command queue, hr %#x.\n", hr); - hr = ID3D12CommandQueue_QueryInterface(queue, &IID_ID3D12Object, (void **)&object); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - ID3D12CommandQueue_Release(queue); } else if (IsEqualGUID(tests[i], &IID_ID3D12Fence)) { vkd3d_test_set_context("fence"); hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE, - &IID_ID3D12Fence, (void **)&fence); + &IID_IUnknown, (void **)&unknown); ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); - hr = ID3D12Fence_QueryInterface(fence, &IID_ID3D12Object, (void **)&object); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - ID3D12Fence_Release(fence); } else { - ok(false, "Unhandled object type %u.\n", i); + unknown = NULL; } + ok(unknown, "Unhandled object type %u.\n", i); + object = NULL; + hr = IUnknown_QueryInterface(unknown, &IID_ID3D12Object, (void **)&object); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + IUnknown_Release(unknown); + hr = ID3D12Object_SetPrivateData(object, &test_guid, 0, NULL); ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); hr = ID3D12Object_SetPrivateDataInterface(object, &test_guid, NULL);

1 0

Józef Kucia : vkd3d: Implement private data for command allocators.
by Alexandre Julliard Jan. 3, 2019

Jan. 3, 2019

Module: vkd3d Branch: master Commit: f92abd7147629fa511487c0213c5833b2c190979 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f92abd7147629fa511487c0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 3 14:23:03 2019 +0100 vkd3d: Implement private data for command allocators. 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/command.c | 22 ++++++++++++++++------ libs/vkd3d/vkd3d_private.h | 2 ++ tests/d3d12.c | 14 +++++++++++++- 3 files changed, 31 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index d277540..b947ad2 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1016,6 +1016,8 @@ static ULONG STDMETHODCALLTYPE d3d12_command_allocator_Release(ID3D12CommandAllo struct d3d12_device *device = allocator->device; const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + vkd3d_private_store_destroy(&allocator->private_store); + if (allocator->current_command_list) d3d12_command_list_allocator_destroyed(allocator->current_command_list); @@ -1043,25 +1045,31 @@ static ULONG STDMETHODCALLTYPE d3d12_command_allocator_Release(ID3D12CommandAllo static HRESULT STDMETHODCALLTYPE d3d12_command_allocator_GetPrivateData(ID3D12CommandAllocator *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!", iface, debugstr_guid(guid), data_size, data); + struct d3d12_command_allocator *allocator = impl_from_ID3D12CommandAllocator(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return vkd3d_get_private_data(&allocator->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d12_command_allocator_SetPrivateData(ID3D12CommandAllocator *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + struct d3d12_command_allocator *allocator = impl_from_ID3D12CommandAllocator(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return vkd3d_set_private_data(&allocator->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d12_command_allocator_SetPrivateDataInterface(ID3D12CommandAllocator *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d12_command_allocator *allocator = impl_from_ID3D12CommandAllocator(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return vkd3d_set_private_data_interface(&allocator->private_store, guid, data); } static HRESULT STDMETHODCALLTYPE d3d12_command_allocator_SetName(ID3D12CommandAllocator *iface, const WCHAR *name) @@ -1232,6 +1240,8 @@ static HRESULT d3d12_command_allocator_init(struct d3d12_command_allocator *allo allocator->current_command_list = NULL; + vkd3d_private_store_init(&allocator->private_store); + allocator->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 79b94d4..24d41e8 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -693,6 +693,8 @@ struct d3d12_command_allocator struct d3d12_command_list *current_command_list; struct d3d12_device *device; + + struct vkd3d_private_store private_store; }; HRESULT d3d12_command_allocator_create(struct d3d12_device *device, diff --git a/tests/d3d12.c b/tests/d3d12.c index ef979cc..70ee83e 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2561,6 +2561,7 @@ static void test_private_data(void) { D3D12_COMMAND_QUEUE_DESC queue_desc; ULONG refcount, expected_refcount; + ID3D12CommandAllocator *allocator; ID3D12CommandQueue *queue; IUnknown *test_object; ID3D12Device *device; @@ -2578,6 +2579,7 @@ static void test_private_data(void) static const DWORD data[] = {1, 2, 3, 4}; static const GUID *tests[] = { + &IID_ID3D12CommandAllocator, &IID_ID3D12CommandQueue, &IID_ID3D12Fence, }; @@ -2591,7 +2593,17 @@ static void test_private_data(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { object = NULL; - if (IsEqualGUID(tests[i], &IID_ID3D12CommandQueue)) + if (IsEqualGUID(tests[i], &IID_ID3D12CommandAllocator)) + { + vkd3d_test_set_context("allocator"); + hr = ID3D12Device_CreateCommandAllocator(device, D3D12_COMMAND_LIST_TYPE_DIRECT, + &IID_ID3D12CommandAllocator, (void **)&allocator); + ok(hr == S_OK, "Failed to create command allocator, hr %#x.\n", hr); + hr = ID3D12CommandAllocator_QueryInterface(allocator, &IID_ID3D12Object, (void **)&object); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ID3D12CommandAllocator_Release(allocator); + } + else if (IsEqualGUID(tests[i], &IID_ID3D12CommandQueue)) { vkd3d_test_set_context("queue"); queue_desc.Type = D3D12_COMMAND_LIST_TYPE_DIRECT;

1 0

Józef Kucia : vkd3d: Implement private data for fences.
by Alexandre Julliard Jan. 3, 2019

Jan. 3, 2019

Module: vkd3d Branch: master Commit: 0ddd6dbbb6cbc5f1843290495486a15ba8aa228d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0ddd6dbbb6cbc5f18432904… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 3 14:23:02 2019 +0100 vkd3d: Implement private data for fences. 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/command.c | 22 +++-- libs/vkd3d/vkd3d_private.h | 2 + tests/d3d12.c | 234 ++++++++++++++++++++++++++------------------- 3 files changed, 151 insertions(+), 107 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=0ddd6dbbb6cbc5f1843…

1 0

Józef Kucia : vkd3d: Implement private data for ID3D12Device.
by Alexandre Julliard Jan. 3, 2019

Jan. 3, 2019

Module: vkd3d Branch: master Commit: 567000cab3a4799e54f9ebf7839292dce4363faf URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=567000cab3a4799e54f9ebf… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 3 14:23:05 2019 +0100 vkd3d: Implement private data for ID3D12Device. 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/device.c | 22 ++++++++++++++++------ libs/vkd3d/vkd3d_private.h | 2 ++ tests/d3d12.c | 12 ++++++++++++ 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 5bcfc29..7a7f4aa 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1469,6 +1469,8 @@ static ULONG STDMETHODCALLTYPE d3d12_device_Release(ID3D12Device *iface) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + vkd3d_private_store_destroy(&device->private_store); + vkd3d_gpu_va_allocator_cleanup(&device->gpu_va_allocator); vkd3d_fence_worker_stop(&device->fence_worker, device); VK_CALL(vkDestroySampler(device->vk_device, device->vk_dummy_sampler, NULL)); @@ -1488,27 +1490,33 @@ static ULONG STDMETHODCALLTYPE d3d12_device_Release(ID3D12Device *iface) static HRESULT STDMETHODCALLTYPE d3d12_device_GetPrivateData(ID3D12Device *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!", + struct d3d12_device *device = impl_from_ID3D12Device(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return vkd3d_get_private_data(&device->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d12_device_SetPrivateData(ID3D12Device *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", + struct d3d12_device *device = impl_from_ID3D12Device(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return vkd3d_set_private_data(&device->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d12_device_SetPrivateDataInterface(ID3D12Device *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d12_device *device = impl_from_ID3D12Device(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return vkd3d_set_private_data_interface(&device->private_store, guid, data); } static HRESULT STDMETHODCALLTYPE d3d12_device_SetName(ID3D12Device *iface, const WCHAR *name) @@ -2526,6 +2534,8 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, if ((device->parent = create_info->parent)) IUnknown_AddRef(device->parent); + vkd3d_private_store_init(&device->private_store); + return S_OK; out_free_pipeline_cache: diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 74e3432..4e26508 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -860,6 +860,8 @@ struct d3d12_device IUnknown *parent; LUID adapter_luid; + struct vkd3d_private_store private_store; + HRESULT removed_reason; }; diff --git a/tests/d3d12.c b/tests/d3d12.c index 38e6673..31c469b 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2581,6 +2581,7 @@ static void test_private_data(void) &IID_ID3D12CommandAllocator, &IID_ID3D12CommandList, &IID_ID3D12CommandQueue, + &IID_ID3D12Device, &IID_ID3D12Fence, }; @@ -2621,6 +2622,11 @@ static void test_private_data(void) &IID_IUnknown, (void **)&unknown); ok(hr == S_OK, "Failed to create command queue, hr %#x.\n", hr); } + else if (IsEqualGUID(tests[i], &IID_ID3D12Device)) + { + vkd3d_test_set_context("device"); + unknown = (IUnknown *)create_device(); + } else if (IsEqualGUID(tests[i], &IID_ID3D12Fence)) { vkd3d_test_set_context("fence"); @@ -2733,6 +2739,12 @@ static void test_private_data(void) ok(!size, "Got unexpected size %u.\n", size); ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); + if (IsEqualGUID(tests[i], &IID_ID3D12Device)) + { + hr = ID3D12Object_SetPrivateDataInterface(object, &test_guid, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + } + ID3D12Object_Release(object); refcount = IUnknown_Release(test_object);

1 0

Alexandre Julliard : ntdll: Also store FPU registers in RtlRaiseException( ).
by Alexandre Julliard Jan. 2, 2019

Jan. 2, 2019

Module: wine Branch: master Commit: dc80a0032927421d61b95659af570c21439e4a76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc80a0032927421d61b95659… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 2 17:24:48 2019 +0100 ntdll: Also store FPU registers in RtlRaiseException(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44485 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 0719c64..91ecfa7 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2499,6 +2499,19 @@ NTSTATUS WINAPI NtRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL } +/******************************************************************* + * raise_exception_full_context + * + * Raise an exception with the full CPU context. + */ +void raise_exception_full_context( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_chance ) +{ + save_fpu( context ); + /* FIXME: extended registers, debug registers */ + RtlRaiseStatus( NtRaiseException( rec, context, first_chance )); +} + + /*********************************************************************** * RtlRaiseException (NTDLL.@) */ @@ -2520,9 +2533,7 @@ __ASM_STDCALL_FUNC( RtlRaiseException, 4, "pushl $1\n\t" "pushl %eax\n\t" "pushl %ecx\n\t" - "call " __ASM_NAME("NtRaiseException") __ASM_STDCALL(12) "\n\t" - "pushl %eax\n\t" - "call " __ASM_NAME("RtlRaiseStatus") __ASM_STDCALL(4) "\n\t" + "call " __ASM_NAME("raise_exception_full_context") "\n\t" "leave\n\t" __ASM_CFI(".cfi_def_cfa %esp,4\n\t") __ASM_CFI(".cfi_same_value %ebp\n\t")

1 0

Zhiyi Zhang : riched20: Fix a use after free.
by Alexandre Julliard Jan. 2, 2019

Jan. 2, 2019

Module: wine Branch: master Commit: 62d80cff6917d6809614885f833358baeb310f20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=62d80cff6917d6809614885f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jan 2 00:03:29 2019 +0800 riched20: Fix a use after free. In ME_DestroyEditor(), the item list is being freed when calling get_total_width() in destroy_para(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46328 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 9bacc63..2bb2858 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3183,13 +3183,13 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) void ME_DestroyEditor(ME_TextEditor *editor) { - ME_DisplayItem *pFirst = editor->pBuffer->pFirst; - ME_DisplayItem *p = pFirst, *pNext = NULL; + ME_DisplayItem *p = editor->pBuffer->pFirst, *pNext = NULL; ME_Style *s, *cursor2; int i; ME_ClearTempStyle(editor); ME_EmptyUndoStack(editor); + editor->pBuffer->pFirst = NULL; while(p) { pNext = p->next; if (p->type == diParagraph)

1 0