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

Dmitry Timoshkov : windowscodecs: Implement MetadataReaderInfo_DoesSupportPadding.
by Alexandre Julliard July 3, 2012

July 3, 2012

Module: wine Branch: master Commit: 8dad0435060cc492e4b29ea9850ef2971ed80a88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dad0435060cc492e4b29ea98… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 2 16:15:26 2012 +0900 windowscodecs: Implement MetadataReaderInfo_DoesSupportPadding. --- dlls/windowscodecs/info.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index b45a1af..9921efc 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -53,6 +53,7 @@ static const WCHAR channelmasks_keyname[] = {'C','h','a','n','n','e','l','M','a' static const WCHAR numericrepresentation_valuename[] = {'N','u','m','e','r','i','c','R','e','p','r','e','s','e','n','t','a','t','i','o','n',0}; static const WCHAR supportstransparency_valuename[] = {'S','u','p','p','o','r','t','s','T','r','a','n','s','p','a','r','e','n','c','y',0}; static const WCHAR requiresfullstream_valuename[] = {'R','e','q','u','i','r','e','s','F','u','l','l','S','t','r','e','a','m',0}; +static const WCHAR supportspadding_valuename[] = {'S','u','p','p','o','r','t','s','P','a','d','d','i','n','g',0}; static HRESULT ComponentInfo_GetStringValue(HKEY classkey, LPCWSTR value, UINT buffer_size, WCHAR *buffer, UINT *actual_size) @@ -1589,8 +1590,9 @@ static HRESULT WINAPI MetadataReaderInfo_DoesRequireFullStream(IWICMetadataReade static HRESULT WINAPI MetadataReaderInfo_DoesSupportPadding(IWICMetadataReaderInfo *iface, BOOL *param) { - FIXME("(%p,%p): stub\n", iface, param); - return E_NOTIMPL; + MetadataReaderInfo *This = impl_from_IWICMetadataReaderInfo(iface); + TRACE("(%p,%p)\n", iface, param); + return ComponentInfo_GetDWORDValue(This->classkey, supportspadding_valuename, (DWORD *)param); } static HRESULT WINAPI MetadataReaderInfo_DoesRequireFixedSize(IWICMetadataReaderInfo *iface,

1 0

Dmitry Timoshkov : windowscodecs: Implement PixelFormatInfo_GetSpecVersion.
by Alexandre Julliard July 3, 2012

July 3, 2012

Module: wine Branch: master Commit: 497e8840ca5b30c94e6406ded3217d5c33779a6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=497e8840ca5b30c94e6406ded… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 2 16:13:21 2012 +0900 windowscodecs: Implement PixelFormatInfo_GetSpecVersion. --- dlls/windowscodecs/info.c | 8 ++++++-- dlls/windowscodecs/tests/info.c | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 4c7fcc2..1bfbfc7 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -1238,8 +1238,12 @@ static HRESULT WINAPI PixelFormatInfo_GetVersion(IWICPixelFormatInfo2 *iface, UI static HRESULT WINAPI PixelFormatInfo_GetSpecVersion(IWICPixelFormatInfo2 *iface, UINT cchSpecVersion, WCHAR *wzSpecVersion, UINT *pcchActual) { - FIXME("(%p,%u,%p,%p): stub\n", iface, cchSpecVersion, wzSpecVersion, pcchActual); - return E_NOTIMPL; + PixelFormatInfo *This = impl_from_IWICPixelFormatInfo2(iface); + + TRACE("(%p,%u,%p,%p)\n", iface, cchSpecVersion, wzSpecVersion, pcchActual); + + return ComponentInfo_GetStringValue(This->classkey, specversion_valuename, + cchSpecVersion, wzSpecVersion, pcchActual); } static HRESULT WINAPI PixelFormatInfo_GetFriendlyName(IWICPixelFormatInfo2 *iface, UINT cchFriendlyName, diff --git a/dlls/windowscodecs/tests/info.c b/dlls/windowscodecs/tests/info.c index 1cd84c1..cae64ff 100644 --- a/dlls/windowscodecs/tests/info.c +++ b/dlls/windowscodecs/tests/info.c @@ -209,8 +209,8 @@ static void test_pixelformat_info(void) len = 0xdeadbeef; hr = IWICComponentInfo_GetSpecVersion(info, 0, NULL, &len); - todo_wine ok(hr == S_OK, "GetSpecVersion failed, hr=%x\n", hr); - todo_wine ok(len == 0, "invalid length 0x%x\n", len); /* spec version does not apply to pixel formats */ + ok(hr == S_OK, "GetSpecVersion failed, hr=%x\n", hr); + ok(len == 0, "invalid length 0x%x\n", len); /* spec version does not apply to pixel formats */ memset(&guid, 0xaa, sizeof(guid)); hr = IWICComponentInfo_GetVendorGUID(info, &guid);

1 0

Dmitry Timoshkov : windowscodecs: Implement FormatConverterInfo_GetSpecVersion.
by Alexandre Julliard July 3, 2012

July 3, 2012

Module: wine Branch: master Commit: 7c191379963647f1ec734e237048731b83613a7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c191379963647f1ec734e237… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 2 17:46:17 2012 +0900 windowscodecs: Implement FormatConverterInfo_GetSpecVersion. --- dlls/windowscodecs/info.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index bd277b8..4c7fcc2 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -1013,8 +1013,12 @@ static HRESULT WINAPI FormatConverterInfo_GetVersion(IWICFormatConverterInfo *if static HRESULT WINAPI FormatConverterInfo_GetSpecVersion(IWICFormatConverterInfo *iface, UINT cchSpecVersion, WCHAR *wzSpecVersion, UINT *pcchActual) { - FIXME("(%p,%u,%p,%p): stub\n", iface, cchSpecVersion, wzSpecVersion, pcchActual); - return E_NOTIMPL; + FormatConverterInfo *This = impl_from_IWICFormatConverterInfo(iface); + + TRACE("(%p,%u,%p,%p)\n", iface, cchSpecVersion, wzSpecVersion, pcchActual); + + return ComponentInfo_GetStringValue(This->classkey, specversion_valuename, + cchSpecVersion, wzSpecVersion, pcchActual); } static HRESULT WINAPI FormatConverterInfo_GetFriendlyName(IWICFormatConverterInfo *iface, UINT cchFriendlyName,

1 0

Dmitry Timoshkov : windowscodecs: Implement BitmapEncoderInfo_GetSpecVersion.
by Alexandre Julliard July 3, 2012

July 3, 2012

Module: wine Branch: master Commit: 3dd73e90b55ad8029b9e0694511e271f65d2837d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dd73e90b55ad8029b9e06945… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 2 17:45:05 2012 +0900 windowscodecs: Implement BitmapEncoderInfo_GetSpecVersion. --- dlls/windowscodecs/info.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index debbf78..bd277b8 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -723,8 +723,12 @@ static HRESULT WINAPI BitmapEncoderInfo_GetVersion(IWICBitmapEncoderInfo *iface, static HRESULT WINAPI BitmapEncoderInfo_GetSpecVersion(IWICBitmapEncoderInfo *iface, UINT cchSpecVersion, WCHAR *wzSpecVersion, UINT *pcchActual) { - FIXME("(%p,%u,%p,%p): stub\n", iface, cchSpecVersion, wzSpecVersion, pcchActual); - return E_NOTIMPL; + BitmapEncoderInfo *This = impl_from_IWICBitmapEncoderInfo(iface); + + TRACE("(%p,%u,%p,%p)\n", iface, cchSpecVersion, wzSpecVersion, pcchActual); + + return ComponentInfo_GetStringValue(This->classkey, specversion_valuename, + cchSpecVersion, wzSpecVersion, pcchActual); } static HRESULT WINAPI BitmapEncoderInfo_GetFriendlyName(IWICBitmapEncoderInfo *iface, UINT cchFriendlyName,

1 0

Dmitry Timoshkov : windowscodecs: Implement MetadataReaderInfo_DoesRequireFullStream.
by Alexandre Julliard July 3, 2012

July 3, 2012

Module: wine Branch: master Commit: 10f897894989e6b16e7b7586a1330b5ecf7ba459 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10f897894989e6b16e7b7586a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 2 16:14:51 2012 +0900 windowscodecs: Implement MetadataReaderInfo_DoesRequireFullStream. --- dlls/windowscodecs/info.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 36d2e87..b45a1af 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -52,6 +52,7 @@ static const WCHAR channelcount_valuename[] = {'C','h','a','n','n','e','l','C',' static const WCHAR channelmasks_keyname[] = {'C','h','a','n','n','e','l','M','a','s','k','s',0}; static const WCHAR numericrepresentation_valuename[] = {'N','u','m','e','r','i','c','R','e','p','r','e','s','e','n','t','a','t','i','o','n',0}; static const WCHAR supportstransparency_valuename[] = {'S','u','p','p','o','r','t','s','T','r','a','n','s','p','a','r','e','n','c','y',0}; +static const WCHAR requiresfullstream_valuename[] = {'R','e','q','u','i','r','e','s','F','u','l','l','S','t','r','e','a','m',0}; static HRESULT ComponentInfo_GetStringValue(HKEY classkey, LPCWSTR value, UINT buffer_size, WCHAR *buffer, UINT *actual_size) @@ -1580,8 +1581,9 @@ static HRESULT WINAPI MetadataReaderInfo_GetDeviceModels(IWICMetadataReaderInfo static HRESULT WINAPI MetadataReaderInfo_DoesRequireFullStream(IWICMetadataReaderInfo *iface, BOOL *param) { - FIXME("(%p,%p): stub\n", iface, param); - return E_NOTIMPL; + MetadataReaderInfo *This = impl_from_IWICMetadataReaderInfo(iface); + TRACE("(%p,%p)\n", iface, param); + return ComponentInfo_GetDWORDValue(This->classkey, requiresfullstream_valuename, (DWORD *)param); } static HRESULT WINAPI MetadataReaderInfo_DoesSupportPadding(IWICMetadataReaderInfo *iface,

1 0

Nikolay Sivov : msxml3: Implement _newEnum() for schema cache.
by Alexandre Julliard July 2, 2012

July 2, 2012

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: Add IEnumVARIANT support for IXMLDOMNodeList.
by Alexandre Julliard July 2, 2012

July 2, 2012

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

Vincas Miliūnas : wined3d: Recognize AMD Radeon HD 6700 Series renderer string.
by Alexandre Julliard July 2, 2012

July 2, 2012

Module: wine Branch: master Commit: ada3dff134a1d711deafc495da2d73cb4387749e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ada3dff134a1d711deafc495d… Author: Vincas Miliūnas <vincas.miliunas(a)gmail.com> Date: Mon Jul 2 16:36:34 2012 +0300 wined3d: Recognize AMD Radeon HD 6700 Series renderer string. --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 381eae7..b0c2d38 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1151,6 +1151,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6550D, "AMD Radeon HD 6550D", DRIVER_AMD_R600, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6600, "AMD Radeon HD 6600 Series", DRIVER_AMD_R600, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6600M, "AMD Radeon HD 6600M Series", DRIVER_AMD_R600, 512 }, + {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6700, "AMD Radeon HD 6700 Series", DRIVER_AMD_R600, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6800, "AMD Radeon HD 6800 Series", DRIVER_AMD_R600, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6900, "AMD Radeon HD 6900 Series", DRIVER_AMD_R600, 2048}, /* Intel cards */ @@ -1713,6 +1714,7 @@ static enum wined3d_pci_device select_card_amd_binary(const struct wined3d_gl_in {"HD 6800", CARD_AMD_RADEON_HD6800}, {"HD 6770M",CARD_AMD_RADEON_HD6600M}, {"HD 6750M",CARD_AMD_RADEON_HD6600M}, + {"HD 6700", CARD_AMD_RADEON_HD6700}, {"HD 6630M",CARD_AMD_RADEON_HD6600M}, {"HD 6600M",CARD_AMD_RADEON_HD6600M}, {"HD 6600", CARD_AMD_RADEON_HD6600}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5d07091..a5b2c55 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1341,6 +1341,7 @@ enum wined3d_pci_device CARD_AMD_RADEON_HD6550D = 0x9640, CARD_AMD_RADEON_HD6600 = 0x6758, CARD_AMD_RADEON_HD6600M = 0x6741, + CARD_AMD_RADEON_HD6700 = 0x68BA, CARD_AMD_RADEON_HD6800 = 0x6739, CARD_AMD_RADEON_HD6900 = 0x6719,

1 0

Nikolay Sivov : msxml3: Add support for bin.hex element type encoding.
by Alexandre Julliard July 2, 2012

July 2, 2012

Module: wine Branch: master Commit: a9aee4c03fbd0862cb0c1e481331bc6b9de7c158 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9aee4c03fbd0862cb0c1e481… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 2 09:43:27 2012 +0400 msxml3: Add support for bin.hex element type encoding. --- dlls/msxml3/element.c | 50 ++++++++++++++++++++++++++++++++++++ dlls/msxml3/tests/domdoc.c | 61 +++++++++++++++++++++++++++++++++++++++---- 2 files changed, 105 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index db6b283..eee737e 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -801,6 +801,23 @@ static HRESULT encode_base64(const BYTE *buf, int len, BSTR *ret) return S_OK; } +static HRESULT encode_binhex(const BYTE *buf, int len, BSTR *ret) +{ + static const char byte_to_hex[16] = "0123456789abcdef"; + int i; + + *ret = SysAllocStringLen(NULL, len*2); + if (!*ret) return E_OUTOFMEMORY; + + for (i = 0; i < len; i++) + { + (*ret)[2*i] = byte_to_hex[buf[i] >> 4]; + (*ret)[2*i+1] = byte_to_hex[0x0f & buf[i]]; + } + + return S_OK; +} + static HRESULT WINAPI domelem_put_nodeTypedValue( IXMLDOMElement *iface, VARIANT value) @@ -865,6 +882,39 @@ static HRESULT WINAPI domelem_put_nodeTypedValue( return E_NOTIMPL; } break; + case DT_BIN_HEX: + if (V_VT(&value) == (VT_UI1|VT_ARRAY)) + { + UINT dim = SafeArrayGetDim(V_ARRAY(&value)); + LONG lbound, ubound; + BSTR encoded; + BYTE *ptr; + int len; + + if (dim > 1) + FIXME("unexpected array dimension count %u\n", dim); + + SafeArrayGetUBound(V_ARRAY(&value), 1, &ubound); + SafeArrayGetLBound(V_ARRAY(&value), 1, &lbound); + + len = (ubound - lbound + 1)*SafeArrayGetElemsize(V_ARRAY(&value)); + + hr = SafeArrayAccessData(V_ARRAY(&value), (void*)&ptr); + if (FAILED(hr)) return hr; + + hr = encode_binhex(ptr, len, &encoded); + SafeArrayUnaccessData(V_ARRAY(&value)); + if (FAILED(hr)) return hr; + + hr = node_set_content(&This->node, encoded); + SysFreeString(encoded); + } + else + { + FIXME("unhandled variant type %d for dt:%s\n", V_VT(&value), debugstr_dt(dt)); + return E_NOTIMPL; + } + break; default: FIXME("not implemented for dt:%s\n", debugstr_dt(dt)); return E_NOTIMPL; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 5dc2581..4b68e74 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -9165,6 +9165,8 @@ static void test_createProcessingInstruction(void) static void test_put_nodeTypedValue(void) { + static const BYTE binhexdata[16] = + {0,1,2,3,4,5,6,7,8,9,0xa,0xb,0xc,0xd,0xe,0xf}; IXMLDOMDocument *doc; IXMLDOMElement *elem; VARIANT type, value; @@ -9179,28 +9181,28 @@ static void test_put_nodeTypedValue(void) if (!doc) return; hr = IXMLDOMDocument_createElement(doc, _bstr_("Element"), &elem); - ok(hr == S_OK, "got 0x%08x\n", hr); + EXPECT_HR(hr, S_OK); V_VT(&type) = VT_EMPTY; hr = IXMLDOMElement_get_dataType(elem, &type); - ok(hr == S_FALSE, "got 0x%08x\n", hr); + EXPECT_HR(hr, S_FALSE); ok(V_VT(&type) == VT_NULL, "got %d, expected VT_NULL\n", V_VT(&type)); /* set typed value for untyped node */ V_VT(&type) = VT_I1; V_I1(&type) = 1; hr = IXMLDOMElement_put_nodeTypedValue(elem, type); - ok(hr == S_OK, "got 0x%08x\n", hr); + EXPECT_HR(hr, S_OK); V_VT(&type) = VT_EMPTY; hr = IXMLDOMElement_get_dataType(elem, &type); - ok(hr == S_FALSE, "got 0x%08x\n", hr); + EXPECT_HR(hr, S_FALSE); ok(V_VT(&type) == VT_NULL, "got %d, expected VT_NULL\n", V_VT(&type)); /* no type info stored */ V_VT(&type) = VT_EMPTY; hr = IXMLDOMElement_get_nodeTypedValue(elem, &type); - ok(hr == S_OK, "got 0x%08x\n", hr); + EXPECT_HR(hr, S_OK); ok(V_VT(&type) == VT_BSTR, "got %d, expected VT_BSTR\n", V_VT(&type)); ok(memcmp(V_BSTR(&type), _bstr_("1"), 2*sizeof(WCHAR)) == 0, "got %s, expected \"1\"\n", wine_dbgstr_w(V_BSTR(&type))); @@ -9257,7 +9259,7 @@ static void test_put_nodeTypedValue(void) hr = SafeArrayAccessData(array, (void*)&ptr); EXPECT_HR(hr, S_OK); memcpy(ptr, "dGVzdA=", strlen("dGVzdA=")); - SafeArrayUnaccessData(V_ARRAY(&value)); + SafeArrayUnaccessData(array); V_VT(&value) = VT_UI1|VT_ARRAY; V_ARRAY(&value) = array; @@ -9290,7 +9292,54 @@ static void test_put_nodeTypedValue(void) EXPECT_HR(hr, S_OK); ok(!lstrcmpW(str, _bstr_("ZEdWemRBPQ==")), "%s\n", wine_dbgstr_w(str)); IXMLDOMNode_Release(node); + SafeArrayDestroyData(array); + /* bin.hex */ + V_VT(&value) = VT_BSTR; + V_BSTR(&value) = _bstr_(""); + hr = IXMLDOMElement_put_nodeTypedValue(elem, value); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMElement_put_dataType(elem, _bstr_("bin.hex")); + EXPECT_HR(hr, S_OK); + + array = SafeArrayCreateVector(VT_UI1, 0, 16); + hr = SafeArrayAccessData(array, (void*)&ptr); + EXPECT_HR(hr, S_OK); + memcpy(ptr, binhexdata, sizeof(binhexdata)); + SafeArrayUnaccessData(array); + + V_VT(&value) = VT_UI1|VT_ARRAY; + V_ARRAY(&value) = array; + hr = IXMLDOMElement_put_nodeTypedValue(elem, value); + EXPECT_HR(hr, S_OK); + + V_VT(&value) = VT_EMPTY; + hr = IXMLDOMElement_get_nodeTypedValue(elem, &value); + EXPECT_HR(hr, S_OK); + ok(V_VT(&value) == (VT_UI1|VT_ARRAY), "got %d\n", V_VT(&value)); + ok(SafeArrayGetDim(V_ARRAY(&value)) == 1, "got wrong dimension\n"); + ubound = 0; + hr = SafeArrayGetUBound(V_ARRAY(&value), 1, &ubound); + EXPECT_HR(hr, S_OK); + ok(ubound == 15, "got %d\n", ubound); + lbound = 0; + hr = SafeArrayGetLBound(V_ARRAY(&value), 1, &lbound); + EXPECT_HR(hr, S_OK); + ok(lbound == 0, "got %d\n", lbound); + hr = SafeArrayAccessData(V_ARRAY(&value), (void*)&ptr); + EXPECT_HR(hr, S_OK); + ok(!memcmp(ptr, binhexdata, sizeof(binhexdata)), "got wrong data\n"); + SafeArrayUnaccessData(V_ARRAY(&value)); + VariantClear(&value); + + /* if set with VT_UI1|VT_ARRAY it's encoded */ + hr = IXMLDOMElement_get_firstChild(elem, &node); + EXPECT_HR(hr, S_OK); + hr = IXMLDOMNode_get_text(node, &str); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(str, _bstr_("000102030405060708090a0b0c0d0e0f")), "%s\n", wine_dbgstr_w(str)); + IXMLDOMNode_Release(node); SafeArrayDestroyData(array); IXMLDOMElement_Release(elem);

1 0

Piotr Caban : msvcp90/tests: Fixed _Getctype tests.
by Alexandre Julliard July 2, 2012

July 2, 2012

Module: wine Branch: master Commit: e16922f3f3282fa3f093c98656690bf985dec04f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e16922f3f3282fa3f093c9865… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jul 2 18:32:05 2012 +0200 msvcp90/tests: Fixed _Getctype tests. --- dlls/msvcp90/tests/misc.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index e7f88c5..19a5854 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -58,7 +58,7 @@ static BYTE (__cdecl *p_short_eq)(const void*, const void*); static char* (__cdecl *p_Copy_s)(char*, size_t, const char*, size_t); static unsigned short (__cdecl *p_wctype)(const char*); -static MSVCP__Ctypevec (__cdecl *p__Getctype)(void); +static MSVCP__Ctypevec* (__cdecl *p__Getctype)(MSVCP__Ctypevec*); #undef __thiscall #ifdef __i386__ @@ -362,16 +362,16 @@ static void test__Getctype(void) { MSVCP__Ctypevec ret; - ret = p__Getctype(); + ok(p__Getctype(&ret) == &ret, "__Getctype returned incorrect pointer\n"); ok(ret.handle == 0, "ret.handle = %d\n", ret.handle); ok(ret.page == 0, "ret.page = %d\n", ret.page); ok(ret.delfl == 1, "ret.delfl = %d\n", ret.delfl); ok(ret.table[0] == 32, "ret.table[0] = %d\n", ret.table[0]); p_free(ret.table); - p__get_current_locale()->locinfo->lc_handle[LC_COLLATE] = 1; - ret = p__Getctype(); - ok(ret.handle == 1, "ret.handle = %d\n", ret.handle); + p__get_current_locale()->locinfo->lc_handle[LC_COLLATE] = 0x1234567; + ok(p__Getctype(&ret) == &ret, "__Getctype returned incorrect pointer\n"); + ok(ret.handle == 0x1234567, "ret.handle = %d\n", ret.handle); ok(ret.page == 0, "ret.page = %d\n", ret.page); ok(ret.delfl == 1, "ret.delfl = %d\n", ret.delfl); ok(ret.table[0] == 32, "ret.table[0] = %d\n", ret.table[0]); @@ -418,6 +418,7 @@ static void test_virtual_call(void) char str2[] = "TEST"; int ret; + p__get_current_locale()->locinfo->lc_handle[LC_COLLATE] = 1; call_func2(p_collate_char_ctor_refs, this, 0); ret = (int)call_func5(p_collate_char_compare, this, str1, str1+4, str1, str1+4); ok(ret == 0, "collate<char>::compare returned %d\n", ret);

1 0