huwcampbell.com / reactos
Reactos
fork atom

[SHELL32:WINE] Make the wine-imported files include shell32_main.h

Hermès Bélusca-Maïto 52dd07fe 72b40554

+13 -6
+3 -2
dll/win32/shell32/wine/appbar.c
··· 36 36 #include <winuser.h> 37 37 #include <shlobj.h> 38 38 #include <shlwapi.h> 39 - 40 - #include "undocshell.h" 39 + #include <undocshell.h> 41 40 42 41 #include <wine/debug.h> 43 42 #include <wine/unicode.h> 43 + 44 + #include "shell32_main.h" 44 45 45 46 WINE_DEFAULT_DEBUG_CHANNEL(appbar); 46 47
+1
dll/win32/shell32/wine/brsfolder.c
··· 38 38 #include "pidl.h" 39 39 #include "shell32_main.h" 40 40 #include "shresdef.h" 41 + 41 42 #ifdef __REACTOS__ 42 43 #include <shlwapi.h> 43 44 #include "ui/layout.h" /* Resizable window */
+2
dll/win32/shell32/wine/clipboard.c
··· 44 44 #include <wine/debug.h> 45 45 #include <wine/unicode.h> 46 46 47 + #include "shell32_main.h" 48 + 47 49 WINE_DEFAULT_DEBUG_CHANNEL(shell); 48 50 49 51 /**************************************************************************
+3 -1
dll/win32/shell32/wine/control.c
··· 30 30 #include <shlwapi.h> 31 31 #include <shellapi.h> 32 32 #define COBJMACROS 33 + #include <shlobj.h> 33 34 #include <shobjidl.h> 34 35 #include <wine/debug.h> 36 + #include <wine/unicode.h> 35 37 36 38 #include <strsafe.h> 37 39 38 40 #include "cpanel.h" 39 - #include "wine/unicode.h" 41 + #include "shell32_main.h" 40 42 41 43 WINE_DEFAULT_DEBUG_CHANNEL(shlctrl); 42 44
+2 -1
dll/win32/shell32/wine/shellreg.c
··· 29 29 #include <winbase.h> 30 30 #include <shlobj.h> 31 31 #include <shlwapi.h> 32 + #include <wine/debug.h> 32 33 33 - #include <wine/debug.h> 34 + #include "shell32_main.h" 34 35 35 36 WINE_DEFAULT_DEBUG_CHANNEL(shell); 36 37
+2 -2
dll/win32/shell32/wine/shellstring.c
··· 25 25 #include <winbase.h> 26 26 #include <shlobj.h> 27 27 #include <shlwapi.h> 28 + #include <undocshell.h> 29 + #include <shlwapi_undoc.h> 28 30 #include <wine/unicode.h> 29 31 #include <wine/debug.h> 30 32 31 33 #include "shell32_main.h" 32 - #include "undocshell.h" 33 - #include "shlwapi_undoc.h" 34 34 35 35 WINE_DEFAULT_DEBUG_CHANNEL(shell); 36 36