February 2019 - Wine-commits

Gabriel Ivăncescu : comctl32/listbox: Use a helper to set item height by index.
by Alexandre Julliard 20 Feb '19

20 Feb '19

Module: wine Branch: master Commit: e0984d401329ca6e537824f4955c274445945b2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0984d401329ca6e537824f4… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Feb 20 12:04:57 2019 +0000 comctl32/listbox: Use a helper to set item height 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 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index a457d63..ba8b7ee 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -168,6 +168,11 @@ static UINT get_item_height( const LB_DESCR *descr, UINT index ) return (descr->style & LBS_NODATA) ? 0 : descr->items[index].height; } +static void set_item_height( LB_DESCR *descr, UINT index, UINT height ) +{ + if (!(descr->style & LBS_NODATA)) descr->items[index].height = height; +} + static BOOL is_item_selected( const LB_DESCR *descr, UINT index ) { if (!(descr->style & (LBS_MULTIPLESEL | LBS_EXTENDEDSEL))) @@ -1233,7 +1238,7 @@ static LRESULT LISTBOX_SetItemHeight( LB_DESCR *descr, INT index, INT height, BO return LB_ERR; } TRACE("[%p]: item %d height = %d\n", descr->self, index, height ); - descr->items[index].height = height; + set_item_height(descr, index, height); LISTBOX_UpdateScroll( descr ); if (repaint) LISTBOX_InvalidateItems( descr, index ); @@ -1590,7 +1595,7 @@ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, mis.itemData = data; mis.itemHeight = descr->item_height; SendMessageW( descr->owner, WM_MEASUREITEM, id, (LPARAM)&mis ); - item->height = mis.itemHeight ? mis.itemHeight : 1; + set_item_height(descr, index, mis.itemHeight ? mis.itemHeight : 1); TRACE("[%p]: measure item %d (%s) = %d\n", descr->self, index, str ? debugstr_w(str) : "", get_item_height(descr, index)); }

1 0

Gabriel Ivăncescu : comctl32/listbox: Move the item data insertion into a separate function.
by Alexandre Julliard 20 Feb '19

20 Feb '19

Module: wine Branch: master Commit: bd2cc1342b50adb826e254223bf11c9316d0fb32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd2cc1342b50adb826e25422… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Feb 20 12:04:58 2019 +0000 comctl32/listbox: Move the item data insertion into a separate function. 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 | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index ba8b7ee..44e3b1c 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -186,6 +186,20 @@ static void set_item_selected_state(LB_DESCR *descr, UINT index, BOOL state) descr->items[index].selected = state; } +static void insert_item_data(LB_DESCR *descr, UINT index, WCHAR *str, ULONG_PTR data) +{ + LB_ITEMDATA *item; + + item = descr->items + index; + if (index < descr->nb_items) + memmove(item + 1, item, (descr->nb_items - index) * sizeof(LB_ITEMDATA)); + + item->str = str; + item->data = HAS_STRINGS(descr) ? 0 : data; + item->height = 0; + item->selected = FALSE; +} + /*********************************************************************** * LISTBOX_GetCurrentPageSize * @@ -1563,23 +1577,13 @@ static void LISTBOX_MoveCaret( LB_DESCR *descr, INT index, BOOL fully_visible ) static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, LPWSTR str, ULONG_PTR data ) { - LB_ITEMDATA *item; INT oldfocus = descr->focus_item; if (index == -1) index = descr->nb_items; else if ((index < 0) || (index > descr->nb_items)) return LB_ERR; if (!resize_storage(descr, descr->nb_items + 1)) return LB_ERR; - /* Insert the item structure */ - - item = &descr->items[index]; - if (index < descr->nb_items) - RtlMoveMemory( item + 1, item, - (descr->nb_items - index) * sizeof(LB_ITEMDATA) ); - item->str = str; - item->data = HAS_STRINGS(descr) ? 0 : data; - item->height = 0; - item->selected = FALSE; + insert_item_data(descr, index, str, data); descr->nb_items++; /* Get item height */

1 0

Gabriel Ivăncescu : comctl32/listbox: Move the item data removal into a separate function.
by Alexandre Julliard 20 Feb '19

20 Feb '19

Module: wine Branch: master Commit: e98d4b4502ba75e8e206984e5d819aee0af3d670 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e98d4b4502ba75e8e206984e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Feb 20 12:04:59 2019 +0000 comctl32/listbox: Move the item data removal into a separate function. 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 | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 44e3b1c..e89d257 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -200,6 +200,15 @@ static void insert_item_data(LB_DESCR *descr, UINT index, WCHAR *str, ULONG_PTR item->selected = FALSE; } +static void remove_item_data(LB_DESCR *descr, UINT index) +{ + LB_ITEMDATA *item; + + item = descr->items + index; + if (index < descr->nb_items) + memmove(item, item + 1, (descr->nb_items - index) * sizeof(LB_ITEMDATA)); +} + /*********************************************************************** * LISTBOX_GetCurrentPageSize * @@ -1699,8 +1708,6 @@ static void LISTBOX_DeleteItem( LB_DESCR *descr, INT index ) */ static LRESULT LISTBOX_RemoveItem( LB_DESCR *descr, INT index ) { - LB_ITEMDATA *item; - if ((index < 0) || (index >= descr->nb_items)) return LB_ERR; /* We need to invalidate the original rect instead of the updated one. */ @@ -1713,15 +1720,9 @@ static LRESULT LISTBOX_RemoveItem( LB_DESCR *descr, INT index ) } descr->nb_items--; LISTBOX_DeleteItem( descr, index ); + remove_item_data(descr, index); - /* Remove the item */ - - item = &descr->items[index]; - if (index < descr->nb_items) - RtlMoveMemory( item, item + 1, - (descr->nb_items - index) * sizeof(LB_ITEMDATA) ); if (descr->anchor_item == descr->nb_items) descr->anchor_item--; - resize_storage(descr, descr->nb_items); /* Repaint the items */

1 0

Gabriel Ivăncescu : comctl32/listbox: Implement LBS_NODATA for single-selection listboxes.
by Alexandre Julliard 20 Feb '19

20 Feb '19

Module: wine Branch: master Commit: 1b7886edaf15b1f13c6ae47bc45e2475589c7638 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b7886edaf15b1f13c6ae47b… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Feb 20 12:05:00 2019 +0000 comctl32/listbox: Implement LBS_NODATA for single-selection listboxes. The LBS_NODATA style's purpose is to drastically improve performance and memory usage on very large lists, since they should function as virtual lists. Thus, don't store any data for single-selection listboxes (descr->items always NULL). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=32374 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 | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index e89d257..cbe57f2 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * TODO: - * - LBS_NODATA + * - LBS_NODATA for multi-selection listboxes */ #include <string.h> @@ -135,17 +135,20 @@ static BOOL resize_storage(LB_DESCR *descr, UINT items_size) items_size + LB_ARRAY_GRANULARITY * 2 < descr->items_size) { items_size = (items_size + LB_ARRAY_GRANULARITY - 1) & ~(LB_ARRAY_GRANULARITY - 1); - items = heap_realloc(descr->items, items_size * sizeof(LB_ITEMDATA)); - if (!items) + if ((descr->style & (LBS_NODATA | LBS_MULTIPLESEL | LBS_EXTENDEDSEL)) != LBS_NODATA) { - SEND_NOTIFICATION(descr, LBN_ERRSPACE); - return FALSE; + items = heap_realloc(descr->items, items_size * sizeof(LB_ITEMDATA)); + if (!items) + { + SEND_NOTIFICATION(descr, LBN_ERRSPACE); + return FALSE; + } + descr->items = items; } descr->items_size = items_size; - descr->items = items; } - if ((descr->style & LBS_NODATA) && items_size > descr->nb_items) + if ((descr->style & LBS_NODATA) && descr->items && items_size > descr->nb_items) { memset(&descr->items[descr->nb_items], 0, (items_size - descr->nb_items) * sizeof(LB_ITEMDATA)); @@ -190,6 +193,8 @@ static void insert_item_data(LB_DESCR *descr, UINT index, WCHAR *str, ULONG_PTR { LB_ITEMDATA *item; + if (!descr->items) return; + item = descr->items + index; if (index < descr->nb_items) memmove(item + 1, item, (descr->nb_items - index) * sizeof(LB_ITEMDATA)); @@ -204,6 +209,8 @@ static void remove_item_data(LB_DESCR *descr, UINT index) { LB_ITEMDATA *item; + if (!descr->items) return; + item = descr->items + index; if (index < descr->nb_items) memmove(item, item + 1, (descr->nb_items - index) * sizeof(LB_ITEMDATA)); @@ -1762,7 +1769,8 @@ static void LISTBOX_ResetContent( LB_DESCR *descr ) { INT i; - for(i = descr->nb_items - 1; i>=0; i--) LISTBOX_DeleteItem( descr, i); + if (!(descr->style & LBS_NODATA)) + for (i = descr->nb_items - 1; i >= 0; i--) LISTBOX_DeleteItem(descr, i); HeapFree( GetProcessHeap(), 0, descr->items ); descr->nb_items = 0; descr->top_item = 0;

1 0

Gabriel Ivăncescu : comctl32/tests: Test negative counts in LB_SETCOUNT.
by Alexandre Julliard 20 Feb '19

20 Feb '19

Module: wine Branch: master Commit: 7ec954988cc37a508049435259baa5a0ad826b9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ec954988cc37a5080494352… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Feb 20 12:05:01 2019 +0000 comctl32/tests: Test negative counts in LB_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/tests/listbox.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index 0cdcdea..de73ad2 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -1996,6 +1996,11 @@ static void test_set_count( void ) GetUpdateRect( listbox, &r, TRUE ); ok( !IsRectEmpty( &r ), "got empty rect\n"); + ret = SendMessageA( listbox, LB_SETCOUNT, -5, 0 ); + ok( ret == 0, "got %d\n", ret ); + ret = SendMessageA( listbox, LB_GETCOUNT, 0, 0 ); + ok( ret == -5, "got %d\n", ret ); + DestroyWindow( listbox ); for (i = 0; i < ARRAY_SIZE(styles); ++i)

1 0

Andrey Gusev : ext-ms-win-ntuser-dialogbox-l1-1-0: Add dll.
by Alexandre Julliard 20 Feb '19

20 Feb '19

Module: wine Branch: master Commit: 0b4ecdebe5d60fb927d790e3735df1c3243bc1f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b4ecdebe5d60fb927d790e3… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Feb 20 14:23:37 2019 +0200 ext-ms-win-ntuser-dialogbox-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/ext-ms-win-ntuser-dialogbox-l1-1-0/Makefile.in | 1 + .../ext-ms-win-ntuser-dialogbox-l1-1-0.spec | 21 +++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 26 insertions(+) diff --git a/configure b/configure index 2dded71..c5c8ab8 100755 --- a/configure +++ b/configure @@ -1273,6 +1273,7 @@ enable_ext_ms_win_gdi_font_l1_1_1 enable_ext_ms_win_gdi_render_l1_1_0 enable_ext_ms_win_kernel32_package_current_l1_1_0 enable_ext_ms_win_kernel32_package_l1_1_1 +enable_ext_ms_win_ntuser_dialogbox_l1_1_0 enable_ext_ms_win_ntuser_draw_l1_1_0 enable_ext_ms_win_ntuser_gui_l1_1_0 enable_ext_ms_win_ntuser_gui_l1_3_0 @@ -19580,6 +19581,7 @@ wine_fn_config_makefile dlls/ext-ms-win-gdi-font-l1-1-1 enable_ext_ms_win_gdi_fo wine_fn_config_makefile dlls/ext-ms-win-gdi-render-l1-1-0 enable_ext_ms_win_gdi_render_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-kernel32-package-current-l1-1-0 enable_ext_ms_win_kernel32_package_current_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-kernel32-package-l1-1-1 enable_ext_ms_win_kernel32_package_l1_1_1 +wine_fn_config_makefile dlls/ext-ms-win-ntuser-dialogbox-l1-1-0 enable_ext_ms_win_ntuser_dialogbox_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-draw-l1-1-0 enable_ext_ms_win_ntuser_draw_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-gui-l1-1-0 enable_ext_ms_win_ntuser_gui_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-gui-l1-3-0 enable_ext_ms_win_ntuser_gui_l1_3_0 diff --git a/configure.ac b/configure.ac index 29be1d0..d77fa7b 100644 --- a/configure.ac +++ b/configure.ac @@ -3311,6 +3311,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-font-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-render-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-kernel32-package-current-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-kernel32-package-l1-1-1) +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-dialogbox-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-draw-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-gui-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-gui-l1-3-0) diff --git a/dlls/ext-ms-win-ntuser-dialogbox-l1-1-0/Makefile.in b/dlls/ext-ms-win-ntuser-dialogbox-l1-1-0/Makefile.in new file mode 100644 index 0000000..e19c95d --- /dev/null +++ b/dlls/ext-ms-win-ntuser-dialogbox-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-ntuser-dialogbox-l1-1-0.dll diff --git a/dlls/ext-ms-win-ntuser-dialogbox-l1-1-0/ext-ms-win-ntuser-dialogbox-l1-1-0.spec b/dlls/ext-ms-win-ntuser-dialogbox-l1-1-0/ext-ms-win-ntuser-dialogbox-l1-1-0.spec new file mode 100644 index 0000000..6816e5f --- /dev/null +++ b/dlls/ext-ms-win-ntuser-dialogbox-l1-1-0/ext-ms-win-ntuser-dialogbox-l1-1-0.spec @@ -0,0 +1,21 @@ +@ stdcall CheckDlgButton(long long long) user32.CheckDlgButton +@ stdcall CreateDialogIndirectParamA(long ptr long ptr long) user32.CreateDialogIndirectParamA +@ stdcall CreateDialogIndirectParamW(long ptr long ptr long) user32.CreateDialogIndirectParamW +@ stdcall CreateDialogParamA(long str long ptr long) user32.CreateDialogParamA +@ stdcall CreateDialogParamW(long wstr long ptr long) user32.CreateDialogParamW +@ stdcall DialogBoxIndirectParamA(long ptr long ptr long) user32.DialogBoxIndirectParamA +@ stdcall DialogBoxIndirectParamW(long ptr long ptr long) user32.DialogBoxIndirectParamW +@ stdcall DialogBoxParamW(long wstr long ptr long) user32.DialogBoxParamW +@ stdcall EndDialog(long long) user32.EndDialog +@ stdcall GetDlgCtrlID(long) user32.GetDlgCtrlID +@ stdcall GetDlgItem(long long) user32.GetDlgItem +@ stdcall GetDlgItemTextW(long long ptr long) user32.GetDlgItemTextW +@ stdcall IsDlgButtonChecked(long long) user32.IsDlgButtonChecked +@ stdcall MessageBoxA(long str str long) user32.MessageBoxA +@ stdcall MessageBoxIndirectA(ptr) user32.MessageBoxIndirectA +@ stdcall MessageBoxIndirectW(ptr) user32.MessageBoxIndirectW +@ stdcall MessageBoxW(long wstr wstr long) user32.MessageBoxW +@ stdcall SendDlgItemMessageA(long long long long long) user32.SendDlgItemMessageA +@ stdcall SendDlgItemMessageW(long long long long long) user32.SendDlgItemMessageW +@ stdcall SetDlgItemTextA(long long str) user32.SetDlgItemTextA +@ stdcall SetDlgItemTextW(long long wstr) user32.SetDlgItemTextW diff --git a/tools/make_specfiles b/tools/make_specfiles index 8933ae4..f6cfea1 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -376,6 +376,7 @@ my @dll_groups = "api-ms-win-rtcore-ntuser-winevent-l1-1-0", "api-ms-win-rtcore-ntuser-wmpointer-l1-1-0", "api-ms-win-rtcore-ntuser-wmpointer-l1-1-3", + "ext-ms-win-ntuser-dialogbox-l1-1-0", "ext-ms-win-ntuser-draw-l1-1-0", "ext-ms-win-ntuser-gui-l1-1-0", "ext-ms-win-ntuser-gui-l1-3-0",

1 0

Andrey Gusev : ext-ms-win-ntuser-message-l1-1-0: Add dll.
by Alexandre Julliard 20 Feb '19

20 Feb '19

Module: wine Branch: master Commit: fe852ef122f3dcdc0b8631c9c2333c2560790513 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe852ef122f3dcdc0b8631c9… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Feb 20 14:23:38 2019 +0200 ext-ms-win-ntuser-message-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/ext-ms-win-ntuser-message-l1-1-0/Makefile.in | 1 + .../ext-ms-win-ntuser-message-l1-1-0.spec | 22 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 27 insertions(+) diff --git a/configure b/configure index c5c8ab8..1c15b5a 100755 --- a/configure +++ b/configure @@ -1278,6 +1278,7 @@ enable_ext_ms_win_ntuser_draw_l1_1_0 enable_ext_ms_win_ntuser_gui_l1_1_0 enable_ext_ms_win_ntuser_gui_l1_3_0 enable_ext_ms_win_ntuser_keyboard_l1_3_0 +enable_ext_ms_win_ntuser_message_l1_1_0 enable_ext_ms_win_ntuser_message_l1_1_1 enable_ext_ms_win_ntuser_misc_l1_2_0 enable_ext_ms_win_ntuser_misc_l1_5_1 @@ -19586,6 +19587,7 @@ wine_fn_config_makefile dlls/ext-ms-win-ntuser-draw-l1-1-0 enable_ext_ms_win_ntu wine_fn_config_makefile dlls/ext-ms-win-ntuser-gui-l1-1-0 enable_ext_ms_win_ntuser_gui_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-gui-l1-3-0 enable_ext_ms_win_ntuser_gui_l1_3_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-keyboard-l1-3-0 enable_ext_ms_win_ntuser_keyboard_l1_3_0 +wine_fn_config_makefile dlls/ext-ms-win-ntuser-message-l1-1-0 enable_ext_ms_win_ntuser_message_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-message-l1-1-1 enable_ext_ms_win_ntuser_message_l1_1_1 wine_fn_config_makefile dlls/ext-ms-win-ntuser-misc-l1-2-0 enable_ext_ms_win_ntuser_misc_l1_2_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-misc-l1-5-1 enable_ext_ms_win_ntuser_misc_l1_5_1 diff --git a/configure.ac b/configure.ac index d77fa7b..91cba94 100644 --- a/configure.ac +++ b/configure.ac @@ -3316,6 +3316,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-draw-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-gui-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-gui-l1-3-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-keyboard-l1-3-0) +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-message-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-message-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-misc-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-misc-l1-5-1) diff --git a/dlls/ext-ms-win-ntuser-message-l1-1-0/Makefile.in b/dlls/ext-ms-win-ntuser-message-l1-1-0/Makefile.in new file mode 100644 index 0000000..f42015a --- /dev/null +++ b/dlls/ext-ms-win-ntuser-message-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-ntuser-message-l1-1-0.dll diff --git a/dlls/ext-ms-win-ntuser-message-l1-1-0/ext-ms-win-ntuser-message-l1-1-0.spec b/dlls/ext-ms-win-ntuser-message-l1-1-0/ext-ms-win-ntuser-message-l1-1-0.spec new file mode 100644 index 0000000..f449bf4 --- /dev/null +++ b/dlls/ext-ms-win-ntuser-message-l1-1-0/ext-ms-win-ntuser-message-l1-1-0.spec @@ -0,0 +1,22 @@ +@ stdcall CallMsgFilterW(ptr long) user32.CallMsgFilterW +@ stdcall DispatchMessageA(ptr) user32.DispatchMessageA +@ stdcall DispatchMessageW(ptr) user32.DispatchMessageW +@ stdcall GetMessageA(ptr long long long) user32.GetMessageA +@ stdcall GetMessageW(ptr long long long) user32.GetMessageW +@ stdcall GetQueueStatus(long) user32.GetQueueStatus +@ stdcall InSendMessage() user32.InSendMessage +@ stdcall InSendMessageEx(ptr) user32.InSendMessageEx +@ stdcall PeekMessageA(ptr long long long long) user32.PeekMessageA +@ stdcall PeekMessageW(ptr long long long long) user32.PeekMessageW +@ stdcall PostMessageA(long long long long) user32.PostMessageA +@ stdcall PostMessageW(long long long long) user32.PostMessageW +@ stdcall PostQuitMessage(long) user32.PostQuitMessage +@ stdcall PostThreadMessageA(long long long long) user32.PostThreadMessageA +@ stdcall PostThreadMessageW(long long long long) user32.PostThreadMessageW +@ stdcall RegisterWindowMessageA(str) user32.RegisterWindowMessageA +@ stdcall RegisterWindowMessageW(wstr) user32.RegisterWindowMessageW +@ stdcall SendMessageA(long long long long) user32.SendMessageA +@ stdcall SendMessageTimeoutW(long long long long long long ptr) user32.SendMessageTimeoutW +@ stdcall SendMessageW(long long long long) user32.SendMessageW +@ stdcall SetMessageQueue(long) user32.SetMessageQueue +@ stdcall TranslateMessage(ptr) user32.TranslateMessage diff --git a/tools/make_specfiles b/tools/make_specfiles index f6cfea1..ab5b3fd 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -381,6 +381,7 @@ my @dll_groups = "ext-ms-win-ntuser-gui-l1-1-0", "ext-ms-win-ntuser-gui-l1-3-0", "ext-ms-win-ntuser-keyboard-l1-3-0", + "ext-ms-win-ntuser-message-l1-1-0", "ext-ms-win-ntuser-message-l1-1-1", "ext-ms-win-ntuser-misc-l1-2-0", "ext-ms-win-ntuser-misc-l1-5-1",

1 0

Andrey Gusev : ext-ms-win-ntuser-misc-l1-1-0: Add dll.
by Alexandre Julliard 20 Feb '19

20 Feb '19

Module: wine Branch: master Commit: a1a9ca8f4a6f21dcc03f341fd0b7fed1475b4396 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1a9ca8f4a6f21dcc03f341f… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Feb 20 14:23:39 2019 +0200 ext-ms-win-ntuser-misc-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/ext-ms-win-ntuser-misc-l1-1-0/Makefile.in | 1 + .../ext-ms-win-ntuser-misc-l1-1-0.spec | 20 ++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 25 insertions(+) diff --git a/configure b/configure index 1c15b5a..166ddbf 100755 --- a/configure +++ b/configure @@ -1280,6 +1280,7 @@ enable_ext_ms_win_ntuser_gui_l1_3_0 enable_ext_ms_win_ntuser_keyboard_l1_3_0 enable_ext_ms_win_ntuser_message_l1_1_0 enable_ext_ms_win_ntuser_message_l1_1_1 +enable_ext_ms_win_ntuser_misc_l1_1_0 enable_ext_ms_win_ntuser_misc_l1_2_0 enable_ext_ms_win_ntuser_misc_l1_5_1 enable_ext_ms_win_ntuser_mouse_l1_1_0 @@ -19589,6 +19590,7 @@ wine_fn_config_makefile dlls/ext-ms-win-ntuser-gui-l1-3-0 enable_ext_ms_win_ntus wine_fn_config_makefile dlls/ext-ms-win-ntuser-keyboard-l1-3-0 enable_ext_ms_win_ntuser_keyboard_l1_3_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-message-l1-1-0 enable_ext_ms_win_ntuser_message_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-message-l1-1-1 enable_ext_ms_win_ntuser_message_l1_1_1 +wine_fn_config_makefile dlls/ext-ms-win-ntuser-misc-l1-1-0 enable_ext_ms_win_ntuser_misc_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-misc-l1-2-0 enable_ext_ms_win_ntuser_misc_l1_2_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-misc-l1-5-1 enable_ext_ms_win_ntuser_misc_l1_5_1 wine_fn_config_makefile dlls/ext-ms-win-ntuser-mouse-l1-1-0 enable_ext_ms_win_ntuser_mouse_l1_1_0 diff --git a/configure.ac b/configure.ac index 91cba94..f11a452 100644 --- a/configure.ac +++ b/configure.ac @@ -3318,6 +3318,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-gui-l1-3-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-keyboard-l1-3-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-message-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-message-l1-1-1) +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-misc-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-misc-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-misc-l1-5-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-mouse-l1-1-0) diff --git a/dlls/ext-ms-win-ntuser-misc-l1-1-0/Makefile.in b/dlls/ext-ms-win-ntuser-misc-l1-1-0/Makefile.in new file mode 100644 index 0000000..da5be2d --- /dev/null +++ b/dlls/ext-ms-win-ntuser-misc-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-ntuser-misc-l1-1-0.dll diff --git a/dlls/ext-ms-win-ntuser-misc-l1-1-0/ext-ms-win-ntuser-misc-l1-1-0.spec b/dlls/ext-ms-win-ntuser-misc-l1-1-0/ext-ms-win-ntuser-misc-l1-1-0.spec new file mode 100644 index 0000000..4a19314 --- /dev/null +++ b/dlls/ext-ms-win-ntuser-misc-l1-1-0/ext-ms-win-ntuser-misc-l1-1-0.spec @@ -0,0 +1,20 @@ +@ stdcall DrawTextW(long wstr long ptr long) user32.DrawTextW +@ stdcall ExitWindowsEx(long long) user32.ExitWindowsEx +@ stdcall GetClipboardFormatNameW(long ptr long) user32.GetClipboardFormatNameW +@ stdcall GetGuiResources(long long) user32.GetGuiResources +@ stdcall GetUserObjectSecurity(long ptr ptr long ptr) user32.GetUserObjectSecurity +@ stdcall KillTimer(long long) user32.KillTimer +@ stdcall MessageBeep(long) user32.MessageBeep +@ stdcall MonitorFromPoint(int64 long) user32.MonitorFromPoint +@ stdcall MonitorFromRect(ptr long) user32.MonitorFromRect +@ stdcall RegisterClipboardFormatW(wstr) user32.RegisterClipboardFormatW +@ stdcall RegisterDeviceNotificationW(long ptr long) user32.RegisterDeviceNotificationW +@ stdcall SetCoalescableTimer(long long long ptr long) user32.SetCoalescableTimer +@ stdcall SetTimer(long long long ptr) user32.SetTimer +@ stdcall SetUserObjectSecurity(long ptr ptr) user32.SetUserObjectSecurity +@ stdcall ShutdownBlockReasonCreate(long wstr) user32.ShutdownBlockReasonCreate +@ stdcall ShutdownBlockReasonDestroy(long) user32.ShutdownBlockReasonDestroy +@ stdcall TabbedTextOutW(long long long wstr long long ptr long) user32.TabbedTextOutW +@ stdcall UnregisterDeviceNotification(long) user32.UnregisterDeviceNotification +@ stdcall WaitForInputIdle(long long) user32.WaitForInputIdle +@ stdcall WinHelpW(long wstr long long) user32.WinHelpW diff --git a/tools/make_specfiles b/tools/make_specfiles index ab5b3fd..3bd6123 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -383,6 +383,7 @@ my @dll_groups = "ext-ms-win-ntuser-keyboard-l1-3-0", "ext-ms-win-ntuser-message-l1-1-0", "ext-ms-win-ntuser-message-l1-1-1", + "ext-ms-win-ntuser-misc-l1-1-0", "ext-ms-win-ntuser-misc-l1-2-0", "ext-ms-win-ntuser-misc-l1-5-1", "ext-ms-win-ntuser-mouse-l1-1-0",

1 0

Michael Stefaniuc : mshtml: Remove useless casts to self.
by Alexandre Julliard 20 Feb '19

20 Feb '19

Module: wine Branch: master Commit: cfe8651c9187d0dd6ad54f129f0a53da2aaedd95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cfe8651c9187d0dd6ad54f12… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Feb 18 21:14:00 2019 +0100 mshtml: Remove useless casts to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/editor.c | 8 ++++---- dlls/mshtml/htmlelem.c | 6 +++--- dlls/mshtml/tests/htmldoc.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 6838433..c901592 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -295,7 +295,7 @@ static void get_font_size(HTMLDocument *This, WCHAR *ret) TRACE("found font tag %p\n", elem); - get_elem_attr_value((nsIDOMElement*)elem, sizeW, &val_str, &val); + get_elem_attr_value(elem, sizeW, &val_str, &val); if(*val) { TRACE("found size %s\n", debugstr_w(val)); strcpyW(ret, val); @@ -366,7 +366,7 @@ static void set_font_size(HTMLDocument *This, LPCWSTR size) nsISelection_Collapse(nsselection, (nsIDOMNode*)elem, 0); }else { /* Remove all size attributes from the range */ - remove_child_attr((nsIDOMElement*)elem, fontW, &size_str); + remove_child_attr(elem, fontW, &size_str); nsISelection_SelectAllChildren(nsselection, (nsIDOMNode*)elem); } @@ -1174,10 +1174,10 @@ static HRESULT exec_hyperlink(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, if (insert_link_at_caret) { /* add them to the document at the caret position */ - nsres = nsIHTMLEditor_InsertElementAtSelection(html_editor, (nsIDOMElement*)anchor_elem, FALSE); + nsres = nsIHTMLEditor_InsertElementAtSelection(html_editor, anchor_elem, FALSE); nsISelection_SelectAllChildren(nsselection, (nsIDOMNode*)anchor_elem); }else /* add them around the selection using the magic provided to us by nsIHTMLEditor */ - nsres = nsIHTMLEditor_InsertLinkAroundSelection(html_editor, (nsIDOMElement*)anchor_elem); + nsres = nsIHTMLEditor_InsertLinkAroundSelection(html_editor, anchor_elem); nsIHTMLEditor_Release(html_editor); hres = NS_SUCCEEDED(nsres) ? S_OK : E_FAIL; diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 4da0156..d490030 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -5597,14 +5597,14 @@ HRESULT HTMLElement_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode, BOOL use_g tag = get_tag_desc(tag_name); if(tag) { - hres = tag->constructor(doc, (nsIDOMElement*)nselem, &elem); + hres = tag->constructor(doc, nselem, &elem); }else if(use_generic) { - hres = HTMLGenericElement_Create(doc, (nsIDOMElement*)nselem, &elem); + hres = HTMLGenericElement_Create(doc, nselem, &elem); }else { elem = heap_alloc_zero(sizeof(HTMLElement)); if(elem) { elem->node.vtbl = &HTMLElementImplVtbl; - HTMLElement_Init(elem, doc, (nsIDOMElement*)nselem, &HTMLElement_dispex); + HTMLElement_Init(elem, doc, nselem, &HTMLElement_dispex); hres = S_OK; }else { hres = E_OUTOFMEMORY; diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 25cdf80..52e6fe7 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -7543,7 +7543,7 @@ static void test_QueryInterface(IHTMLDocument2 *htmldoc) hres = IUnknown_QueryInterface(doc, &IID_IDispatch, (void**)&qi); ok(hres == S_OK, "Could not get IDispatch interface: %08x\n", hres); - ok(qi != (IUnknown*)doc, "disp == doc\n"); + ok(qi != doc, "disp == doc\n"); IUnknown_Release(qi); }

1 0

Michael Stefaniuc : d3dx9: Remove redundant "not NULL" checks ( coccinellery).
by Alexandre Julliard 20 Feb '19

20 Feb '19

Module: wine Branch: master Commit: be30aab1e21e5b6811470a351ec0d6100e6e7687 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be30aab1e21e5b6811470a35… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 19 00:06:22 2019 +0100 d3dx9: Remove redundant "not NULL" checks (coccinellery). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index e8ae7b5..1abc8dc 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -948,15 +948,14 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, return NULL; } - count = parameter ? parameter->member_count : base->parameter_count; + count = parameter->member_count; length = strcspn( name, "[.@" ); part = name + length; for (i = 0; i < count; i++) { - temp_parameter = !parameter ? &base->parameters[i].param - : &parameter->members[i]; + temp_parameter = &parameter->members[i]; if (!strcmp(temp_parameter->name, name)) { @@ -971,13 +970,8 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, return get_parameter_by_name(base, temp_parameter, part); case '@': - { - struct d3dx_top_level_parameter *top_param - = top_level_parameter_from_parameter(temp_parameter); + return NULL; - return parameter ? NULL : get_annotation_by_name(base, top_param->annotation_count, - top_param->annotations, part); - } case '[': return get_parameter_element_by_name(base, temp_parameter, part);

1 0