- Wine-Devel - list.winehq.org

[PATCH] makefiles: Disable implicit rules.
by Zebediah Figura Nov. 15, 2020

Nov. 15, 2020

This improves the time of a full-tree build with no out-of-date objects from ~3.7s to ~0.7s on one of my development machines. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Makefile.in | 3 +++ tools/makedep.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/Makefile.in b/Makefile.in index 307a95b3b1a..3dc76398d85 100644 --- a/Makefile.in +++ b/Makefile.in @@ -89,6 +89,9 @@ TOP_INSTALL_DEV = @TOP_INSTALL_DEV@ @ALL_VARS_RULES@ @SET_MAKE@ +# Disable implicit rules +.SUFFIXES: + all: wine @echo "Wine build complete." diff --git a/tools/makedep.c b/tools/makedep.c index 90a21ef825c..ab685b1d596 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -4069,6 +4069,9 @@ static void output_dependencies( struct makefile *make ) if (!found) output( "\n%s (everything below this line is auto-generated; DO NOT EDIT!!)\n", separator ); + /* disable implicit rules */ + output( ".SUFFIXES:\n" ); + if (make == top_makefile) { for (i = 0; i < subdirs.count; i++) output_sources( submakes[i] ); -- 2.29.2

1 0

[PATCH] ntdll: get struct link_map fully working on all FreeBSD versions
by Damjan Jovanovic Nov. 15, 2020

Nov. 15, 2020

autoheader and autoconf need to be run. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- configure.ac | 3 +++ dlls/ntdll/unix/loader.c | 25 +++++++++++++++++++++++-- 2 files changed, 26 insertions(+), 2 deletions(-)

1 0

[PATCH] user32: Add InternalGetWindowIcon stub.
by Gijs Vermeulen Nov. 14, 2020

Nov. 14, 2020

From: David Torok <dt(a)zeroitlab.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47915 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/user32/user32.spec | 1 + dlls/user32/win.c | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 8051ae3f767..b77d71944ea 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -445,6 +445,7 @@ @ stdcall InsertMenuItemA(long long long ptr) @ stdcall InsertMenuItemW(long long long ptr) @ stdcall InsertMenuW(long long long long ptr) +@ stdcall InternalGetWindowIcon(long long) @ stdcall InternalGetWindowText(long ptr long) @ stdcall IntersectRect(ptr ptr ptr) @ stdcall InvalidateRect(long ptr long) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 680defc2071..1bd9ef79cb0 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2886,6 +2886,14 @@ INT WINAPI GetWindowTextA( HWND hwnd, LPSTR lpString, INT nMaxCount ) return strlen(lpString); } +/******************************************************************* + * InternalGetWindowIcon (USER32.@) + */ +HICON WINAPI InternalGetWindowIcon( HWND hwnd, UINT type ) +{ + FIXME("hwnd %p, type %u, stub!\n", hwnd, type); + return NULL; +} /******************************************************************* * InternalGetWindowText (USER32.@) -- 2.29.2

3 3

[PATCH] ntdll: Add NtDebugActiveProcess stub.
by Gijs Vermeulen Nov. 14, 2020

Nov. 14, 2020

From: David Torok <dt(a)zeroitlab.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47198 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/unix/process.c | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index dbd2eab1fa1..248ae72a011 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -190,7 +190,7 @@ @ stdcall -syscall NtCreateUserProcess(ptr ptr long long ptr ptr long long ptr ptr ptr) # @ stub NtCreateWaitablePort @ stdcall -arch=win32,arm64 NtCurrentTeb() -# @ stub NtDebugActiveProcess +@ stdcall -syscall NtDebugActiveProcess(long long) # @ stub NtDebugContinue @ stdcall -syscall NtDelayExecution(long ptr) @ stdcall -syscall NtDeleteAtom(long) @@ -1195,7 +1195,7 @@ @ stub ZwCreateToken @ stdcall -private -syscall ZwCreateUserProcess(ptr ptr long long ptr ptr long long ptr ptr ptr) NtCreateUserProcess # @ stub ZwCreateWaitablePort -# @ stub ZwDebugActiveProcess +@ stdcall -private -syscall ZwDebugActiveProcess(long long) NtDebugActiveProcess # @ stub ZwDebugContinue @ stdcall -private -syscall ZwDelayExecution(long ptr) NtDelayExecution @ stdcall -private -syscall ZwDeleteAtom(long) NtDeleteAtom diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 5ccf435e9ff..941a938bad9 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -1744,6 +1744,16 @@ NTSTATUS WINAPI NtResumeProcess( HANDLE handle ) } +/********************************************************************** + * NtDebugActiveProcess (NTDLL.@) + */ +NTSTATUS WINAPI NtDebugActiveProcess( HANDLE process_handle, HANDLE debug_object_handle ) +{ + FIXME( "(%p %p), stub!\n", process_handle, debug_object_handle ); + return STATUS_SUCCESS; +} + + /*********************************************************************** * __wine_make_process_system (NTDLL.@) * -- 2.29.2

2 1

[PATCH] winevulkan: Initialize Vulkan in native_vkGetInstanceProcAddrWINE.
by Georg Lehmann Nov. 13, 2020

Nov. 13, 2020

In the past this was done in DllMain, the removal broke winelib applications. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/vulkan.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 8e369d95f47..b0a8559fe2c 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -2053,6 +2053,10 @@ static void *wine_vk_get_global_proc_addr(const char *name) */ void *native_vkGetInstanceProcAddrWINE(VkInstance instance, const char *name) { + wine_vk_init_once(); + if (!vk_funcs) + return NULL; + return vk_funcs->p_vkGetInstanceProcAddr(instance, name); } -- 2.29.2

2 1

[PATCH] ws2_32: Force adding completion for error status in WS2_ConnectEx().
by Paul Gofman Nov. 13, 2020

Nov. 13, 2020

Fixes Paradox launcher hang on start (which happens after commit 0c2f556afe7b5fcc873c737512fae5b9c8c07624). The referenced commit did not introduce the problem, it just made getsockopt(..., WS_SO_PROTOCOL_INFOW, ) working and the application is taking another path after getting XP1_IFS_HANDLES flag for protocol. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ws2_32/socket.c | 2 +- dlls/ws2_32/tests/sock.c | 26 ++++++++++++++++++++++++-- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 3efa4ebd64f..7d810c6d7b2 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3485,7 +3485,7 @@ static BOOL WINAPI WS2_ConnectEx(SOCKET s, const struct WS_sockaddr* name, int n { ov->Internal = sock_error_to_ntstatus( get_sock_error( s, FD_CONNECT_BIT )); ov->InternalHigh = 0; - if (cvalue) WS_AddCompletion( s, cvalue, ov->Internal, ov->InternalHigh, FALSE ); + if (cvalue) WS_AddCompletion( s, cvalue, ov->Internal, ov->InternalHigh, TRUE ); if (ov->hEvent) NtSetEvent( ov->hEvent, NULL ); status = STATUS_PENDING; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 9357ad0d872..2d69a05aec5 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7182,11 +7182,13 @@ static void test_ConnectEx(void) SOCKET connector = INVALID_SOCKET; struct sockaddr_in address, conaddress; int addrlen; - OVERLAPPED overlapped; + OVERLAPPED overlapped, *olp; LPFN_CONNECTEX pConnectEx; GUID connectExGuid = WSAID_CONNECTEX; + HANDLE previous_port, io_port; DWORD bytesReturned; char buffer[1024]; + ULONG_PTR key; BOOL bret; DWORD dwret; int iret; @@ -7305,18 +7307,39 @@ static void test_ConnectEx(void) address.sin_port = htons(1); + previous_port = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0); + ok( previous_port != NULL, "Failed to create completion port %u\n", GetLastError()); + + io_port = CreateIoCompletionPort((HANDLE)connector, previous_port, 125, 0); + ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); + + bret = SetFileCompletionNotificationModes((HANDLE)connector, FILE_SKIP_COMPLETION_PORT_ON_SUCCESS); + ok(bret, "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError()); + bret = pConnectEx(connector, (struct sockaddr*)&address, addrlen, NULL, 0, &bytesReturned, &overlapped); ok(bret == FALSE && GetLastError() == ERROR_IO_PENDING, "ConnectEx to bad destination failed: " "returned %d + errno %d\n", bret, GetLastError()); dwret = WaitForSingleObject(overlapped.hEvent, 15000); ok(dwret == WAIT_OBJECT_0, "Waiting for connect event failed with %d + errno %d\n", dwret, GetLastError()); + bytesReturned = 0xdeadbeef; + bret = GetQueuedCompletionStatus( io_port, &bytesReturned, &key, &olp, 200 ); + ok(!bret && GetLastError() == ERROR_CONNECTION_REFUSED, "Got unexpected bret %#x, GetLastError() %u.\n", + bret, GetLastError()); + ok(key == 125, "Key is %lu\n", key); + ok(!bytesReturned, "Number of bytes transferred is %u\n", bytesReturned); + ok(olp == &overlapped, "Overlapped structure is at %p\n", olp); + bret = GetOverlappedResult((HANDLE)connector, &overlapped, &bytesReturned, FALSE); ok(bret == FALSE && GetLastError() == ERROR_CONNECTION_REFUSED, "Connecting to a disconnected host returned error %d - %d\n", bret, WSAGetLastError()); + CloseHandle(io_port); + WSACloseEvent(overlapped.hEvent); closesocket(connector); + + CloseHandle(previous_port); } static void test_AcceptEx(void) @@ -10557,7 +10580,6 @@ START_TEST( sock ) test_WSAAsyncGetServByPort(); test_WSAAsyncGetServByName(); - test_completion_port(); test_address_list_query(); -- 2.28.0

1 0

[PATCH] directmanipulation: Return S_OK form viewport_SetViewportOptions stub.
by Paul Gofman Nov. 13, 2020

Nov. 13, 2020

Fixes Paradox launcher crash on start when Windows version is set to 10. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/directmanipulation/directmanipulation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/directmanipulation/directmanipulation.c b/dlls/directmanipulation/directmanipulation.c index 36a863c7c69..5bb3461d443 100644 --- a/dlls/directmanipulation/directmanipulation.c +++ b/dlls/directmanipulation/directmanipulation.c @@ -610,7 +610,7 @@ static HRESULT WINAPI viewport_SetViewportOptions(IDirectManipulationViewport2 * { struct directviewport *This = impl_from_IDirectManipulationViewport2(iface); FIXME("%p, %d\n", This, options); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI viewport_AddConfiguration(IDirectManipulationViewport2 *iface, DIRECTMANIPULATION_CONFIGURATION configuration) -- 2.28.0

1 0

[PATCH] cmd.exe: increase size of WCMD_HandleTildeModifiers() buffers to MAXSTRING
by Damjan Jovanovic Nov. 13, 2020

Nov. 13, 2020

Some buffers in WCMD_HandleTildeModifiers() are only of size MAX_PATH, even though they handle strings that aren't necessarily filenames. When changed to have size MAXSTRING, a stack overflow crash with strings of size MAX_PATH stops happening. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42731 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- programs/cmd/batch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH v2] msxml3: Support IStream in domdoc_transformNodeToObject.
by Daniel Lehman Nov. 13, 2020

Nov. 13, 2020

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/msxml3/domdoc.c | 17 ++++++++++++++++- dlls/msxml3/msxml_private.h | 2 +- dlls/msxml3/node.c | 18 +++++++++++------- dlls/msxml3/stylesheet.c | 2 +- dlls/msxml3/tests/domdoc.c | 23 +++++++++++++++++++++++ 5 files changed, 52 insertions(+), 10 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index d447bd2b1d8..90d59df2027 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1525,7 +1525,9 @@ static HRESULT WINAPI domdoc_transformNodeToObject( case VT_DISPATCH: { IXMLDOMDocument *doc; + IStream *stream; HRESULT hr; + BSTR str; if (!V_UNKNOWN(&output)) return E_INVALIDARG; @@ -1535,7 +1537,6 @@ static HRESULT WINAPI domdoc_transformNodeToObject( if (IUnknown_QueryInterface(V_UNKNOWN(&output), &IID_IXMLDOMDocument, (void **)&doc) == S_OK) { VARIANT_BOOL b; - BSTR str; if (FAILED(hr = node_transform_node(&This->node, stylesheet, &str))) return hr; @@ -1544,6 +1545,20 @@ static HRESULT WINAPI domdoc_transformNodeToObject( SysFreeString(str); return hr; } + else if (IUnknown_QueryInterface(V_UNKNOWN(&output), &IID_IStream, (void**)&stream) == S_OK) + { + BSTR str; + + if (SUCCEEDED(hr = node_transform_node_params(&This->node, stylesheet, &str, NULL, NULL, TRUE))) + { + DWORD count; + hr = IStream_Write( stream, str, SysStringByteLen(str), &count ); + SysFreeString(str); + } + + IStream_Release(stream); + return hr; + } else { FIXME("Unsupported destination type.\n"); diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index a59e00bf2b3..7b5b161c9de 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -344,7 +344,7 @@ extern HRESULT node_select_nodes(const xmlnode*,BSTR,IXMLDOMNodeList**) DECLSPEC extern HRESULT node_select_singlenode(const xmlnode*,BSTR,IXMLDOMNode**) DECLSPEC_HIDDEN; extern HRESULT node_transform_node(const xmlnode*,IXMLDOMNode*,BSTR*) DECLSPEC_HIDDEN; extern HRESULT node_transform_node_params(const xmlnode*,IXMLDOMNode*,BSTR*,ISequentialStream*, - const struct xslprocessor_params*) DECLSPEC_HIDDEN; + const struct xslprocessor_params*,BOOL) DECLSPEC_HIDDEN; extern HRESULT node_create_supporterrorinfo(const tid_t*,void**) DECLSPEC_HIDDEN; extern HRESULT get_domdoc_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document) DECLSPEC_HIDDEN; diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 35777d65918..0123cb117b9 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1249,7 +1249,7 @@ static HRESULT node_transform_write(xsltStylesheetPtr style, xmlDocPtr result, B } /* For BSTR output is always UTF-16, without 'encoding' attribute */ -static HRESULT node_transform_write_to_bstr(xsltStylesheetPtr style, xmlDocPtr result, BSTR *str) +static HRESULT node_transform_write_to_bstr(xsltStylesheetPtr style, xmlDocPtr result, BSTR *str, BOOL keep_bom) { HRESULT hr = S_OK; @@ -1273,9 +1273,13 @@ static HRESULT node_transform_write_to_bstr(xsltStylesheetPtr style, xmlDocPtr r content = xmlBufferContent(output->conv); len = xmlBufferLength(output->conv); #endif - /* UTF-16 encoder places UTF-16 bom, we don't need it for BSTR */ - content += sizeof(WCHAR); - *str = SysAllocStringLen((WCHAR*)content, len/sizeof(WCHAR) - 1); + len /= sizeof(WCHAR); + if (!keep_bom) + { + content += sizeof(WCHAR); + --len; + } + *str = SysAllocStringLen((WCHAR*)content, len); xmlOutputBufferClose(output); } @@ -1503,7 +1507,7 @@ failed: #endif /* SONAME_LIBXSLT */ HRESULT node_transform_node_params(const xmlnode *This, IXMLDOMNode *stylesheet, BSTR *p, - ISequentialStream *stream, const struct xslprocessor_params *params) + ISequentialStream *stream, const struct xslprocessor_params *params, BOOL keep_bom) { #ifdef SONAME_LIBXSLT xsltStylesheetPtr xsltSS; @@ -1563,7 +1567,7 @@ HRESULT node_transform_node_params(const xmlnode *This, IXMLDOMNode *stylesheet, if (stream) hr = node_transform_write_to_stream(xsltSS, result, stream); else - hr = node_transform_write_to_bstr(xsltSS, result, p); + hr = node_transform_write_to_bstr(xsltSS, result, p, keep_bom); xmlFreeDoc(result); } @@ -1584,7 +1588,7 @@ HRESULT node_transform_node_params(const xmlnode *This, IXMLDOMNode *stylesheet, HRESULT node_transform_node(const xmlnode *node, IXMLDOMNode *stylesheet, BSTR *p) { - return node_transform_node_params(node, stylesheet, p, NULL, NULL); + return node_transform_node_params(node, stylesheet, p, NULL, NULL, FALSE); } HRESULT node_select_nodes(const xmlnode *This, BSTR query, IXMLDOMNodeList **nodes) diff --git a/dlls/msxml3/stylesheet.c b/dlls/msxml3/stylesheet.c index 9863ed7aa4b..7950adbe6da 100644 --- a/dlls/msxml3/stylesheet.c +++ b/dlls/msxml3/stylesheet.c @@ -588,7 +588,7 @@ static HRESULT WINAPI xslprocessor_transform( SysFreeString(This->outstr); hr = node_transform_node_params(get_node_obj(This->input), This->stylesheet->node, - &This->outstr, stream, &This->params); + &This->outstr, stream, &This->params, FALSE); if (SUCCEEDED(hr)) { IStream *src = (IStream *)stream; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 101a775ca36..3ed08b04b30 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -13030,7 +13030,11 @@ static void test_transformNodeToObject(void) { IUnknown transformdest = { &transformdestvtbl }; IXMLDOMDocument *doc, *doc2, *doc3; + LARGE_INTEGER off; + WCHAR buffer[256]; + IStream *istream; VARIANT_BOOL b; + ULONG nread; HRESULT hr; VARIANT v; @@ -13063,6 +13067,25 @@ static void test_transformNodeToObject(void) hr = IXMLDOMDocument_transformNodeToObject(doc, (IXMLDOMNode *)doc2, v); ok(hr == S_OK, "Failed to transform node, hr %#x.\n", hr); + istream = SHCreateMemStream(NULL, 0); + V_VT(&v) = VT_UNKNOWN; + V_UNKNOWN(&v) = (IUnknown *)istream; + hr = IXMLDOMDocument_transformNodeToObject(doc, (IXMLDOMNode *)doc2, v); + ok(hr == S_OK, "Failed to transform node, hr %#x.\n", hr); + + off.QuadPart = 0; + hr = IStream_Seek(istream, off, STREAM_SEEK_SET, NULL); + ok(hr == S_OK, "Failed to seek, hr %#x.\n", hr); + + nread = 0; + memset(buffer, 0xcc, sizeof(buffer)); + hr = IStream_Read(istream, buffer, sizeof(buffer), &nread); + ok(hr == S_OK, "Failed to read, hr %#x.\n", hr); + buffer[nread/2] = 0; + ok(buffer[0] == 0xfeff, "got %x\n", buffer[0]); + ok(compareIgnoreReturns(&buffer[1], _bstr_(szTransformOutput)), "got output %s\n", wine_dbgstr_w(buffer)); + IStream_Release(istream); + IXMLDOMDocument_Release(doc3); IXMLDOMDocument_Release(doc2); IXMLDOMDocument_Release(doc); -- 2.25.1

2 2

[PATCH] msxml3: Support IStream in domdoc_transformNodeToObject.
by Daniel Lehman Nov. 13, 2020

Nov. 13, 2020

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- i have another version that doesn't skip the BOM in node_transform_write_to_bstr, if preferred --- dlls/msxml3/domdoc.c | 16 +++++++++++++++- dlls/msxml3/tests/domdoc.c | 23 +++++++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index d447bd2b1d8..de5ea51a675 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1525,7 +1525,9 @@ static HRESULT WINAPI domdoc_transformNodeToObject( case VT_DISPATCH: { IXMLDOMDocument *doc; + IStream *stream; HRESULT hr; + BSTR str; if (!V_UNKNOWN(&output)) return E_INVALIDARG; @@ -1535,7 +1537,6 @@ static HRESULT WINAPI domdoc_transformNodeToObject( if (IUnknown_QueryInterface(V_UNKNOWN(&output), &IID_IXMLDOMDocument, (void **)&doc) == S_OK) { VARIANT_BOOL b; - BSTR str; if (FAILED(hr = node_transform_node(&This->node, stylesheet, &str))) return hr; @@ -1544,6 +1545,19 @@ static HRESULT WINAPI domdoc_transformNodeToObject( SysFreeString(str); return hr; } + else if (IUnknown_QueryInterface(V_UNKNOWN(&output), &IID_IStream, (void**)&stream) == S_OK) + { + if (SUCCEEDED(hr = node_transform_node(&This->node, stylesheet, &str))) + { + static const char utf16BOM[] = {0xff,0xfe}; + if (SUCCEEDED(hr = IStream_Write( stream, utf16BOM, sizeof(utf16BOM), NULL))) + hr = IStream_Write( stream, str, SysStringByteLen(str), NULL ); + SysFreeString(str); + } + + IStream_Release(stream); + return hr; + } else { FIXME("Unsupported destination type.\n"); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 101a775ca36..3ed08b04b30 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -13030,7 +13030,11 @@ static void test_transformNodeToObject(void) { IUnknown transformdest = { &transformdestvtbl }; IXMLDOMDocument *doc, *doc2, *doc3; + LARGE_INTEGER off; + WCHAR buffer[256]; + IStream *istream; VARIANT_BOOL b; + ULONG nread; HRESULT hr; VARIANT v; @@ -13063,6 +13067,25 @@ static void test_transformNodeToObject(void) hr = IXMLDOMDocument_transformNodeToObject(doc, (IXMLDOMNode *)doc2, v); ok(hr == S_OK, "Failed to transform node, hr %#x.\n", hr); + istream = SHCreateMemStream(NULL, 0); + V_VT(&v) = VT_UNKNOWN; + V_UNKNOWN(&v) = (IUnknown *)istream; + hr = IXMLDOMDocument_transformNodeToObject(doc, (IXMLDOMNode *)doc2, v); + ok(hr == S_OK, "Failed to transform node, hr %#x.\n", hr); + + off.QuadPart = 0; + hr = IStream_Seek(istream, off, STREAM_SEEK_SET, NULL); + ok(hr == S_OK, "Failed to seek, hr %#x.\n", hr); + + nread = 0; + memset(buffer, 0xcc, sizeof(buffer)); + hr = IStream_Read(istream, buffer, sizeof(buffer), &nread); + ok(hr == S_OK, "Failed to read, hr %#x.\n", hr); + buffer[nread/2] = 0; + ok(buffer[0] == 0xfeff, "got %x\n", buffer[0]); + ok(compareIgnoreReturns(&buffer[1], _bstr_(szTransformOutput)), "got output %s\n", wine_dbgstr_w(buffer)); + IStream_Release(istream); + IXMLDOMDocument_Release(doc3); IXMLDOMDocument_Release(doc2); IXMLDOMDocument_Release(doc); -- 2.25.1

2 2