uxtheme: Disallow EnableTheming() to enable theming.

Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

uxtheme: Disallow EnableTheming() to enable theming.
50005fee · Zhiyi Zhang · Alexandre Julliard · 2cfd5c08 · 50005fee · 50005fee
Commit 50005fee authored Sep 22, 2021 by Zhiyi Zhang Committed by Alexandre Julliard Sep 22, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 9 deletions

system.c dlls/uxtheme/system.c +4 -8

system.c dlls/uxtheme/tests/system.c +0 -1

No files found.
--- 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);

--- 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);