From 52dd07febd2c24e2fd3c76e83c8a4fc3b5a36135 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Mon, 10 Jan 2022 20:02:18 +0100 Subject: [PATCH] [SHELL32:WINE] Make the wine-imported files include shell32_main.h --- dll/win32/shell32/wine/appbar.c | 5 +++-- dll/win32/shell32/wine/brsfolder.c | 1 + dll/win32/shell32/wine/clipboard.c | 2 ++ dll/win32/shell32/wine/control.c | 4 +++- dll/win32/shell32/wine/shellreg.c | 3 ++- dll/win32/shell32/wine/shellstring.c | 4 ++-- 6 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dll/win32/shell32/wine/appbar.c b/dll/win32/shell32/wine/appbar.c index 78ca967b238..3bcaf085cde 100644 --- a/dll/win32/shell32/wine/appbar.c +++ b/dll/win32/shell32/wine/appbar.c @@ -36,12 +36,13 @@ #include #include #include - -#include "undocshell.h" +#include #include #include +#include "shell32_main.h" + WINE_DEFAULT_DEBUG_CHANNEL(appbar); struct appbar_cmd diff --git a/dll/win32/shell32/wine/brsfolder.c b/dll/win32/shell32/wine/brsfolder.c index b44d5d20b38..03a99ae8c3a 100644 --- a/dll/win32/shell32/wine/brsfolder.c +++ b/dll/win32/shell32/wine/brsfolder.c @@ -38,6 +38,7 @@ #include "pidl.h" #include "shell32_main.h" #include "shresdef.h" + #ifdef __REACTOS__ #include #include "ui/layout.h" /* Resizable window */ diff --git a/dll/win32/shell32/wine/clipboard.c b/dll/win32/shell32/wine/clipboard.c index fc91d077ae8..908949efc6d 100644 --- a/dll/win32/shell32/wine/clipboard.c +++ b/dll/win32/shell32/wine/clipboard.c @@ -44,6 +44,8 @@ #include #include +#include "shell32_main.h" + WINE_DEFAULT_DEBUG_CHANNEL(shell); /************************************************************************** diff --git a/dll/win32/shell32/wine/control.c b/dll/win32/shell32/wine/control.c index 82768d2971c..4acbc31ae0a 100644 --- a/dll/win32/shell32/wine/control.c +++ b/dll/win32/shell32/wine/control.c @@ -30,13 +30,15 @@ #include #include #define COBJMACROS +#include #include #include +#include #include #include "cpanel.h" -#include "wine/unicode.h" +#include "shell32_main.h" WINE_DEFAULT_DEBUG_CHANNEL(shlctrl); diff --git a/dll/win32/shell32/wine/shellreg.c b/dll/win32/shell32/wine/shellreg.c index 807a94e5cc8..044d71e8c22 100644 --- a/dll/win32/shell32/wine/shellreg.c +++ b/dll/win32/shell32/wine/shellreg.c @@ -29,9 +29,10 @@ #include #include #include - #include +#include "shell32_main.h" + WINE_DEFAULT_DEBUG_CHANNEL(shell); /************************************************************************* diff --git a/dll/win32/shell32/wine/shellstring.c b/dll/win32/shell32/wine/shellstring.c index 6099325559c..78e25390fe8 100644 --- a/dll/win32/shell32/wine/shellstring.c +++ b/dll/win32/shell32/wine/shellstring.c @@ -25,12 +25,12 @@ #include #include #include +#include +#include #include #include #include "shell32_main.h" -#include "undocshell.h" -#include "shlwapi_undoc.h" WINE_DEFAULT_DEBUG_CHANNEL(shell);