Jacek Caban : mshtml: Moved HTMLStyle to separated header file.
Alexandre Julliard
julliard at winehq.org
Tue Oct 7 08:53:50 CDT 2008
Module: wine
Branch: master
Commit: 596206f05468d3d54914331adc20d8bd5a404ab9
URL: http://source.winehq.org/git/wine.git/?a=commit;h=596206f05468d3d54914331adc20d8bd5a404ab9
Author: Jacek Caban <jacek at codeweavers.com>
Date: Mon Oct 6 09:47:58 2008 -0500
mshtml: Moved HTMLStyle to separated header file.
---
dlls/mshtml/htmlstyle.c | 5 +++--
dlls/mshtml/htmlstyle.h | 32 ++++++++++++++++++++++++++++++++
dlls/mshtml/htmlstyle2.c | 5 +++--
dlls/mshtml/mshtml_private.h | 14 --------------
4 files changed, 38 insertions(+), 18 deletions(-)
diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c
index 1d2ea9f..83cdea7 100644
--- a/dlls/mshtml/htmlstyle.c
+++ b/dlls/mshtml/htmlstyle.c
@@ -25,11 +25,12 @@
#include "winuser.h"
#include "ole2.h"
+#include "mshtml_private.h"
+#include "htmlstyle.h"
+
#include "wine/debug.h"
#include "wine/unicode.h"
-#include "mshtml_private.h"
-
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
static const WCHAR attrBackground[] =
diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h
new file mode 100644
index 0000000..3e0ecc3
--- /dev/null
+++ b/dlls/mshtml/htmlstyle.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2008 Jacek Caban for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+typedef struct {
+ DispatchEx dispex;
+ const IHTMLStyleVtbl *lpHTMLStyleVtbl;
+ const IHTMLStyle2Vtbl *lpHTMLStyle2Vtbl;
+
+ LONG ref;
+
+ nsIDOMCSSStyleDeclaration *nsstyle;
+} HTMLStyle;
+
+#define HTMLSTYLE(x) ((IHTMLStyle*) &(x)->lpHTMLStyleVtbl)
+#define HTMLSTYLE2(x) ((IHTMLStyle2*) &(x)->lpHTMLStyle2Vtbl)
+
+void HTMLStyle2_Init(HTMLStyle*);
diff --git a/dlls/mshtml/htmlstyle2.c b/dlls/mshtml/htmlstyle2.c
index c25ce62..f900f7d 100644
--- a/dlls/mshtml/htmlstyle2.c
+++ b/dlls/mshtml/htmlstyle2.c
@@ -25,11 +25,12 @@
#include "winuser.h"
#include "ole2.h"
+#include "mshtml_private.h"
+#include "htmlstyle.h"
+
#include "wine/debug.h"
#include "wine/unicode.h"
-#include "mshtml_private.h"
-
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
#define HTMLSTYLE2_THIS(iface) DEFINE_THIS(HTMLStyle, HTMLStyle2, iface)
diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h
index 5a1dfc3..4df7efe 100644
--- a/dlls/mshtml/mshtml_private.h
+++ b/dlls/mshtml/mshtml_private.h
@@ -393,16 +393,6 @@ typedef struct {
ConnectionPoint cp;
} HTMLTextContainer;
-typedef struct {
- DispatchEx dispex;
- const IHTMLStyleVtbl *lpHTMLStyleVtbl;
- const IHTMLStyle2Vtbl *lpHTMLStyle2Vtbl;
-
- LONG ref;
-
- nsIDOMCSSStyleDeclaration *nsstyle;
-} HTMLStyle;
-
#define HTMLWINDOW2(x) ((IHTMLWindow2*) &(x)->lpHTMLWindow2Vtbl)
#define HTMLWINDOW3(x) ((IHTMLWindow3*) &(x)->lpHTMLWindow3Vtbl)
@@ -459,9 +449,6 @@ typedef struct {
#define HTMLOPTFACTORY(x) ((IHTMLOptionElementFactory*) &(x)->lpHTMLOptionElementFactoryVtbl)
#define HTMLLOCATION(x) ((IHTMLLocation*) &(x)->lpHTMLLocationVtbl)
-#define HTMLSTYLE(x) ((IHTMLStyle*) &(x)->lpHTMLStyleVtbl)
-#define HTMLSTYLE2(x) ((IHTMLStyle2*) &(x)->lpHTMLStyle2Vtbl)
-
#define DISPATCHEX(x) ((IDispatchEx*) &(x)->lpIDispatchExVtbl)
#define DEFINE_THIS2(cls,ifc,iface) ((cls*)((BYTE*)(iface)-offsetof(cls,ifc)))
@@ -487,7 +474,6 @@ void HTMLDocument_Window_Init(HTMLDocument*);
void HTMLDocument_Service_Init(HTMLDocument*);
void HTMLDocument_Hlink_Init(HTMLDocument*);
-void HTMLStyle2_Init(HTMLStyle*);
HRESULT HTMLCurrentStyle_Create(IHTMLCurrentStyle**);
void ConnectionPoint_Init(ConnectionPoint*,ConnectionPointContainer*,REFIID);
More information about the wine-cvs
mailing list