ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mshtml: COM cleanup for the IHTMLDocument5 iface.

This commit is contained in:
Michael Stefaniuc 2010-12-22 10:43:37 +01:00 committed by Alexandre Julliard
parent 8b3a76d694
commit f178089e9d
3 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/mshtml/htmldoc.c
View File

@ -1725,7 +1725,7 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv)
*ppv = &This->IHTMLDocument4_iface; *ppv = &This->IHTMLDocument4_iface;
}else if(IsEqualGUID(&IID_IHTMLDocument5, riid)) { }else if(IsEqualGUID(&IID_IHTMLDocument5, riid)) {
TRACE("(%p)->(IID_IHTMLDocument5, %p)\n", This, ppv); TRACE("(%p)->(IID_IHTMLDocument5, %p)\n", This, ppv);
*ppv = HTMLDOC5(This); *ppv = &This->IHTMLDocument5_iface;
}else if(IsEqualGUID(&IID_IHTMLDocument6, riid)) { }else if(IsEqualGUID(&IID_IHTMLDocument6, riid)) {
TRACE("(%p)->(IID_IHTMLDocument6, %p)\n", This, ppv); TRACE("(%p)->(IID_IHTMLDocument6, %p)\n", This, ppv);
*ppv = HTMLDOC6(This); *ppv = HTMLDOC6(This);

61
dlls/mshtml/htmldoc5.c
View File

@ -34,44 +34,47 @@
WINE_DEFAULT_DEBUG_CHANNEL(mshtml); WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
#define HTMLDOC5_THIS(iface) DEFINE_THIS(HTMLDocument, HTMLDocument5, iface) static inline HTMLDocument *impl_from_IHTMLDocument5(IHTMLDocument5 *iface)
{
return CONTAINING_RECORD(iface, HTMLDocument, IHTMLDocument5_iface);
}
static HRESULT WINAPI HTMLDocument5_QueryInterface(IHTMLDocument5 *iface, static HRESULT WINAPI HTMLDocument5_QueryInterface(IHTMLDocument5 *iface,
REFIID riid, void **ppv) REFIID riid, void **ppv)
{ {
HTMLDocument *This = HTMLDOC5_THIS(iface); HTMLDocument *This = impl_from_IHTMLDocument5(iface);
return htmldoc_query_interface(This, riid, ppv); return htmldoc_query_interface(This, riid, ppv);
} }
static ULONG WINAPI HTMLDocument5_AddRef(IHTMLDocument5 *iface) static ULONG WINAPI HTMLDocument5_AddRef(IHTMLDocument5 *iface)
{ {
HTMLDocument *This = HTMLDOC5_THIS(iface); HTMLDocument *This = impl_from_IHTMLDocument5(iface);
return htmldoc_addref(This); return htmldoc_addref(This);
} }
static ULONG WINAPI HTMLDocument5_Release(IHTMLDocument5 *iface) static ULONG WINAPI HTMLDocument5_Release(IHTMLDocument5 *iface)
{ {
HTMLDocument *This = HTMLDOC5_THIS(iface); HTMLDocument *This = impl_from_IHTMLDocument5(iface);
return htmldoc_release(This); return htmldoc_release(This);
} }
static HRESULT WINAPI HTMLDocument5_GetTypeInfoCount(IHTMLDocument5 *iface, UINT *pctinfo) static HRESULT WINAPI HTMLDocument5_GetTypeInfoCount(IHTMLDocument5 *iface, UINT *pctinfo)
{ {
HTMLDocument *This = HTMLDOC5_THIS(iface); HTMLDocument *This = impl_from_IHTMLDocument5(iface);
return IDispatchEx_GetTypeInfoCount(DISPATCHEX(This), pctinfo); return IDispatchEx_GetTypeInfoCount(DISPATCHEX(This), pctinfo);
} }
static HRESULT WINAPI HTMLDocument5_GetTypeInfo(IHTMLDocument5 *iface, UINT iTInfo, static HRESULT WINAPI HTMLDocument5_GetTypeInfo(IHTMLDocument5 *iface, UINT iTInfo,
LCID lcid, ITypeInfo **ppTInfo) LCID lcid, ITypeInfo **ppTInfo)
{ {
HTMLDocument *This = HTMLDOC5_THIS(iface); HTMLDocument *This = impl_from_IHTMLDocument5(iface);
return IDispatchEx_GetTypeInfo(DISPATCHEX(This), iTInfo, lcid, ppTInfo); return IDispatchEx_GetTypeInfo(DISPATCHEX(This), iTInfo, lcid, ppTInfo);
} }
static HRESULT WINAPI HTMLDocument5_GetIDsOfNames(IHTMLDocument5 *iface, REFIID riid, static HRESULT WINAPI HTMLDocument5_GetIDsOfNames(IHTMLDocument5 *iface, REFIID riid,
LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId)
{ {
HTMLDocument *This = HTMLDOC5_THIS(iface); HTMLDocument *This = impl_from_IHTMLDocument5(iface);
return IDispatchEx_GetIDsOfNames(DISPATCHEX(This), riid, rgszNames, cNames, lcid, rgDispId); return IDispatchEx_GetIDsOfNames(DISPATCHEX(This), riid, rgszNames, cNames, lcid, rgDispId);
} }
@ -79,35 +82,35 @@ static HRESULT WINAPI HTMLDocument5_Invoke(IHTMLDocument5 *iface, DISPID dispIdM
REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams,
VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr)
{ {
HTMLDocument *This = HTMLDOC5_THIS(iface); HTMLDocument *This = impl_from_IHTMLDocument5(iface);
return IDispatchEx_Invoke(DISPATCHEX(This), dispIdMember, riid, lcid, wFlags, pDispParams, return IDispatchEx_Invoke(DISPATCHEX(This), dispIdMember, riid, lcid, wFlags, pDispParams,
pVarResult, pExcepInfo, puArgErr); pVarResult, pExcepInfo, puArgErr);
} }
static HRESULT WINAPI HTMLDocument5_put_onmousewheel(IHTMLDocument5 *iface, VARIANT v) static HRESULT WINAPI HTMLDocument5_put_onmousewheel(IHTMLDocument5 *iface, VARIANT v)
{ {
HTMLDocument *This = HTMLDOC5_THIS(iface); HTMLDocument *This = impl_from_IHTMLDocument5(iface);
FIXME("(%p)->(v)\n", This); FIXME("(%p)->(v)\n", This);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLDocument5_get_onmousewheel(IHTMLDocument5 *iface, VARIANT *p) static HRESULT WINAPI HTMLDocument5_get_onmousewheel(IHTMLDocument5 *iface, VARIANT *p)
{ {
HTMLDocument *This = HTMLDOC5_THIS(iface); HTMLDocument *This = impl_from_IHTMLDocument5(iface);
FIXME("(%p)->(%p)\n", This, p); FIXME("(%p)->(%p)\n", This, p);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLDocument5_get_doctype(IHTMLDocument5 *iface, IHTMLDOMNode **p) static HRESULT WINAPI HTMLDocument5_get_doctype(IHTMLDocument5 *iface, IHTMLDOMNode **p)
{ {
HTMLDocument *This = HTMLDOC5_THIS(iface); HTMLDocument *This = impl_from_IHTMLDocument5(iface);
FIXME("(%p)->(%p)\n", This, p); FIXME("(%p)->(%p)\n", This, p);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLDocument5_get_implementation(IHTMLDocument5 *iface, IHTMLDOMImplementation **p) static HRESULT WINAPI HTMLDocument5_get_implementation(IHTMLDocument5 *iface, IHTMLDOMImplementation **p)
{ {
HTMLDocument *This = HTMLDOC5_THIS(iface); HTMLDocument *This = impl_from_IHTMLDocument5(iface);
FIXME("(%p)->(%p)\n", This, p); FIXME("(%p)->(%p)\n", This, p);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -115,7 +118,7 @@ static HRESULT WINAPI HTMLDocument5_get_implementation(IHTMLDocument5 *iface, IH
static HRESULT WINAPI HTMLDocument5_createAttribute(IHTMLDocument5 *iface, BSTR bstrattrName, static HRESULT WINAPI HTMLDocument5_createAttribute(IHTMLDocument5 *iface, BSTR bstrattrName,
IHTMLDOMAttribute **ppattribute) IHTMLDOMAttribute **ppattribute)
{ {
HTMLDocument *This = HTMLDOC5_THIS(iface); HTMLDocument *This = impl_from_IHTMLDocument5(iface);
FIXME("(%p)->(%s %p)\n", This, debugstr_w(bstrattrName), ppattribute); FIXME("(%p)->(%s %p)\n", This, debugstr_w(bstrattrName), ppattribute);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -123,7 +126,7 @@ static HRESULT WINAPI HTMLDocument5_createAttribute(IHTMLDocument5 *iface, BSTR
static HRESULT WINAPI HTMLDocument5_createComment(IHTMLDocument5 *iface, BSTR bstrdata, static HRESULT WINAPI HTMLDocument5_createComment(IHTMLDocument5 *iface, BSTR bstrdata,
IHTMLDOMNode **ppRetNode) IHTMLDOMNode **ppRetNode)
{ {
HTMLDocument *This = HTMLDOC5_THIS(iface); HTMLDocument *This = impl_from_IHTMLDocument5(iface);
nsIDOMComment *nscomment; nsIDOMComment *nscomment;
HTMLElement *elem; HTMLElement *elem;
nsAString str; nsAString str;
@ -157,91 +160,91 @@ static HRESULT WINAPI HTMLDocument5_createComment(IHTMLDocument5 *iface, BSTR bs
static HRESULT WINAPI HTMLDocument5_put_onfocusin(IHTMLDocument5 *iface, VARIANT v) static HRESULT WINAPI HTMLDocument5_put_onfocusin(IHTMLDocument5 *iface, VARIANT v)
{ {
HTMLDocument *This = HTMLDOC5_THIS(iface); HTMLDocument *This = impl_from_IHTMLDocument5(iface);
FIXME("(%p)->(v)\n", This); FIXME("(%p)->(v)\n", This);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLDocument5_get_onfocusin(IHTMLDocument5 *iface, VARIANT *p) static HRESULT WINAPI HTMLDocument5_get_onfocusin(IHTMLDocument5 *iface, VARIANT *p)
{ {
HTMLDocument *This = HTMLDOC5_THIS(iface); HTMLDocument *This = impl_from_IHTMLDocument5(iface);
FIXME("(%p)->(%p)\n", This, p); FIXME("(%p)->(%p)\n", This, p);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLDocument5_put_onfocusout(IHTMLDocument5 *iface, VARIANT v) static HRESULT WINAPI HTMLDocument5_put_onfocusout(IHTMLDocument5 *iface, VARIANT v)
{ {
HTMLDocument *This = HTMLDOC5_THIS(iface); HTMLDocument *This = impl_from_IHTMLDocument5(iface);
FIXME("(%p)->(v)\n", This); FIXME("(%p)->(v)\n", This);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLDocument5_get_onfocusout(IHTMLDocument5 *iface, VARIANT *p) static HRESULT WINAPI HTMLDocument5_get_onfocusout(IHTMLDocument5 *iface, VARIANT *p)
{ {
HTMLDocument *This = HTMLDOC5_THIS(iface); HTMLDocument *This = impl_from_IHTMLDocument5(iface);
FIXME("(%p)->(%p)\n", This, p); FIXME("(%p)->(%p)\n", This, p);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLDocument5_put_onactivate(IHTMLDocument5 *iface, VARIANT v) static HRESULT WINAPI HTMLDocument5_put_onactivate(IHTMLDocument5 *iface, VARIANT v)
{ {
HTMLDocument *This = HTMLDOC5_THIS(iface); HTMLDocument *This = impl_from_IHTMLDocument5(iface);
FIXME("(%p)->(v)\n", This); FIXME("(%p)->(v)\n", This);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLDocument5_get_onactivate(IHTMLDocument5 *iface, VARIANT *p) static HRESULT WINAPI HTMLDocument5_get_onactivate(IHTMLDocument5 *iface, VARIANT *p)
{ {
HTMLDocument *This = HTMLDOC5_THIS(iface); HTMLDocument *This = impl_from_IHTMLDocument5(iface);
FIXME("(%p)->(%p)\n", This, p); FIXME("(%p)->(%p)\n", This, p);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLDocument5_put_ondeactivate(IHTMLDocument5 *iface, VARIANT v) static HRESULT WINAPI HTMLDocument5_put_ondeactivate(IHTMLDocument5 *iface, VARIANT v)
{ {
HTMLDocument *This = HTMLDOC5_THIS(iface); HTMLDocument *This = impl_from_IHTMLDocument5(iface);
FIXME("(%p)->(v)\n", This); FIXME("(%p)->(v)\n", This);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLDocument5_get_ondeactivate(IHTMLDocument5 *iface, VARIANT *p) static HRESULT WINAPI HTMLDocument5_get_ondeactivate(IHTMLDocument5 *iface, VARIANT *p)
{ {
HTMLDocument *This = HTMLDOC5_THIS(iface); HTMLDocument *This = impl_from_IHTMLDocument5(iface);
FIXME("(%p)->(%p)\n", This, p); FIXME("(%p)->(%p)\n", This, p);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLDocument5_put_onbeforeactivate(IHTMLDocument5 *iface, VARIANT v) static HRESULT WINAPI HTMLDocument5_put_onbeforeactivate(IHTMLDocument5 *iface, VARIANT v)
{ {
HTMLDocument *This = HTMLDOC5_THIS(iface); HTMLDocument *This = impl_from_IHTMLDocument5(iface);
FIXME("(%p)->(v)\n", This); FIXME("(%p)->(v)\n", This);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLDocument5_get_onbeforeactivate(IHTMLDocument5 *iface, VARIANT *p) static HRESULT WINAPI HTMLDocument5_get_onbeforeactivate(IHTMLDocument5 *iface, VARIANT *p)
{ {
HTMLDocument *This = HTMLDOC5_THIS(iface); HTMLDocument *This = impl_from_IHTMLDocument5(iface);
FIXME("(%p)->(%p)\n", This, p); FIXME("(%p)->(%p)\n", This, p);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLDocument5_put_onbeforedeactivate(IHTMLDocument5 *iface, VARIANT v) static HRESULT WINAPI HTMLDocument5_put_onbeforedeactivate(IHTMLDocument5 *iface, VARIANT v)
{ {
HTMLDocument *This = HTMLDOC5_THIS(iface); HTMLDocument *This = impl_from_IHTMLDocument5(iface);
FIXME("(%p)->(v)\n", This); FIXME("(%p)->(v)\n", This);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLDocument5_get_onbeforedeactivate(IHTMLDocument5 *iface, VARIANT *p) static HRESULT WINAPI HTMLDocument5_get_onbeforedeactivate(IHTMLDocument5 *iface, VARIANT *p)
{ {
HTMLDocument *This = HTMLDOC5_THIS(iface); HTMLDocument *This = impl_from_IHTMLDocument5(iface);
FIXME("(%p)->(%p)\n", This, p); FIXME("(%p)->(%p)\n", This, p);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLDocument5_get_compatMode(IHTMLDocument5 *iface, BSTR *p) static HRESULT WINAPI HTMLDocument5_get_compatMode(IHTMLDocument5 *iface, BSTR *p)
{ {
HTMLDocument *This = HTMLDOC5_THIS(iface); HTMLDocument *This = impl_from_IHTMLDocument5(iface);
nsIDOMNSHTMLDocument *nshtmldoc; nsIDOMNSHTMLDocument *nshtmldoc;
nsAString mode_str; nsAString mode_str;
const PRUnichar *mode; const PRUnichar *mode;
@ -271,8 +274,6 @@ static HRESULT WINAPI HTMLDocument5_get_compatMode(IHTMLDocument5 *iface, BSTR *
return S_OK; return S_OK;
} }
#undef HTMLDOC5_THIS
static const IHTMLDocument5Vtbl HTMLDocument5Vtbl = { static const IHTMLDocument5Vtbl HTMLDocument5Vtbl = {
HTMLDocument5_QueryInterface, HTMLDocument5_QueryInterface,
HTMLDocument5_AddRef, HTMLDocument5_AddRef,
@ -437,6 +438,6 @@ static const IHTMLDocument6Vtbl HTMLDocument6Vtbl = {
void HTMLDocument_HTMLDocument5_Init(HTMLDocument *This) void HTMLDocument_HTMLDocument5_Init(HTMLDocument *This)
{ {
This->lpHTMLDocument5Vtbl = &HTMLDocument5Vtbl; This->IHTMLDocument5_iface.lpVtbl = &HTMLDocument5Vtbl;
This->lpHTMLDocument6Vtbl = &HTMLDocument6Vtbl; This->lpHTMLDocument6Vtbl = &HTMLDocument6Vtbl;
} }

3
dlls/mshtml/mshtml_private.h
View File

@ -345,7 +345,7 @@ struct HTMLDocument {
IHTMLDocument2 IHTMLDocument2_iface; IHTMLDocument2 IHTMLDocument2_iface;
IHTMLDocument3 IHTMLDocument3_iface; IHTMLDocument3 IHTMLDocument3_iface;
IHTMLDocument4 IHTMLDocument4_iface; IHTMLDocument4 IHTMLDocument4_iface;
const IHTMLDocument5Vtbl *lpHTMLDocument5Vtbl; IHTMLDocument5 IHTMLDocument5_iface;
const IHTMLDocument6Vtbl *lpHTMLDocument6Vtbl; const IHTMLDocument6Vtbl *lpHTMLDocument6Vtbl;
const IPersistMonikerVtbl *lpPersistMonikerVtbl; const IPersistMonikerVtbl *lpPersistMonikerVtbl;
const IPersistFileVtbl *lpPersistFileVtbl; const IPersistFileVtbl *lpPersistFileVtbl;
@ -626,7 +626,6 @@ struct HTMLDocumentNode {
#define HTMLWINDOW3(x) ((IHTMLWindow3*) &(x)->lpHTMLWindow3Vtbl) #define HTMLWINDOW3(x) ((IHTMLWindow3*) &(x)->lpHTMLWindow3Vtbl)
#define HTMLWINDOW4(x) ((IHTMLWindow4*) &(x)->lpHTMLWindow4Vtbl) #define HTMLWINDOW4(x) ((IHTMLWindow4*) &(x)->lpHTMLWindow4Vtbl)
#define HTMLDOC5(x) ((IHTMLDocument5*) &(x)->lpHTMLDocument5Vtbl)
#define HTMLDOC6(x) ((IHTMLDocument6*) &(x)->lpHTMLDocument6Vtbl) #define HTMLDOC6(x) ((IHTMLDocument6*) &(x)->lpHTMLDocument6Vtbl)
#define PERSIST(x) ((IPersist*) &(x)->lpPersistFileVtbl) #define PERSIST(x) ((IPersist*) &(x)->lpPersistFileVtbl)
#define PERSISTMON(x) ((IPersistMoniker*) &(x)->lpPersistMonikerVtbl) #define PERSISTMON(x) ((IPersistMoniker*) &(x)->lpPersistMonikerVtbl)