May 2018 - Wine-Devel - list.winehq.org

Re: [PATCH] comctl32/taskdialog/tests: Add a basic taskdialog creator as interactive test

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=38878 Your paranoid android. === wvistau64_zh_CN (32 bit edit) === edit.c:1542: Test failed: 0: got 2, 1 edit.c:1563: Test failed: 0: got 2, 1 edit.c:1577: Test failed: 0: got 2, 1 edit.c:1591: Test failed: 0: got 2, 1 edit.c:1717: Test failed: got 1 edit.c:1718: Test failed: got 1 edit.c:1724: Test failed: got 1 edit.c:1740: Test failed: got 2 edit.c:1763: Test failed: got 1 === wvistau64 (32 bit listbox) === listbox.c:939: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18 === wvistau64_zh_CN (32 bit listbox) === listbox.c:939: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18 === wvistau64_fr (32 bit listbox) === listbox.c:939: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18 === wvistau64_he (32 bit listbox) === listbox.c:939: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18 === wvistau64 (64 bit listbox) === listbox.c:939: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18 === w864 (64 bit listbox) === TestBot process got stuck or died unexpectedly The previous 1 run(s) terminated abnormally === w864 (32 bit misc) === TestBot process got stuck or died unexpectedly The previous 1 run(s) terminated abnormally === w2003std (32 bit static) === TestBot process got stuck or died unexpectedly The previous 1 run(s) terminated abnormally === w2008s64 (64 bit static) === TestBot process got stuck or died unexpectedly The previous 1 run(s) terminated abnormally === w7u (32 bit taskdialog) === TestBot process got stuck or died unexpectedly The previous 1 run(s) terminated abnormally === wvistau64 (64 bit button) === TestBot process got stuck or died unexpectedly The previous 1 run(s) terminated abnormally === w8 (32 bit treeview) === TestBot process got stuck or died unexpectedly The previous 1 run(s) terminated abnormally

May 31, 2018

Re: [PATCH] comctl32/edit/tests: Add interactive test showing a rendering glitch

by Fabian Maurer

On Donnerstag, 31. Mai 2018 21:49:50 CEST Marvin wrote: > While running your changed tests on Windows, I think I found new failures. > Being a bot and all I'm not very good at pattern recognition, so I might be > wrong, but could you please double-check? I sent an updated version. But why does https://source.winehq.org/patches/ say "TestBot OK"? Regards, Fabian Maurer

May 31, 2018

[PATCH v2] comctl32/edit/tests: Add interactive test showing a rendering glitch

by Fabian Maurer

v2: Only run test when WINETEST_INTERACTIVE is set Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/comctl32/tests/edit.c | 35 +++++++++++++++++++++++++++++++++++ dlls/comctl32/tests/rsrc.rc | 12 ++++++++++++ 2 files changed, 47 insertions(+) diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index 7e9e7e7634..fa8ded377d 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -3094,6 +3094,36 @@ static void test_change_focus(void) DestroyWindow(hwnd); } +static INT_PTR CALLBACK dialog_proc_interactive(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_COMMAND: + if (HIWORD(wparam) == BN_CLICKED) + { + EndDialog(hdlg, LOWORD(wparam)); + } + break; + case WM_CLOSE: + EndDialog(hdlg, IDCANCEL); + break; + + default: + break; + } + + return FALSE; +} + +static void test_rendering_interactive(void) +{ + int button_clicked; + + button_clicked = DialogBoxParamA(GetModuleHandleA(NULL), "EDIT_OVERLAPPING_LABEL", NULL, dialog_proc_interactive, 0); + todo_wine + ok(button_clicked == IDOK, "Interactive test 'edit overlapping label' failed.\n"); +} + START_TEST(edit) { ULONG_PTR ctx_cookie; @@ -3139,6 +3169,11 @@ START_TEST(edit) test_wordbreak_proc(); test_change_focus(); + if (winetest_interactive) + { + test_rendering_interactive(); + } + UnregisterWindowClasses(); unload_v6_module(ctx_cookie, hCtx); diff --git a/dlls/comctl32/tests/rsrc.rc b/dlls/comctl32/tests/rsrc.rc index 327aa225e1..959130e2f1 100644 --- a/dlls/comctl32/tests/rsrc.rc +++ b/dlls/comctl32/tests/rsrc.rc @@ -78,6 +78,18 @@ FONT 8, "MS Shell Dlg" { } +EDIT_OVERLAPPING_LABEL DIALOG 0, 0, 200, 80 +STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | DS_CENTER +CAPTION "Does the edit box look alright?" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Title:", -1, 5, 5, 70, 15, BS_CENTER + EDITTEXT 1000, 60, 5, 450, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_WANTRETURN + + PUSHBUTTON "OK", IDOK, 20, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Broken", IDNO, 100, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +} + STRINGTABLE { IDS_TBADD1 "abc" -- 2.17.1

May 31, 2018

[PATCH 2/2] find: Add stub program

by Fabian Maurer

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- configure | 2 ++ configure.ac | 1 + programs/find/Makefile.in | 4 ++++ programs/find/find.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 40 insertions(+) create mode 100644 programs/find/Makefile.in create mode 100644 programs/find/find.c diff --git a/configure b/configure index ea2d353e5f..3a7d3e370f 100755 --- a/configure +++ b/configure @@ -1672,6 +1672,7 @@ enable_expand enable_explorer enable_extrac32 enable_fc +enable_find enable_findstr enable_fsutil enable_hh @@ -19363,6 +19364,7 @@ wine_fn_config_makefile programs/expand enable_expand wine_fn_config_makefile programs/explorer enable_explorer wine_fn_config_makefile programs/extrac32 enable_extrac32 wine_fn_config_makefile programs/fc enable_fc +wine_fn_config_makefile programs/find enable_find wine_fn_config_makefile programs/findstr enable_findstr wine_fn_config_makefile programs/fsutil enable_fsutil wine_fn_config_makefile programs/hh enable_hh diff --git a/configure.ac b/configure.ac index a9fffc17c5..600cb63b9f 100644 --- a/configure.ac +++ b/configure.ac @@ -3876,6 +3876,7 @@ WINE_CONFIG_MAKEFILE(programs/expand) WINE_CONFIG_MAKEFILE(programs/explorer) WINE_CONFIG_MAKEFILE(programs/extrac32) WINE_CONFIG_MAKEFILE(programs/fc) +WINE_CONFIG_MAKEFILE(programs/find) WINE_CONFIG_MAKEFILE(programs/findstr) WINE_CONFIG_MAKEFILE(programs/fsutil) WINE_CONFIG_MAKEFILE(programs/hh) diff --git a/programs/find/Makefile.in b/programs/find/Makefile.in new file mode 100644 index 0000000000..ef8d61b7ce --- /dev/null +++ b/programs/find/Makefile.in @@ -0,0 +1,4 @@ +MODULE = find.exe +APPMODE = -mconsole -municode + +C_SRCS = find.c diff --git a/programs/find/find.c b/programs/find/find.c new file mode 100644 index 0000000000..c66dd2dba7 --- /dev/null +++ b/programs/find/find.c @@ -0,0 +1,33 @@ +/* + * Copyright 2010 Fabian Maurer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(find); + +int wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +} -- 2.17.1

May 31, 2018

[PATCH 1/2] fc: Add stub program

by Fabian Maurer

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- configure | 26 ++++++++------------------ configure.ac | 1 + programs/fc/Makefile.in | 4 ++++ programs/fc/fc.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 46 insertions(+), 18 deletions(-) create mode 100644 programs/fc/Makefile.in create mode 100644 programs/fc/fc.c diff --git a/configure b/configure index 2960b34c93..ea2d353e5f 100755 --- a/configure +++ b/configure @@ -800,7 +800,6 @@ infodir docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir @@ -1672,6 +1671,7 @@ enable_eject enable_expand enable_explorer enable_extrac32 +enable_fc enable_findstr enable_fsutil enable_hh @@ -1859,7 +1859,6 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -2112,15 +2111,6 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; - -runstatedir | --runstatedir | --runstatedi | --runstated \ - | --runstate | --runstat | --runsta | --runst | --runs \ - | --run | --ru | --r) - ac_prev=runstatedir ;; - -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ - | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ - | --run=* | --ru=* | --r=*) - runstatedir=$ac_optarg ;; - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -2258,7 +2248,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir runstatedir + libdir localedir mandir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -2411,7 +2401,6 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -6623,7 +6612,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -6669,7 +6658,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -6693,7 +6682,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -6738,7 +6727,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -6762,7 +6751,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -19373,6 +19362,7 @@ wine_fn_config_makefile programs/eject enable_eject wine_fn_config_makefile programs/expand enable_expand wine_fn_config_makefile programs/explorer enable_explorer wine_fn_config_makefile programs/extrac32 enable_extrac32 +wine_fn_config_makefile programs/fc enable_fc wine_fn_config_makefile programs/findstr enable_findstr wine_fn_config_makefile programs/fsutil enable_fsutil wine_fn_config_makefile programs/hh enable_hh diff --git a/configure.ac b/configure.ac index 3a6a3a1762..a9fffc17c5 100644 --- a/configure.ac +++ b/configure.ac @@ -3875,6 +3875,7 @@ WINE_CONFIG_MAKEFILE(programs/eject) WINE_CONFIG_MAKEFILE(programs/expand) WINE_CONFIG_MAKEFILE(programs/explorer) WINE_CONFIG_MAKEFILE(programs/extrac32) +WINE_CONFIG_MAKEFILE(programs/fc) WINE_CONFIG_MAKEFILE(programs/findstr) WINE_CONFIG_MAKEFILE(programs/fsutil) WINE_CONFIG_MAKEFILE(programs/hh) diff --git a/programs/fc/Makefile.in b/programs/fc/Makefile.in new file mode 100644 index 0000000000..96d878a410 --- /dev/null +++ b/programs/fc/Makefile.in @@ -0,0 +1,4 @@ +MODULE = fc.exe +APPMODE = -mconsole -municode + +C_SRCS = fc.c diff --git a/programs/fc/fc.c b/programs/fc/fc.c new file mode 100644 index 0000000000..ba3b04bda2 --- /dev/null +++ b/programs/fc/fc.c @@ -0,0 +1,33 @@ +/* + * Copyright 2018 Fabian Maurer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(fc); + +int wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +} -- 2.17.1

May 31, 2018

Re: [PATCH] comctl32/edit/tests: Add interactive test showing a rendering glitch

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=38877 Your paranoid android. === w864 (32 bit dpa) === TestBot process got stuck or died unexpectedly The previous 1 run(s) terminated abnormally === wvistau64_zh_CN (32 bit edit) === edit.c:1542: Test failed: 0: got 2, 1 edit.c:1563: Test failed: 0: got 2, 1 edit.c:1577: Test failed: 0: got 2, 1 edit.c:1591: Test failed: 0: got 2, 1 edit.c:1717: Test failed: got 1 edit.c:1718: Test failed: got 1 edit.c:1724: Test failed: got 1 edit.c:1740: Test failed: got 2 edit.c:1763: Test failed: got 1 === wvistau64 (32 bit listbox) === listbox.c:939: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18 === wvistau64_zh_CN (32 bit listbox) === listbox.c:939: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18 === wvistau64_fr (32 bit listbox) === listbox.c:939: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18 === wvistau64_he (32 bit listbox) === listbox.c:939: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18 === wvistau64 (64 bit listbox) === listbox.c:939: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18 === w7pro64 (32 bit progress) === TestBot process got stuck or died unexpectedly The previous 1 run(s) terminated abnormally === wvistau64_zh_CN (32 bit taskdialog) === TestBot process got stuck or died unexpectedly The previous 1 run(s) terminated abnormally

May 31, 2018

[PATCH] comctl32/taskdialog/tests: Add a basic taskdialog creator as interactive test

by Fabian Maurer

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/comctl32/tests/resources.h | 5 +++ dlls/comctl32/tests/rsrc.rc | 17 +++++++++ dlls/comctl32/tests/taskdialog.c | 62 ++++++++++++++++++++++++++++++++ 3 files changed, 84 insertions(+) diff --git a/dlls/comctl32/tests/resources.h b/dlls/comctl32/tests/resources.h index 3a89cd7baf..0e4ff6702c 100644 --- a/dlls/comctl32/tests/resources.h +++ b/dlls/comctl32/tests/resources.h @@ -48,4 +48,9 @@ #define IDC_PS_COMBO1 1020 #define IDC_PS_PUSHBUTTON1 1021 +#define IDC_TASKDIALOG_CREATE 1030 +#define IDC_TASKDIALOG_TEXT_TITLE 1031 +#define IDC_TASKDIALOG_TEXT_MAIN 1032 +#define IDC_TASKDIALOG_TEXT_CONTENT 1033 + #endif /* __WINE_COMCTL32_TEST_RESOURCES_H */ diff --git a/dlls/comctl32/tests/rsrc.rc b/dlls/comctl32/tests/rsrc.rc index 959130e2f1..fad3f71858 100644 --- a/dlls/comctl32/tests/rsrc.rc +++ b/dlls/comctl32/tests/rsrc.rc @@ -173,3 +173,20 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Cancel", IDCANCEL, 100, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP EDITTEXT 1000, 5, 5, 150, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | ES_AUTOVSCROLL | ES_WANTRETURN } + +TAKDIALOG_CREATOR DIALOG 0, 0, 600, 500 +STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | DS_CENTER +CAPTION "Taskdialog Creator" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Title:", -1, 5, 5, 70, 15, BS_CENTER + EDITTEXT IDC_TASKDIALOG_TEXT_TITLE, 75, 5, 450, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_WANTRETURN + + LTEXT "Main Instruction:", -1, 5, 25, 70, 50, BS_CENTER + EDITTEXT IDC_TASKDIALOG_TEXT_MAIN, 75, 25, 450, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | ES_MULTILINE | ES_WANTRETURN + + LTEXT "Content:", -1, 5, 80, 70, 50, BS_CENTER + EDITTEXT IDC_TASKDIALOG_TEXT_CONTENT, 75, 80, 450, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | ES_MULTILINE | ES_WANTRETURN + + PUSHBUTTON "Create Taskdialog", IDC_TASKDIALOG_CREATE, 260, 460, 80, 30, WS_CHILD | WS_VISIBLE | WS_TABSTOP +} diff --git a/dlls/comctl32/tests/taskdialog.c b/dlls/comctl32/tests/taskdialog.c index 432b89bd15..3b78f4fbf7 100644 --- a/dlls/comctl32/tests/taskdialog.c +++ b/dlls/comctl32/tests/taskdialog.c @@ -28,6 +28,7 @@ #include "wine/test.h" #include "v6util.h" #include "msg.h" +#include "resources.h" #define WM_TD_CALLBACK (WM_APP) /* Custom dummy message to wrap callback notifications */ @@ -374,6 +375,61 @@ static void test_timer(void) pTaskDialogIndirect(&info, NULL, NULL, NULL); } +/* Caller must free the buffer */ +static WCHAR* control_get_text(HWND hdlg, int id_control) +{ + HWND hwnd_control = GetDlgItem(hdlg, id_control); + int text_length = GetWindowTextLengthW(hwnd_control); + WCHAR *text = heap_alloc((text_length + 1) * sizeof(WCHAR)); + GetWindowTextW(hwnd_control, text, text_length + 1); + return text; +} + +static void taskdialog_creator_create(HWND hdlg) +{ + TASKDIALOGCONFIG info = { 0 }; + WCHAR *text_title; + WCHAR *text_main_instruction; + WCHAR *text_content; + + text_title = control_get_text(hdlg, IDC_TASKDIALOG_TEXT_TITLE); + text_main_instruction = control_get_text(hdlg, IDC_TASKDIALOG_TEXT_MAIN); + text_content = control_get_text(hdlg, IDC_TASKDIALOG_TEXT_CONTENT); + + info.cbSize = sizeof(TASKDIALOGCONFIG); + info.hwndParent = hdlg; + info.pszWindowTitle = text_title; + info.pszMainInstruction = text_main_instruction; + info.pszContent = text_content; + + pTaskDialogIndirect(&info, NULL, NULL, NULL); + + heap_free(text_title); + heap_free(text_main_instruction); + heap_free(text_content); +} + +static INT_PTR CALLBACK taskdialog_creator_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_COMMAND: + if (HIWORD(wparam) == BN_CLICKED && LOWORD(wparam) == IDC_TASKDIALOG_CREATE) + { + taskdialog_creator_create(hdlg); + } + break; + case WM_CLOSE: + EndDialog(hdlg, 0); + break; + + default: + break; + } + + return FALSE; +} + START_TEST(taskdialog) { ULONG_PTR ctx_cookie; @@ -405,6 +461,12 @@ START_TEST(taskdialog) ok(pTaskDialogIndirect == ptr_ordinal, "got wrong pointer for ordinal 345, %p expected %p\n", ptr_ordinal, pTaskDialogIndirect); + if (winetest_interactive) + { + DialogBoxParamA(GetModuleHandleA(NULL), "TAKDIALOG_CREATOR", NULL, taskdialog_creator_proc, 0); + return; + } + init_msg_sequences(sequences, NUM_MSG_SEQUENCES); test_invalid_parameters(); -- 2.17.1

May 31, 2018

[PATCH] comctl32/edit/tests: Add interactive test showing a rendering glitch

by Fabian Maurer

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/comctl32/tests/edit.c | 32 ++++++++++++++++++++++++++++++++ dlls/comctl32/tests/rsrc.rc | 12 ++++++++++++ 2 files changed, 44 insertions(+) diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index 7e9e7e7634..76397ac92f 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -3094,6 +3094,36 @@ static void test_change_focus(void) DestroyWindow(hwnd); } +static INT_PTR CALLBACK dialog_proc_interactive(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_COMMAND: + if (HIWORD(wparam) == BN_CLICKED) + { + EndDialog(hdlg, LOWORD(wparam)); + } + break; + case WM_CLOSE: + EndDialog(hdlg, IDCANCEL); + break; + + default: + break; + } + + return FALSE; +} + +static void test_rendering_interactive(void) +{ + int button_clicked; + + button_clicked = DialogBoxParamA(GetModuleHandleA(NULL), "EDIT_OVERLAPPING_LABEL", NULL, dialog_proc_interactive, 0); + todo_wine + ok(button_clicked == IDOK, "Interactive test 'edit overlapping label' failed.\n"); +} + START_TEST(edit) { ULONG_PTR ctx_cookie; @@ -3139,6 +3169,8 @@ START_TEST(edit) test_wordbreak_proc(); test_change_focus(); + test_rendering_interactive(); + UnregisterWindowClasses(); unload_v6_module(ctx_cookie, hCtx); diff --git a/dlls/comctl32/tests/rsrc.rc b/dlls/comctl32/tests/rsrc.rc index 327aa225e1..959130e2f1 100644 --- a/dlls/comctl32/tests/rsrc.rc +++ b/dlls/comctl32/tests/rsrc.rc @@ -78,6 +78,18 @@ FONT 8, "MS Shell Dlg" { } +EDIT_OVERLAPPING_LABEL DIALOG 0, 0, 200, 80 +STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | DS_CENTER +CAPTION "Does the edit box look alright?" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Title:", -1, 5, 5, 70, 15, BS_CENTER + EDITTEXT 1000, 60, 5, 450, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_WANTRETURN + + PUSHBUTTON "OK", IDOK, 20, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Broken", IDNO, 100, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +} + STRINGTABLE { IDS_TBADD1 "abc" -- 2.17.1

May 31, 2018

Re: [PATCH] d3dx10/tests: Use the available ARRAY_SIZE() macro

by Matteo Bruni

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>

May 31, 2018

Re: [PATCH v3 1/8] dxgi: Create Vulkan swapchains for D3D12.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

May 31, 2018