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

[PATCH vkd3d 3/5] vkd3d: Implement private data for command allocators.
by Józef Kucia Jan. 3, 2019

Jan. 3, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- 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 d27754029bba..b947ad2f00db 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 79b94d4d1f1d..24d41e84fa45 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 ef979cc5f0e5..70ee83ef3428 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; -- 2.19.2

2 1

[PATCH vkd3d] tests: Modify ps_movc shader to avoid crashes on Windows.
by Józef Kucia Jan. 3, 2019

Jan. 3, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 43 ++++++++++++++++++++----------------------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 314f08a2fb7a..defcd288b271 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -7015,18 +7015,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, - 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, - 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000, - 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000070, 0x00000050, 0x0000001c, - 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, + 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, 0x0000008c, 0x00000050, 0x00000023, + 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000003, 0x03000065, 0x001020f2, 0x00000000, + 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[] = @@ -7274,7 +7277,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}}}, @@ -7634,12 +7637,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, @@ -8002,12 +8005,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) -- 2.19.2

2 1

[PATCH] comctl32/tests: Move the cursor over the treeview to avoid random mouse move messages.
by Huw Davies Jan. 3, 2019

Jan. 3, 2019

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45719 Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/comctl32/tests/treeview.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index c60aa8a6c4..8ba7f543de 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -2809,7 +2809,7 @@ static void test_right_click(void) HTREEITEM selected; RECT rc; LRESULT result; - POINT pt; + POINT pt, orig_pos; hTree = create_treeview_control(0); fill_tree(hTree); @@ -2828,6 +2828,8 @@ static void test_right_click(void) pt.x = (rc.left + rc.right) / 2; pt.y = (rc.top + rc.bottom) / 2; ClientToScreen(hMainWnd, &pt); + GetCursorPos(&orig_pos); + SetCursorPos(pt.x, pt.y); flush_events(); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -2843,6 +2845,7 @@ static void test_right_click(void) selected = (HTREEITEM)SendMessageA(hTree, TVM_GETNEXTITEM, TVGN_CARET, 0); ok(selected == hChild, "child item should still be selected\n"); + SetCursorPos(orig_pos.x, orig_pos.y); DestroyWindow(hTree); } -- 2.18.0

1 0

[PATCH 2/2] po: Updated Sinhala translation.
by Isira Seneviratne Jan. 3, 2019

Jan. 3, 2019

2 2

[PATCH 1/2] po: Updated French translation.
by Isira Seneviratne Jan. 3, 2019

Jan. 3, 2019

3 2

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

Jan. 3, 2019

Found while trying to install Borland C++ Builder. 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 3d4a8c09eb6e..5f8c26a34436 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 ) -- 2.19.2

2 1

Wine staging 4.0-rc4 release
by Alistair Leslie-Hughes Jan. 2, 2019

Jan. 2, 2019

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary of the past few weeks * Rebased to current wine 4.0-rc4 (830 patches are applied to wine vanilla) * Reviewed and upstreamed patches. Upstreamed (Either directly from staging or fixed with a similar patch). * urlmon/tests: Add test for opening cache file with DELETE access. * appwiz.cpl: Copy addons to cache instead of moving. Where can you help * Run Steam/Battle.net/UPlay. * Try you favorite game. * Test your favorite applications. * Steal staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[RFC PATCH] port: Provide ucrt compat functions required for mingw build.
by Jacek Caban Jan. 2, 2019

Jan. 2, 2019

Hi all, Recent mingw-w64 changed quite a lot its crt to be able to support different runtime DLLs (most notably both msvcrt.dll and ucrtbase.dll at the same time). This requires some compat code to be used depending on which DLL is used. Compat code lives in the same libraries as are used as importlibs (like libmsvcrt.a). Wine doesn't use this library and generates its own import library instead. This library misses compat code required by mingw startup code. Commit 32bac734632cf082da40a82de7f3135262688351 worked around the build problem by exporting more functions from our msvcrt. The problem is that those functions are not exported on Windows, so Wine DLLs compiled this way will fail to load on Windows. The attached patch adds required compat code from mingw-w64 (it's mostly just a copy of its code). It's just a proof of concept - if we want that, we'd need to make sure it builds with old mingw-w64 first. The solution has its problems: for example we may need to extend that in the future if more such changes will happen to be needed on mingw-w64 side. Also __acrt_iob_func situation is even more tricky than onexit table functions. It's pulled by code that is so late in linker order, that linker will not pull it from our lib. It happens to work because it's in the same object file as other onexit table functions which are pulled earlier in the process (so using GC sections could break it). It's not really nice, but it looks like a maintainable solution. Comments or better ideas are welcomed. Jacek --- libs/port/Makefile.in | 1 + libs/port/ucrt.c | 90 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+) create mode 100644 libs/port/ucrt.c

1 0

[PATCH] po: Update French translation
by Isira Seneviratne Jan. 2, 2019

Jan. 2, 2019

1 0

[PATCH] po: Update French translation
by Isira Seneviratne Jan. 2, 2019

Jan. 2, 2019

1 0