[IEFRAME]
authorAmine Khaldi <amine.khaldi@reactos.org>
Tue, 24 Dec 2013 20:56:17 +0000 (20:56 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Tue, 24 Dec 2013 20:56:17 +0000 (20:56 +0000)
* 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

21 files changed:
reactos/dll/win32/ieframe/classinfo.c
reactos/dll/win32/ieframe/client.c
reactos/dll/win32/ieframe/dochost.c
reactos/dll/win32/ieframe/events.c
reactos/dll/win32/ieframe/frame.c
reactos/dll/win32/ieframe/ie.c
reactos/dll/win32/ieframe/ieframe.h
reactos/dll/win32/ieframe/ieframe.rc
reactos/dll/win32/ieframe/ieframe_main.c
reactos/dll/win32/ieframe/iehtmlwnd.c
reactos/dll/win32/ieframe/iexplore.c
reactos/dll/win32/ieframe/intshcut.c
reactos/dll/win32/ieframe/navigate.c
reactos/dll/win32/ieframe/oleobject.c
reactos/dll/win32/ieframe/persist.c
reactos/dll/win32/ieframe/resource.h
reactos/dll/win32/ieframe/shellbrowser.c
reactos/dll/win32/ieframe/shelluihelper.c
reactos/dll/win32/ieframe/urlhist.c
reactos/dll/win32/ieframe/view.c
reactos/dll/win32/ieframe/webbrowser.c

index d731616..267064b 100644 (file)
 
 #include "ieframe.h"
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(ieframe);
-
 /**********************************************************************
  * Implement the IProvideClassInfo2 interface
  */
index 08a73ea..ff0fbb8 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdio.h>
-
-#include <ieframe.h>
-
-#include <mshtmdid.h>
-#include <idispids.h>
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(ieframe);
+#include "ieframe.h"
 
 static inline DocHost *impl_from_IOleClientSite(IOleClientSite *iface)
 {
index 007935f..ec9399a 100644 (file)
 
 #include "ieframe.h"
 
-#include <exdispid.h>
-//#include "mshtml.h"
-#include <perhist.h>
 #include <initguid.h>
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(ieframe);
-
 DEFINE_OLEGUID(CGID_DocHostCmdPriv, 0x000214D4L, 0, 0);
 
 #define DOCHOST_DOCCANNAVIGATE  0
index c8d2099..17bc7f1 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-//#include <string.h>
-
 #include "ieframe.h"
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(ieframe);
-
 struct ConnectionPoint {
     IConnectionPoint IConnectionPoint_iface;
 
index aabadeb..9dfcce4 100644 (file)
 
 #include "ieframe.h"
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(ieframe);
-
 static inline DocHost *impl_from_IOleInPlaceFrame(IOleInPlaceFrame *iface)
 {
     return CONTAINING_RECORD(iface, DocHost, IOleInPlaceFrame_iface);
index 9c1f09f..9bd9cc9 100644 (file)
 
 #include "ieframe.h"
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(ieframe);
-
 static inline InternetExplorer *impl_from_IWebBrowser2(IWebBrowser2 *iface)
 {
     return CONTAINING_RECORD(iface, InternetExplorer, IWebBrowser2_iface);
index ab1e288..fe4dbbf 100644 (file)
  */
 
 #include <stdarg.h>
+#include <stdio.h>
 
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
 
 #define COBJMACROS
+
 #define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 
 #include <windef.h>
 #include <winbase.h>
 #include <wingdi.h>
-//#include "winuser.h"
+#include <winreg.h>
 #include <wincon.h>
-
-//#include "ole2.h"
-//#include "olectl.h"
 #include <shlobj.h>
 #include <mshtmhst.h>
-//#include "exdisp.h"
+#include <mshtmdid.h>
+#include <exdispid.h>
 #include <hlink.h>
 #include <htiface.h>
-#include "shdeprecated.h"
+#include <idispids.h>
+#include <intshcut.h>
+#include <perhist.h>
+#include <shellapi.h>
+#include <shlwapi.h>
+#include <shdeprecated.h>
 #include <docobjectservice.h>
 
 #include <wine/unicode.h>
 #include <wine/list.h>
 
+#include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(ieframe);
+
+#include "resource.h"
+
 typedef struct ConnectionPoint ConnectionPoint;
 typedef struct DocHost DocHost;
 
index 9b1758b..3f9eedd 100644 (file)
@@ -16,6 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <windef.h>
+#include <winuser.h>
+
 #include "resource.h"
 
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
index 888f220..373e5d6 100644 (file)
 #include "ieframe.h"
 
 #include <rpcproxy.h>
-//#include "shlguid.h"
-//#include "isguids.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(ieframe);
 
 LONG module_ref = 0;
 HINSTANCE ieframe_instance;
index 249c1b5..fc22096 100644 (file)
 
 #include "ieframe.h"
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(ieframe);
-
 static inline IEHTMLWindow *impl_from_IHTMLWindow2(IHTMLWindow2 *iface)
 {
     return CONTAINING_RECORD(iface, IEHTMLWindow, IHTMLWindow2_iface);
index a7a71f4..2f14b92 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define COBJMACROS
-
-//#include <stdarg.h>
-
 #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 <mshtmcid.h>
-#include <shellapi.h>
-#include <winreg.h>
-#include <shlwapi.h>
-#include <intshcut.h>
 #include <ddeml.h>
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(ieframe);
-
 #define IDI_APPICON 1
 
 #define WM_UPDATEADDRBAR    (WM_APP+1)
index 31b3516..f2c864e 100644 (file)
  * The installer for the Zuma Deluxe Popcap game is good for testing.
  */
 
-#include <stdio.h>
-
 #include "ieframe.h"
 
-//#include "shlobj.h"
-//#include "shobjidl.h"
-#include <intshcut.h>
-#include <shellapi.h>
-#include <winreg.h>
-//#include "shlwapi.h"
-//#include "shlguid.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(ieframe);
-
 typedef struct
 {
     IUniformResourceLocatorA IUniformResourceLocatorA_iface;
index e46ec77..72390ee 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
 #include "ieframe.h"
 
-#include <exdispid.h>
-#include <shellapi.h>
-#include <winreg.h>
-#include <shlwapi.h>
 #include <wininet.h>
-//#include "mshtml.h"
-#include <perhist.h>
-#include "resource.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(ieframe);
 
 static const WCHAR emptyW[] = {0};
 
index 350a411..92a9696 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-//#include <string.h>
-
 #include "ieframe.h"
 
-//#include "htiframe.h"
-#include <idispids.h>
-#include <mshtmdid.h>
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(ieframe);
-
 /* shlwapi.dll */
 HWND WINAPI SHSetParentHwnd(HWND hWnd, HWND hWndParent);
 
index 037df91..e09f204 100644 (file)
 
 #include "ieframe.h"
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(ieframe);
-
 /**********************************************************************
  * Implement the IPersistStorage interface
  */
index ae02b20..29e7cd5 100644 (file)
@@ -18,8 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <windef.h>
-#include <winuser.h>
+#pragma once
 
 #define IDR_BROWSE_MAIN_MENU           1000
 #define IDD_BROWSE_OPEN                1001
index 6281497..d117c37 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <assert.h>
-
 #include "ieframe.h"
-#include <exdispid.h>
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(ieframe);
+#include <assert.h>
 
 static inline ShellBrowser *impl_from_IShellBrowser(IShellBrowser *iface)
 {
index fafab24..f514165 100644 (file)
 
 #include "ieframe.h"
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(ieframe);
-
 struct ShellUIHelper {
     IShellUIHelper2 IShellUIHelper2_iface;
     LONG ref;
index 42b6b34..e15e312 100644 (file)
  */
 
 #include "ieframe.h"
-#include <urlhist.h>
-
-#include <wine/debug.h>
 
-WINE_DEFAULT_DEBUG_CHANNEL(ieframe);
+#include <urlhist.h>
 
 static HRESULT WINAPI UrlHistoryStg_QueryInterface(IUrlHistoryStg2 *iface, REFIID riid, void **ppv)
 {
index a52b257..db4a46d 100644 (file)
 
 #include "ieframe.h"
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(ieframe);
-
 /**********************************************************************
  * Implement the IViewObject interface
  */
index 4934f4e..779730c 100644 (file)
 
 #include "ieframe.h"
 
-#include <exdispid.h>
-//#include "mshtml.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(ieframe);
-
 static inline WebBrowser *impl_from_IWebBrowser2(IWebBrowser2 *iface)
 {
     return CONTAINING_RECORD(iface, WebBrowser, IWebBrowser2_iface);