Zhiyi Zhang : comctl32/theming: Register themed dialog and scrollbar even when theming is not active.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 277daa7ea7e8a953a2f726ce9354af82ab4635da
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=277daa7ea7e8a953a2f726ce9...

Author: Zhiyi Zhang <zzhang(a)codeweavers.com>
Date:   Tue Apr 27 11:35:08 2021 +0800

comctl32/theming: Register themed dialog and scrollbar even when theming is not active.

So that we can turn on theming in runtime. Otherwise, themed dialog and scrollbar
are not enabled even if a theme is made active in winecfg if theming is disabled at start.

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 | 2 +-
 dlls/comctl32/theming.c    | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c
index 4b0c1f9a4d0..15ff3b2d099 100644
--- a/dlls/comctl32/tests/misc.c
+++ b/dlls/comctl32/tests/misc.c
@@ -580,7 +580,7 @@ static void test_WM_THEMECHANGED(void)
         {TRACKBAR_CLASSA, wm_themechanged_paint_seq},
         {WC_TREEVIEWA, wm_themechanged_paint_erase_seq, 1, {0x1128}},
         {UPDOWN_CLASSA, wm_themechanged_paint_erase_seq},
-        {WC_SCROLLBARA, wm_themechanged_paint_erase_seq, 1, {SBM_GETSCROLLINFO}, TRUE},
+        {WC_SCROLLBARA, wm_themechanged_paint_erase_seq, 1, {SBM_GETSCROLLINFO}},
     };
 
     parent = CreateWindowExA(0, WC_STATICA, "parent", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, 100,
diff --git a/dlls/comctl32/theming.c b/dlls/comctl32/theming.c
index ed7bb0a5b33..8078e661b76 100644
--- a/dlls/comctl32/theming.c
+++ b/dlls/comctl32/theming.c
@@ -26,7 +26,6 @@
 #include "wingdi.h"
 #include "winuser.h"
 #include "comctl32.h"
-#include "uxtheme.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(theming);
@@ -96,8 +95,6 @@ void THEMING_Initialize (void)
 {
     unsigned int i;
 
-    if (!IsThemeActive()) return;
-
     atSubclassProp = GlobalAddAtomW (L"CC32ThemingSubCl");
     atRefDataProp = GlobalAddAtomW (L"CC32ThemingData");