May 2017 - Wine-Commits - list.winehq.org

Hans Leidekker : webservices: Implement WsSkipNode.
by Alexandre Julliard May 23, 2017

May 23, 2017

Module: wine Branch: master Commit: da030566e7de8b5c8cd99985598c04f72a54f646 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da030566e7de8b5c8cd999855… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 23 12:03:50 2017 +0200 webservices: Implement WsSkipNode. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 46 ++++++++++++++++++++++++++++++ dlls/webservices/tests/reader.c | 60 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 3 files changed, 107 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 1d85f00..befe8db 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1739,6 +1739,52 @@ HRESULT WINAPI WsReadNode( WS_XML_READER *handle, WS_ERROR *error ) return hr; } +static HRESULT skip_node( struct reader *reader ) +{ + const struct node *parent; + HRESULT hr; + + if (node_type( reader->current ) == WS_XML_NODE_TYPE_EOF) return WS_E_INVALID_OPERATION; + if (node_type( reader->current ) == WS_XML_NODE_TYPE_ELEMENT) parent = reader->current; + else parent = NULL; + + for (;;) + { + if ((hr = read_node( reader ) != S_OK) || !parent) break; + if (node_type( reader->current ) != WS_XML_NODE_TYPE_END_ELEMENT) continue; + if (reader->current->parent == parent) return read_node( reader ); + } + + return hr; +} + +/************************************************************************** + * WsSkipNode [webservices.@] + */ +HRESULT WINAPI WsSkipNode( WS_XML_READER *handle, WS_ERROR *error ) +{ + struct reader *reader = (struct reader *)handle; + HRESULT hr; + + TRACE( "%p %p\n", handle, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!reader) return E_INVALIDARG; + + EnterCriticalSection( &reader->cs ); + + if (reader->magic != READER_MAGIC) + { + LeaveCriticalSection( &reader->cs ); + return E_INVALIDARG; + } + + hr = skip_node( reader ); + + LeaveCriticalSection( &reader->cs ); + return hr; +} + /************************************************************************** * WsReadStartElement [webservices.@] */ diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 1598cb2..93b7ed5 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -4403,6 +4403,65 @@ static void test_WsReadAttribute(void) WsFreeReader( reader ); } +static void test_WsSkipNode(void) +{ + const WS_XML_NODE *node; + WS_XML_READER *reader; + HRESULT hr; + + hr = WsSkipNode( NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateReader( NULL, 0, &reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsSkipNode( reader, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = set_input( reader, "<t><u></u></t>", sizeof("<t><u></u></t>") - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_BOF, "got %u\n", node->nodeType ); + + /* BOF */ + hr = WsSkipNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); + + /* element */ + hr = WsSkipNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); + + /* EOF */ + hr = WsSkipNode( reader, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = set_input( reader, "<t></t>", sizeof("<t></t>") - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* non-element */ + hr = WsSkipNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_COMMENT, "got %u\n", node->nodeType ); + + hr = WsSkipNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); + + WsFreeReader( reader ); +} + START_TEST(reader) { test_WsCreateError(); @@ -4444,4 +4503,5 @@ START_TEST(reader) test_WsReadCharsUtf8(); test_WsReadQualifiedName(); test_WsReadAttribute(); + test_WsSkipNode(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index a6b8452..1f98aa3 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -159,7 +159,7 @@ @ stdcall WsSetReaderPosition(ptr ptr ptr) @ stdcall WsSetWriterPosition(ptr ptr ptr) @ stub WsShutdownSessionChannel -@ stub WsSkipNode +@ stdcall WsSkipNode(ptr ptr) @ stub WsStartReaderCanonicalization @ stub WsStartWriterCanonicalization @ stub WsTrimXmlWhitespace

1 0

Hans Leidekker : webservices: Add support for writing attributes and text in binary mode.
by Alexandre Julliard May 23, 2017

May 23, 2017

Module: wine Branch: master Commit: e6b9f9a63483dba5de8dc33690c0f42e9c1e903e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6b9f9a63483dba5de8dc3369… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 23 12:03:54 2017 +0200 webservices: Add support for writing attributes and text in binary mode. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 100 ++++++++++++-- dlls/webservices/writer.c | 284 +++++++++++++++++++++++++++++----------- 2 files changed, 302 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e6b9f9a63483dba5de8dc…

1 0

Alistair Leslie-Hughes : wined3d: Allow passing NULL to context_reacquire( ).
by Alexandre Julliard May 23, 2017

May 23, 2017

Module: wine Branch: master Commit: c9ea06e7a8fef557bd781c2b56cd81a3629ec839 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9ea06e7a8fef557bd781c2b5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat May 20 14:12:31 2017 +0200 wined3d: Allow passing NULL to context_reacquire(). A context associated with a query may be destroyed together with a swapchain. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 89731e5..6d09c22 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3970,7 +3970,7 @@ struct wined3d_context *context_reacquire(const struct wined3d_device *device, { struct wined3d_context *current_context; - if (context->tid != GetCurrentThreadId()) + if (!context || context->tid != GetCurrentThreadId()) return NULL; current_context = context_acquire(device, context->current_rt.texture,

1 0

Hugh McMaster : regedit: Only show the 'New' pop-up menu when right-clicking beneath the listview item list.
by Alexandre Julliard May 22, 2017

May 22, 2017

Module: wine Branch: master Commit: e880c9ca8c557fe9df536ae5970fe0b57a793868 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e880c9ca8c557fe9df536ae59… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 22 13:03:21 2017 +0000 regedit: Only show the 'New' pop-up menu when right-clicking beneath the listview item list. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 258 ++++++++++++++++++++++---------------------- po/bg.po | 258 ++++++++++++++++++++++---------------------- po/ca.po | 258 ++++++++++++++++++++++---------------------- po/cs.po | 258 ++++++++++++++++++++++---------------------- po/da.po | 258 ++++++++++++++++++++++---------------------- po/de.po | 258 ++++++++++++++++++++++---------------------- po/el.po | 258 ++++++++++++++++++++++---------------------- po/en.po | 258 ++++++++++++++++++++++---------------------- po/en_US.po | 258 ++++++++++++++++++++++---------------------- po/eo.po | 258 ++++++++++++++++++++++---------------------- po/es.po | 258 ++++++++++++++++++++++---------------------- po/fa.po | 258 ++++++++++++++++++++++---------------------- po/fi.po | 258 ++++++++++++++++++++++---------------------- po/fr.po | 258 ++++++++++++++++++++++---------------------- po/he.po | 258 ++++++++++++++++++++++---------------------- po/hi.po | 258 ++++++++++++++++++++++---------------------- po/hr.po | 258 ++++++++++++++++++++++---------------------- po/hu.po | 258 ++++++++++++++++++++++---------------------- po/it.po | 258 ++++++++++++++++++++++---------------------- po/ja.po | 258 ++++++++++++++++++++++---------------------- po/ko.po | 258 ++++++++++++++++++++++---------------------- po/lt.po | 258 ++++++++++++++++++++++---------------------- po/ml.po | 258 ++++++++++++++++++++++---------------------- po/nb_NO.po | 258 ++++++++++++++++++++++---------------------- po/nl.po | 258 ++++++++++++++++++++++---------------------- po/or.po | 258 ++++++++++++++++++++++---------------------- po/pa.po | 258 ++++++++++++++++++++++---------------------- po/pl.po | 258 ++++++++++++++++++++++---------------------- po/pt_BR.po | 258 ++++++++++++++++++++++---------------------- po/pt_PT.po | 258 ++++++++++++++++++++++---------------------- po/rm.po | 258 ++++++++++++++++++++++---------------------- po/ro.po | 258 ++++++++++++++++++++++---------------------- po/ru.po | 258 ++++++++++++++++++++++---------------------- po/sk.po | 258 ++++++++++++++++++++++---------------------- po/sl.po | 258 ++++++++++++++++++++++---------------------- po/sr_RS(a)cyrillic.po | 258 ++++++++++++++++++++++---------------------- po/sr_RS(a)latin.po | 258 ++++++++++++++++++++++---------------------- po/sv.po | 258 ++++++++++++++++++++++---------------------- po/te.po | 258 ++++++++++++++++++++++---------------------- po/th.po | 258 ++++++++++++++++++++++---------------------- po/tr.po | 258 ++++++++++++++++++++++---------------------- po/uk.po | 258 ++++++++++++++++++++++---------------------- po/wa.po | 258 ++++++++++++++++++++++---------------------- po/wine.pot | 258 ++++++++++++++++++++++---------------------- po/zh_CN.po | 258 ++++++++++++++++++++++---------------------- po/zh_TW.po | 258 ++++++++++++++++++++++---------------------- programs/regedit/listview.c | 2 +- programs/regedit/main.h | 3 +- programs/regedit/regedit.rc | 14 +++ 49 files changed, 5951 insertions(+), 5936 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e880c9ca8c557fe9df536…

1 0

Vincent Povirk : gdiplus: Check SHADEBLENDCAPS only for printer devices.
by Alexandre Julliard May 22, 2017

May 22, 2017

Module: wine Branch: master Commit: b8a8e1bde9382897927945ec0b58b8a2fcfcfe59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8a8e1bde9382897927945ec0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon May 22 13:20:58 2017 -0500 gdiplus: Check SHADEBLENDCAPS only for printer devices. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 6c0d58d..815ffb0 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -324,7 +324,8 @@ static void transform_and_round_points(GpGraphics *graphics, POINT *pti, static void gdi_alpha_blend(GpGraphics *graphics, INT dst_x, INT dst_y, INT dst_width, INT dst_height, HDC hdc, INT src_x, INT src_y, INT src_width, INT src_height) { - if (GetDeviceCaps(graphics->hdc, SHADEBLENDCAPS) == SB_NONE) + if (GetDeviceCaps(graphics->hdc, TECHNOLOGY) == DT_RASPRINTER && + GetDeviceCaps(graphics->hdc, SHADEBLENDCAPS) == SB_NONE) { TRACE("alpha blending not supported by device, fallback to StretchBlt\n"); @@ -404,7 +405,8 @@ static GpStatus alpha_blend_hdc_pixels(GpGraphics *graphics, INT dst_x, INT dst_ hbitmap = CreateDIBSection(hdc, (BITMAPINFO*)&bih, DIB_RGB_COLORS, (void**)&temp_bits, NULL, 0); - if (GetDeviceCaps(graphics->hdc, SHADEBLENDCAPS) == SB_NONE || + if ((GetDeviceCaps(graphics->hdc, TECHNOLOGY) == DT_RASPRINTER && + GetDeviceCaps(graphics->hdc, SHADEBLENDCAPS) == SB_NONE) || fmt & PixelFormatPAlpha) memcpy(temp_bits, src, src_width * src_height * 4); else

1 0

Hugh McMaster : regedit: Update and sort the pop-up menus.
by Alexandre Julliard May 22, 2017

May 22, 2017

Module: wine Branch: master Commit: 7bf054f198695abb445e5d2ebd7b777d6a1bba71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bf054f198695abb445e5d2eb… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 22 13:03:11 2017 +0000 regedit: Update and sort the pop-up menus. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 266 ++++++++++++++++++++++---------------------- po/bg.po | 266 ++++++++++++++++++++++---------------------- po/ca.po | 266 ++++++++++++++++++++++---------------------- po/cs.po | 266 ++++++++++++++++++++++---------------------- po/da.po | 266 ++++++++++++++++++++++---------------------- po/de.po | 266 ++++++++++++++++++++++---------------------- po/el.po | 266 ++++++++++++++++++++++---------------------- po/en.po | 266 ++++++++++++++++++++++---------------------- po/en_US.po | 266 ++++++++++++++++++++++---------------------- po/eo.po | 266 ++++++++++++++++++++++---------------------- po/es.po | 266 ++++++++++++++++++++++---------------------- po/fa.po | 266 ++++++++++++++++++++++---------------------- po/fi.po | 266 ++++++++++++++++++++++---------------------- po/fr.po | 266 ++++++++++++++++++++++---------------------- po/he.po | 266 ++++++++++++++++++++++---------------------- po/hi.po | 266 ++++++++++++++++++++++---------------------- po/hr.po | 266 ++++++++++++++++++++++---------------------- po/hu.po | 266 ++++++++++++++++++++++---------------------- po/it.po | 266 ++++++++++++++++++++++---------------------- po/ja.po | 266 ++++++++++++++++++++++---------------------- po/ko.po | 266 ++++++++++++++++++++++---------------------- po/lt.po | 266 ++++++++++++++++++++++---------------------- po/ml.po | 266 ++++++++++++++++++++++---------------------- po/nb_NO.po | 266 ++++++++++++++++++++++---------------------- po/nl.po | 266 ++++++++++++++++++++++---------------------- po/or.po | 266 ++++++++++++++++++++++---------------------- po/pa.po | 266 ++++++++++++++++++++++---------------------- po/pl.po | 266 ++++++++++++++++++++++---------------------- po/pt_BR.po | 266 ++++++++++++++++++++++---------------------- po/pt_PT.po | 266 ++++++++++++++++++++++---------------------- po/rm.po | 266 ++++++++++++++++++++++---------------------- po/ro.po | 266 ++++++++++++++++++++++---------------------- po/ru.po | 266 ++++++++++++++++++++++---------------------- po/sk.po | 266 ++++++++++++++++++++++---------------------- po/sl.po | 266 ++++++++++++++++++++++---------------------- po/sr_RS(a)cyrillic.po | 266 ++++++++++++++++++++++---------------------- po/sr_RS(a)latin.po | 266 ++++++++++++++++++++++---------------------- po/sv.po | 266 ++++++++++++++++++++++---------------------- po/te.po | 266 ++++++++++++++++++++++---------------------- po/th.po | 266 ++++++++++++++++++++++---------------------- po/tr.po | 266 ++++++++++++++++++++++---------------------- po/uk.po | 266 ++++++++++++++++++++++---------------------- po/wa.po | 266 ++++++++++++++++++++++---------------------- po/wine.pot | 266 ++++++++++++++++++++++---------------------- po/zh_CN.po | 266 ++++++++++++++++++++++---------------------- po/zh_TW.po | 266 ++++++++++++++++++++++---------------------- programs/regedit/childwnd.c | 2 +- programs/regedit/listview.c | 2 +- programs/regedit/main.h | 7 +- programs/regedit/regedit.rc | 22 ++-- 50 files changed, 6136 insertions(+), 6133 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7bf054f198695abb445e5…

1 0

Jacek Caban : rpcrt4: Implement cancel_call for named pipes.
by Alexandre Julliard May 22, 2017

May 22, 2017

Module: wine Branch: master Commit: b54833890a21d1d5e3feeba74a7084b729fca30d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b54833890a21d1d5e3feeba74… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 22 16:04:50 2017 +0200 rpcrt4: Implement cancel_call for named pipes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_transport.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index ab87daa..1e7a62b 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -447,9 +447,10 @@ static int rpcrt4_conn_np_close(RpcConnection *conn) return 0; } -static void rpcrt4_conn_np_cancel_call(RpcConnection *Connection) +static void rpcrt4_conn_np_cancel_call(RpcConnection *conn) { - /* FIXME: implement when named pipe writes use overlapped I/O */ + RpcConnection_np *connection = (RpcConnection_np *)conn; + CancelIoEx(connection->pipe, NULL); } static int rpcrt4_conn_np_wait_for_incoming_data(RpcConnection *Connection)

1 0

Jacek Caban : rpcrt4: Use named pipe in overlapped mode.
by Alexandre Julliard May 22, 2017

May 22, 2017

Module: wine Branch: master Commit: 4f4ac8c40ee5b7a0adc7d3589667b889556ffcb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f4ac8c40ee5b7a0adc7d3589… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 22 16:04:15 2017 +0200 rpcrt4: Use named pipe in overlapped mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_transport.c | 40 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 6fa1e60..98fa597 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -75,6 +75,16 @@ static RpcConnection *rpcrt4_conn_np_alloc(void) return &npc->common; } +static HANDLE get_np_event(void) +{ + return CreateEventW(NULL, TRUE, FALSE, NULL); +} + +static void release_np_event(HANDLE event) +{ + CloseHandle(event); +} + static DWORD CALLBACK listen_thread(void *arg) { RpcConnection_np *npc = arg; @@ -123,7 +133,7 @@ static RPC_STATUS rpcrt4_conn_create_pipe(RpcConnection *Connection, LPCSTR pnam RpcConnection_np *npc = (RpcConnection_np *) Connection; TRACE("listening on %s\n", pname); - npc->pipe = CreateNamedPipeA(pname, PIPE_ACCESS_DUPLEX, + npc->pipe = CreateNamedPipeA(pname, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE, PIPE_UNLIMITED_INSTANCES, RPC_MAX_PACKET_SIZE, RPC_MAX_PACKET_SIZE, 5000, NULL); @@ -175,7 +185,7 @@ static RPC_STATUS rpcrt4_conn_open_pipe(RpcConnection *Connection, LPCSTR pname, dwFlags |= SECURITY_CONTEXT_TRACKING; } pipe = CreateFileA(pname, GENERIC_READ|GENERIC_WRITE, 0, NULL, - OPEN_EXISTING, dwFlags, 0); + OPEN_EXISTING, dwFlags | FILE_FLAG_OVERLAPPED, 0); if (pipe != INVALID_HANDLE_VALUE) break; err = GetLastError(); if (err == ERROR_PIPE_BUSY) { @@ -413,9 +423,20 @@ static int rpcrt4_conn_np_read(RpcConnection *conn, void *buffer, unsigned int c { RpcConnection_np *connection = (RpcConnection_np *) conn; IO_STATUS_BLOCK io_status; + HANDLE event; NTSTATUS status; - status = NtReadFile(connection->pipe, NULL, NULL, NULL, &io_status, buffer, count, NULL, NULL); + event = get_np_event(); + if (!event) + return -1; + + status = NtReadFile(connection->pipe, event, NULL, NULL, &io_status, buffer, count, NULL, NULL); + if (status == STATUS_PENDING) + { + WaitForSingleObject(event, INFINITE); + status = io_status.Status; + } + release_np_event(event); return status && status != STATUS_BUFFER_OVERFLOW ? -1 : io_status.Information; } @@ -423,9 +444,20 @@ static int rpcrt4_conn_np_write(RpcConnection *conn, const void *buffer, unsigne { RpcConnection_np *connection = (RpcConnection_np *) conn; IO_STATUS_BLOCK io_status; + HANDLE event; NTSTATUS status; - status = NtWriteFile(connection->pipe, NULL, NULL, NULL, &io_status, buffer, count, NULL, NULL); + event = get_np_event(); + if (!event) + return -1; + + status = NtWriteFile(connection->pipe, event, NULL, NULL, &io_status, buffer, count, NULL, NULL); + if (status == STATUS_PENDING) + { + WaitForSingleObject(event, INFINITE); + status = io_status.Status; + } + release_np_event(event); if (status) return -1;

1 0

Jacek Caban : rpcrt4: Simplify rpcrt4_conn_np_write implementation.
by Alexandre Julliard May 22, 2017

May 22, 2017

Module: wine Branch: master Commit: f62b9d69ae06df67cce3e0b6d7eb2a5470470290 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f62b9d69ae06df67cce3e0b6d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 22 16:03:46 2017 +0200 rpcrt4: Simplify rpcrt4_conn_np_write implementation. There is no need for the loop. Named pipes always do complete writes. Also use NtWriteFile like we do for reading to not mess with GetLastError(). Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_transport.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 60975ca..bc2f4a3 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -429,24 +429,18 @@ static int rpcrt4_conn_np_read(RpcConnection *Connection, return count; } -static int rpcrt4_conn_np_write(RpcConnection *Connection, - const void *buffer, unsigned int count) +static int rpcrt4_conn_np_write(RpcConnection *conn, const void *buffer, unsigned int count) { - RpcConnection_np *npc = (RpcConnection_np *) Connection; - const char *buf = buffer; - BOOL ret = TRUE; - unsigned int bytes_left = count; + RpcConnection_np *connection = (RpcConnection_np *) conn; + IO_STATUS_BLOCK io_status; + NTSTATUS status; - while (bytes_left) - { - DWORD bytes_written; - ret = WriteFile(npc->pipe, buf, bytes_left, &bytes_written, NULL); - if (!ret || !bytes_written) - break; - bytes_left -= bytes_written; - buf += bytes_written; - } - return ret ? count : -1; + status = NtWriteFile(connection->pipe, NULL, NULL, NULL, &io_status, buffer, count, NULL, NULL); + if (status) + return -1; + + assert(io_status.Information == count); + return count; } static int rpcrt4_conn_np_close(RpcConnection *Connection)

1 0

Zebediah Figura : kernel32: Implement bytes left in PeekNamedPipe().
by Alexandre Julliard May 22, 2017

May 22, 2017

Module: wine Branch: master Commit: d37bfe960f6fb554f0d4e24052d6b802ba745f1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d37bfe960f6fb554f0d4e2405… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 21 08:53:51 2017 -0500 kernel32: Implement bytes left in PeekNamedPipe(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/sync.c | 2 +- server/named_pipe.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index ee995f5..d3d46b7 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1475,7 +1475,7 @@ BOOL WINAPI PeekNamedPipe( HANDLE hPipe, LPVOID lpvBuffer, DWORD cbBuffer, ULONG read_size = io.Information - FIELD_OFFSET( FILE_PIPE_PEEK_BUFFER, Data ); if (lpcbAvail) *lpcbAvail = buffer->ReadDataAvailable; if (lpcbRead) *lpcbRead = read_size; - if (lpcbMessage) *lpcbMessage = 0; /* FIXME */ + if (lpcbMessage) *lpcbMessage = buffer->MessageLength - read_size; if (lpvBuffer) memcpy( lpvBuffer, buffer->Data, read_size ); } else SetLastError( RtlNtStatusToDosError(status) ); diff --git a/server/named_pipe.c b/server/named_pipe.c index b8ea426..0c314bd 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -927,6 +927,7 @@ static void pipe_end_peek( struct pipe_end *pipe_end ) FILE_PIPE_PEEK_BUFFER *buffer; struct pipe_message *message; data_size_t avail = 0; + data_size_t message_length = 0; if (!use_server_io( pipe_end )) { @@ -947,7 +948,8 @@ static void pipe_end_peek( struct pipe_end *pipe_end ) if (avail) { message = LIST_ENTRY( list_head(&pipe_end->message_queue), struct pipe_message, entry ); - reply_size = min( reply_size, message->iosb->in_size - message->read_pos ); + message_length = message->iosb->in_size - message->read_pos; + reply_size = min( reply_size, message_length ); } else reply_size = 0; @@ -955,7 +957,7 @@ static void pipe_end_peek( struct pipe_end *pipe_end ) buffer->NamedPipeState = 0; /* FIXME */ buffer->ReadDataAvailable = avail; buffer->NumberOfMessages = 0; /* FIXME */ - buffer->MessageLength = 0; /* FIXME */ + buffer->MessageLength = message_length; if (reply_size) memcpy( buffer->Data, (const char *)message->iosb->in_data + message->read_pos, reply_size ); }

1 0