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

Re: [PATCH 1/3] user32/tests: Add a test for custom dialog control data.

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=42734 Your paranoid android. === build (build log) === Makefile:805: recipe for target 'user32_test.exe' failed Makefile:7471: recipe for target 'dlls/user32/tests' failed Task: The exe32 Wine crossbuild failed === debian9 (build log) ===

Oct. 1, 2018

[PATCH 3/3] user32: Fix the pointer to custom dialog control data.

by Dmitry Timoshkov

The fix is suggested by vendor2013(a)herdsoft.com. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/dialog.c | 2 +- dlls/user32/tests/dialog.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 7b918193fd..c5c646e0b1 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -197,7 +197,7 @@ static const WORD *DIALOG_GetControl32( const WORD *p, DLG_CONTROL_INFO *info, TRACE("\n"); TRACE(" END\n" ); } - info->data = p + 1; + info->data = p; p += GET_WORD(p) / sizeof(WORD); } else info->data = NULL; diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index b75759ba0a..631f3d3b2b 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -553,7 +553,6 @@ static LRESULT CALLBACK test_control_procA(HWND hwnd, UINT msg, WPARAM wparam, L static const short sample[] = { 10,1,2,3,4,5 }; CREATESTRUCTA *cs = (CREATESTRUCTA *)lparam; short *data = cs->lpCreateParams; -todo_wine ok(!memcmp(data, sample, sizeof(sample)), "data mismatch: %d,%d,%d,%d,%d\n", data[0], data[1], data[2], data[3], data[4]); } return 0; -- 2.17.1

Oct. 1, 2018

[PATCH 2/3] tools/wrc: Fix generation of custom dialog control data.

by Dmitry Timoshkov

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- tools/wrc/genres.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/wrc/genres.c b/tools/wrc/genres.c index 8c2f280ac5..939d2655b2 100644 --- a/tools/wrc/genres.c +++ b/tools/wrc/genres.c @@ -726,8 +726,7 @@ static res_t *dialog2res(name_id_t *name, dialog_t *dlg) put_word(res, 0); if(ctrl->extra) { - put_word(res, ctrl->extra->size+2); - put_pad(res); + put_word(res, ctrl->extra->size); put_raw_data(res, ctrl->extra, 0); } else -- 2.17.1

Oct. 1, 2018

[PATCH 1/3] user32/tests: Add a test for custom dialog control data.

by Dmitry Timoshkov

Warning: this patch needs recent binutils that include fixed windres, otherwise cross-compilation of the test will fail. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/tests/dialog.c | 38 +++++++++++++++++++++++++++++++++++ dlls/user32/tests/resource.rc | 9 +++++++++ 2 files changed, 47 insertions(+) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 0604423acf..b75759ba0a 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -544,6 +544,27 @@ static LRESULT CALLBACK testDlgWinProc (HWND hwnd, UINT uiMsg, WPARAM wParam, return DefDlgProcA (hwnd, uiMsg, wParam, lParam); } +static LRESULT CALLBACK test_control_procA(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch(msg) + { + case WM_CREATE: + { + static const short sample[] = { 10,1,2,3,4,5 }; + CREATESTRUCTA *cs = (CREATESTRUCTA *)lparam; + short *data = cs->lpCreateParams; +todo_wine + ok(!memcmp(data, sample, sizeof(sample)), "data mismatch: %d,%d,%d,%d,%d\n", data[0], data[1], data[2], data[3], data[4]); + } + return 0; + + default: + break; + } + + return DefWindowProcA(hwnd, msg, wparam, lparam); +} + static BOOL RegisterWindowClasses (void) { WNDCLASSA cls; @@ -563,7 +584,10 @@ static BOOL RegisterWindowClasses (void) cls.lpfnWndProc = main_window_procA; cls.lpszClassName = "IsDialogMessageWindowClass"; + if (!RegisterClassA (&cls)) return FALSE; + cls.lpfnWndProc = test_control_procA; + cls.lpszClassName = "TESTCONTROL"; if (!RegisterClassA (&cls)) return FALSE; GetClassInfoA(0, "#32770", &cls); @@ -2048,12 +2072,26 @@ static void test_MessageBox(void) UnhookWindowsHookEx(hook); } +static INT_PTR CALLBACK custom_test_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) +{ + if (msg == WM_INITDIALOG) + EndDialog(hdlg, 0); + + return FALSE; +} + +static void test_dialog_custom_data(void) +{ + DialogBoxA(g_hinst, "CUSTOM_TEST_DIALOG", NULL, custom_test_dialog_proc); +} + START_TEST(dialog) { g_hinst = GetModuleHandleA (0); if (!RegisterWindowClasses()) assert(0); + test_dialog_custom_data(); test_GetNextDlgItem(); test_IsDialogMessage(); test_WM_NEXTDLGCTL(); diff --git a/dlls/user32/tests/resource.rc b/dlls/user32/tests/resource.rc index 756e38f0f7..a9e45e90ce 100644 --- a/dlls/user32/tests/resource.rc +++ b/dlls/user32/tests/resource.rc @@ -206,6 +206,15 @@ FONT 8, "MS Shell Dlg" EDITTEXT 1000, 5, 5, 150, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_MULTILINE | WS_VSCROLL | ES_AUTOVSCROLL | ES_READONLY } +CUSTOM_TEST_DIALOG DIALOGEX 6, 15, 207, 111 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Custom Test Dialog" +FONT 8, "MS Sans Serif" +{ + CONTROL "evenlengthtext", -1, "TESTCONTROL", WS_CHILD|WS_VISIBLE|WS_BORDER|WS_TABSTOP, 10,10,100,50 { 1,2,3,4,5 } + CONTROL "oddlengthtext", -1, "TESTCONTROL", WS_CHILD|WS_VISIBLE|WS_BORDER|WS_TABSTOP, 10,60,100,50 { 1,2,3,4,5 } +} + /* @makedep: test_mono.bmp */ 100 BITMAP test_mono.bmp -- 2.17.1

Oct. 1, 2018

[PATCH] makefiles: Only generate proxy code for the target architecture.

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Makefile.in | 1 + configure.ac | 5 +++++ tools/makedep.c | 3 +++ 3 files changed, 9 insertions(+) diff --git a/Makefile.in b/Makefile.in index 6b65fdf..c1242af 100644 --- a/Makefile.in +++ b/Makefile.in @@ -49,6 +49,7 @@ MSVCRTFLAGS = @BUILTINFLAG@ TARGETFLAGS = @TARGETFLAGS@ UNWINDFLAGS = @UNWINDFLAGS@ LDEXECFLAGS = @LDEXECFLAGS@ +WIDLFLAGS = @WIDLFLAGS@ LIBS = @LIBS@ BISON = @BISON@ FLEX = @FLEX@ diff --git a/configure.ac b/configure.ac index 70532b2..31ec935 100644 --- a/configure.ac +++ b/configure.ac @@ -157,6 +157,7 @@ case $host in host_cpu="i386" notice_platform="32-bit " AC_SUBST(TARGETFLAGS,"-m32") + AC_SUBST(WIDLFLAGS,"--win32") PKG_CONFIG_PATH=${PKG_CONFIG_PATH:-/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib/pkgconfig} export PKG_CONFIG_PATH enable_win16=${enable_win16:-yes} @@ -174,6 +175,7 @@ case $host in host_cpu="x86_64" notice_platform="64-bit " AC_SUBST(TARGETFLAGS,"-m64") + AC_SUBST(WIDLFLAGS,"--win64") fi ;; arm*) @@ -205,6 +207,7 @@ case $host in esac CFLAGS="$CFLAGS -marm -mfloat-abi=$float_abi" AC_SUBST(TARGETFLAGS,"-marm -mfloat-abi=$float_abi") + AC_SUBST(WIDLFLAGS,"--win32") ;; aarch64*) AC_MSG_CHECKING([whether $CC supports __builtin_ms_va_list]) @@ -212,9 +215,11 @@ case $host in [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]) AC_MSG_ERROR([You need clang >= 5.0 to build Wine for arm64.])]) + AC_SUBST(WIDLFLAGS,"--win64") ;; i[[3456789]]86*) enable_win16=${enable_win16:-yes} + AC_SUBST(WIDLFLAGS,"--win32") ;; esac diff --git a/tools/makedep.c b/tools/makedep.c index 4fcc99e..66b21db 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -133,6 +133,7 @@ static struct strarray msvcrt_flags; static struct strarray extra_cflags; static struct strarray cpp_flags; static struct strarray unwind_flags; +static struct strarray widl_flags; static struct strarray libs; static struct strarray enable_tests; static struct strarray cmdline_vars; @@ -2641,6 +2642,7 @@ static void output_source_idl( struct makefile *make, struct incl_file *source, output_filenames_obj_dir( make, targets ); output( ": %s\n", tools_path( make, "widl" )); output( "\t%s -o $@", tools_path( make, "widl" ) ); + output_filenames( widl_flags ); output_filenames( target_flags ); output_filenames( make->include_args ); output_filenames( make->define_args ); @@ -4208,6 +4210,7 @@ int main( int argc, char *argv[] ) extra_cflags = get_expanded_make_var_array( top_makefile, "EXTRACFLAGS" ); cpp_flags = get_expanded_make_var_array( top_makefile, "CPPFLAGS" ); unwind_flags = get_expanded_make_var_array( top_makefile, "UNWINDFLAGS" ); + widl_flags = get_expanded_make_var_array( top_makefile, "WIDLFLAGS" ); libs = get_expanded_make_var_array( top_makefile, "LIBS" ); enable_tests = get_expanded_make_var_array( top_makefile, "ENABLE_TESTS" ); -- 2.7.4

Oct. 1, 2018