reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-25 04:39:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

msxml3: Added IVBSAXAttributes for MXAttributes.

Browse Source
This commit is contained in:
Nikolay Sivov 2012-03-15 12:53:45 +03:00 committed by Alexandre Julliard
parent 72187762a3
commit a58249cd5c
2 changed files with 270 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

231
dlls/msxml3/mxwriter.c
View File

@ -132,6 +132,7 @@ typedef struct
DispatchEx dispex;
IMXAttributes IMXAttributes_iface;
ISAXAttributes ISAXAttributes_iface;
IVBSAXAttributes IVBSAXAttributes_iface;
LONG ref;
MSXML_VERSION class_version;
@ -151,6 +152,11 @@ static inline mxattributes *impl_from_ISAXAttributes( ISAXAttributes *iface )
return CONTAINING_RECORD(iface, mxattributes, ISAXAttributes_iface);
}
static inline mxattributes *impl_from_IVBSAXAttributes( IVBSAXAttributes *iface )
{
return CONTAINING_RECORD(iface, mxattributes, IVBSAXAttributes_iface);
}
static HRESULT mxattributes_grow(mxattributes *This)
{
if (This->length < This->allocated) return S_OK;
@ -1498,6 +1504,10 @@ static HRESULT WINAPI MXAttributes_QueryInterface(IMXAttributes *iface, REFIID r
{
*ppObj = &This->ISAXAttributes_iface;
}
else if ( IsEqualGUID( riid, &IID_IVBSAXAttributes ))
{
*ppObj = &This->IVBSAXAttributes_iface;
}
else if (dispex_query_interface(&This->dispex, riid, ppObj))
{
return *ppObj ? S_OK : E_NOINTERFACE;
@ -1911,6 +1921,226 @@ static const ISAXAttributesVtbl SAXAttributesVtbl = {
SAXAttributes_getValueFromQName
};
static HRESULT WINAPI VBSAXAttributes_QueryInterface(
IVBSAXAttributes* iface,
REFIID riid,
void **ppvObject)
{
mxattributes *This = impl_from_IVBSAXAttributes( iface );
TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject);
return ISAXAttributes_QueryInterface(&This->ISAXAttributes_iface, riid, ppvObject);
}
static ULONG WINAPI VBSAXAttributes_AddRef(IVBSAXAttributes* iface)
{
mxattributes *This = impl_from_IVBSAXAttributes( iface );
return ISAXAttributes_AddRef(&This->ISAXAttributes_iface);
}
static ULONG WINAPI VBSAXAttributes_Release(IVBSAXAttributes* iface)
{
mxattributes *This = impl_from_IVBSAXAttributes( iface );
return ISAXAttributes_Release(&This->ISAXAttributes_iface);
}
static HRESULT WINAPI VBSAXAttributes_GetTypeInfoCount( IVBSAXAttributes *iface, UINT* pctinfo )
{
mxattributes *This = impl_from_IVBSAXAttributes( iface );
TRACE("(%p)->(%p)\n", This, pctinfo);
*pctinfo = 1;
return S_OK;
}
static HRESULT WINAPI VBSAXAttributes_GetTypeInfo(
IVBSAXAttributes *iface,
UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo )
{
mxattributes *This = impl_from_IVBSAXAttributes( iface );
TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
return get_typeinfo(IVBSAXAttributes_tid, ppTInfo);
}
static HRESULT WINAPI VBSAXAttributes_GetIDsOfNames(
IVBSAXAttributes *iface,
REFIID riid,
LPOLESTR* rgszNames,
UINT cNames,
LCID lcid,
DISPID* rgDispId)
{
mxattributes *This = impl_from_IVBSAXAttributes( iface );
ITypeInfo *typeinfo;
HRESULT hr;
TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
lcid, rgDispId);
if(!rgszNames || cNames == 0 || !rgDispId)
return E_INVALIDARG;
hr = get_typeinfo(IVBSAXAttributes_tid, &typeinfo);
if(SUCCEEDED(hr))
{
hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId);
ITypeInfo_Release(typeinfo);
}
return hr;
}
static HRESULT WINAPI VBSAXAttributes_Invoke(
IVBSAXAttributes *iface,
DISPID dispIdMember,
REFIID riid,
LCID lcid,
WORD wFlags,
DISPPARAMS* pDispParams,
VARIANT* pVarResult,
EXCEPINFO* pExcepInfo,
UINT* puArgErr)
{
mxattributes *This = impl_from_IVBSAXAttributes( iface );
ITypeInfo *typeinfo;
HRESULT hr;
TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
hr = get_typeinfo(IVBSAXAttributes_tid, &typeinfo);
if(SUCCEEDED(hr))
{
hr = ITypeInfo_Invoke(typeinfo, &This->IVBSAXAttributes_iface, dispIdMember, wFlags,
pDispParams, pVarResult, pExcepInfo, puArgErr);
ITypeInfo_Release(typeinfo);
}
return hr;
}
static HRESULT WINAPI VBSAXAttributes_get_length(IVBSAXAttributes* iface, int *len)
{
mxattributes *This = impl_from_IVBSAXAttributes( iface );
return ISAXAttributes_getLength(&This->ISAXAttributes_iface, len);
}
static HRESULT WINAPI VBSAXAttributes_getURI(IVBSAXAttributes* iface, int index, BSTR *uri)
{
mxattributes *This = impl_from_IVBSAXAttributes( iface );
int len;
return ISAXAttributes_getURI(&This->ISAXAttributes_iface, index, (const WCHAR**)uri, &len);
}
static HRESULT WINAPI VBSAXAttributes_getLocalName(IVBSAXAttributes* iface, int index, BSTR *name)
{
mxattributes *This = impl_from_IVBSAXAttributes( iface );
int len;
return ISAXAttributes_getLocalName(&This->ISAXAttributes_iface, index, (const WCHAR**)name, &len);
}
static HRESULT WINAPI VBSAXAttributes_getQName(IVBSAXAttributes* iface, int index, BSTR *qname)
{
mxattributes *This = impl_from_IVBSAXAttributes( iface );
int len;
return ISAXAttributes_getQName(&This->ISAXAttributes_iface, index, (const WCHAR**)qname, &len);
}
static HRESULT WINAPI VBSAXAttributes_getIndexFromName(IVBSAXAttributes* iface, BSTR uri, BSTR name, int *index)
{
mxattributes *This = impl_from_IVBSAXAttributes( iface );
return ISAXAttributes_getIndexFromName(&This->ISAXAttributes_iface, uri, SysStringLen(uri),
name, SysStringLen(name), index);
}
static HRESULT WINAPI VBSAXAttributes_getIndexFromQName(IVBSAXAttributes* iface, BSTR qname, int *index)
{
mxattributes *This = impl_from_IVBSAXAttributes( iface );
return ISAXAttributes_getIndexFromQName(&This->ISAXAttributes_iface, qname,
SysStringLen(qname), index);
}
static HRESULT WINAPI VBSAXAttributes_getType(IVBSAXAttributes* iface, int index,BSTR *type)
{
mxattributes *This = impl_from_IVBSAXAttributes( iface );
int len;
return ISAXAttributes_getType(&This->ISAXAttributes_iface, index, (const WCHAR**)type, &len);
}
static HRESULT WINAPI VBSAXAttributes_getTypeFromName(IVBSAXAttributes* iface, BSTR uri,
BSTR name, BSTR *type)
{
mxattributes *This = impl_from_IVBSAXAttributes( iface );
int len;
return ISAXAttributes_getTypeFromName(&This->ISAXAttributes_iface, uri, SysStringLen(uri),
name, SysStringLen(name), (const WCHAR**)type, &len);
}
static HRESULT WINAPI VBSAXAttributes_getTypeFromQName(IVBSAXAttributes* iface, BSTR qname, BSTR *type)
{
mxattributes *This = impl_from_IVBSAXAttributes( iface );
int len;
return ISAXAttributes_getTypeFromQName(&This->ISAXAttributes_iface, qname, SysStringLen(qname),
(const WCHAR**)type, &len);
}
static HRESULT WINAPI VBSAXAttributes_getValue(IVBSAXAttributes* iface, int index, BSTR *value)
{
mxattributes *This = impl_from_IVBSAXAttributes( iface );
int len;
return ISAXAttributes_getValue(&This->ISAXAttributes_iface, index, (const WCHAR**)value, &len);
}
static HRESULT WINAPI VBSAXAttributes_getValueFromName(IVBSAXAttributes* iface, BSTR uri, BSTR name,
BSTR *value)
{
mxattributes *This = impl_from_IVBSAXAttributes( iface );
int len;
return ISAXAttributes_getValueFromName(&This->ISAXAttributes_iface, uri, SysStringLen(uri),
name, SysStringLen(name), (const WCHAR**)value, &len);
}
static HRESULT WINAPI VBSAXAttributes_getValueFromQName(IVBSAXAttributes* iface, BSTR qname, BSTR *value)
{
mxattributes *This = impl_from_IVBSAXAttributes( iface );
int len;
return ISAXAttributes_getValueFromQName(&This->ISAXAttributes_iface, qname, SysStringLen(qname),
(const WCHAR**)value, &len);
}
static const struct IVBSAXAttributesVtbl VBSAXAttributesVtbl =
{
VBSAXAttributes_QueryInterface,
VBSAXAttributes_AddRef,
VBSAXAttributes_Release,
VBSAXAttributes_GetTypeInfoCount,
VBSAXAttributes_GetTypeInfo,
VBSAXAttributes_GetIDsOfNames,
VBSAXAttributes_Invoke,
VBSAXAttributes_get_length,
VBSAXAttributes_getURI,
VBSAXAttributes_getLocalName,
VBSAXAttributes_getQName,
VBSAXAttributes_getIndexFromName,
VBSAXAttributes_getIndexFromQName,
VBSAXAttributes_getType,
VBSAXAttributes_getTypeFromName,
VBSAXAttributes_getTypeFromQName,
VBSAXAttributes_getValue,
VBSAXAttributes_getValueFromName,
VBSAXAttributes_getValueFromQName
};
static const tid_t mxattrs_iface_tids[] = {
IMXAttributes_tid,
0
@ -1936,6 +2166,7 @@ HRESULT SAXAttributes_create(MSXML_VERSION version, IUnknown *outer, void **ppOb
This->IMXAttributes_iface.lpVtbl = &MXAttributesVtbl;
This->ISAXAttributes_iface.lpVtbl = &SAXAttributesVtbl;
This->IVBSAXAttributes_iface.lpVtbl = &VBSAXAttributesVtbl;
This->ref = 1;
This->class_version = version;

39
dlls/msxml3/tests/saxreader.c
View File

@ -3581,6 +3581,44 @@ static void test_mxattr_dispex(void)
IMXAttributes_Release(mxattr);
}
static void test_mxattr_qi(void)
{
IVBSAXAttributes *vbsaxattr, *vbsaxattr2;
ISAXAttributes *saxattr;
IMXAttributes *mxattr;
HRESULT hr;
hr = CoCreateInstance(&CLSID_SAXAttributes, NULL, CLSCTX_INPROC_SERVER,
&IID_IMXAttributes, (void**)&mxattr);
EXPECT_HR(hr, S_OK);
EXPECT_REF(mxattr, 1);
hr = IMXAttributes_QueryInterface(mxattr, &IID_ISAXAttributes, (void**)&saxattr);
EXPECT_HR(hr, S_OK);
EXPECT_REF(mxattr, 2);
EXPECT_REF(saxattr, 2);
hr = IMXAttributes_QueryInterface(mxattr, &IID_IVBSAXAttributes, (void**)&vbsaxattr);
EXPECT_HR(hr, S_OK);
EXPECT_REF(vbsaxattr, 3);
EXPECT_REF(mxattr, 3);
EXPECT_REF(saxattr, 3);
hr = ISAXAttributes_QueryInterface(saxattr, &IID_IVBSAXAttributes, (void**)&vbsaxattr2);
EXPECT_HR(hr, S_OK);
EXPECT_REF(vbsaxattr, 4);
EXPECT_REF(mxattr, 4);
EXPECT_REF(saxattr, 4);
IMXAttributes_Release(mxattr);
ISAXAttributes_Release(saxattr);
IVBSAXAttributes_Release(vbsaxattr);
IVBSAXAttributes_Release(vbsaxattr2);
}
START_TEST(saxreader)
{
ISAXXMLReader *reader;
@ -3632,6 +3670,7 @@ START_TEST(saxreader)
get_mxattributes_support_data(mxattributes_support_data);
if (is_clsid_supported(&CLSID_SAXAttributes, mxattributes_support_data))
{
test_mxattr_qi();
test_mxattr_addAttribute();
test_mxattr_clear();
test_mxattr_dispex();