April 2021 - Wine-Commits - list.winehq.org

Alexandre Julliard : wineandroid: Load ntdll from the architecture-specific directory.
by Alexandre Julliard April 28, 2021

April 28, 2021

Module: wine Branch: master Commit: 6d00838e1137e6c248afea6005375c569c055a95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d00838e1137e6c248afea60… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 28 11:42:04 2021 +0200 wineandroid: Load ntdll from the architecture-specific directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/wineandroid.drv/WineActivity.java b/dlls/wineandroid.drv/WineActivity.java index 44db8f003db..f9f39dc6c7b 100644 --- a/dlls/wineandroid.drv/WineActivity.java +++ b/dlls/wineandroid.drv/WineActivity.java @@ -97,6 +97,15 @@ public class WineActivity extends Activity return null; } + private String get_so_dir( String abi ) + { + if (abi.equals( "x86" )) return "/i386-unix"; + if (abi.equals( "x86_64" )) return "/x86_64-unix"; + if (abi.equals( "armeabi-v7a" )) return "/arm-unix"; + if (abi.equals( "arm64-v8a" )) return "/aarch64-unix"; + return ""; + } + private void loadWine( String cmdline ) { copyAssetFiles(); @@ -138,7 +147,7 @@ public class WineActivity extends Activity createProgressDialog( 0, "Setting up the Windows environment..." ); - System.load( dlldir.toString() + "/ntdll.so" ); + System.load( dlldir.toString() + get_so_dir(wine_abi) + "/ntdll.so" ); prefix.mkdirs(); runWine( cmdline, env );

1 0

Alexandre Julliard : winegcc: Look for libraries in the architecture-specific directory.
by Alexandre Julliard April 28, 2021

April 28, 2021

Module: wine Branch: master Commit: 0aa335b1060428f5f799c93e3c6dea2bc2dd864a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0aa335b1060428f5f799c93e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 28 11:42:40 2021 +0200 winegcc: Look for libraries in the architecture-specific directory. Based on patches by Jacek Caban. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 85 +++++++++++++++++++++++++------------------------ 1 file changed, 43 insertions(+), 42 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index bf72b612034..969daa0f96b 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -597,29 +597,6 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) return link_args; } -/* check that file is a library for the correct platform */ -static int check_platform( struct options *opts, const char *file ) -{ - int ret = 0, fd = open( file, O_RDONLY ); - if (fd != -1) - { - unsigned char header[16]; - if (read( fd, header, sizeof(header) ) == sizeof(header)) - { - /* FIXME: only ELF is supported, platform is not checked beyond 32/64 */ - if (!memcmp( header, "\177ELF", 4 )) - { - if (header[4] == 2) /* 64-bit */ - ret = (opts->target_cpu == CPU_x86_64 || opts->target_cpu == CPU_ARM64); - else - ret = (opts->target_cpu != CPU_x86_64 && opts->target_cpu != CPU_ARM64); - } - } - close( fd ); - } - return ret; -} - static const char *get_multiarch_dir( enum target_cpu cpu ) { switch(cpu) @@ -635,17 +612,41 @@ static const char *get_multiarch_dir( enum target_cpu cpu ) } } +static const char *get_wine_arch_dir( enum target_cpu target_cpu, enum target_platform target_platform ) +{ + const char *cpu; + + switch (target_cpu) + { + case CPU_x86: cpu = "i386"; break; + case CPU_x86_64: cpu = "x86_64"; break; + case CPU_ARM: cpu = "arm"; break; + case CPU_ARM64: cpu = "aarch64"; break; + default: return "/wine"; + } + switch (target_platform) + { + case PLATFORM_WINDOWS: + case PLATFORM_CYGWIN: + case PLATFORM_MINGW: + return strmake( "/wine/%s-windows", cpu ); + default: + return strmake( "/wine/%s-unix", cpu ); + } +} + static char *get_lib_dir( struct options *opts ) { const char *stdlibpath[] = { libdir, LIBDIR, "/usr/lib", "/usr/local/lib", "/lib" }; - static const char ntdll[] = "/wine/ntdll.so"; - const char *bit_suffix, *other_bit_suffix, *build_multiarch, *target_multiarch; + const char *bit_suffix, *other_bit_suffix, *build_multiarch, *target_multiarch, *winecrt0; const char *root = opts->sysroot ? opts->sysroot : ""; unsigned int i; + struct stat st; size_t build_len, target_len; bit_suffix = opts->target_cpu == CPU_x86_64 || opts->target_cpu == CPU_ARM64 ? "64" : "32"; other_bit_suffix = opts->target_cpu == CPU_x86_64 || opts->target_cpu == CPU_ARM64 ? "32" : "64"; + winecrt0 = strmake( "%s/libwinecrt0.a", get_wine_arch_dir( opts->target_cpu, opts->target_platform )); build_multiarch = get_multiarch_dir( build_cpu ); target_multiarch = get_multiarch_dir( opts->target_cpu ); build_len = strlen( build_multiarch ); @@ -658,31 +659,31 @@ static char *get_lib_dir( struct options *opts ) if (!stdlibpath[i]) continue; buffer = xmalloc( strlen(root) + strlen(stdlibpath[i]) + - strlen("/arm-linux-gnueabi") + strlen(ntdll) + 1 ); + strlen("/arm-linux-gnueabi") + strlen(winecrt0) + 1 ); strcpy( buffer, root ); strcat( buffer, stdlibpath[i] ); p = buffer + strlen(buffer); while (p > buffer && p[-1] == '/') p--; - strcpy( p, ntdll ); - if (check_platform( opts, buffer )) goto found; + strcpy( p, winecrt0 ); + if (!stat( buffer, &st )) goto found; if (p > buffer + 2 && (!memcmp( p - 2, "32", 2 ) || !memcmp( p - 2, "64", 2 ))) { p -= 2; - strcpy( p, ntdll ); - if (check_platform( opts, buffer )) goto found; + strcpy( p, winecrt0 ); + if (!stat( buffer, &st )) goto found; } strcpy( p, bit_suffix ); - strcat( p, ntdll ); - if (check_platform( opts, buffer )) goto found; + strcat( p, winecrt0 ); + if (!stat( buffer, &st )) goto found; strcpy( p, target_multiarch ); - strcat( p, ntdll ); - if (check_platform( opts, buffer )) goto found; + strcat( p, winecrt0 ); + if (!stat( buffer, &st )) goto found; strcpy( buffer, root ); strcat( buffer, stdlibpath[i] ); p = buffer + strlen(buffer); while (p > buffer && p[-1] == '/') p--; - strcpy( p, ntdll ); + strcpy( p, winecrt0 ); /* try to fixup each parent dirs named lib, lib32 or lib64 with target bitness suffix */ while (p > buffer) @@ -696,7 +697,7 @@ static char *get_lib_dir( struct options *opts ) { memmove( p + target_len, p + build_len, strlen( p + build_len ) + 1 ); memcpy( p, target_multiarch, target_len ); - if (check_platform( opts, buffer )) goto found; + if (!stat( buffer, &st )) goto found; memmove( p + build_len, p + target_len, strlen( p + target_len ) + 1 ); memcpy( p, build_multiarch, build_len ); } @@ -706,15 +707,15 @@ static char *get_lib_dir( struct options *opts ) { memmove( p + 6, p + 4, strlen( p + 4 ) + 1 ); memcpy( p + 4, bit_suffix, 2 ); - if (check_platform( opts, buffer )) goto found; + if (!stat( buffer, &st )) goto found; memmove( p + 4, p + 6, strlen( p + 6 ) + 1 ); } else if (!memcmp( p + 4, other_bit_suffix, 2 ) && p[6] == '/') { memcpy( p + 4, bit_suffix, 2 ); - if (check_platform( opts, buffer )) goto found; + if (!stat( buffer, &st )) goto found; memmove( p + 4, p + 6, strlen( p + 6 ) + 1 ); - if (check_platform( opts, buffer )) goto found; + if (!stat( buffer, &st )) goto found; memmove( p + 6, p + 4, strlen( p + 4 ) + 1 ); memcpy( p + 4, other_bit_suffix, 2 ); } @@ -724,7 +725,7 @@ static char *get_lib_dir( struct options *opts ) continue; found: - buffer[strlen(buffer) - strlen(ntdll)] = 0; + buffer[strlen(buffer) - strlen(winecrt0)] = 0; return buffer; } return strmake( "%s%s", root, LIBDIR ); @@ -1148,14 +1149,14 @@ static void build(struct options* opts) { char *lib_dir = get_lib_dir( opts ); lib_dirs = strarray_dup(opts->lib_dirs); - strarray_add( lib_dirs, strmake( "%s/wine", lib_dir )); + strarray_add( lib_dirs, strmake( "%s%s", lib_dir, + get_wine_arch_dir( opts->target_cpu, opts->target_platform ))); strarray_add( lib_dirs, lib_dir ); } else { lib_dirs = strarray_alloc(); strarray_add(lib_dirs, strmake("%s/dlls", opts->wine_objdir)); - strarray_add(lib_dirs, strmake("%s/libs/wine", opts->wine_objdir)); strarray_addall(lib_dirs, opts->lib_dirs); }

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard April 28, 2021

April 28, 2021

Module: wine Branch: master Commit: 22a7059f985387d44502de828e52f8f8f0e835d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22a7059f985387d44502de82… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Apr 28 11:59:49 2021 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index a85dbe0e19d..828aaff52fa 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-04-21 09:19+0300\n" +"PO-Revision-Date: 2021-04-28 11:59+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -3974,10 +3974,8 @@ msgid "Cannot modify non-writable property '|'" msgstr "Negalima modifikuoti nerašomos savybės „|“" #: dlls/jscript/jscript.rc:77 -#, fuzzy -#| msgid "'[object]' is not a date object" msgid "'this' is not a Map object" -msgstr "„[objektas]“ nėra datos objektas" +msgstr "„Šis“ nėra atvaizdžio objektas" #: dlls/jscript/jscript.rc:78 msgid "Property cannot have both accessors and a value"

1 0

Hugh McMaster : reg: Consistently use 'hkey' for HKEY variables.
by Alexandre Julliard April 28, 2021

April 28, 2021

Module: wine Branch: master Commit: c809f9462455ffb0e03a9ae4057f0cd47c85ee5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c809f9462455ffb0e03a9ae4… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Apr 28 19:19:28 2021 +1000 reg: Consistently use 'hkey' for HKEY variables. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/add.c | 18 +++++++++--------- programs/reg/delete.c | 16 ++++++++-------- programs/reg/export.c | 8 ++++---- programs/reg/query.c | 26 +++++++++++++------------- 4 files changed, 34 insertions(+), 34 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c809f9462455ffb0e03a…

1 0

Hugh McMaster : reg: Only print the name of the registry key if it contains values or we are recursing.
by Alexandre Julliard April 28, 2021

April 28, 2021

Module: wine Branch: master Commit: ec0a799ea8884479d7b56b81fb9fdd106f1a751b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec0a799ea8884479d7b56b81… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Apr 28 19:19:30 2021 +1000 reg: Only print the name of the registry key if it contains values or we are recursing. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/query.c | 14 ++++++++++---- programs/reg/tests/query.c | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/programs/reg/query.c b/programs/reg/query.c index efcd16f8ad5..4af6c7f5449 100644 --- a/programs/reg/query.c +++ b/programs/reg/query.c @@ -210,9 +210,10 @@ static int query_value(HKEY hkey, WCHAR *value_name, WCHAR *path, BOOL recurse) return 0; } -static int query_all(HKEY hkey, WCHAR *path, BOOL recurse) +static int query_all(HKEY hkey, WCHAR *path, BOOL recurse, BOOL recursing) { LONG rc; + DWORD num_values; DWORD max_value_len = 256, value_len; DWORD max_data_bytes = 2048, data_size; DWORD subkey_len; @@ -221,7 +222,12 @@ static int query_all(HKEY hkey, WCHAR *path, BOOL recurse) BYTE *data; HKEY subkey; - output_string(L"%1\n", path); + rc = RegQueryInfoKeyW(hkey, NULL, NULL, NULL, NULL, NULL, NULL, + &num_values, NULL, NULL, NULL, NULL); + if (rc) return 1; + + if (num_values || recursing) + output_string(L"%1\n", path); value_name = malloc(max_value_len * sizeof(WCHAR)); data = malloc(max_data_bytes); @@ -275,7 +281,7 @@ static int query_all(HKEY hkey, WCHAR *path, BOOL recurse) subkey_path = build_subkey_path(path, path_len, subkey_name, subkey_len); if (!RegOpenKeyExW(hkey, subkey_name, 0, KEY_READ, &subkey)) { - query_all(subkey, subkey_path, recurse); + query_all(subkey, subkey_path, recurse, TRUE); RegCloseKey(subkey); } free(subkey_path); @@ -311,7 +317,7 @@ static int run_query(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, output_message(STRING_MATCHES_FOUND, num_values_found); } else - ret = query_all(hkey, key_name, recurse); + ret = query_all(hkey, key_name, recurse, FALSE); RegCloseKey(hkey); diff --git a/programs/reg/tests/query.c b/programs/reg/tests/query.c index a8720da8da1..4ccbab58cb8 100644 --- a/programs/reg/tests/query.c +++ b/programs/reg/tests/query.c @@ -282,7 +282,7 @@ static void test_query(void) read_reg_output("reg query HKCU\\" KEY_BASE, buf, sizeof(buf), &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - compare_query(buf, test8a, FALSE, TODO_REG_COMPARE); + compare_query(buf, test8a, FALSE, 0); read_reg_output("reg query HKCU\\" KEY_BASE " /s", buf, sizeof(buf), &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);

1 0

Hugh McMaster : reg: Do not print a line break after querying a registry key.
by Alexandre Julliard April 28, 2021

April 28, 2021

Module: wine Branch: master Commit: f32816268ed5715c5bce20daf9bb20aa194a7127 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f32816268ed5715c5bce20da… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Apr 28 19:19:29 2021 +1000 reg: Do not print a line break after querying a registry key. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/query.c | 4 ---- programs/reg/tests/query.c | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/programs/reg/query.c b/programs/reg/query.c index 6485d36db6f..efcd16f8ad5 100644 --- a/programs/reg/query.c +++ b/programs/reg/query.c @@ -287,10 +287,6 @@ static int query_all(HKEY hkey, WCHAR *path, BOOL recurse) } free(subkey_name); - - if (i && !recurse) - output_string(newlineW); - return 0; } diff --git a/programs/reg/tests/query.c b/programs/reg/tests/query.c index 34196c77aa4..a8720da8da1 100644 --- a/programs/reg/tests/query.c +++ b/programs/reg/tests/query.c @@ -225,7 +225,7 @@ static void test_query(void) read_reg_output("reg query HKCU\\" KEY_BASE, buf, sizeof(buf), &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - compare_query(buf, test3, FALSE, TODO_REG_COMPARE); + compare_query(buf, test3, FALSE, 0); add_value(subkey, "Test3", REG_SZ, "Some string data", 16); dword = 0xabc;

1 0

Zhiyi Zhang : comctl32: Repaint after the WM_THEMECHANGED message is received.
by Alexandre Julliard April 28, 2021

April 28, 2021

Module: wine Branch: master Commit: 6576d461b8b6e02e0306929fc86defec65922ed9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6576d461b8b6e02e0306929f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Apr 27 11:35:01 2021 +0800 comctl32: Repaint after the WM_THEMECHANGED message is received. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 1 + dlls/comctl32/combo.c | 1 + dlls/comctl32/datetime.c | 1 + dlls/comctl32/edit.c | 1 + dlls/comctl32/header.c | 2 +- dlls/comctl32/ipaddress.c | 1 + dlls/comctl32/listbox.c | 1 + dlls/comctl32/listview.c | 1 + dlls/comctl32/monthcal.c | 1 + dlls/comctl32/pager.c | 9 +++++++++ dlls/comctl32/progress.c | 2 +- dlls/comctl32/static.c | 4 ++++ dlls/comctl32/status.c | 1 + dlls/comctl32/tab.c | 1 + dlls/comctl32/tests/misc.c | 36 ++++++++++++++++++------------------ dlls/comctl32/theme_scrollbar.c | 1 + dlls/comctl32/toolbar.c | 1 + dlls/comctl32/trackbar.c | 1 + dlls/comctl32/treeview.c | 1 + dlls/comctl32/updown.c | 2 +- 20 files changed, 48 insertions(+), 21 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6576d461b8b6e02e0306…

1 0

Zhiyi Zhang : comctl32/tests: Test that WM_THEMECHANGED should invalidate client area.
by Alexandre Julliard April 28, 2021

April 28, 2021

Module: wine Branch: master Commit: a9eaf7a7da2bbca5e2c69481f9a5c14e738144fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9eaf7a7da2bbca5e2c69481… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Apr 27 11:34:51 2021 +0800 comctl32/tests: Test that WM_THEMECHANGED should invalidate client area. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/misc.c | 206 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 205 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index a3ba2028873..f4fcb300bb2 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -24,6 +24,7 @@ #include "wine/test.h" #include "v6util.h" +#include "msg.h" static PVOID (WINAPI * pAlloc)(LONG); static PVOID (WINAPI * pReAlloc)(PVOID, LONG); @@ -35,8 +36,21 @@ static BOOL (WINAPI * pStr_SetPtrA)(LPSTR, LPCSTR); static INT (WINAPI * pStr_GetPtrW)(LPCWSTR, LPWSTR, INT); static BOOL (WINAPI * pStr_SetPtrW)(LPWSTR, LPCWSTR); +static BOOL (WINAPI *pSetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR); +static BOOL (WINAPI *pRemoveWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR); +static LRESULT (WINAPI *pDefSubclassProc)(HWND, UINT, WPARAM, LPARAM); + static HMODULE hComctl32 = 0; +/* For message tests */ +enum seq_index +{ + CHILD_SEQ_INDEX, + NUM_MSG_SEQUENCES +}; + +static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; + static char testicon_data[] = { 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x02, 0x00, 0x00, 0x01, 0x00, @@ -79,6 +93,40 @@ static BOOL InitFunctionPtrs(void) return TRUE; } +static BOOL init_functions_v6(void) +{ + hComctl32 = LoadLibraryA("comctl32.dll"); + if (!hComctl32) + { + trace("Could not load comctl32.dll version 6\n"); + return FALSE; + } + + COMCTL32_GET_PROC(410, SetWindowSubclass) + COMCTL32_GET_PROC(412, RemoveWindowSubclass) + COMCTL32_GET_PROC(413, DefSubclassProc) + + return TRUE; +} + +/* try to make sure pending X events have been processed before continuing */ +static void flush_events(void) +{ + MSG msg; + int diff = 200; + int min_timeout = 100; + DWORD time = GetTickCount() + diff; + + while (diff > 0) + { + if (MsgWaitForMultipleObjects(0, NULL, FALSE, min_timeout, QS_ALLINPUT) == WAIT_TIMEOUT) + break; + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + DispatchMessageA(&msg); + diff = time - GetTickCount(); + } +} + static void test_GetPtrAW(void) { if (pStr_GetPtrA) @@ -406,6 +454,156 @@ static void test_comctl32_classes(BOOL v6) check_class("SysLink", v6, CS_GLOBALCLASS, 0, FALSE); } +struct wm_themechanged_test +{ + const char *class; + const struct message *expected_msg; + int ignored_msg_count; + DWORD ignored_msgs[16]; + BOOL todo; +}; + +static BOOL ignore_message(UINT msg) +{ + /* these are always ignored */ + return (msg >= 0xc000 || + msg == WM_GETICON || + msg == WM_GETOBJECT || + msg == WM_TIMECHANGE || + msg == WM_DISPLAYCHANGE || + msg == WM_DEVICECHANGE || + msg == WM_DWMNCRENDERINGCHANGED || + msg == WM_WININICHANGE || + msg == WM_CHILDACTIVATE); +} + +static LRESULT CALLBACK test_wm_themechanged_proc(HWND hwnd, UINT message, WPARAM wParam, + LPARAM lParam, UINT_PTR id, DWORD_PTR ref_data) +{ + const struct wm_themechanged_test *test = (const struct wm_themechanged_test *)ref_data; + static int defwndproc_counter = 0; + struct message msg = {0}; + LRESULT ret; + int i; + + if (ignore_message(message)) + return pDefSubclassProc(hwnd, message, wParam, lParam); + + /* Extra messages to be ignored for a test case */ + for (i = 0; i < test->ignored_msg_count; ++i) + { + if (message == test->ignored_msgs[i]) + return pDefSubclassProc(hwnd, message, wParam, lParam); + } + + msg.message = message; + msg.flags = sent | wparam | lparam; + if (defwndproc_counter) + msg.flags |= defwinproc; + msg.wParam = wParam; + msg.lParam = lParam; + add_message(sequences, CHILD_SEQ_INDEX, &msg); + + if (message == WM_NCDESTROY) + pRemoveWindowSubclass(hwnd, test_wm_themechanged_proc, 0); + + ++defwndproc_counter; + ret = pDefSubclassProc(hwnd, message, wParam, lParam); + --defwndproc_counter; + + return ret; +} + +static HWND create_control(const char *class, DWORD style, HWND parent, DWORD_PTR data) +{ + HWND hwnd; + + if (parent) + style |= WS_CHILD; + hwnd = CreateWindowExA(0, class, "test", style, 0, 0, 50, 20, parent, 0, 0, NULL); + ok(!!hwnd, "Failed to create %s style %#x parent %p\n", class, style, parent); + pSetWindowSubclass(hwnd, test_wm_themechanged_proc, 0, data); + return hwnd; +} + +static const struct message wm_themechanged_paint_erase_seq[] = +{ + {WM_THEMECHANGED, sent | wparam | lparam}, + {WM_PAINT, sent | wparam | lparam}, + {WM_ERASEBKGND, sent | defwinproc}, + {0}, +}; + +static const struct message wm_themechanged_paint_seq[] = +{ + {WM_THEMECHANGED, sent | wparam | lparam}, + {WM_PAINT, sent | wparam | lparam}, + {0}, +}; + +static const struct message wm_themechanged_no_paint_seq[] = +{ + {WM_THEMECHANGED, sent | wparam | lparam}, + {0}, +}; + +static void test_WM_THEMECHANGED(void) +{ + HWND parent, child; + char buffer[64]; + int i; + + static const struct wm_themechanged_test tests[] = + { + {ANIMATE_CLASSA, wm_themechanged_no_paint_seq}, + {WC_BUTTONA, wm_themechanged_paint_erase_seq, 2, {WM_GETTEXT, WM_GETTEXTLENGTH}, TRUE}, + {WC_COMBOBOXA, wm_themechanged_paint_erase_seq, 1, {WM_CTLCOLOREDIT}, TRUE}, + {WC_COMBOBOXEXA, wm_themechanged_no_paint_seq}, + {DATETIMEPICK_CLASSA, wm_themechanged_paint_erase_seq, 0, {0}, TRUE}, + {WC_EDITA, wm_themechanged_paint_erase_seq, 7, {WM_GETTEXTLENGTH, WM_GETFONT, EM_GETSEL, EM_GETRECT, EM_CHARFROMPOS, EM_LINEFROMCHAR, EM_POSFROMCHAR}, TRUE}, + {WC_HEADERA, wm_themechanged_paint_erase_seq, 0, {0}, TRUE}, + {HOTKEY_CLASSA, wm_themechanged_no_paint_seq}, + {WC_IPADDRESSA, wm_themechanged_paint_erase_seq, 1, {WM_CTLCOLOREDIT}, TRUE}, + {WC_LISTBOXA, wm_themechanged_paint_erase_seq, 0, {0}, TRUE}, + {WC_LISTVIEWA, wm_themechanged_paint_erase_seq, 0, {0}, TRUE}, + {MONTHCAL_CLASSA, wm_themechanged_paint_erase_seq, 0, {0}, TRUE}, + {WC_NATIVEFONTCTLA, wm_themechanged_no_paint_seq}, + {WC_PAGESCROLLERA, wm_themechanged_paint_erase_seq, 0, {0}, TRUE}, + {PROGRESS_CLASSA, wm_themechanged_paint_erase_seq, 3, {WM_STYLECHANGING, WM_STYLECHANGED, WM_NCPAINT}, TRUE}, + {REBARCLASSNAMEA, wm_themechanged_no_paint_seq, 1, {WM_WINDOWPOSCHANGING}}, + {WC_STATICA, wm_themechanged_paint_erase_seq, 2, {WM_GETTEXT, WM_GETTEXTLENGTH}, TRUE}, + {STATUSCLASSNAMEA, wm_themechanged_paint_erase_seq, 0, {0}, TRUE}, + {"SysLink", wm_themechanged_no_paint_seq}, + {WC_TABCONTROLA, wm_themechanged_paint_erase_seq, 0, {0}, TRUE}, + {TOOLBARCLASSNAMEA, wm_themechanged_paint_erase_seq, 1, {WM_WINDOWPOSCHANGING}, TRUE}, + {TOOLTIPS_CLASSA, wm_themechanged_no_paint_seq}, + {TRACKBAR_CLASSA, wm_themechanged_paint_seq, 0, {0}, TRUE}, + {WC_TREEVIEWA, wm_themechanged_paint_erase_seq, 1, {0x1128}, TRUE}, + {UPDOWN_CLASSA, wm_themechanged_paint_erase_seq, 0, {0}, TRUE}, + {WC_SCROLLBARA, wm_themechanged_paint_erase_seq, 1, {SBM_GETSCROLLINFO}, TRUE}, + }; + + parent = CreateWindowExA(0, WC_STATICA, "parent", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, 100, + 200, 200, 0, 0, 0, NULL); + ok(!!parent, "Failed to create parent window\n"); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + child = create_control(tests[i].class, WS_VISIBLE, parent, (DWORD_PTR)&tests[i]); + flush_events(); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + SendMessageW(child, WM_THEMECHANGED, 0, 0); + flush_events(); + + sprintf(buffer, "Test %d class %s WM_THEMECHANGED", i, tests[i].class); + ok_sequence(sequences, CHILD_SEQ_INDEX, tests[i].expected_msg, buffer, tests[i].todo); + DestroyWindow(child); + } + + DestroyWindow(parent); +} + START_TEST(misc) { ULONG_PTR ctx_cookie; @@ -416,15 +614,21 @@ START_TEST(misc) test_GetPtrAW(); test_Alloc(); - test_comctl32_classes(FALSE); + FreeLibrary(hComctl32); + if (!load_v6_module(&ctx_cookie, &hCtx)) return; + if(!init_functions_v6()) + return; + init_msg_sequences(sequences, NUM_MSG_SEQUENCES); test_comctl32_classes(TRUE); test_builtin_classes(); test_LoadIconWithScaleDown(); + test_WM_THEMECHANGED(); unload_v6_module(ctx_cookie, hCtx); + FreeLibrary(hComctl32); }

1 0

Zhiyi Zhang : comctl32/test: Test that WM_SYSCOLORCHANGE should always be passed to the dialog procedure.
by Alexandre Julliard April 28, 2021

April 28, 2021

Module: wine Branch: master Commit: 00e1664b0b23e01eccfa63c001e71dd5801882a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00e1664b0b23e01eccfa63c0… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Apr 27 11:35:18 2021 +0800 comctl32/test: Test that WM_SYSCOLORCHANGE should always be passed to the dialog procedure. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/misc.c | 59 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 58 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 15ff3b2d099..ccbda7aebeb 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -21,6 +21,7 @@ #include <stdio.h> #include <windows.h> #include <commctrl.h> +#include <uxtheme.h> #include "wine/test.h" #include "v6util.h" @@ -39,8 +40,9 @@ static BOOL (WINAPI * pStr_SetPtrW)(LPWSTR, LPCWSTR); static BOOL (WINAPI *pSetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR); static BOOL (WINAPI *pRemoveWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR); static LRESULT (WINAPI *pDefSubclassProc)(HWND, UINT, WPARAM, LPARAM); +static BOOL (WINAPI *pIsThemeActive)(void); -static HMODULE hComctl32 = 0; +static HMODULE hComctl32, hUxtheme; /* For message tests */ enum seq_index @@ -106,6 +108,9 @@ static BOOL init_functions_v6(void) COMCTL32_GET_PROC(412, RemoveWindowSubclass) COMCTL32_GET_PROC(413, DefSubclassProc) + hUxtheme = LoadLibraryA("uxtheme.dll"); + pIsThemeActive = (void *)GetProcAddress(hUxtheme, "IsThemeActive"); + return TRUE; } @@ -604,6 +609,56 @@ static void test_WM_THEMECHANGED(void) DestroyWindow(parent); } +static const struct message wm_syscolorchange_seq[] = +{ + {WM_SYSCOLORCHANGE, sent | wparam | lparam}, + {0}, +}; + +static INT_PTR CALLBACK wm_syscolorchange_dlg_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + struct message msg = {0}; + + msg.message = message; + msg.flags = sent | wparam | lparam; + msg.wParam = wParam; + msg.lParam = lParam; + add_message(sequences, CHILD_SEQ_INDEX, &msg); + return FALSE; +} + +static void test_WM_SYSCOLORCHANGE(void) +{ + HWND parent, dialog; + BOOL todo; + struct + { + DLGTEMPLATE tmplate; + WORD menu; + WORD class; + WORD title; + } temp = {{0}}; + + parent = CreateWindowExA(0, WC_STATICA, "parent", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, 100, + 200, 200, 0, 0, 0, NULL); + ok(!!parent, "CreateWindowExA failed, error %d\n", GetLastError()); + + temp.tmplate.style = WS_CHILD | WS_VISIBLE; + temp.tmplate.cx = 50; + temp.tmplate.cy = 50; + dialog = CreateDialogIndirectParamA(NULL, &temp.tmplate, parent, wm_syscolorchange_dlg_proc, 0); + ok(!!dialog, "CreateDialogIndirectParamA failed, error %d\n", GetLastError()); + flush_events(); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + SendMessageW(dialog, WM_SYSCOLORCHANGE, 0, 0); + todo = pIsThemeActive && pIsThemeActive(); + ok_sequence(sequences, CHILD_SEQ_INDEX, wm_syscolorchange_seq, "test dialog WM_SYSCOLORCHANGE", todo); + + EndDialog(dialog, 0); + DestroyWindow(parent); +} + START_TEST(misc) { ULONG_PTR ctx_cookie; @@ -628,7 +683,9 @@ START_TEST(misc) test_builtin_classes(); test_LoadIconWithScaleDown(); test_WM_THEMECHANGED(); + test_WM_SYSCOLORCHANGE(); unload_v6_module(ctx_cookie, hCtx); FreeLibrary(hComctl32); + FreeLibrary(hUxtheme); }

1 0

Zhiyi Zhang : comctl32/theme_dialog: Pass the WM_SYSCOLORCHANGE message to the original dialog procedure.
by Alexandre Julliard April 28, 2021

April 28, 2021

Module: wine Branch: master Commit: 2de05267d76bf2a388ed7519b502c73f9e89537c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2de05267d76bf2a388ed7519… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Apr 27 11:35:28 2021 +0800 comctl32/theme_dialog: Pass the WM_SYSCOLORCHANGE message to the original dialog procedure. Even though themed dialog itself doesn't need to repaint after WM_SYSCOLORCHANGE is received, WM_SYSCOLORCHANGE should be passed to the original dialog procedure DefDlgProcW(), which can then forward WM_SYSCOLORCHANGE to its common controls and call COMCTL32_RefreshSysColors(). Fix wrong property sheet tab background color after winecfg disables theming. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44511 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/misc.c | 12 ++---------- dlls/comctl32/theme_dialog.c | 8 +------- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index ccbda7aebeb..eba7858d7b9 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -21,7 +21,6 @@ #include <stdio.h> #include <windows.h> #include <commctrl.h> -#include <uxtheme.h> #include "wine/test.h" #include "v6util.h" @@ -40,9 +39,8 @@ static BOOL (WINAPI * pStr_SetPtrW)(LPWSTR, LPCWSTR); static BOOL (WINAPI *pSetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR); static BOOL (WINAPI *pRemoveWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR); static LRESULT (WINAPI *pDefSubclassProc)(HWND, UINT, WPARAM, LPARAM); -static BOOL (WINAPI *pIsThemeActive)(void); -static HMODULE hComctl32, hUxtheme; +static HMODULE hComctl32; /* For message tests */ enum seq_index @@ -108,9 +106,6 @@ static BOOL init_functions_v6(void) COMCTL32_GET_PROC(412, RemoveWindowSubclass) COMCTL32_GET_PROC(413, DefSubclassProc) - hUxtheme = LoadLibraryA("uxtheme.dll"); - pIsThemeActive = (void *)GetProcAddress(hUxtheme, "IsThemeActive"); - return TRUE; } @@ -630,7 +625,6 @@ static INT_PTR CALLBACK wm_syscolorchange_dlg_proc(HWND hwnd, UINT message, WPAR static void test_WM_SYSCOLORCHANGE(void) { HWND parent, dialog; - BOOL todo; struct { DLGTEMPLATE tmplate; @@ -652,8 +646,7 @@ static void test_WM_SYSCOLORCHANGE(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); SendMessageW(dialog, WM_SYSCOLORCHANGE, 0, 0); - todo = pIsThemeActive && pIsThemeActive(); - ok_sequence(sequences, CHILD_SEQ_INDEX, wm_syscolorchange_seq, "test dialog WM_SYSCOLORCHANGE", todo); + ok_sequence(sequences, CHILD_SEQ_INDEX, wm_syscolorchange_seq, "test dialog WM_SYSCOLORCHANGE", FALSE); EndDialog(dialog, 0); DestroyWindow(parent); @@ -687,5 +680,4 @@ START_TEST(misc) unload_v6_module(ctx_cookie, hCtx); FreeLibrary(hComctl32); - FreeLibrary(hUxtheme); } diff --git a/dlls/comctl32/theme_dialog.c b/dlls/comctl32/theme_dialog.c index 29007ba5c60..0f7835ae32f 100644 --- a/dlls/comctl32/theme_dialog.c +++ b/dlls/comctl32/theme_dialog.c @@ -63,13 +63,7 @@ LRESULT CALLBACK THEMING_DialogSubclassProc (HWND hWnd, UINT msg, OpenThemeData( hWnd, themeClass ); InvalidateRect( hWnd, NULL, TRUE ); return 0; - - case WM_SYSCOLORCHANGE: - if (!doTheming) return THEMING_CallOriginalClass (hWnd, msg, wParam, lParam); - /* Do nothing. When themed, a WM_THEMECHANGED will be received, too, - * which will do the repaint. */ - break; - + case WM_ERASEBKGND: if (!doTheming) return THEMING_CallOriginalClass (hWnd, msg, wParam, lParam); {

1 0