Author: akhaldi Date: Fri Nov 20 10:11:33 2015 New Revision: 69948
URL: http://svn.reactos.org/svn/reactos?rev=69948&view=rev Log: [XMLLITE_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536
Modified: trunk/rostests/winetests/xmllite/reader.c trunk/rostests/winetests/xmllite/writer.c
Modified: trunk/rostests/winetests/xmllite/reader.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/xmllite/reader.c... ============================================================================== --- trunk/rostests/winetests/xmllite/reader.c [iso-8859-1] (original) +++ trunk/rostests/winetests/xmllite/reader.c [iso-8859-1] Fri Nov 20 10:11:33 2015 @@ -1436,6 +1436,7 @@ ok(value[0] == 'c', "got %s\n", wine_dbgstr_w(value));
IXmlReader_Release(reader); + IStream_Release(stream); }
static struct test_entry cdata_tests[] = {
Modified: trunk/rostests/winetests/xmllite/writer.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/xmllite/writer.c... ============================================================================== --- trunk/rostests/winetests/xmllite/writer.c [iso-8859-1] (original) +++ trunk/rostests/winetests/xmllite/writer.c [iso-8859-1] Fri Nov 20 10:11:33 2015 @@ -30,6 +30,7 @@
#include <windef.h> #include <winbase.h> +#include <winnls.h> #include <objbase.h> #include <ole2.h> #include <xmllite.h> @@ -43,6 +44,10 @@ 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 @@ #define MAKEFUNC(f) if (!(p##f = (void*)GetProcAddress(mod, #f))) return FALSE; MAKEFUNC(CreateXmlWriter); MAKEFUNC(CreateXmlWriterOutputWithEncodingName); + MAKEFUNC(CreateXmlWriterOutputWithEncodingCodePage); #undef MAKEFUNC
return TRUE; @@ -193,6 +199,20 @@ IUnknown_Release(output);
hr = pCreateXmlWriterOutputWithEncodingName(&testoutput, NULL, utf16W, &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); + + 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);