From: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/comctl32.h | 3 +++ dlls/comctl32/datetime.c | 2 -- dlls/comctl32/header.c | 2 -- dlls/comctl32/hotkey.c | 1 - dlls/comctl32/ipaddress.c | 3 --- dlls/comctl32/listview.c | 2 -- dlls/comctl32/monthcal.c | 2 -- dlls/comctl32/progress.c | 2 -- dlls/comctl32/propsheet.c | 1 - dlls/comctl32/rebar.c | 2 -- dlls/comctl32/status.c | 2 -- dlls/comctl32/tab.c | 2 -- dlls/comctl32/toolbar.c | 2 -- dlls/comctl32/trackbar.c | 2 -- dlls/comctl32/treeview.c | 2 -- dlls/comctl32/updown.c | 2 -- dlls/comctl32_v6/button.c | 2 -- dlls/comctl32_v6/combo.c | 2 -- dlls/comctl32_v6/edit.c | 2 -- dlls/comctl32_v6/listbox.c | 2 -- dlls/comctl32_v6/static.c | 1 - 21 files changed, 3 insertions(+), 38 deletions(-) diff --git a/dlls/comctl32/comctl32.h b/dlls/comctl32/comctl32.h index 8d74464e67b..32e7658e22b 100644 --- a/dlls/comctl32/comctl32.h +++ b/dlls/comctl32/comctl32.h @@ -34,6 +34,9 @@ #include "winuser.h" #include "winnls.h" #include "commctrl.h" +#include "uxtheme.h" +#include "vsstyle.h" +#include "vssym32.h" extern HMODULE COMCTL32_hModule; extern HBRUSH COMCTL32_hPattern55AABrush; diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 2772cfec00c..6f42c7e4c3d 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -43,8 +43,6 @@ #include "winnls.h" #include "commctrl.h" #include "comctl32.h" -#include "uxtheme.h" -#include "vsstyle.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(datetime); diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 354ca615500..fd31b98eee3 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -38,8 +38,6 @@ #include "winnls.h" #include "commctrl.h" #include "comctl32.h" -#include "vssym32.h" -#include "uxtheme.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(header); diff --git a/dlls/comctl32/hotkey.c b/dlls/comctl32/hotkey.c index a3a8a8ce6b4..17e2b282cd6 100644 --- a/dlls/comctl32/hotkey.c +++ b/dlls/comctl32/hotkey.c @@ -38,7 +38,6 @@ #include "winnls.h" #include "commctrl.h" #include "comctl32.h" -#include "uxtheme.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(hotkey); diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index af1ae11300e..75918e00c70 100644 --- a/dlls/comctl32/ipaddress.c +++ b/dlls/comctl32/ipaddress.c @@ -35,9 +35,6 @@ #include "winnls.h" #include "commctrl.h" #include "comctl32.h" -#include "uxtheme.h" -#include "vsstyle.h" -#include "vssym32.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ipaddress); diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 7f51838f000..c0fc8d2103c 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -138,8 +138,6 @@ #include "winnls.h" #include "commctrl.h" #include "comctl32.h" -#include "uxtheme.h" -#include "vsstyle.h" #include "shlwapi.h" #include "wine/debug.h" diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index ac8a382310e..ccbb57107d3 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -43,8 +43,6 @@ #include "winnls.h" #include "commctrl.h" #include "comctl32.h" -#include "uxtheme.h" -#include "vssym32.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(monthcal); diff --git a/dlls/comctl32/progress.c b/dlls/comctl32/progress.c index 9c4a0c3e3a0..b235abdc6a2 100644 --- a/dlls/comctl32/progress.c +++ b/dlls/comctl32/progress.c @@ -35,8 +35,6 @@ #include "winnls.h" #include "commctrl.h" #include "comctl32.h" -#include "uxtheme.h" -#include "vssym32.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(progress); diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 96a35338648..da15385f496 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -59,7 +59,6 @@ #include "commctrl.h" #include "prsht.h" #include "comctl32.h" -#include "uxtheme.h" #include "wine/debug.h" diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 2ce19eb4f19..79c217c67a1 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -89,8 +89,6 @@ #include "winnls.h" #include "commctrl.h" #include "comctl32.h" -#include "uxtheme.h" -#include "vssym32.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(rebar); diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index 3473cf8f05a..bd5fa040ecf 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -41,8 +41,6 @@ #include "winnls.h" #include "commctrl.h" #include "comctl32.h" -#include "uxtheme.h" -#include "vssym32.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(statusbar); diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 887682196bc..535fac11120 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -63,8 +63,6 @@ #include "winnls.h" #include "commctrl.h" #include "comctl32.h" -#include "uxtheme.h" -#include "vssym32.h" #include "wine/debug.h" #include <math.h> diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 05dcdd7e37b..0a660a85fc8 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -79,8 +79,6 @@ #include "winnls.h" #include "commctrl.h" #include "comctl32.h" -#include "uxtheme.h" -#include "vssym32.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(toolbar); diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 2cc1f747e1f..978fb283b7a 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -32,8 +32,6 @@ #include "winuser.h" #include "winnls.h" #include "commctrl.h" -#include "uxtheme.h" -#include "vssym32.h" #include "wine/debug.h" #include "comctl32.h" diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index e353fda34af..fb06a727748 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -54,8 +54,6 @@ #include "winnls.h" #include "commctrl.h" #include "comctl32.h" -#include "uxtheme.h" -#include "vssym32.h" #include "wine/debug.h" #include "wine/exception.h" diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index 284e3d91c9a..519aa9dde2a 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -31,8 +31,6 @@ #include "winnls.h" #include "commctrl.h" #include "comctl32.h" -#include "uxtheme.h" -#include "vssym32.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(updown); diff --git a/dlls/comctl32_v6/button.c b/dlls/comctl32_v6/button.c index a0eb41fec20..1ad752fc861 100644 --- a/dlls/comctl32_v6/button.c +++ b/dlls/comctl32_v6/button.c @@ -51,8 +51,6 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "uxtheme.h" -#include "vssym32.h" #include "wine/debug.h" #include "comctl32.h" diff --git a/dlls/comctl32_v6/combo.c b/dlls/comctl32_v6/combo.c index b85066b6f6d..607e18a6f18 100644 --- a/dlls/comctl32_v6/combo.c +++ b/dlls/comctl32_v6/combo.c @@ -29,8 +29,6 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "uxtheme.h" -#include "vssym32.h" #include "commctrl.h" #include "wine/debug.h" diff --git a/dlls/comctl32_v6/edit.c b/dlls/comctl32_v6/edit.c index b8f995057f4..16a05d59101 100644 --- a/dlls/comctl32_v6/edit.c +++ b/dlls/comctl32_v6/edit.c @@ -42,8 +42,6 @@ #include "imm.h" #include "usp10.h" #include "commctrl.h" -#include "uxtheme.h" -#include "vsstyle.h" #include "comctl32.h" #include "wine/debug.h" diff --git a/dlls/comctl32_v6/listbox.c b/dlls/comctl32_v6/listbox.c index c770c2470ed..01b14f36079 100644 --- a/dlls/comctl32_v6/listbox.c +++ b/dlls/comctl32_v6/listbox.c @@ -29,8 +29,6 @@ #include "wingdi.h" #include "winuser.h" #include "commctrl.h" -#include "uxtheme.h" -#include "vssym32.h" #include "wine/exception.h" #include "wine/debug.h" diff --git a/dlls/comctl32_v6/static.c b/dlls/comctl32_v6/static.c index 605b75612e8..b1ec0e6b008 100644 --- a/dlls/comctl32_v6/static.c +++ b/dlls/comctl32_v6/static.c @@ -36,7 +36,6 @@ #include "wingdi.h" #include "winuser.h" #include "commctrl.h" -#include "uxtheme.h" #include "wine/debug.h" -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9221