Nikolay Sivov : xmllite/writer: Fix IID argument handling in CreateXmlWriter().
Alexandre Julliard
julliard at winehq.org
Tue Apr 11 15:31:03 CDT 2017
Module: wine
Branch: master
Commit: 707ab559e529ac7e3370146fc48b08ec381b628f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=707ab559e529ac7e3370146fc48b08ec381b628f
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Tue Apr 11 14:28:41 2017 +0300
xmllite/writer: Fix IID argument handling in CreateXmlWriter().
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/xmllite/tests/writer.c | 12 ++++++++++++
dlls/xmllite/writer.c | 24 +++++++++++++-----------
2 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c
index 62ab871..89fdb4e 100644
--- a/dlls/xmllite/tests/writer.c
+++ b/dlls/xmllite/tests/writer.c
@@ -237,6 +237,7 @@ static void test_writer_create(void)
HRESULT hr;
IXmlWriter *writer;
LONG_PTR value;
+ IUnknown *unk;
/* crashes native */
if (0)
@@ -245,6 +246,17 @@ static void test_writer_create(void)
CreateXmlWriter(NULL, (void**)&writer, NULL);
}
+ hr = CreateXmlWriter(&IID_IStream, (void **)&unk, NULL);
+ ok(hr == E_NOINTERFACE, "got %08x\n", hr);
+
+ hr = CreateXmlWriter(&IID_IUnknown, (void **)&unk, NULL);
+ ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ hr = IUnknown_QueryInterface(unk, &IID_IXmlWriter, (void **)&writer);
+ ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
+ ok(unk == (IUnknown *)writer, "unexpected interface pointer\n");
+ IUnknown_Release(unk);
+ IXmlWriter_Release(writer);
+
hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL);
ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c
index a841614..b0e16c0 100644
--- a/dlls/xmllite/writer.c
+++ b/dlls/xmllite/writer.c
@@ -458,11 +458,17 @@ static HRESULT WINAPI xmlwriter_QueryInterface(IXmlWriter *iface, REFIID riid, v
TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject);
- if (IsEqualGUID(riid, &IID_IUnknown) ||
- IsEqualGUID(riid, &IID_IXmlWriter))
+ if (IsEqualGUID(riid, &IID_IXmlWriter) ||
+ IsEqualGUID(riid, &IID_IUnknown))
{
*ppvObject = iface;
}
+ else
+ {
+ FIXME("interface %s is not supported\n", debugstr_guid(riid));
+ *ppvObject = NULL;
+ return E_NOINTERFACE;
+ }
IXmlWriter_AddRef(iface);
@@ -1393,15 +1399,10 @@ static const struct IUnknownVtbl xmlwriteroutputvtbl =
HRESULT WINAPI CreateXmlWriter(REFIID riid, void **obj, IMalloc *imalloc)
{
xmlwriter *writer;
+ HRESULT hr;
TRACE("(%s, %p, %p)\n", wine_dbgstr_guid(riid), obj, imalloc);
- if (!IsEqualGUID(riid, &IID_IXmlWriter))
- {
- ERR("Unexpected IID requested -> (%s)\n", wine_dbgstr_guid(riid));
- return E_FAIL;
- }
-
if (imalloc)
writer = IMalloc_Alloc(imalloc, sizeof(*writer));
else
@@ -1423,11 +1424,12 @@ HRESULT WINAPI CreateXmlWriter(REFIID riid, void **obj, IMalloc *imalloc)
writer->starttagopen = FALSE;
list_init(&writer->elements);
- *obj = &writer->IXmlWriter_iface;
+ hr = IXmlWriter_QueryInterface(&writer->IXmlWriter_iface, riid, obj);
+ IXmlWriter_Release(&writer->IXmlWriter_iface);
- TRACE("returning iface %p\n", *obj);
+ TRACE("returning iface %p, hr %#x\n", *obj, hr);
- return S_OK;
+ return hr;
}
static HRESULT create_writer_output(IUnknown *stream, IMalloc *imalloc, xml_encoding encoding,
More information about the wine-cvs
mailing list