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

Józef Kucia : vkd3d-shader: Add FIXME() for unknown root signature descriptor flags.
by Alexandre Julliard 25 Apr '19

25 Apr '19

Module: vkd3d Branch: master Commit: 070de4dfbb1e9458dbb8d670963e3a3959ba5e7f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=070de4dfbb1e9458dbb8d67… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 24 16:05:45 2019 +0200 vkd3d-shader: Add FIXME() for unknown root signature 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> --- libs/vkd3d-shader/dxbc.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 1230f30..3fe728e 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2130,6 +2130,18 @@ static int shader_parse_descriptor_ranges(struct root_signature_parser_context * return VKD3D_OK; } +static void shader_validate_descriptor_range1(const struct vkd3d_descriptor_range1 *range) +{ + unsigned int unknown_flags = range->flags & ~(VKD3D_DESCRIPTOR_RANGE_FLAG_NONE + | VKD3D_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE + | VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE + | VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE + | VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_STATIC); + + if (unknown_flags) + FIXME("Unknown descriptor range flags %#x.\n", unknown_flags); +} + static int shader_parse_descriptor_ranges1(struct root_signature_parser_context *context, unsigned int offset, unsigned int count, struct vkd3d_descriptor_range1 *ranges) { @@ -2157,6 +2169,8 @@ static int shader_parse_descriptor_ranges1(struct root_signature_parser_context ranges[i].range_type, ranges[i].descriptor_count, ranges[i].base_shader_register, ranges[i].register_space, ranges[i].flags, ranges[i].descriptor_table_offset); + + shader_validate_descriptor_range1(&ranges[i]); } return VKD3D_OK; @@ -2259,6 +2273,17 @@ static int shader_parse_root_descriptor(struct root_signature_parser_context *co return VKD3D_OK; } +static void shader_validate_root_descriptor1(const struct vkd3d_root_descriptor1 *descriptor) +{ + unsigned int unknown_flags = descriptor->flags & ~(VKD3D_ROOT_DESCRIPTOR_FLAG_NONE + | VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE + | VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE + | VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_STATIC); + + if (unknown_flags) + FIXME("Unknown root descriptor flags %#x.\n", unknown_flags); +} + static int shader_parse_root_descriptor1(struct root_signature_parser_context *context, unsigned int offset, struct vkd3d_root_descriptor1 *descriptor) { @@ -2278,6 +2303,8 @@ static int shader_parse_root_descriptor1(struct root_signature_parser_context *c TRACE("Shader register %u, register space %u, flags %#x.\n", descriptor->shader_register, descriptor->register_space, descriptor->flags); + shader_validate_root_descriptor1(descriptor); + return VKD3D_OK; }

1 0

Józef Kucia : vkd3d-shader: Remove versioned_ prefix from root signature functions.
by Alexandre Julliard 25 Apr '19

25 Apr '19

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 : vkd3d: Prefer versioned root signature structures.
by Alexandre Julliard 25 Apr '19

25 Apr '19

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 25 Apr '19

25 Apr '19

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

Stefan Dösinger : winemac: Add +fps support for Vulkan.
by Alexandre Julliard 24 Apr '19

24 Apr '19

Module: wine Branch: master Commit: f5e00b0a3e621f493430cf111beea5a16feb0159 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5e00b0a3e621f493430cf11… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Apr 20 16:05:40 2019 +0200 winemac: Add +fps support for Vulkan. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/vulkan.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/vulkan.c b/dlls/winemac.drv/vulkan.c index d49c9a1..ea785c9 100644 --- a/dlls/winemac.drv/vulkan.c +++ b/dlls/winemac.drv/vulkan.c @@ -45,6 +45,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(vulkan); #ifdef SONAME_LIBMOLTENVK +WINE_DECLARE_DEBUG_CHANNEL(fps); + typedef VkFlags VkMacOSSurfaceCreateFlagsMVK; #define VK_STRUCTURE_TYPE_MACOS_SURFACE_CREATE_INFO_MVK 1000123000 @@ -463,7 +465,30 @@ static VkResult macdrv_vkGetSwapchainImagesKHR(VkDevice device, static VkResult macdrv_vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR *present_info) { TRACE("%p, %p\n", queue, present_info); - return pvkQueuePresentKHR(queue, present_info); + VkResult res = pvkQueuePresentKHR(queue, present_info); + + if (TRACE_ON(fps)) + { + static unsigned long frames, frames_total; + static long prev_time, start_time; + DWORD time; + + time = GetTickCount(); + frames++; + frames_total++; + if (time - prev_time > 1500) + { + TRACE_(fps)("%p @ approx %.2ffps, total %.2ffps\n", + queue, 1000.0 * frames / (time - prev_time), + 1000.0 * frames_total / (time - start_time)); + prev_time = time; + frames = 0; + if (!start_time) + start_time = time; + } + } + + return res; } static const struct vulkan_funcs vulkan_funcs =

1 0

Vlad Bespalov : user32: Make LoadString[AW] patchable.
by Alexandre Julliard 24 Apr '19

24 Apr '19

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

Akihiro Sagawa : comctl32/tests: Move the default margin size tests into a separate function.
by Alexandre Julliard 24 Apr '19

24 Apr '19

Module: wine Branch: master Commit: 21dcb1ec87f90b005d485fa5dac1c1e6fd1ff257 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21dcb1ec87f90b005d485fa5… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Apr 24 21:42:11 2019 +0900 comctl32/tests: Move the default margin size tests into a separate function. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/edit.c | 93 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 76 insertions(+), 17 deletions(-) diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index 70cb94e..2a333c2 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -1501,7 +1501,6 @@ static void test_margins_usefontinfo(UINT charset) HDC hdc; TEXTMETRICW tm; SIZE size; - BOOL cjk_charset; LOGFONTA lf; HFONT hfont; RECT rect; @@ -1536,29 +1535,14 @@ static void test_margins_usefontinfo(UINT charset) return; } expect = MAKELONG(size.cx / 2, size.cx / 2); - cjk_charset = is_cjk_charset(hdc); - hfont = SelectObject(hdc, hfont); ReleaseDC(hwnd, hdc); 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)); - expect = margins; - } + expect = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); DestroyWindow(hwnd); threshold = HIWORD(expect) + LOWORD(expect) + size.cx * 2; @@ -1615,6 +1599,74 @@ static void test_margins_usefontinfo(UINT charset) DeleteObject(hfont); } +static void test_margins_default(UINT charset) +{ + HWND hwnd; + HDC hdc; + TEXTMETRICW tm; + SIZE size; + BOOL cjk_charset; + LOGFONTA lf; + HFONT hfont; + RECT rect; + INT margins, expect; + const UINT small_margins = MAKELONG(1, 5); + + memset(&lf, 0, sizeof(lf)); + lf.lfHeight = -11; + lf.lfWeight = FW_NORMAL; + lf.lfCharSet = charset; + strcpy(lf.lfFaceName, "Tahoma"); + + 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); + ok(hwnd != NULL, "got %p\n", hwnd); + GetClientRect(hwnd, &rect); + ok(!IsRectEmpty(&rect), "got rect %s\n", wine_dbgstr_rect(&rect)); + + hdc = GetDC(hwnd); + hfont = SelectObject(hdc, hfont); + size.cx = GdiGetCharDimensions( hdc, &tm, &size.cy ); + if ((charset != tm.tmCharSet && charset != DEFAULT_CHARSET) || + !(tm.tmPitchAndFamily & (TMPF_TRUETYPE | TMPF_VECTOR))) { + skip("%s for charset %d isn't available\n", lf.lfFaceName, charset); + hfont = SelectObject(hdc, hfont); + ReleaseDC(hwnd, hdc); + DestroyWindow(hwnd); + DeleteObject(hfont); + return; + } + expect = MAKELONG(size.cx / 2, size.cx / 2); + cjk_charset = is_cjk_charset(hdc); + + hfont = SelectObject(hdc, hfont); + ReleaseDC(hwnd, hdc); + + 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); +} + static void test_margins(void) { DWORD old_margins, new_margins; @@ -1689,6 +1741,13 @@ static void test_margins(void) but not by < Win 8 and Win 10. */ test_margins_usefontinfo(DEFAULT_CHARSET); + + test_margins_default(ANSI_CHARSET); + test_margins_default(EASTEUROPE_CHARSET); + + test_margins_default(SHIFTJIS_CHARSET); + test_margins_default(HANGUL_CHARSET); + test_margins_default(CHINESEBIG5_CHARSET); } static INT CALLBACK find_font_proc(const LOGFONTA *elf, const TEXTMETRICA *ntm, DWORD type, LPARAM lParam)

1 0

Akihiro Sagawa : comctl32/tests: Add Unicode version tests for Edit control margins.
by Alexandre Julliard 24 Apr '19

24 Apr '19

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

Akihiro Sagawa : comctl32/tests: Tests default margin size with various font face and charset.
by Alexandre Julliard 24 Apr '19

24 Apr '19

Module: wine Branch: master Commit: 95f7ad03e39946ee4d05c94e67b7d5bf7c7742f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95f7ad03e39946ee4d05c94e… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Apr 24 21:42:15 2019 +0900 comctl32/tests: Tests default margin size with various font face and charset. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/edit.c | 100 ++++++++++++++++++++++++++++++--------------- 1 file changed, 66 insertions(+), 34 deletions(-) diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index aa5ee66..fedd8dd 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -1485,13 +1485,17 @@ static void test_edit_control_scroll(void) DestroyWindow (hwEdit); } -static BOOL is_cjk_charset(HDC dc) +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 FALSE; + return (GetTextCharsetInfo(dc, &fs, 0) != DEFAULT_CHARSET && + (fs.fsCsb[0] & FS_DBCS_MASK)); } } @@ -1599,13 +1603,13 @@ static void test_margins_usefontinfo(UINT charset) DeleteObject(hfont); } -static void test_margins_default(UINT charset) +static void test_margins_default(const char* facename, UINT charset) { HWND hwnd; HDC hdc; TEXTMETRICW tm; SIZE size; - BOOL cjk_charset; + BOOL cjk; LOGFONTA lf; HFONT hfont; RECT rect; @@ -1617,7 +1621,7 @@ static void test_margins_default(UINT charset) lf.lfHeight = -11; lf.lfWeight = FW_NORMAL; lf.lfCharSet = charset; - strcpy(lf.lfFaceName, "Tahoma"); + strcpy(lf.lfFaceName, facename); hfont = CreateFontIndirectA(&lf); ok(hfont != NULL, "got %p\n", hfont); @@ -1641,7 +1645,7 @@ static void test_margins_default(UINT charset) return; } expect = MAKELONG(size.cx / 2, size.cx / 2); - cjk_charset = is_cjk_charset(hdc); + cjk = is_cjk(hdc); hfont = SelectObject(hdc, hfont); ReleaseDC(hwnd, hdc); @@ -1651,17 +1655,17 @@ static void test_margins_default(UINT charset) 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)); + if (!cjk) + ok(margins == expect, "%s:%d: got %d, %d\n", facename, 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)); + if (!cjk) + ok(margins == expect, "%s:%d: got %d, %d\n", facename, 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)); + 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)); } DestroyWindow(hwnd); @@ -1676,23 +1680,40 @@ static void test_margins_default(UINT charset) 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)); + if (!cjk) + ok(margins == expect, "%s:%d: got %d, %d\n", facename, 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)); + if (!cjk) + ok(margins == expect, "%s:%d: got %d, %d\n", facename, 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)); + 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)); } DestroyWindow(hwnd); DeleteObject(hfont); } +static INT CALLBACK find_font_proc(const LOGFONTA *elf, const TEXTMETRICA *ntm, DWORD type, LPARAM lParam) +{ + return 0; +} + +static BOOL is_font_installed(const char*name) +{ + HDC hdc = GetDC(NULL); + BOOL ret = FALSE; + + if (!EnumFontFamiliesA(hdc, name, find_font_proc, 0)) + ret = TRUE; + + ReleaseDC(NULL, hdc); + return ret; +} + static void test_margins(void) { DWORD old_margins, new_margins; @@ -1768,33 +1789,44 @@ static void test_margins(void) test_margins_usefontinfo(DEFAULT_CHARSET); - test_margins_default(ANSI_CHARSET); - test_margins_default(EASTEUROPE_CHARSET); + test_margins_default("Tahoma", ANSI_CHARSET); + test_margins_default("Tahoma", EASTEUROPE_CHARSET); - test_margins_default(SHIFTJIS_CHARSET); - test_margins_default(HANGUL_CHARSET); - test_margins_default(CHINESEBIG5_CHARSET); -} + test_margins_default("Tahoma", HANGUL_CHARSET); + test_margins_default("Tahoma", CHINESEBIG5_CHARSET); -static INT CALLBACK find_font_proc(const LOGFONTA *elf, const TEXTMETRICA *ntm, DWORD type, LPARAM lParam) -{ - return 0; + if (is_font_installed("MS PGothic")) { + test_margins_default("MS PGothic", SHIFTJIS_CHARSET); + test_margins_default("MS PGothic", GREEK_CHARSET); + } + else + skip("MS PGothic is not available, skipping some margin tests\n"); + + if (is_font_installed("Ume P Gothic")) { + test_margins_default("Ume P Gothic", SHIFTJIS_CHARSET); + test_margins_default("Ume P Gothic", GREEK_CHARSET); + } + else + skip("Ume P Gothic is not available, skipping some margin tests\n"); + + if (is_font_installed("SimSun")) { + test_margins_default("SimSun", GB2312_CHARSET); + test_margins_default("SimSun", ANSI_CHARSET); + } + else + skip("SimSun is not available, skipping some margin tests\n"); } static void test_margins_font_change(void) { - DWORD margins, font_margins, ret; + DWORD margins, font_margins; HFONT hfont, hfont2; HWND hwEdit; LOGFONTA lf; - HDC hdc; - hdc = GetDC(0); - ret = EnumFontFamiliesA(hdc, "Arial", find_font_proc, 0); - ReleaseDC(0, hdc); - if (ret) + if (!is_font_installed("Arial")) { - trace("Arial not found - skipping font change margin tests\n"); + skip("Arial not found - skipping font change margin tests\n"); return; }

1 0

Akihiro Sagawa : comctl32/tests: Use calculated EC_USEFONTINFO margins in the CJK case.
by Alexandre Julliard 24 Apr '19

24 Apr '19

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