June 2019 - Wine-Commits - list.winehq.org

Józef Kucia : vkd3d: Begin and end conditional rendering outside render passes.
by Alexandre Julliard June 18, 2019

June 18, 2019

Module: vkd3d Branch: master Commit: 9939712560b124715debe9d7fb19adb1868b66c9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9939712560b124715debe9d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 18 10:07:49 2019 +0200 vkd3d: Begin and end conditional rendering outside render passes. The Vulkan spec says: "Conditional rendering must also either begin and end inside the same subpass of a render pass instance, or must both begin and end outside of a render pass instance (i.e. contain entire render pass instances)." 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 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 31a5d20..5b877db 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4941,11 +4941,14 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetPredication(ID3D12GraphicsCo vk_procs = &list->device->vk_procs; + /* FIXME: Add support for conditional rendering in render passes. */ + d3d12_command_list_end_current_render_pass(list); + if (resource) { VkConditionalRenderingBeginInfoEXT cond_info; - if (aligned_buffer_offset & (sizeof(UINT64) - 1)) + if (aligned_buffer_offset & (sizeof(uint64_t) - 1)) { WARN("Unaligned predicate argument buffer offset %#"PRIx64".\n", aligned_buffer_offset); return; @@ -4957,7 +4960,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetPredication(ID3D12GraphicsCo return; } - FIXME("Predication doesn't support clear and copy commands, " + FIXME_ONCE("Predication doesn't support clear and copy commands, " "and predication values are treated as 32-bit values.\n"); cond_info.sType = VK_STRUCTURE_TYPE_CONDITIONAL_RENDERING_BEGIN_INFO_EXT;

1 0

Józef Kucia : vkd3d: Validate resource pointer for transition barriers.
by Alexandre Julliard June 18, 2019

June 18, 2019

Module: vkd3d Branch: master Commit: e912a2c3290d5c4319ddf3e825019646d711abf1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e912a2c3290d5c4319ddf3e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jun 17 15:43:25 2019 +0200 vkd3d: Validate resource pointer for transition barriers. 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 | 28 ++++++++++++++++++++++------ libs/vkd3d/device.c | 2 +- tests/d3d12_invalid_usage.c | 12 ++++++++++-- 3 files changed, 33 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 4723e79..d3feb78 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1140,6 +1140,18 @@ HRESULT d3d12_fence_create(struct d3d12_device *device, } /* Command buffers */ +static void d3d12_command_list_mark_as_invalid(struct d3d12_command_list *list, + const char *message, ...) +{ + va_list args; + + va_start(args, message); + WARN("Command list %p is invalid: \"%s\".\n", list, vkd3d_dbg_vsprintf(message, args)); + va_end(args); + + list->is_valid = false; +} + static HRESULT d3d12_command_list_begin_command_buffer(struct d3d12_command_list *list) { struct d3d12_device *device = list->device; @@ -3731,19 +3743,23 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC if (!is_valid_resource_state(transition->StateBefore)) { - WARN("Invalid StateBefore %#x (barrier %u).\n", transition->StateBefore, i); - list->is_valid = false; + d3d12_command_list_mark_as_invalid(list, + "Invalid StateBefore %#x (barrier %u).", transition->StateBefore, i); continue; } if (!is_valid_resource_state(transition->StateAfter)) { - WARN("Invalid StateAfter %#x (barrier %u).\n", transition->StateAfter, i); - list->is_valid = false; + d3d12_command_list_mark_as_invalid(list, + "Invalid StateAfter %#x (barrier %u).", transition->StateAfter, i); + continue; + } + + if (!(resource = unsafe_impl_from_ID3D12Resource(transition->pResource))) + { + d3d12_command_list_mark_as_invalid(list, "A resource pointer is NULL."); continue; } - resource = unsafe_impl_from_ID3D12Resource(transition->pResource); - assert(resource); sub_resource_idx = transition->Subresource; if (!vk_barrier_parameters_from_d3d12_resource_state(transition->StateBefore, diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 217c1c8..37bfc40 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3201,7 +3201,7 @@ void d3d12_device_mark_as_removed(struct d3d12_device *device, HRESULT reason, va_list args; va_start(args, message); - WARN("Device %p is lost (reason %#x, message \"%s\").\n", + WARN("Device %p is lost (reason %#x, \"%s\").\n", device, reason, vkd3d_dbg_vsprintf(message, args)); va_end(args); diff --git a/tests/d3d12_invalid_usage.c b/tests/d3d12_invalid_usage.c index ab5deb5..feb45b4 100644 --- a/tests/d3d12_invalid_usage.c +++ b/tests/d3d12_invalid_usage.c @@ -32,7 +32,7 @@ static void recreate_command_list_(unsigned int line, ID3D12Device *device, ok_(line)(hr == S_OK, "Failed to create command list, hr %#x.\n", hr); } -static void test_invalid_texture_resource_barriers(void) +static void test_invalid_resource_barriers(void) { ID3D12Resource *texture, *readback_buffer, *upload_buffer; ID3D12CommandAllocator *command_allocator; @@ -127,6 +127,14 @@ static void test_invalid_texture_resource_barriers(void) hr = ID3D12GraphicsCommandList_Close(command_list); todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + recreate_command_list(device, command_allocator, &command_list); + + /* NULL resource. */ + transition_resource_state(command_list, NULL, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + hr = ID3D12GraphicsCommandList_Close(command_list); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ID3D12CommandAllocator_Release(command_allocator); ID3D12CommandQueue_Release(queue); ID3D12GraphicsCommandList_Release(command_list); @@ -284,6 +292,6 @@ START_TEST(d3d12_invalid_usage) enable_d3d12_debug_layer(argc, argv); init_adapter_info(); - run_test(test_invalid_texture_resource_barriers); + run_test(test_invalid_resource_barriers); run_test(test_invalid_copy_texture_region); }

1 0

Józef Kucia : vkd3d-shader: Fix component decoration for shader IO variables.
by Alexandre Julliard June 18, 2019

June 18, 2019

Module: vkd3d Branch: master Commit: 0bde4c7dca5ca681f3e653bd953939a02708c702 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0bde4c7dca5ca681f3e653b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jun 17 15:43:27 2019 +0200 vkd3d-shader: Fix component decoration for shader IO variables. This fixes a regression introduced by commit 91820630cb49ef645ca6251f63ce2ff63e0c568d. We need to take into account the combined write mask returned from needs_private_io_variable(). 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 | 8 ++++++ tests/d3d12.c | 65 ++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 69 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 25e3f8e..73d2661 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3944,6 +3944,10 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi component_count = VKD3D_VEC4_SIZE; write_mask = VKD3DSP_WRITEMASK_ALL; } + else + { + component_idx = vkd3d_write_mask_get_component_idx(write_mask); + } storage_class = SpvStorageClassInput; @@ -4300,6 +4304,10 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler use_private_variable = true; write_mask = VKD3DSP_WRITEMASK_ALL; } + else + { + component_idx = vkd3d_write_mask_get_component_idx(write_mask); + } vkd3d_symbol_make_register(&reg_symbol, reg); diff --git a/tests/d3d12.c b/tests/d3d12.c index 473a347..dbced1a 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -10039,6 +10039,62 @@ static void test_shader_input_output_components(void) 0x0100003e, }; static const D3D12_SHADER_BYTECODE ps4 = {ps4_code, sizeof(ps4_code)}; +#if 0 + struct ps_data + { + float4 position : SV_Position; + float4 color : COLOR; + float3 color1 : COLOR1; + float color2 : COLOR2; + }; + + ps_data vs_main(float4 position : POSITION) + { + ps_data o; + o.position = position; + o.color = float4(0, 1, 0, 1); + o.color1 = (float3)0.5; + o.color2 = 0.25; + return o; + } + + float4 ps_main(ps_data i) : SV_Target + { + return float4(i.color.rgb, i.color2); + } +#endif + static const DWORD vs5_code[] = + { + 0x43425844, 0xc3e1b9fc, 0xb99e43ef, 0x9a2a6dfc, 0xad719e68, 0x00000001, 0x00000190, 0x00000003, + 0x0000002c, 0x00000060, 0x000000e4, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x49534f50, 0x4e4f4954, 0xababab00, + 0x4e47534f, 0x0000007c, 0x00000004, 0x00000008, 0x00000068, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x00000074, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, + 0x00000074, 0x00000001, 0x00000000, 0x00000003, 0x00000002, 0x00000807, 0x00000074, 0x00000002, + 0x00000000, 0x00000003, 0x00000002, 0x00000708, 0x505f5653, 0x7469736f, 0x006e6f69, 0x4f4c4f43, + 0xabab0052, 0x58454853, 0x000000a4, 0x00010050, 0x00000029, 0x0100086a, 0x0300005f, 0x001010f2, + 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000001, + 0x03000065, 0x00102072, 0x00000002, 0x03000065, 0x00102082, 0x00000002, 0x05000036, 0x001020f2, + 0x00000000, 0x00101e46, 0x00000000, 0x08000036, 0x001020f2, 0x00000001, 0x00004002, 0x00000000, + 0x3f800000, 0x00000000, 0x3f800000, 0x08000036, 0x001020f2, 0x00000002, 0x00004002, 0x3f000000, + 0x3f000000, 0x3f000000, 0x3e800000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE vs5 = {vs5_code, sizeof(vs5_code)}; + static const DWORD ps5_code[] = + { + 0x43425844, 0x285bf397, 0xbc07e078, 0xc4e528e3, 0x74efea4d, 0x00000001, 0x00000148, 0x00000003, + 0x0000002c, 0x000000b0, 0x000000e4, 0x4e475349, 0x0000007c, 0x00000004, 0x00000008, 0x00000068, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000074, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x0000070f, 0x00000074, 0x00000001, 0x00000000, 0x00000003, 0x00000002, + 0x00000007, 0x00000074, 0x00000002, 0x00000000, 0x00000003, 0x00000002, 0x00000808, 0x505f5653, + 0x7469736f, 0x006e6f69, 0x4f4c4f43, 0xabab0052, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, + 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, + 0xabab0074, 0x58454853, 0x0000005c, 0x00000050, 0x00000017, 0x0100086a, 0x03001062, 0x00101072, + 0x00000001, 0x03001062, 0x00101082, 0x00000002, 0x03000065, 0x001020f2, 0x00000000, 0x05000036, + 0x00102072, 0x00000000, 0x00101246, 0x00000001, 0x05000036, 0x00102082, 0x00000000, 0x0010103a, + 0x00000002, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps5 = {ps5_code, sizeof(ps5_code)}; static const D3D12_INPUT_ELEMENT_DESC layout_desc[] = { {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, @@ -10071,10 +10127,11 @@ static void test_shader_input_output_components(void) } tests[] = { - {&vs1, &ps1, {1.0f, 2.0f, 3.0f, 0.0f}, {0xdeadbeef, 0, 2, 3}}, - {&vs2, &ps2, {6.0f, 4.0f, 7.0f, 8.0f}, { 9, 5, 0, 1}}, - {&vs2, &ps3, {3.0f, 8.0f, 7.0f, 7.0f}, { 9, 0, 0, 1}}, - {&vs2, &ps4, {0.0f, 1.0f, 0.0f, 1.0f}, { 0, 1, 0, 0}}, + {&vs1, &ps1, {1.0f, 2.0f, 3.0f, 0.00f}, {0xdeadbeef, 0, 2, 3}}, + {&vs2, &ps2, {6.0f, 4.0f, 7.0f, 8.00f}, { 9, 5, 0, 1}}, + {&vs2, &ps3, {3.0f, 8.0f, 7.0f, 7.00f}, { 9, 0, 0, 1}}, + {&vs2, &ps4, {0.0f, 1.0f, 0.0f, 1.00f}, { 0, 1, 0, 0}}, + {&vs5, &ps5, {0.0f, 1.0f, 0.0f, 0.25f}, { 0, 1, 0, 0}}, }; memset(&desc, 0, sizeof(desc));

1 0

Alistair Leslie-Hughes : dbghelp: Return a dos path from SymGetLineFromAddr.
by Alexandre Julliard June 17, 2019

June 17, 2019

Module: wine Branch: master Commit: 4aa7fbe0561e6a27f098a05a63c5a7d12397e678 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4aa7fbe0561e6a27f098a05a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 13 08:29:58 2019 +0000 dbghelp: Return a dos path from SymGetLineFromAddr. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=34687 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/symbol.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 2516904..3689500 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1478,7 +1478,19 @@ BOOL symt_fill_func_line_info(const struct module* module, const struct symt_fun } if (found) { - line->FileName = (char*)source_get(module, dli->u.source_file); + if (dbghelp_opt_native) + { + /* Return native file paths when using winedbg */ + line->FileName = (char*)source_get(module, dli->u.source_file); + } + else + { + WCHAR *dospath = wine_get_dos_file_name(source_get(module, dli->u.source_file)); + DWORD len = WideCharToMultiByte(CP_ACP, 0, dospath, -1, NULL, 0, NULL, NULL); + line->FileName = fetch_buffer(module->process, len); + WideCharToMultiByte(CP_ACP, 0, dospath, -1, line->FileName, len, NULL, NULL); + HeapFree( GetProcessHeap(), 0, dospath ); + } return TRUE; } }

1 0

Dmitry Timoshkov : mshtml: Fix a typo.
by Alexandre Julliard June 17, 2019

June 17, 2019

Module: wine Branch: master Commit: 0716fd58a8d96782454c9cc49351cc0f453e82bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=0716fd58a8d96782454c9cc4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jun 14 18:46:31 2019 +0800 mshtml: Fix a typo. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelemcol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index 15b5844..62c7254 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -523,7 +523,7 @@ static HRESULT WINAPI HTMLElementCollection_tags(IHTMLElementCollection *iface, nsAString_Finish(&tag_str); elem_vector_normalize(&buf); - TRACE("fount %d tags\n", buf.len); + TRACE("found %d tags\n", buf.len); *pdisp = (IDispatch*)HTMLElementCollection_Create(buf.buf, buf.len, dispex_compat_mode(&This->dispex));

1 0

Alistair Leslie-Hughes : mshtml: Remove redundant assignments.
by Alexandre Julliard June 17, 2019

June 17, 2019

Module: wine Branch: master Commit: f6bdee2a62881c8c1a6c0d93564ca1d35e133095 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6bdee2a62881c8c1a6c0d93… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jun 14 05:53:30 2019 +0000 mshtml: Remove redundant assignments. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/oleobj.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index 274db8c..1d8d626 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -922,7 +922,6 @@ static HRESULT WINAPI OleControl_OnAmbientPropertyChange(IOleControl *iface, DIS if(V_VT(&res) == VT_BOOL) { if(V_BOOL(&res)) { FIXME("silent mode is not supported\n"); - hres = E_FAIL; } }else { FIXME("silent=%s\n", debugstr_variant(&res)); @@ -935,7 +934,6 @@ static HRESULT WINAPI OleControl_OnAmbientPropertyChange(IOleControl *iface, DIS return S_OK; FIXME("not supported AMBIENT_USERAGENT\n"); - hres = E_FAIL; return S_OK; case DISPID_AMBIENT_PALETTE: TRACE("(%p)->(DISPID_AMBIENT_PALETTE)\n", This); @@ -944,7 +942,6 @@ static HRESULT WINAPI OleControl_OnAmbientPropertyChange(IOleControl *iface, DIS return S_OK; FIXME("not supported AMBIENT_PALETTE\n"); - hres = E_FAIL; return S_OK; }

1 0

Alistair Leslie-Hughes : advapi32: Don' t read a value that might be uninitialized (Coverity).
by Alexandre Julliard June 17, 2019

June 17, 2019

Module: wine Branch: master Commit: 1b714ca0886aed265f85f6a661e3058f9f7c56a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b714ca0886aed265f85f6a6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jun 17 06:28:43 2019 +0000 advapi32: Don't read a value that might be uninitialized (Coverity). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/registry.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 9269898..2d2c1be 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -2118,7 +2118,7 @@ LSTATUS WINAPI RegGetValueW( HKEY hKey, LPCWSTR pszSubKey, LPCWSTR pszValue, DWORD dwFlags, LPDWORD pdwType, PVOID pvData, LPDWORD pcbData ) { - DWORD dwType, cbData = pcbData ? *pcbData : 0; + DWORD dwType, cbData = (pvData && pcbData) ? *pcbData : 0; PVOID pvBuf = NULL; LONG ret; @@ -2214,7 +2214,7 @@ LSTATUS WINAPI RegGetValueA( HKEY hKey, LPCSTR pszSubKey, LPCSTR pszValue, DWORD dwFlags, LPDWORD pdwType, PVOID pvData, LPDWORD pcbData ) { - DWORD dwType, cbData = pcbData ? *pcbData : 0; + DWORD dwType, cbData = (pvData && pcbData) ? *pcbData : 0; PVOID pvBuf = NULL; LONG ret;

1 0

Alistair Leslie-Hughes : dinput: Ensure buffer doesn't overflow (Coverity) .
by Alexandre Julliard June 17, 2019

June 17, 2019

Module: wine Branch: master Commit: 55edfc8837a26ced87964014c6e62e1be7dcc5e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55edfc8837a26ced87964014… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jun 16 06:50:02 2019 +0000 dinput: Ensure buffer doesn't overflow (Coverity). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick.c | 2 +- dlls/dinput/joystick_linuxinput.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 433348c..a5308b6 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -700,7 +700,7 @@ HRESULT WINAPI JoystickAGenericImpl_GetDeviceInfo( /* we only support traditional joysticks for now */ pdidi->dwDevType = This->devcaps.dwDevType; snprintf(pdidi->tszInstanceName, MAX_PATH, "Joystick %d", index); - strcpy(pdidi->tszProductName, This->name); + lstrcpynA(pdidi->tszProductName, This->name, MAX_PATH); if (pdidi->dwSize > sizeof(DIDEVICEINSTANCE_DX3A)) { pdidi->guidFFDriver = GUID_NULL; pdidi->wUsagePage = 0; diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index e3371b9..1e8c542 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -411,8 +411,8 @@ static void fill_joystick_dideviceinstanceA(LPDIDEVICEINSTANCEA lpddi, DWORD ver lpddi->guidInstance = lpddiW.guidInstance; lpddi->guidProduct = lpddiW.guidProduct; lpddi->dwDevType = lpddiW.dwDevType; - strcpy(lpddi->tszInstanceName, joydevs[id].name); - strcpy(lpddi->tszProductName, joydevs[id].name); + lstrcpynA(lpddi->tszInstanceName, joydevs[id].name, MAX_PATH); + lstrcpynA(lpddi->tszProductName, joydevs[id].name, MAX_PATH); lpddi->guidFFDriver = lpddiW.guidFFDriver; lpddi->wUsagePage = lpddiW.wUsagePage; lpddi->wUsage = lpddiW.wUsage;

1 0

Ethan Lee : xaudio2: Fix some TRACE calls erroneously marked as stubs.
by Alexandre Julliard June 17, 2019

June 17, 2019

Module: wine Branch: master Commit: 07d3780d6888e795e9fe6da0391991f85b5f0947 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07d3780d6888e795e9fe6da0… Author: Ethan Lee <elee(a)codeweavers.com> Date: Fri Jun 14 10:06:30 2019 -0400 xaudio2: Fix some TRACE calls erroneously marked as stubs. Signed-off-by: Ethan Lee <elee(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index f135642..da0b0aa 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1811,7 +1811,7 @@ static void WINAPI IXAudio2Impl_GetPerformanceData(IXAudio2 *iface, { IXAudio2Impl *This = impl_from_IXAudio2(iface); - TRACE("(%p)->(%p): stub!\n", This, pPerfData); + TRACE("(%p)->(%p)\n", This, pPerfData); FAudio_GetPerformanceData(This->faudio, (FAudioPerformanceData *)pPerfData); } @@ -1822,7 +1822,7 @@ static void WINAPI IXAudio2Impl_SetDebugConfiguration(IXAudio2 *iface, { IXAudio2Impl *This = impl_from_IXAudio2(iface); - TRACE("(%p)->(%p, %p): stub!\n", This, pDebugConfiguration, pReserved); + TRACE("(%p)->(%p, %p)\n", This, pDebugConfiguration, pReserved); FAudio_SetDebugConfiguration(This->faudio, (FAudioDebugConfiguration *)pDebugConfiguration, pReserved); }

1 0

Zebediah Figura : kernel32: Use RtlCreateUserStack().
by Alexandre Julliard June 17, 2019

June 17, 2019

Module: wine Branch: master Commit: 9b7e2f54b236ee8944a6e1c90408dd92c6783a0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b7e2f54b236ee8944a6e1c9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jun 14 10:32:44 2019 -0500 kernel32: Use RtlCreateUserStack(). Planet Coaster allocates 128kB of stack (both reserve and commit) but expects to be able to use at least one page more than that. Native Windows always reserves at least 1MB of stack. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/fiber.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/fiber.c b/dlls/kernel32/fiber.c index 151a676..27abd78 100644 --- a/dlls/kernel32/fiber.c +++ b/dlls/kernel32/fiber.c @@ -89,6 +89,8 @@ LPVOID WINAPI CreateFiberEx( SIZE_T stack_commit, SIZE_T stack_reserve, DWORD fl LPFIBER_START_ROUTINE start, LPVOID param ) { struct fiber_data *fiber; + INITIAL_TEB stack; + NTSTATUS status; if (!(fiber = HeapAlloc( GetProcessHeap(), 0, sizeof(*fiber) ))) { @@ -96,15 +98,15 @@ LPVOID WINAPI CreateFiberEx( SIZE_T stack_commit, SIZE_T stack_reserve, DWORD fl return NULL; } - /* FIXME: should use the thread stack allocation routines here */ - if (!stack_reserve) stack_reserve = 1024*1024; - if(!(fiber->stack_allocation = VirtualAlloc( 0, stack_reserve, MEM_COMMIT, PAGE_READWRITE ))) + if ((status = RtlCreateUserStack( stack_commit, stack_reserve, 0, 1, 1, &stack ))) { - HeapFree( GetProcessHeap(), 0, fiber ); + SetLastError( RtlNtStatusToDosError(status) ); return NULL; } - fiber->stack_base = (char *)fiber->stack_allocation + stack_reserve; - fiber->stack_limit = fiber->stack_allocation; + + fiber->stack_allocation = stack.DeallocationStack; + fiber->stack_base = stack.StackBase; + fiber->stack_limit = stack.StackLimit; fiber->param = param; fiber->except = (void *)-1; fiber->start = start; @@ -127,7 +129,7 @@ void WINAPI DeleteFiber( LPVOID fiber_ptr ) HeapFree( GetProcessHeap(), 0, fiber ); ExitThread(1); } - VirtualFree( fiber->stack_allocation, 0, MEM_RELEASE ); + RtlFreeUserStack( fiber->stack_allocation ); HeapFree( GetProcessHeap(), 0, fiber->fls_slots ); HeapFree( GetProcessHeap(), 0, fiber ); }

1 0