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

mshtml: COM cleanup for the IMonikerProp iface.

This commit is contained in:
Michael Stefaniuc 2010-12-23 02:12:25 +01:00 committed by Alexandre Julliard
parent af4c6c8155
commit 7e32a1abb3
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/mshtml/htmldoc.c
View File

@ -1740,7 +1740,7 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv)
*ppv = &This->IPersistFile_iface; *ppv = &This->IPersistFile_iface;
}else if(IsEqualGUID(&IID_IMonikerProp, riid)) { }else if(IsEqualGUID(&IID_IMonikerProp, riid)) {
TRACE("(%p)->(IID_IMonikerProp, %p)\n", This, ppv); TRACE("(%p)->(IID_IMonikerProp, %p)\n", This, ppv);
*ppv = MONPROP(This); *ppv = &This->IMonikerProp_iface;
}else if(IsEqualGUID(&IID_IOleObject, riid)) { }else if(IsEqualGUID(&IID_IOleObject, riid)) {
TRACE("(%p)->(IID_IOleObject, %p)\n", This, ppv); TRACE("(%p)->(IID_IOleObject, %p)\n", This, ppv);
*ppv = OLEOBJ(This); *ppv = OLEOBJ(This);

3
dlls/mshtml/mshtml_private.h
View File

@ -350,7 +350,7 @@ struct HTMLDocument {
IPersistMoniker IPersistMoniker_iface; IPersistMoniker IPersistMoniker_iface;
IPersistFile IPersistFile_iface; IPersistFile IPersistFile_iface;
IPersistHistory IPersistHistory_iface; IPersistHistory IPersistHistory_iface;
const IMonikerPropVtbl *lpMonikerPropVtbl; IMonikerProp IMonikerProp_iface;
const IOleObjectVtbl *lpOleObjectVtbl; const IOleObjectVtbl *lpOleObjectVtbl;
const IOleDocumentVtbl *lpOleDocumentVtbl; const IOleDocumentVtbl *lpOleDocumentVtbl;
const IOleDocumentViewVtbl *lpOleDocumentViewVtbl; const IOleDocumentViewVtbl *lpOleDocumentViewVtbl;
@ -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 MONPROP(x) ((IMonikerProp*) &(x)->lpMonikerPropVtbl)
#define OLEOBJ(x) ((IOleObject*) &(x)->lpOleObjectVtbl) #define OLEOBJ(x) ((IOleObject*) &(x)->lpOleObjectVtbl)
#define OLEDOC(x) ((IOleDocument*) &(x)->lpOleDocumentVtbl) #define OLEDOC(x) ((IOleDocument*) &(x)->lpOleDocumentVtbl)
#define DOCVIEW(x) ((IOleDocumentView*) &(x)->lpOleDocumentViewVtbl) #define DOCVIEW(x) ((IOleDocumentView*) &(x)->lpOleDocumentViewVtbl)

15
dlls/mshtml/persist.c
View File

@ -466,29 +466,32 @@ static const IPersistMonikerVtbl PersistMonikerVtbl = {
* IMonikerProp implementation * IMonikerProp implementation
*/ */
#define MONPROP_THIS(iface) DEFINE_THIS(HTMLDocument, MonikerProp, iface) static inline HTMLDocument *impl_from_IMonikerProp(IMonikerProp *iface)
{
return CONTAINING_RECORD(iface, HTMLDocument, IMonikerProp_iface);
}
static HRESULT WINAPI MonikerProp_QueryInterface(IMonikerProp *iface, REFIID riid, void **ppv) static HRESULT WINAPI MonikerProp_QueryInterface(IMonikerProp *iface, REFIID riid, void **ppv)
{ {
HTMLDocument *This = MONPROP_THIS(iface); HTMLDocument *This = impl_from_IMonikerProp(iface);
return htmldoc_query_interface(This, riid, ppv); return htmldoc_query_interface(This, riid, ppv);
} }
static ULONG WINAPI MonikerProp_AddRef(IMonikerProp *iface) static ULONG WINAPI MonikerProp_AddRef(IMonikerProp *iface)
{ {
HTMLDocument *This = MONPROP_THIS(iface); HTMLDocument *This = impl_from_IMonikerProp(iface);
return htmldoc_addref(This); return htmldoc_addref(This);
} }
static ULONG WINAPI MonikerProp_Release(IMonikerProp *iface) static ULONG WINAPI MonikerProp_Release(IMonikerProp *iface)
{ {
HTMLDocument *This = MONPROP_THIS(iface); HTMLDocument *This = impl_from_IMonikerProp(iface);
return htmldoc_release(This); return htmldoc_release(This);
} }
static HRESULT WINAPI MonikerProp_PutProperty(IMonikerProp *iface, MONIKERPROPERTY mkp, LPCWSTR val) static HRESULT WINAPI MonikerProp_PutProperty(IMonikerProp *iface, MONIKERPROPERTY mkp, LPCWSTR val)
{ {
HTMLDocument *This = MONPROP_THIS(iface); HTMLDocument *This = impl_from_IMonikerProp(iface);
TRACE("(%p)->(%d %s)\n", This, mkp, debugstr_w(val)); TRACE("(%p)->(%d %s)\n", This, mkp, debugstr_w(val));
@ -835,7 +838,7 @@ void HTMLDocument_Persist_Init(HTMLDocument *This)
{ {
This->IPersistMoniker_iface.lpVtbl = &PersistMonikerVtbl; This->IPersistMoniker_iface.lpVtbl = &PersistMonikerVtbl;
This->IPersistFile_iface.lpVtbl = &PersistFileVtbl; This->IPersistFile_iface.lpVtbl = &PersistFileVtbl;
This->lpMonikerPropVtbl = &MonikerPropVtbl; This->IMonikerProp_iface.lpVtbl = &MonikerPropVtbl;
This->IPersistStreamInit_iface.lpVtbl = &PersistStreamInitVtbl; This->IPersistStreamInit_iface.lpVtbl = &PersistStreamInitVtbl;
This->IPersistHistory_iface.lpVtbl = &PersistHistoryVtbl; This->IPersistHistory_iface.lpVtbl = &PersistHistoryVtbl;
} }