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

Józef Kucia : vkd3d: Prefer versioned root signature structures.
by Alexandre Julliard April 25, 2019

April 25, 2019

Module: vkd3d Branch: master Commit: aa2d00929e8df59c456081403133a6fbf7ba32fc URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=aa2d00929e8df59c4560814… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 24 16:05:47 2019 +0200 vkd3d: Prefer versioned root signature structures. 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_main.c | 15 ++++++++------- libs/vkd3d/vkd3d_private.h | 2 +- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index df96ae4..980d9ed 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -999,8 +999,8 @@ HRESULT d3d12_root_signature_create(struct d3d12_device *device, const struct vkd3d_shader_code dxbc = {bytecode, bytecode_length}; union { - D3D12_ROOT_SIGNATURE_DESC d3d12; - struct vkd3d_root_signature_desc vkd3d; + D3D12_VERSIONED_ROOT_SIGNATURE_DESC d3d12; + struct vkd3d_versioned_root_signature_desc vkd3d; } root_signature_desc; struct d3d12_root_signature *object; HRESULT hr; @@ -1014,12 +1014,12 @@ HRESULT d3d12_root_signature_create(struct d3d12_device *device, if (!(object = vkd3d_malloc(sizeof(*object)))) { - vkd3d_shader_free_root_signature_v_1_0(&root_signature_desc.vkd3d); + vkd3d_shader_free_root_signature(&root_signature_desc.vkd3d); return E_OUTOFMEMORY; } - hr = d3d12_root_signature_init(object, device, &root_signature_desc.d3d12); - vkd3d_shader_free_root_signature_v_1_0(&root_signature_desc.vkd3d); + hr = d3d12_root_signature_init(object, device, &root_signature_desc.d3d12.u.Desc_1_0); + vkd3d_shader_free_root_signature(&root_signature_desc.vkd3d); if (FAILED(hr)) { vkd3d_free(object); diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index e095fdf..7775077 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -87,8 +87,8 @@ struct d3d12_root_signature_deserializer union { - D3D12_ROOT_SIGNATURE_DESC d3d12; - struct vkd3d_root_signature_desc vkd3d; + D3D12_VERSIONED_ROOT_SIGNATURE_DESC d3d12; + struct vkd3d_versioned_root_signature_desc vkd3d; } desc; }; @@ -140,7 +140,7 @@ static ULONG STDMETHODCALLTYPE d3d12_root_signature_deserializer_Release(ID3D12R if (!refcount) { - vkd3d_shader_free_root_signature_v_1_0(&deserializer->desc.vkd3d); + vkd3d_shader_free_root_signature(&deserializer->desc.vkd3d); vkd3d_free(deserializer); } @@ -154,7 +154,8 @@ static const D3D12_ROOT_SIGNATURE_DESC * STDMETHODCALLTYPE d3d12_root_signature_ TRACE("iface %p.\n", iface); - return &deserializer->desc.d3d12; + assert(deserializer->desc.d3d12.Version == D3D_ROOT_SIGNATURE_VERSION_1_0); + return &deserializer->desc.d3d12.u.Desc_1_0; } static const struct ID3D12RootSignatureDeserializerVtbl d3d12_root_signature_deserializer_vtbl = @@ -168,7 +169,7 @@ static const struct ID3D12RootSignatureDeserializerVtbl d3d12_root_signature_des }; int vkd3d_parse_root_signature_v_1_0(const struct vkd3d_shader_code *dxbc, - struct vkd3d_root_signature_desc *out_desc) + struct vkd3d_versioned_root_signature_desc *out_desc) { struct vkd3d_versioned_root_signature_desc desc, converted_desc; int ret; @@ -181,7 +182,7 @@ int vkd3d_parse_root_signature_v_1_0(const struct vkd3d_shader_code *dxbc, if (desc.version == VKD3D_ROOT_SIGNATURE_VERSION_1_0) { - *out_desc = desc.u.v_1_0; + *out_desc = desc; } else { @@ -195,7 +196,7 @@ int vkd3d_parse_root_signature_v_1_0(const struct vkd3d_shader_code *dxbc, return ret; } - *out_desc = converted_desc.u.v_1_0; + *out_desc = converted_desc; } return ret; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index c680a04..ba586b4 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -620,7 +620,7 @@ HRESULT d3d12_root_signature_create(struct d3d12_device *device, const void *byt struct d3d12_root_signature *unsafe_impl_from_ID3D12RootSignature(ID3D12RootSignature *iface) DECLSPEC_HIDDEN; int vkd3d_parse_root_signature_v_1_0(const struct vkd3d_shader_code *dxbc, - struct vkd3d_root_signature_desc *desc) DECLSPEC_HIDDEN; + struct vkd3d_versioned_root_signature_desc *desc) DECLSPEC_HIDDEN; struct d3d12_graphics_pipeline_state {

1 0

Józef Kucia : vkd3d-shader: Do not export vkd3d_shader_free_root_signature_v_1_0().
by Alexandre Julliard April 25, 2019

April 25, 2019

Module: vkd3d Branch: master Commit: d5d1ee4031e1edbc7085d1d5604c906d4b5ef38a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d5d1ee4031e1edbc7085d1d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 24 16:05:48 2019 +0200 vkd3d-shader: Do not export vkd3d_shader_free_root_signature_v_1_0(). 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_shader.h | 2 -- libs/vkd3d-shader/vkd3d_shader.map | 1 - libs/vkd3d-shader/vkd3d_shader_main.c | 41 ++++++++++++++++++----------------- 3 files changed, 21 insertions(+), 23 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 57761af..cfb0263 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -569,7 +569,6 @@ void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *code); int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, struct vkd3d_versioned_root_signature_desc *root_signature); void vkd3d_shader_free_root_signature(struct vkd3d_versioned_root_signature_desc *root_signature); -void vkd3d_shader_free_root_signature_v_1_0(struct vkd3d_root_signature_desc *root_signature); /* FIXME: Add support for returning error messages (ID3DBlob). */ int vkd3d_shader_serialize_root_signature(const struct vkd3d_versioned_root_signature_desc *root_signature, @@ -602,7 +601,6 @@ typedef void (*PFN_vkd3d_shader_free_shader_code)(struct vkd3d_shader_code *code typedef int (*PFN_vkd3d_shader_parse_root_signature)(const struct vkd3d_shader_code *dxbc, struct vkd3d_versioned_root_signature_desc *root_signature); typedef void (*PFN_vkd3d_shader_free_root_signature)(struct vkd3d_versioned_root_signature_desc *root_signature); -typedef void (*PFN_vkd3d_shader_free_root_signature_v_1_0)(struct vkd3d_root_signature_desc *root_signature); typedef int (*PFN_vkd3d_shader_serialize_root_signature)( const struct vkd3d_versioned_root_signature_desc *root_signature, struct vkd3d_shader_code *dxbc); diff --git a/libs/vkd3d-shader/vkd3d_shader.map b/libs/vkd3d-shader/vkd3d_shader.map index c2cfcbd..74c38e1 100644 --- a/libs/vkd3d-shader/vkd3d_shader.map +++ b/libs/vkd3d-shader/vkd3d_shader.map @@ -5,7 +5,6 @@ global: vkd3d_shader_convert_root_signature; vkd3d_shader_find_signature_element; vkd3d_shader_free_root_signature; - vkd3d_shader_free_root_signature_v_1_0; vkd3d_shader_free_shader_code; vkd3d_shader_free_shader_signature; vkd3d_shader_parse_input_signature; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index ef491f7..9848202 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -327,7 +327,7 @@ void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *shader_code) vkd3d_free((void *)shader_code->code); } -void vkd3d_shader_free_root_signature_v_1_0(struct vkd3d_root_signature_desc *root_signature) +static void vkd3d_shader_free_root_signature_v_1_0(struct vkd3d_root_signature_desc *root_signature) { unsigned int i; @@ -344,28 +344,10 @@ void vkd3d_shader_free_root_signature_v_1_0(struct vkd3d_root_signature_desc *ro memset(root_signature, 0, sizeof(*root_signature)); } -void vkd3d_shader_free_root_signature(struct vkd3d_versioned_root_signature_desc *desc) +static void vkd3d_shader_free_root_signature_v_1_1(struct vkd3d_root_signature_desc1 *root_signature) { - struct vkd3d_root_signature_desc1 *root_signature; unsigned int i; - if (!desc->version) - return; - - if (desc->version == VKD3D_ROOT_SIGNATURE_VERSION_1_0) - { - vkd3d_shader_free_root_signature_v_1_0(&desc->u.v_1_0); - return; - } - - if (desc->version != VKD3D_ROOT_SIGNATURE_VERSION_1_1) - { - FIXME("Unknown version %#x.\n", desc->version); - return; - } - - root_signature = &desc->u.v_1_1; - for (i = 0; i < root_signature->parameter_count; ++i) { const struct vkd3d_root_parameter1 *parameter = &root_signature->parameters[i]; @@ -379,6 +361,25 @@ void vkd3d_shader_free_root_signature(struct vkd3d_versioned_root_signature_desc memset(root_signature, 0, sizeof(*root_signature)); } +void vkd3d_shader_free_root_signature(struct vkd3d_versioned_root_signature_desc *desc) +{ + if (desc->version == VKD3D_ROOT_SIGNATURE_VERSION_1_0) + { + vkd3d_shader_free_root_signature_v_1_0(&desc->u.v_1_0); + } + else if (desc->version == VKD3D_ROOT_SIGNATURE_VERSION_1_1) + { + vkd3d_shader_free_root_signature_v_1_1(&desc->u.v_1_1); + } + else if (desc->version) + { + FIXME("Unknown version %#x.\n", desc->version); + return; + } + + desc->version = 0; +} + int vkd3d_shader_parse_input_signature(const struct vkd3d_shader_code *dxbc, struct vkd3d_shader_signature *signature) {

1 0

Józef Kucia : vkd3d-shader: Remove versioned_ prefix from root signature functions.
by Alexandre Julliard April 25, 2019

April 25, 2019

Module: vkd3d Branch: master Commit: 374bcd276e914f126c3c4fbd73596bbcc7e2fb9b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=374bcd276e914f126c3c4fb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 24 16:05:46 2019 +0200 vkd3d-shader: Remove versioned_ prefix from root signature functions. 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_shader.h | 16 ++++++++-------- libs/vkd3d-shader/dxbc.c | 6 +++--- libs/vkd3d-shader/vkd3d_shader.map | 6 +++--- libs/vkd3d-shader/vkd3d_shader_main.c | 6 +++--- libs/vkd3d/state.c | 4 ++-- libs/vkd3d/vkd3d_main.c | 16 ++++++++-------- tests/vkd3d_shader_api.c | 18 +++++++++--------- 7 files changed, 36 insertions(+), 36 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=374bcd276e914f126c3…

1 0

Józef Kucia : tests: Add tests for root signature 1.1 descriptor flags.
by Alexandre Julliard April 25, 2019

April 25, 2019

Module: vkd3d Branch: master Commit: eef0651548cb16879a9c1eb6fd9911ed39695648 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=eef0651548cb16879a9c1eb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 24 16:05:44 2019 +0200 tests: Add tests for root signature 1.1 descriptor flags. 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 | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 6cc6771..199a86f 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -10035,6 +10035,9 @@ static void check_root_signature_deserialization_(unsigned int line, const D3D12 ULONG refcount; HRESULT hr; + if (!code->BytecodeLength) + return; + hr = D3D12CreateRootSignatureDeserializer(code->pShaderBytecode, code->BytecodeLength, &IID_ID3D12RootSignatureDeserializer, (void **)&deserializer); ok_(line)(hr == S_OK, "Failed to create deserializer, hr %#x.\n", hr); @@ -10132,6 +10135,9 @@ static void check_root_signature_serialization_(unsigned int line, const D3D12_S unsigned int i; HRESULT hr; + if (!bytecode->BytecodeLength) + return; + error_blob = (ID3DBlob *)0xdeadbeef; hr = D3D12SerializeRootSignature(desc, D3D_ROOT_SIGNATURE_VERSION_1_0, &blob, &error_blob); ok_(line)(hr == S_OK, "Failed to serialize root signature, hr %#x.\n", hr); @@ -10408,6 +10414,42 @@ static void test_root_signature_byte_code(void) }; #if 0 + #define RS "CBV(b4, space = 1, visibility = SHADER_VISIBILITY_VERTEX), " \ + "SRV(t13, flags = DATA_STATIC), " \ + "UAV(u6, flags = DATA_STATIC_WHILE_SET_AT_EXECUTE)" +#endif + static const DWORD root_descriptors_rootsig1[] = + { + 0x43425844, 0x8ddedbbe, 0xbcfea259, 0x6b35bfbb, 0x23e1de24, 0x00000001, 0x0000008c, 0x00000001, + 0x00000024, 0x30535452, 0x00000060, 0x00000002, 0x00000003, 0x00000018, 0x00000000, 0x00000060, + 0x00000000, 0x00000002, 0x00000001, 0x0000003c, 0x00000003, 0x00000000, 0x00000048, 0x00000004, + 0x00000000, 0x00000054, 0x00000004, 0x00000001, 0x00000000, 0x0000000d, 0x00000000, 0x00000008, + 0x00000006, 0x00000000, 0x00000004, + }; + static const D3D12_ROOT_PARAMETER root_descriptors_parameters[] = + { + {D3D12_ROOT_PARAMETER_TYPE_CBV, .Descriptor = {4, 1}, D3D12_SHADER_VISIBILITY_VERTEX}, + {D3D12_ROOT_PARAMETER_TYPE_SRV, .Descriptor = {13}}, + {D3D12_ROOT_PARAMETER_TYPE_UAV, .Descriptor = {6}}, + }; + static const D3D12_ROOT_SIGNATURE_DESC root_descriptors_desc = + { + .NumParameters = ARRAY_SIZE(root_descriptors_parameters), + .pParameters = root_descriptors_parameters, + }; + static const D3D12_ROOT_PARAMETER1 root_descriptors_parameters1[] = + { + {D3D12_ROOT_PARAMETER_TYPE_CBV, .Descriptor = {4, 1}, D3D12_SHADER_VISIBILITY_VERTEX}, + {D3D12_ROOT_PARAMETER_TYPE_SRV, .Descriptor = {13, 0, D3D12_ROOT_DESCRIPTOR_FLAG_DATA_STATIC}}, + {D3D12_ROOT_PARAMETER_TYPE_UAV, .Descriptor = {6, 0, D3D12_ROOT_DESCRIPTOR_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE}}, + }; + static const D3D12_ROOT_SIGNATURE_DESC1 root_descriptors_desc1 = + { + .NumParameters = ARRAY_SIZE(root_descriptors_parameters1), + .pParameters = root_descriptors_parameters1, + }; + +#if 0 #define RS "RootConstants(num32BitConstants=3, b4), " \ "RootConstants(num32BitConstants=4, b5, space = 3)" #endif @@ -10501,6 +10543,40 @@ static void test_root_signature_byte_code(void) }; #if 0 + #define RS "DescriptorTable(CBV(b1, space = 7, flags = DESCRIPTORS_VOLATILE), " \ + "SRV(t16, numDescriptors = 8, flags = DESCRIPTORS_VOLATILE | DATA_VOLATILE), " \ + "UAV(u3, numDescriptors = unbounded, offset = 44, flags = DATA_STATIC))" +#endif + static const DWORD descriptor_table_flags_rootsig1[] = + { + 0x43425844, 0xe77ffa8f, 0xfab552d5, 0x586e15d4, 0x4c186c26, 0x00000001, 0x000000a0, 0x00000001, + 0x00000024, 0x30535452, 0x00000074, 0x00000002, 0x00000001, 0x00000018, 0x00000000, 0x00000074, + 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000003, 0x0000002c, 0x00000002, 0x00000001, + 0x00000001, 0x00000007, 0x00000001, 0xffffffff, 0x00000000, 0x00000008, 0x00000010, 0x00000000, + 0x00000003, 0xffffffff, 0x00000001, 0xffffffff, 0x00000003, 0x00000000, 0x00000008, 0x0000002c, + }; + static const D3D12_DESCRIPTOR_RANGE1 descriptor_ranges1_flags[] = + { + {D3D12_DESCRIPTOR_RANGE_TYPE_CBV, 1, 1, 7, + D3D12_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE, D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND}, + {D3D12_DESCRIPTOR_RANGE_TYPE_SRV, 8, 16, 0, + D3D12_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE | D3D12_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE, + D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND}, + {D3D12_DESCRIPTOR_RANGE_TYPE_UAV, UINT_MAX, 3, 0, + D3D12_DESCRIPTOR_RANGE_FLAG_DATA_STATIC, 44}, + }; + static const D3D12_ROOT_PARAMETER1 descriptor_table_parameters1_flags[] = + { + {D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE, + .DescriptorTable = {ARRAY_SIZE(descriptor_ranges1_flags), descriptor_ranges1_flags}}, + }; + static const D3D12_ROOT_SIGNATURE_DESC1 descriptor_table_flags_rootsig_desc1 = + { + .NumParameters = ARRAY_SIZE(descriptor_table_parameters1_flags), + .pParameters = descriptor_table_parameters1_flags, + }; + +#if 0 #define RS "StaticSampler(s4)" #endif static const DWORD default_static_sampler_rootsig[] = @@ -10647,6 +10723,11 @@ static void test_root_signature_byte_code(void) &uav_rootsig_desc, &uav_rootsig_desc1, }, { + {NULL}, + {root_descriptors_rootsig1, sizeof(root_descriptors_rootsig1)}, + &root_descriptors_desc, &root_descriptors_desc1, + }, + { {constants_rootsig, sizeof(constants_rootsig)}, {constants_rootsig1, sizeof(constants_rootsig1)}, &constants_rootsig_desc, &constants_rootsig_desc1, @@ -10657,6 +10738,11 @@ static void test_root_signature_byte_code(void) &descriptor_table_rootsig_desc, &descriptor_table_rootsig_desc1, }, { + {NULL}, + {descriptor_table_flags_rootsig1, sizeof(descriptor_table_flags_rootsig1)}, + &descriptor_table_rootsig_desc, &descriptor_table_flags_rootsig_desc1, + }, + { {default_static_sampler_rootsig, sizeof(default_static_sampler_rootsig)}, {default_static_sampler_rootsig1, sizeof(default_static_sampler_rootsig1)}, &default_static_sampler_rootsig_desc, &default_static_sampler_rootsig_desc1,

1 0

John Thomson : shell32: Do not fail in SHCreateDirectoryExW for ERROR_ALREADY_EXISTS.
by Alexandre Julliard April 24, 2019

April 24, 2019

Module: wine Branch: master Commit: 9b6d198a3c7c8a02aa69c0d3d11829712e9778a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b6d198a3c7c8a02aa69c0d3… Author: John Thomson <git(a)johnthomson.fastmail.com.au> Date: Wed Apr 17 10:34:38 2019 +1000 shell32: Do not fail in SHCreateDirectoryExW for ERROR_ALREADY_EXISTS. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47023 Signed-off-by: John Thomson <git(a)johnthomson.fastmail.com.au> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlfileop.c | 4 +++- dlls/shell32/tests/shlfileop.c | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index c7bd54d..1515ad3 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -763,7 +763,9 @@ int WINAPI SHCreateDirectoryExW(HWND hWnd, LPCWSTR path, LPSECURITY_ATTRIBUTES s } } - if (ret && hWnd && (ERROR_CANCELLED != ret)) + if (ret && hWnd && + ret != ERROR_CANCELLED && + ret != ERROR_ALREADY_EXISTS) { /* We failed and should show a dialog box */ FIXME("Show system error message, creating path %s, failed with error %d\n", debugstr_w(path), ret); diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 8fb4dcf..27c7244 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -2543,6 +2543,7 @@ static void test_unicode(void) int ret; HANDLE file; static const WCHAR UNICODE_PATH_TO[] = {'c',':','\\',0x00ae,0x00ae,'\0'}; + HWND hwnd; shfoW.hwnd = NULL; shfoW.wFunc = FO_DELETE; @@ -2633,6 +2634,20 @@ static void test_unicode(void) ok(GetLastError() == ERROR_SUCCESS || broken(GetLastError() == ERROR_INVALID_HANDLE), /* WinXp, win2k3 */ "Expected ERROR_SUCCESS, got %d\n", GetLastError()); + + /* Check SHCreateDirectoryExW with a Hwnd + * returns ERROR_ALREADY_EXISTS where a directory already exists */ + /* Get any window handle */ + hwnd = FindWindowA(NULL, NULL); + ok(hwnd != 0, "FindWindowA failed to produce a hwnd\n"); + ret = SHCreateDirectoryExW(hwnd, UNICODE_PATH, NULL); + ok(!ret, "SHCreateDirectoryExW returned %d\n", ret); + /* Create already-existing directory */ + ok(file_existsW(UNICODE_PATH), "The directory was not created\n"); + ret = SHCreateDirectoryExW(hwnd, UNICODE_PATH, NULL); + ok(ret == ERROR_ALREADY_EXISTS, + "Expected ERROR_ALREADY_EXISTS, got %d\n", ret); + RemoveDirectoryW(UNICODE_PATH); } static void

1 0

Akihiro Sagawa : comctl32/edit: Implement EC_USEFONTINFO margins in the CJK case.
by Alexandre Julliard April 24, 2019

April 24, 2019

Module: wine Branch: master Commit: ef94a9fc6c52fdbc76092e73964a1ed1082a7d07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef94a9fc6c52fdbc76092e73… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Apr 24 21:42:19 2019 +0900 comctl32/edit: Implement EC_USEFONTINFO margins in the CJK case. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/edit.c | 45 ++++++++++++++++++++++++++++++++++++++++++--- dlls/comctl32/tests/edit.c | 2 -- 2 files changed, 42 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index 38a0d97..fc3742d 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -2685,6 +2685,36 @@ static void EDIT_EM_SetLimitText(EDITSTATE *es, UINT limit) es->buffer_limit = limit; } +static BOOL is_cjk(HDC dc) +{ + const DWORD FS_DBCS_MASK = FS_JISJAPAN|FS_CHINESESIMP|FS_WANSUNG|FS_CHINESETRAD|FS_JOHAB; + FONTSIGNATURE fs; + + switch (GdiGetCodePage(dc)) { + case 932: case 936: case 949: case 950: case 1361: + return TRUE; + default: + return (GetTextCharsetInfo(dc, &fs, 0) != DEFAULT_CHARSET && + (fs.fsCsb[0] & FS_DBCS_MASK)); + } +} + +static int get_cjk_fontinfo_margin(int width, int side_bearing) +{ + int margin; + if (side_bearing < 0) + margin = min(-side_bearing, width/2); + else + margin = 0; + return margin; +} + +struct char_width_info { + INT min_lsb, min_rsb, unknown; +}; + +/* Undocumented gdi32 export */ +extern BOOL WINAPI GetCharWidthInfo(HDC, struct char_width_info *); /********************************************************************* * @@ -2714,9 +2744,18 @@ static void EDIT_EM_SetMargins(EDITSTATE *es, INT action, /* The default margins are only non zero for TrueType or Vector fonts */ if (tm.tmPitchAndFamily & ( TMPF_VECTOR | TMPF_TRUETYPE )) { - /* FIXME: figure out the CJK values. */ - default_left_margin = width / 2; - default_right_margin = width / 2; + struct char_width_info width_info; + + if (is_cjk(dc) && GetCharWidthInfo(dc, &width_info)) + { + default_left_margin = get_cjk_fontinfo_margin(width, width_info.min_lsb); + default_right_margin = get_cjk_fontinfo_margin(width, width_info.min_rsb); + } + else + { + default_left_margin = width / 2; + default_right_margin = width / 2; + } GetClientRect(es->hwndSelf, &rc); rc_width = !IsRectEmpty(&rc) ? rc.right - rc.left : 80; diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index b76a419..fa273a4 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -1686,7 +1686,6 @@ static void test_margins_default(const char* facename, UINT charset) SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); - todo_wine_if(cjk && expect != MAKELONG(size.cx / 2, size.cx / 2)) ok(margins == expect, "%s:%d: expected %d, %d, got %d, %d\n", facename, charset, HIWORD(expect), LOWORD(expect), HIWORD(margins), LOWORD(margins)); DestroyWindow(hwnd); @@ -1706,7 +1705,6 @@ static void test_margins_default(const char* facename, UINT charset) SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); - todo_wine_if(cjk && expect != MAKELONG(size.cx / 2, size.cx / 2)) ok(margins == expect, "%s:%d: expected %d, %d, got %d, %d\n", facename, charset, HIWORD(expect), LOWORD(expect), HIWORD(margins), LOWORD(margins)); DestroyWindow(hwnd);

1 0

Akihiro Sagawa : comctl32/tests: Use calculated EC_USEFONTINFO margins in the CJK case.
by Alexandre Julliard April 24, 2019

April 24, 2019

Module: wine Branch: master Commit: 28400eff292796afcfaf73278cfd0bb444fc78a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=28400eff292796afcfaf7327… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Apr 24 21:42:17 2019 +0900 comctl32/tests: Use calculated EC_USEFONTINFO margins in the CJK case. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/edit.c | 46 +++++++++++++++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 15 deletions(-) diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index fedd8dd..b76a419 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -1603,6 +1603,16 @@ static void test_margins_usefontinfo(UINT charset) DeleteObject(hfont); } +static INT get_cjk_fontinfo_margin(INT width, INT side_bearing) +{ + INT margin; + if (side_bearing < 0) + margin = min(-side_bearing, width/2); + else + margin = 0; + return margin; +} + static void test_margins_default(const char* facename, UINT charset) { HWND hwnd; @@ -1616,6 +1626,14 @@ static void test_margins_default(const char* facename, UINT charset) INT margins, expect; const UINT small_margins = MAKELONG(1, 5); const WCHAR EditW[] = {'E','d','i','t',0}, strW[] = {'W',0}; + struct char_width_info { + INT lsb, rsb, unknown; + } info; + HMODULE hgdi32; + BOOL (WINAPI *pGetCharWidthInfo)(HDC, struct char_width_info *); + + hgdi32 = GetModuleHandleA("gdi32.dll"); + pGetCharWidthInfo = (void *)GetProcAddress(hgdi32, "GetCharWidthInfo"); memset(&lf, 0, sizeof(lf)); lf.lfHeight = -11; @@ -1644,8 +1662,16 @@ static void test_margins_default(const char* facename, UINT charset) DeleteObject(hfont); return; } - expect = MAKELONG(size.cx / 2, size.cx / 2); cjk = is_cjk(hdc); + if (cjk && pGetCharWidthInfo && pGetCharWidthInfo(hdc, &info)) { + short left, right; + + left = get_cjk_fontinfo_margin(size.cx, info.lsb); + right = get_cjk_fontinfo_margin(size.cx, info.rsb); + expect = MAKELONG(left, right); + } + else + expect = MAKELONG(size.cx / 2, size.cx / 2); hfont = SelectObject(hdc, hfont); ReleaseDC(hwnd, hdc); @@ -1660,13 +1686,8 @@ static void test_margins_default(const char* facename, UINT charset) SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); - if (!cjk) - ok(margins == expect, "%s:%d: got %d, %d\n", facename, charset, HIWORD(margins), LOWORD(margins)); - else - { - ok(HIWORD(margins) <= HIWORD(expect), "%s:%d: got %d\n", facename, charset, HIWORD(margins)); - ok(LOWORD(margins) <= LOWORD(expect), "%s:%d: got %d\n", facename, charset, LOWORD(margins)); - } + todo_wine_if(cjk && expect != MAKELONG(size.cx / 2, size.cx / 2)) + ok(margins == expect, "%s:%d: expected %d, %d, got %d, %d\n", facename, charset, HIWORD(expect), LOWORD(expect), HIWORD(margins), LOWORD(margins)); DestroyWindow(hwnd); /* ANSI version */ @@ -1685,13 +1706,8 @@ static void test_margins_default(const char* facename, UINT charset) SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); - if (!cjk) - ok(margins == expect, "%s:%d: got %d, %d\n", facename, charset, HIWORD(margins), LOWORD(margins)); - else - { - ok(HIWORD(margins) <= HIWORD(expect), "%s:%d: got %d\n", facename, charset, HIWORD(margins)); - ok(LOWORD(margins) <= LOWORD(expect), "%s:%d: got %d\n", facename, charset, LOWORD(margins)); - } + todo_wine_if(cjk && expect != MAKELONG(size.cx / 2, size.cx / 2)) + ok(margins == expect, "%s:%d: expected %d, %d, got %d, %d\n", facename, charset, HIWORD(expect), LOWORD(expect), HIWORD(margins), LOWORD(margins)); DestroyWindow(hwnd); DeleteObject(hfont);

1 0

Akihiro Sagawa : comctl32/tests: Add Unicode version tests for Edit control margins.
by Alexandre Julliard April 24, 2019

April 24, 2019

Module: wine Branch: master Commit: 5012c1b18b1b80d24be6a094155f289305830236 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5012c1b18b1b80d24be6a094… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Apr 24 21:42:13 2019 +0900 comctl32/tests: Add Unicode version tests for Edit control margins. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/edit.c | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index 2a333c2..aa5ee66 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -1611,6 +1611,7 @@ static void test_margins_default(UINT charset) RECT rect; INT margins, expect; const UINT small_margins = MAKELONG(1, 5); + const WCHAR EditW[] = {'E','d','i','t',0}, strW[] = {'W',0}; memset(&lf, 0, sizeof(lf)); lf.lfHeight = -11; @@ -1621,8 +1622,8 @@ static void test_margins_default(UINT charset) hfont = CreateFontIndirectA(&lf); ok(hfont != NULL, "got %p\n", hfont); - /* Big window rectangle */ - hwnd = CreateWindowExA(0, "Edit", "A", WS_POPUP, 0, 0, 5000, 1000, NULL, NULL, NULL, NULL); + /* Unicode version */ + hwnd = CreateWindowExW(0, EditW, strW, WS_POPUP, 0, 0, 5000, 1000, NULL, NULL, NULL, NULL); ok(hwnd != NULL, "got %p\n", hwnd); GetClientRect(hwnd, &rect); ok(!IsRectEmpty(&rect), "got rect %s\n", wine_dbgstr_rect(&rect)); @@ -1664,6 +1665,31 @@ static void test_margins_default(UINT charset) } DestroyWindow(hwnd); + /* ANSI version */ + hwnd = CreateWindowExA(0, "Edit", "A", WS_POPUP, 0, 0, 5000, 1000, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "got %p\n", hwnd); + GetClientRect(hwnd, &rect); + ok(!IsRectEmpty(&rect), "got rect %s\n", wine_dbgstr_rect(&rect)); + + margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); + ok(margins == 0, "got %x\n", margins); + SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); + SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); + margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); + if (!cjk_charset) + ok(margins == expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); + SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); + SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); + margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); + if (!cjk_charset) + ok(margins == expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); + else + { + ok(HIWORD(margins) <= HIWORD(expect), "%d: got %d\n", charset, HIWORD(margins)); + ok(LOWORD(margins) <= LOWORD(expect), "%d: got %d\n", charset, LOWORD(margins)); + } + DestroyWindow(hwnd); + DeleteObject(hfont); }

1 0

Vlad Bespalov : user32: Make LoadString[AW] patchable.
by Alexandre Julliard April 24, 2019

April 24, 2019

Module: wine Branch: master Commit: fd5f03035c2e5c60178d4f74ec1d8a4a376f3c6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd5f03035c2e5c60178d4f74… Author: Vlad Bespalov <vlad.botanic(a)gmail.com> Date: Tue Feb 12 04:25:09 2019 -0500 user32: Make LoadString[AW] patchable. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46626 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45199 Signed-off-by: Vlad Bespalov <vlad.botanic(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/resource.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/user32/resource.c b/dlls/user32/resource.c index 83442d8..8dad3d5 100644 --- a/dlls/user32/resource.c +++ b/dlls/user32/resource.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" + #include <stdarg.h> #include "windef.h" @@ -234,7 +236,7 @@ BOOL WINAPI DestroyAcceleratorTable( HACCEL handle ) /********************************************************************** * LoadStringW (USER32.@) */ -INT WINAPI LoadStringW( HINSTANCE instance, UINT resource_id, +INT WINAPI DECLSPEC_HOTPATCH LoadStringW( HINSTANCE instance, UINT resource_id, LPWSTR buffer, INT buflen ) { HGLOBAL hmem; @@ -289,7 +291,7 @@ INT WINAPI LoadStringW( HINSTANCE instance, UINT resource_id, /********************************************************************** * LoadStringA (USER32.@) */ -INT WINAPI LoadStringA( HINSTANCE instance, UINT resource_id, LPSTR buffer, INT buflen ) +INT WINAPI DECLSPEC_HOTPATCH LoadStringA( HINSTANCE instance, UINT resource_id, LPSTR buffer, INT buflen ) { HGLOBAL hmem; HRSRC hrsrc;

1 0

Alexandre Julliard : configure: Add check for recent enough bison.
by Alexandre Julliard April 24, 2019

April 24, 2019

Module: wine Branch: master Commit: a4c93936c9493f7619e1877b522eeb809a390dfe URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4c93936c9493f7619e1877b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 24 22:31:31 2019 +0200 configure: Add check for recent enough bison. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 20 ++++++++++++++++++++ configure.ac | 13 +++++++++++++ 2 files changed, 33 insertions(+) diff --git a/configure b/configure index 1ed30b9..e97f57f 100755 --- a/configure +++ b/configure @@ -5892,6 +5892,26 @@ if test "$BISON" = "none" then as_fn_error $? "no suitable bison found. Please install the 'bison' package." "$LINENO" 5 fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether bison is recent enough" >&5 +$as_echo_n "checking whether bison is recent enough... " >&6; } +if ${wine_cv_recent_bison+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat >conftest.y <<EOF +%define parse.error verbose +%% +empty: ; +EOF + if $BISON conftest.y >/dev/null 2>&5 + then + wine_cv_recent_bison=yes + else + wine_cv_recent_bison=no + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wine_cv_recent_bison" >&5 +$as_echo "$wine_cv_recent_bison" >&6; } +test $wine_cv_recent_bison != no || as_fn_error $? "Your bison version is too old. Please install bison version 3.0 or newer." "$LINENO" 5 if test -n "$ac_tool_prefix"; then for ac_prog in ar gar diff --git a/configure.ac b/configure.ac index 68d52a8..d1502ba 100644 --- a/configure.ac +++ b/configure.ac @@ -288,6 +288,19 @@ if test "$BISON" = "none" then AC_MSG_ERROR([no suitable bison found. Please install the 'bison' package.]) fi +AC_CACHE_CHECK([whether bison is recent enough],wine_cv_recent_bison, + [cat >conftest.y <<EOF +%define parse.error verbose +%% +empty: ; +EOF + if $BISON conftest.y >/dev/null 2>&AS_MESSAGE_LOG_FD + then + wine_cv_recent_bison=yes + else + wine_cv_recent_bison=no + fi]) +test $wine_cv_recent_bison != no || AC_MSG_ERROR([Your bison version is too old. Please install bison version 3.0 or newer.]) AC_CHECK_TOOLS(AR,[ar gar],ar) AC_CHECK_TOOL(STRIP,strip,strip)

1 0