October 2018 - Wine-commits

Alexandre Julliard : user32: Use height from font metrics for empty text runs in TabbedTextOut().
by Alexandre Julliard 08 Oct '18

08 Oct '18

Module: wine Branch: master Commit: 5d282ec64d1ad815586adcd57ff494b524ed1064 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d282ec64d1ad815586adcd5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 8 13:20:36 2018 +0200 user32: Use height from font metrics for empty text runs in TabbedTextOut(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39051 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/text.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/user32/text.c b/dlls/user32/text.c index 118dbeb..9601c60 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -1385,7 +1385,9 @@ static LONG TEXT_TabbedTextOut( HDC hdc, INT x, INT y, LPCWSTR lpstr, } } else x += extent.cx; - + + if (!extent.cy) extent.cy = tm.tmHeight; + if (fDisplayText) { r.top = y; @@ -1398,9 +1400,6 @@ static LONG TEXT_TabbedTextOut( HDC hdc, INT x, INT y, LPCWSTR lpstr, lpstr += j; } - if(!extent.cy) - extent.cy = tm.tmHeight; - return MAKELONG(x - start, extent.cy); }

1 0

Alexandre Julliard : msvcr120: Avoid duplicate spec file entry for creal() .
by Alexandre Julliard 08 Oct '18

08 Oct '18

Module: wine Branch: master Commit: 7f72332d6cd2a9e091f0cf7aeb0379fa3c84d91d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f72332d6cd2a9e091f0cf7a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 8 13:36:53 2018 +0200 msvcr120: Avoid duplicate spec file entry for creal(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec | 3 +-- dlls/msvcr120/msvcr120.spec | 3 +-- dlls/msvcr120_app/msvcr120_app.spec | 3 +-- dlls/ucrtbase/ucrtbase.spec | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index e7f3c98..0d645e5 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -202,8 +202,7 @@ @ stub cproj @ stub cprojf @ stub cprojl -@ cdecl -arch=i386 creal(double double) ucrtbase.creal -@ cdecl -arch=arm,x86_64,arm64 creal(ptr) ucrtbase.creal +@ cdecl creal(int128) ucrtbase.creal @ stub crealf @ stub creall @ stub csin diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index c94947c..2725e01 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2103,8 +2103,7 @@ @ stub cproj @ stub cprojf @ stub cprojl -@ cdecl -arch=i386 creal(double double) MSVCR120_creal -@ cdecl -arch=arm,x86_64,arm64 creal(ptr) MSVCR120_creal +@ cdecl creal(int128) MSVCR120_creal @ stub crealf @ stub creall @ stub csin diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index f385f6c..22539e1 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1769,8 +1769,7 @@ @ stub cproj @ stub cprojf @ stub cprojl -@ cdecl -arch=i386 creal(double double) msvcr120.creal -@ cdecl -arch=arm,x86_64,arm64 creal(ptr) msvcr120.creal +@ cdecl creal(int128) msvcr120.creal @ stub crealf @ stub creall @ stub csin diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 084bea8..422315b 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2246,8 +2246,7 @@ @ stub cproj @ stub cprojf @ stub cprojl -@ cdecl -arch=i386 creal(double double) MSVCR120_creal -@ cdecl -arch=arm,x86_64,arm64 creal(ptr) MSVCR120_creal +@ cdecl creal(int128) MSVCR120_creal @ stub crealf @ stub creall @ stub csin

1 0

Józef Kucia : vkd3d: Ignore D3D_PRIMITIVE_TOPOLOGY_UNDEFINED.
by Alexandre Julliard 08 Oct '18

08 Oct '18

Module: vkd3d Branch: master Commit: fa6304ee04f227dbbc77168de045f36f8d71fa82 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=fa6304ee04f227dbbc77168… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 8 15:40:17 2018 +0200 vkd3d: Ignore D3D_PRIMITIVE_TOPOLOGY_UNDEFINED. 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 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 017e6ac..55fa933 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2910,6 +2910,12 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetPrimitiveTopology(ID3D12Gr TRACE("iface %p, topology %#x.\n", iface, topology); + if (topology == D3D_PRIMITIVE_TOPOLOGY_UNDEFINED) + { + WARN("Ignoring D3D_PRIMITIVE_TOPOLOGY_UNDEFINED.\n"); + return; + } + list->primitive_topology = vk_topology_from_d3d12_topology(topology); d3d12_command_list_invalidate_current_pipeline(list); }

1 0

Józef Kucia : tests: Clear RTV outside pipeline statistics query.
by Alexandre Julliard 08 Oct '18

08 Oct '18

Module: vkd3d Branch: master Commit: 74dfb3fcc2642a37cb4da7682b9ae354342b088e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=74dfb3fcc2642a37cb4da76… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 8 15:40:18 2018 +0200 tests: Clear RTV outside pipeline statistics query. On RADV additional vertices generated by clears are also counted. The Vulkan spec allows this behavior: "Rendering operations such as clears, MSAA resolves, attachment load/store operations, and blits may count towards the results of queries." 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index dd842bc..73f4da9 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -16898,11 +16898,11 @@ static void test_query_pipeline_statistics(void) ID3D12GraphicsCommandList_ResolveQueryData(command_list, query_heap, D3D12_QUERY_TYPE_PIPELINE_STATISTICS, 0, 1, resource, 0); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + /* Second query: draw something simple. */ ID3D12GraphicsCommandList_BeginQuery(command_list, query_heap, D3D12_QUERY_TYPE_PIPELINE_STATISTICS, 1); - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); - ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);

1 0

Józef Kucia : vkd3d: Implement D3D12_FEATURE_SHADER_MODEL.
by Alexandre Julliard 08 Oct '18

08 Oct '18

Module: vkd3d Branch: master Commit: c296cbe30b3332d1b48341f78a173ec6adc94268 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c296cbe30b3332d1b48341f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 8 16:28:21 2018 +0200 vkd3d: Implement D3D12_FEATURE_SHADER_MODEL. 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 | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index f91c0d9..a839dcc 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1804,9 +1804,32 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * return S_OK; } + case D3D12_FEATURE_SHADER_MODEL: + { + D3D12_FEATURE_DATA_SHADER_MODEL *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + return E_INVALIDARG; + } + + TRACE("Request shader model %#x.\n", data->HighestShaderModel); + + data->HighestShaderModel = D3D_SHADER_MODEL_5_1; + return S_OK; + } + case D3D12_FEATURE_ROOT_SIGNATURE: { D3D12_FEATURE_DATA_ROOT_SIGNATURE *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + return E_INVALIDARG; + } + FIXME("Root signature version 1_1 not supported yet.\n"); data->HighestVersion = D3D_ROOT_SIGNATURE_VERSION_1_0; return S_OK;

1 0

Józef Kucia : vkd3d: Fix race condition while dumping DXBC shaders.
by Alexandre Julliard 08 Oct '18

08 Oct '18

Module: vkd3d Branch: master Commit: 07d115b1d472e70822a39641ee66ba3dd71ad92c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=07d115b1d472e70822a3964… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 8 15:40:20 2018 +0200 vkd3d: Fix race condition while dumping DXBC shaders. 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 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index b60cebf..1d18c31 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1203,11 +1203,14 @@ struct d3d12_pipeline_state *unsafe_impl_from_ID3D12PipelineState(ID3D12Pipeline static void dump_shader(const char *path, const char *prefix, const void *data, size_t size) { - static unsigned int shader_id = 0; + static int shader_id = 0; char filename[1024]; + unsigned int id; FILE *f; - snprintf(filename, ARRAY_SIZE(filename), "%s/vkd3d-shader-%s-%u.dxbc", path, prefix, shader_id); + id = InterlockedIncrement(&shader_id) - 1; + + snprintf(filename, ARRAY_SIZE(filename), "%s/vkd3d-shader-%s-%u.dxbc", path, prefix, id); if (!(f = fopen(filename, "wb"))) { ERR("Failed to open %s for dumping shader.\n", filename); @@ -1218,8 +1221,6 @@ static void dump_shader(const char *path, const char *prefix, const void *data, ERR("Failed to write shader to %s.\n", filename); if (fclose(f)) ERR("Failed to close stream %s.\n", filename); - - ++shader_id; } static void dump_shader_stage(VkShaderStageFlagBits stage, const void *data, size_t size)

1 0

Józef Kucia : tests: Add test for creating tons of command queues.
by Alexandre Julliard 08 Oct '18

08 Oct '18

Module: vkd3d Branch: master Commit: e47a1320ca0c13e84134aaa076c8946b4ab62f17 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e47a1320ca0c13e84134aaa… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 8 15:40:21 2018 +0200 tests: Add test for creating tons of command queues. Mainly to show that those are not strictly linked to HW 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> --- tests/d3d12.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 73f4da9..f40aded 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1529,9 +1529,11 @@ static void test_create_command_list(void) static void test_create_command_queue(void) { + ID3D12CommandQueue* direct_queues[32], *compute_queues[32]; D3D12_COMMAND_QUEUE_DESC desc, result_desc; ID3D12Device *device, *tmp_device; ID3D12CommandQueue *queue; + unsigned int i; ULONG refcount; HRESULT hr; @@ -1584,6 +1586,24 @@ static void test_create_command_queue(void) refcount = ID3D12CommandQueue_Release(queue); ok(!refcount, "ID3D12CommandQueue has %u references left.\n", (unsigned int)refcount); + desc.Type = D3D12_COMMAND_LIST_TYPE_DIRECT; + for (i = 0; i < ARRAY_SIZE(direct_queues); ++i) + { + hr = ID3D12Device_CreateCommandQueue(device, &desc, &IID_ID3D12CommandQueue, (void **)&direct_queues[i]); + ok(hr == S_OK, "Failed to create direct command queue %u, hr %#x.\n", hr, i); + } + desc.Type = D3D12_COMMAND_LIST_TYPE_COMPUTE; + for (i = 0; i < ARRAY_SIZE(compute_queues); ++i) + { + hr = ID3D12Device_CreateCommandQueue(device, &desc, &IID_ID3D12CommandQueue, (void **)&compute_queues[i]); + ok(hr == S_OK, "Failed to create compute command queue %u, hr %#x.\n", hr, i); + } + + for (i = 0; i < ARRAY_SIZE(direct_queues); ++i) + ID3D12CommandQueue_Release(direct_queues[i]); + for (i = 0; i < ARRAY_SIZE(compute_queues); ++i) + ID3D12CommandQueue_Release(compute_queues[i]); + refcount = ID3D12Device_Release(device); ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); }

1 0

Józef Kucia : vkd3d-shader: Implement SV_SampleIndex.
by Alexandre Julliard 08 Oct '18

08 Oct '18

Module: vkd3d Branch: master Commit: 1f4e6dc60330eee49567a920db682075d9bc0288 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1f4e6dc60330eee49567a92… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 8 15:40:15 2018 +0200 vkd3d-shader: Implement SV_SampleIndex. 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-shader/spirv.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 98d7a93..63a1a0e 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2958,6 +2958,14 @@ static uint32_t sv_front_face_fixup(struct vkd3d_dxbc_compiler *compiler, return vkd3d_dxbc_compiler_emit_bool_to_int(compiler, 1, front_facing_id); } +static uint32_t sv_sample_index(struct vkd3d_dxbc_compiler *compiler, uint32_t id) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + + vkd3d_spirv_enable_capability(builder, SpvCapabilitySampleRateShading); + return id; +} + struct vkd3d_spirv_builtin { enum vkd3d_component_type component_type; @@ -2986,6 +2994,8 @@ vkd3d_system_value_builtins[] = {VKD3D_SIV_IS_FRONT_FACE, {VKD3D_TYPE_BOOL, 1, SpvBuiltInFrontFacing, sv_front_face_fixup}}, + {VKD3D_SIV_SAMPLE_INDEX, {VKD3D_TYPE_UINT, 1, SpvBuiltInSampleId, sv_sample_index}}, + {VKD3D_SIV_CLIP_DISTANCE, {VKD3D_TYPE_FLOAT, 1, SpvBuiltInClipDistance, NULL, true}}, {VKD3D_SIV_CULL_DISTANCE, {VKD3D_TYPE_FLOAT, 1, SpvBuiltInCullDistance, NULL, true}}, };

1 0

Józef Kucia : vkd3d: Downgrade FIXME() in d3d12_command_list_IASetIndexBuffer().
by Alexandre Julliard 08 Oct '18

08 Oct '18

Module: vkd3d Branch: master Commit: 39886b23860b7eedb8c06747367c1af7ef1c47bc URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=39886b23860b7eedb8c0674… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 8 15:40:16 2018 +0200 vkd3d: Downgrade FIXME() in d3d12_command_list_IASetIndexBuffer(). An app calls IASetIndexBuffer() with DXGI_FORMAT_UNKNOWN. 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 5a2baef..017e6ac 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3554,7 +3554,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetIndexBuffer(ID3D12Graphics index_type = VK_INDEX_TYPE_UINT32; break; default: - FIXME("Unhandled format %#x.\n", view->Format); + WARN("Invalid index format %#x.\n", view->Format); return; }

1 0

Jacek Caban : hostname: Use GetComputerNameW to get hostname.
by Alexandre Julliard 05 Oct '18

05 Oct '18

1 0