From: Nikolay Sivov nsivov@codeweavers.com
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com --- dlls/msxml3/tests/xmldoc.c | 13 +++++-------- dlls/msxml3/xmldoc.c | 9 ++------- 2 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/dlls/msxml3/tests/xmldoc.c b/dlls/msxml3/tests/xmldoc.c index 0bc7dc49004..33669cfaba6 100644 --- a/dlls/msxml3/tests/xmldoc.c +++ b/dlls/msxml3/tests/xmldoc.c @@ -1206,14 +1206,11 @@ static void test_xmldoc_version(void) hr = IXMLDocument_get_version(doc, NULL); ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
- if (strcmp(winetest_platform, "wine")) - { - s = NULL; - hr = IXMLDocument_get_version(doc, &s); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok(!wcscmp(s, L"1.0"), "Unexpected version %s.\n", wine_dbgstr_w(s)); - SysFreeString(s); - } + s = NULL; + hr = IXMLDocument_get_version(doc, &s); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!wcscmp(s, L"1.0"), "Unexpected version %s.\n", wine_dbgstr_w(s)); + SysFreeString(s);
hr = load_document(doc, "<a/>", 4); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); diff --git a/dlls/msxml3/xmldoc.c b/dlls/msxml3/xmldoc.c index abd6337c32b..9e2eeecf28e 100644 --- a/dlls/msxml3/xmldoc.c +++ b/dlls/msxml3/xmldoc.c @@ -431,14 +431,9 @@ static HRESULT WINAPI xmldoc_put_charset(IXMLDocument2 *iface, BSTR p)
static HRESULT WINAPI xmldoc_get_version(IXMLDocument2 *iface, BSTR *p) { - xmldoc *This = impl_from_IXMLDocument2(iface); - - TRACE("(%p, %p)\n", This, p); + TRACE("%p, %p.\n", iface, p);
- if (!p) return E_INVALIDARG; - *p = bstr_from_xmlChar(This->xmldoc->version); - - return S_OK; + return return_bstr(L"1.0", p); }
static HRESULT WINAPI xmldoc_get_doctype(IXMLDocument2 *iface, BSTR *p)