January 2019 - Wine-commits

Józef Kucia : vkd3d-shader: Mark hs_decls as declaration instruction.
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: vkd3d Branch: master Commit: 4f55d990b9e951b06b151fb7712b23e8baf47aca URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4f55d990b9e951b06b151fb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 24 15:09:22 2019 +0100 vkd3d-shader: Mark hs_decls as declaration instruction. 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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 6ea9836..d2c417f 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -6765,7 +6765,8 @@ static void vkd3d_dxbc_compiler_emit_main_prolog(struct vkd3d_dxbc_compiler *com static bool is_dcl_instruction(enum VKD3D_SHADER_INSTRUCTION_HANDLER handler_idx) { - return VKD3DSIH_DCL <= handler_idx && handler_idx <= VKD3DSIH_DCL_VERTICES_OUT; + return (VKD3DSIH_DCL <= handler_idx && handler_idx <= VKD3DSIH_DCL_VERTICES_OUT) + || handler_idx == VKD3DSIH_HS_DECLS; } int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler,

1 0

Józef Kucia : vkd3d-shader: Implement vCoverage shader register.
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: vkd3d Branch: master Commit: 559c0191c848800b260c333c2d7e65a4c762d24a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=559c0191c848800b260c333… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 24 15:09:23 2019 +0100 vkd3d-shader: Implement vCoverage shader register. 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/dxbc.c | 1 + libs/vkd3d-shader/spirv.c | 13 ++++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 2fd0cda..0b5f7bc 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1566,6 +1566,7 @@ static bool shader_sm4_is_scalar_register(const struct vkd3d_shader_register *re { switch (reg->type) { + case VKD3DSPR_COVERAGE: case VKD3DSPR_DEPTHOUT: case VKD3DSPR_DEPTHOUTGE: case VKD3DSPR_DEPTHOUTLE: diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index d2c417f..ddcaead 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2302,6 +2302,9 @@ static bool vkd3d_dxbc_compiler_get_register_name(char *buffer, unsigned int buf case VKD3DSPR_IDXTEMP: snprintf(buffer, buffer_size, "x%u", idx); break; + case VKD3DSPR_COVERAGE: + snprintf(buffer, buffer_size, "vCoverage"); + break; case VKD3DSPR_SAMPLEMASK: snprintf(buffer, buffer_size, "oMask"); break; @@ -2473,7 +2476,7 @@ static void vkd3d_dxbc_compiler_emit_dereference_register(struct vkd3d_dxbc_comp { indexes[index_count++] = vkd3d_dxbc_compiler_emit_register_addressing(compiler, &reg->idx[1]); } - else if (reg->type == VKD3DSPR_SAMPLEMASK) + else if (reg->type == VKD3DSPR_COVERAGE || reg->type == VKD3DSPR_SAMPLEMASK) { indexes[index_count++] = vkd3d_dxbc_compiler_get_constant_uint(compiler, register_info->member_idx); } @@ -3116,6 +3119,7 @@ vkd3d_register_builtins[] = {VKD3DSPR_TESSCOORD, {VKD3D_TYPE_FLOAT, 3, SpvBuiltInTessCoord}}, + {VKD3DSPR_COVERAGE, {VKD3D_TYPE_UINT, 1, SpvBuiltInSampleMask, NULL, true}}, {VKD3DSPR_SAMPLEMASK, {VKD3D_TYPE_UINT, 1, SpvBuiltInSampleMask, NULL, true}}, {VKD3DSPR_DEPTHOUT, {VKD3D_TYPE_FLOAT, 1, SpvBuiltInFragDepth}}, @@ -3437,6 +3441,7 @@ static void vkd3d_dxbc_compiler_emit_input_register(struct vkd3d_dxbc_compiler * const struct vkd3d_shader_register *reg = &dst->reg; const struct vkd3d_spirv_builtin *builtin; struct vkd3d_symbol reg_symbol; + unsigned int array_size; uint32_t input_id; assert(!reg->idx[0].rel_addr); @@ -3449,15 +3454,17 @@ static void vkd3d_dxbc_compiler_emit_input_register(struct vkd3d_dxbc_compiler * return; } - input_id = vkd3d_dxbc_compiler_emit_variable(compiler, + array_size = builtin->is_spirv_array ? 1 : 0; + input_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, SpvStorageClassInput, - builtin->component_type, builtin->component_count); + builtin->component_type, builtin->component_count, array_size); vkd3d_spirv_add_iface_variable(builder, input_id); vkd3d_dxbc_compiler_decorate_builtin(compiler, input_id, builtin->spirv_builtin); vkd3d_symbol_make_register(&reg_symbol, reg); reg_symbol.id = input_id; reg_symbol.info.reg.storage_class = SpvStorageClassInput; + reg_symbol.info.reg.member_idx = 0; reg_symbol.info.reg.component_type = builtin->component_type; reg_symbol.info.reg.write_mask = vkd3d_write_mask_from_component_count(builtin->component_count); vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol);

1 0

Józef Kucia : vkd3d: Do not ignore SampleMask in D3D12_GRAPHICS_PIPELINE_STATE_DESC.
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: vkd3d Branch: master Commit: 639693de865886f27a25535eb32bf058bb29e3c8 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=639693de865886f27a25535… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 24 15:09:24 2019 +0100 vkd3d: Do not ignore SampleMask in D3D12_GRAPHICS_PIPELINE_STATE_DESC. 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 | 10 +++++++--- libs/vkd3d/vkd3d_private.h | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index eb7c8be..6daeab7 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2429,9 +2429,6 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s rs_stream_desc_from_d3d12(&graphics->rs_stream_desc, &graphics->rs_desc, so_desc, vk_info); - if (desc->SampleMask != ~0u) - FIXME("Ignoring sample mask %#x.\n", desc->SampleMask); - graphics->ms_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO; graphics->ms_desc.pNext = NULL; graphics->ms_desc.flags = 0; @@ -2439,6 +2436,13 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s graphics->ms_desc.sampleShadingEnable = VK_FALSE; graphics->ms_desc.minSampleShading = 0.0f; graphics->ms_desc.pSampleMask = NULL; + if (desc->SampleMask != ~0u) + { + assert(DIV_ROUND_UP(sample_count, 32) < ARRAY_SIZE(graphics->sample_mask)); + graphics->sample_mask[0] = desc->SampleMask; + graphics->sample_mask[1] = 0xffffffffu; + graphics->ms_desc.pSampleMask = graphics->sample_mask; + } graphics->ms_desc.alphaToCoverageEnable = desc->BlendState.AlphaToCoverageEnable; graphics->ms_desc.alphaToOneEnable = VK_FALSE; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index c4b0a4c..6b35dc0 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -617,6 +617,7 @@ struct d3d12_graphics_pipeline_state VkPipelineMultisampleStateCreateInfo ms_desc; VkPipelineDepthStencilStateCreateInfo ds_desc; + VkSampleMask sample_mask[2]; VkPipelineRasterizationStateStreamCreateInfoEXT rs_stream_desc; const struct d3d12_root_signature *root_signature;

1 0

Józef Kucia : tests: Add test for vCoverage shader register.
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: vkd3d Branch: master Commit: abe857d2deeba9bc47b774df54c8337edc5225de URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=abe857d2deeba9bc47b774d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 24 15:09:25 2019 +0100 tests: Add test for vCoverage shader register. 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 | 160 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 160 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index f115e43..5cc2e2b 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -23145,6 +23145,165 @@ static void test_sample_mask(void) destroy_test_context(&context); } +static void test_coverage(void) +{ + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + ID3D12GraphicsCommandList *command_list; + D3D12_CPU_DESCRIPTOR_HANDLE ms_rtv; + ID3D12Resource *ms_render_target; + ID3D12PipelineState *pso_resolve; + struct test_context_desc desc; + struct test_context context; + ID3D12DescriptorHeap *heap; + ID3D12CommandQueue *queue; + unsigned int i; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + uint4 main(uint coverage : SV_Coverage) : SV_Target + { + return coverage; + } +#endif + 0x43425844, 0x0d652986, 0x6144c247, 0x743bacfa, 0x95068994, 0x00000001, 0x000000ac, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000034, 0x00000050, 0x0000000d, + 0x0100086a, 0x0200005f, 0x00023001, 0x03000065, 0x001020f2, 0x00000000, 0x04000036, 0x001020f2, + 0x00000000, 0x00023006, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; + static const DWORD ps_resolve_code[] = + { +#if 0 + Texture2DMS<uint> t; + + uint4 main(float4 position : SV_Position) : SV_Target + { + return t.Load((int2)position.xy, 0); + } +#endif + 0x43425844, 0x280a495f, 0x88543834, 0x1fd0597d, 0xe7ed74ac, 0x00000001, 0x00000154, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x7469736f, 0x006e6f69, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000000b8, 0x00000050, + 0x0000002e, 0x0100086a, 0x04002058, 0x00107000, 0x00000000, 0x00004444, 0x04002064, 0x00101032, + 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0500001b, + 0x00100032, 0x00000000, 0x00101046, 0x00000000, 0x08000036, 0x001000c2, 0x00000000, 0x00004002, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8b00002e, 0x80000102, 0x00111103, 0x00100012, + 0x00000000, 0x00100e46, 0x00000000, 0x00107e46, 0x00000000, 0x00004001, 0x00000000, 0x05000036, + 0x001020f2, 0x00000000, 0x00100006, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps_resolve = {ps_resolve_code, sizeof(ps_resolve_code)}; + + static const struct + { + unsigned int sample_mask; + unsigned int expected_result; + } + tests[] = + { + {0x01, 0x1}, + {0x03, 0x3}, + {0x07, 0x7}, + {0x09, 0x9}, + {0x0d, 0xd}, + {0x0f, 0xf}, + {0xff, 0xf}, + { ~0u, 0xf}, + }; + + if (use_warp_device) + { + skip("Sample shading tests fail on WARP.\n"); + return; + } + + memset(&desc, 0, sizeof(desc)); + desc.rt_width = desc.rt_height = 32; + desc.rt_format = DXGI_FORMAT_R32_UINT; + desc.rt_descriptor_count = 2; + desc.no_root_signature = true; + if (!init_test_context(&context, &desc)) + return; + command_list = context.list; + queue = context.queue; + + context.root_signature = create_texture_root_signature(context.device, + D3D12_SHADER_VISIBILITY_PIXEL, 1, 0); + + ms_rtv = get_cpu_rtv_handle(&context, context.rtv_heap, 1); + desc.sample_desc.Count = 4; + create_render_target(&context, &desc, &ms_render_target, &ms_rtv); + + heap = create_gpu_descriptor_heap(context.device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1); + ID3D12Device_CreateShaderResourceView(context.device, ms_render_target, NULL, + get_cpu_descriptor_handle(&context, heap, 0)); + + pso_resolve = create_pipeline_state(context.device, + context.root_signature, context.render_target_desc.Format, NULL, &ps_resolve, NULL); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + vkd3d_test_set_context("sample mask %#x", tests[i].sample_mask); + + if (context.pipeline_state) + ID3D12PipelineState_Release(context.pipeline_state); + + init_pipeline_state_desc(&pso_desc, context.root_signature, + context.render_target_desc.Format, NULL, &ps, NULL); + pso_desc.SampleMask = tests[i].sample_mask; + pso_desc.SampleDesc.Count = 4; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Failed to create pipeline, hr %#x.\n", hr); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, ms_rtv, white, 0, NULL); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &ms_rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_resource_state(command_list, ms_render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, pso_resolve); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap); + ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, + get_gpu_descriptor_handle(&context, heap, 0)); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_resource_state(command_list, ms_render_target, + D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context.render_target, 0, queue, command_list, tests[i].expected_result, 0); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + } + vkd3d_test_set_context(NULL); + + ID3D12DescriptorHeap_Release(heap); + ID3D12PipelineState_Release(pso_resolve); + ID3D12Resource_Release(ms_render_target); + destroy_test_context(&context); +} + static void test_primitive_restart(void) { static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; @@ -23546,6 +23705,7 @@ START_TEST(d3d12) run_test(test_dual_source_blending); run_test(test_multisample_rendering); run_test(test_sample_mask); + run_test(test_coverage); run_test(test_primitive_restart); run_test(test_vertex_shader_stream_output); }

1 0

Józef Kucia : tests: Add test for sample_c_lz instruction.
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: vkd3d Branch: master Commit: c8ec3be7169218dcf71ccc4296a9c2793524957a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c8ec3be7169218dcf71ccc4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 24 15:09:26 2019 +0100 tests: Add test for sample_c_lz instruction. 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 | 325 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 312 insertions(+), 13 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=c8ec3be7169218dcf71…

1 0

Dmitry Timoshkov : crypt32: Make sure that the provider supports the specified hash algorithm.
by Alexandre Julliard 23 Jan '19

23 Jan '19

Module: wine Branch: master Commit: ca683382e08d7c2121212774bc73b1a124f0fe04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca683382e08d7c2121212774… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jan 23 17:27:44 2019 +0800 crypt32: Make sure that the provider supports the specified hash algorithm. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/cert.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index b532936..eb646cd 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -2195,7 +2195,7 @@ BOOL WINAPI CryptHashCertificate(HCRYPTPROV_LEGACY hCryptProv, ALG_ID Algid, pbEncoded, cbEncoded, pbComputedHash, pcbComputedHash); if (!hCryptProv) - hCryptProv = I_CryptGetDefaultCryptProv(0); + hCryptProv = I_CryptGetDefaultCryptProv(Algid); if (!Algid) Algid = CALG_SHA1; if (ret)

1 0

Piotr Caban : msvcrt: Optimize tolower function when locale was never changed.
by Alexandre Julliard 23 Jan '19

23 Jan '19

Module: wine Branch: master Commit: e867af3bfeb5fc50d76cf26816d294d5342fe48c URL: https://source.winehq.org/git/wine.git/?a=commit;h=e867af3bfeb5fc50d76cf268… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 23 11:59:05 2019 +0100 msvcrt: Optimize tolower function when locale was never changed. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/ctype.c | 4 +++- dlls/msvcrt/locale.c | 4 ++++ dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/tests/string.c | 14 ++++++++++---- 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c index 758411a..17b12e2 100644 --- a/dlls/msvcrt/ctype.c +++ b/dlls/msvcrt/ctype.c @@ -458,7 +458,9 @@ int CDECL MSVCRT__tolower_l(int c, MSVCRT__locale_t locale) */ int CDECL MSVCRT_tolower(int c) { - return MSVCRT__tolower_l(c, NULL); + if(initial_locale) + return c>='A' && c<='Z' ? c-'A'+'a' : c; + return MSVCRT__tolower_l(c, NULL); } /********************************************************************* diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 1e56395..a1e827d 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -48,6 +48,7 @@ int MSVCRT___lc_collate_cp = 0; LCID MSVCRT___lc_handle[MSVCRT_LC_MAX - MSVCRT_LC_MIN + 1] = { 0 }; int MSVCRT___mb_cur_max = 1; static unsigned char charmax = CHAR_MAX; +BOOL initial_locale = TRUE; #define MSVCRT_LEADBYTE 0x8000 #define MSVCRT_C1_DEFINED 0x200 @@ -1780,6 +1781,9 @@ char* CDECL MSVCRT_setlocale(int category, const char* locale) _lock_locales(); + if(locale[0] != 'C' || locale[1] != '\0') + initial_locale = FALSE; + if(locinfo->lc_handle[MSVCRT_LC_COLLATE]!=newlocinfo->lc_handle[MSVCRT_LC_COLLATE] || locinfo->lc_id[MSVCRT_LC_COLLATE].wCodePage!=newlocinfo->lc_id[MSVCRT_LC_COLLATE].wCodePage) { locinfo->lc_collate_cp = newlocinfo->lc_collate_cp; diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index fc91066..02b8628 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -283,6 +283,7 @@ extern MSVCRT__locale_t MSVCRT_locale DECLSPEC_HIDDEN; extern unsigned int MSVCRT___lc_codepage; extern int MSVCRT___lc_collate_cp; extern WORD MSVCRT__ctype [257]; +extern BOOL initial_locale DECLSPEC_HIDDEN; void msvcrt_set_errno(int) DECLSPEC_HIDDEN; #if _MSVCR_VER >= 80 diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index e80a518..a159132 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2788,13 +2788,19 @@ static void test_tolower(void) errno = 0xdeadbeef; ret = p_tolower((char)0xF4); - todo_wine ok(ret == (char)0xF4, "ret = %x\n", ret); - todo_wine ok(errno == 0xdeadbeef, "errno = %d\n", errno); + ok(ret == (char)0xF4, "ret = %x\n", ret); + ok(errno == 0xdeadbeef, "errno = %d\n", errno); errno = 0xdeadbeef; ret = p_tolower((char)0xD0); - todo_wine ok(ret == (char)0xD0, "ret = %x\n", ret); - todo_wine ok(errno == 0xdeadbeef, "errno = %d\n", errno); + ok(ret == (char)0xD0, "ret = %x\n", ret); + ok(errno == 0xdeadbeef, "errno = %d\n", errno); + + setlocale(LC_ALL, "C"); + errno = 0xdeadbeef; + ret = p_tolower((char)0xF4); + ok(ret == (char)0xF4, "ret = %x\n", ret); + ok(errno == 0xdeadbeef, "errno = %d\n", errno); /* test C locale after setting locale */ if(!setlocale(LC_ALL, "us")) {

1 0

Piotr Caban : msvcrt: Optimize toupper function when locale was never changed.
by Alexandre Julliard 23 Jan '19

23 Jan '19

Module: wine Branch: master Commit: 688671763154c569b286567810d2e0ed3341dbac URL: https://source.winehq.org/git/wine.git/?a=commit;h=688671763154c569b2865678… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 23 11:59:11 2019 +0100 msvcrt: Optimize toupper function when locale was never changed. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/ctype.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c index 17b12e2..3b037aa 100644 --- a/dlls/msvcrt/ctype.c +++ b/dlls/msvcrt/ctype.c @@ -398,6 +398,8 @@ int CDECL MSVCRT__toupper_l(int c, MSVCRT__locale_t locale) */ int CDECL MSVCRT_toupper(int c) { + if(initial_locale) + return c>='a' && c<='z' ? c-'a'+'A' : c; return MSVCRT__toupper_l(c, NULL); }

1 0

Jacek Caban : rpcrt4/tests: Run RPC tests in both mixed and fully interpreted mode.
by Alexandre Julliard 23 Jan '19

23 Jan '19

Module: wine Branch: master Commit: d73a6bae08644f0e551fd16ac0ed543d1eb871e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d73a6bae08644f0e551fd16a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 23 14:11:11 2019 +0100 rpcrt4/tests: Run RPC tests in both mixed and fully interpreted mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/Makefile.in | 6 +- dlls/rpcrt4/tests/server.c | 934 ++++++++++++++++++++++++++++++------ dlls/rpcrt4/tests/server.idl | 228 +++++---- dlls/rpcrt4/tests/server_interp.idl | 25 + 4 files changed, 965 insertions(+), 228 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d73a6bae08644f0e551f…

1 0

Sven Baars : msscript.ocx/tests: Fix some memory leaks (Valgrind).
by Alexandre Julliard 23 Jan '19

23 Jan '19

Module: wine Branch: master Commit: 305234e5cde5b79fd93d20afecf3e6666bad05ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=305234e5cde5b79fd93d20af… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat Jan 19 20:42:22 2019 +0100 msscript.ocx/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/msscript.ocx/tests/msscript.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 3110ea2..47ae76d 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -283,8 +283,11 @@ static HRESULT WINAPI ActiveScript_SetScriptSite(IActiveScript *iface, IActiveSc ok(hres == S_OK, "Could not get IActiveScriptSiteWindow interface: %08x\n", hres); IActiveScriptSiteWindow_Release(window); + if (site) + IActiveScriptSite_Release(site); site = pass; IActiveScriptSite_AddRef(site); + return S_OK; } @@ -430,6 +433,7 @@ static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown ok(!outer, "outer = %p\n", outer); ok(IsEqualGUID(&IID_IActiveScript, riid), "unexpected riid %s\n", wine_dbgstr_guid(riid)); *ppv = &ActiveScript; + site = NULL; return S_OK; } @@ -780,6 +784,8 @@ static void test_Language(void) ok(!lstrcmpW(testscriptW, str), "%s\n", wine_dbgstr_w(str)); SysFreeString(str); + IActiveScriptSite_Release(site); + init_registry(FALSE); SET_EXPECT(Close); @@ -1077,6 +1083,9 @@ static void test_Reset(void) ok(hr == S_OK, "got 0x%08x\n", hr); CHECK_CALLED(SetScriptState_INITIALIZED); + CHECK_CALLED(SetScriptSite); + IActiveScriptSite_Release(site); + init_registry(FALSE); SET_EXPECT(Close); @@ -1213,6 +1222,9 @@ static void test_AddObject(void) hr = IScriptControl_AddObject(sc, objname, &testdisp, VARIANT_TRUE); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + CHECK_CALLED(SetScriptSite); + IActiveScriptSite_Release(site); + init_registry(FALSE); SET_EXPECT(Close);

1 0