From 9c1738cd73084e104e2e828a10586ce891d0047d Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Tue, 24 Dec 2013 20:56:17 +0000 Subject: [PATCH] [IEFRAME] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716 svn path=/trunk/; revision=61380 --- reactos/dll/win32/ieframe/classinfo.c | 4 ---- reactos/dll/win32/ieframe/client.c | 11 +---------- reactos/dll/win32/ieframe/dochost.c | 7 ------- reactos/dll/win32/ieframe/events.c | 6 ------ reactos/dll/win32/ieframe/frame.c | 4 ---- reactos/dll/win32/ieframe/ie.c | 4 ---- reactos/dll/win32/ieframe/ieframe.h | 23 +++++++++++++++++------ reactos/dll/win32/ieframe/ieframe.rc | 3 +++ reactos/dll/win32/ieframe/ieframe_main.c | 6 ------ reactos/dll/win32/ieframe/iehtmlwnd.c | 4 ---- reactos/dll/win32/ieframe/iexplore.c | 20 -------------------- reactos/dll/win32/ieframe/intshcut.c | 14 -------------- reactos/dll/win32/ieframe/navigate.c | 14 -------------- reactos/dll/win32/ieframe/oleobject.c | 10 ---------- reactos/dll/win32/ieframe/persist.c | 4 ---- reactos/dll/win32/ieframe/resource.h | 3 +-- reactos/dll/win32/ieframe/shellbrowser.c | 7 +------ reactos/dll/win32/ieframe/shelluihelper.c | 4 ---- reactos/dll/win32/ieframe/urlhist.c | 5 +---- reactos/dll/win32/ieframe/view.c | 4 ---- reactos/dll/win32/ieframe/webbrowser.c | 7 ------- 21 files changed, 24 insertions(+), 140 deletions(-) diff --git a/reactos/dll/win32/ieframe/classinfo.c b/reactos/dll/win32/ieframe/classinfo.c index d73161649e7..267064b00d2 100644 --- a/reactos/dll/win32/ieframe/classinfo.c +++ b/reactos/dll/win32/ieframe/classinfo.c @@ -20,10 +20,6 @@ #include "ieframe.h" -#include - -WINE_DEFAULT_DEBUG_CHANNEL(ieframe); - /********************************************************************** * Implement the IProvideClassInfo2 interface */ diff --git a/reactos/dll/win32/ieframe/client.c b/reactos/dll/win32/ieframe/client.c index 08a73eaefd9..ff0fbb88614 100644 --- a/reactos/dll/win32/ieframe/client.c +++ b/reactos/dll/win32/ieframe/client.c @@ -16,16 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include - -#include - -#include -#include - -#include - -WINE_DEFAULT_DEBUG_CHANNEL(ieframe); +#include "ieframe.h" static inline DocHost *impl_from_IOleClientSite(IOleClientSite *iface) { diff --git a/reactos/dll/win32/ieframe/dochost.c b/reactos/dll/win32/ieframe/dochost.c index 007935f2bc8..ec9399a56e9 100644 --- a/reactos/dll/win32/ieframe/dochost.c +++ b/reactos/dll/win32/ieframe/dochost.c @@ -18,15 +18,8 @@ #include "ieframe.h" -#include -//#include "mshtml.h" -#include #include -#include - -WINE_DEFAULT_DEBUG_CHANNEL(ieframe); - DEFINE_OLEGUID(CGID_DocHostCmdPriv, 0x000214D4L, 0, 0); #define DOCHOST_DOCCANNAVIGATE 0 diff --git a/reactos/dll/win32/ieframe/events.c b/reactos/dll/win32/ieframe/events.c index c8d2099b8a8..17bc7f1ce8d 100644 --- a/reactos/dll/win32/ieframe/events.c +++ b/reactos/dll/win32/ieframe/events.c @@ -22,14 +22,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include - #include "ieframe.h" -#include - -WINE_DEFAULT_DEBUG_CHANNEL(ieframe); - struct ConnectionPoint { IConnectionPoint IConnectionPoint_iface; diff --git a/reactos/dll/win32/ieframe/frame.c b/reactos/dll/win32/ieframe/frame.c index aabadeb32c3..9dfcce47ade 100644 --- a/reactos/dll/win32/ieframe/frame.c +++ b/reactos/dll/win32/ieframe/frame.c @@ -18,10 +18,6 @@ #include "ieframe.h" -#include - -WINE_DEFAULT_DEBUG_CHANNEL(ieframe); - static inline DocHost *impl_from_IOleInPlaceFrame(IOleInPlaceFrame *iface) { return CONTAINING_RECORD(iface, DocHost, IOleInPlaceFrame_iface); diff --git a/reactos/dll/win32/ieframe/ie.c b/reactos/dll/win32/ieframe/ie.c index 9c1f09fd3a8..9bd9cc9552e 100644 --- a/reactos/dll/win32/ieframe/ie.c +++ b/reactos/dll/win32/ieframe/ie.c @@ -18,10 +18,6 @@ #include "ieframe.h" -#include - -WINE_DEFAULT_DEBUG_CHANNEL(ieframe); - static inline InternetExplorer *impl_from_IWebBrowser2(IWebBrowser2 *iface) { return CONTAINING_RECORD(iface, InternetExplorer, IWebBrowser2_iface); diff --git a/reactos/dll/win32/ieframe/ieframe.h b/reactos/dll/win32/ieframe/ieframe.h index ab1e2888fc8..fe4dbbf16e2 100644 --- a/reactos/dll/win32/ieframe/ieframe.h +++ b/reactos/dll/win32/ieframe/ieframe.h @@ -19,33 +19,44 @@ */ #include +#include #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H #define COBJMACROS + #define NONAMELESSUNION +#define NONAMELESSSTRUCT #include #include #include -//#include "winuser.h" +#include #include - -//#include "ole2.h" -//#include "olectl.h" #include #include -//#include "exdisp.h" +#include +#include #include #include -#include "shdeprecated.h" +#include +#include +#include +#include +#include +#include #include #include #include +#include +WINE_DEFAULT_DEBUG_CHANNEL(ieframe); + +#include "resource.h" + typedef struct ConnectionPoint ConnectionPoint; typedef struct DocHost DocHost; diff --git a/reactos/dll/win32/ieframe/ieframe.rc b/reactos/dll/win32/ieframe/ieframe.rc index 9b1758ba841..3f9eeddbc82 100644 --- a/reactos/dll/win32/ieframe/ieframe.rc +++ b/reactos/dll/win32/ieframe/ieframe.rc @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include +#include + #include "resource.h" LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT diff --git a/reactos/dll/win32/ieframe/ieframe_main.c b/reactos/dll/win32/ieframe/ieframe_main.c index 888f2202531..373e5d6229e 100644 --- a/reactos/dll/win32/ieframe/ieframe_main.c +++ b/reactos/dll/win32/ieframe/ieframe_main.c @@ -19,12 +19,6 @@ #include "ieframe.h" #include -//#include "shlguid.h" -//#include "isguids.h" - -#include - -WINE_DEFAULT_DEBUG_CHANNEL(ieframe); LONG module_ref = 0; HINSTANCE ieframe_instance; diff --git a/reactos/dll/win32/ieframe/iehtmlwnd.c b/reactos/dll/win32/ieframe/iehtmlwnd.c index 249c1b500c7..fc220961524 100644 --- a/reactos/dll/win32/ieframe/iehtmlwnd.c +++ b/reactos/dll/win32/ieframe/iehtmlwnd.c @@ -18,10 +18,6 @@ #include "ieframe.h" -#include - -WINE_DEFAULT_DEBUG_CHANNEL(ieframe); - static inline IEHTMLWindow *impl_from_IHTMLWindow2(IHTMLWindow2 *iface) { return CONTAINING_RECORD(iface, IEHTMLWindow, IHTMLWindow2_iface); diff --git a/reactos/dll/win32/ieframe/iexplore.c b/reactos/dll/win32/ieframe/iexplore.c index a7a71f46dca..2f14b922efb 100644 --- a/reactos/dll/win32/ieframe/iexplore.c +++ b/reactos/dll/win32/ieframe/iexplore.c @@ -19,31 +19,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS - -//#include - #include "ieframe.h" -#include "resource.h" - -//#include "winuser.h" -//#include "wingdi.h" -//#include "winnls.h" -//#include "ole2.h" -//#include "exdisp.h" -//#include "oleidl.h" #include -#include -#include -#include -#include #include -#include - -WINE_DEFAULT_DEBUG_CHANNEL(ieframe); - #define IDI_APPICON 1 #define WM_UPDATEADDRBAR (WM_APP+1) diff --git a/reactos/dll/win32/ieframe/intshcut.c b/reactos/dll/win32/ieframe/intshcut.c index 31b35167e3d..f2c864eff17 100644 --- a/reactos/dll/win32/ieframe/intshcut.c +++ b/reactos/dll/win32/ieframe/intshcut.c @@ -27,22 +27,8 @@ * The installer for the Zuma Deluxe Popcap game is good for testing. */ -#include - #include "ieframe.h" -//#include "shlobj.h" -//#include "shobjidl.h" -#include -#include -#include -//#include "shlwapi.h" -//#include "shlguid.h" - -#include - -WINE_DEFAULT_DEBUG_CHANNEL(ieframe); - typedef struct { IUniformResourceLocatorA IUniformResourceLocatorA_iface; diff --git a/reactos/dll/win32/ieframe/navigate.c b/reactos/dll/win32/ieframe/navigate.c index e46ec77db0f..72390ee720e 100644 --- a/reactos/dll/win32/ieframe/navigate.c +++ b/reactos/dll/win32/ieframe/navigate.c @@ -16,23 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - #include "ieframe.h" -#include -#include -#include -#include #include -//#include "mshtml.h" -#include -#include "resource.h" - -#include - -WINE_DEFAULT_DEBUG_CHANNEL(ieframe); static const WCHAR emptyW[] = {0}; diff --git a/reactos/dll/win32/ieframe/oleobject.c b/reactos/dll/win32/ieframe/oleobject.c index 350a4119332..92a9696ec3b 100644 --- a/reactos/dll/win32/ieframe/oleobject.c +++ b/reactos/dll/win32/ieframe/oleobject.c @@ -23,18 +23,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include - #include "ieframe.h" -//#include "htiframe.h" -#include -#include - -#include - -WINE_DEFAULT_DEBUG_CHANNEL(ieframe); - /* shlwapi.dll */ HWND WINAPI SHSetParentHwnd(HWND hWnd, HWND hWndParent); diff --git a/reactos/dll/win32/ieframe/persist.c b/reactos/dll/win32/ieframe/persist.c index 037df915c52..e09f2045e04 100644 --- a/reactos/dll/win32/ieframe/persist.c +++ b/reactos/dll/win32/ieframe/persist.c @@ -21,10 +21,6 @@ #include "ieframe.h" -#include - -WINE_DEFAULT_DEBUG_CHANNEL(ieframe); - /********************************************************************** * Implement the IPersistStorage interface */ diff --git a/reactos/dll/win32/ieframe/resource.h b/reactos/dll/win32/ieframe/resource.h index ae02b20b6b4..29e7cd52585 100644 --- a/reactos/dll/win32/ieframe/resource.h +++ b/reactos/dll/win32/ieframe/resource.h @@ -18,8 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include +#pragma once #define IDR_BROWSE_MAIN_MENU 1000 #define IDD_BROWSE_OPEN 1001 diff --git a/reactos/dll/win32/ieframe/shellbrowser.c b/reactos/dll/win32/ieframe/shellbrowser.c index 628149775a3..d117c373e89 100644 --- a/reactos/dll/win32/ieframe/shellbrowser.c +++ b/reactos/dll/win32/ieframe/shellbrowser.c @@ -19,14 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include - #include "ieframe.h" -#include -#include - -WINE_DEFAULT_DEBUG_CHANNEL(ieframe); +#include static inline ShellBrowser *impl_from_IShellBrowser(IShellBrowser *iface) { diff --git a/reactos/dll/win32/ieframe/shelluihelper.c b/reactos/dll/win32/ieframe/shelluihelper.c index fafab2421a1..f5141659906 100644 --- a/reactos/dll/win32/ieframe/shelluihelper.c +++ b/reactos/dll/win32/ieframe/shelluihelper.c @@ -18,10 +18,6 @@ #include "ieframe.h" -#include - -WINE_DEFAULT_DEBUG_CHANNEL(ieframe); - struct ShellUIHelper { IShellUIHelper2 IShellUIHelper2_iface; LONG ref; diff --git a/reactos/dll/win32/ieframe/urlhist.c b/reactos/dll/win32/ieframe/urlhist.c index 42b6b34ae5c..e15e312111d 100644 --- a/reactos/dll/win32/ieframe/urlhist.c +++ b/reactos/dll/win32/ieframe/urlhist.c @@ -17,12 +17,9 @@ */ #include "ieframe.h" + #include -#include - -WINE_DEFAULT_DEBUG_CHANNEL(ieframe); - static HRESULT WINAPI UrlHistoryStg_QueryInterface(IUrlHistoryStg2 *iface, REFIID riid, void **ppv) { *ppv = NULL; diff --git a/reactos/dll/win32/ieframe/view.c b/reactos/dll/win32/ieframe/view.c index a52b257ee97..db4a46df5de 100644 --- a/reactos/dll/win32/ieframe/view.c +++ b/reactos/dll/win32/ieframe/view.c @@ -19,10 +19,6 @@ #include "ieframe.h" -#include - -WINE_DEFAULT_DEBUG_CHANNEL(ieframe); - /********************************************************************** * Implement the IViewObject interface */ diff --git a/reactos/dll/win32/ieframe/webbrowser.c b/reactos/dll/win32/ieframe/webbrowser.c index 4934f4e8abd..779730c3b76 100644 --- a/reactos/dll/win32/ieframe/webbrowser.c +++ b/reactos/dll/win32/ieframe/webbrowser.c @@ -21,13 +21,6 @@ #include "ieframe.h" -#include -//#include "mshtml.h" - -#include - -WINE_DEFAULT_DEBUG_CHANNEL(ieframe); - static inline WebBrowser *impl_from_IWebBrowser2(IWebBrowser2 *iface) { return CONTAINING_RECORD(iface, WebBrowser, IWebBrowser2_iface);