From 493f7ff217607140ef5b517f8e851f9116279966 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Fri, 20 Nov 2015 10:11:33 +0000 Subject: [PATCH 1/1] [XMLLITE_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536 svn path=/trunk/; revision=69948 --- rostests/winetests/xmllite/reader.c | 1 + rostests/winetests/xmllite/writer.c | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/rostests/winetests/xmllite/reader.c b/rostests/winetests/xmllite/reader.c index 54138e95d7b..820f6a29eef 100644 --- a/rostests/winetests/xmllite/reader.c +++ b/rostests/winetests/xmllite/reader.c @@ -1436,6 +1436,7 @@ static void test_readvaluechunk(void) ok(value[0] == 'c', "got %s\n", wine_dbgstr_w(value)); IXmlReader_Release(reader); + IStream_Release(stream); } static struct test_entry cdata_tests[] = { diff --git a/rostests/winetests/xmllite/writer.c b/rostests/winetests/xmllite/writer.c index 04d25d54755..4ca8b644f4d 100644 --- a/rostests/winetests/xmllite/writer.c +++ b/rostests/winetests/xmllite/writer.c @@ -30,6 +30,7 @@ #include #include +#include #include #include #include @@ -43,6 +44,10 @@ static HRESULT (WINAPI *pCreateXmlWriterOutputWithEncodingName)(IUnknown *stream IMalloc *imalloc, LPCWSTR encoding_name, IXmlWriterOutput **output); +static HRESULT (WINAPI *pCreateXmlWriterOutputWithEncodingCodePage)(IUnknown *stream, + IMalloc *imalloc, + UINT codepage, + IXmlWriterOutput **output); static HRESULT WINAPI testoutput_QueryInterface(IUnknown *iface, REFIID riid, void **obj) { @@ -175,6 +180,7 @@ static BOOL init_pointers(void) #define MAKEFUNC(f) if (!(p##f = (void*)GetProcAddress(mod, #f))) return FALSE; MAKEFUNC(CreateXmlWriter); MAKEFUNC(CreateXmlWriterOutputWithEncodingName); + MAKEFUNC(CreateXmlWriterOutputWithEncodingCodePage); #undef MAKEFUNC return TRUE; @@ -200,6 +206,20 @@ static void test_writeroutput(void) ok(unk != NULL, "got %p\n", unk); /* releasing 'unk' crashes on native */ IUnknown_Release(output); + + output = NULL; + hr = pCreateXmlWriterOutputWithEncodingCodePage(&testoutput, NULL, ~0u, &output); + ok(hr == S_OK, "got %08x\n", hr); + IUnknown_Release(output); + + hr = pCreateXmlWriterOutputWithEncodingCodePage(&testoutput, NULL, CP_UTF8, &output); + ok(hr == S_OK, "got %08x\n", hr); + unk = NULL; + hr = IUnknown_QueryInterface(output, &IID_IXmlWriterOutput, (void**)&unk); + ok(hr == S_OK, "got %08x\n", hr); + ok(unk != NULL, "got %p\n", unk); + /* releasing 'unk' crashes on native */ + IUnknown_Release(output); } static void test_writestartdocument(void) -- 2.17.1