July 2012 - Wine-Commits - list.winehq.org

Dmitry Timoshkov : windowscodecs: Do not assume that vtable is the first element of the object, avoid not necessary casts.
by Alexandre Julliard July 25, 2012

July 25, 2012

Module: wine Branch: master Commit: 2a08532cfb1ab68b92d14addd791eedfbbaf6b86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a08532cfb1ab68b92d14addd… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jul 25 11:25:35 2012 +0900 windowscodecs: Do not assume that vtable is the first element of the object, avoid not necessary casts. --- dlls/windowscodecs/icoformat.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/windowscodecs/icoformat.c b/dlls/windowscodecs/icoformat.c index 48a5c95..047c25a 100644 --- a/dlls/windowscodecs/icoformat.c +++ b/dlls/windowscodecs/icoformat.c @@ -95,7 +95,7 @@ static HRESULT WINAPI IcoFrameDecode_QueryInterface(IWICBitmapFrameDecode *iface IsEqualIID(&IID_IWICBitmapSource, iid) || IsEqualIID(&IID_IWICBitmapFrameDecode, iid)) { - *ppv = This; + *ppv = &This->IWICBitmapFrameDecode_iface; } else { @@ -446,9 +446,10 @@ static HRESULT WINAPI IcoDecoder_QueryInterface(IWICBitmapDecoder *iface, REFIID if (!ppv) return E_INVALIDARG; - if (IsEqualIID(&IID_IUnknown, iid) || IsEqualIID(&IID_IWICBitmapDecoder, iid)) + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_IWICBitmapDecoder, iid)) { - *ppv = This; + *ppv = &This->IWICBitmapDecoder_iface; } else { @@ -692,7 +693,7 @@ static HRESULT WINAPI IcoDecoder_GetFrame(IWICBitmapDecoder *iface, } if (FAILED(hr)) goto fail; - *ppIBitmapFrame = (IWICBitmapFrameDecode*)result; + *ppIBitmapFrame = &result->IWICBitmapFrameDecode_iface; LeaveCriticalSection(&This->lock); @@ -747,8 +748,8 @@ HRESULT IcoDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) InitializeCriticalSection(&This->lock); This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IcoDecoder.lock"); - ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); - IUnknown_Release((IUnknown*)This); + ret = IWICBitmapDecoder_QueryInterface(&This->IWICBitmapDecoder_iface, iid, ppv); + IWICBitmapDecoder_Release(&This->IWICBitmapDecoder_iface); return ret; }

1 0

Jacek Caban : mshtml: Added IHTMLDOMAttribute::get_specified implementation .
by Alexandre Julliard July 24, 2012

July 24, 2012

Module: wine Branch: master Commit: af4967186a5547965cfc0ae8034038ad1472cd96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af4967186a5547965cfc0ae80… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 24 15:55:54 2012 +0200 mshtml: Added IHTMLDOMAttribute::get_specified implementation. --- dlls/mshtml/dispex.c | 9 +++++++++ dlls/mshtml/htmlattr.c | 41 +++++++++++++++++++++++++++++++++++++++-- dlls/mshtml/mshtml_private.h | 8 ++++++++ dlls/mshtml/tests/dom.c | 18 ++++++++++++++++++ 4 files changed, 74 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index b2024d4..614c9d5 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -385,6 +385,15 @@ static inline BOOL is_dynamic_dispid(DISPID id) return DISPID_DYNPROP_0 <= id && id <= DISPID_DYNPROP_MAX; } +dispex_prop_type_t get_dispid_type(DISPID id) +{ + if(is_dynamic_dispid(id)) + return DISPEXPROP_DYNAMIC; + if(is_custom_dispid(id)) + return DISPEXPROP_CUSTOM; + return DISPEXPROP_BUILTIN; +} + static HRESULT variant_copy(VARIANT *dest, VARIANT *src) { if(V_VT(src) == VT_BSTR && !V_BSTR(src)) { diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index d8203fe..5d4c2b4 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -155,8 +155,45 @@ static HRESULT WINAPI HTMLDOMAttribute_get_nodeValue(IHTMLDOMAttribute *iface, V static HRESULT WINAPI HTMLDOMAttribute_get_specified(IHTMLDOMAttribute *iface, VARIANT_BOOL *p) { HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMAttr *nsattr; + nsAString nsname; + BSTR name; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); + + if(get_dispid_type(This->dispid) != DISPEXPROP_BUILTIN) { + *p = VARIANT_TRUE; + return S_OK; + } + + if(!This->elem || !This->elem->nselem) { + FIXME("NULL This->elem\n"); + return E_UNEXPECTED; + } + + hres = IDispatchEx_GetMemberName(&This->elem->node.dispex.IDispatchEx_iface, This->dispid, &name); + if(FAILED(hres)) + return hres; + + /* FIXME: This is not exactly right, we have some attributes that don't map directly to Gecko attributes. */ + nsAString_InitDepend(&nsname, name); + nsres = nsIDOMHTMLElement_GetAttributeNode(This->elem->nselem, &nsname, &nsattr); + nsAString_Finish(&nsname); + SysFreeString(name); + if(NS_FAILED(nsres)) + return E_FAIL; + + /* If the Gecko attribute node can be found, we know that the attribute is specified. + There is no point in calling GetSpecified */ + if(nsattr) { + nsIDOMAttr_Release(nsattr); + *p = VARIANT_TRUE; + }else { + *p = VARIANT_FALSE; + } + return S_OK; } static const IHTMLDOMAttributeVtbl HTMLDOMAttributeVtbl = { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 04b5b1e..1f51804 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -263,6 +263,14 @@ void dispex_unlink(DispatchEx*) DECLSPEC_HIDDEN; void release_typelib(void) DECLSPEC_HIDDEN; HRESULT get_htmldoc_classinfo(ITypeInfo **typeinfo) DECLSPEC_HIDDEN; +typedef enum { + DISPEXPROP_CUSTOM, + DISPEXPROP_DYNAMIC, + DISPEXPROP_BUILTIN +} dispex_prop_type_t; + +dispex_prop_type_t get_dispid_type(DISPID) DECLSPEC_HIDDEN; + typedef struct HTMLWindow HTMLWindow; typedef struct HTMLInnerWindow HTMLInnerWindow; typedef struct HTMLOuterWindow HTMLOuterWindow; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 1a1732f..b0c5335 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2632,6 +2632,17 @@ static void test_attr_collection(IHTMLElement *elem) IHTMLAttributeCollection_Release(attr_col); } +#define test_attr_specified(a,b) _test_attr_specified(__LINE__,a,b) +static void _test_attr_specified(unsigned line, IHTMLDOMAttribute *attr, VARIANT_BOOL expected) +{ + VARIANT_BOOL specified; + HRESULT hres; + + hres = IHTMLDOMAttribute_get_specified(attr, &specified); + ok_(__FILE__,line)(hres == S_OK, "get_specified failed: %08x\n", hres); + ok_(__FILE__,line)(specified == expected, "specified = %x, expected %x\n", specified, expected); +} + #define test_input_type(i,t) _test_input_type(__LINE__,i,t) static void _test_input_type(unsigned line, IHTMLInputElement *input, const char *extype) { @@ -5721,6 +5732,7 @@ static void test_attr(IHTMLElement *elem) test_disp((IUnknown*)attr, &DIID_DispHTMLDOMAttribute, "[object]"); test_ifaces((IUnknown*)attr, attr_iids); test_no_iface((IUnknown*)attr, &IID_IHTMLDOMNode); + test_attr_specified(attr, VARIANT_TRUE); attr2 = get_elem_attr_node((IUnknown*)elem, "id", TRUE); ok(iface_cmp((IUnknown*)attr, (IUnknown*)attr2), "attr != attr2\n"); @@ -5736,6 +5748,7 @@ static void test_attr(IHTMLElement *elem) get_attr_node_value(attr, &v, VT_BSTR); ok(!V_BSTR(&v), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); + test_attr_specified(attr, VARIANT_TRUE); IHTMLDOMAttribute_Release(attr); V_VT(&v) = VT_I4; @@ -5744,6 +5757,11 @@ static void test_attr(IHTMLElement *elem) attr = get_elem_attr_node((IUnknown*)elem, "dispprop", TRUE); get_attr_node_value(attr, &v, VT_I4); ok(V_I4(&v) == 100, "V_I4(v) = %d\n", V_I4(&v)); + test_attr_specified(attr, VARIANT_TRUE); + IHTMLDOMAttribute_Release(attr); + + attr = get_elem_attr_node((IUnknown*)elem, "tabIndex", TRUE); + test_attr_specified(attr, VARIANT_FALSE); IHTMLDOMAttribute_Release(attr); }

1 0

Jacek Caban : mshtml: Clean up InvokeEx implementation by using get_dispid_type.
by Alexandre Julliard July 24, 2012

July 24, 2012

Module: wine Branch: master Commit: 1f6febea085115b039d198b158d8143a88c6c714 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f6febea085115b039d198b15… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 24 15:56:05 2012 +0200 mshtml: Clean up InvokeEx implementation by using get_dispid_type. --- dlls/mshtml/dispex.c | 37 ++++++++++++++++++++++--------------- 1 files changed, 22 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 614c9d5..b2f5b81 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -1147,22 +1147,13 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); - if(is_custom_dispid(id) && This->data->vtbl && This->data->vtbl->invoke) + switch(get_dispid_type(id)) { + case DISPEXPROP_CUSTOM: + if(!This->data->vtbl || !This->data->vtbl->invoke) + return DISP_E_UNKNOWNNAME; return This->data->vtbl->invoke(This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); - if(wFlags == DISPATCH_CONSTRUCT) { - if(id == DISPID_VALUE) { - if(This->data->vtbl && This->data->vtbl->value) { - return This->data->vtbl->value(This, lcid, wFlags, pdp, pvarRes, pei, pspCaller); - } - FIXME("DISPATCH_CONSTRUCT flag but missing value function\n"); - return E_FAIL; - } - FIXME("DISPATCH_CONSTRUCT flag without DISPID_VALUE\n"); - return E_FAIL; - } - - if(is_dynamic_dispid(id)) { + case DISPEXPROP_DYNAMIC: { DWORD idx = id - DISPID_DYNPROP_0; dynamic_prop_t *prop; @@ -1209,8 +1200,24 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc return E_NOTIMPL; } } + case DISPEXPROP_BUILTIN: + if(wFlags == DISPATCH_CONSTRUCT) { + if(id == DISPID_VALUE) { + if(This->data->vtbl && This->data->vtbl->value) { + return This->data->vtbl->value(This, lcid, wFlags, pdp, pvarRes, pei, pspCaller); + } + FIXME("DISPATCH_CONSTRUCT flag but missing value function\n"); + return E_FAIL; + } + FIXME("DISPATCH_CONSTRUCT flag without DISPID_VALUE\n"); + return E_FAIL; + } - return invoke_builtin_prop(This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); + return invoke_builtin_prop(This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); + default: + assert(0); + return E_FAIL; + } } static HRESULT WINAPI DispatchEx_DeleteMemberByName(IDispatchEx *iface, BSTR bstrName, DWORD grfdex)

1 0

Jacek Caban : mshtml: Use proper document node for createElement called on document fragment.
by Alexandre Julliard July 24, 2012

July 24, 2012

Module: wine Branch: master Commit: a68e77d6133bbe60e1d4e6c3e683af549b989bd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a68e77d6133bbe60e1d4e6c3e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 24 15:55:41 2012 +0200 mshtml: Use proper document node for createElement called on document fragment. --- dlls/mshtml/htmldoc.c | 10 ++++++++-- dlls/mshtml/tests/dom.c | 10 +++++++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index f9e11ce..57d0b31 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1022,17 +1022,23 @@ static HRESULT WINAPI HTMLDocument_createElement(IHTMLDocument2 *iface, BSTR eTa IHTMLElement **newElem) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); + HTMLDocumentNode *doc_node; nsIDOMHTMLElement *nselem; HTMLElement *elem; HRESULT hres; TRACE("(%p)->(%s %p)\n", This, debugstr_w(eTag), newElem); - hres = create_nselem(This->doc_node, eTag, &nselem); + /* Use owner doc if called on document fragment */ + doc_node = This->doc_node; + if(!doc_node->nsdoc) + doc_node = doc_node->node.doc; + + hres = create_nselem(doc_node, eTag, &nselem); if(FAILED(hres)) return hres; - hres = HTMLElement_Create(This->doc_node, (nsIDOMNode*)nselem, TRUE, &elem); + hres = HTMLElement_Create(doc_node, (nsIDOMNode*)nselem, TRUE, &elem); nsIDOMHTMLElement_Release(nselem); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 8907a98..1a1732f 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6246,10 +6246,10 @@ static IHTMLDocument2 *create_docfrag(IHTMLDocument2 *doc) static void test_docfrag(IHTMLDocument2 *doc) { + IHTMLDocument2 *frag, *owner_doc, *doc_node; IHTMLElement *div, *body, *br; IHTMLElementCollection *col; IHTMLLocation *location; - IHTMLDocument2 *frag; HRESULT hres; static const elem_type_t all_types[] = { @@ -6288,6 +6288,14 @@ static void test_docfrag(IHTMLDocument2 *doc) test_elem_collection((IUnknown*)col, all_types, sizeof(all_types)/sizeof(all_types[0])); IHTMLElementCollection_Release(col); + div = test_create_elem(frag, "div"); + owner_doc = get_owner_doc((IUnknown*)div); + doc_node = get_doc_node(doc); + ok(iface_cmp((IUnknown*)owner_doc, (IUnknown*)doc_node), "owner_doc != doc_node\n"); + IHTMLDocument2_Release(doc_node); + IHTMLDocument2_Release(owner_doc); + IHTMLElement_Release(div); + IHTMLDocument2_Release(frag); }

1 0

Dmitry Timoshkov : windowscodecs: Do not assume that vtable is the first element of the object, avoid not necessary casts.
by Alexandre Julliard July 24, 2012

July 24, 2012

Module: wine Branch: master Commit: b1d063b17f85325af0b29370a7ff71ccb49740c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1d063b17f85325af0b29370a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 24 15:18:16 2012 +0900 windowscodecs: Do not assume that vtable is the first element of the object, avoid not necessary casts. --- dlls/windowscodecs/tiffformat.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 19aa441..3c5144d 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -506,9 +506,10 @@ static HRESULT WINAPI TiffDecoder_QueryInterface(IWICBitmapDecoder *iface, REFII if (!ppv) return E_INVALIDARG; - if (IsEqualIID(&IID_IUnknown, iid) || IsEqualIID(&IID_IWICBitmapDecoder, iid)) + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_IWICBitmapDecoder, iid)) { - *ppv = This; + *ppv = &This->IWICBitmapDecoder_iface; } else { @@ -716,7 +717,7 @@ static HRESULT WINAPI TiffDecoder_GetFrame(IWICBitmapDecoder *iface, result->cached_tile = HeapAlloc(GetProcessHeap(), 0, decode_info.tile_size); if (result->cached_tile) - *ppIBitmapFrame = (IWICBitmapFrameDecode*)result; + *ppIBitmapFrame = &result->IWICBitmapFrameDecode_iface; else { hr = E_OUTOFMEMORY; @@ -760,7 +761,7 @@ static HRESULT WINAPI TiffFrameDecode_QueryInterface(IWICBitmapFrameDecode *ifac IsEqualIID(&IID_IWICBitmapSource, iid) || IsEqualIID(&IID_IWICBitmapFrameDecode, iid)) { - *ppv = This; + *ppv = &This->IWICBitmapFrameDecode_iface; } else if (IsEqualIID(&IID_IWICMetadataBlockReader, iid)) { @@ -1271,8 +1272,8 @@ HRESULT TiffDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This->tiff = NULL; This->initialized = FALSE; - ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); - IUnknown_Release((IUnknown*)This); + ret = IWICBitmapDecoder_QueryInterface(&This->IWICBitmapDecoder_iface, iid, ppv); + IWICBitmapDecoder_Release(&This->IWICBitmapDecoder_iface); return ret; } @@ -1729,7 +1730,7 @@ static HRESULT WINAPI TiffEncoder_QueryInterface(IWICBitmapEncoder *iface, REFII if (IsEqualIID(&IID_IUnknown, iid) || IsEqualIID(&IID_IWICBitmapEncoder, iid)) { - *ppv = This; + *ppv = &This->IWICBitmapEncoder_iface; } else { @@ -1993,8 +1994,8 @@ HRESULT TiffEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This->num_frames_committed = 0; This->committed = FALSE; - ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); - IUnknown_Release((IUnknown*)This); + ret = IWICBitmapEncoder_QueryInterface(&This->IWICBitmapEncoder_iface, iid, ppv); + IWICBitmapEncoder_Release(&This->IWICBitmapEncoder_iface); return ret; }

1 0

Dmitry Timoshkov : windowscodecs: Do not assume that vtable is the first element of the object, avoid not necessary casts.
by Alexandre Julliard July 24, 2012

July 24, 2012

Module: wine Branch: master Commit: 85c02fd7609af094ba90bd4c30435303fc23db15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85c02fd7609af094ba90bd4c3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 24 15:17:15 2012 +0900 windowscodecs: Do not assume that vtable is the first element of the object, avoid not necessary casts. --- dlls/windowscodecs/tgaformat.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/tgaformat.c b/dlls/windowscodecs/tgaformat.c index 0a12056..eac3406 100644 --- a/dlls/windowscodecs/tgaformat.c +++ b/dlls/windowscodecs/tgaformat.c @@ -140,7 +140,7 @@ static HRESULT WINAPI TgaDecoder_QueryInterface(IWICBitmapDecoder *iface, REFIID if (IsEqualIID(&IID_IUnknown, iid) || IsEqualIID(&IID_IWICBitmapDecoder, iid)) { - *ppv = This; + *ppv = &This->IWICBitmapDecoder_iface; } else { @@ -468,13 +468,13 @@ static HRESULT WINAPI TgaDecoder_Frame_QueryInterface(IWICBitmapFrameDecode *ifa static ULONG WINAPI TgaDecoder_Frame_AddRef(IWICBitmapFrameDecode *iface) { TgaDecoder *This = impl_from_IWICBitmapFrameDecode(iface); - return IUnknown_AddRef((IUnknown*)This); + return IWICBitmapDecoder_AddRef(&This->IWICBitmapDecoder_iface); } static ULONG WINAPI TgaDecoder_Frame_Release(IWICBitmapFrameDecode *iface) { TgaDecoder *This = impl_from_IWICBitmapFrameDecode(iface); - return IUnknown_Release((IUnknown*)This); + return IWICBitmapDecoder_Release(&This->IWICBitmapDecoder_iface); } static HRESULT WINAPI TgaDecoder_Frame_GetSize(IWICBitmapFrameDecode *iface, @@ -962,8 +962,8 @@ HRESULT TgaDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) InitializeCriticalSection(&This->lock); This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": TgaDecoder.lock"); - ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); - IUnknown_Release((IUnknown*)This); + ret = IWICBitmapDecoder_QueryInterface(&This->IWICBitmapDecoder_iface, iid, ppv); + IWICBitmapDecoder_Release(&This->IWICBitmapDecoder_iface); return ret; }

1 0

Dmitry Timoshkov : windowscodecs: Do not assume that vtable is the first element of the object, avoid not necessary casts.
by Alexandre Julliard July 24, 2012

July 24, 2012

Module: wine Branch: master Commit: 6abda85c2987b3d384e433d6efbe4163cdcf9c9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6abda85c2987b3d384e433d6e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 24 15:14:14 2012 +0900 windowscodecs: Do not assume that vtable is the first element of the object, avoid not necessary casts. --- dlls/windowscodecs/pngformat.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index c440d3e..683da2d 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -194,7 +194,7 @@ static HRESULT WINAPI PngDecoder_QueryInterface(IWICBitmapDecoder *iface, REFIID if (IsEqualIID(&IID_IUnknown, iid) || IsEqualIID(&IID_IWICBitmapDecoder, iid)) { - *ppv = This; + *ppv = &This->IWICBitmapDecoder_iface; } else { @@ -573,11 +573,11 @@ static HRESULT WINAPI PngDecoder_Frame_QueryInterface(IWICBitmapFrameDecode *ifa IsEqualIID(&IID_IWICBitmapSource, iid) || IsEqualIID(&IID_IWICBitmapFrameDecode, iid)) { - *ppv = iface; + *ppv = &This->IWICBitmapFrameDecode_iface; } else if (IsEqualIID(&IID_IWICMetadataBlockReader, iid)) { - *ppv = (void**)&This->IWICMetadataBlockReader_iface; + *ppv = &This->IWICMetadataBlockReader_iface; } else { @@ -592,13 +592,13 @@ static HRESULT WINAPI PngDecoder_Frame_QueryInterface(IWICBitmapFrameDecode *ifa static ULONG WINAPI PngDecoder_Frame_AddRef(IWICBitmapFrameDecode *iface) { PngDecoder *This = impl_from_IWICBitmapFrameDecode(iface); - return IUnknown_AddRef((IUnknown*)This); + return IWICBitmapDecoder_AddRef(&This->IWICBitmapDecoder_iface); } static ULONG WINAPI PngDecoder_Frame_Release(IWICBitmapFrameDecode *iface) { PngDecoder *This = impl_from_IWICBitmapFrameDecode(iface); - return IUnknown_Release((IUnknown*)This); + return IWICBitmapDecoder_Release(&This->IWICBitmapDecoder_iface); } static HRESULT WINAPI PngDecoder_Frame_GetSize(IWICBitmapFrameDecode *iface, @@ -766,13 +766,13 @@ static HRESULT WINAPI PngDecoder_Block_QueryInterface(IWICMetadataBlockReader *i static ULONG WINAPI PngDecoder_Block_AddRef(IWICMetadataBlockReader *iface) { PngDecoder *This = impl_from_IWICMetadataBlockReader(iface); - return IUnknown_AddRef((IUnknown*)This); + return IWICBitmapDecoder_AddRef(&This->IWICBitmapDecoder_iface); } static ULONG WINAPI PngDecoder_Block_Release(IWICMetadataBlockReader *iface) { PngDecoder *This = impl_from_IWICMetadataBlockReader(iface); - return IUnknown_Release((IUnknown*)This); + return IWICBitmapDecoder_Release(&This->IWICBitmapDecoder_iface); } static HRESULT WINAPI PngDecoder_Block_GetContainerFormat(IWICMetadataBlockReader *iface, @@ -846,8 +846,8 @@ HRESULT PngDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) InitializeCriticalSection(&This->lock); This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": PngDecoder.lock"); - ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); - IUnknown_Release((IUnknown*)This); + ret = IWICBitmapDecoder_QueryInterface(&This->IWICBitmapDecoder_iface, iid, ppv); + IWICBitmapDecoder_Release(&This->IWICBitmapDecoder_iface); return ret; } @@ -930,13 +930,13 @@ static HRESULT WINAPI PngFrameEncode_QueryInterface(IWICBitmapFrameEncode *iface static ULONG WINAPI PngFrameEncode_AddRef(IWICBitmapFrameEncode *iface) { PngEncoder *This = impl_from_IWICBitmapFrameEncode(iface); - return IUnknown_AddRef((IUnknown*)This); + return IWICBitmapEncoder_AddRef(&This->IWICBitmapEncoder_iface); } static ULONG WINAPI PngFrameEncode_Release(IWICBitmapFrameEncode *iface) { PngEncoder *This = impl_from_IWICBitmapFrameEncode(iface); - return IUnknown_Release((IUnknown*)This); + return IWICBitmapEncoder_Release(&This->IWICBitmapEncoder_iface); } static HRESULT WINAPI PngFrameEncode_Initialize(IWICBitmapFrameEncode *iface, @@ -1270,7 +1270,7 @@ static HRESULT WINAPI PngEncoder_QueryInterface(IWICBitmapEncoder *iface, REFIID if (IsEqualIID(&IID_IUnknown, iid) || IsEqualIID(&IID_IWICBitmapEncoder, iid)) { - *ppv = This; + *ppv = &This->IWICBitmapEncoder_iface; } else { @@ -1546,8 +1546,8 @@ HRESULT PngEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) InitializeCriticalSection(&This->lock); This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": PngEncoder.lock"); - ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); - IUnknown_Release((IUnknown*)This); + ret = IWICBitmapEncoder_QueryInterface(&This->IWICBitmapEncoder_iface, iid, ppv); + IWICBitmapEncoder_Release(&This->IWICBitmapEncoder_iface); return ret; }

1 0

Dmitry Timoshkov : windowscodecs: Do not assume that vtable is the first element of the object.
by Alexandre Julliard July 24, 2012

July 24, 2012

Module: wine Branch: master Commit: e796ef820bfa6269df871a33e6cdf91c44893ba7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e796ef820bfa6269df871a33e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 24 15:15:15 2012 +0900 windowscodecs: Do not assume that vtable is the first element of the object. --- dlls/windowscodecs/propertybag.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/propertybag.c b/dlls/windowscodecs/propertybag.c index 128cf24..3a85df0 100644 --- a/dlls/windowscodecs/propertybag.c +++ b/dlls/windowscodecs/propertybag.c @@ -54,7 +54,7 @@ static HRESULT WINAPI PropertyBag_QueryInterface(IPropertyBag2 *iface, REFIID ii if (IsEqualIID(&IID_IUnknown, iid) || IsEqualIID(&IID_IPropertyBag2, iid)) { - *ppv = This; + *ppv = &This->IPropertyBag2_iface; } else {

1 0

Dmitry Timoshkov : windowscodecs: Do not assume that vtable is the first element of the object.
by Alexandre Julliard July 24, 2012

July 24, 2012

Module: wine Branch: master Commit: e9b642ee69287120fa47d55839de5bea91d444ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9b642ee69287120fa47d5583… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 24 15:16:15 2012 +0900 windowscodecs: Do not assume that vtable is the first element of the object. --- dlls/windowscodecs/scaler.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/scaler.c b/dlls/windowscodecs/scaler.c index 06d900d..5470d2b 100644 --- a/dlls/windowscodecs/scaler.c +++ b/dlls/windowscodecs/scaler.c @@ -63,7 +63,7 @@ static HRESULT WINAPI BitmapScaler_QueryInterface(IWICBitmapScaler *iface, REFII IsEqualIID(&IID_IWICBitmapSource, iid) || IsEqualIID(&IID_IWICBitmapScaler, iid)) { - *ppv = This; + *ppv = &This->IWICBitmapScaler_iface; } else {

1 0

Dmitry Timoshkov : windowscodecs: Do not assume that vtable is the first element of the object.
by Alexandre Julliard July 24, 2012

July 24, 2012

Module: wine Branch: master Commit: 6588aea643832291187391a713b4e95b67fdef42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6588aea643832291187391a71… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 24 15:13:15 2012 +0900 windowscodecs: Do not assume that vtable is the first element of the object. --- dlls/windowscodecs/palette.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index 096258a..f989c97 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -611,7 +611,7 @@ HRESULT PaletteImpl_Create(IWICPalette **palette) InitializeCriticalSection(&This->lock); This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": PaletteImpl.lock"); - *palette = (IWICPalette*)This; + *palette = &This->IWICPalette_iface; return S_OK; }

1 0