- wine-gitlab - winehq.org

Re: [PATCH v9 0/2] MR3114: comctl32: Make sure the type is sLink to increase id.
by Zhiyi Zhang (＠zhiyi) 10 Jul '23

10 Jul '23

Zhiyi Zhang (@zhiyi) commented about dlls/comctl32/tests/syslink.c: > +static void test_GETSYSLINKID(void) > +{ > + HWND hwnd; > + int point; > + > + hwnd = create_syslink(WS_CHILD | WS_TABSTOP | WS_VISIBLE, hWndParent); > + ok(hwnd != NULL, "Failed to create SysLink window.\n"); > + > + /*the test point of link3(x=120 y=20).*/ > + point = ((20 << 16) | 120); > + > + SendMessageA(hwnd, WM_LBUTTONDOWN, 1, (LPARAM)point); > + > + g_linkid = 0; > + SendMessageA(hwnd, WM_LBUTTONUP, 0, (LPARAM)point); > + todo_wine ok(g_linkid == 2, "GETSYSLINKID was not processed correctly!\n"); Rename g_linkid to g_link_id. Rename the function to test_link_id(). Change this line to todo_wine ok(g_link_id == 2, "Got unexpected link id %d.\n", g_link_id); -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3114#note_38453

1 0

Re: [PATCH v9 0/2] MR3114: comctl32: Make sure the type is sLink to increase id.
by Zhiyi Zhang (＠zhiyi) 10 Jul '23

10 Jul '23

Zhiyi Zhang (@zhiyi) commented about dlls/comctl32/tests/syslink.c: > } > > defwndproc_counter++; > - ret = DefWindowProcW(hwnd, message, wParam, lParam); > + switch(message) You only need to record nml->item.iLink so you don't really need to process the message. So you can move this switch statement before defwndproc_counter++ and let the DefWindowProcW() handle it. Basically, add a switch statement, record nml->item.iLink from WM_NOTIFY, and break on other messages. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3114#note_38452

1 0

Re: [PATCH v9 0/2] MR3114: comctl32: Make sure the type is sLink to increase id.
by Zhiyi Zhang (＠zhiyi) 10 Jul '23

10 Jul '23

Zhiyi Zhang (@zhiyi) commented about dlls/comctl32/tests/syslink.c: > You can change the commit subject to "comctl32/syslink: Check item type before increasing link ID in SYSLINK_LinkAtPt()." -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3114#note_38451

1 0

Re: [PATCH v9 0/2] MR3114: comctl32: Make sure the type is sLink to increase id.
by Zhao Yi (＠Zhaoyi) 10 Jul '23

10 Jul '23

On Mon Jul 10 01:38:24 2023 +0000, Zhiyi Zhang wrote: > Remove the extra space before ; Thank you for reviewing my code and I will fix the above issue later. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3114#note_38450

1 0

Re: [PATCH v9 0/2] MR3114: comctl32: Make sure the type is sLink to increase id.
by Zhiyi Zhang (＠zhiyi) 10 Jul '23

10 Jul '23

Zhiyi Zhang (@zhiyi) commented about dlls/comctl32/tests/syslink.c: > } > > defwndproc_counter++; > - ret = DefWindowProcW(hwnd, message, wParam, lParam); > + switch(message) > + { > + case WM_NOTIFY: > + { > + NMLINK *nml = ((NMLINK*)lParam); > + if (nml && NM_CLICK == nml->hdr.code) > + { > + g_linkid = nml->item.iLink ; Remove the extra space before ; -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3114#note_38449

1 0

Re: [PATCH v9 0/2] MR3114: comctl32: Make sure the type is sLink to increase id.
by Zhiyi Zhang (＠zhiyi) 10 Jul '23

10 Jul '23

Zhiyi Zhang (@zhiyi) commented about dlls/comctl32/tests/syslink.c: > } > > defwndproc_counter++; > - ret = DefWindowProcW(hwnd, message, wParam, lParam); > + switch(message) > + { > + case WM_NOTIFY: > + { > + NMLINK *nml = ((NMLINK*)lParam); Change "NMLINK*" to "NMLINK *" -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3114#note_38448

1 0

Re: [PATCH v9 0/2] MR3114: comctl32: Make sure the type is sLink to increase id.
by Zhiyi Zhang (＠zhiyi) 10 Jul '23

10 Jul '23

Zhiyi Zhang (@zhiyi) commented about dlls/comctl32/tests/syslink.c: > DestroyWindow(hwnd); > } > > +static void test_GETSYSLINKID(void) > +{ > + HWND hwnd; > + int point; > + > + hwnd = create_syslink(WS_CHILD | WS_TABSTOP | WS_VISIBLE, hWndParent); > + ok(hwnd != NULL, "Failed to create SysLink window.\n"); > + > + /*the test point of link3(x=120 y=20).*/ Add a space after /* and before */ -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3114#note_38447

1 0

Re: [PATCH v9 0/2] MR3114: comctl32: Make sure the type is sLink to increase id.
by Zhiyi Zhang (＠zhiyi) 10 Jul '23

10 Jul '23

Zhiyi Zhang (@zhiyi) commented about dlls/comctl32/tests/syslink.c: > DestroyWindow(hwnd); > } > > +static void test_GETSYSLINKID(void) > +{ > + HWND hwnd; > + int point; > + > + hwnd = create_syslink(WS_CHILD | WS_TABSTOP | WS_VISIBLE, hWndParent); > + ok(hwnd != NULL, "Failed to create SysLink window.\n"); > + > + /*the test point of link3(x=120 y=20).*/ > + point = ((20 << 16) | 120); You can use MAKELPARAM(120, 20) here. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3114#note_38446

1 0

[PATCH 0/1] MR3276: user32/tests: Remove DrawTextEx tests that overrun stack variable
by Fabian Maurer (＠DarkShadow44) 09 Jul '23

09 Jul '23

Fixes regression introduced by 35c8f15bc67f7602438fe0c39a69ff6ddf6b8297 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55215 We already test for an invalid pointer, those tests don't really help. The test against DrawTextA crashes on windows sometimes, the other test shows that windows probably just overruns the stack variable: `textheight = DrawTextExA((HDC)0xdeadbeef, (LPSTR)0xdeadbeef, 100, &rect, 0, 0);` -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3276

2 1

[PATCH v4 0/8] MR3050: msvcrt: Switch to using snames for create_locinfo.
by Victor Hermann Chiletto (＠vitorhnn) 09 Jul '23

09 Jul '23

This MR attempts to bring Wine's handling of `setlocale` and `_create_locale` more in line with the behavior of native >= `msvcr110`. It does this by replacing the usage of the LCID based `GetLocaleInfo` with the sname based `GetLocaleInfoEx`. `GetLocaleInfo` doesn't support neutral locales, even on native, which causes problems with neutral Chinese locales like `zh-Hans` and `zh-Hant`. It also improves the accuracy of the internal `__lc_locale_name_func`, as tests indicate that it returns `LOCALE_SNAME`s instead of ISO 639 language names. Potential future improvements: * Modifying the generation of the `pclmap` and `pcumap` fields of `threadlocaleinfostruct` to work on WCHARs. * I've done some changes to `__thread_data` which make it not fully match native, I'll submit a follow up which fixes this. -- v4: make_unicode: rename Hong Kong SAR China to Hong Kong SAR to match native behavior. msvcrt: Use GetLocaleInfoEx to compare locale info. msvcrt: Remap synonyms to snames. msvcrt: Skip exhaustive locale search with valid snames. msvcrt: Convert locale_to_LCID to snames. msvcrt: Use snames instead of LCIDs in create_locinfo. msvcr120/tests: Check ___lc_locale_name_func with neutral Chinese locales. msvcr110/tests: Add tests for new setlocale behaviors. https://gitlab.winehq.org/wine/wine/-/merge_requests/3050

3 13

2025

2024

2023

2022

wine-gitlab