[akhaldi] 61380: [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...

Author: akhaldi
Date: Tue Dec 24 20:56:17 2013
New Revision: 61380

URL: http://svn.reactos.org/svn/reactos?rev=61380&view=rev
Log:
[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

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

Modified: trunk/reactos/dll/win32/ieframe/classinfo.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/classinf…
==============================================================================
--- trunk/reactos/dll/win32/ieframe/classinfo.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ieframe/classinfo.c	[iso-8859-1] Tue Dec 24 20:56:17 2013
@@ -19,10 +19,6 @@
  */
 
 #include "ieframe.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(ieframe);
 
 /**********************************************************************
  * Implement the IProvideClassInfo2 interface

Modified: trunk/reactos/dll/win32/ieframe/client.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/client.c…
==============================================================================
--- trunk/reactos/dll/win32/ieframe/client.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ieframe/client.c	[iso-8859-1] Tue Dec 24 20:56:17 2013
@@ -16,16 +16,7 @@
  * 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)
 {

Modified: trunk/reactos/dll/win32/ieframe/dochost.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/dochost.…
==============================================================================
--- trunk/reactos/dll/win32/ieframe/dochost.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ieframe/dochost.c	[iso-8859-1] Tue Dec 24 20:56:17 2013
@@ -18,14 +18,7 @@
 
 #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);
 

Modified: trunk/reactos/dll/win32/ieframe/events.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/events.c…
==============================================================================
--- trunk/reactos/dll/win32/ieframe/events.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ieframe/events.c	[iso-8859-1] Tue Dec 24 20:56:17 2013
@@ -22,13 +22,7 @@
  * 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;

Modified: trunk/reactos/dll/win32/ieframe/frame.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/frame.c?…
==============================================================================
--- trunk/reactos/dll/win32/ieframe/frame.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ieframe/frame.c	[iso-8859-1] Tue Dec 24 20:56:17 2013
@@ -17,10 +17,6 @@
  */
 
 #include "ieframe.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(ieframe);
 
 static inline DocHost *impl_from_IOleInPlaceFrame(IOleInPlaceFrame *iface)
 {

Modified: trunk/reactos/dll/win32/ieframe/ie.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/ie.c?rev…
==============================================================================
--- trunk/reactos/dll/win32/ieframe/ie.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ieframe/ie.c	[iso-8859-1] Tue Dec 24 20:56:17 2013
@@ -17,10 +17,6 @@
  */
 
 #include "ieframe.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(ieframe);
 
 static inline InternetExplorer *impl_from_IWebBrowser2(IWebBrowser2 *iface)
 {

Modified: trunk/reactos/dll/win32/ieframe/ieframe.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/ieframe.…
==============================================================================
--- trunk/reactos/dll/win32/ieframe/ieframe.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ieframe/ieframe.h	[iso-8859-1] Tue Dec 24 20:56:17 2013
@@ -19,32 +19,43 @@
  */
 
 #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;

Modified: trunk/reactos/dll/win32/ieframe/ieframe.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/ieframe.…
==============================================================================
--- trunk/reactos/dll/win32/ieframe/ieframe.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ieframe/ieframe.rc	[iso-8859-1] Tue Dec 24 20:56:17 2013
@@ -15,6 +15,9 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+
+#include <windef.h>
+#include <winuser.h>
 
 #include "resource.h"
 

Modified: trunk/reactos/dll/win32/ieframe/ieframe_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/ieframe_…
==============================================================================
--- trunk/reactos/dll/win32/ieframe/ieframe_main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ieframe/ieframe_main.c	[iso-8859-1] Tue Dec 24 20:56:17 2013
@@ -19,12 +19,6 @@
 #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;

Modified: trunk/reactos/dll/win32/ieframe/iehtmlwnd.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/iehtmlwn…
==============================================================================
--- trunk/reactos/dll/win32/ieframe/iehtmlwnd.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ieframe/iehtmlwnd.c	[iso-8859-1] Tue Dec 24 20:56:17 2013
@@ -17,10 +17,6 @@
  */
 
 #include "ieframe.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(ieframe);
 
 static inline IEHTMLWindow *impl_from_IHTMLWindow2(IHTMLWindow2 *iface)
 {

Modified: trunk/reactos/dll/win32/ieframe/iexplore.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/iexplore…
==============================================================================
--- trunk/reactos/dll/win32/ieframe/iexplore.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ieframe/iexplore.c	[iso-8859-1] Tue Dec 24 20:56:17 2013
@@ -19,30 +19,10 @@
  * 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
 

Modified: trunk/reactos/dll/win32/ieframe/intshcut.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/intshcut…
==============================================================================
--- trunk/reactos/dll/win32/ieframe/intshcut.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ieframe/intshcut.c	[iso-8859-1] Tue Dec 24 20:56:17 2013
@@ -27,21 +27,7 @@
  * 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
 {

Modified: trunk/reactos/dll/win32/ieframe/navigate.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/navigate…
==============================================================================
--- trunk/reactos/dll/win32/ieframe/navigate.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ieframe/navigate.c	[iso-8859-1] Tue Dec 24 20:56:17 2013
@@ -16,23 +16,9 @@
  * 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};
 

Modified: trunk/reactos/dll/win32/ieframe/oleobject.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/oleobjec…
==============================================================================
--- trunk/reactos/dll/win32/ieframe/oleobject.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ieframe/oleobject.c	[iso-8859-1] Tue Dec 24 20:56:17 2013
@@ -23,17 +23,7 @@
  * 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);

Modified: trunk/reactos/dll/win32/ieframe/persist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/persist.…
==============================================================================
--- trunk/reactos/dll/win32/ieframe/persist.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ieframe/persist.c	[iso-8859-1] Tue Dec 24 20:56:17 2013
@@ -20,10 +20,6 @@
  */
 
 #include "ieframe.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(ieframe);
 
 /**********************************************************************
  * Implement the IPersistStorage interface

Modified: trunk/reactos/dll/win32/ieframe/resource.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/resource…
==============================================================================
--- trunk/reactos/dll/win32/ieframe/resource.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ieframe/resource.h	[iso-8859-1] Tue Dec 24 20:56:17 2013
@@ -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

Modified: trunk/reactos/dll/win32/ieframe/shellbrowser.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/shellbro…
==============================================================================
--- trunk/reactos/dll/win32/ieframe/shellbrowser.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ieframe/shellbrowser.c	[iso-8859-1] Tue Dec 24 20:56:17 2013
@@ -19,14 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "ieframe.h"
+
 #include <assert.h>
-
-#include "ieframe.h"
-#include <exdispid.h>
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(ieframe);
 
 static inline ShellBrowser *impl_from_IShellBrowser(IShellBrowser *iface)
 {

Modified: trunk/reactos/dll/win32/ieframe/shelluihelper.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/shelluih…
==============================================================================
--- trunk/reactos/dll/win32/ieframe/shelluihelper.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ieframe/shelluihelper.c	[iso-8859-1] Tue Dec 24 20:56:17 2013
@@ -17,10 +17,6 @@
  */
 
 #include "ieframe.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(ieframe);
 
 struct ShellUIHelper {
     IShellUIHelper2 IShellUIHelper2_iface;

Modified: trunk/reactos/dll/win32/ieframe/urlhist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/urlhist.…
==============================================================================
--- trunk/reactos/dll/win32/ieframe/urlhist.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ieframe/urlhist.c	[iso-8859-1] Tue Dec 24 20:56:17 2013
@@ -17,11 +17,8 @@
  */
 
 #include "ieframe.h"
+
 #include <urlhist.h>
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(ieframe);
 
 static HRESULT WINAPI UrlHistoryStg_QueryInterface(IUrlHistoryStg2 *iface, REFIID riid,
void **ppv)
 {

Modified: trunk/reactos/dll/win32/ieframe/view.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/view.c?r…
==============================================================================
--- trunk/reactos/dll/win32/ieframe/view.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ieframe/view.c	[iso-8859-1] Tue Dec 24 20:56:17 2013
@@ -19,10 +19,6 @@
 
 #include "ieframe.h"
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(ieframe);
-
 /**********************************************************************
  * Implement the IViewObject interface
  */

Modified: trunk/reactos/dll/win32/ieframe/webbrowser.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/webbrows…
==============================================================================
--- trunk/reactos/dll/win32/ieframe/webbrowser.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ieframe/webbrowser.c	[iso-8859-1] Tue Dec 24 20:56:17 2013
@@ -20,13 +20,6 @@
  */
 
 #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)
 {