ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-08-29 19:26:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MSHTML]

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/resource file.
* Improve the GUIDs situation.
CORE-7716

svn path=/trunk/; revision=61414
This commit is contained in:
Amine Khaldi
2013-12-25 17:40:49 +00:00
parent 417108243e
commit 6db005ca4d
103 changed files with 84 additions and 1487 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/dll/win32/mshtml/CMakeLists.txt
+1
View File
@@ -85,6 +85,7 @@ list(APPEND SOURCE
task.c
txtrange.c
view.c
guid.c
rsrc.rc
${CMAKE_CURRENT_BINARY_DIR}/mshtml_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/mshtml.def)
reactos/dll/win32/mshtml/conpoint.c
-16
View File
@@ -16,24 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <stdarg.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
#include <wine/debug.h>
#include "mshtml_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
static const char *debugstr_cp_guid(REFIID riid)
{
#define X(x) \
reactos/dll/win32/mshtml/dispex.c
-18
View File
@@ -16,26 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <stdarg.h>
#include <assert.h>
#define COBJMACROS
#define NONAMELESSUNION
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
#include <wine/debug.h>
#include "mshtml_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
#define MAX_ARGS 16
static CRITICAL_SECTION cs_dispex_static_data;
reactos/dll/win32/mshtml/editor.c
-20
View File
@@ -16,27 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
//#include <stdarg.h>
#include <stdio.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
#include <mshtmcid.h>
#include <shlguid.h>
#include <wine/debug.h>
#include "mshtml_private.h"
#include "resource.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
#define NSCMD_ALIGN "cmd_align"
#define NSCMD_BEGINLINE "cmd_beginLine"
reactos/dll/win32/mshtml/guid.c
+29
View File
@@ -0,0 +1,29 @@
/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */
#include <stdarg.h>
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <windef.h>
#include <winbase.h>
#include <objbase.h>
#include <initguid.h>
#include <nsiface.h>
DEFINE_GUID(CLSID_AboutProtocol, 0x3050F406, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B);
DEFINE_GUID(CLSID_JSProtocol, 0x3050F3B2, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B);
DEFINE_GUID(CLSID_MailtoProtocol, 0x3050F3DA, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B);
DEFINE_GUID(CLSID_ResProtocol, 0x3050F3BC, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B);
DEFINE_GUID(CLSID_SysimageProtocol, 0x76E67A63, 0x06E9, 0x11D2, 0xA8,0x40, 0x00,0x60,0x08,0x05,0x93,0x82);
DEFINE_GUID(CLSID_CMarkup,0x3050f4fb,0x98b5,0x11cf,0xbb,0x82,0x00,0xaa,0x00,0xbd,0xce,0x0b);
DEFINE_OLEGUID(CGID_DocHostCmdPriv, 0x000214D4L, 0, 0);
DEFINE_GUID(CLSID_JScript, 0xf414c260,0x6ac0,0x11cf, 0xb6,0xd1,0x00,0xaa,0x00,0xbb,0xbb,0x58);
DEFINE_GUID(CLSID_VBScript, 0xb54f3741,0x5b07,0x11cf, 0xa4,0xb0,0x00,0xaa,0x00,0x4a,0x55,0xe8);
DEFINE_GUID(IID_nsXPCOMCycleCollectionParticipant, 0x9674489b,0x1f6f,0x4550,0xa7,0x30, 0xcc,0xae,0xdd,0x10,0x4c,0xf9);
/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */
reactos/dll/win32/mshtml/hlink.c
-17
View File
@@ -16,24 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <stdarg.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
#include <wine/debug.h>
#include "mshtml_private.h"
#include "binding.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
/**********************************************************
* IHlinkTarget implementation
reactos/dll/win32/mshtml/htmlanchor.c
-20
View File
@@ -16,27 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <stdarg.h>
//#include <stdio.h>
#include <assert.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
#include "mshtml_private.h"
#include "htmlevent.h"
#include "binding.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
typedef struct {
HTMLElement element;
reactos/dll/win32/mshtml/htmlattr.c
-17
View File
@@ -16,25 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <stdarg.h>
#include <assert.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
#include "mshtml_private.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
static inline HTMLDOMAttribute *impl_from_IHTMLDOMAttribute(IHTMLDOMAttribute *iface)
{
return CONTAINING_RECORD(iface, HTMLDOMAttribute, IHTMLDOMAttribute_iface);
reactos/dll/win32/mshtml/htmlbody.c
-18
View File
@@ -16,25 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <stdarg.h>
//#include <stdio.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
#include <wine/debug.h>
#include "mshtml_private.h"
#include "htmlevent.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
typedef struct {
HTMLTextContainer textcont;
reactos/dll/win32/mshtml/htmlcomment.c
-17
View File
@@ -16,25 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <stdarg.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
#include "mshtml_private.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
struct HTMLCommentElement {
HTMLElement element;
IHTMLCommentElement IHTMLCommentElement_iface;
reactos/dll/win32/mshtml/htmlcurstyle.c
-17
View File
@@ -16,24 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <stdarg.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
#include "mshtml_private.h"
#include "htmlstyle.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
struct HTMLCurrentStyle {
DispatchEx dispex;
reactos/dll/win32/mshtml/htmldoc.c
-26
View File
@@ -16,33 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <config.h>
#include <stdarg.h>
//#include <stdio.h>
#include <assert.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <wininet.h>
#include <ole2.h>
//#include "perhist.h"
#include <mshtmdid.h>
#include <wine/debug.h>
#include "mshtml_private.h"
#include "htmlevent.h"
#include "pluginhost.h"
#include "binding.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
static inline HTMLDocument *impl_from_IHTMLDocument2(IHTMLDocument2 *iface)
{
reactos/dll/win32/mshtml/htmldoc3.c
-21
View File
@@ -16,28 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <config.h>
#include <stdarg.h>
//#include <stdio.h>
#include <assert.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
#include <wine/debug.h>
#include "mshtml_private.h"
#include "htmlevent.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
HRESULT get_doc_elem_by_id(HTMLDocumentNode *doc, const WCHAR *id, HTMLElement **ret)
{
reactos/dll/win32/mshtml/htmldoc5.c
-19
View File
@@ -16,27 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <config.h>
#include <stdarg.h>
//#include <stdio.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
#include <wine/debug.h>
#include "mshtml_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
static inline HTMLDocument *impl_from_IHTMLDocument5(IHTMLDocument5 *iface)
{
return CONTAINING_RECORD(iface, HTMLDocument, IHTMLDocument5_iface);
reactos/dll/win32/mshtml/htmlelem.c
-21
View File
@@ -16,28 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <stdarg.h>
#include <assert.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
//#include "winreg.h"
#include <ole2.h>
//#include "shlwapi.h"
#include <wine/debug.h>
#include "mshtml_private.h"
#include "htmlevent.h"
#include "htmlstyle.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
static const WCHAR aW[] = {'A',0};
static const WCHAR bodyW[] = {'B','O','D','Y',0};
reactos/dll/win32/mshtml/htmlelem2.c
-20
View File
@@ -16,27 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <stdarg.h>
#include <assert.h>
#include <math.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
#include <wine/debug.h>
#include "mshtml_private.h"
#include "htmlevent.h"
#include "htmlstyle.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
typedef struct {
DispatchEx dispex;
reactos/dll/win32/mshtml/htmlelem3.c
-17
View File
@@ -16,24 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <stdarg.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
#include <wine/debug.h>
#include "mshtml_private.h"
#include "htmlevent.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
static inline HTMLElement *impl_from_IHTMLElement3(IHTMLElement3 *iface)
{
reactos/dll/win32/mshtml/htmlelemcol.c
-16
View File
@@ -16,24 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <stdarg.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
#include <wine/debug.h>
#include "mshtml_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
typedef struct {
DispatchEx dispex;
IHTMLElementCollection IHTMLElementCollection_iface;
reactos/dll/win32/mshtml/htmlembed.c
-17
View File
@@ -16,25 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <stdarg.h>
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
//#include "winreg.h"
#include <ole2.h>
#include <wine/debug.h>
#include "mshtml_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
typedef struct {
HTMLElement element;
reactos/dll/win32/mshtml/htmlevent.c
-19
View File
@@ -16,26 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <stdarg.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
#include <mshtmdid.h>
#include "mshtml_private.h"
#include "htmlevent.h"
#include "htmlscript.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
typedef struct {
IDispatch *handler_prop;
reactos/dll/win32/mshtml/htmlform.c
-18
View File
@@ -16,25 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <stdarg.h>
#include <assert.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
#include <wine/debug.h>
#include "mshtml_private.h"
#include "htmlevent.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
struct HTMLFormElement {
HTMLElement element;
reactos/dll/win32/mshtml/htmlframe.c
-16
View File
@@ -16,24 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <stdarg.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
#include "mshtml_private.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
typedef struct {
HTMLFrameBase framebase;
IHTMLFrameElement3 IHTMLFrameElement3_iface;
reactos/dll/win32/mshtml/htmlframebase.c
-18
View File
@@ -16,25 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <stdarg.h>
#include <assert.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
#include "mshtml_private.h"
#include "binding.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
static const WCHAR autoW[] = {'a','u','t','o',0};
static const WCHAR yesW[] = {'y','e','s',0};
reactos/dll/win32/mshtml/htmlgeneric.c
-16
View File
@@ -16,24 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <stdarg.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
#include <wine/debug.h>
#include "mshtml_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
typedef struct {
HTMLElement element;
reactos/dll/win32/mshtml/htmlhead.c
-16
View File
@@ -16,24 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <stdarg.h>
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
#include <wine/debug.h>
#include "mshtml_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
typedef struct {
HTMLElement element;
reactos/dll/win32/mshtml/htmliframe.c
-16
View File
@@ -16,24 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <stdarg.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
#include "mshtml_private.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
typedef struct {
HTMLFrameBase framebase;
IHTMLIFrameElement IHTMLIFrameElement_iface;
reactos/dll/win32/mshtml/htmlimg.c
-18
View File
@@ -16,25 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <stdarg.h>
#include <assert.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
#include <wine/debug.h>
#include "mshtml_private.h"
#include "htmlevent.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
typedef struct {
HTMLElement element;
reactos/dll/win32/mshtml/htmlinput.c
+1 -18
View File
@@ -16,26 +16,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <stdarg.h>
#include <assert.h>
#include <limits.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
#include <wine/debug.h>
#include "mshtml_private.h"
#include "htmlevent.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
#include <limits.h>
typedef struct {
HTMLElement element;
reactos/dll/win32/mshtml/htmllink.c
-17
View File
@@ -16,25 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <stdarg.h>
#include <assert.h>
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
#include <wine/debug.h>
#include "mshtml_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
typedef struct {
HTMLElement element;
IHTMLLinkElement IHTMLLinkElement_iface;
reactos/dll/win32/mshtml/htmllocation.c
-21
View File
@@ -16,28 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <stdarg.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
//#include "winreg.h"
#include <ole2.h>
#include <wininet.h>
//#include "shlwapi.h"
#include <wine/debug.h>
#include "mshtml_private.h"
#include "binding.h"
//#include "resource.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
static HRESULT get_url(HTMLLocation *This, const WCHAR **ret)
{
reactos/dll/win32/mshtml/htmlmeta.c
-16
View File
@@ -16,24 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <stdarg.h>
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
#include <wine/debug.h>
#include "mshtml_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
typedef struct {
HTMLElement element;
reactos/dll/win32/mshtml/htmlnode.c
-18
View File
@@ -16,25 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <stdarg.h>
#include <assert.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
#include <wine/debug.h>
#include "mshtml_private.h"
#include "htmlevent.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
static HTMLDOMNode *get_node_obj(IHTMLDOMNode*);
static HRESULT create_node(HTMLDocumentNode*,nsIDOMNode*,HTMLDOMNode**);
reactos/dll/win32/mshtml/htmlobject.c
-19
View File
@@ -16,26 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <stdarg.h>
#include <assert.h>
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
//#include "winreg.h"
#include <ole2.h>
#include <wine/debug.h>
#include "mshtml_private.h"
#include "pluginhost.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
typedef struct {
HTMLPluginContainer plugin_container;
reactos/dll/win32/mshtml/htmloption.c
-17
View File
@@ -16,25 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <stdarg.h>
#include <assert.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
#include <wine/debug.h>
#include "mshtml_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
struct HTMLOptionElement {
HTMLElement element;
reactos/dll/win32/mshtml/htmlscreen.c
-16
View File
@@ -16,24 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <stdarg.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
#include <wine/debug.h>
#include "mshtml_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
typedef struct {
DispatchEx dispex;
IHTMLScreen IHTMLScreen_iface;
reactos/dll/win32/mshtml/htmlscript.c
-18
View File
@@ -16,25 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <stdarg.h>
#include <assert.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
#include <wine/debug.h>
#include "mshtml_private.h"
#include "htmlscript.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
static inline HTMLScriptElement *impl_from_IHTMLScriptElement(IHTMLScriptElement *iface)
{
reactos/dll/win32/mshtml/htmlselect.c
-18
View File
@@ -16,25 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <stdarg.h>
#include <assert.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
#include <wine/debug.h>
#include "mshtml_private.h"
#include "htmlevent.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
typedef struct {
HTMLElement element;
reactos/dll/win32/mshtml/htmlstorage.c
-16
View File
@@ -16,24 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <stdarg.h>
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
#include <wine/debug.h>
#include "mshtml_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
typedef struct {
DispatchEx dispex;
IHTMLStorage IHTMLStorage_iface;
reactos/dll/win32/mshtml/htmlstyle.c
-20
View File
@@ -16,27 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <stdarg.h>
#include <assert.h>
#include <math.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
#include <mshtmdid.h>
#include "mshtml_private.h"
#include "htmlstyle.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
static const WCHAR attrBackground[] =
{'b','a','c','k','g','r','o','u','n','d',0};
reactos/dll/win32/mshtml/htmlstyle2.c
-17
View File
@@ -16,24 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <stdarg.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
#include "mshtml_private.h"
#include "htmlstyle.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
static inline HTMLStyle *impl_from_IHTMLStyle2(IHTMLStyle2 *iface)
{
reactos/dll/win32/mshtml/htmlstyle3.c
-17
View File
@@ -16,24 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <stdarg.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
#include "mshtml_private.h"
#include "htmlstyle.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
static inline HTMLStyle *impl_from_IHTMLStyle3(IHTMLStyle3 *iface)
{
reactos/dll/win32/mshtml/htmlstyleelem.c
-18
View File
@@ -16,26 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <stdarg.h>
#include <assert.h>
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
//#include "winreg.h"
#include <ole2.h>
#include <wine/debug.h>
#include "mshtml_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
typedef struct {
HTMLElement element;
reactos/dll/win32/mshtml/htmlstylesheet.c
-16
View File
@@ -16,24 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <stdarg.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
#include <wine/debug.h>
#include "mshtml_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
struct HTMLStyleSheet {
DispatchEx dispex;
IHTMLStyleSheet IHTMLStyleSheet_iface;
reactos/dll/win32/mshtml/htmltable.c
-17
View File
@@ -16,25 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <stdarg.h>
#include <assert.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
#include <wine/debug.h>
#include "mshtml_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
struct HTMLTable {
HTMLElement element;
reactos/dll/win32/mshtml/htmltablecell.c
-16
View File
@@ -16,24 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <stdarg.h>
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
#include <wine/debug.h>
#include "mshtml_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
typedef struct {
HTMLElement element;
reactos/dll/win32/mshtml/htmltablerow.c
-17
View File
@@ -16,25 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <stdarg.h>
#include <assert.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
#include <wine/debug.h>
#include "mshtml_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
typedef struct {
HTMLElement element;
reactos/dll/win32/mshtml/htmltextarea.c
-17
View File
@@ -16,25 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <stdarg.h>
#include <assert.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
#include <wine/debug.h>
#include "mshtml_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
typedef struct {
HTMLElement element;
reactos/dll/win32/mshtml/htmltextcont.c
-19
View File
@@ -16,27 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <config.h>
#include <stdarg.h>
//#include <stdio.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
#include <wine/debug.h>
#include "mshtml_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
static inline HTMLTextContainer *impl_from_IHTMLTextContainer(IHTMLTextContainer *iface)
{
return CONTAINING_RECORD(iface, HTMLTextContainer, IHTMLTextContainer_iface);
reactos/dll/win32/mshtml/htmltextnode.c
-17
View File
@@ -16,25 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <stdarg.h>
#include <assert.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
#include "mshtml_private.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
struct HTMLDOMTextNode {
HTMLDOMNode node;
IHTMLDOMTextNode IHTMLDOMTextNode_iface;
reactos/dll/win32/mshtml/htmlwindow.c
+1 -27
View File
@@ -16,35 +16,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <stdarg.h>
#include <assert.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
#include <mshtmdid.h>
#include <shlguid.h>
#include <shobjidl.h>
#include <exdispid.h>
#define NO_SHLWAPI_REG
#include "shlwapi.h"
#include <wine/debug.h>
#include "mshtml_private.h"
#include "htmlevent.h"
#include "htmlscript.h"
#include "binding.h"
#include "resource.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
#include <exdispid.h>
static struct list window_list = LIST_INIT(window_list);
reactos/dll/win32/mshtml/ifacewrap.c
-18
View File
@@ -16,26 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <config.h>
#include <stdarg.h>
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
#include <wine/debug.h>
#include "mshtml_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
/*
* This object wraps any unrecognized interface overriding its IUnknown methods, allowing
* us to return external interface from our QI implementation preserving COM rules.
reactos/dll/win32/mshtml/ipwindow.c
-20
View File
@@ -16,27 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <config.h>
#include <stdarg.h>
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
//#include "shlobj.h"
#include "mshtml_private.h"
#include "pluginhost.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
typedef struct {
IOleInPlaceFrame IOleInPlaceFrame_iface;
reactos/dll/win32/mshtml/lang/Bg.rc
-2
View File
@@ -16,8 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "resource.h"
LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
STRINGTABLE
reactos/dll/win32/mshtml/lang/Da.rc
-2
View File
@@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "resource.h"
#pragma code_page(65001)
LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
reactos/dll/win32/mshtml/lang/De.rc
-2
View File
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "resource.h"
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
#pragma code_page(65001)
reactos/dll/win32/mshtml/lang/En.rc
-2
View File
@@ -16,8 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "resource.h"
LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
STRINGTABLE
reactos/dll/win32/mshtml/lang/Es.rc
-2
View File
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "resource.h"
LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
STRINGTABLE
reactos/dll/win32/mshtml/lang/Fi.rc
-2
View File
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "resource.h"
LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
STRINGTABLE
reactos/dll/win32/mshtml/lang/Fr.rc
-2
View File
@@ -20,8 +20,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "resource.h"
/* UTF-8 */
#pragma code_page(65001)
reactos/dll/win32/mshtml/lang/He.rc
-2
View File
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "resource.h"
LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
STRINGTABLE
reactos/dll/win32/mshtml/lang/Hu.rc
-2
View File
@@ -16,8 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "resource.h"
/* UTF-8 */
#pragma code_page(65001)
reactos/dll/win32/mshtml/lang/It.rc
-2
View File
@@ -16,8 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "resource.h"
/*UTF-8*/
#pragma code_page(65001)
reactos/dll/win32/mshtml/lang/Ja.rc
-2
View File
@@ -16,8 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "resource.h"
/* UTF-8 */
#pragma code_page(65001)
reactos/dll/win32/mshtml/lang/Ko.rc
-2
View File
@@ -17,8 +17,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "resource.h"
LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
STRINGTABLE
reactos/dll/win32/mshtml/lang/Lt.rc
-2
View File
@@ -16,8 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "resource.h"
/* UTF-8 */
#pragma code_page(65001)
reactos/dll/win32/mshtml/lang/Nl.rc
-2
View File
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "resource.h"
LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
STRINGTABLE
reactos/dll/win32/mshtml/lang/No.rc
-2
View File
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "resource.h"
#pragma code_page(65001)
LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
reactos/dll/win32/mshtml/lang/Pl.rc
-2
View File
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "resource.h"
LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
STRINGTABLE
reactos/dll/win32/mshtml/lang/Pt.rc
-2
View File
@@ -17,8 +17,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "resource.h"
#pragma code_page(65001)
LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
reactos/dll/win32/mshtml/lang/Ro.rc
-2
View File
@@ -17,8 +17,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "resource.h"
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
#pragma code_page(65001)
reactos/dll/win32/mshtml/lang/Ru.rc
-2
View File
@@ -16,8 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "resource.h"
/* UTF-8 */
#pragma code_page(65001)
reactos/dll/win32/mshtml/lang/Si.rc
-2
View File
@@ -16,8 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "resource.h"
#pragma code_page(65001)
LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
reactos/dll/win32/mshtml/lang/Sv.rc
-2
View File
@@ -16,8 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "resource.h"
LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
STRINGTABLE
reactos/dll/win32/mshtml/lang/Tr.rc
-2
View File
@@ -16,8 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "resource.h"
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
STRINGTABLE
reactos/dll/win32/mshtml/lang/Uk.rc
-2
View File
@@ -17,8 +17,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "resource.h"
/* UTF-8 */
#pragma code_page(65001)
reactos/dll/win32/mshtml/lang/Zh.rc
-2
View File
@@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "resource.h"
/* Chinese text is encoded in UTF-8 */
#pragma code_page(65001)
reactos/dll/win32/mshtml/loadopts.c
-20
View File
@@ -16,28 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <config.h>
#include <stdarg.h>
//#include <stdio.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
#include <optary.h>
#include <wine/debug.h>
#include "mshtml_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
typedef struct load_opt {
DWORD option;
PVOID buffer;
reactos/dll/win32/mshtml/main.c
+3 -24
View File
@@ -20,32 +20,11 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
//#include <stdarg.h>
#include <stdio.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <winreg.h>
#include <ole2.h>
#include <advpub.h>
//#include "shlwapi.h"
#include <optary.h>
#include "rpcproxy.h"
#include <shlguid.h>
#include <wine/debug.h>
#define INIT_GUID
#include "mshtml_private.h"
#include "resource.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
#include <advpub.h>
#include <rpcproxy.h>
#include <initguid.h>
HINSTANCE hInst;
DWORD mshtml_tls = TLS_OUT_OF_INDEXES;
reactos/dll/win32/mshtml/mshtml_private.h
+40 -14
View File
@@ -16,28 +16,47 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <config.h>
#include <assert.h>
#include <stdarg.h>
#include <stdio.h>
#include <math.h>
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COBJMACROS
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include <windef.h>
#include <winbase.h>
#include <winreg.h>
#include <wingdi.h>
#include "docobj.h"
#include "docobjectservice.h"
#include <comcat.h>
#include <mshtml.h>
#include <ole2.h>
#include <docobjectservice.h>
#include <mshtmhst.h>
#include <hlink.h>
#include <mshtmcid.h>
#include <mshtmdid.h>
#include <perhist.h>
#include <dispex.h>
#include "objsafe.h"
#include "htiframe.h"
#include "tlogstg.h"
#include <objsafe.h>
#include <htiframe.h>
#include <tlogstg.h>
#include <shdeprecated.h>
#include <shlguid.h>
#define NO_SHLWAPI_REG
#include <shlwapi.h>
#include <optary.h>
#include <idispids.h>
#include <wininet.h>
#include <nsiface.h>
#include <wine/list.h>
#include <wine/unicode.h>
#ifdef INIT_GUID
#include <initguid.h>
#endif
#include <nsiface.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
#define NS_ERROR_GENERATE_FAILURE(module,code) \
((nsresult) (((UINT32)(1<<31)) | ((UINT32)(module+0x45)<<16) | ((UINT32)(code))))
@@ -1178,3 +1197,10 @@ HINSTANCE get_shdoclc(void) DECLSPEC_HIDDEN;
void set_statustext(HTMLDocumentObj*,INT,LPCWSTR) DECLSPEC_HIDDEN;
extern HINSTANCE hInst DECLSPEC_HIDDEN;
#include "binding.h"
#include "htmlevent.h"
#include "htmlscript.h"
#include "htmlstyle.h"
#include "pluginhost.h"
#include "resource.h"
reactos/dll/win32/mshtml/mutation.c
-24
View File
@@ -16,31 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <config.h>
#include <stdarg.h>
#include <assert.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
//#include "winreg.h"
#include <ole2.h>
#include <shlguid.h>
#include "mshtml_private.h"
#include "htmlscript.h"
#include "htmlevent.h"
#include "binding.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
#define IE_MAJOR_VERSION 7
#define IE_MINOR_VERSION 0
reactos/dll/win32/mshtml/navigate.c
+2 -29
View File
@@ -16,37 +16,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <config.h>
#include <stdarg.h>
#include <assert.h>
#define COBJMACROS
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <winreg.h>
#include <ole2.h>
#include <hlguids.h>
#include <shlguid.h>
#include <wininet.h>
#include <shlwapi.h>
#include "htiface.h"
#include "shdeprecated.h"
#include <wine/debug.h>
#include "mshtml_private.h"
#include "htmlscript.h"
#include "binding.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
#include <hlguids.h>
#include <htiface.h>
#define CONTENT_LENGTH "Content-Length"
#define UTF8_STR "utf-8"
reactos/dll/win32/mshtml/npplugin.c
-20
View File
@@ -16,27 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <config.h>
#include <stdarg.h>
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
//#include "shlobj.h"
#include "mshtml_private.h"
#include "pluginhost.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
/* Parts of npapi.h */
reactos/dll/win32/mshtml/nsembed.c
+3 -23
View File
@@ -16,31 +16,11 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <config.h>
#include <stdarg.h>
#include <assert.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <winreg.h>
#include <ole2.h>
#include "shlobj.h"
#include "shlwapi.h"
#include <wine/debug.h>
#include "mshtml_private.h"
#include "htmlevent.h"
#include "binding.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
#include <wincon.h>
#include <shlobj.h>
WINE_DECLARE_DEBUG_CHANNEL(gecko);
#define NS_APPSTARTUPNOTIFIER_CONTRACTID "@mozilla.org/embedcomp/appstartup-notifier;1"
reactos/dll/win32/mshtml/nsevents.c
-24
View File
@@ -16,31 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <config.h>
#include <stdarg.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
#include <mshtmcid.h>
#include <shlguid.h>
#include <wine/debug.h>
#include "mshtml_private.h"
#include "htmlscript.h"
#include "htmlevent.h"
#include "binding.h"
#include "resource.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
static const PRUnichar blurW[] = {'b','l','u','r',0};
static const PRUnichar focusW[] = {'f','o','c','u','s',0};
reactos/dll/win32/mshtml/nsio.c
-24
View File
@@ -16,31 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <config.h>
#include <stdarg.h>
#include <assert.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <winreg.h>
#include <ole2.h>
#include <shlguid.h>
#include <wininet.h>
#include <shlwapi.h>
#include <wine/debug.h>
#include "mshtml_private.h"
#include "binding.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
#define NS_IOSERVICE_CLASSNAME "nsIOService"
#define NS_IOSERVICE_CONTRACTID "@mozilla.org/network/io-service;1"
reactos/dll/win32/mshtml/nsservice.c
-19
View File
@@ -16,27 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <config.h>
#include <stdarg.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
//#include "winreg.h"
#include <ole2.h>
#include <wine/debug.h>
#include "mshtml_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
#define NS_PROMPTSERVICE_CONTRACTID "@mozilla.org/embedcomp/prompt-service;1"
#define NS_TOOLTIPTEXTPROVIDER_CONTRACTID "@mozilla.org/embedcomp/tooltiptextprovider;1"
reactos/dll/win32/mshtml/olecmd.c
-22
View File
@@ -16,29 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <stdarg.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
#include <shlguid.h>
//#include "mshtmdid.h"
//#include "idispids.h"
#include <mshtmcid.h>
#include <wine/debug.h>
#include "mshtml_private.h"
#include "binding.h"
#include "resource.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
#define NSCMD_COPY "cmd_copy"
reactos/dll/win32/mshtml/oleobj.c
-23
View File
@@ -16,31 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <config.h>
#include <stdarg.h>
//#include <stdio.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
#include <shlguid.h>
#include <shdeprecated.h>
#include <mshtmdid.h>
#include <idispids.h>
#include <wine/debug.h>
#include "mshtml_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
#define DOCHOST_DOCCANNAVIGATE 0
typedef struct {
reactos/dll/win32/mshtml/olewnd.c
-20
View File
@@ -16,27 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <config.h>
#include <stdarg.h>
//#include <stdio.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
#include <wine/debug.h>
#include "mshtml_private.h"
//#include "resource.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
/**********************************************************
* IOleInPlaceActiveObject implementation
reactos/dll/win32/mshtml/omnavigator.c
-16
View File
@@ -16,24 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <stdarg.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
#include <wine/debug.h>
#include "mshtml_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
#ifdef __REACTOS__
/* HACK This is a Vista+ API */
static INT WINAPI LCIDToLocaleName( LCID lcid, LPWSTR name, INT count, DWORD flags )
reactos/dll/win32/mshtml/persist.c
-30
View File
@@ -16,37 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <config.h>
#include <stdarg.h>
#include <stdio.h>
#define COBJMACROS
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
#include <shlguid.h>
#include <idispids.h>
#define NO_SHLWAPI_REG
#include "shlwapi.h"
#include <wine/debug.h>
#include "mshtml_private.h"
#include "htmlscript.h"
#include "htmlevent.h"
#include "binding.h"
#include "resource.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
/* Undocumented notification, see tests */
#define CMDID_EXPLORER_UPDATEHISTORY 38
reactos/dll/win32/mshtml/pluginhost.c
-22
View File
@@ -16,29 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <config.h>
#include <stdarg.h>
#include <assert.h>
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
//#include "shlobj.h"
#include <mshtmdid.h>
#include "mshtml_private.h"
#include "pluginhost.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
const IID IID_HTMLPluginContainer =
{0xbd7a6050,0xb373,0x4f6f,{0xa4,0x93,0xdd,0x40,0xc5,0x23,0xa8,0x6a}};
reactos/dll/win32/mshtml/propbag.c
-20
View File
@@ -16,27 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <config.h>
#include <stdarg.h>
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
//#include "shlobj.h"
#include "mshtml_private.h"
#include "pluginhost.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
typedef struct {
IPropertyBag IPropertyBag_iface;
reactos/dll/win32/mshtml/protocol.c
-19
View File
@@ -16,27 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <config.h>
#include <stdarg.h>
//#include <stdio.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
#include <wine/debug.h>
#include "mshtml_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
/********************************************************************
* common ProtocolFactory implementation
*/
reactos/dll/win32/mshtml/resource.h
+1 -3
View File
@@ -16,9 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <windef.h>
#include <winuser.h>
#include <commctrl.h>
#pragma once
#define IDS_HTMLDOCUMENT 7501
reactos/dll/win32/mshtml/rsrc.rc
+1 -2
View File
@@ -16,10 +16,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
//#include "windef.h"
#include <windef.h>
#include <winuser.h>
#include <commctrl.h>
//#include "mshtmcid.h"
#include "resource.h"
reactos/dll/win32/mshtml/script.c
+1 -24
View File
@@ -16,32 +16,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <config.h>
#include <stdarg.h>
#include <assert.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
//#include "activscp.h"
#include <activdbg.h>
#include <wine/debug.h>
#include "mshtml_private.h"
#include "htmlscript.h"
#include "pluginhost.h"
#include "htmlevent.h"
#include "binding.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
#include <activdbg.h>
#ifdef _WIN64
reactos/dll/win32/mshtml/secmgr.c
+1 -20
View File
@@ -16,28 +16,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <config.h>
#include <stdarg.h>
//#include <stdio.h>
#include <assert.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
#include <activscp.h>
#include <wine/debug.h>
#include "mshtml_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
#include <activscp.h>
static const WCHAR about_blankW[] = {'a','b','o','u','t',':','b','l','a','n','k',0};
reactos/dll/win32/mshtml/selection.c
-16
View File
@@ -16,24 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <stdarg.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
#include <wine/debug.h>
#include "mshtml_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
typedef struct {
IHTMLSelectionObject IHTMLSelectionObject_iface;
reactos/dll/win32/mshtml/service.c
-19
View File
@@ -16,27 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <config.h>
#include <stdarg.h>
//#include <stdio.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
#include <wine/debug.h>
#include "mshtml_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
typedef struct {
IOleUndoManager IOleUndoManager_iface;

Some files were not shown because too many files have changed in this diff Show More