- Wine-Devel - list.winehq.org

[PATCH 5/5] uxtheme: Do not change system metrics in EnableTheming().
by Zhiyi Zhang Sept. 21, 2021

Sept. 21, 2021

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/system.c | 2 -- dlls/uxtheme/tests/system.c | 5 ----- 2 files changed, 7 deletions(-) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 193e8f80538..18b93435e4c 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -576,8 +576,6 @@ HRESULT WINAPI EnableTheming(BOOL fEnable) if (bThemeActive && !fEnable) { - UXTHEME_RestoreSystemMetrics(); - UXTHEME_SaveSystemMetrics (); bThemeActive = fEnable; if(!RegOpenKeyW(HKEY_CURRENT_USER, szThemeManager, &hKey)) { RegSetValueExW(hKey, L"ThemeActive", 0, REG_SZ, (BYTE *)L"0", 2 * sizeof(WCHAR)); diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 3d85bffeaf7..f56c3d2c273 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -1195,7 +1195,6 @@ static void test_EnableTheming(void) size = sizeof(color_string); ls = RegQueryValueExW(hkey, L"Scrollbar", NULL, NULL, (BYTE *)color_string, &size); ok(!ls, "RegQueryValueExW failed, ls %#x.\n", ls); - todo_wine ok(!lstrcmpW(color_string, new_color_string), "Expected %s, got %s.\n", wine_dbgstr_w(new_color_string), wine_dbgstr_w(color_string)); @@ -1204,7 +1203,6 @@ static void test_EnableTheming(void) ok(flat_menu == new_flat_menu, "Expected %d, got %d.\n", new_flat_menu, flat_menu); ret = SystemParametersInfoW(SPI_GETGRADIENTCAPTIONS, 0, &gradient_caption, 0); ok(ret, "SystemParametersInfoW failed, error %u.\n", GetLastError()); - todo_wine ok(gradient_caption == new_gradient_caption, "Expected %d, got %d.\n", new_gradient_caption, gradient_caption); @@ -1212,13 +1210,11 @@ static void test_EnableTheming(void) ncm.cbSize = FIELD_OFFSET(NONCLIENTMETRICSW, iPaddedBorderWidth); ret = SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof(ncm), &ncm, 0); ok(ret, "SystemParametersInfoW failed, error %u.\n", GetLastError()); - todo_wine ok(!memcmp(&ncm, &new_ncm, sizeof(ncm)), "Expected non-client metrics unchanged.\n"); memset(&logfont, 0, sizeof(logfont)); ret = SystemParametersInfoW(SPI_GETICONTITLELOGFONT, sizeof(logfont), &logfont, 0); ok(ret, "SystemParametersInfoW failed, error %u.\n", GetLastError()); - todo_wine ok(!memcmp(&logfont, &new_logfont, sizeof(logfont)), "Expected icon title font unchanged.\n"); @@ -1226,7 +1222,6 @@ static void test_EnableTheming(void) hr = EnableTheming(TRUE); ok(hr == S_OK, "EnableTheming failed, hr %#x.\n", hr); is_theme_active = IsThemeActive(); - todo_wine ok(!is_theme_active || broken(is_theme_active), /* Win8+ can no longer disable theming */ "Expected theming inactive.\n"); -- 2.30.2

1 0

[PATCH 4/5] uxtheme: Disallow EnableTheming() to enable theming.
by Zhiyi Zhang Sept. 21, 2021

Sept. 21, 2021

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/system.c | 12 ++++-------- dlls/uxtheme/tests/system.c | 1 - 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 8ced977c267..193e8f80538 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -571,20 +571,16 @@ BOOL WINAPI IsCompositionActive(void) HRESULT WINAPI EnableTheming(BOOL fEnable) { HKEY hKey; - WCHAR szEnabled[] = L"0"; TRACE("(%d)\n", fEnable); - if(fEnable != bThemeActive) { - if(fEnable) - UXTHEME_BackupSystemMetrics(); - else - UXTHEME_RestoreSystemMetrics(); + if (bThemeActive && !fEnable) + { + UXTHEME_RestoreSystemMetrics(); UXTHEME_SaveSystemMetrics (); bThemeActive = fEnable; - if(bThemeActive) szEnabled[0] = '1'; if(!RegOpenKeyW(HKEY_CURRENT_USER, szThemeManager, &hKey)) { - RegSetValueExW(hKey, L"ThemeActive", 0, REG_SZ, (BYTE*)szEnabled, sizeof(WCHAR)); + RegSetValueExW(hKey, L"ThemeActive", 0, REG_SZ, (BYTE *)L"0", 2 * sizeof(WCHAR)); RegCloseKey(hKey); } UXTHEME_broadcast_msg (NULL, WM_THEMECHANGED); diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index a4ace2adfd3..3d85bffeaf7 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -1260,7 +1260,6 @@ static void test_EnableTheming(void) hr = EnableTheming(TRUE); ok(hr == S_OK, "EnableTheming failed, hr %#x.\n", hr); - todo_wine ok(!IsThemeActive(), "Expected theming inactive.\n"); hr = EnableTheming(FALSE); -- 2.30.2

1 0

[PATCH 3/5] uxtheme/tests: Add EnableTheming() tests.
by Zhiyi Zhang Sept. 21, 2021

Sept. 21, 2021

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/tests/Makefile.in | 2 +- dlls/uxtheme/tests/system.c | 173 +++++++++++++++++++++++++++++++++ 2 files changed, 174 insertions(+), 1 deletion(-) diff --git a/dlls/uxtheme/tests/Makefile.in b/dlls/uxtheme/tests/Makefile.in index 42bdcfaa365..3fd3c23f5d8 100644 --- a/dlls/uxtheme/tests/Makefile.in +++ b/dlls/uxtheme/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = uxtheme.dll -IMPORTS = user32 gdi32 uxtheme +IMPORTS = advapi32 user32 gdi32 uxtheme C_SRCS = \ system.c diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index b088a7a050e..a4ace2adfd3 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -1099,6 +1099,176 @@ done: pSetThreadDpiAwarenessContext(old_context); } +static void test_EnableTheming(void) +{ + WCHAR old_color_string[13], new_color_string[13], color_string[13]; + BOOL old_gradient_caption, new_gradient_caption, gradient_caption; + BOOL old_flat_menu, new_flat_menu, flat_menu; + LOGFONTW old_logfont, new_logfont, logfont; + NONCLIENTMETRICSW old_ncm, new_ncm, ncm; + DPI_AWARENESS_CONTEXT old_context = 0; + COLORREF old_color, new_color; + BOOL is_theme_active, ret; + DWORD size, length; + HRESULT hr; + LSTATUS ls; + HKEY hkey; + + if (IsThemeActive()) + { + hr = EnableTheming(TRUE); + ok(hr == S_OK, "EnableTheming failed, hr %#x.\n", hr); + ok(IsThemeActive(), "Expected theming active.\n"); + + /* Only run in interactive mode because once theming is disabled, it can't be turned back on + * via EnableTheming() */ + if (winetest_interactive) + { + if (pSetThreadDpiAwarenessContext) + { + old_context = pSetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE); + } + else if (get_primary_monitor_effective_dpi() != 96) + { + skip("DPI isn't 96, skipping.\n"); + return; + } + + /* Read current system metrics */ + old_color = GetSysColor(COLOR_SCROLLBAR); + swprintf(old_color_string, ARRAY_SIZE(old_color_string), L"%d %d %d", + GetRValue(old_color), GetGValue(old_color), GetBValue(old_color)); + + memset(&old_ncm, 0, sizeof(old_ncm)); + old_ncm.cbSize = FIELD_OFFSET(NONCLIENTMETRICSW, iPaddedBorderWidth); + ret = SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof(old_ncm), &old_ncm, 0); + ok(ret, "SystemParametersInfoW failed, error %u.\n", GetLastError()); + + memset(&old_logfont, 0, sizeof(old_logfont)); + ret = SystemParametersInfoW(SPI_GETICONTITLELOGFONT, sizeof(old_logfont), &old_logfont, 0); + ok(ret, "SystemParametersInfoW failed, error %u.\n", GetLastError()); + ret = SystemParametersInfoW(SPI_GETFLATMENU, 0, &old_flat_menu, 0); + ok(ret, "SystemParametersInfoW failed, error %u.\n", GetLastError()); + ret = SystemParametersInfoW(SPI_GETGRADIENTCAPTIONS, 0, &old_gradient_caption, 0); + ok(ret, "SystemParametersInfoW failed, error %u.\n", GetLastError()); + + /* Write new system metrics to the registry */ + new_color = ~old_color; + new_flat_menu = !old_flat_menu; + new_gradient_caption = !old_gradient_caption; + memcpy(&new_ncm, &old_ncm, sizeof(new_ncm)); + new_ncm.iScrollWidth += 5; + memcpy(&new_logfont, &old_logfont, sizeof(new_logfont)); + new_logfont.lfWidth += 5; + + ls = RegOpenKeyExW(HKEY_CURRENT_USER, L"Control Panel\\Colors", 0, KEY_ALL_ACCESS, + &hkey); + ok(!ls, "RegOpenKeyExW failed, ls %#x.\n", ls); + + length = swprintf(new_color_string, ARRAY_SIZE(new_color_string), L"%d %d %d", + GetRValue(new_color), GetGValue(new_color), GetBValue(new_color)); + ls = RegSetValueExW(hkey, L"Scrollbar", 0, REG_SZ, (BYTE *)new_color_string, + (length + 1) * sizeof(WCHAR)); + ok(!ls, "RegSetValueExW failed, ls %#x.\n", ls); + + ret = SystemParametersInfoW(SPI_SETNONCLIENTMETRICS, sizeof(new_ncm), &new_ncm, + SPIF_UPDATEINIFILE); + ok(ret, "SystemParametersInfoW failed, error %u.\n", GetLastError()); + ret = SystemParametersInfoW(SPI_SETICONTITLELOGFONT, sizeof(new_logfont), &new_logfont, + SPIF_UPDATEINIFILE); + ok(ret, "SystemParametersInfoW failed, error %u.\n", GetLastError()); + ret = SystemParametersInfoW(SPI_SETFLATMENU, 0, (void *)(INT_PTR)new_flat_menu, + SPIF_UPDATEINIFILE); + ok(ret, "SystemParametersInfoW failed, error %u.\n", GetLastError()); + ret = SystemParametersInfoW(SPI_SETGRADIENTCAPTIONS, 0, + (void *)(INT_PTR)new_gradient_caption, SPIF_UPDATEINIFILE); + ok(ret, "SystemParametersInfoW failed, error %u.\n", GetLastError()); + + /* Change theming state */ + hr = EnableTheming(FALSE); + ok(hr == S_OK, "EnableTheming failed, hr %#x.\n", hr); + is_theme_active = IsThemeActive(); + ok(!is_theme_active || broken(is_theme_active), /* Win8+ can no longer disable theming */ + "Expected theming inactive.\n"); + + /* Test that system metrics are unchanged */ + size = sizeof(color_string); + ls = RegQueryValueExW(hkey, L"Scrollbar", NULL, NULL, (BYTE *)color_string, &size); + ok(!ls, "RegQueryValueExW failed, ls %#x.\n", ls); + todo_wine + ok(!lstrcmpW(color_string, new_color_string), "Expected %s, got %s.\n", + wine_dbgstr_w(new_color_string), wine_dbgstr_w(color_string)); + + ret = SystemParametersInfoW(SPI_GETFLATMENU, 0, &flat_menu, 0); + ok(ret, "SystemParametersInfoW failed, error %u.\n", GetLastError()); + ok(flat_menu == new_flat_menu, "Expected %d, got %d.\n", new_flat_menu, flat_menu); + ret = SystemParametersInfoW(SPI_GETGRADIENTCAPTIONS, 0, &gradient_caption, 0); + ok(ret, "SystemParametersInfoW failed, error %u.\n", GetLastError()); + todo_wine + ok(gradient_caption == new_gradient_caption, "Expected %d, got %d.\n", + new_gradient_caption, gradient_caption); + + memset(&ncm, 0, sizeof(ncm)); + ncm.cbSize = FIELD_OFFSET(NONCLIENTMETRICSW, iPaddedBorderWidth); + ret = SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof(ncm), &ncm, 0); + ok(ret, "SystemParametersInfoW failed, error %u.\n", GetLastError()); + todo_wine + ok(!memcmp(&ncm, &new_ncm, sizeof(ncm)), "Expected non-client metrics unchanged.\n"); + + memset(&logfont, 0, sizeof(logfont)); + ret = SystemParametersInfoW(SPI_GETICONTITLELOGFONT, sizeof(logfont), &logfont, 0); + ok(ret, "SystemParametersInfoW failed, error %u.\n", GetLastError()); + todo_wine + ok(!memcmp(&logfont, &new_logfont, sizeof(logfont)), + "Expected icon title font unchanged.\n"); + + /* Test that theming cannot be turned on via EnableTheming() */ + hr = EnableTheming(TRUE); + ok(hr == S_OK, "EnableTheming failed, hr %#x.\n", hr); + is_theme_active = IsThemeActive(); + todo_wine + ok(!is_theme_active || broken(is_theme_active), /* Win8+ can no longer disable theming */ + "Expected theming inactive.\n"); + + /* Restore system metrics */ + ls = RegSetValueExW(hkey, L"Scrollbar", 0, REG_SZ, (BYTE *)old_color_string, + (lstrlenW(old_color_string) + 1) * sizeof(WCHAR)); + ok(!ls, "RegSetValueExW failed, ls %#x.\n", ls); + ret = SystemParametersInfoW(SPI_SETFLATMENU, 0, (void *)(INT_PTR)old_flat_menu, + SPIF_UPDATEINIFILE); + ok(ret, "SystemParametersInfoW failed, error %u.\n", GetLastError()); + ret = SystemParametersInfoW(SPI_SETGRADIENTCAPTIONS, 0, + (void *)(INT_PTR)old_gradient_caption, SPIF_UPDATEINIFILE); + ok(ret, "SystemParametersInfoW failed, error %u.\n", GetLastError()); + ret = SystemParametersInfoW(SPI_SETNONCLIENTMETRICS, sizeof(old_ncm), &old_ncm, + SPIF_UPDATEINIFILE); + ok(ret, "SystemParametersInfoW failed, error %u.\n", GetLastError()); + ret = SystemParametersInfoW(SPI_SETICONTITLELOGFONT, sizeof(old_logfont), &old_logfont, + SPIF_UPDATEINIFILE); + ok(ret, "SystemParametersInfoW failed, error %u.\n", GetLastError()); + + RegCloseKey(hkey); + if (pSetThreadDpiAwarenessContext) + pSetThreadDpiAwarenessContext(old_context); + } + } + else + { + hr = EnableTheming(FALSE); + ok(hr == S_OK, "EnableTheming failed, hr %#x.\n", hr); + ok(!IsThemeActive(), "Expected theming inactive.\n"); + + hr = EnableTheming(TRUE); + ok(hr == S_OK, "EnableTheming failed, hr %#x.\n", hr); + todo_wine + ok(!IsThemeActive(), "Expected theming inactive.\n"); + + hr = EnableTheming(FALSE); + ok(hr == S_OK, "EnableTheming failed, hr %#x.\n", hr); + ok(!IsThemeActive(), "Expected theming inactive.\n"); + } +} + START_TEST(system) { init_funcs(); @@ -1118,4 +1288,7 @@ START_TEST(system) test_GetThemePartSize(); test_CloseThemeData(); test_buffered_paint(); + + /* Test EnableTheming() in the end because it may disable theming */ + test_EnableTheming(); } -- 2.30.2

1 0

[PATCH 2/5] uxtheme: Initialize system metrics in 96 DPI.
by Zhiyi Zhang Sept. 21, 2021

Sept. 21, 2021

Similar to 7290db3. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/msstyles.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index 7356f6ea354..f129d998d65 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -733,12 +733,18 @@ struct PARSENONCLIENTSTATE static inline void parse_init_nonclient (struct PARSENONCLIENTSTATE* state) { + DPI_AWARENESS_CONTEXT old_context; + + old_context = SetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_UNAWARE); + memset (state, 0, sizeof (*state)); state->metrics.cbSize = sizeof (NONCLIENTMETRICSW); SystemParametersInfoW (SPI_GETNONCLIENTMETRICS, sizeof (NONCLIENTMETRICSW), &state->metrics, 0); SystemParametersInfoW (SPI_GETICONTITLELOGFONT, sizeof (LOGFONTW), &state->iconTitleFont, 0); + + SetThreadDpiAwarenessContext(old_context); } static BOOL parse_handle_nonclient_font (struct PARSENONCLIENTSTATE* state, -- 2.30.2

1 0

[PATCH 1/5] uxtheme: Use wide character string literals.
by Zhiyi Zhang Sept. 21, 2021

Sept. 21, 2021

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/system.c | 87 +++++++++++++++++++++---------------------- 1 file changed, 43 insertions(+), 44 deletions(-) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index a467fc8b157..8ced977c267 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -199,39 +199,39 @@ static void UXTHEME_LoadTheme(void) /***********************************************************************/ -static const char * const SysColorsNames[] = +static const WCHAR * const SysColorsNames[] = { - "Scrollbar", /* COLOR_SCROLLBAR */ - "Background", /* COLOR_BACKGROUND */ - "ActiveTitle", /* COLOR_ACTIVECAPTION */ - "InactiveTitle", /* COLOR_INACTIVECAPTION */ - "Menu", /* COLOR_MENU */ - "Window", /* COLOR_WINDOW */ - "WindowFrame", /* COLOR_WINDOWFRAME */ - "MenuText", /* COLOR_MENUTEXT */ - "WindowText", /* COLOR_WINDOWTEXT */ - "TitleText", /* COLOR_CAPTIONTEXT */ - "ActiveBorder", /* COLOR_ACTIVEBORDER */ - "InactiveBorder", /* COLOR_INACTIVEBORDER */ - "AppWorkSpace", /* COLOR_APPWORKSPACE */ - "Hilight", /* COLOR_HIGHLIGHT */ - "HilightText", /* COLOR_HIGHLIGHTTEXT */ - "ButtonFace", /* COLOR_BTNFACE */ - "ButtonShadow", /* COLOR_BTNSHADOW */ - "GrayText", /* COLOR_GRAYTEXT */ - "ButtonText", /* COLOR_BTNTEXT */ - "InactiveTitleText", /* COLOR_INACTIVECAPTIONTEXT */ - "ButtonHilight", /* COLOR_BTNHIGHLIGHT */ - "ButtonDkShadow", /* COLOR_3DDKSHADOW */ - "ButtonLight", /* COLOR_3DLIGHT */ - "InfoText", /* COLOR_INFOTEXT */ - "InfoWindow", /* COLOR_INFOBK */ - "ButtonAlternateFace", /* COLOR_ALTERNATEBTNFACE */ - "HotTrackingColor", /* COLOR_HOTLIGHT */ - "GradientActiveTitle", /* COLOR_GRADIENTACTIVECAPTION */ - "GradientInactiveTitle", /* COLOR_GRADIENTINACTIVECAPTION */ - "MenuHilight", /* COLOR_MENUHILIGHT */ - "MenuBar", /* COLOR_MENUBAR */ + L"Scrollbar", /* COLOR_SCROLLBAR */ + L"Background", /* COLOR_BACKGROUND */ + L"ActiveTitle", /* COLOR_ACTIVECAPTION */ + L"InactiveTitle", /* COLOR_INACTIVECAPTION */ + L"Menu", /* COLOR_MENU */ + L"Window", /* COLOR_WINDOW */ + L"WindowFrame", /* COLOR_WINDOWFRAME */ + L"MenuText", /* COLOR_MENUTEXT */ + L"WindowText", /* COLOR_WINDOWTEXT */ + L"TitleText", /* COLOR_CAPTIONTEXT */ + L"ActiveBorder", /* COLOR_ACTIVEBORDER */ + L"InactiveBorder", /* COLOR_INACTIVEBORDER */ + L"AppWorkSpace", /* COLOR_APPWORKSPACE */ + L"Hilight", /* COLOR_HIGHLIGHT */ + L"HilightText", /* COLOR_HIGHLIGHTTEXT */ + L"ButtonFace", /* COLOR_BTNFACE */ + L"ButtonShadow", /* COLOR_BTNSHADOW */ + L"GrayText", /* COLOR_GRAYTEXT */ + L"ButtonText", /* COLOR_BTNTEXT */ + L"InactiveTitleText", /* COLOR_INACTIVECAPTIONTEXT */ + L"ButtonHilight", /* COLOR_BTNHIGHLIGHT */ + L"ButtonDkShadow", /* COLOR_3DDKSHADOW */ + L"ButtonLight", /* COLOR_3DLIGHT */ + L"InfoText", /* COLOR_INFOTEXT */ + L"InfoWindow", /* COLOR_INFOBK */ + L"ButtonAlternateFace", /* COLOR_ALTERNATEBTNFACE */ + L"HotTrackingColor", /* COLOR_HOTLIGHT */ + L"GradientActiveTitle", /* COLOR_GRADIENTACTIVECAPTION */ + L"GradientInactiveTitle", /* COLOR_GRADIENTINACTIVECAPTION */ + L"MenuHilight", /* COLOR_MENUHILIGHT */ + L"MenuBar", /* COLOR_MENUBAR */ }; static const WCHAR strColorKey[] = L"Control Panel\\Colors"; @@ -251,9 +251,9 @@ static const struct BackupSysParam static void save_sys_colors (HKEY baseKey) { - char colorStr[13]; + WCHAR colorStr[13]; HKEY hKey; - int i; + int i, length; if (RegCreateKeyExW( baseKey, strColorKey, 0, 0, 0, KEY_ALL_ACCESS, @@ -262,12 +262,11 @@ static void save_sys_colors (HKEY baseKey) for (i = 0; i < NUM_SYS_COLORS; i++) { COLORREF col = GetSysColor (i); - - sprintf (colorStr, "%d %d %d", - GetRValue (col), GetGValue (col), GetBValue (col)); - RegSetValueExA (hKey, SysColorsNames[i], 0, REG_SZ, - (BYTE*)colorStr, strlen (colorStr)+1); + length = swprintf(colorStr, ARRAY_SIZE(colorStr), L"%d %d %d", GetRValue(col), + GetGValue(col), GetBValue(col)); + RegSetValueExW(hKey, SysColorsNames[i], 0, REG_SZ, (BYTE *)colorStr, + (length + 1) * sizeof(WCHAR)); } RegCloseKey (hKey); } @@ -350,14 +349,14 @@ static void UXTHEME_RestoreSystemMetrics(void) for (i = 0; i < NUM_SYS_COLORS; i++) { DWORD type; - char colorStr[13]; + WCHAR colorStr[13]; DWORD count = sizeof(colorStr); - - if (RegQueryValueExA (colorKey, SysColorsNames[i], 0, - &type, (LPBYTE) colorStr, &count) == ERROR_SUCCESS) + + if (RegQueryValueExW(colorKey, SysColorsNames[i], 0, &type, (LPBYTE)colorStr, + &count) == ERROR_SUCCESS) { int r, g, b; - if (sscanf (colorStr, "%d %d %d", &r, &g, &b) == 3) + if (swscanf(colorStr, L"%d %d %d", &r, &g, &b) == 3) { sysColsIndices[sysColCount] = i; sysCols[sysColCount] = RGB(r, g, b); -- 2.30.2

1 0

[PATCH v3 1/2] kernel32/tests: Fix stack overflow by DefineDosDeviceW().
by Xu Wei Sept. 21, 2021

Sept. 21, 2021

Signed-off-by: Xu Wei <xuwei(a)uniontech.com> --- dlls/kernel32/tests/volume.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index cb35de6add1..2fe8c1995cf 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -111,6 +111,7 @@ static void test_dos_devices(void) { char buf[MAX_PATH], buf2[400]; char drivestr[3]; + WCHAR drivestrW[3]; HANDLE file; BOOL ret; @@ -185,6 +186,21 @@ static void test_dos_devices(void) ret = QueryDosDeviceA( drivestr, buf, sizeof(buf) ); ok(!ret, "expected failure\n"); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "got error %u\n", GetLastError()); + + SetLastError(0); + ret = DefineDosDeviceW( DDD_RAW_TARGET_PATH, drivestrW, NULL ); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got error %u\n", GetLastError()); + + SetLastError(0); + ret = DefineDosDeviceW( DDD_RAW_TARGET_PATH, NULL, drivestrW ); + ok(ret, "got error %u\n", GetLastError()); + + SetLastError(0); + DefineDosDeviceW( DDD_EXACT_MATCH_ON_REMOVE|DDD_RAW_TARGET_PATH|DDD_REMOVE_DEFINITION, + "{00000001-0000-0000-0000-4E6574446576}", + "\\Device\\{00000001-0000-0000-0000-4E6574446576}" ); + ok(ret, "got error %u\n", GetLastError()); } static void test_FindFirstVolume(void) -- 2.20.1

3 3

[PATCH 1/5] user32/tests: Fix test_listbox_messages() message sequences to support WinEvents.
by Connor McAdams Sept. 21, 2021

Sept. 21, 2021

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/user32/tests/msg.c | 42 ++++++++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 15 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index edad263bfab..52cb7aa8eb4 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -15173,8 +15173,8 @@ static const struct message wm_lb_setcursel_0[] = { LB_SETCURSEL, sent|wparam|lparam, 0, 0 }, { WM_CTLCOLORLISTBOX, sent|parent }, { WM_DRAWITEM, sent|wparam|lparam|parent, ID_LISTBOX, 0x000120f2 }, - { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 1 }, - { EVENT_OBJECT_SELECTION, winevent_hook|wparam|lparam, OBJID_CLIENT, 1 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 1 }, + { EVENT_OBJECT_SELECTION, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 1 }, { 0 } }; static const struct message wm_lb_setcursel_1[] = @@ -15184,8 +15184,8 @@ static const struct message wm_lb_setcursel_1[] = { WM_DRAWITEM, sent|wparam|lparam|parent, ID_LISTBOX, 0x000020f2 }, { WM_CTLCOLORLISTBOX, sent|parent }, { WM_DRAWITEM, sent|wparam|lparam|parent, ID_LISTBOX, 0x000121f2 }, - { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 2 }, - { EVENT_OBJECT_SELECTION, winevent_hook|wparam|lparam, OBJID_CLIENT, 2 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 2 }, + { EVENT_OBJECT_SELECTION, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 2 }, { 0 } }; static const struct message wm_lb_setcursel_2[] = @@ -15195,8 +15195,8 @@ static const struct message wm_lb_setcursel_2[] = { WM_DRAWITEM, sent|wparam|lparam|parent, ID_LISTBOX, 0x000021f2 }, { WM_CTLCOLORLISTBOX, sent|parent }, { WM_DRAWITEM, sent|wparam|lparam|parent, ID_LISTBOX, 0x000122f2 }, - { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 3 }, - { EVENT_OBJECT_SELECTION, winevent_hook|wparam|lparam, OBJID_CLIENT, 3 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 3 }, + { EVENT_OBJECT_SELECTION, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 3 }, { 0 } }; static const struct message wm_lb_click_0[] = @@ -15206,14 +15206,14 @@ static const struct message wm_lb_click_0[] = { WM_KILLFOCUS, sent|parent }, { WM_IME_SETCONTEXT, sent|wparam|optional|parent, 0 }, { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, - { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|defwinproc }, { WM_DRAWITEM, sent|wparam|lparam|parent, ID_LISTBOX, 0x001142f2 }, { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_LISTBOX, LBN_SETFOCUS) }, - { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 3 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 3 }, { WM_LBTRACKPOINT, sent|wparam|lparam|parent, 0, MAKELPARAM(1,1) }, - { EVENT_SYSTEM_CAPTURESTART, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_SYSTEM_CAPTURESTART, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_DRAWITEM, sent|wparam|lparam|parent, ID_LISTBOX, 0x000142f2 }, { WM_CTLCOLORLISTBOX, sent|parent }, @@ -15222,11 +15222,11 @@ static const struct message wm_lb_click_0[] = { WM_DRAWITEM, sent|wparam|lparam|parent, ID_LISTBOX, 0x000120f2 }, { WM_DRAWITEM, sent|wparam|lparam|parent, ID_LISTBOX, 0x001140f2 }, - { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 1 }, - { EVENT_OBJECT_SELECTION, winevent_hook|wparam|lparam, OBJID_CLIENT, 1 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 1 }, + { EVENT_OBJECT_SELECTION, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 1 }, { WM_LBUTTONUP, sent|wparam|lparam, 0, 0 }, - { EVENT_SYSTEM_CAPTUREEND, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_SYSTEM_CAPTUREEND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_CAPTURECHANGED, sent|wparam|lparam|defwinproc, 0, 0 }, { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_LISTBOX, LBN_SELCHANGE) }, { 0 } @@ -15234,6 +15234,7 @@ static const struct message wm_lb_click_0[] = static const struct message wm_lb_deletestring[] = { { LB_DELETESTRING, sent|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 1 }, { WM_DELETEITEM, sent|wparam|parent|optional, ID_LISTBOX, 0 }, { WM_DRAWITEM, sent|wparam|parent|optional, ID_LISTBOX }, { WM_DRAWITEM, sent|wparam|parent|optional, ID_LISTBOX }, @@ -15242,6 +15243,7 @@ static const struct message wm_lb_deletestring[] = static const struct message wm_lb_deletestring_reset[] = { { LB_DELETESTRING, sent|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 1 }, { LB_RESETCONTENT, sent|wparam|lparam|defwinproc|optional, 0, 0 }, { WM_DELETEITEM, sent|wparam|parent|optional, ID_LISTBOX, 0 }, { WM_DRAWITEM, sent|wparam|parent|optional, ID_LISTBOX }, @@ -15251,31 +15253,41 @@ static const struct message wm_lb_deletestring_reset[] = static const struct message wm_lb_addstring[] = { { LB_ADDSTRING, sent|wparam|lparam, 0, 0xf30604ef }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 1 }, { LB_ADDSTRING, sent|wparam|lparam, 0, 0xf30604ed }, + /* Child ID changes each test, don't test lparam. */ + { EVENT_OBJECT_CREATE, winevent_hook|wparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { LB_ADDSTRING, sent|wparam|lparam, 0, 0xf30604ee }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { 0 } }; static const struct message wm_lb_addstring_ownerdraw[] = { { LB_ADDSTRING, sent|wparam|lparam, 0, 0xf30604ed }, { WM_MEASUREITEM, sent|wparam|lparam|parent, 0xf0f2, 0xf30604ed }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 1 }, { LB_ADDSTRING, sent|wparam|lparam, 0, 0xf30604ee }, { WM_MEASUREITEM, sent|wparam|lparam|parent, 0xf1f2, 0xf30604ee }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 2 }, { LB_ADDSTRING, sent|wparam|lparam, 0, 0xf30604ef }, { WM_MEASUREITEM, sent|wparam|lparam|parent, 0xf2f2, 0xf30604ef }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 3 }, { 0 } }; static const struct message wm_lb_addstring_sort_ownerdraw[] = { { LB_ADDSTRING, sent|wparam|lparam, 0, 0xf30604ed }, { WM_MEASUREITEM, sent|wparam|lparam|parent, 0xf0f2, 0xf30604ed }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 1 }, { LB_ADDSTRING, sent|wparam|lparam, 0, 0xf30604ee }, { WM_COMPAREITEM, sent|wparam|lparam|parent, 0xf30604ed, 0xf30604ee }, { WM_MEASUREITEM, sent|wparam|lparam|parent, 0xf1f2, 0xf30604ee }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 2 }, { LB_ADDSTRING, sent|wparam|lparam, 0, 0xf30604ef }, { WM_COMPAREITEM, sent|wparam|lparam|parent, 0xf30604ed, 0xf30604ef }, { WM_COMPAREITEM, sent|wparam|lparam|parent, 0xf30604ee, 0xf30604ef }, { WM_MEASUREITEM, sent|wparam|lparam|parent, 0xf2f2, 0xf30604ef }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 3 }, { 0 } }; @@ -18515,6 +18527,9 @@ START_TEST(msg) test_autoradio_BM_CLICK(); test_autoradio_kbd_move(); test_static_messages(); + test_listbox_messages(); + test_combobox_messages(); + test_wmime_keydown_message(); /* Fix message sequences before removing 4 lines below */ if (pUnhookWinEvent && hEvent_hook) @@ -18525,9 +18540,6 @@ START_TEST(msg) } hEvent_hook = 0; - test_listbox_messages(); - test_combobox_messages(); - test_wmime_keydown_message(); test_paint_messages(); test_interthread_messages(); test_message_conversion(); -- 2.25.1

2 9

The demise of echo.websocket.org broke the winhttp tests
by Francois Gouget Sept. 21, 2021

Sept. 21, 2021

I mentioned this a few times before on IRC and in a bug report but apparently I had not yet reported it to the mailing list. echo.websocket.org has been offline for over a month and I have seen no sign that it would ever come back. The end result is that winhttp:winhttp and winhttp:notification now fail systematically. So I really need someone to figure out how to replace it. https://bugs.winehq.org//show_bug.cgi?id=51631 http://winetest.dolphin/data/patterns.html#winhttp:winhttp https://test.winehq.org/data/patterns.html#winhttp:notification -- Francois Gouget <fgouget(a)codeweavers.com>

2 1

[PATCH v2 6/6] gdi32: Remove workaround for old freetype versions.
by Jacek Caban Sept. 21, 2021

Sept. 21, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Since the plan is to move font.c to Unix lib, we need to do something about those kernel32 calls. While it would be possible to reimplement it, it doesn't seem worth given how old affected freetype versions are. dlls/gdi32/font.c | 53 ++--------------------------------------------- 1 file changed, 2 insertions(+), 51 deletions(-)

2 1

[PATCH v2 5/6] gdi32: Directly use ntdll for font mutex.
by Jacek Caban Sept. 21, 2021

Sept. 21, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)

2 1