February 2019 - Wine-Commits

Zebediah Figura : user32/tests: Execute test_shell_window() last.
by Alexandre Julliard Feb. 14, 2019

Feb. 14, 2019

Module: wine Branch: master Commit: 21c8c5a900903db2d37110ca42117982ce484422 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21c8c5a900903db2d37110ca… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 13 22:19:34 2019 -0600 user32/tests: Execute test_shell_window() last. Cf. also d83fc43e5e0155d1d00e54425c2af0a14dd2d40b. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index e55c139..3854325 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -10905,7 +10905,6 @@ START_TEST(win) test_layered_window(); test_SetForegroundWindow(hwndMain); - test_shell_window(); test_handles( hwndMain ); test_winregion(); test_map_points(); @@ -10935,4 +10934,8 @@ START_TEST(win) * state of hwndMain and hwndMain2 windows. */ test_topmost(); + + /* Execute the SetShellWindow() test last, since it kills explorer and that + * breaks a lot of things. */ + test_shell_window(); }

1 0

Gabriel Ivăncescu : comctl32/listbox: Repaint the old selected item after setting the item selection.
by Alexandre Julliard Feb. 14, 2019

Feb. 14, 2019

Module: wine Branch: master Commit: 012b7669f794f48d941ada46443644ad895d60b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=012b7669f794f48d941ada46… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Feb 13 16:36:13 2019 +0200 comctl32/listbox: Repaint the old selected item after setting the item selection. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index db7d474..6ab224e 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -1466,8 +1466,8 @@ static LRESULT LISTBOX_SetSelection( LB_DESCR *descr, INT index, if (index == oldsel) return LB_OKAY; if (oldsel != -1) descr->items[oldsel].selected = FALSE; if (index != -1) descr->items[index].selected = TRUE; - if (oldsel != -1) LISTBOX_RepaintItem( descr, oldsel, ODA_SELECT ); descr->selected_item = index; + if (oldsel != -1) LISTBOX_RepaintItem( descr, oldsel, ODA_SELECT ); if (index != -1) LISTBOX_RepaintItem( descr, index, ODA_SELECT ); if (send_notify && descr->nb_items) SEND_NOTIFICATION( descr, (index != -1) ? LBN_SELCHANGE : LBN_SELCANCEL );

1 0

Gabriel Ivăncescu : comctl32/listbox: Resize the entire item array at once in SetCount.
by Alexandre Julliard Feb. 14, 2019

Feb. 14, 2019

Module: wine Branch: master Commit: eed36af54bfcfec5603c88956cc42059b05ea433 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eed36af54bfcfec5603c8895… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Feb 13 16:36:12 2019 +0200 comctl32/listbox: Resize the entire item array at once in SetCount. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 43 ++++++++++++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index c92c2a2..db7d474 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -144,6 +144,12 @@ static BOOL resize_storage(LB_DESCR *descr, UINT items_size) descr->items_size = items_size; descr->items = items; } + + if ((descr->style & LBS_NODATA) && items_size > descr->nb_items) + { + memset(&descr->items[descr->nb_items], 0, + (items_size - descr->nb_items) * sizeof(LB_ITEMDATA)); + } return TRUE; } @@ -1742,25 +1748,36 @@ static void LISTBOX_ResetContent( LB_DESCR *descr ) /*********************************************************************** * LISTBOX_SetCount */ -static LRESULT LISTBOX_SetCount( LB_DESCR *descr, INT count ) +static LRESULT LISTBOX_SetCount( LB_DESCR *descr, UINT count ) { - LRESULT ret; + UINT orig_num = descr->nb_items; if (!(descr->style & LBS_NODATA)) return LB_ERR; - /* FIXME: this is far from optimal... */ - if (count > descr->nb_items) - { - while (count > descr->nb_items) - if ((ret = LISTBOX_InsertString( descr, -1, 0 )) < 0) - return ret; - } - else if (count < descr->nb_items) + if (!resize_storage(descr, count)) + return LB_ERRSPACE; + descr->nb_items = count; + + if (count) { - while (count < descr->nb_items) - if ((ret = LISTBOX_RemoveItem( descr, (descr->nb_items - 1) )) < 0) - return ret; + LISTBOX_UpdateScroll(descr); + if (count < orig_num) + { + descr->anchor_item = min(descr->anchor_item, count - 1); + if (descr->selected_item >= count) + descr->selected_item = -1; + + /* If we removed the scrollbar, reset the top of the list */ + if (count <= descr->page_size && orig_num > descr->page_size) + LISTBOX_SetTopItem(descr, 0, TRUE); + + descr->focus_item = min(descr->focus_item, count - 1); + } + + /* If it was empty before growing, set focus to the first item */ + else if (orig_num == 0) LISTBOX_SetCaretIndex(descr, 0, FALSE); } + else SendMessageW(descr->self, LB_RESETCONTENT, 0, 0); InvalidateRect( descr->self, NULL, TRUE ); return LB_OKAY;

1 0

Piotr Caban : msvcrt: Add _ismbbtrail_l implementation.
by Alexandre Julliard Feb. 14, 2019

Feb. 14, 2019

Module: wine Branch: master Commit: 790f97cb3080bbec2794f608893f4b4176887e43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=790f97cb3080bbec2794f608… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Feb 14 14:35:02 2019 +0100 msvcrt: Add _ismbbtrail_l implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-multibyte-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 16 +++++++++++++++- dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 10 files changed, 24 insertions(+), 10 deletions(-) diff --git a/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec b/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec index 1c987d0..31ccd0f 100644 --- a/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec +++ b/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec @@ -23,7 +23,7 @@ @ cdecl _ismbbpunct(long) ucrtbase._ismbbpunct @ stub _ismbbpunct_l @ cdecl _ismbbtrail(long) ucrtbase._ismbbtrail -@ stub _ismbbtrail_l +@ cdecl _ismbbtrail_l(long ptr) ucrtbase._ismbbtrail_l @ cdecl _ismbcalnum(long) ucrtbase._ismbcalnum @ stub _ismbcalnum_l @ cdecl _ismbcalpha(long) ucrtbase._ismbcalpha diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index c4574c6..5e30c77 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -973,7 +973,7 @@ @ stub _ismbbpunct(long) @ stub _ismbbpunct_l @ cdecl _ismbbtrail(long) -@ stub _ismbbtrail_l +@ cdecl _ismbbtrail_l(long ptr) @ cdecl _ismbcalnum(long) @ stub _ismbcalnum_l @ cdecl _ismbcalpha(long) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 59ed703..8f35f48 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1319,7 +1319,7 @@ @ stub _ismbbpunct(long) @ stub _ismbbpunct_l @ cdecl _ismbbtrail(long) -@ stub _ismbbtrail_l +@ cdecl _ismbbtrail_l(long ptr) @ cdecl _ismbcalnum(long) @ stub _ismbcalnum_l @ cdecl _ismbcalpha(long) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 4e25c68..49b3327 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1322,7 +1322,7 @@ @ stub _ismbbpunct(long) @ stub _ismbbpunct_l @ cdecl _ismbbtrail(long) -@ stub _ismbbtrail_l +@ cdecl _ismbbtrail_l(long ptr) @ cdecl _ismbcalnum(long) @ stub _ismbcalnum_l @ cdecl _ismbcalpha(long) diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index c1f6e0b..e3323dd 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1225,7 +1225,7 @@ @ cdecl _ismbbpunct(long) msvcr120._ismbbpunct @ stub _ismbbpunct_l @ cdecl _ismbbtrail(long) msvcr120._ismbbtrail -@ stub _ismbbtrail_l +@ cdecl _ismbbtrail_l(long ptr) msvcr120._ismbbtrail_l @ cdecl _isnan(double) msvcr120._isnan @ cdecl -arch=x86_64 _isnanf(float) msvcr120._isnanf @ cdecl _isprint_l(long ptr) msvcr120._isprint_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index c9863d9..c1b3d8b 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -645,7 +645,7 @@ @ stub _ismbbpunct(long) @ stub _ismbbpunct_l @ cdecl _ismbbtrail(long) -@ stub _ismbbtrail_l +@ cdecl _ismbbtrail_l(long ptr) @ cdecl _ismbcalnum(long) @ stub _ismbcalnum_l @ cdecl _ismbcalpha(long) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index b686122..3da8fdf 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -623,7 +623,7 @@ @ stub _ismbbpunct(long) @ stub _ismbbpunct_l @ cdecl _ismbbtrail(long) -@ stub _ismbbtrail_l +@ cdecl _ismbbtrail_l(long ptr) @ cdecl _ismbcalnum(long) @ stub _ismbcalnum_l @ cdecl _ismbcalpha(long) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index d00c31a..d470f10 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1551,13 +1551,27 @@ int CDECL _ismbblead(unsigned int c) return _ismbblead_l(c, NULL); } +/********************************************************************* + * _ismbbtrail_l(MSVCRT.@) + */ +int CDECL _ismbbtrail_l(unsigned int c, MSVCRT__locale_t locale) +{ + MSVCRT_pthreadmbcinfo mbcinfo; + + if(!locale) + mbcinfo = get_mbcinfo(); + else + mbcinfo = locale->mbcinfo; + + return (mbcinfo->mbctype[(c&0xff) + 1] & _M2) != 0; +} /********************************************************************* * _ismbbtrail(MSVCRT.@) */ int CDECL _ismbbtrail(unsigned int c) { - return (get_mbcinfo()->mbctype[(c&0xff) + 1] & _M2) != 0; + return _ismbbtrail_l(c, NULL); } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 2a74d51..0154998 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -594,7 +594,7 @@ @ stub _ismbbpunct(long) # stub _ismbbpunct_l(long ptr) @ cdecl _ismbbtrail(long) -# stub _ismbbtrail_l(long ptr) +@ cdecl _ismbbtrail_l(long ptr) @ cdecl _ismbcalnum(long) # stub _ismbcalnum_l(long ptr) @ cdecl _ismbcalpha(long) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 2d1d8da..021d9b2 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -461,7 +461,7 @@ @ stub _ismbbpunct(long) @ stub _ismbbpunct_l @ cdecl _ismbbtrail(long) -@ stub _ismbbtrail_l +@ cdecl _ismbbtrail_l(long ptr) @ cdecl _ismbcalnum(long) @ stub _ismbcalnum_l @ cdecl _ismbcalpha(long)

1 0

Gabriel Ivăncescu : comctl32/listbox: Use a helper to retrieve item string by index.
by Alexandre Julliard Feb. 14, 2019

Feb. 14, 2019

Module: wine Branch: master Commit: d1b0626c8152fcd652d3127cf48ab8ff7092386c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1b0626c8152fcd652d3127c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Feb 13 16:36:17 2019 +0200 comctl32/listbox: Use a helper to retrieve item string by index. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 61bb9da..a6f7bd5 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -158,6 +158,11 @@ static ULONG_PTR get_item_data( const LB_DESCR *descr, UINT index ) return (descr->style & LBS_NODATA) ? 0 : descr->items[index].data; } +static WCHAR *get_item_string( const LB_DESCR *descr, UINT index ) +{ + return HAS_STRINGS(descr) ? descr->items[index].str : NULL; +} + static BOOL is_item_selected( const LB_DESCR *descr, UINT index ) { if (!(descr->style & (LBS_MULTIPLESEL | LBS_EXTENDEDSEL))) @@ -526,11 +531,11 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, INT index, UINT action, BOOL ignoreFocus ) { BOOL selected = FALSE, focused; - LB_ITEMDATA *item = NULL; + WCHAR *item_str = NULL; if (index < descr->nb_items) { - item = &descr->items[index]; + item_str = get_item_string(descr, index); selected = is_item_selected(descr, index); } @@ -573,7 +578,7 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, dis.itemData = get_item_data(descr, index); dis.rcItem = *rect; TRACE("[%p]: drawitem %d (%s) action=%02x state=%02x rect=%s\n", - descr->self, index, item ? debugstr_w(item->str) : "", action, + descr->self, index, debugstr_w(item_str), action, dis.itemState, wine_dbgstr_rect(rect) ); SendMessageW(descr->owner, WM_DRAWITEM, dis.CtlID, (LPARAM)&dis); SelectClipRgn( hdc, hrgn ); @@ -595,22 +600,22 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, } TRACE("[%p]: painting %d (%s) action=%02x rect=%s\n", - descr->self, index, item ? debugstr_w(item->str) : "", action, + descr->self, index, debugstr_w(item_str), action, wine_dbgstr_rect(rect) ); - if (!item) + if (!item_str) ExtTextOutW( hdc, rect->left + 1, rect->top, ETO_OPAQUE | ETO_CLIPPED, rect, NULL, 0, NULL ); else if (!(descr->style & LBS_USETABSTOPS)) ExtTextOutW( hdc, rect->left + 1, rect->top, - ETO_OPAQUE | ETO_CLIPPED, rect, item->str, - strlenW(item->str), NULL ); + ETO_OPAQUE | ETO_CLIPPED, rect, item_str, + strlenW(item_str), NULL ); else { /* Output empty string to paint background in the full width. */ ExtTextOutW( hdc, rect->left + 1, rect->top, ETO_OPAQUE | ETO_CLIPPED, rect, NULL, 0, NULL ); TabbedTextOutW( hdc, rect->left + 1 , rect->top, - item->str, strlenW(item->str), + item_str, strlenW(item_str), descr->nb_tabs, descr->tabs, 0); } if (selected) @@ -773,14 +778,16 @@ static LRESULT LISTBOX_GetText( LB_DESCR *descr, INT index, LPWSTR buffer, BOOL if (HAS_STRINGS(descr)) { + WCHAR *str = get_item_string(descr, index); + if (!buffer) - return strlenW(descr->items[index].str); + return strlenW(str); - TRACE("index %d (0x%04x) %s\n", index, index, debugstr_w(descr->items[index].str)); + TRACE("index %d (0x%04x) %s\n", index, index, debugstr_w(str)); __TRY /* hide a Delphi bug that passes a read-only buffer */ { - strcpyW( buffer, descr->items[index].str ); + strcpyW(buffer, str); len = strlenW(buffer); } __EXCEPT_PAGE_FAULT @@ -829,7 +836,7 @@ static INT LISTBOX_FindStringPos( LB_DESCR *descr, LPCWSTR str, BOOL exact ) { index = (min + max) / 2; if (HAS_STRINGS(descr)) - res = LISTBOX_lstrcmpiW( descr->locale, descr->items[index].str, str ); + res = LISTBOX_lstrcmpiW( descr->locale, get_item_string(descr, index), str ); else { COMPAREITEMSTRUCT cis; @@ -872,7 +879,7 @@ static INT LISTBOX_FindFileStrPos( LB_DESCR *descr, LPCWSTR str ) while (min != max) { INT index = (min + max) / 2; - LPCWSTR p = descr->items[index].str; + LPCWSTR p = get_item_string(descr, index); if (*p == '[') /* drive or directory */ { if (*str != '[') res = -1; @@ -1646,7 +1653,7 @@ static void LISTBOX_DeleteItem( LB_DESCR *descr, INT index ) { /* save the item data before it gets freed by LB_RESETCONTENT */ ULONG_PTR item_data = get_item_data(descr, index); - LPWSTR item_str = descr->items[index].str; + LPWSTR item_str = get_item_string(descr, index); if (!descr->nb_items) SendMessageW( descr->self, LB_RESETCONTENT, 0, 0 ); @@ -1668,8 +1675,7 @@ static void LISTBOX_DeleteItem( LB_DESCR *descr, INT index ) dis.itemData = item_data; SendMessageW( descr->owner, WM_DELETEITEM, id, (LPARAM)&dis ); } - if (HAS_STRINGS(descr)) - HeapFree( GetProcessHeap(), 0, item_str ); + HeapFree( GetProcessHeap(), 0, item_str ); } @@ -2672,7 +2678,7 @@ static LRESULT CALLBACK LISTBOX_WindowProc( HWND hwnd, UINT msg, WPARAM wParam, return LB_ERR; } if (!HAS_STRINGS(descr)) return sizeof(ULONG_PTR); - return strlenW( descr->items[wParam].str ); + return strlenW(get_item_string(descr, wParam)); case LB_GETCURSEL: if (descr->nb_items == 0)

1 0

Gabriel Ivăncescu : comctl32/listbox: Use a helper to retrieve item data by index.
by Alexandre Julliard Feb. 14, 2019

Feb. 14, 2019

Module: wine Branch: master Commit: e16d591dc802dc913acc7db288f774b06cb28030 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e16d591dc802dc913acc7db2… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Feb 13 16:36:16 2019 +0200 comctl32/listbox: Use a helper to retrieve item data by index. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 5c58214..61bb9da 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -153,6 +153,11 @@ static BOOL resize_storage(LB_DESCR *descr, UINT items_size) return TRUE; } +static ULONG_PTR get_item_data( const LB_DESCR *descr, UINT index ) +{ + return (descr->style & LBS_NODATA) ? 0 : descr->items[index].data; +} + static BOOL is_item_selected( const LB_DESCR *descr, UINT index ) { if (!(descr->style & (LBS_MULTIPLESEL | LBS_EXTENDEDSEL))) @@ -565,7 +570,7 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, if (focused) dis.itemState |= ODS_FOCUS; if (!IsWindowEnabled(descr->self)) dis.itemState |= ODS_DISABLED; - dis.itemData = item ? item->data : 0; + dis.itemData = get_item_data(descr, index); dis.rcItem = *rect; TRACE("[%p]: drawitem %d (%s) action=%02x state=%02x rect=%s\n", descr->self, index, item ? debugstr_w(item->str) : "", action, @@ -788,8 +793,7 @@ static LRESULT LISTBOX_GetText( LB_DESCR *descr, INT index, LPWSTR buffer, BOOL } else { if (buffer) - *((ULONG_PTR *)buffer) = (descr->style & LBS_NODATA) - ? 0 : descr->items[index].data; + *((ULONG_PTR *)buffer) = get_item_data(descr, index); len = sizeof(ULONG_PTR); } return len; @@ -837,7 +841,7 @@ static INT LISTBOX_FindStringPos( LB_DESCR *descr, LPCWSTR str, BOOL exact ) /* note that some application (MetaStock) expects the second item * to be in the listbox */ cis.itemID1 = index; - cis.itemData1 = descr->items[index].data; + cis.itemData1 = get_item_data(descr, index); cis.itemID2 = -1; cis.itemData2 = (ULONG_PTR)str; cis.dwLocaleId = descr->locale; @@ -1641,7 +1645,7 @@ static LRESULT LISTBOX_InsertString( LB_DESCR *descr, INT index, LPCWSTR str ) static void LISTBOX_DeleteItem( LB_DESCR *descr, INT index ) { /* save the item data before it gets freed by LB_RESETCONTENT */ - ULONG_PTR item_data = descr->items[index].data; + ULONG_PTR item_data = get_item_data(descr, index); LPWSTR item_str = descr->items[index].str; if (!descr->nb_items) @@ -2643,7 +2647,7 @@ static LRESULT CALLBACK LISTBOX_WindowProc( HWND hwnd, UINT msg, WPARAM wParam, SetLastError(ERROR_INVALID_INDEX); return LB_ERR; } - return (descr->style & LBS_NODATA) ? 0 : descr->items[wParam].data; + return get_item_data(descr, wParam); case LB_SETITEMDATA: if (((INT)wParam < 0) || ((INT)wParam >= descr->nb_items))

1 0

Gabriel Ivăncescu : comctl32/tests: Test changing the selection styles after listbox creation.
by Alexandre Julliard Feb. 14, 2019

Feb. 14, 2019

Module: wine Branch: master Commit: b00482e2a4b3e045a8be35a8e0ae2d6daa9025e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b00482e2a4b3e045a8be35a8… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Feb 13 16:36:15 2019 +0200 comctl32/tests: Test changing the selection styles after listbox creation. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listbox.c | 130 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 130 insertions(+) diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index 68e4073..0cdcdea 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -784,6 +784,135 @@ static void test_listbox_height(void) DestroyWindow( hList ); } +static void test_changing_selection_styles(void) +{ + static const DWORD styles[] = + { + 0, + LBS_NODATA | LBS_OWNERDRAWFIXED + }; + static const DWORD selstyles[] = + { + 0, + LBS_MULTIPLESEL, + LBS_EXTENDEDSEL, + LBS_MULTIPLESEL | LBS_EXTENDEDSEL + }; + static const LONG selexpect_single[] = { 0, 0, 1 }; + static const LONG selexpect_single2[] = { 1, 0, 0 }; + static const LONG selexpect_multi[] = { 1, 0, 1 }; + static const LONG selexpect_multi2[] = { 1, 1, 0 }; + + HWND parent, listbox; + DWORD style; + LONG ret; + UINT i, j, k; + + parent = create_parent(); + ok(parent != NULL, "Failed to create parent window.\n"); + for (i = 0; i < ARRAY_SIZE(styles); i++) + { + /* Test if changing selection styles affects selection storage */ + for (j = 0; j < ARRAY_SIZE(selstyles); j++) + { + LONG setcursel_expect, selitemrange_expect, getselcount_expect; + const LONG *selexpect; + + listbox = CreateWindowA(WC_LISTBOXA, "TestList", styles[i] | selstyles[j] | WS_CHILD | WS_VISIBLE, + 0, 0, 100, 100, parent, (HMENU)ID_LISTBOX, NULL, 0); + ok(listbox != NULL, "%u: Failed to create ListBox window.\n", j); + + if (selstyles[j] & (LBS_MULTIPLESEL | LBS_EXTENDEDSEL)) + { + setcursel_expect = LB_ERR; + selitemrange_expect = LB_OKAY; + getselcount_expect = 2; + selexpect = selexpect_multi; + } + else + { + setcursel_expect = 2; + selitemrange_expect = LB_ERR; + getselcount_expect = LB_ERR; + selexpect = selexpect_single; + } + + for (k = 0; k < ARRAY_SIZE(selexpect_multi); k++) + { + ret = SendMessageA(listbox, LB_INSERTSTRING, -1, (LPARAM)"x"); + ok(ret == k, "%u: Unexpected return value %d, expected %d.\n", j, ret, k); + } + ret = SendMessageA(listbox, LB_GETCOUNT, 0, 0); + ok(ret == ARRAY_SIZE(selexpect_multi), "%u: Unexpected count %d.\n", j, ret); + + /* Select items with different methods */ + ret = SendMessageA(listbox, LB_SETCURSEL, 2, 0); + ok(ret == setcursel_expect, "%u: Unexpected return value %d.\n", j, ret); + ret = SendMessageA(listbox, LB_SELITEMRANGE, TRUE, MAKELPARAM(0, 0)); + ok(ret == selitemrange_expect, "%u: Unexpected return value %d.\n", j, ret); + ret = SendMessageA(listbox, LB_SELITEMRANGE, TRUE, MAKELPARAM(2, 2)); + ok(ret == selitemrange_expect, "%u: Unexpected return value %d.\n", j, ret); + + /* Verify that the proper items are selected */ + for (k = 0; k < ARRAY_SIZE(selexpect_multi); k++) + { + ret = SendMessageA(listbox, LB_GETSEL, k, 0); + ok(ret == selexpect[k], "%u: Unexpected selection state %d, expected %d.\n", + j, ret, selexpect[k]); + } + + /* Now change the selection style */ + style = GetWindowLongA(listbox, GWL_STYLE); + ok((style & (LBS_MULTIPLESEL | LBS_EXTENDEDSEL)) == selstyles[j], + "%u: unexpected window styles %#x.\n", j, style); + if (selstyles[j] & (LBS_MULTIPLESEL | LBS_EXTENDEDSEL)) + style &= ~selstyles[j]; + else + style |= LBS_MULTIPLESEL | LBS_EXTENDEDSEL; + SetWindowLongA(listbox, GWL_STYLE, style); + style = GetWindowLongA(listbox, GWL_STYLE); + ok(!(style & selstyles[j]), "%u: unexpected window styles %#x.\n", j, style); + + /* Verify that the same items are selected */ + ret = SendMessageA(listbox, LB_GETSELCOUNT, 0, 0); + ok(ret == getselcount_expect, "%u: expected %d from LB_GETSELCOUNT, got %d\n", + j, getselcount_expect, ret); + + for (k = 0; k < ARRAY_SIZE(selexpect_multi); k++) + { + ret = SendMessageA(listbox, LB_GETSEL, k, 0); + ok(ret == selexpect[k], "%u: Unexpected selection state %d, expected %d.\n", + j, ret, selexpect[k]); + } + + /* Lastly see if we can still change the selection as before with old style */ + if (setcursel_expect != LB_ERR) setcursel_expect = 0; + ret = SendMessageA(listbox, LB_SETCURSEL, 0, 0); + ok(ret == setcursel_expect, "%u: Unexpected return value %d.\n", j, ret); + ret = SendMessageA(listbox, LB_SELITEMRANGE, TRUE, MAKELPARAM(1, 1)); + ok(ret == selitemrange_expect, "%u: Unexpected return value %d.\n", j, ret); + ret = SendMessageA(listbox, LB_SELITEMRANGE, FALSE, MAKELPARAM(2, 2)); + ok(ret == selitemrange_expect, "%u: Unexpected return value %d.\n", j, ret); + + /* And verify the selections */ + selexpect = (selstyles[j] & (LBS_MULTIPLESEL | LBS_EXTENDEDSEL)) ? selexpect_multi2 : selexpect_single2; + ret = SendMessageA(listbox, LB_GETSELCOUNT, 0, 0); + ok(ret == getselcount_expect, "%u: expected %d from LB_GETSELCOUNT, got %d\n", + j, getselcount_expect, ret); + + for (k = 0; k < ARRAY_SIZE(selexpect_multi); k++) + { + ret = SendMessageA(listbox, LB_GETSEL, k, 0); + ok(ret == selexpect[k], "%u: Unexpected selection state %d, expected %d.\n", + j, ret, selexpect[k]); + } + + DestroyWindow(listbox); + } + } + DestroyWindow(parent); +} + static void test_itemfrompoint(void) { /* WS_POPUP is required in order to have a more accurate size calculation ( @@ -2483,6 +2612,7 @@ START_TEST(listbox) test_LB_SELITEMRANGE(); test_LB_SETCURSEL(); test_listbox_height(); + test_changing_selection_styles(); test_itemfrompoint(); test_listbox_item_data(); test_listbox_LB_DIR();

1 0

Gabriel Ivăncescu : comctl32/listbox: Use descr-> selected_item for single-selection listboxes when checking selection.
by Alexandre Julliard Feb. 14, 2019

Feb. 14, 2019

Module: wine Branch: master Commit: 1f062e386fa9e27812be56378380e76aefaf28b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f062e386fa9e27812be5637… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Feb 13 16:36:14 2019 +0200 comctl32/listbox: Use descr->selected_item for single-selection listboxes when checking selection. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 6ab224e..5c58214 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -155,6 +155,8 @@ static BOOL resize_storage(LB_DESCR *descr, UINT items_size) static BOOL is_item_selected( const LB_DESCR *descr, UINT index ) { + if (!(descr->style & (LBS_MULTIPLESEL | LBS_EXTENDEDSEL))) + return index == descr->selected_item; return descr->items[index].selected; }

1 0

Gabriel Ivăncescu : comctl32/listbox: Use a helper to set the selected item state.
by Alexandre Julliard Feb. 14, 2019

Feb. 14, 2019

Module: wine Branch: master Commit: 7834e40989e8e45fc9d264261deb4c8a79cd6513 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7834e40989e8e45fc9d26426… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Feb 13 16:36:19 2019 +0200 comctl32/listbox: Use a helper to set the selected item state. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 47c76ad..9f4dcb6 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -170,6 +170,12 @@ static BOOL is_item_selected( const LB_DESCR *descr, UINT index ) return descr->items[index].selected; } +static void set_item_selected_state(LB_DESCR *descr, UINT index, BOOL state) +{ + if (descr->style & (LBS_MULTIPLESEL | LBS_EXTENDEDSEL)) + descr->items[index].selected = state; +} + /*********************************************************************** * LISTBOX_GetCurrentPageSize * @@ -1435,7 +1441,7 @@ static LRESULT LISTBOX_SelectItemRange( LB_DESCR *descr, INT first, for (i = first; i <= last; i++) { if (is_item_selected(descr, i)) continue; - descr->items[i].selected = TRUE; + set_item_selected_state(descr, i, TRUE); LISTBOX_InvalidateItemRect(descr, i); } } @@ -1444,7 +1450,7 @@ static LRESULT LISTBOX_SelectItemRange( LB_DESCR *descr, INT first, for (i = first; i <= last; i++) { if (!is_item_selected(descr, i)) continue; - descr->items[i].selected = FALSE; + set_item_selected_state(descr, i, FALSE); LISTBOX_InvalidateItemRect(descr, i); } } @@ -1477,8 +1483,8 @@ static LRESULT LISTBOX_SetSelection( LB_DESCR *descr, INT index, { INT oldsel = descr->selected_item; if (index == oldsel) return LB_OKAY; - if (oldsel != -1) descr->items[oldsel].selected = FALSE; - if (index != -1) descr->items[index].selected = TRUE; + if (oldsel != -1) set_item_selected_state(descr, oldsel, FALSE); + if (index != -1) set_item_selected_state(descr, index, TRUE); descr->selected_item = index; if (oldsel != -1) LISTBOX_RepaintItem( descr, oldsel, ODA_SELECT ); if (index != -1) LISTBOX_RepaintItem( descr, index, ODA_SELECT );

1 0

Nikolay Sivov : msvcrt: Add _ismbcl1().
by Alexandre Julliard Feb. 14, 2019

Feb. 14, 2019

Module: wine Branch: master Commit: 698b26a432ff8ce036014adc041efb08a63d6367 URL: https://source.winehq.org/git/wine.git/?a=commit;h=698b26a432ff8ce036014adc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 14 14:35:45 2019 +0100 msvcrt: Add _ismbcl1(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46644 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 8 ++++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/string.c | 15 +++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 11 files changed, 32 insertions(+), 9 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index e9fdbff..202042d 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -988,7 +988,7 @@ @ stub _ismbckata_l @ cdecl _ismbcl0(long) @ cdecl _ismbcl0_l(long ptr) -@ stub _ismbcl1(long) +@ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) @ stub _ismbcl2(long) @ stub _ismbcl2_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index dc1fa1d..1f4bfe3 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1334,7 +1334,7 @@ @ stub _ismbckata_l @ cdecl _ismbcl0(long) @ cdecl _ismbcl0_l(long ptr) -@ stub _ismbcl1(long) +@ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) @ stub _ismbcl2(long) @ stub _ismbcl2_l diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 5d05b3d..7e03eb1 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1339,7 +1339,7 @@ @ stub _ismbckata_l @ cdecl _ismbcl0(long) @ cdecl _ismbcl0_l(long ptr) -@ stub _ismbcl1(long) +@ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) @ stub _ismbcl2(long) @ stub _ismbcl2_l diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index e1b373f..629dce9 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -382,7 +382,7 @@ @ cdecl _ismbchira(long) @ cdecl _ismbckata(long) @ cdecl _ismbcl0(long) -@ stub _ismbcl1(long) +@ cdecl _ismbcl1(long) @ stub _ismbcl2(long) @ cdecl _ismbclegal(long) @ cdecl _ismbclower(long) diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 24bd681..f0009be 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -377,7 +377,7 @@ @ cdecl _ismbchira(long) @ cdecl _ismbckata(long) @ cdecl _ismbcl0(long) -@ stub _ismbcl1(long) +@ cdecl _ismbcl1(long) @ stub _ismbcl2(long) @ cdecl _ismbclegal(long) @ cdecl _ismbclower(long) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index ec1cd22..7dc4ea8 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -660,7 +660,7 @@ @ stub _ismbckata_l @ cdecl _ismbcl0(long) @ cdecl _ismbcl0_l(long ptr) -@ stub _ismbcl1(long) +@ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) @ stub _ismbcl2(long) @ stub _ismbcl2_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 78f1768..16a2473 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -638,7 +638,7 @@ @ stub _ismbckata_l @ cdecl _ismbcl0(long) @ cdecl _ismbcl0_l(long ptr) -@ stub _ismbcl1(long) +@ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) @ stub _ismbcl2(long) @ stub _ismbcl2_l diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 9174214..909ea46 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2600,3 +2600,11 @@ int CDECL _ismbcl1_l(unsigned int c, MSVCRT__locale_t locale) return 0; } + +/********************************************************************* + * _ismbcl1 (MSVCRT.@) + */ +int CDECL _ismbcl1(unsigned int c) +{ + return _ismbcl1_l(c, NULL); +} diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index b6b7882..1f9ad64 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -609,7 +609,7 @@ # stub _ismbckata_l(long ptr) @ cdecl _ismbcl0(long) @ cdecl _ismbcl0_l(long ptr) -@ stub _ismbcl1(long) +@ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) @ stub _ismbcl2(long) # stub _ismbcl2_l(long ptr) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 4574ea7..53fbfd3 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -3275,11 +3275,17 @@ static void test__ismbclx(void) ret = _ismbcl0(0); ok(!ret, "got %d\n", ret); + ret = _ismbcl1(0); + ok(!ret, "got %d\n", ret); + cp = _setmbcp(1252); ret = _ismbcl0(0x8140); ok(!ret, "got %d\n", ret); + ret = _ismbcl1(0x889f); + ok(!ret, "got %d\n", ret); + _setmbcp(932); ret = _ismbcl0(0); @@ -3291,6 +3297,15 @@ static void test__ismbclx(void) ret = _ismbcl0(0x817f); ok(!ret, "got %d\n", ret); + ret = _ismbcl1(0); + ok(!ret, "got %d\n", ret); + + ret = _ismbcl1(0x889f); + ok(ret, "got %d\n", ret); + + ret = _ismbcl1(0x88fd); + ok(!ret, "got %d\n", ret); + _setmbcp(cp); } diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 8387521..db894a0 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -478,7 +478,7 @@ @ stub _ismbckata_l @ cdecl _ismbcl0(long) @ cdecl _ismbcl0_l(long ptr) -@ stub _ismbcl1(long) +@ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) @ stub _ismbcl2(long) @ stub _ismbcl2_l

1 0