Skip to content

W
wine-winehq
Commit 6dcff905 authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard
Browse files
Options

mshtml: COM cleanup for the IHTMLStyle2 iface.

parent e7f5cc27
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
dlls/mshtml/htmlstyle.c
View file @ 6dcff905
...@@ -573,7 +573,7 @@ static HRESULT WINAPI HTMLStyle_QueryInterface(IHTMLStyle *iface, REFIID riid, v ...@@ -573,7 +573,7 @@ static HRESULT WINAPI HTMLStyle_QueryInterface(IHTMLStyle *iface, REFIID riid, v
*ppv = &This->IHTMLStyle_iface; *ppv = &This->IHTMLStyle_iface;
}else if(IsEqualGUID(&IID_IHTMLStyle2, riid)) { }else if(IsEqualGUID(&IID_IHTMLStyle2, riid)) {
TRACE("(%p)->(IID_IHTMLStyle2 %p)\n", This, ppv); TRACE("(%p)->(IID_IHTMLStyle2 %p)\n", This, ppv);
*ppv = HTMLSTYLE2(This); *ppv = &This->IHTMLStyle2_iface;
}else if(IsEqualGUID(&IID_IHTMLStyle3, riid)) { }else if(IsEqualGUID(&IID_IHTMLStyle3, riid)) {
TRACE("(%p)->(IID_IHTMLStyle3 %p)\n", This, ppv); TRACE("(%p)->(IID_IHTMLStyle3 %p)\n", This, ppv);
*ppv = HTMLSTYLE3(This); *ppv = HTMLSTYLE3(This);
...@@ -2037,7 +2037,7 @@ static HRESULT WINAPI HTMLStyle_get_position(IHTMLStyle *iface, BSTR *p) ...@@ -2037,7 +2037,7 @@ static HRESULT WINAPI HTMLStyle_get_position(IHTMLStyle *iface, BSTR *p)
{ {
HTMLStyle *This = impl_from_IHTMLStyle(iface); HTMLStyle *This = impl_from_IHTMLStyle(iface);
TRACE("(%p)->(%p)\n", This, p); TRACE("(%p)->(%p)\n", This, p);
return IHTMLStyle2_get_position(HTMLSTYLE2(This), p); return IHTMLStyle2_get_position(&This->IHTMLStyle2_iface, p);
} }
static HRESULT WINAPI HTMLStyle_put_zIndex(IHTMLStyle *iface, VARIANT v) static HRESULT WINAPI HTMLStyle_put_zIndex(IHTMLStyle *iface, VARIANT v)
......
dlls/mshtml/htmlstyle.h
View file @ 6dcff905
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
struct HTMLStyle { struct HTMLStyle {
DispatchEx dispex; DispatchEx dispex;
IHTMLStyle IHTMLStyle_iface; IHTMLStyle IHTMLStyle_iface;
const IHTMLStyle2Vtbl *lpHTMLStyle2Vtbl; IHTMLStyle2 IHTMLStyle2_iface;
const IHTMLStyle3Vtbl *lpHTMLStyle3Vtbl; const IHTMLStyle3Vtbl *lpHTMLStyle3Vtbl;
const IHTMLStyle4Vtbl *lpHTMLStyle4Vtbl; const IHTMLStyle4Vtbl *lpHTMLStyle4Vtbl;
...@@ -28,7 +28,6 @@ struct HTMLStyle { ...@@ -28,7 +28,6 @@ struct HTMLStyle {
nsIDOMCSSStyleDeclaration *nsstyle; nsIDOMCSSStyleDeclaration *nsstyle;
}; };
#define HTMLSTYLE2(x) ((IHTMLStyle2*) &(x)->lpHTMLStyle2Vtbl)
#define HTMLSTYLE3(x) ((IHTMLStyle3*) &(x)->lpHTMLStyle3Vtbl) #define HTMLSTYLE3(x) ((IHTMLStyle3*) &(x)->lpHTMLStyle3Vtbl)
#define HTMLSTYLE4(x) ((IHTMLStyle4*) &(x)->lpHTMLStyle4Vtbl) #define HTMLSTYLE4(x) ((IHTMLStyle4*) &(x)->lpHTMLStyle4Vtbl)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment