wine-commits July 2012

wine-commits@winehq.org

2 participants
712 discussions

Hans Leidekker : wbemprox: Support overriding the CIM to VARIANT type mapping for integer properties.
by Alexandre Julliard 02 Jul '12

02 Jul '12

Module: wine Branch: master Commit: cd340ac87f1c785bfab9c29df11bd051cff59496 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd340ac87f1c785bfab9c29df… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 2 16:00:50 2012 +0200 wbemprox: Support overriding the CIM to VARIANT type mapping for integer properties. --- dlls/wbemprox/query.c | 59 +++++++++++++++++++++++++++++--------- dlls/wbemprox/wbemprox_private.h | 1 + 2 files changed, 46 insertions(+), 14 deletions(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index f54fcc3..2a7c088 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -662,11 +662,43 @@ static HRESULT get_system_propval( const struct view *view, UINT index, const WC return WBEM_E_NOT_FOUND; } +static void set_variant( VARTYPE vartype, LONGLONG val, BSTR val_bstr, VARIANT *ret ) +{ + switch (vartype) + { + case VT_BSTR: + V_VT( ret ) = VT_BSTR; + V_BSTR( ret ) = val_bstr; + return; + case VT_I2: + V_VT( ret ) = VT_I2; + V_I2( ret ) = val; + return; + case VT_UI2: + V_VT( ret ) = VT_UI2; + V_UI2( ret ) = val; + return; + case VT_I4: + V_VT( ret ) = VT_I4; + V_I4( ret ) = val; + return; + case VT_UI4: + V_VT( ret ) = VT_UI4; + V_UI4( ret ) = val; + return; + default: + ERR("unhandled variant type %u\n", vartype); + return; + } +} + HRESULT get_propval( const struct view *view, UINT index, const WCHAR *name, VARIANT *ret, CIMTYPE *type, LONG *flavor ) { HRESULT hr; UINT column, row = view->result[index]; + VARTYPE vartype; + BSTR val_bstr = NULL; LONGLONG val; if (is_system_prop( name )) return get_system_propval( view, index, name, ret, type, flavor ); @@ -675,6 +707,8 @@ HRESULT get_propval( const struct view *view, UINT index, const WCHAR *name, VAR hr = get_column_index( view->table, name, &column ); if (hr != S_OK) return WBEM_E_NOT_FOUND; + vartype = view->table->columns[column].vartype; + hr = get_value( view->table, row, column, &val ); if (hr != S_OK) return hr; @@ -682,37 +716,34 @@ HRESULT get_propval( const struct view *view, UINT index, const WCHAR *name, VAR { case CIM_STRING: case CIM_DATETIME: - V_VT( ret ) = VT_BSTR; - V_BSTR( ret ) = SysAllocString( (const WCHAR *)(INT_PTR)val ); + vartype = VT_BSTR; + val_bstr = SysAllocString( (const WCHAR *)(INT_PTR)val ); break; case CIM_SINT16: - V_VT( ret ) = VT_I2; - V_I2( ret ) = val; + if (!vartype) vartype = VT_I2; break; case CIM_UINT16: - V_VT( ret ) = VT_UI2; - V_UI2( ret ) = val; + if (!vartype) vartype = VT_UI2; break; case CIM_SINT32: - V_VT( ret ) = VT_I4; - V_I4( ret ) = val; + if (!vartype) vartype = VT_I4; break; case CIM_UINT32: - V_VT( ret ) = VT_UI4; - V_UI4( ret ) = val; + if (!vartype) vartype = VT_UI4; break; case CIM_SINT64: - V_VT( ret ) = VT_BSTR; - V_BSTR( ret ) = get_value_bstr( view->table, row, column ); + vartype = VT_BSTR; + val_bstr = get_value_bstr( view->table, row, column ); break; case CIM_UINT64: - V_VT( ret ) = VT_BSTR; - V_BSTR( ret ) = get_value_bstr( view->table, row, column ); + vartype = VT_BSTR; + val_bstr = get_value_bstr( view->table, row, column ); break; default: ERR("unhandled column type %u\n", view->table->columns[column].type); return WBEM_E_FAILED; } + set_variant( vartype, val, val_bstr, ret ); if (type) *type = view->table->columns[column].type & COL_TYPE_MASK; if (flavor) *flavor = 0; return S_OK; diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 437da28..602fbaa 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -31,6 +31,7 @@ struct column { const WCHAR *name; UINT type; + VARTYPE vartype; /* 0 for default mapping */ }; struct table

1 0

Vincas Miliūnas : wined3d: Recognize AMD Radeon HD 6700 Series renderer string.
by Alexandre Julliard 02 Jul '12

02 Jul '12

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 02 Jul '12

02 Jul '12

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

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

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: 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: 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: 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: Correct IEnumVARIANT regarding IUnknown forwarding.
by Alexandre Julliard 02 Jul '12

02 Jul '12

Module: wine Branch: master Commit: 60dd1c6a6eca6205f3838b4c96863639967d99f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60dd1c6a6eca6205f3838b4c9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 30 16:16:33 2012 +0400 msxml3: Correct IEnumVARIANT regarding IUnknown forwarding. --- dlls/msxml3/nodelist.c | 2 +- dlls/msxml3/selection.c | 14 +++++- dlls/msxml3/tests/domdoc.c | 93 +++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 100 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/nodelist.c b/dlls/msxml3/nodelist.c index 5710d48..f948fcf 100644 --- a/dlls/msxml3/nodelist.c +++ b/dlls/msxml3/nodelist.c @@ -40,7 +40,7 @@ #include "wine/debug.h" /* This file implements the object returned by childNodes property. Note that this is - * not the IXMLDOMNodeList returned by XPath querites - it's implemented in queryresult.c. + * not the IXMLDOMNodeList returned by XPath queries - it's implemented in selection.c. * They are different because the list returned by childNodes: * - is "live" - changes to the XML tree are automatically reflected in the list * - doesn't supports IXMLDOMSelection diff --git a/dlls/msxml3/selection.c b/dlls/msxml3/selection.c index ba173f9..55873bb 100644 --- a/dlls/msxml3/selection.c +++ b/dlls/msxml3/selection.c @@ -433,8 +433,14 @@ static HRESULT WINAPI enumvariant_QueryInterface( *ppvObject = NULL; - if ( IsEqualGUID( riid, &IID_IUnknown ) || - IsEqualGUID( riid, &IID_IEnumVARIANT )) + if (IsEqualGUID( riid, &IID_IUnknown )) + { + if (This->own) + *ppvObject = &This->IEnumVARIANT_iface; + else + return IXMLDOMSelection_QueryInterface(This->selection, riid, ppvObject); + } + else if (IsEqualGUID( riid, &IID_IEnumVARIANT )) { *ppvObject = &This->IEnumVARIANT_iface; } @@ -563,7 +569,9 @@ static HRESULT create_enumvariant(IXMLDOMSelection *selection, BOOL own, IUnknow if (This->own) IXMLDOMSelection_AddRef(selection); - return IEnumVARIANT_QueryInterface(&This->IEnumVARIANT_iface, &IID_IUnknown, (void**)penum); + *penum = (IUnknown*)&This->IEnumVARIANT_iface; + IUnknown_AddRef(*penum); + return S_OK; } static HRESULT domselection_get_dispid(IUnknown *iface, BSTR name, DWORD flags, DISPID *dispid) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 7a02e19..4b73d47 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -4122,13 +4122,15 @@ static void test_get_text(void) static void test_get_childNodes(void) { - BSTR str; + IXMLDOMNodeList *node_list, *node_list2; + IEnumVARIANT *enum1, *enum2, *enum3; VARIANT_BOOL b; IXMLDOMDocument *doc; - IXMLDOMElement *element; IXMLDOMNode *node, *node2; - IXMLDOMNodeList *node_list, *node_list2; + IXMLDOMElement *element; + IUnknown *unk1, *unk2; HRESULT hr; + BSTR str; LONG len; doc = create_document(&IID_IXMLDOMDocument); @@ -4148,6 +4150,58 @@ static void test_get_childNodes(void) EXPECT_HR(hr, S_OK); ok( len == 4, "len %d\n", len); + /* refcount tests for IEnumVARIANT support */ + EXPECT_REF(node_list, 1); + hr = IXMLDOMNodeList_QueryInterface(node_list, &IID_IEnumVARIANT, (void**)&enum1); +if (hr == S_OK) +{ + EXPECT_REF(node_list, 1); + EXPECT_REF(enum1, 2); + + EXPECT_REF(node_list, 1); + hr = IXMLDOMNodeList_QueryInterface(node_list, &IID_IEnumVARIANT, (void**)&enum2); + EXPECT_HR(hr, S_OK); + EXPECT_REF(node_list, 1); + ok(enum2 == enum1, "got %p, %p\n", enum2, enum1); + IEnumVARIANT_Release(enum2); + + hr = IXMLDOMNodeList_QueryInterface(node_list, &IID_IUnknown, (void**)&unk1); + EXPECT_HR(hr, S_OK); + hr = IEnumVARIANT_QueryInterface(enum1, &IID_IUnknown, (void**)&unk2); + EXPECT_HR(hr, S_OK); + EXPECT_REF(node_list, 3); + EXPECT_REF(enum1, 2); + ok(unk1 == unk2, "got %p, %p\n", unk1, unk2); + IUnknown_Release(unk1); + IUnknown_Release(unk2); + + EXPECT_REF(node_list, 1); + hr = IXMLDOMNodeList__newEnum(node_list, (IUnknown**)&enum2); + EXPECT_HR(hr, S_OK); + EXPECT_REF(node_list, 2); + EXPECT_REF(enum2, 1); + ok(enum2 != enum1, "got %p, %p\n", enum2, enum1); + + /* enumerator created with _newEnum() doesn't share IUnknown* with main object */ + hr = IXMLDOMNodeList_QueryInterface(node_list, &IID_IUnknown, (void**)&unk1); + EXPECT_HR(hr, S_OK); + hr = IEnumVARIANT_QueryInterface(enum2, &IID_IUnknown, (void**)&unk2); + EXPECT_HR(hr, S_OK); + EXPECT_REF(node_list, 3); + EXPECT_REF(enum2, 2); + ok(unk1 != unk2, "got %p, %p\n", unk1, unk2); + IUnknown_Release(unk1); + IUnknown_Release(unk2); + + hr = IXMLDOMNodeList__newEnum(node_list, (IUnknown**)&enum3); + EXPECT_HR(hr, S_OK); + ok(enum2 != enum3, "got %p, %p\n", enum2, enum3); + IEnumVARIANT_Release(enum3); + IEnumVARIANT_Release(enum2); + + IEnumVARIANT_Release(enum1); +} + hr = IXMLDOMNodeList_get_item( node_list, 2, &node ); EXPECT_HR(hr, S_OK); @@ -10171,6 +10225,7 @@ static void test_selection(void) IXMLDOMSelection *selection, *selection2; IEnumVARIANT *enum1, *enum2, *enum3; IXMLDOMNodeList *list; + IUnknown *unk1, *unk2; IXMLDOMDocument *doc; IDispatchEx *dispex; IXMLDOMNode *node; @@ -10218,6 +10273,25 @@ static void test_selection(void) ok(enum1 != NULL, "got %p\n", enum1); EXPECT_REF(enum1, 2); + EXPECT_REF(selection, 1); + hr = IXMLDOMSelection_QueryInterface(selection, &IID_IUnknown, (void**)&unk1); + EXPECT_HR(hr, S_OK); + EXPECT_REF(selection, 2); + EXPECT_REF(enum1, 2); + + /* enumerator and selection object return same IUnknown* */ + hr = IEnumVARIANT_QueryInterface(enum1, &IID_IUnknown, (void**)&unk2); + EXPECT_HR(hr, S_OK); + EXPECT_REF(selection, 3); + EXPECT_REF(enum1, 2); + ok(unk2 == unk1, "got %p, %p\n", unk1, unk2); + IUnknown_Release(unk2); + + EXPECT_REF(selection, 2); + IEnumVARIANT_AddRef(enum1); + EXPECT_REF(selection, 2); + IEnumVARIANT_Release(enum1); + enum3 = NULL; hr = IXMLDOMSelection_QueryInterface(selection, &IID_IEnumVARIANT, (void**)&enum3); EXPECT_HR(hr, S_OK); @@ -10226,7 +10300,7 @@ static void test_selection(void) EXPECT_REF(enum1, 3); IEnumVARIANT_Release(enum3); - EXPECT_REF(selection, 1); + EXPECT_REF(selection, 2); EXPECT_REF(enum1, 2); enum2 = NULL; @@ -10234,12 +10308,20 @@ static void test_selection(void) EXPECT_HR(hr, S_OK); ok(enum2 != NULL, "got %p\n", enum2); - EXPECT_REF(selection, 2); + EXPECT_REF(selection, 3); EXPECT_REF(enum1, 2); EXPECT_REF(enum2, 1); ok(enum1 != enum2, "got %p, %p\n", enum1, enum2); + hr = IEnumVARIANT_QueryInterface(enum2, &IID_IUnknown, (void**)&unk2); + EXPECT_HR(hr, S_OK); + EXPECT_REF(selection, 3); + EXPECT_REF(enum2, 2); + ok(unk2 != unk1, "got %p, %p\n", unk1, unk2); + IUnknown_Release(unk2); + IUnknown_Release(unk1); + selection2 = NULL; hr = IEnumVARIANT_QueryInterface(enum1, &IID_IXMLDOMSelection, (void**)&selection2); EXPECT_HR(hr, S_OK); @@ -10368,6 +10450,7 @@ static void test_selection(void) SysFreeString(name); IXMLDOMNode_Release(node); VariantClear(&v); + IEnumVARIANT_Release(enum1); hr = IXMLDOMSelection_nextNode(selection, &node); EXPECT_HR(hr, S_OK);

1 0

Henri Verbeet : winex11: Get rid of some unused prototypes.
by Alexandre Julliard 02 Jul '12

02 Jul '12

Module: wine Branch: master Commit: 0fda9d95a5c49e10880fb3616e394f9d323b6363 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fda9d95a5c49e10880fb3616… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 2 14:46:00 2012 +0200 winex11: Get rid of some unused prototypes. --- dlls/winex11.drv/x11drv.h | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index df01379..a4a4f0d 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -220,8 +220,6 @@ extern INT X11DRV_YWStoDS( HDC hdc, INT height ) DECLSPEC_HIDDEN; extern const int X11DRV_XROPfunction[]; -extern void _XInitImageFuncPtrs(XImage *) DECLSPEC_HIDDEN; - extern int client_side_with_render DECLSPEC_HIDDEN; extern int client_side_antialias_with_core DECLSPEC_HIDDEN; extern int client_side_antialias_with_render DECLSPEC_HIDDEN; @@ -649,8 +647,6 @@ extern void X11DRV_init_desktop( Window win, unsigned int width, unsigned int he extern void X11DRV_resize_desktop(unsigned int width, unsigned int height) DECLSPEC_HIDDEN; extern void X11DRV_Settings_AddDepthModes(void) DECLSPEC_HIDDEN; extern void X11DRV_Settings_AddOneMode(unsigned int width, unsigned int height, unsigned int bpp, unsigned int freq) DECLSPEC_HIDDEN; -extern int X11DRV_Settings_CreateDriver(LPDDHALINFO info) DECLSPEC_HIDDEN; -extern LPDDHALMODEINFO X11DRV_Settings_CreateModes(unsigned int max_modes, int reserve_depths) DECLSPEC_HIDDEN; unsigned int X11DRV_Settings_GetModeCount(void) DECLSPEC_HIDDEN; void X11DRV_Settings_Init(void) DECLSPEC_HIDDEN; LPDDHALMODEINFO X11DRV_Settings_SetHandlers(const char *name,

1 0

← Newer
1
...
64
65
66
67
68
69
70
71
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2012