Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-31 19:41:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

[IEFRAME]

Browse source 
* 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
This commit is contained in:
Amine Khaldi 2013-12-24 20:56:17 +00:00
parent 102d96c6d9
commit 9c1738cd73
21 changed files with 24 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

4
reactos/dll/win32/ieframe/classinfo.c
View file

@ -20,10 +20,6 @@
#include "ieframe.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(ieframe);
/**********************************************************************
* Implement the IProvideClassInfo2 interface
*/

11
reactos/dll/win32/ieframe/client.c
View file

@ -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)
{

7
reactos/dll/win32/ieframe/dochost.c
View file

@ -18,15 +18,8 @@
#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

6
reactos/dll/win32/ieframe/events.c
View file

@ -22,14 +22,8 @@
* 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;

4
reactos/dll/win32/ieframe/frame.c
View file

@ -18,10 +18,6 @@
#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);

4
reactos/dll/win32/ieframe/ie.c
View file

@ -18,10 +18,6 @@
#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);

23
reactos/dll/win32/ieframe/ieframe.h
View file

@ -19,33 +19,44 @@
*/
#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;

3
reactos/dll/win32/ieframe/ieframe.rc
View 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

6
reactos/dll/win32/ieframe/ieframe_main.c
View file

@ -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;

4
reactos/dll/win32/ieframe/iehtmlwnd.c
View file

@ -18,10 +18,6 @@
#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);

20
reactos/dll/win32/ieframe/iexplore.c
View file

@ -19,31 +19,11 @@
* 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)

14
reactos/dll/win32/ieframe/intshcut.c
View file

@ -27,22 +27,8 @@
* 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;

14
reactos/dll/win32/ieframe/navigate.c
View file

@ -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};

10
reactos/dll/win32/ieframe/oleobject.c
View file

@ -23,18 +23,8 @@
* 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);

4
reactos/dll/win32/ieframe/persist.c
View file

@ -21,10 +21,6 @@
#include "ieframe.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(ieframe);
/**********************************************************************
* Implement the IPersistStorage interface
*/

3
reactos/dll/win32/ieframe/resource.h
View 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

7
reactos/dll/win32/ieframe/shellbrowser.c
View file

@ -19,14 +19,9 @@
* 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)
{

4
reactos/dll/win32/ieframe/shelluihelper.c
View file

@ -18,10 +18,6 @@
#include "ieframe.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(ieframe);
struct ShellUIHelper {
IShellUIHelper2 IShellUIHelper2_iface;
LONG ref;

5
reactos/dll/win32/ieframe/urlhist.c
View file

@ -17,12 +17,9 @@
*/
#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)
{
*ppv = NULL;

4
reactos/dll/win32/ieframe/view.c
View file

@ -19,10 +19,6 @@
#include "ieframe.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(ieframe);
/**********************************************************************
* Implement the IViewObject interface
*/

7
reactos/dll/win32/ieframe/webbrowser.c
View file

@ -21,13 +21,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)
{
return CONTAINING_RECORD(iface, WebBrowser, IWebBrowser2_iface);