ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xmllite: Fail to set input for external IXmlReaderInput.

This commit is contained in:
Nikolay Sivov 2013-01-27 11:54:58 +04:00 committed by Alexandre Julliard
parent 9d664b2217
commit 8954671cdc
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
dlls/xmllite/reader.c
View File

@ -114,6 +114,8 @@ typedef struct
unsigned int pending : 1; unsigned int pending : 1;
} xmlreaderinput; } xmlreaderinput;
static const struct IUnknownVtbl xmlreaderinputvtbl;
typedef struct typedef struct
{ {
WCHAR *str; WCHAR *str;
@ -1764,7 +1766,7 @@ static HRESULT WINAPI xmlreader_QueryInterface(IXmlReader *iface, REFIID riid, v
{ {
xmlreader *This = impl_from_IXmlReader(iface); xmlreader *This = impl_from_IXmlReader(iface);
TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject);
if (IsEqualGUID(riid, &IID_IUnknown) || if (IsEqualGUID(riid, &IID_IUnknown) ||
IsEqualGUID(riid, &IID_IXmlReader)) IsEqualGUID(riid, &IID_IXmlReader))
@ -1774,6 +1776,7 @@ static HRESULT WINAPI xmlreader_QueryInterface(IXmlReader *iface, REFIID riid, v
else else
{ {
FIXME("interface %s not implemented\n", debugstr_guid(riid)); FIXME("interface %s not implemented\n", debugstr_guid(riid));
*ppvObject = NULL;
return E_NOINTERFACE; return E_NOINTERFACE;
} }
@ -1814,6 +1817,7 @@ static ULONG WINAPI xmlreader_Release(IXmlReader *iface)
static HRESULT WINAPI xmlreader_SetInput(IXmlReader* iface, IUnknown *input) static HRESULT WINAPI xmlreader_SetInput(IXmlReader* iface, IUnknown *input)
{ {
xmlreader *This = impl_from_IXmlReader(iface); xmlreader *This = impl_from_IXmlReader(iface);
IXmlReaderInput *readerinput;
HRESULT hr; HRESULT hr;
TRACE("(%p)->(%p)\n", This, input); TRACE("(%p)->(%p)\n", This, input);
@ -1838,11 +1842,23 @@ static HRESULT WINAPI xmlreader_SetInput(IXmlReader* iface, IUnknown *input)
} }
/* now try IXmlReaderInput, ISequentialStream, IStream */ /* now try IXmlReaderInput, ISequentialStream, IStream */
hr = IUnknown_QueryInterface(input, &IID_IXmlReaderInput, (void**)&This->input); hr = IUnknown_QueryInterface(input, &IID_IXmlReaderInput, (void**)&readerinput);
if (hr != S_OK) if (hr == S_OK)
{ {
IXmlReaderInput *readerinput; if (readerinput->lpVtbl == &xmlreaderinputvtbl)
This->input = impl_from_IXmlReaderInput(readerinput);
else
{
ERR("got external IXmlReaderInput implementation: %p, vtbl=%p\n",
readerinput, readerinput->lpVtbl);
IUnknown_Release(readerinput);
return E_FAIL;
}
}
if (hr != S_OK || !readerinput)
{
/* create IXmlReaderInput basing on supplied interface */ /* create IXmlReaderInput basing on supplied interface */
hr = CreateXmlReaderInputWithEncodingName(input, hr = CreateXmlReaderInputWithEncodingName(input,
NULL, NULL, FALSE, NULL, &readerinput); NULL, NULL, FALSE, NULL, &readerinput);
@ -2160,7 +2176,7 @@ static HRESULT WINAPI xmlreaderinput_QueryInterface(IXmlReaderInput *iface, REFI
{ {
xmlreaderinput *This = impl_from_IXmlReaderInput(iface); xmlreaderinput *This = impl_from_IXmlReaderInput(iface);
TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject);
if (IsEqualGUID(riid, &IID_IXmlReaderInput) || if (IsEqualGUID(riid, &IID_IXmlReaderInput) ||
IsEqualGUID(riid, &IID_IUnknown)) IsEqualGUID(riid, &IID_IUnknown))
@ -2170,6 +2186,7 @@ static HRESULT WINAPI xmlreaderinput_QueryInterface(IXmlReaderInput *iface, REFI
else else
{ {
WARN("interface %s not implemented\n", debugstr_guid(riid)); WARN("interface %s not implemented\n", debugstr_guid(riid));
*ppvObject = NULL;
return E_NOINTERFACE; return E_NOINTERFACE;
} }
@ -2207,7 +2224,7 @@ static ULONG WINAPI xmlreaderinput_Release(IXmlReaderInput *iface)
return ref; return ref;
} }
static const struct IUnknownVtbl xmlreaderinput_vtbl = static const struct IUnknownVtbl xmlreaderinputvtbl =
{ {
xmlreaderinput_QueryInterface, xmlreaderinput_QueryInterface,
xmlreaderinput_AddRef, xmlreaderinput_AddRef,
@ -2281,7 +2298,7 @@ HRESULT WINAPI CreateXmlReaderInputWithEncodingName(IUnknown *stream,
readerinput = heap_alloc(sizeof(*readerinput)); readerinput = heap_alloc(sizeof(*readerinput));
if(!readerinput) return E_OUTOFMEMORY; if(!readerinput) return E_OUTOFMEMORY;
readerinput->IXmlReaderInput_iface.lpVtbl = &xmlreaderinput_vtbl; readerinput->IXmlReaderInput_iface.lpVtbl = &xmlreaderinputvtbl;
readerinput->ref = 1; readerinput->ref = 1;
readerinput->imalloc = imalloc; readerinput->imalloc = imalloc;
readerinput->stream = NULL; readerinput->stream = NULL;