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

Vincent Povirk : windowscodecs: Implement IWICBitmapCodecInfo:: GetPixelFormats.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: 5c4ed986c0933945295dc45e56876cdb81168d6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c4ed986c0933945295dc45e5… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jul 2 13:48:05 2012 -0500 windowscodecs: Implement IWICBitmapCodecInfo::GetPixelFormats. --- dlls/windowscodecs/info.c | 73 ++++++++++++++++++++++++++++++++++++-- dlls/windowscodecs/tests/info.c | 54 ++++++++++++++++++++++++++++ 2 files changed, 123 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 9921efc..f1eaf4c 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -42,6 +42,7 @@ static const WCHAR mimetypes_valuename[] = {'M','i','m','e','T','y','p','e','s', static const WCHAR author_valuename[] = {'A','u','t','h','o','r',0}; static const WCHAR friendlyname_valuename[] = {'F','r','i','e','n','d','l','y','N','a','m','e',0}; static const WCHAR pixelformats_keyname[] = {'P','i','x','e','l','F','o','r','m','a','t','s',0}; +static const WCHAR formats_keyname[] = {'F','o','r','m','a','t','s',0}; static const WCHAR containerformat_valuename[] = {'C','o','n','t','a','i','n','e','r','F','o','r','m','a','t',0}; static const WCHAR metadataformat_valuename[] = {'M','e','t','a','d','a','t','a','F','o','r','m','a','t',0}; static const WCHAR vendor_valuename[] = {'V','e','n','d','o','r',0}; @@ -135,6 +136,68 @@ static HRESULT ComponentInfo_GetDWORDValue(HKEY classkey, LPCWSTR value, return HRESULT_FROM_WIN32(ret); } +static HRESULT ComponentInfo_GetGuidList(HKEY classkey, LPCWSTR subkeyname, + UINT buffersize, GUID *buffer, UINT *actual_size) +{ + LONG ret; + HKEY subkey; + UINT items_returned; + WCHAR guid_string[39]; + DWORD guid_string_size; + HRESULT hr=S_OK; + + if (!actual_size) + return E_INVALIDARG; + + ret = RegOpenKeyExW(classkey, subkeyname, 0, KEY_READ, &subkey); + if (ret != ERROR_SUCCESS) return HRESULT_FROM_WIN32(ret); + + if (buffer) + { + items_returned = 0; + guid_string_size = 39; + while (items_returned < buffersize) + { + ret = RegEnumKeyExW(subkey, items_returned, guid_string, + &guid_string_size, NULL, NULL, NULL, NULL); + + if (ret != ERROR_SUCCESS) + { + hr = HRESULT_FROM_WIN32(ret); + break; + } + + if (guid_string_size != 38) + { + hr = E_FAIL; + break; + } + + hr = CLSIDFromString(guid_string, &buffer[items_returned]); + if (FAILED(hr)) + break; + + items_returned++; + guid_string_size = 39; + } + + if (ret == ERROR_NO_MORE_ITEMS) + hr = S_OK; + + *actual_size = items_returned; + } + else + { + ret = RegQueryInfoKeyW(subkey, NULL, NULL, NULL, actual_size, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + if (ret != ERROR_SUCCESS) + hr = HRESULT_FROM_WIN32(ret); + } + + RegCloseKey(subkey); + + return hr; +} + typedef struct { IWICBitmapDecoderInfo IWICBitmapDecoderInfo_iface; LONG ref; @@ -290,8 +353,9 @@ static HRESULT WINAPI BitmapDecoderInfo_GetContainerFormat(IWICBitmapDecoderInfo static HRESULT WINAPI BitmapDecoderInfo_GetPixelFormats(IWICBitmapDecoderInfo *iface, UINT cFormats, GUID *pguidPixelFormats, UINT *pcActual) { - FIXME("(%p,%u,%p,%p): stub\n", iface, cFormats, pguidPixelFormats, pcActual); - return E_NOTIMPL; + BitmapDecoderInfo *This = impl_from_IWICBitmapDecoderInfo(iface); + TRACE("(%p,%u,%p,%p)\n", iface, cFormats, pguidPixelFormats, pcActual); + return ComponentInfo_GetGuidList(This->classkey, formats_keyname, cFormats, pguidPixelFormats, pcActual); } static HRESULT WINAPI BitmapDecoderInfo_GetColorManagementVersion(IWICBitmapDecoderInfo *iface, @@ -755,8 +819,9 @@ static HRESULT WINAPI BitmapEncoderInfo_GetContainerFormat(IWICBitmapEncoderInfo static HRESULT WINAPI BitmapEncoderInfo_GetPixelFormats(IWICBitmapEncoderInfo *iface, UINT cFormats, GUID *pguidPixelFormats, UINT *pcActual) { - FIXME("(%p,%u,%p,%p): stub\n", iface, cFormats, pguidPixelFormats, pcActual); - return E_NOTIMPL; + BitmapEncoderInfo *This = impl_from_IWICBitmapEncoderInfo(iface); + TRACE("(%p,%u,%p,%p)\n", iface, cFormats, pguidPixelFormats, pcActual); + return ComponentInfo_GetGuidList(This->classkey, formats_keyname, cFormats, pguidPixelFormats, pcActual); } static HRESULT WINAPI BitmapEncoderInfo_GetColorManagementVersion(IWICBitmapEncoderInfo *iface, diff --git a/dlls/windowscodecs/tests/info.c b/dlls/windowscodecs/tests/info.c index cae64ff..6eb20cb 100644 --- a/dlls/windowscodecs/tests/info.c +++ b/dlls/windowscodecs/tests/info.c @@ -63,6 +63,23 @@ static HRESULT get_component_info(const GUID *clsid, IWICComponentInfo **result) return hr; } +static int is_pixelformat(GUID *format) +{ + IWICComponentInfo *info; + HRESULT hr; + WICComponentType componenttype; + + hr = get_component_info(format, &info); + if (FAILED(hr)) + return FALSE; + + hr = IWICComponentInfo_GetComponentType(info, &componenttype); + + IWICComponentInfo_Release(info); + + return SUCCEEDED(hr) && componenttype == WICPixelFormat; +} + static void test_decoder_info(void) { IWICComponentInfo *info; @@ -72,6 +89,9 @@ static void test_decoder_info(void) WCHAR value[256]; const WCHAR expected_mimetype[] = {'i','m','a','g','e','/','b','m','p',0}; CLSID clsid; + GUID pixelformats[20]; + UINT num_formats, count; + int i; hr = get_component_info(&CLSID_WICBmpDecoder, &info); @@ -114,6 +134,40 @@ static void test_decoder_info(void) ok(lstrcmpW(value, expected_mimetype) == 0, "GetMimeType returned wrong value %s\n", wine_dbgstr_w(value)); ok(len == lstrlenW(expected_mimetype)+1, "GetMimeType returned wrong len %i\n", len); + num_formats = 0xdeadbeef; + hr = IWICBitmapDecoderInfo_GetPixelFormats(decoder_info, 0, NULL, &num_formats); + ok(hr == S_OK, "GetPixelFormats failed, hr=%x\n", hr); + ok(num_formats < 20 && num_formats > 1, "got %d formats\n", num_formats); + + hr = IWICBitmapDecoderInfo_GetPixelFormats(decoder_info, 0, NULL, NULL); + ok(hr == E_INVALIDARG, "GetPixelFormats failed, hr=%x\n", hr); + + count = 0xdeadbeef; + hr = IWICBitmapDecoderInfo_GetPixelFormats(decoder_info, 0, pixelformats, &count); + ok(hr == S_OK, "GetPixelFormats failed, hr=%x\n", hr); + ok(count == 0, "got %d formats\n", count); + + count = 0xdeadbeef; + hr = IWICBitmapDecoderInfo_GetPixelFormats(decoder_info, 1, pixelformats, &count); + ok(hr == S_OK, "GetPixelFormats failed, hr=%x\n", hr); + ok(count == 1, "got %d formats\n", count); + ok(is_pixelformat(&pixelformats[0]), "got invalid pixel format\n"); + + count = 0xdeadbeef; + hr = IWICBitmapDecoderInfo_GetPixelFormats(decoder_info, num_formats, pixelformats, &count); + ok(hr == S_OK, "GetPixelFormats failed, hr=%x\n", hr); + ok(count == num_formats, "got %d formats, expected %d\n", count, num_formats); + for (i=0; i<num_formats; i++) + ok(is_pixelformat(&pixelformats[i]), "got invalid pixel format\n"); + + hr = IWICBitmapDecoderInfo_GetPixelFormats(decoder_info, num_formats, pixelformats, NULL); + ok(hr == E_INVALIDARG, "GetPixelFormats failed, hr=%x\n", hr); + + count = 0xdeadbeef; + hr = IWICBitmapDecoderInfo_GetPixelFormats(decoder_info, 20, pixelformats, &count); + ok(hr == S_OK, "GetPixelFormats failed, hr=%x\n", hr); + ok(count == num_formats, "got %d formats, expected %d\n", count, num_formats); + IWICBitmapDecoderInfo_Release(decoder_info); IWICComponentInfo_Release(info);

1 0

Detlef Riekenberg : shell32/tests: Fix a failure on w2k.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: bb684aaba74dfb252138dea4eac4be28983e7517 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb684aaba74dfb252138dea4e… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jul 2 21:22:10 2012 +0200 shell32/tests: Fix a failure on w2k. --- dlls/shell32/tests/shlfolder.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index bee6cb5..f34bb70 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -73,6 +73,18 @@ static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); static UINT (WINAPI *pGetSystemWow64DirectoryW)(LPWSTR, UINT); static HRESULT (WINAPI *pSHCreateDefaultContextMenu)(const DEFCONTEXTMENU*,REFIID,void**); +static const char *debugstr_guid(REFIID riid) +{ + static char buf[50]; + + sprintf(buf, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], + riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], + riid->Data4[5], riid->Data4[6], riid->Data4[7]); + + return buf; +} + static WCHAR *make_wstr(const char *str) { WCHAR *ret; @@ -566,7 +578,9 @@ if (0) CLSID id; hr = IPersist_GetClassID(pp, &id); ok(hr == S_OK, "Got 0x%08x\n", hr); - ok(IsEqualIID(&id, &CLSID_ShellDocObjView), "Unexpected classid\n"); + /* CLSID_ShellFSFolder on some w2k systems */ + ok(IsEqualIID(&id, &CLSID_ShellDocObjView) || broken(IsEqualIID(&id, &CLSID_ShellFSFolder)), + "Unexpected classid %s\n", debugstr_guid(&id)); IPersist_Release(pp); }

1 0

Michael Stefaniuc : quartz: COM cleanup for IMediaSample2.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: b904b6949ebff5449273e15403025d5ab25650ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=b904b6949ebff5449273e1540… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 3 00:15:01 2012 +0200 quartz: COM cleanup for IMediaSample2. --- dlls/quartz/memallocator.c | 80 +++++++++++++++++++++++------------------- dlls/quartz/quartz_private.h | 12 ------ 2 files changed, 44 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b904b6949ebff5449273e…

1 0

Michael Stefaniuc : quartz: Avoid a COM object => iface => object round trip.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: f557ed6f944226f0f8b6ef03ee3d66bcb3abc07b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f557ed6f944226f0f8b6ef03e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 3 00:17:23 2012 +0200 quartz: Avoid a COM object => iface => object round trip. --- dlls/quartz/memallocator.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index f74a2fd..df4cf63 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -335,14 +335,14 @@ static HRESULT WINAPI BaseMemAllocator_GetBuffer(IMemAllocator * iface, IMediaSa hr = VFW_E_TIMEOUT; else { + StdMediaSample2 *ms; struct list * free = list_head(&This->free_list); list_remove(free); list_add_head(&This->used_list, free); - *pSample = (IMediaSample *)LIST_ENTRY(free, StdMediaSample2, listentry); - - assert(((StdMediaSample2 *)*pSample)->ref == 0); - + ms = LIST_ENTRY(free, StdMediaSample2, listentry); + assert(ms->ref == 0); + *pSample = (IMediaSample *)&ms->IMediaSample2_iface; IMediaSample_AddRef(*pSample); } }

1 0

Michael Stefaniuc : quartz: Use unsafe_impl_from_IMediaSample() instead of a cast.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: 9262c55a2ecf834b98ccd5b8f2794e74d5b39e69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9262c55a2ecf834b98ccd5b8f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 3 00:19:52 2012 +0200 quartz: Use unsafe_impl_from_IMediaSample() instead of a cast. --- dlls/quartz/memallocator.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index df4cf63..cc700c2 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -70,6 +70,7 @@ static inline BaseMemAllocator *impl_from_IMemAllocator(IMemAllocator *iface) static const IMemAllocatorVtbl BaseMemAllocator_VTable; static const IMediaSample2Vtbl StdMediaSample2_VTable; +static inline StdMediaSample2 *unsafe_impl_from_IMediaSample(IMediaSample * iface); #define AM_SAMPLE2_PROP_SIZE_WRITABLE FIELD_OFFSET(AM_SAMPLE2_PROPERTIES, pbBuffer) @@ -356,9 +357,9 @@ static HRESULT WINAPI BaseMemAllocator_GetBuffer(IMemAllocator * iface, IMediaSa static HRESULT WINAPI BaseMemAllocator_ReleaseBuffer(IMemAllocator * iface, IMediaSample * pSample) { BaseMemAllocator *This = impl_from_IMemAllocator(iface); - StdMediaSample2 * pStdSample = (StdMediaSample2 *)pSample; + StdMediaSample2 * pStdSample = unsafe_impl_from_IMediaSample(pSample); HRESULT hr = S_OK; - + TRACE("(%p)->(%p)\n", This, pSample); /* FIXME: make sure that sample is currently on the used list */ @@ -791,6 +792,16 @@ static const IMediaSample2Vtbl StdMediaSample2_VTable = StdMediaSample2_SetProperties }; +static inline StdMediaSample2 *unsafe_impl_from_IMediaSample(IMediaSample * iface) +{ + IMediaSample2 *iface2 = (IMediaSample2 *)iface; + + if (!iface) + return NULL; + assert(iface2->lpVtbl == &StdMediaSample2_VTable); + return impl_from_IMediaSample2(iface2); +} + typedef struct StdMemAllocator { BaseMemAllocator base;

1 0

Nikolay Sivov : msxml3: Fix node interface leak after nextNode().
by Alexandre Julliard 02 Jul '12

02 Jul '12

Module: wine Branch: master Commit: f139a88fd5b5df6baac1b1d1bbce2113a7e68adf URL: http://source.winehq.org/git/wine.git/?a=commit;h=f139a88fd5b5df6baac1b1d1b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 30 17:48:44 2012 +0400 msxml3: Fix node interface leak after nextNode(). --- dlls/msxml3/selection.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/selection.c b/dlls/msxml3/selection.c index 55873bb..3cbf4e9 100644 --- a/dlls/msxml3/selection.c +++ b/dlls/msxml3/selection.c @@ -513,7 +513,11 @@ static HRESULT WINAPI enumvariant_Next( /* we need to advance one step more for some reason */ if (ret_count) + { + node = NULL; IXMLDOMSelection_nextNode(This->selection, &node); + if (node) IXMLDOMNode_Release(node); + } return celt == 0 ? S_OK : S_FALSE; }

1 0

Nikolay Sivov : msxml3: Make it possible to use different outer objects with single IEnumVARIANT implementation .
by Alexandre Julliard 02 Jul '12

02 Jul '12

Module: wine Branch: master Commit: 27eedd5f5eae5d62e5c8c13f3b47d5b2f9c59029 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27eedd5f5eae5d62e5c8c13f3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 30 20:34:27 2012 +0400 msxml3: Make it possible to use different outer objects with single IEnumVARIANT implementation. --- dlls/msxml3/selection.c | 71 ++++++++++++++++++++++++++++++---------------- 1 files changed, 46 insertions(+), 25 deletions(-) diff --git a/dlls/msxml3/selection.c b/dlls/msxml3/selection.c index 3cbf4e9..b41e323 100644 --- a/dlls/msxml3/selection.c +++ b/dlls/msxml3/selection.c @@ -59,18 +59,26 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); int registerNamespaces(xmlXPathContextPtr ctxt); xmlChar* XSLPattern_to_XPath(xmlXPathContextPtr ctxt, xmlChar const* xslpat_str); -typedef struct _enumvariant +struct enumvariant_funcs +{ + HRESULT (*get_item)(IUnknown*, LONG, IDispatch**); + HRESULT (*next)(IUnknown*); +}; + +typedef struct { IEnumVARIANT IEnumVARIANT_iface; LONG ref; - IXMLDOMSelection *selection; + IUnknown *outer; BOOL own; LONG pos; + + const struct enumvariant_funcs *funcs; } enumvariant; -typedef struct _domselection +typedef struct { DispatchEx dispex; IXMLDOMSelection IXMLDOMSelection_iface; @@ -81,6 +89,24 @@ typedef struct _domselection IEnumVARIANT *enumvariant; } domselection; +static HRESULT selection_get_item(IUnknown *iface, LONG index, IDispatch** item) +{ + return IXMLDOMSelection_get_item((IXMLDOMSelection*)iface, index, (IXMLDOMNode**)item); +} + +static HRESULT selection_next(IUnknown *iface) +{ + IXMLDOMNode *node; + HRESULT hr = IXMLDOMSelection_nextNode((IXMLDOMSelection*)iface, &node); + if (hr == S_OK) IXMLDOMNode_Release(node); + return hr; +} + +static const struct enumvariant_funcs selection_enumvariant = { + selection_get_item, + selection_next +}; + static inline domselection *impl_from_IXMLDOMSelection( IXMLDOMSelection *iface ) { return CONTAINING_RECORD(iface, domselection, IXMLDOMSelection_iface); @@ -91,7 +117,7 @@ static inline enumvariant *impl_from_IEnumVARIANT( IEnumVARIANT *iface ) return CONTAINING_RECORD(iface, enumvariant, IEnumVARIANT_iface); } -static HRESULT create_enumvariant(IXMLDOMSelection*, BOOL, IUnknown**); +static HRESULT create_enumvariant(IUnknown*, BOOL, IEnumVARIANT**); static HRESULT WINAPI domselection_QueryInterface( IXMLDOMSelection *iface, @@ -115,7 +141,7 @@ static HRESULT WINAPI domselection_QueryInterface( { if (!This->enumvariant) { - HRESULT hr = create_enumvariant(iface, FALSE, (IUnknown**)&This->enumvariant); + HRESULT hr = create_enumvariant((IUnknown*)iface, FALSE, &This->enumvariant); if (FAILED(hr)) return hr; } @@ -284,13 +310,13 @@ static HRESULT WINAPI domselection_reset( static HRESULT WINAPI domselection_get__newEnum( IXMLDOMSelection* iface, - IUnknown** ppUnk) + IUnknown** enumv) { domselection *This = impl_from_IXMLDOMSelection( iface ); - TRACE("(%p)->(%p)\n", This, ppUnk); + TRACE("(%p)->(%p)\n", This, enumv); - return create_enumvariant(iface, TRUE, ppUnk); + return create_enumvariant((IUnknown*)iface, TRUE, (IEnumVARIANT**)enumv); } static HRESULT WINAPI domselection_get_expr( @@ -438,14 +464,14 @@ static HRESULT WINAPI enumvariant_QueryInterface( if (This->own) *ppvObject = &This->IEnumVARIANT_iface; else - return IXMLDOMSelection_QueryInterface(This->selection, riid, ppvObject); + return IUnknown_QueryInterface(This->outer, riid, ppvObject); } else if (IsEqualGUID( riid, &IID_IEnumVARIANT )) { *ppvObject = &This->IEnumVARIANT_iface; } else - return IXMLDOMSelection_QueryInterface(This->selection, riid, ppvObject); + return IUnknown_QueryInterface(This->outer, riid, ppvObject); IEnumVARIANT_AddRef( iface ); @@ -468,7 +494,7 @@ static ULONG WINAPI enumvariant_Release(IEnumVARIANT *iface ) TRACE("(%p)->(%d)\n", This, ref); if ( ref == 0 ) { - if (This->own) IXMLDOMSelection_Release(This->selection); + if (This->own) IUnknown_Release(This->outer); heap_free(This); } @@ -482,7 +508,6 @@ static HRESULT WINAPI enumvariant_Next( ULONG *fetched) { enumvariant *This = impl_from_IEnumVARIANT( iface ); - IXMLDOMNode *node; ULONG ret_count = 0; TRACE("(%p)->(%u %p %p)\n", This, celt, var, fetched); @@ -496,13 +521,9 @@ static HRESULT WINAPI enumvariant_Next( IDispatch *disp = NULL; HRESULT hr; - node = NULL; - hr = IXMLDOMSelection_get_item(This->selection, This->pos, &node); + hr = This->funcs->get_item(This->outer, This->pos, &disp); if (hr != S_OK) break; - IXMLDOMNode_QueryInterface(node, &IID_IDispatch, (void**)&disp); - IXMLDOMNode_Release(node); - V_VT(var) = VT_DISPATCH; V_DISPATCH(var) = disp; @@ -514,9 +535,8 @@ static HRESULT WINAPI enumvariant_Next( /* we need to advance one step more for some reason */ if (ret_count) { - node = NULL; - IXMLDOMSelection_nextNode(This->selection, &node); - if (node) IXMLDOMNode_Release(node); + if (This->funcs->next) + This->funcs->next(This->outer); } return celt == 0 ? S_OK : S_FALSE; @@ -557,7 +577,7 @@ static const struct IEnumVARIANTVtbl EnumVARIANTVtbl = enumvariant_Clone }; -static HRESULT create_enumvariant(IXMLDOMSelection *selection, BOOL own, IUnknown **penum) +static HRESULT create_enumvariant(IUnknown *outer, BOOL own, IEnumVARIANT **penum) { enumvariant *This; @@ -566,15 +586,16 @@ static HRESULT create_enumvariant(IXMLDOMSelection *selection, BOOL own, IUnknow This->IEnumVARIANT_iface.lpVtbl = &EnumVARIANTVtbl; This->ref = 0; - This->selection = selection; + This->outer = outer; This->own = own; This->pos = 0; + This->funcs = &selection_enumvariant; if (This->own) - IXMLDOMSelection_AddRef(selection); + IUnknown_AddRef(This->outer); - *penum = (IUnknown*)&This->IEnumVARIANT_iface; - IUnknown_AddRef(*penum); + *penum = &This->IEnumVARIANT_iface; + IEnumVARIANT_AddRef(*penum); return S_OK; }

1 0

Nikolay Sivov : msxml3: Add IEnumVARIANT support for IXMLDOMNodeList.
by Alexandre Julliard 02 Jul '12

02 Jul '12

Module: wine Branch: master Commit: 03ad0acfad45ea4a6a992645e6fa2c17f6165fd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03ad0acfad45ea4a6a992645e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 1 01:12:12 2012 +0400 msxml3: Add IEnumVARIANT support for IXMLDOMNodeList. --- dlls/msxml3/msxml_private.h | 8 ++++++++ dlls/msxml3/nodelist.c | 31 +++++++++++++++++++++++++++---- dlls/msxml3/selection.c | 16 ++++------------ dlls/msxml3/tests/domdoc.c | 43 ++++++++++++++++++++++++++++++++++++++++--- 4 files changed, 79 insertions(+), 19 deletions(-) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 3a2efb0..4aafc29 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -256,6 +256,13 @@ struct nodemap_funcs HRESULT (*next_node)(const xmlNodePtr,LONG*,IXMLDOMNode**); }; +/* used by IEnumVARIANT to access outer object items */ +struct enumvariant_funcs +{ + HRESULT (*get_item)(IUnknown*, LONG, IDispatch**); + HRESULT (*next)(IUnknown*); +}; + /* constructors */ extern IUnknown *create_domdoc( xmlNodePtr ) DECLSPEC_HIDDEN; extern IUnknown *create_xmldoc( void ) DECLSPEC_HIDDEN; @@ -273,6 +280,7 @@ extern IUnknown *create_doc_fragment( xmlNodePtr ) DECLSPEC_HIDDEN; extern IUnknown *create_doc_entity_ref( xmlNodePtr ) DECLSPEC_HIDDEN; extern IUnknown *create_doc_type( xmlNodePtr ) DECLSPEC_HIDDEN; extern HRESULT create_selection( xmlNodePtr, xmlChar*, IXMLDOMNodeList** ) DECLSPEC_HIDDEN; +extern HRESULT create_enumvariant( IUnknown*, BOOL, const struct enumvariant_funcs*, IEnumVARIANT**) DECLSPEC_HIDDEN; /* data accessors */ xmlNodePtr xmlNodePtr_from_domnode( IXMLDOMNode *iface, xmlElementType type ) DECLSPEC_HIDDEN; diff --git a/dlls/msxml3/nodelist.c b/dlls/msxml3/nodelist.c index f948fcf..7e46d40 100644 --- a/dlls/msxml3/nodelist.c +++ b/dlls/msxml3/nodelist.c @@ -52,15 +52,26 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); #ifdef HAVE_LIBXML2 -typedef struct _xmlnodelist +typedef struct { DispatchEx dispex; IXMLDOMNodeList IXMLDOMNodeList_iface; LONG ref; xmlNodePtr parent; xmlNodePtr current; + IEnumVARIANT *enumvariant; } xmlnodelist; +static HRESULT nodelist_get_item(IUnknown *iface, LONG index, IDispatch** item) +{ + return IXMLDOMNodeList_get_item((IXMLDOMNodeList*)iface, index, (IXMLDOMNode**)item); +} + +static const struct enumvariant_funcs nodelist_enumvariant = { + nodelist_get_item, + NULL +}; + static inline xmlnodelist *impl_from_IXMLDOMNodeList( IXMLDOMNodeList *iface ) { return CONTAINING_RECORD(iface, xmlnodelist, IXMLDOMNodeList_iface); @@ -81,6 +92,16 @@ static HRESULT WINAPI xmlnodelist_QueryInterface( { *ppvObject = iface; } + else if (IsEqualGUID( riid, &IID_IEnumVARIANT )) + { + if (!This->enumvariant) + { + HRESULT hr = create_enumvariant((IUnknown*)iface, FALSE, &nodelist_enumvariant, &This->enumvariant); + if (FAILED(hr)) return hr; + } + + return IEnumVARIANT_QueryInterface(This->enumvariant, &IID_IEnumVARIANT, ppvObject); + } else if (dispex_query_interface(&This->dispex, riid, ppvObject)) { return *ppvObject ? S_OK : E_NOINTERFACE; @@ -116,6 +137,7 @@ static ULONG WINAPI xmlnodelist_Release( if ( ref == 0 ) { xmldoc_release( This->parent->doc ); + if (This->enumvariant) IEnumVARIANT_Release(This->enumvariant); heap_free( This ); } @@ -261,11 +283,11 @@ static HRESULT WINAPI xmlnodelist_reset( static HRESULT WINAPI xmlnodelist__newEnum( IXMLDOMNodeList* iface, - IUnknown** ppUnk) + IUnknown** enumv) { xmlnodelist *This = impl_from_IXMLDOMNodeList( iface ); - FIXME("(%p)->(%p)\n", This, ppUnk); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, enumv); + return create_enumvariant((IUnknown*)iface, TRUE, &nodelist_enumvariant, (IEnumVARIANT**)enumv); } static const struct IXMLDOMNodeListVtbl xmlnodelist_vtbl = @@ -362,6 +384,7 @@ IXMLDOMNodeList* create_children_nodelist( xmlNodePtr node ) This->ref = 1; This->parent = node; This->current = node->children; + This->enumvariant = NULL; xmldoc_add_ref( node->doc ); init_dispex(&This->dispex, (IUnknown*)&This->IXMLDOMNodeList_iface, &xmlnodelist_dispex); diff --git a/dlls/msxml3/selection.c b/dlls/msxml3/selection.c index b41e323..bf5fe61 100644 --- a/dlls/msxml3/selection.c +++ b/dlls/msxml3/selection.c @@ -59,12 +59,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); int registerNamespaces(xmlXPathContextPtr ctxt); xmlChar* XSLPattern_to_XPath(xmlXPathContextPtr ctxt, xmlChar const* xslpat_str); -struct enumvariant_funcs -{ - HRESULT (*get_item)(IUnknown*, LONG, IDispatch**); - HRESULT (*next)(IUnknown*); -}; - typedef struct { IEnumVARIANT IEnumVARIANT_iface; @@ -117,8 +111,6 @@ static inline enumvariant *impl_from_IEnumVARIANT( IEnumVARIANT *iface ) return CONTAINING_RECORD(iface, enumvariant, IEnumVARIANT_iface); } -static HRESULT create_enumvariant(IUnknown*, BOOL, IEnumVARIANT**); - static HRESULT WINAPI domselection_QueryInterface( IXMLDOMSelection *iface, REFIID riid, @@ -141,7 +133,7 @@ static HRESULT WINAPI domselection_QueryInterface( { if (!This->enumvariant) { - HRESULT hr = create_enumvariant((IUnknown*)iface, FALSE, &This->enumvariant); + HRESULT hr = create_enumvariant((IUnknown*)iface, FALSE, &selection_enumvariant, &This->enumvariant); if (FAILED(hr)) return hr; } @@ -316,7 +308,7 @@ static HRESULT WINAPI domselection_get__newEnum( TRACE("(%p)->(%p)\n", This, enumv); - return create_enumvariant((IUnknown*)iface, TRUE, (IEnumVARIANT**)enumv); + return create_enumvariant((IUnknown*)iface, TRUE, &selection_enumvariant, (IEnumVARIANT**)enumv); } static HRESULT WINAPI domselection_get_expr( @@ -577,7 +569,7 @@ static const struct IEnumVARIANTVtbl EnumVARIANTVtbl = enumvariant_Clone }; -static HRESULT create_enumvariant(IUnknown *outer, BOOL own, IEnumVARIANT **penum) +HRESULT create_enumvariant(IUnknown *outer, BOOL own, const struct enumvariant_funcs *funcs, IEnumVARIANT **penum) { enumvariant *This; @@ -589,7 +581,7 @@ static HRESULT create_enumvariant(IUnknown *outer, BOOL own, IEnumVARIANT **penu This->outer = outer; This->own = own; This->pos = 0; - This->funcs = &selection_enumvariant; + This->funcs = funcs; if (This->own) IUnknown_AddRef(This->outer); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 4b73d47..92e8d5e 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -4130,6 +4130,7 @@ static void test_get_childNodes(void) IXMLDOMElement *element; IUnknown *unk1, *unk2; HRESULT hr; + VARIANT v; BSTR str; LONG len; @@ -4153,8 +4154,7 @@ static void test_get_childNodes(void) /* refcount tests for IEnumVARIANT support */ EXPECT_REF(node_list, 1); hr = IXMLDOMNodeList_QueryInterface(node_list, &IID_IEnumVARIANT, (void**)&enum1); -if (hr == S_OK) -{ + EXPECT_HR(hr, S_OK); EXPECT_REF(node_list, 1); EXPECT_REF(enum1, 2); @@ -4199,8 +4199,45 @@ if (hr == S_OK) IEnumVARIANT_Release(enum3); IEnumVARIANT_Release(enum2); + /* iteration tests */ + hr = IXMLDOMNodeList_get_item(node_list, 0, &node); + EXPECT_HR(hr, S_OK); + hr = IXMLDOMNode_get_nodeName(node, &str); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(str, _bstr_("bs")), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + IXMLDOMNode_Release(node); + + hr = IXMLDOMNodeList_nextNode(node_list, &node); + EXPECT_HR(hr, S_OK); + hr = IXMLDOMNode_get_nodeName(node, &str); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(str, _bstr_("bs")), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + IXMLDOMNode_Release(node); + + V_VT(&v) = VT_EMPTY; + hr = IEnumVARIANT_Next(enum1, 1, &v, NULL); + EXPECT_HR(hr, S_OK); + ok(V_VT(&v) == VT_DISPATCH, "got var type %d\n", V_VT(&v)); + hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IXMLDOMNode, (void**)&node); + EXPECT_HR(hr, S_OK); + hr = IXMLDOMNode_get_nodeName(node, &str); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(str, _bstr_("bs")), "got node name %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + IXMLDOMNode_Release(node); + VariantClear(&v); + + hr = IXMLDOMNodeList_nextNode(node_list, &node); + EXPECT_HR(hr, S_OK); + hr = IXMLDOMNode_get_nodeName(node, &str); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(str, _bstr_("pr")), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + IXMLDOMNode_Release(node); + IEnumVARIANT_Release(enum1); -} hr = IXMLDOMNodeList_get_item( node_list, 2, &node ); EXPECT_HR(hr, S_OK);

1 0

Nikolay Sivov : msxml3: Implement _newEnum() for schema cache.
by Alexandre Julliard 02 Jul '12

02 Jul '12

Module: wine Branch: master Commit: 892b21088ee3cd30e57e48c0b8563bdb0591b616 URL: http://source.winehq.org/git/wine.git/?a=commit;h=892b21088ee3cd30e57e48c0b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 1 19:26:55 2012 +0400 msxml3: Implement _newEnum() for schema cache. --- dlls/msxml3/msxml_private.h | 2 +- dlls/msxml3/nodelist.c | 5 +- dlls/msxml3/schema.c | 20 ++++++--- dlls/msxml3/selection.c | 20 ++++----- dlls/msxml3/tests/domdoc.c | 96 +++++++++++++++++++++++-------------------- 5 files changed, 78 insertions(+), 65 deletions(-) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 4aafc29..8468e55 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -259,7 +259,7 @@ struct nodemap_funcs /* used by IEnumVARIANT to access outer object items */ struct enumvariant_funcs { - HRESULT (*get_item)(IUnknown*, LONG, IDispatch**); + HRESULT (*get_item)(IUnknown*, LONG, VARIANT*); HRESULT (*next)(IUnknown*); }; diff --git a/dlls/msxml3/nodelist.c b/dlls/msxml3/nodelist.c index 7e46d40..756783d 100644 --- a/dlls/msxml3/nodelist.c +++ b/dlls/msxml3/nodelist.c @@ -62,9 +62,10 @@ typedef struct IEnumVARIANT *enumvariant; } xmlnodelist; -static HRESULT nodelist_get_item(IUnknown *iface, LONG index, IDispatch** item) +static HRESULT nodelist_get_item(IUnknown *iface, LONG index, VARIANT *item) { - return IXMLDOMNodeList_get_item((IXMLDOMNodeList*)iface, index, (IXMLDOMNode**)item); + V_VT(item) = VT_DISPATCH; + return IXMLDOMNodeList_get_item((IXMLDOMNodeList*)iface, index, (IXMLDOMNode**)&V_DISPATCH(item)); } static const struct enumvariant_funcs nodelist_enumvariant = { diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index 903f311..2f31016 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -288,6 +288,17 @@ static void validate_serror(void* ctx, xmlErrorPtr err) } #endif +static HRESULT schema_cache_get_item(IUnknown *iface, LONG index, VARIANT *item) +{ + V_VT(item) = VT_BSTR; + return IXMLDOMSchemaCollection2_get_namespaceURI((IXMLDOMSchemaCollection2*)iface, index, &V_BSTR(item)); +} + +static const struct enumvariant_funcs schemacache_enumvariant = { + schema_cache_get_item, + NULL +}; + static inline HRESULT Schema_validate_tree(xmlSchemaPtr schema, xmlNodePtr tree) { xmlSchemaValidCtxtPtr svctx; @@ -1327,14 +1338,11 @@ static HRESULT WINAPI schema_cache_addCollection(IXMLDOMSchemaCollection2* iface return S_OK; } -static HRESULT WINAPI schema_cache_get__newEnum(IXMLDOMSchemaCollection2* iface, - IUnknown** ppUnk) +static HRESULT WINAPI schema_cache_get__newEnum(IXMLDOMSchemaCollection2* iface, IUnknown** enumv) { schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface); - FIXME("(%p)->(%p): stub\n", This, ppUnk); - if (ppUnk) - *ppUnk = NULL; - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, enumv); + return create_enumvariant((IUnknown*)iface, TRUE, &schemacache_enumvariant, (IEnumVARIANT**)enumv); } static HRESULT WINAPI schema_cache_validate(IXMLDOMSchemaCollection2* iface) diff --git a/dlls/msxml3/selection.c b/dlls/msxml3/selection.c index bf5fe61..bb0f42e 100644 --- a/dlls/msxml3/selection.c +++ b/dlls/msxml3/selection.c @@ -83,9 +83,10 @@ typedef struct IEnumVARIANT *enumvariant; } domselection; -static HRESULT selection_get_item(IUnknown *iface, LONG index, IDispatch** item) +static HRESULT selection_get_item(IUnknown *iface, LONG index, VARIANT* item) { - return IXMLDOMSelection_get_item((IXMLDOMSelection*)iface, index, (IXMLDOMNode**)item); + V_VT(item) = VT_DISPATCH; + return IXMLDOMSelection_get_item((IXMLDOMSelection*)iface, index, (IXMLDOMNode**)&V_DISPATCH(item)); } static HRESULT selection_next(IUnknown *iface) @@ -510,15 +511,12 @@ static HRESULT WINAPI enumvariant_Next( for (; celt > 0; celt--, var++, This->pos++) { - IDispatch *disp = NULL; - HRESULT hr; - - hr = This->funcs->get_item(This->outer, This->pos, &disp); - if (hr != S_OK) break; - - V_VT(var) = VT_DISPATCH; - V_DISPATCH(var) = disp; - + HRESULT hr = This->funcs->get_item(This->outer, This->pos, var); + if (hr != S_OK) + { + V_VT(var) = VT_EMPTY; + break; + } ret_count++; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 92e8d5e..58b170c 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -11700,7 +11700,8 @@ static void test_get_namespaces(void) { IXMLDOMSchemaCollection *collection, *collection2; IXMLDOMDocument2 *doc, *doc2; - IEnumVARIANT *enumv; + IEnumVARIANT *enumv, *enum2; + IUnknown *unk1, *unk2; IXMLDOMNode *node; VARIANT_BOOL b; HRESULT hr; @@ -11789,34 +11790,43 @@ static void test_get_namespaces(void) /* enumerate */ enumv = (void*)0xdeadbeef; + EXPECT_REF(collection, 2); hr = IXMLDOMSchemaCollection_get__newEnum(collection, (IUnknown**)&enumv); -todo_wine EXPECT_HR(hr, S_OK); - if (hr == S_OK) - { - ok(enumv != NULL, "got %p\n", enumv); + EXPECT_REF(collection, 3); + ok(enumv != NULL, "got %p\n", enumv); - V_VT(&v) = VT_EMPTY; - hr = IEnumVARIANT_Next(enumv, 1, &v, NULL); - EXPECT_HR(hr, S_OK); - ok(V_VT(&v) == VT_BSTR, "got %d\n", V_VT(&v)); - ok(!lstrcmpW(V_BSTR(&v), _bstr_("http://blah.org")), "got %s\n", wine_dbgstr_w(V_BSTR(&v))); - VariantClear(&v); + hr = IXMLDOMSchemaCollection_QueryInterface(collection, &IID_IUnknown, (void**)&unk1); + EXPECT_HR(hr, S_OK); + hr = IEnumVARIANT_QueryInterface(enumv, &IID_IUnknown, (void**)&unk2); + EXPECT_HR(hr, S_OK); + ok(unk1 != unk2, "got %p, %p\n", unk1, unk2); + IUnknown_Release(unk1); + IUnknown_Release(unk2); - V_VT(&v) = VT_EMPTY; - hr = IEnumVARIANT_Next(enumv, 1, &v, NULL); - EXPECT_HR(hr, S_OK); - ok(V_VT(&v) == VT_BSTR, "got %d\n", V_VT(&v)); - ok(!lstrcmpW(V_BSTR(&v), _bstr_("http://blahblah.org")), "got %s\n", wine_dbgstr_w(V_BSTR(&v))); - VariantClear(&v); + hr = IXMLDOMSchemaCollection_QueryInterface(collection, &IID_IEnumVARIANT, (void**)&enum2); + EXPECT_HR(hr, E_NOINTERFACE); - V_VT(&v) = VT_NULL; - hr = IEnumVARIANT_Next(enumv, 1, &v, NULL); - EXPECT_HR(hr, S_FALSE); - ok(V_VT(&v) == VT_EMPTY, "got %d\n", V_VT(&v)); + V_VT(&v) = VT_EMPTY; + hr = IEnumVARIANT_Next(enumv, 1, &v, NULL); + EXPECT_HR(hr, S_OK); + ok(V_VT(&v) == VT_BSTR, "got %d\n", V_VT(&v)); + ok(!lstrcmpW(V_BSTR(&v), _bstr_("http://blah.org")), "got %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); - IEnumVARIANT_Release(enumv); - } + V_VT(&v) = VT_EMPTY; + hr = IEnumVARIANT_Next(enumv, 1, &v, NULL); + EXPECT_HR(hr, S_OK); + ok(V_VT(&v) == VT_BSTR, "got %d\n", V_VT(&v)); + ok(!lstrcmpW(V_BSTR(&v), _bstr_("http://blahblah.org")), "got %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + V_VT(&v) = VT_NULL; + hr = IEnumVARIANT_Next(enumv, 1, &v, NULL); + EXPECT_HR(hr, S_FALSE); + ok(V_VT(&v) == VT_EMPTY, "got %d\n", V_VT(&v)); + + IEnumVARIANT_Release(enumv); IXMLDOMSchemaCollection_Release(collection); IXMLDOMDocument2_Release(doc); @@ -11900,33 +11910,29 @@ todo_wine /* enumerate */ enumv = (void*)0xdeadbeef; hr = IXMLDOMSchemaCollection_get__newEnum(collection, (IUnknown**)&enumv); -todo_wine EXPECT_HR(hr, S_OK); - if (hr == S_OK) - { - ok(enumv != NULL, "got %p\n", enumv); + ok(enumv != NULL, "got %p\n", enumv); - V_VT(&v) = VT_EMPTY; - hr = IEnumVARIANT_Next(enumv, 1, &v, NULL); - EXPECT_HR(hr, S_OK); - ok(V_VT(&v) == VT_BSTR, "got %d\n", V_VT(&v)); - ok(!lstrcmpW(V_BSTR(&v), _bstr_("http://blah.org")), "got %s\n", wine_dbgstr_w(V_BSTR(&v))); - VariantClear(&v); + V_VT(&v) = VT_EMPTY; + hr = IEnumVARIANT_Next(enumv, 1, &v, NULL); + EXPECT_HR(hr, S_OK); + ok(V_VT(&v) == VT_BSTR, "got %d\n", V_VT(&v)); + ok(!lstrcmpW(V_BSTR(&v), _bstr_("http://blah.org")), "got %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); - V_VT(&v) = VT_EMPTY; - hr = IEnumVARIANT_Next(enumv, 1, &v, NULL); - EXPECT_HR(hr, S_OK); - ok(V_VT(&v) == VT_BSTR, "got %d\n", V_VT(&v)); - ok(!lstrcmpW(V_BSTR(&v), _bstr_("http://blahblah.org")), "got %s\n", wine_dbgstr_w(V_BSTR(&v))); - VariantClear(&v); + V_VT(&v) = VT_EMPTY; + hr = IEnumVARIANT_Next(enumv, 1, &v, NULL); + EXPECT_HR(hr, S_OK); + ok(V_VT(&v) == VT_BSTR, "got %d\n", V_VT(&v)); + ok(!lstrcmpW(V_BSTR(&v), _bstr_("http://blahblah.org")), "got %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); - V_VT(&v) = VT_NULL; - hr = IEnumVARIANT_Next(enumv, 1, &v, NULL); - EXPECT_HR(hr, S_FALSE); - ok(V_VT(&v) == VT_EMPTY, "got %d\n", V_VT(&v)); + V_VT(&v) = VT_NULL; + hr = IEnumVARIANT_Next(enumv, 1, &v, NULL); + EXPECT_HR(hr, S_FALSE); + ok(V_VT(&v) == VT_EMPTY, "got %d\n", V_VT(&v)); - IEnumVARIANT_Release(enumv); - } + IEnumVARIANT_Release(enumv); IXMLDOMSchemaCollection_Release(collection); IXMLDOMDocument2_Release(doc); free_bstrs();

1 0

Nikolay Sivov : msxml3: Fix putref_schemas()/get_schemas() behaviour on NULL pointer.
by Alexandre Julliard 02 Jul '12

02 Jul '12

Module: wine Branch: master Commit: 2b5dd13a0ab6f59a6976ccaffd254a911f6218eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b5dd13a0ab6f59a6976ccaff… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 1 22:27:17 2012 +0400 msxml3: Fix putref_schemas()/get_schemas() behaviour on NULL pointer. --- dlls/msxml3/domdoc.c | 33 ++++++++++++-------- dlls/msxml3/tests/domdoc.c | 73 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 13 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 5097ff6..080eb3d 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2553,22 +2553,23 @@ static HRESULT WINAPI domdoc_get_namespaces( static HRESULT WINAPI domdoc_get_schemas( IXMLDOMDocument3* iface, - VARIANT* var1 ) + VARIANT* schema ) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - HRESULT hr = S_FALSE; IXMLDOMSchemaCollection2* cur_schema = This->properties->schemaCache; + HRESULT hr = S_FALSE; - TRACE("(%p)->(%p)\n", This, var1); + TRACE("(%p)->(%p)\n", This, schema); - VariantInit(var1); /* Test shows we don't call VariantClear here */ - V_VT(var1) = VT_NULL; + V_VT(schema) = VT_NULL; + /* just to reset pointer part, cause that's what application is expected to use */ + V_DISPATCH(schema) = NULL; if(cur_schema) { - hr = IXMLDOMSchemaCollection2_QueryInterface(cur_schema, &IID_IDispatch, (void**)&V_DISPATCH(var1)); + hr = IXMLDOMSchemaCollection2_QueryInterface(cur_schema, &IID_IDispatch, (void**)&V_DISPATCH(schema)); if(SUCCEEDED(hr)) - V_VT(var1) = VT_DISPATCH; + V_VT(schema) = VT_DISPATCH; } return hr; } @@ -2585,13 +2586,19 @@ static HRESULT WINAPI domdoc_putref_schemas( switch(V_VT(&schema)) { case VT_UNKNOWN: - hr = IUnknown_QueryInterface(V_UNKNOWN(&schema), &IID_IXMLDOMSchemaCollection, (void**)&new_schema); - break; - + if (V_UNKNOWN(&schema)) + { + hr = IUnknown_QueryInterface(V_UNKNOWN(&schema), &IID_IXMLDOMSchemaCollection, (void**)&new_schema); + break; + } + /* fallthrough */ case VT_DISPATCH: - hr = IDispatch_QueryInterface(V_DISPATCH(&schema), &IID_IXMLDOMSchemaCollection, (void**)&new_schema); - break; - + if (V_DISPATCH(&schema)) + { + hr = IDispatch_QueryInterface(V_DISPATCH(&schema), &IID_IXMLDOMSchemaCollection, (void**)&new_schema); + break; + } + /* fallthrough */ case VT_NULL: case VT_EMPTY: hr = S_OK; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 58b170c..5dc2581 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -12055,6 +12055,78 @@ static void test_put_data(void) free_bstrs(); } +static void test_putref_schemas(void) +{ + IXMLDOMSchemaCollection *cache; + IXMLDOMDocument2 *doc; + VARIANT schema; + HRESULT hr; + + doc = create_document(&IID_IXMLDOMDocument2); + if (!doc) return; + cache = create_cache(&IID_IXMLDOMSchemaCollection); + + /* set to NULL iface when no schema is set */ + V_VT(&schema) = VT_DISPATCH; + V_DISPATCH(&schema) = NULL; + hr = IXMLDOMDocument2_putref_schemas(doc, schema); + EXPECT_HR(hr, S_OK); + + V_VT(&schema) = VT_UNKNOWN; + V_UNKNOWN(&schema) = NULL; + hr = IXMLDOMDocument2_putref_schemas(doc, schema); + EXPECT_HR(hr, S_OK); + + /* set as VT_DISPATCH, reset with it */ + V_VT(&schema) = VT_DISPATCH; + V_DISPATCH(&schema) = (IDispatch*)cache; + hr = IXMLDOMDocument2_putref_schemas(doc, schema); + EXPECT_HR(hr, S_OK); + + V_DISPATCH(&schema) = NULL; + hr = IXMLDOMDocument2_get_schemas(doc, &schema); + EXPECT_HR(hr, S_OK); + ok(V_DISPATCH(&schema) == (IDispatch*)cache, "got %p\n", V_DISPATCH(&schema)); + + V_VT(&schema) = VT_DISPATCH; + V_DISPATCH(&schema) = NULL; + hr = IXMLDOMDocument2_putref_schemas(doc, schema); + EXPECT_HR(hr, S_OK); + + V_DISPATCH(&schema) = (IDispatch*)0xdeadbeef; + V_VT(&schema) = VT_I2; + hr = IXMLDOMDocument2_get_schemas(doc, &schema); + EXPECT_HR(hr, S_FALSE); + ok(V_DISPATCH(&schema) == NULL, "got %p\n", V_DISPATCH(&schema)); + ok(V_VT(&schema) == VT_NULL, "got %d\n", V_VT(&schema)); + + /* set as VT_UNKNOWN, reset with it */ + V_VT(&schema) = VT_UNKNOWN; + V_UNKNOWN(&schema) = (IUnknown*)cache; + hr = IXMLDOMDocument2_putref_schemas(doc, schema); + EXPECT_HR(hr, S_OK); + + V_DISPATCH(&schema) = NULL; + hr = IXMLDOMDocument2_get_schemas(doc, &schema); + EXPECT_HR(hr, S_OK); + ok(V_DISPATCH(&schema) == (IDispatch*)cache, "got %p\n", V_DISPATCH(&schema)); + + V_VT(&schema) = VT_UNKNOWN; + V_UNKNOWN(&schema) = NULL; + hr = IXMLDOMDocument2_putref_schemas(doc, schema); + EXPECT_HR(hr, S_OK); + + V_DISPATCH(&schema) = (IDispatch*)0xdeadbeef; + V_VT(&schema) = VT_I2; + hr = IXMLDOMDocument2_get_schemas(doc, &schema); + EXPECT_HR(hr, S_FALSE); + ok(V_DISPATCH(&schema) == NULL, "got %p\n", V_DISPATCH(&schema)); + ok(V_VT(&schema) == VT_NULL, "got %d\n", V_VT(&schema)); + + IXMLDOMSchemaCollection_Release(cache); + IXMLDOMDocument2_Release(doc); +} + START_TEST(domdoc) { IXMLDOMDocument *doc; @@ -12134,6 +12206,7 @@ START_TEST(domdoc) test_nodeValue(); test_get_namespaces(); test_put_data(); + test_putref_schemas(); test_xsltemplate();

1 0