January 2011 - Wine-commits

Michael Stefaniuc : mshtml: COM cleanup for the IConnectionPoint* ifaces.
by Alexandre Julliard 03 Jan '11

03 Jan '11

Module: wine Branch: master Commit: 7f9f1697123b6ed7e10671791192a173cac4e906 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f9f1697123b6ed7e10671791… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 3 01:02:57 2011 +0100 mshtml: COM cleanup for the IConnectionPoint* ifaces. --- dlls/mshtml/conpoint.c | 61 +++++++++++++++++++++-------------------- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/mshtml_private.h | 5 +-- 4 files changed, 35 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7f9f1697123b6ed7e1067…

1 0

Michael Stefaniuc : mshtml: COM cleanup for the IHTMLOptionElement* ifaces.
by Alexandre Julliard 03 Jan '11

03 Jan '11

Module: wine Branch: master Commit: 118379d642e8ad064a3cfa56b05771f93ced54cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=118379d642e8ad064a3cfa56b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 3 01:04:25 2011 +0100 mshtml: COM cleanup for the IHTMLOptionElement* ifaces. --- dlls/mshtml/htmloption.c | 86 +++++++++++++++++++++--------------------- dlls/mshtml/htmlwindow.c | 4 +- dlls/mshtml/mshtml_private.h | 3 +- 3 files changed, 46 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=118379d642e8ad064a3cf…

1 0

Michael Stefaniuc : mshtml: COM cleanup for the IHTMLImageElementFactory iface.
by Alexandre Julliard 03 Jan '11

03 Jan '11

Module: wine Branch: master Commit: 726312c535e40de0212a0357c0ba76d2c236532b URL: http://source.winehq.org/git/wine.git/?a=commit;h=726312c535e40de0212a0357c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 3 01:05:51 2011 +0100 mshtml: COM cleanup for the IHTMLImageElementFactory iface. --- dlls/mshtml/htmlimg.c | 35 +++++++++++++++++++---------------- dlls/mshtml/htmlwindow.c | 4 ++-- dlls/mshtml/mshtml_private.h | 3 +-- 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index 6fb02cd..1008f87 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -693,21 +693,24 @@ HRESULT HTMLImgElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, return S_OK; } -#define HTMLIMGFACTORY_THIS(iface) DEFINE_THIS(HTMLImageElementFactory, HTMLImageElementFactory, iface) +static inline HTMLImageElementFactory *impl_from_IHTMLImageElementFactory(IHTMLImageElementFactory *iface) +{ + return CONTAINING_RECORD(iface, HTMLImageElementFactory, IHTMLImageElementFactory_iface); +} static HRESULT WINAPI HTMLImageElementFactory_QueryInterface(IHTMLImageElementFactory *iface, REFIID riid, void **ppv) { - HTMLImageElementFactory *This = HTMLIMGFACTORY_THIS(iface); + HTMLImageElementFactory *This = impl_from_IHTMLImageElementFactory(iface); *ppv = NULL; if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_Unknown %p)\n", This, ppv); - *ppv = HTMLIMGFACTORY(This); + *ppv = &This->IHTMLImageElementFactory_iface; }else if(IsEqualGUID(&IID_IHTMLImageElementFactory, riid)) { TRACE("(%p)->(IID_IHTMLImageElementFactory %p)\n", This, ppv); - *ppv = HTMLIMGFACTORY(This); + *ppv = &This->IHTMLImageElementFactory_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) return *ppv ? S_OK : E_NOINTERFACE; @@ -722,7 +725,7 @@ static HRESULT WINAPI HTMLImageElementFactory_QueryInterface(IHTMLImageElementFa static ULONG WINAPI HTMLImageElementFactory_AddRef(IHTMLImageElementFactory *iface) { - HTMLImageElementFactory *This = HTMLIMGFACTORY_THIS(iface); + HTMLImageElementFactory *This = impl_from_IHTMLImageElementFactory(iface); LONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -732,7 +735,7 @@ static ULONG WINAPI HTMLImageElementFactory_AddRef(IHTMLImageElementFactory *ifa static ULONG WINAPI HTMLImageElementFactory_Release(IHTMLImageElementFactory *iface) { - HTMLImageElementFactory *This = HTMLIMGFACTORY_THIS(iface); + HTMLImageElementFactory *This = impl_from_IHTMLImageElementFactory(iface); LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -746,7 +749,7 @@ static ULONG WINAPI HTMLImageElementFactory_Release(IHTMLImageElementFactory *if static HRESULT WINAPI HTMLImageElementFactory_GetTypeInfoCount(IHTMLImageElementFactory *iface, UINT *pctinfo) { - HTMLImageElementFactory *This = HTMLIMGFACTORY_THIS(iface); + HTMLImageElementFactory *This = impl_from_IHTMLImageElementFactory(iface); FIXME("(%p)->(%p)\n", This, pctinfo); return E_NOTIMPL; } @@ -754,7 +757,7 @@ static HRESULT WINAPI HTMLImageElementFactory_GetTypeInfoCount(IHTMLImageElement static HRESULT WINAPI HTMLImageElementFactory_GetTypeInfo(IHTMLImageElementFactory *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - HTMLImageElementFactory *This = HTMLIMGFACTORY_THIS(iface); + HTMLImageElementFactory *This = impl_from_IHTMLImageElementFactory(iface); FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); return E_NOTIMPL; } @@ -763,7 +766,7 @@ static HRESULT WINAPI HTMLImageElementFactory_GetIDsOfNames(IHTMLImageElementFac REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - HTMLImageElementFactory *This = HTMLIMGFACTORY_THIS(iface); + HTMLImageElementFactory *This = impl_from_IHTMLImageElementFactory(iface); FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); return E_NOTIMPL; @@ -774,7 +777,7 @@ static HRESULT WINAPI HTMLImageElementFactory_Invoke(IHTMLImageElementFactory *i DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - HTMLImageElementFactory *This = HTMLIMGFACTORY_THIS(iface); + HTMLImageElementFactory *This = impl_from_IHTMLImageElementFactory(iface); FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); return E_NOTIMPL; @@ -807,7 +810,7 @@ static LONG var_to_size(const VARIANT *v) static HRESULT WINAPI HTMLImageElementFactory_create(IHTMLImageElementFactory *iface, VARIANT width, VARIANT height, IHTMLImgElement **img_elem) { - HTMLImageElementFactory *This = HTMLIMGFACTORY_THIS(iface); + HTMLImageElementFactory *This = impl_from_IHTMLImageElementFactory(iface); IHTMLImgElement *img; HTMLElement *elem; nsIDOMHTMLElement *nselem; @@ -855,8 +858,6 @@ static HRESULT WINAPI HTMLImageElementFactory_create(IHTMLImageElementFactory *i return S_OK; } -#undef HTMLIMGFACTORY_THIS - static const IHTMLImageElementFactoryVtbl HTMLImageElementFactoryVtbl = { HTMLImageElementFactory_QueryInterface, HTMLImageElementFactory_AddRef, @@ -890,7 +891,8 @@ static HRESULT HTMLImageElementFactory_value(DispatchEx *dispex, LCID lcid, width = argc >= 1 ? params->rgvarg + (params->cArgs - 1) : ∅ height = argc >= 2 ? params->rgvarg + (params->cArgs - 2) : ∅ - hres = IHTMLImageElementFactory_create(HTMLIMGFACTORY(This), *width, *height, &img); + hres = IHTMLImageElementFactory_create(&This->IHTMLImageElementFactory_iface, *width, *height, + &img); if(FAILED(hres)) return hres; @@ -924,11 +926,12 @@ HTMLImageElementFactory *HTMLImageElementFactory_Create(HTMLWindow *window) ret = heap_alloc(sizeof(HTMLImageElementFactory)); - ret->lpHTMLImageElementFactoryVtbl = &HTMLImageElementFactoryVtbl; + ret->IHTMLImageElementFactory_iface.lpVtbl = &HTMLImageElementFactoryVtbl; ret->ref = 1; ret->window = window; - init_dispex(&ret->dispex, (IUnknown*)HTMLIMGFACTORY(ret), &HTMLImageElementFactory_dispex); + init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLImageElementFactory_iface, + &HTMLImageElementFactory_dispex); return ret; } diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 5a936e7..f0be07b 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -244,7 +244,7 @@ static ULONG WINAPI HTMLWindow2_Release(IHTMLWindow2 *iface) if(This->image_factory) { This->image_factory->window = NULL; - IHTMLImageElementFactory_Release(HTMLIMGFACTORY(This->image_factory)); + IHTMLImageElementFactory_Release(&This->image_factory->IHTMLImageElementFactory_iface); } if(This->location) { @@ -670,7 +670,7 @@ static HRESULT WINAPI HTMLWindow2_get_Image(IHTMLWindow2 *iface, IHTMLImageEleme if(!This->image_factory) This->image_factory = HTMLImageElementFactory_Create(This); - *p = HTMLIMGFACTORY(This->image_factory); + *p = &This->image_factory->IHTMLImageElementFactory_iface; IHTMLImageElementFactory_AddRef(*p); return S_OK; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 70046b2..df3b023 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -237,7 +237,7 @@ typedef struct { typedef struct { DispatchEx dispex; - const IHTMLImageElementFactoryVtbl *lpHTMLImageElementFactoryVtbl; + IHTMLImageElementFactory IHTMLImageElementFactory_iface; LONG ref; @@ -634,7 +634,6 @@ struct HTMLDocumentNode { #define HTMLTEXTCONT(x) ((IHTMLTextContainer*) &(x)->lpHTMLTextContainerVtbl) -#define HTMLIMGFACTORY(x) ((IHTMLImageElementFactory*) &(x)->lpHTMLImageElementFactoryVtbl) #define HTMLLOCATION(x) ((IHTMLLocation*) &(x)->lpHTMLLocationVtbl) #define DEFINE_THIS(cls,ifc,iface) ((cls*)((BYTE*)(iface)-offsetof(cls,lp ## ifc ## Vtbl)))

1 0

Michael Stefaniuc : mshtml: COM cleanup for the IHTMLTextContainer iface.
by Alexandre Julliard 03 Jan '11

03 Jan '11

Module: wine Branch: master Commit: 7cd11df83154c4b4fa3e53dbb7879cd780243981 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cd11df83154c4b4fa3e53dbb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 3 01:08:23 2011 +0100 mshtml: COM cleanup for the IHTMLTextContainer iface. --- dlls/mshtml/htmlbody.c | 2 +- dlls/mshtml/htmltextcont.c | 41 +++++++++++++++++++++-------------------- dlls/mshtml/mshtml_private.h | 4 +--- 3 files changed, 23 insertions(+), 24 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 3dbfd99..8789200 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -763,7 +763,7 @@ static HRESULT HTMLBodyElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) *ppv = &This->IHTMLBodyElement_iface; }else if(IsEqualGUID(&IID_IHTMLTextContainer, riid)) { TRACE("(%p)->(IID_IHTMLTextContainer %p)\n", &This->textcont, ppv); - *ppv = HTMLTEXTCONT(&This->textcont); + *ppv = &This->textcont.IHTMLTextContainer_iface; } if(*ppv) { diff --git a/dlls/mshtml/htmltextcont.c b/dlls/mshtml/htmltextcont.c index d74f3cc..ad3c714 100644 --- a/dlls/mshtml/htmltextcont.c +++ b/dlls/mshtml/htmltextcont.c @@ -34,37 +34,40 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -#define HTMLTEXTCONT_THIS(iface) DEFINE_THIS(HTMLTextContainer, HTMLTextContainer, iface) +static inline HTMLTextContainer *impl_from_IHTMLTextContainer(IHTMLTextContainer *iface) +{ + return CONTAINING_RECORD(iface, HTMLTextContainer, IHTMLTextContainer_iface); +} static HRESULT WINAPI HTMLTextContainer_QueryInterface(IHTMLTextContainer *iface, REFIID riid, void **ppv) { - HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); + HTMLTextContainer *This = impl_from_IHTMLTextContainer(iface); return IHTMLElement_QueryInterface(&This->element.IHTMLElement_iface, riid, ppv); } static ULONG WINAPI HTMLTextContainer_AddRef(IHTMLTextContainer *iface) { - HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); + HTMLTextContainer *This = impl_from_IHTMLTextContainer(iface); return IHTMLElement_AddRef(&This->element.IHTMLElement_iface); } static ULONG WINAPI HTMLTextContainer_Release(IHTMLTextContainer *iface) { - HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); + HTMLTextContainer *This = impl_from_IHTMLTextContainer(iface); return IHTMLElement_Release(&This->element.IHTMLElement_iface); } static HRESULT WINAPI HTMLTextContainer_GetTypeInfoCount(IHTMLTextContainer *iface, UINT *pctinfo) { - HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); + HTMLTextContainer *This = impl_from_IHTMLTextContainer(iface); return IDispatchEx_GetTypeInfoCount(&This->element.node.dispex.IDispatchEx_iface, pctinfo); } static HRESULT WINAPI HTMLTextContainer_GetTypeInfo(IHTMLTextContainer *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); + HTMLTextContainer *This = impl_from_IHTMLTextContainer(iface); return IDispatchEx_GetTypeInfo(&This->element.node.dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); } @@ -73,7 +76,7 @@ static HRESULT WINAPI HTMLTextContainer_GetIDsOfNames(IHTMLTextContainer *iface, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); + HTMLTextContainer *This = impl_from_IHTMLTextContainer(iface); return IDispatchEx_GetIDsOfNames(&This->element.node.dispex.IDispatchEx_iface, riid, rgszNames, cNames, lcid, rgDispId); } @@ -82,7 +85,7 @@ static HRESULT WINAPI HTMLTextContainer_Invoke(IHTMLTextContainer *iface, DISPID REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); + HTMLTextContainer *This = impl_from_IHTMLTextContainer(iface); return IDispatchEx_Invoke(&This->element.node.dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } @@ -90,14 +93,14 @@ static HRESULT WINAPI HTMLTextContainer_Invoke(IHTMLTextContainer *iface, DISPID static HRESULT WINAPI HTMLTextContainer_createControlRange(IHTMLTextContainer *iface, IDispatch **range) { - HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); + HTMLTextContainer *This = impl_from_IHTMLTextContainer(iface); FIXME("(%p)->(%p)\n", This, range); return E_NOTIMPL; } static HRESULT WINAPI HTMLTextContainer_get_scrollHeight(IHTMLTextContainer *iface, LONG *p) { - HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); + HTMLTextContainer *This = impl_from_IHTMLTextContainer(iface); TRACE("(%p)->(%p)\n", This, p); @@ -106,7 +109,7 @@ static HRESULT WINAPI HTMLTextContainer_get_scrollHeight(IHTMLTextContainer *ifa static HRESULT WINAPI HTMLTextContainer_get_scrollWidth(IHTMLTextContainer *iface, LONG *p) { - HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); + HTMLTextContainer *This = impl_from_IHTMLTextContainer(iface); TRACE("(%p)->(%p)\n", This, p); @@ -115,7 +118,7 @@ static HRESULT WINAPI HTMLTextContainer_get_scrollWidth(IHTMLTextContainer *ifac static HRESULT WINAPI HTMLTextContainer_put_scrollTop(IHTMLTextContainer *iface, LONG v) { - HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); + HTMLTextContainer *This = impl_from_IHTMLTextContainer(iface); TRACE("(%p)->(%d)\n", This, v); @@ -124,7 +127,7 @@ static HRESULT WINAPI HTMLTextContainer_put_scrollTop(IHTMLTextContainer *iface, static HRESULT WINAPI HTMLTextContainer_get_scrollTop(IHTMLTextContainer *iface, LONG *p) { - HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); + HTMLTextContainer *This = impl_from_IHTMLTextContainer(iface); TRACE("(%p)->(%p)\n", This, p); @@ -133,7 +136,7 @@ static HRESULT WINAPI HTMLTextContainer_get_scrollTop(IHTMLTextContainer *iface, static HRESULT WINAPI HTMLTextContainer_put_scrollLeft(IHTMLTextContainer *iface, LONG v) { - HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); + HTMLTextContainer *This = impl_from_IHTMLTextContainer(iface); TRACE("(%p)->(%d)\n", This, v); @@ -142,7 +145,7 @@ static HRESULT WINAPI HTMLTextContainer_put_scrollLeft(IHTMLTextContainer *iface static HRESULT WINAPI HTMLTextContainer_get_scrollLeft(IHTMLTextContainer *iface, LONG *p) { - HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); + HTMLTextContainer *This = impl_from_IHTMLTextContainer(iface); TRACE("(%p)->(%p)\n", This, p); @@ -151,20 +154,18 @@ static HRESULT WINAPI HTMLTextContainer_get_scrollLeft(IHTMLTextContainer *iface static HRESULT WINAPI HTMLTextContainer_put_onscroll(IHTMLTextContainer *iface, VARIANT v) { - HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); + HTMLTextContainer *This = impl_from_IHTMLTextContainer(iface); FIXME("(%p)->()\n", This); return E_NOTIMPL; } static HRESULT WINAPI HTMLTextContainer_get_onscroll(IHTMLTextContainer *iface, VARIANT *p) { - HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); + HTMLTextContainer *This = impl_from_IHTMLTextContainer(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } -#undef HTMLTEXTCONT_THIS - static const IHTMLTextContainerVtbl HTMLTextContainerVtbl = { HTMLTextContainer_QueryInterface, HTMLTextContainer_AddRef, @@ -187,7 +188,7 @@ static const IHTMLTextContainerVtbl HTMLTextContainerVtbl = { void HTMLTextContainer_Init(HTMLTextContainer *This, HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, dispex_static_data_t *dispex_data) { - This->lpHTMLTextContainerVtbl = &HTMLTextContainerVtbl; + This->IHTMLTextContainer_iface.lpVtbl = &HTMLTextContainerVtbl; HTMLElement_Init(&This->element, doc, nselem, dispex_data); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index df3b023..b7e377a 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -567,7 +567,7 @@ typedef struct { typedef struct { HTMLElement element; - const IHTMLTextContainerVtbl *lpHTMLTextContainerVtbl; + IHTMLTextContainer IHTMLTextContainer_iface; ConnectionPoint cp; } HTMLTextContainer; @@ -632,8 +632,6 @@ struct HTMLDocumentNode { #define STATUSCLB(x) ((IBindStatusCallback*) &(x)->lpBindStatusCallbackVtbl) #define BINDINFO(x) ((IInternetBindInfo*) &(x)->lpInternetBindInfoVtbl); -#define HTMLTEXTCONT(x) ((IHTMLTextContainer*) &(x)->lpHTMLTextContainerVtbl) - #define HTMLLOCATION(x) ((IHTMLLocation*) &(x)->lpHTMLLocationVtbl) #define DEFINE_THIS(cls,ifc,iface) ((cls*)((BYTE*)(iface)-offsetof(cls,lp ## ifc ## Vtbl)))

1 0

Michael Stefaniuc : mshtml: COM cleanup for the ICustomDoc iface.
by Alexandre Julliard 03 Jan '11

03 Jan '11

Module: wine Branch: master Commit: f2c4a122615c9404f72ced0c6eab730168de30cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2c4a122615c9404f72ced0c6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 3 01:10:03 2011 +0100 mshtml: COM cleanup for the ICustomDoc iface. --- dlls/mshtml/htmldoc.c | 25 +++++++++++++------------ dlls/mshtml/mshtml_private.h | 4 +--- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 259f0e9..12e0947 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2054,18 +2054,21 @@ HRESULT create_document_fragment(nsIDOMNode *nsnode, HTMLDocumentNode *doc_node, * ICustomDoc implementation */ -#define CUSTOMDOC_THIS(iface) DEFINE_THIS(HTMLDocumentObj, CustomDoc, iface) +static inline HTMLDocumentObj *impl_from_ICustomDoc(ICustomDoc *iface) +{ + return CONTAINING_RECORD(iface, HTMLDocumentObj, ICustomDoc_iface); +} static HRESULT WINAPI CustomDoc_QueryInterface(ICustomDoc *iface, REFIID riid, void **ppv) { - HTMLDocumentObj *This = CUSTOMDOC_THIS(iface); + HTMLDocumentObj *This = impl_from_ICustomDoc(iface); if(htmldoc_qi(&This->basedoc, riid, ppv)) return *ppv ? S_OK : E_NOINTERFACE; if(IsEqualGUID(&IID_ICustomDoc, riid)) { TRACE("(%p)->(IID_ICustomDoc %p)\n", This, ppv); - *ppv = CUSTOMDOC(This); + *ppv = &This->ICustomDoc_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; }else { @@ -2080,7 +2083,7 @@ static HRESULT WINAPI CustomDoc_QueryInterface(ICustomDoc *iface, REFIID riid, v static ULONG WINAPI CustomDoc_AddRef(ICustomDoc *iface) { - HTMLDocumentObj *This = CUSTOMDOC_THIS(iface); + HTMLDocumentObj *This = impl_from_ICustomDoc(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref = %u\n", This, ref); @@ -2090,7 +2093,7 @@ static ULONG WINAPI CustomDoc_AddRef(ICustomDoc *iface) static ULONG WINAPI CustomDoc_Release(ICustomDoc *iface) { - HTMLDocumentObj *This = CUSTOMDOC_THIS(iface); + HTMLDocumentObj *This = impl_from_ICustomDoc(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref = %u\n", This, ref); @@ -2112,7 +2115,7 @@ static ULONG WINAPI CustomDoc_Release(ICustomDoc *iface) if(This->client) IOleObject_SetClientSite(&This->basedoc.IOleObject_iface, NULL); if(This->hostui) - ICustomDoc_SetUIHandler(CUSTOMDOC(This), NULL); + ICustomDoc_SetUIHandler(&This->ICustomDoc_iface, NULL); if(This->in_place_active) IOleInPlaceObjectWindowless_InPlaceDeactivate(&This->basedoc.IOleInPlaceObjectWindowless_iface); if(This->ipsite) @@ -2139,7 +2142,7 @@ static ULONG WINAPI CustomDoc_Release(ICustomDoc *iface) static HRESULT WINAPI CustomDoc_SetUIHandler(ICustomDoc *iface, IDocHostUIHandler *pUIHandler) { - HTMLDocumentObj *This = CUSTOMDOC_THIS(iface); + HTMLDocumentObj *This = impl_from_ICustomDoc(iface); IOleCommandTarget *cmdtrg; HRESULT hres; @@ -2167,8 +2170,6 @@ static HRESULT WINAPI CustomDoc_SetUIHandler(ICustomDoc *iface, IDocHostUIHandle return S_OK; } -#undef CUSTOMDOC_THIS - static const ICustomDocVtbl CustomDocVtbl = { CustomDoc_QueryInterface, CustomDoc_AddRef, @@ -2203,10 +2204,10 @@ HRESULT HTMLDocument_Create(IUnknown *pUnkOuter, REFIID riid, void** ppvObject) if(!doc) return E_OUTOFMEMORY; - init_dispex(&doc->dispex, (IUnknown*)CUSTOMDOC(doc), &HTMLDocumentObj_dispex); - init_doc(&doc->basedoc, (IUnknown*)CUSTOMDOC(doc), &doc->dispex.IDispatchEx_iface); + init_dispex(&doc->dispex, (IUnknown*)&doc->ICustomDoc_iface, &HTMLDocumentObj_dispex); + init_doc(&doc->basedoc, (IUnknown*)&doc->ICustomDoc_iface, &doc->dispex.IDispatchEx_iface); - doc->lpCustomDocVtbl = &CustomDocVtbl; + doc->ICustomDoc_iface.lpVtbl = &CustomDocVtbl; doc->ref = 1; doc->basedoc.doc_obj = doc; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index b7e377a..ad3d2ae 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -406,7 +406,7 @@ static inline ULONG htmldoc_release(HTMLDocument *This) struct HTMLDocumentObj { HTMLDocument basedoc; DispatchEx dispex; - const ICustomDocVtbl *lpCustomDocVtbl; + ICustomDoc ICustomDoc_iface; LONG ref; @@ -624,8 +624,6 @@ struct HTMLDocumentNode { struct list plugin_hosts; }; -#define CUSTOMDOC(x) ((ICustomDoc*) &(x)->lpCustomDocVtbl) - #define NSEVENTLIST(x) ((nsIDOMEventListener*) &(x)->lpDOMEventListenerVtbl) #define HTTPNEG(x) ((IHttpNegotiate2*) &(x)->lpHttpNegotiate2Vtbl)

1 0

Michael Stefaniuc : mshtml: COM cleanup for the IHTMLLocation iface.
by Alexandre Julliard 03 Jan '11

03 Jan '11

Module: wine Branch: master Commit: ed9c65b1ba80a438d181a025eebdcfe7c0186da9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed9c65b1ba80a438d181a025e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 3 01:12:05 2011 +0100 mshtml: COM cleanup for the IHTMLLocation iface. --- dlls/mshtml/htmllocation.c | 69 +++++++++++++++++++++-------------------- dlls/mshtml/htmlwindow.c | 8 ++-- dlls/mshtml/mshtml_private.h | 4 +-- 3 files changed, 40 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ed9c65b1ba80a438d181a…

1 0

Michael Stefaniuc : mshtml: Use ifaces instead of vtbl pointers in BSCallback.
by Alexandre Julliard 03 Jan '11

03 Jan '11

Module: wine Branch: master Commit: fb92f979dd9fa4427eafc4018df9bb47901de33f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb92f979dd9fa4427eafc4018… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 3 01:13:16 2011 +0100 mshtml: Use ifaces instead of vtbl pointers in BSCallback. --- dlls/mshtml/mshtml_private.h | 4 - dlls/mshtml/navigate.c | 143 ++++++++++++++++++++++-------------------- 2 files changed, 74 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fb92f979dd9fa4427eafc…

1 0

David Hedberg : urlmon: Move protocol flags for wininet based protocols into a common header.
by Alexandre Julliard 03 Jan '11

03 Jan '11

Module: wine Branch: master Commit: 2b5c18c35b913482c58d060001178fbf11ef19ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b5c18c35b913482c58d06000… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Mon Jan 3 03:47:37 2011 +0100 urlmon: Move protocol flags for wininet based protocols into a common header. --- dlls/urlmon/protocol.c | 30 ------------------------------ dlls/urlmon/urlmon_main.h | 30 ++++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/dlls/urlmon/protocol.c b/dlls/urlmon/protocol.c index 669343b..2ca1629 100644 --- a/dlls/urlmon/protocol.c +++ b/dlls/urlmon/protocol.c @@ -23,36 +23,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); -/* Flags are needed for, among other things, return HRESULTs from the Read function - * to conform to native. For example, Read returns: - * - * 1. E_PENDING if called before the request has completed, - * (flags = 0) - * 2. S_FALSE after all data has been read and S_OK has been reported, - * (flags = FLAG_REQUEST_COMPLETE | FLAG_ALL_DATA_READ | FLAG_RESULT_REPORTED) - * 3. INET_E_DATA_NOT_AVAILABLE if InternetQueryDataAvailable fails. The first time - * this occurs, INET_E_DATA_NOT_AVAILABLE will also be reported to the sink, - * (flags = FLAG_REQUEST_COMPLETE) - * but upon subsequent calls to Read no reporting will take place, yet - * InternetQueryDataAvailable will still be called, and, on failure, - * INET_E_DATA_NOT_AVAILABLE will still be returned. - * (flags = FLAG_REQUEST_COMPLETE | FLAG_RESULT_REPORTED) - * - * FLAG_FIRST_DATA_REPORTED and FLAG_LAST_DATA_REPORTED are needed for proper - * ReportData reporting. For example, if OnResponse returns S_OK, Continue will - * report BSCF_FIRSTDATANOTIFICATION, and when all data has been read Read will - * report BSCF_INTERMEDIATEDATANOTIFICATION|BSCF_LASTDATANOTIFICATION. However, - * if OnResponse does not return S_OK, Continue will not report data, and Read - * will report BSCF_FIRSTDATANOTIFICATION|BSCF_LASTDATANOTIFICATION when all - * data has been read. - */ -#define FLAG_REQUEST_COMPLETE 0x0001 -#define FLAG_FIRST_CONTINUE_COMPLETE 0x0002 -#define FLAG_FIRST_DATA_REPORTED 0x0004 -#define FLAG_ALL_DATA_READ 0x0008 -#define FLAG_LAST_DATA_REPORTED 0x0010 -#define FLAG_RESULT_REPORTED 0x0020 - static inline HRESULT report_progress(Protocol *protocol, ULONG status_code, LPCWSTR status_text) { return IInternetProtocolSink_ReportProgress(protocol->protocol_sink, status_code, status_text); diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index ea33f15..dc6d3fc 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -115,6 +115,36 @@ struct ProtocolVtbl { void (*close_connection)(Protocol*); }; +/* Flags are needed for, among other things, return HRESULTs from the Read function + * to conform to native. For example, Read returns: + * + * 1. E_PENDING if called before the request has completed, + * (flags = 0) + * 2. S_FALSE after all data has been read and S_OK has been reported, + * (flags = FLAG_REQUEST_COMPLETE | FLAG_ALL_DATA_READ | FLAG_RESULT_REPORTED) + * 3. INET_E_DATA_NOT_AVAILABLE if InternetQueryDataAvailable fails. The first time + * this occurs, INET_E_DATA_NOT_AVAILABLE will also be reported to the sink, + * (flags = FLAG_REQUEST_COMPLETE) + * but upon subsequent calls to Read no reporting will take place, yet + * InternetQueryDataAvailable will still be called, and, on failure, + * INET_E_DATA_NOT_AVAILABLE will still be returned. + * (flags = FLAG_REQUEST_COMPLETE | FLAG_RESULT_REPORTED) + * + * FLAG_FIRST_DATA_REPORTED and FLAG_LAST_DATA_REPORTED are needed for proper + * ReportData reporting. For example, if OnResponse returns S_OK, Continue will + * report BSCF_FIRSTDATANOTIFICATION, and when all data has been read Read will + * report BSCF_INTERMEDIATEDATANOTIFICATION|BSCF_LASTDATANOTIFICATION. However, + * if OnResponse does not return S_OK, Continue will not report data, and Read + * will report BSCF_FIRSTDATANOTIFICATION|BSCF_LASTDATANOTIFICATION when all + * data has been read. + */ +#define FLAG_REQUEST_COMPLETE 0x0001 +#define FLAG_FIRST_CONTINUE_COMPLETE 0x0002 +#define FLAG_FIRST_DATA_REPORTED 0x0004 +#define FLAG_ALL_DATA_READ 0x0008 +#define FLAG_LAST_DATA_REPORTED 0x0010 +#define FLAG_RESULT_REPORTED 0x0020 + HRESULT protocol_start(Protocol*,IInternetProtocol*,IUri*,IInternetProtocolSink*,IInternetBindInfo*); HRESULT protocol_continue(Protocol*,PROTOCOLDATA*); HRESULT protocol_read(Protocol*,void*,ULONG,ULONG*);

1 0

David Hedberg : urlmon: Add new on_error function to protocol vtbl.
by Alexandre Julliard 03 Jan '11

03 Jan '11

Module: wine Branch: master Commit: 4121ac12243ba94e6a320df9d450976dc06678e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4121ac12243ba94e6a320df9d… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Mon Jan 3 03:47:38 2011 +0100 urlmon: Add new on_error function to protocol vtbl. --- dlls/urlmon/ftp.c | 8 +++++++- dlls/urlmon/gopher.c | 8 +++++++- dlls/urlmon/http.c | 8 +++++++- dlls/urlmon/protocol.c | 40 ++++++++++++++++++++++++---------------- dlls/urlmon/urlmon_main.h | 2 ++ 5 files changed, 47 insertions(+), 19 deletions(-) diff --git a/dlls/urlmon/ftp.c b/dlls/urlmon/ftp.c index deb611b..854f169 100644 --- a/dlls/urlmon/ftp.c +++ b/dlls/urlmon/ftp.c @@ -99,13 +99,19 @@ static void FtpProtocol_close_connection(Protocol *prot) { } +static void FtpProtocol_on_error(Protocol *prot, DWORD error) +{ + FIXME("(%p) %d - stub\n", prot, error); +} + #undef ASYNCPROTOCOL_THIS static const ProtocolVtbl AsyncProtocolVtbl = { FtpProtocol_open_request, FtpProtocol_end_request, FtpProtocol_start_downloading, - FtpProtocol_close_connection + FtpProtocol_close_connection, + FtpProtocol_on_error }; static HRESULT WINAPI FtpProtocol_QueryInterface(IInternetProtocolEx *iface, REFIID riid, void **ppv) diff --git a/dlls/urlmon/gopher.c b/dlls/urlmon/gopher.c index da241e9..5964882 100644 --- a/dlls/urlmon/gopher.c +++ b/dlls/urlmon/gopher.c @@ -70,13 +70,19 @@ static void GopherProtocol_close_connection(Protocol *prot) { } +static void GopherProtocol_on_error(Protocol *prot, DWORD error) +{ + FIXME("(%p) %d - stub\n", prot, error); +} + #undef ASYNCPROTOCOL_THIS static const ProtocolVtbl AsyncProtocolVtbl = { GopherProtocol_open_request, GopherProtocol_end_request, GopherProtocol_start_downloading, - GopherProtocol_close_connection + GopherProtocol_close_connection, + GopherProtocol_on_error }; #define PROTOCOL_THIS(iface) DEFINE_THIS(GopherProtocol, IInternetProtocol, iface) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index cfa2fc6..a62323b 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -388,13 +388,19 @@ static void HttpProtocol_close_connection(Protocol *prot) } } +static void HttpProtocol_on_error(Protocol *prot, DWORD error) +{ + FIXME("(%p) %d - stub\n", prot, error); +} + #undef ASYNCPROTOCOL_THIS static const ProtocolVtbl AsyncProtocolVtbl = { HttpProtocol_open_request, HttpProtocol_end_request, HttpProtocol_start_downloading, - HttpProtocol_close_connection + HttpProtocol_close_connection, + HttpProtocol_on_error }; static HRESULT WINAPI HttpProtocol_QueryInterface(IInternetProtocolEx *iface, REFIID riid, void **ppv) diff --git a/dlls/urlmon/protocol.c b/dlls/urlmon/protocol.c index 2ca1629..1b8b5e3 100644 --- a/dlls/urlmon/protocol.c +++ b/dlls/urlmon/protocol.c @@ -76,25 +76,27 @@ static void request_complete(Protocol *protocol, INTERNET_ASYNC_RESULT *ar) TRACE("(%p)->(%p)\n", protocol, ar); - if(!ar->dwResult) { - WARN("request failed: %d\n", ar->dwError); - return; - } - - protocol->flags |= FLAG_REQUEST_COMPLETE; - - if(!protocol->request) { - TRACE("setting request handle %p\n", (HINTERNET)ar->dwResult); - protocol->request = (HINTERNET)ar->dwResult; - } - /* PROTOCOLDATA same as native */ memset(&data, 0, sizeof(data)); data.dwState = 0xf1000000; - if(protocol->flags & FLAG_FIRST_CONTINUE_COMPLETE) - data.pData = (LPVOID)BINDSTATUS_ENDDOWNLOADCOMPONENTS; - else - data.pData = (LPVOID)BINDSTATUS_DOWNLOADINGDATA; + + if(ar->dwResult) { + protocol->flags |= FLAG_REQUEST_COMPLETE; + + if(!protocol->request) { + TRACE("setting request handle %p\n", (HINTERNET)ar->dwResult); + protocol->request = (HINTERNET)ar->dwResult; + } + + if(protocol->flags & FLAG_FIRST_CONTINUE_COMPLETE) + data.pData = (LPVOID)BINDSTATUS_ENDDOWNLOADCOMPONENTS; + else + data.pData = (LPVOID)BINDSTATUS_DOWNLOADINGDATA; + + }else { + protocol->flags |= FLAG_ERROR; + data.pData = (LPVOID)ar->dwError; + } if (protocol->bindf & BINDF_FROMURLMON) IInternetProtocolSink_Switch(protocol->protocol_sink, &data); @@ -301,6 +303,12 @@ HRESULT protocol_continue(Protocol *protocol, PROTOCOLDATA *data) return S_OK; } + if(protocol->flags & FLAG_ERROR) { + protocol->flags &= ~FLAG_ERROR; + protocol->vtbl->on_error(protocol, (DWORD)data->pData); + return S_OK; + } + if(protocol->post_stream) return write_post_stream(protocol); diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index dc6d3fc..719c2eb 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -113,6 +113,7 @@ struct ProtocolVtbl { HRESULT (*end_request)(Protocol*); HRESULT (*start_downloading)(Protocol*); void (*close_connection)(Protocol*); + void (*on_error)(Protocol*,DWORD); }; /* Flags are needed for, among other things, return HRESULTs from the Read function @@ -144,6 +145,7 @@ struct ProtocolVtbl { #define FLAG_ALL_DATA_READ 0x0008 #define FLAG_LAST_DATA_REPORTED 0x0010 #define FLAG_RESULT_REPORTED 0x0020 +#define FLAG_ERROR 0x0040 HRESULT protocol_start(Protocol*,IInternetProtocol*,IUri*,IInternetProtocolSink*,IInternetBindInfo*); HRESULT protocol_continue(Protocol*,PROTOCOLDATA*);

1 0

Jeremy Chin : wined3d: Update detection of vertex blend capabilities.
by Alexandre Julliard 03 Jan '11

03 Jan '11

Module: wine Branch: master Commit: f41fdb225cf1e1df494237664ce92e51179f3725 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f41fdb225cf1e1df494237664… Author: Jeremy Chin <rekless(a)fastmail.fm> Date: Sun Jan 2 20:41:12 2011 +1100 wined3d: Update detection of vertex blend capabilities. --- dlls/wined3d/directx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index da179a7..2b7e5ce 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2318,7 +2318,7 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_adapter *adapter) TRACE_(d3d_caps)("Max vertex samplers: %u.\n", gl_info->limits.vertex_samplers); TRACE_(d3d_caps)("Max combined samplers: %u.\n", gl_info->limits.combined_samplers); } - if (gl_info->supported[ARB_VERTEX_BLEND]) + if (gl_info->supported[ARB_VERTEX_BLEND] || gl_info->supported[ARB_VERTEX_PROGRAM]) { glGetIntegerv(GL_MAX_VERTEX_UNITS_ARB, &gl_max); gl_info->limits.blends = gl_max;

1 0