wine-commits May 2017

wine-commits@winehq.org

2 participants
640 discussions

Jacek Caban : rpcrt4: Use non-blocking listening on named pipes.
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: 6e7a2978e7e1be40dc0e05f307dbefac3bbfaf24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e7a2978e7e1be40dc0e05f30… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 22 16:04:31 2017 +0200 rpcrt4: Use non-blocking listening on 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 | 139 ++++++++++++++++++++------------------------ 1 file changed, 62 insertions(+), 77 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 98fa597..afcb0e7 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -38,6 +38,7 @@ #include "winerror.h" #include "wininet.h" #include "winternl.h" +#include "winioctl.h" #include "wine/unicode.h" #include "rpc.h" @@ -63,10 +64,10 @@ static RPC_STATUS RPCRT4_SpawnConnection(RpcConnection** Connection, RpcConnecti typedef struct _RpcConnection_np { - RpcConnection common; - HANDLE pipe; - HANDLE listen_thread; - BOOL listening; + RpcConnection common; + HANDLE pipe; + HANDLE listen_event; + IO_STATUS_BLOCK io_status; } RpcConnection_np; static RpcConnection *rpcrt4_conn_np_alloc(void) @@ -85,49 +86,6 @@ static void release_np_event(HANDLE event) CloseHandle(event); } -static DWORD CALLBACK listen_thread(void *arg) -{ - RpcConnection_np *npc = arg; - for (;;) - { - if (ConnectNamedPipe(npc->pipe, NULL)) - return RPC_S_OK; - - switch(GetLastError()) - { - case ERROR_PIPE_CONNECTED: - return RPC_S_OK; - case ERROR_HANDLES_CLOSED: - /* connection closed during listen */ - return RPC_S_NO_CONTEXT_AVAILABLE; - case ERROR_NO_DATA_DETECTED: - /* client has disconnected, retry */ - DisconnectNamedPipe( npc->pipe ); - break; - default: - npc->listening = FALSE; - WARN("Couldn't ConnectNamedPipe (error was %d)\n", GetLastError()); - return RPC_S_OUT_OF_RESOURCES; - } - } -} - -static RPC_STATUS rpcrt4_conn_listen_pipe(RpcConnection_np *npc) -{ - if (npc->listening) - return RPC_S_OK; - - npc->listening = TRUE; - npc->listen_thread = CreateThread(NULL, 0, listen_thread, npc, 0, NULL); - if (!npc->listen_thread) - { - npc->listening = FALSE; - ERR("Couldn't create listen thread (error was %d)\n", GetLastError()); - return RPC_S_OUT_OF_RESOURCES; - } - return RPC_S_OK; -} - static RPC_STATUS rpcrt4_conn_create_pipe(RpcConnection *Connection, LPCSTR pname) { RpcConnection_np *npc = (RpcConnection_np *) Connection; @@ -333,14 +291,12 @@ static RPC_STATUS rpcrt4_protseq_ncacn_np_open_endpoint(RpcServerProtseq *protse static void rpcrt4_conn_np_handoff(RpcConnection_np *old_npc, RpcConnection_np *new_npc) { - /* because of the way named pipes work, we'll transfer the connected pipe - * to the child, then reopen the server binding to continue listening */ + /* because of the way named pipes work, we'll transfer the connected pipe + * to the child, then reopen the server binding to continue listening */ - new_npc->pipe = old_npc->pipe; - new_npc->listen_thread = old_npc->listen_thread; - old_npc->pipe = 0; - old_npc->listen_thread = 0; - old_npc->listening = FALSE; + new_npc->pipe = old_npc->pipe; + old_npc->pipe = 0; + assert(!old_npc->listen_event); } static RPC_STATUS rpcrt4_ncacn_np_handoff(RpcConnection *old_conn, RpcConnection *new_conn) @@ -465,19 +421,21 @@ static int rpcrt4_conn_np_write(RpcConnection *conn, const void *buffer, unsigne return count; } -static int rpcrt4_conn_np_close(RpcConnection *Connection) +static int rpcrt4_conn_np_close(RpcConnection *conn) { - RpcConnection_np *npc = (RpcConnection_np *) Connection; - if (npc->pipe) { - FlushFileBuffers(npc->pipe); - CloseHandle(npc->pipe); - npc->pipe = 0; - } - if (npc->listen_thread) { - CloseHandle(npc->listen_thread); - npc->listen_thread = 0; - } - return 0; + RpcConnection_np *connection = (RpcConnection_np *) conn; + if (connection->pipe) + { + FlushFileBuffers(connection->pipe); + CloseHandle(connection->pipe); + connection->pipe = 0; + } + if (connection->listen_event) + { + CloseHandle(connection->listen_event); + connection->listen_event = 0; + } + return 0; } static void rpcrt4_conn_np_cancel_call(RpcConnection *Connection) @@ -677,9 +635,33 @@ static void *rpcrt4_protseq_np_get_wait_array(RpcServerProtseq *protseq, void *p /* open and count connections */ *count = 1; LIST_FOR_EACH_ENTRY(conn, &protseq->connections, RpcConnection_np, common.protseq_entry) { - rpcrt4_conn_listen_pipe(conn); - if (conn->listen_thread) - (*count)++; + if (!conn->listen_event) + { + NTSTATUS status; + HANDLE event; + + event = get_np_event(); + if (!event) + continue; + + status = NtFsControlFile(conn->pipe, event, NULL, NULL, &conn->io_status, FSCTL_PIPE_LISTEN, NULL, 0, NULL, 0); + switch (status) + { + case STATUS_SUCCESS: + case STATUS_PIPE_CONNECTED: + conn->io_status.Status = status; + SetEvent(event); + break; + case STATUS_PENDING: + break; + default: + ERR("pipe listen error %x\n", status); + continue; + } + + conn->listen_event = event; + } + (*count)++; } /* make array of connections */ @@ -697,8 +679,8 @@ static void *rpcrt4_protseq_np_get_wait_array(RpcServerProtseq *protseq, void *p objs[0] = npps->mgr_event; *count = 1; LIST_FOR_EACH_ENTRY(conn, &protseq->connections, RpcConnection_np, common.protseq_entry) { - if ((objs[*count] = conn->listen_thread)) - (*count)++; + if (conn->listen_event) + objs[(*count)++] = conn->listen_event; } LeaveCriticalSection(&protseq->cs); return objs; @@ -741,13 +723,16 @@ static int rpcrt4_protseq_np_wait_for_new_connection(RpcServerProtseq *protseq, b_handle = objs[res - WAIT_OBJECT_0]; /* find which connection got a RPC */ EnterCriticalSection(&protseq->cs); - LIST_FOR_EACH_ENTRY(conn, &protseq->connections, RpcConnection_np, common.protseq_entry) { - if (b_handle == conn->listen_thread) { - DWORD exit_code; - if (GetExitCodeThread(conn->listen_thread, &exit_code) && exit_code == RPC_S_OK) + LIST_FOR_EACH_ENTRY(conn, &protseq->connections, RpcConnection_np, common.protseq_entry) + { + if (b_handle == conn->listen_event) + { + release_np_event(conn->listen_event); + conn->listen_event = NULL; + if (conn->io_status.Status == STATUS_SUCCESS || conn->io_status.Status == STATUS_PIPE_CONNECTED) RPCRT4_SpawnConnection(&cconn, &conn->common); - CloseHandle(conn->listen_thread); - conn->listen_thread = 0; + else + ERR("listen failed %x\n", conn->io_status.Status); break; } }

1 0

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

22 May '17

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_read implementation.
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: bd6f8071d87a6f3dd72ee6358fe2051e5b772aed URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd6f8071d87a6f3dd72ee6358… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 22 16:04:02 2017 +0200 rpcrt4: Simplify rpcrt4_conn_np_read implementation. Since RPC messages are sent as a single message, if it's too short, it means the message is broken and we let the caller to handle an error. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_transport.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index bc2f4a3..6fa1e60 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -409,24 +409,14 @@ static RPC_STATUS rpcrt4_ncalrpc_handoff(RpcConnection *old_conn, RpcConnection return status; } -static int rpcrt4_conn_np_read(RpcConnection *Connection, - void *buffer, unsigned int count) +static int rpcrt4_conn_np_read(RpcConnection *conn, void *buffer, unsigned int count) { - RpcConnection_np *npc = (RpcConnection_np *) Connection; - IO_STATUS_BLOCK io_status; - char *buf = buffer; - unsigned int bytes_left = count; - NTSTATUS status; + RpcConnection_np *connection = (RpcConnection_np *) conn; + IO_STATUS_BLOCK io_status; + NTSTATUS status; - while (bytes_left) - { - status = NtReadFile(npc->pipe, NULL, NULL, NULL, &io_status, buf, bytes_left, NULL, NULL); - if (status && status != STATUS_BUFFER_OVERFLOW) - return -1; - bytes_left -= io_status.Information; - buf += io_status.Information; - } - return count; + status = NtReadFile(connection->pipe, NULL, NULL, NULL, &io_status, buffer, count, NULL, NULL); + return status && status != STATUS_BUFFER_OVERFLOW ? -1 : io_status.Information; } static int rpcrt4_conn_np_write(RpcConnection *conn, const void *buffer, unsigned int count)

1 0

Jacek Caban : rpcrt4: Simplify rpcrt4_conn_np_write implementation.
by Alexandre Julliard 22 May '17

22 May '17

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

Stefan Dösinger : msvcp140: Implement _Close_dir.
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: b21ca1887f13a70f8c1b805b9f8a6de5ecb1b6ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=b21ca1887f13a70f8c1b805b9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon May 22 15:59:46 2017 +0200 msvcp140: Implement _Close_dir. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index d5cedf9..ee01b42 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3620,7 +3620,7 @@ @ thiscall -ret64 -arch=i386 ?xsputn@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MAE_JPB_W_J@Z(ptr wstr int64) basic_streambuf_wchar_xsputn @ cdecl -arch=win64 ?xsputn@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MEAA_JPEB_W_J@Z(ptr ptr long) basic_streambuf_wchar_xsputn @ stub _Chmod -@ stub _Close_dir +@ cdecl _Close_dir(ptr) tr2_sys__Close_dir @ cdecl _Cnd_broadcast(ptr) @ cdecl _Cnd_destroy(ptr) @ cdecl _Cnd_destroy_in_situ(ptr)

1 0

Stefan Dösinger : msvcp: Implement the wchar version of _Read_dir.
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: 3ddbd236d0363a8ea8753f70b4e74a0fc2cfae3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ddbd236d0363a8ea8753f70b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon May 22 15:59:45 2017 +0200 msvcp: Implement the wchar version of _Read_dir. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 4 ++-- dlls/msvcp120/msvcp120.spec | 4 ++-- dlls/msvcp120_app/msvcp120_app.spec | 4 ++-- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp90/ios.c | 28 +++++++++++++++++++++------- 5 files changed, 28 insertions(+), 14 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 0627aed..4001b68 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1713,8 +1713,8 @@ @ cdecl ?_Random_device@std@@YAIXZ() _Random_device @ cdecl -arch=win32 ?_Read_dir@sys@tr2@std@@YAPADPADPAXAAW4file_type@123@@Z(ptr ptr ptr) tr2_sys__Read_dir @ cdecl -arch=win64 ?_Read_dir@sys@tr2@std@@YAPEADPEADPEAXAEAW4file_type@123@@Z(ptr ptr ptr) tr2_sys__Read_dir -@ stub -arch=win32 ?_Read_dir@sys@tr2@std@@YAPA_WPA_WPAXAAW4file_type@123@@Z -@ stub -arch=win64 ?_Read_dir@sys@tr2@std@@YAPEA_WPEA_WPEAXAEAW4file_type@123@@Z +@ cdecl -arch=win32 ?_Read_dir@sys@tr2@std@@YAPA_WPA_WPAXAAW4file_type@123@@Z(ptr ptr ptr) tr2_sys__Read_dir_wchar +@ cdecl -arch=win64 ?_Read_dir@sys@tr2@std@@YAPEA_WPEA_WPEAXAEAW4file_type@123@@Z(ptr ptr ptr) tr2_sys__Read_dir_wchar @ cdecl -arch=arm ?_Release@_Pad@std@@QAAXXZ(ptr) _Pad__Release @ thiscall -arch=i386 ?_Release@_Pad@std@@QAEXXZ(ptr) _Pad__Release @ cdecl -arch=win64 ?_Release@_Pad@std@@QEAAXXZ(ptr) _Pad__Release diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index a2b82cb..7cd3514 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1674,8 +1674,8 @@ @ cdecl ?_Random_device@std@@YAIXZ() _Random_device @ cdecl -arch=win32 ?_Read_dir@sys@tr2@std@@YAPADAAY0BAE@DPAXAAW4file_type@123@@Z(ptr ptr ptr) tr2_sys__Read_dir @ cdecl -arch=win64 ?_Read_dir@sys@tr2@std@@YAPEADAEAY0BAE@DPEAXAEAW4file_type@123@@Z(ptr ptr ptr) tr2_sys__Read_dir -@ stub -arch=win32 ?_Read_dir@sys@tr2@std@@YAPA_WAAY0BAE@_WPAXAAW4file_type@123@@Z -@ stub -arch=win64 ?_Read_dir@sys@tr2@std@@YAPEA_WAEAY0BAE@_WPEAXAEAW4file_type@123@@Z +@ cdecl -arch=win32 ?_Read_dir@sys@tr2@std@@YAPA_WAAY0BAE@_WPAXAAW4file_type@123@@Z(ptr ptr ptr) tr2_sys__Read_dir_wchar +@ cdecl -arch=win64 ?_Read_dir@sys@tr2@std@@YAPEA_WAEAY0BAE@_WPEAXAEAW4file_type@123@@Z(ptr ptr ptr) tr2_sys__Read_dir_wchar @ cdecl -arch=arm ?_Release@_Pad@std@@QAAXXZ(ptr) _Pad__Release @ thiscall -arch=i386 ?_Release@_Pad@std@@QAEXXZ(ptr) _Pad__Release @ cdecl -arch=win64 ?_Release@_Pad@std@@QEAAXXZ(ptr) _Pad__Release diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index be11ca1..6a74f84 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1674,8 +1674,8 @@ @ cdecl ?_Random_device@std@@YAIXZ() msvcp120.?_Random_device@std@@YAIXZ @ cdecl -arch=win32 ?_Read_dir@sys@tr2@std@@YAPADAAY0BAE@DPAXAAW4file_type@123@@Z(ptr ptr ptr) msvcp120.?_Read_dir@sys@tr2@std@@YAPADAAY0BAE@DPAXAAW4file_type@123@@Z @ cdecl -arch=win64 ?_Read_dir@sys@tr2@std@@YAPEADAEAY0BAE@DPEAXAEAW4file_type@123@@Z(ptr ptr ptr) msvcp120.?_Read_dir@sys@tr2@std@@YAPEADAEAY0BAE@DPEAXAEAW4file_type@123@@Z -@ stub -arch=win32 ?_Read_dir@sys@tr2@std@@YAPA_WAAY0BAE@_WPAXAAW4file_type@123@@Z -@ stub -arch=win64 ?_Read_dir@sys@tr2@std@@YAPEA_WAEAY0BAE@_WPEAXAEAW4file_type@123@@Z +@ cdecl -arch=win32 ?_Read_dir@sys@tr2@std@@YAPA_WAAY0BAE@_WPAXAAW4file_type@123@@Z(ptr ptr ptr) msvcp120.?_Read_dir@sys@tr2@std@@YAPA_WAAY0BAE@_WPAXAAW4file_type@123@@Z +@ cdecl -arch=win64 ?_Read_dir@sys@tr2@std@@YAPEA_WAEAY0BAE@_WPEAXAEAW4file_type@123@@Z(ptr ptr ptr) msvcp120.?_Read_dir@sys@tr2@std@@YAPEA_WAEAY0BAE@_WPEAXAEAW4file_type@123@@Z @ cdecl -arch=arm ?_Release@_Pad@std@@QAAXXZ(ptr) msvcp120.?_Release@_Pad@std@@QAAXXZ @ thiscall -arch=i386 ?_Release@_Pad@std@@QAEXXZ(ptr) msvcp120.?_Release@_Pad@std@@QAEXXZ @ cdecl -arch=win64 ?_Release@_Pad@std@@QEAAXXZ(ptr) msvcp120.?_Release@_Pad@std@@QEAAXXZ diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index faf0578..d5cedf9 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3692,7 +3692,7 @@ @ cdecl _Open_dir(ptr wstr long long) tr2_sys__Open_dir_wchar @ cdecl -ret64 _Query_perf_counter() @ cdecl -ret64 _Query_perf_frequency() -@ stub _Read_dir +@ cdecl _Read_dir(ptr ptr ptr) tr2_sys__Read_dir_wchar @ stub _Remove_dir @ stub _Rename @ stub _Resize diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 838abf3..8e3376c 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14962,23 +14962,25 @@ void* __cdecl tr2_sys__Open_dir(char* target, char const* dest, int* err_code, e return handle; } -/* ?_Read_dir@sys@tr2@std@@YAPADAAY0BAE@DPAXAAW4file_type@123@@Z */ -/* ?_Read_dir@sys@tr2@std@@YAPEADAEAY0BAE@DPEAXAEAW4file_type@123@@Z */ -char* __cdecl tr2_sys__Read_dir(char* target, void* handle, enum file_type* type) +/* ??_Read_dir@sys@tr2@std@@YAPA_WPA_WPAXAAW4file_type@123@@Z */ +/* ??_Read_dir@sys@tr2@std@@YAPEA_WPEA_WPEAXAEAW4file_type@123@@Z */ +wchar_t* __cdecl tr2_sys__Read_dir_wchar(wchar_t* target, void* handle, enum file_type* type) { - WIN32_FIND_DATAA data; + WIN32_FIND_DATAW data; + static const wchar_t dot[] = {'.', 0}; + static const wchar_t dotdot[] = {'.', '.', 0}; TRACE("(%p %p %p)\n", target, handle, type); do { - if(!FindNextFileA(handle, &data)) { + if(!FindNextFileW(handle, &data)) { *type = status_unknown; *target = '\0'; return target; } - } while(!strcmp(data.cFileName, ".") || !strcmp(data.cFileName, "..")); + } while(!wcscmp(data.cFileName, dot) || !wcscmp(data.cFileName, dotdot)); - strcpy(target, data.cFileName); + wcscpy(target, data.cFileName); if(data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) *type = directory_file; else @@ -14986,6 +14988,18 @@ char* __cdecl tr2_sys__Read_dir(char* target, void* handle, enum file_type* type return target; } +/* ?_Read_dir@sys@tr2@std@@YAPADAAY0BAE@DPAXAAW4file_type@123@@Z */ +/* ?_Read_dir@sys@tr2@std@@YAPEADAEAY0BAE@DPEAXAEAW4file_type@123@@Z */ +char* __cdecl tr2_sys__Read_dir(char* target, void* handle, enum file_type* type) +{ + wchar_t target_w[MAX_PATH]; + + tr2_sys__Read_dir_wchar(target_w, handle, type); + WideCharToMultiByte(CP_ACP, 0, target_w, -1, target, MAX_PATH, NULL, NULL); + + return target; +} + /* ?_Close_dir@sys@tr2@std@@YAXPAX@Z */ /* ?_Close_dir@sys@tr2@std@@YAXPEAX@Z */ void __cdecl tr2_sys__Close_dir(void* handle)

1 0

Stefan Dösinger : msvcp: Implement the wchar version of _Open_dir.
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: 4193e717b6221d78fe2d7a559024df0f7468a834 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4193e717b6221d78fe2d7a559… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon May 22 15:59:44 2017 +0200 msvcp: Implement the wchar version of _Open_dir. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 4 +-- dlls/msvcp120/msvcp120.spec | 4 +-- dlls/msvcp120_app/msvcp120_app.spec | 4 +-- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp90/ios.c | 58 ++++++++++++++++++++++++++++--------- 5 files changed, 51 insertions(+), 21 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 17e8531..0627aed 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1643,8 +1643,8 @@ @ cdecl -arch=win64 ?_New_Locimp@_Locimp@locale@std@@CAPEAV123@_N@Z(long) locale__Locimp__New_Locimp_transparent @ cdecl -arch=win32 ?_Open_dir@sys@tr2@std@@YAPAXPADPBDAAHAAW4file_type@123@@Z(ptr str long long) tr2_sys__Open_dir @ cdecl -arch=win64 ?_Open_dir@sys@tr2@std@@YAPEAXAEAY0BAE@DPEBDAEAHAEAW4file_type@123@@Z(ptr str long long) tr2_sys__Open_dir -@ stub -arch=win32 ?_Open_dir@sys@tr2@std@@YAPAXPA_WPB_WAAHAAW4file_type@123@@Z -@ stub -arch=win64 ?_Open_dir@sys@tr2@std@@YAPEAXPEA_WPEB_WAEAHAEAW4file_type@123@@Z +@ cdecl -arch=win32 ?_Open_dir@sys@tr2@std@@YAPAXPA_WPB_WAAHAAW4file_type@123@@Z(ptr wstr long long) tr2_sys__Open_dir_wchar +@ cdecl -arch=win64 ?_Open_dir@sys@tr2@std@@YAPEAXPEA_WPEB_WAEAHAEAW4file_type@123@@Z(ptr wstr long long) tr2_sys__Open_dir_wchar @ cdecl -arch=arm ?_Orphan_all@_Container_base0@std@@QAAXXZ(ptr) Container_base0_Orphan_all @ thiscall -arch=i386 ?_Orphan_all@_Container_base0@std@@QAEXXZ(ptr) Container_base0_Orphan_all @ cdecl -arch=win64 ?_Orphan_all@_Container_base0@std@@QEAAXXZ(ptr) Container_base0_Orphan_all diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 0146719..a2b82cb 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1604,8 +1604,8 @@ @ cdecl -arch=win64 ?_New_Locimp@_Locimp@locale@std@@CAPEAV123@_N@Z(long) locale__Locimp__New_Locimp_transparent @ cdecl -arch=win32 ?_Open_dir@sys@tr2@std@@YAPAXAAY0BAE@DPBDAAHAAW4file_type@123@@Z(ptr str long long) tr2_sys__Open_dir @ cdecl -arch=win64 ?_Open_dir@sys@tr2@std@@YAPEAXAEAY0BAE@DPEBDAEAHAEAW4file_type@123@@Z(ptr str long long) tr2_sys__Open_dir -@ stub -arch=win32 ?_Open_dir@sys@tr2@std@@YAPAXAAY0BAE@_WPB_WAAHAAW4file_type@123@@Z -@ stub -arch=win64 ?_Open_dir@sys@tr2@std@@YAPEAXAEAY0BAE@_WPEB_WAEAHAEAW4file_type@123@@Z +@ cdecl -arch=win32 ?_Open_dir@sys@tr2@std@@YAPAXAAY0BAE@_WPB_WAAHAAW4file_type@123@@Z(ptr wstr long long) tr2_sys__Open_dir_wchar +@ cdecl -arch=win64 ?_Open_dir@sys@tr2@std@@YAPEAXAEAY0BAE@_WPEB_WAEAHAEAW4file_type@123@@Z(ptr wstr long long) tr2_sys__Open_dir_wchar @ cdecl -arch=arm ?_Orphan_all@_Container_base0@std@@QAAXXZ(ptr) Container_base0_Orphan_all @ thiscall -arch=i386 ?_Orphan_all@_Container_base0@std@@QAEXXZ(ptr) Container_base0_Orphan_all @ cdecl -arch=win64 ?_Orphan_all@_Container_base0@std@@QEAAXXZ(ptr) Container_base0_Orphan_all diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 70fa429..be11ca1 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1604,8 +1604,8 @@ @ cdecl -arch=win64 ?_New_Locimp@_Locimp@locale@std@@CAPEAV123@_N@Z(long) msvcp120.?_New_Locimp@_Locimp@locale@std@@CAPEAV123@_N@Z @ cdecl -arch=win32 ?_Open_dir@sys@tr2@std@@YAPAXAAY0BAE@DPBDAAHAAW4file_type@123@@Z(ptr str long long) msvcp120.?_Open_dir@sys@tr2@std@@YAPAXAAY0BAE@DPBDAAHAAW4file_type@123@@Z @ cdecl -arch=win64 ?_Open_dir@sys@tr2@std@@YAPEAXAEAY0BAE@DPEBDAEAHAEAW4file_type@123@@Z(ptr str long long) msvcp120.?_Open_dir@sys@tr2@std@@YAPEAXAEAY0BAE@DPEBDAEAHAEAW4file_type@123@@Z -@ stub -arch=win32 ?_Open_dir@sys@tr2@std@@YAPAXAAY0BAE@_WPB_WAAHAAW4file_type@123@@Z -@ stub -arch=win64 ?_Open_dir@sys@tr2@std@@YAPEAXAEAY0BAE@_WPEB_WAEAHAEAW4file_type@123@@Z +@ cdecl -arch=win32 ?_Open_dir@sys@tr2@std@@YAPAXAAY0BAE@_WPB_WAAHAAW4file_type@123@@Z(ptr wstr long long) msvcp120.?_Open_dir@sys@tr2@std@@YAPAXAAY0BAE@_WPB_WAAHAAW4file_type@123@@Z +@ cdecl -arch=win64 ?_Open_dir@sys@tr2@std@@YAPEAXAEAY0BAE@_WPEB_WAEAHAEAW4file_type@123@@Z(ptr wstr long long) msvcp120.?_Open_dir@sys@tr2@std@@YAPEAXAEAY0BAE@_WPEB_WAEAHAEAW4file_type@123@@Z @ cdecl -arch=arm ?_Orphan_all@_Container_base0@std@@QAAXXZ(ptr) msvcp120.?_Orphan_all@_Container_base0@std@@QAAXXZ @ thiscall -arch=i386 ?_Orphan_all@_Container_base0@std@@QAEXXZ(ptr) msvcp120.?_Orphan_all@_Container_base0@std@@QAEXXZ @ cdecl -arch=win64 ?_Orphan_all@_Container_base0@std@@QEAAXXZ(ptr) msvcp120.?_Orphan_all@_Container_base0@std@@QEAAXXZ diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index c75f8dd..faf0578 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3689,7 +3689,7 @@ @ stub _Mtxlock @ stub _Mtxunlock @ extern _Nan _Nan -@ stub _Open_dir +@ cdecl _Open_dir(ptr wstr long long) tr2_sys__Open_dir_wchar @ cdecl -ret64 _Query_perf_counter() @ cdecl -ret64 _Query_perf_frequency() @ stub _Read_dir diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 07aa651..838abf3 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -26,7 +26,9 @@ #include "msvcp90.h" #include "windef.h" #include "winbase.h" +#include "winnls.h" #include "wine/debug.h" + WINE_DEFAULT_DEBUG_CHANNEL(msvcp); #define SECSPERDAY 86400 @@ -14893,29 +14895,32 @@ void __cdecl tr2_sys__Last_write_time_set(char const* path, __int64 newtime) CloseHandle(handle); } -/* ?_Open_dir@sys@tr2@std@@YAPAXAAY0BAE@DPBDAAHAAW4file_type@123@@Z */ -/* ?_Open_dir@sys@tr2@std@@YAPEAXAEAY0BAE@DPEBDAEAHAEAW4file_type@123@@Z */ -void* __cdecl tr2_sys__Open_dir(char* target, char const* dest, int* err_code, enum file_type* type) +/* ??_Open_dir@sys@tr2@std@@YAPAXPA_WPB_WAAHAAW4file_type@123@@Z */ +/* ??_Open_dir@sys@tr2@std@@YAPEAXPEA_WPEB_WAEAHAEAW4file_type@123@@Z */ +void* __cdecl tr2_sys__Open_dir_wchar(wchar_t* target, wchar_t const* dest, int* err_code, enum file_type* type) { HANDLE handle; - WIN32_FIND_DATAA data; - char temppath[MAX_PATH]; - - TRACE("(%p %s %p %p)\n", target, debugstr_a(dest), err_code, type); - if(strlen(dest) > MAX_PATH - 3) { + WIN32_FIND_DATAW data; + wchar_t temppath[MAX_PATH]; + static const wchar_t dot[] = {'.', 0}; + static const wchar_t dotdot[] = {'.', '.', 0}; + static const wchar_t asterisk[] = {'\\', '*', 0}; + + TRACE("(%p %s %p %p)\n", target, debugstr_w(dest), err_code, type); + if(wcslen(dest) > MAX_PATH - 3) { *err_code = ERROR_BAD_PATHNAME; return NULL; } - strcpy(temppath, dest); - strcat(temppath, "\\*"); + wcscpy(temppath, dest); + wcscat(temppath, asterisk); - handle = FindFirstFileA(temppath, &data); + handle = FindFirstFileW(temppath, &data); if(handle == INVALID_HANDLE_VALUE) { *err_code = GetLastError(); return NULL; } - while(!strcmp(data.cFileName, ".") || !strcmp(data.cFileName, "..")) { - if(!FindNextFileA(handle, &data)) { + while(!wcscmp(data.cFileName, dot) || !wcscmp(data.cFileName, dotdot)) { + if(!FindNextFileW(handle, &data)) { *err_code = ERROR_SUCCESS; *type = status_unknown; FindClose(handle); @@ -14923,7 +14928,7 @@ void* __cdecl tr2_sys__Open_dir(char* target, char const* dest, int* err_code, e } } - strcpy(target, data.cFileName); + wcscpy(target, data.cFileName); *err_code = ERROR_SUCCESS; if(data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) *type = directory_file; @@ -14932,6 +14937,31 @@ void* __cdecl tr2_sys__Open_dir(char* target, char const* dest, int* err_code, e return handle; } +/* ?_Open_dir@sys@tr2@std@@YAPAXAAY0BAE@DPBDAAHAAW4file_type@123@@Z */ +/* ?_Open_dir@sys@tr2@std@@YAPEAXAEAY0BAE@DPEBDAEAHAEAW4file_type@123@@Z */ +void* __cdecl tr2_sys__Open_dir(char* target, char const* dest, int* err_code, enum file_type* type) +{ + void *handle; + wchar_t target_w[MAX_PATH]; + wchar_t dest_w[MAX_PATH]; + + TRACE("(%p %s %p %p)\n", target, debugstr_a(dest), err_code, type); + + if (dest && !MultiByteToWideChar(CP_ACP, 0, dest, -1, dest_w, MAX_PATH)) + { + WARN("Failed to convert input string.\n"); + *err_code = ERROR_BAD_PATHNAME; + return NULL; + } + + handle = tr2_sys__Open_dir_wchar(target_w, dest ? dest_w : NULL, err_code, type); + + if (handle) + WideCharToMultiByte(CP_ACP, 0, target_w, -1, target, MAX_PATH, NULL, NULL); + + return handle; +} + /* ?_Read_dir@sys@tr2@std@@YAPADAAY0BAE@DPAXAAW4file_type@123@@Z */ /* ?_Read_dir@sys@tr2@std@@YAPEADAEAY0BAE@DPEAXAEAW4file_type@123@@Z */ char* __cdecl tr2_sys__Read_dir(char* target, void* handle, enum file_type* type)

1 0

Jacek Caban : kernel32/tests: Run test_overlapped_transport in byte mode.
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: 0657b1d1f43968e07177519cc8d35d90a0ed8b59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0657b1d1f43968e07177519cc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 22 13:46:14 2017 +0200 kernel32/tests: Run test_overlapped_transport in byte mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 8c62bd0..0a6edd6 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -3056,4 +3056,6 @@ START_TEST(pipe) test_readfileex_pending(); test_overlapped_transport(TRUE, FALSE); test_overlapped_transport(TRUE, TRUE); + if (broken(1)) /* FIXME: Remove once Wine is ready. */ + test_overlapped_transport(FALSE, FALSE); }

1 0

Jacek Caban : kernel32/tests: Added more PeekNamedPipe tests.
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: 9d011931db89afec1f56f56bd90c40eb162ae0c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d011931db89afec1f56f56bd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 22 13:40:58 2017 +0200 kernel32/tests: Added more PeekNamedPipe tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 42 +++++++++++++++++++++++++++++++++--------- 1 file changed, 33 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index e27e29e..8c62bd0 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -26,6 +26,7 @@ #include "windef.h" #include "winbase.h" #include "winternl.h" +#include "winioctl.h" #include "wine/test.h" #define PIPENAME "\\\\.\\PiPe\\tests_pipe.c" @@ -2534,17 +2535,40 @@ todo_wine CloseHandle(event); } -#define test_peek_pipe(a,b,c) _test_peek_pipe(__LINE__,a,b,c) -static void _test_peek_pipe(unsigned line, HANDLE pipe, DWORD expected_read, DWORD expected_avail) +#define test_peek_pipe(a,b,c,d) _test_peek_pipe(__LINE__,a,b,c,d) +static void _test_peek_pipe(unsigned line, HANDLE pipe, DWORD expected_read, DWORD expected_avail, DWORD expected_message_length) { - DWORD bytes_read = 0xdeadbeed, avail = 0xdeadbeef; + DWORD bytes_read = 0xdeadbeed, avail = 0xdeadbeef, left = 0xdeadbeed; char buf[4000]; + FILE_PIPE_PEEK_BUFFER *peek_buf = (void*)buf; + IO_STATUS_BLOCK io; + NTSTATUS status; BOOL r; - r = PeekNamedPipe(pipe, buf, sizeof(buf), &bytes_read, &avail, NULL); + r = PeekNamedPipe(pipe, buf, sizeof(buf), &bytes_read, &avail, &left); ok_(__FILE__,line)(r, "PeekNamedPipe failed: %u\n", GetLastError()); ok_(__FILE__,line)(bytes_read == expected_read, "bytes_read = %u, expected %u\n", bytes_read, expected_read); ok_(__FILE__,line)(avail == expected_avail, "avail = %u, expected %u\n", avail, expected_avail); + ok_(__FILE__,line)(left == expected_message_length - expected_read, "left = %d, expected %d\n", + left, expected_message_length - expected_read); + + status = NtFsControlFile(pipe, 0, NULL, NULL, &io, FSCTL_PIPE_PEEK, NULL, 0, buf, sizeof(buf)); + ok_(__FILE__,line)(!status || status == STATUS_PENDING, "NtFsControlFile(FSCTL_PIPE_PEEK) failed: %x\n", status); + ok_(__FILE__,line)(io.Information == FIELD_OFFSET(FILE_PIPE_PEEK_BUFFER, Data[expected_read]), + "io.Information = %lu\n", io.Information); + ok_(__FILE__,line)(peek_buf->ReadDataAvailable == expected_avail, "ReadDataAvailable = %u, expected %u\n", + peek_buf->ReadDataAvailable, expected_avail); + ok_(__FILE__,line)(peek_buf->MessageLength == expected_message_length, "MessageLength = %u, expected %u\n", + peek_buf->MessageLength, expected_message_length); + + if (expected_read) + { + r = PeekNamedPipe(pipe, buf, 1, &bytes_read, &avail, &left); + ok_(__FILE__,line)(r, "PeekNamedPipe failed: %u\n", GetLastError()); + ok_(__FILE__,line)(bytes_read == 1, "bytes_read = %u, expected %u\n", bytes_read, expected_read); + ok_(__FILE__,line)(avail == expected_avail, "avail = %u, expected %u\n", avail, expected_avail); + ok_(__FILE__,line)(left == expected_message_length-1, "left = %d, expected %d\n", left, expected_message_length-1); + } } #define overlapped_read_sync(a,b,c,d,e) _overlapped_read_sync(__LINE__,a,b,c,d,e) @@ -2728,7 +2752,7 @@ static void test_blocking_rw(HANDLE writer, HANDLE reader, DWORD buf_size, BOOL /* test pending read with overlapped event */ overlapped_read_async(reader, read_buf, 1000, &read_overlapped); test_flush_sync(writer); - test_peek_pipe(reader, 0, 0); + test_peek_pipe(reader, 0, 0, 0); /* write more data than needed for read */ overlapped_write_sync(writer, buf, 4000); @@ -2813,13 +2837,13 @@ static void test_blocking_rw(HANDLE writer, HANDLE reader, DWORD buf_size, BOOL test_overlapped_result(reader, &read_overlapped2, 1, FALSE); overlapped_write_sync(writer, buf, 20); - test_peek_pipe(reader, 20, 20); + test_peek_pipe(reader, 20, 20, msg_mode ? 20 : 0); overlapped_write_sync(writer, buf, 15); - test_peek_pipe(reader, msg_mode ? 20 : 35, 35); + test_peek_pipe(reader, msg_mode ? 20 : 35, 35, msg_mode ? 20 : 0); overlapped_read_sync(reader, read_buf, 10, 10, msg_read); - test_peek_pipe(reader, msg_mode ? 10 : 25, 25); + test_peek_pipe(reader, msg_mode ? 10 : 25, 25, msg_mode ? 10 : 0); overlapped_read_sync(reader, read_buf, 10, 10, FALSE); - test_peek_pipe(reader, 15, 15); + test_peek_pipe(reader, 15, 15, msg_mode ? 15 : 0); overlapped_read_sync(reader, read_buf, 15, 15, FALSE); if(!pCancelIoEx) {

1 0

Zebediah Figura : kernel32/tests: Test bytes left in PeekNamedPipe().
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: ad2f1efe01fe6a402878a56743c671f037dfa3e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad2f1efe01fe6a402878a5674… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 21 08:53:52 2017 -0500 kernel32/tests: Test 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/tests/pipe.c | 63 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 53 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 77450e3..e27e29e 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -149,6 +149,7 @@ static void test_CreateNamedPipe(int pipemode) DWORD written; DWORD readden; DWORD avail; + DWORD left; DWORD lpmode; BOOL ret; @@ -240,8 +241,12 @@ static void test_CreateNamedPipe(int pipemode) memset(ibuf, 0, sizeof(ibuf)); ok(WriteFile(hnp, obuf, sizeof(obuf), &written, NULL), "WriteFile\n"); ok(written == sizeof(obuf), "write file len 1\n"); - ok(PeekNamedPipe(hFile, NULL, 0, NULL, &readden, NULL), "Peek\n"); - ok(readden == sizeof(obuf), "peek 1 got %d bytes\n", readden); + ok(PeekNamedPipe(hFile, NULL, 0, NULL, &avail, &left), "Peek\n"); + ok(avail == sizeof(obuf), "peek 1 got %d bytes\n", avail); + if (pipemode == PIPE_TYPE_BYTE) + ok(left == 0, "peek 1 got %d bytes left\n", left); + else + ok(left == sizeof(obuf), "peek 1 got %d bytes left\n", left); ok(ReadFile(hFile, ibuf, sizeof(ibuf), &readden, NULL), "ReadFile\n"); ok(readden == sizeof(obuf), "read 1 got %d bytes\n", readden); ok(memcmp(obuf, ibuf, written) == 0, "content 1 check\n"); @@ -249,10 +254,18 @@ static void test_CreateNamedPipe(int pipemode) memset(ibuf, 0, sizeof(ibuf)); ok(WriteFile(hFile, obuf2, sizeof(obuf2), &written, NULL), "WriteFile\n"); ok(written == sizeof(obuf2), "write file len 2\n"); - ok(PeekNamedPipe(hnp, NULL, 0, NULL, &readden, NULL), "Peek\n"); - ok(readden == sizeof(obuf2), "peek 2 got %d bytes\n", readden); - ok(PeekNamedPipe(hnp, (LPVOID)1, 0, NULL, &readden, NULL), "Peek\n"); - ok(readden == sizeof(obuf2), "peek 2 got %d bytes\n", readden); + ok(PeekNamedPipe(hnp, NULL, 0, NULL, &avail, &left), "Peek\n"); + ok(avail == sizeof(obuf2), "peek 2 got %d bytes\n", avail); + if (pipemode == PIPE_TYPE_BYTE) + ok(left == 0, "peek 2 got %d bytes left\n", left); + else + ok(left == sizeof(obuf2), "peek 2 got %d bytes left\n", left); + ok(PeekNamedPipe(hnp, (LPVOID)1, 0, NULL, &avail, &left), "Peek\n"); + ok(avail == sizeof(obuf2), "peek 2 got %d bytes\n", avail); + if (pipemode == PIPE_TYPE_BYTE) + ok(left == 0, "peek 2 got %d bytes left\n", left); + else + ok(left == sizeof(obuf2), "peek 2 got %d bytes left\n", left); ok(ReadFile(hnp, ibuf, sizeof(ibuf), &readden, NULL), "ReadFile\n"); ok(readden == sizeof(obuf2), "read 2 got %d bytes\n", readden); ok(memcmp(obuf2, ibuf, written) == 0, "content 2 check\n"); @@ -261,6 +274,13 @@ static void test_CreateNamedPipe(int pipemode) memset(ibuf, 0, sizeof(ibuf)); ok(WriteFile(hnp, obuf2, sizeof(obuf2), &written, NULL), "WriteFile\n"); ok(written == sizeof(obuf2), "write file len\n"); + ok(PeekNamedPipe(hFile, ibuf, 4, &readden, &avail, &left), "Peek\n"); + ok(readden == 4, "peek got %d bytes\n", readden); + ok(avail == sizeof(obuf2), "peek got %d bytes available\n", avail); + if (pipemode == PIPE_TYPE_BYTE) + ok(left == -4, "peek got %d bytes left\n", left); + else + ok(left == sizeof(obuf2)-4, "peek got %d bytes left\n", left); ok(ReadFile(hFile, ibuf, 4, &readden, NULL), "ReadFile\n"); ok(readden == 4, "read got %d bytes\n", readden); ok(ReadFile(hFile, ibuf + 4, sizeof(ibuf) - 4, &readden, NULL), "ReadFile\n"); @@ -270,12 +290,17 @@ static void test_CreateNamedPipe(int pipemode) memset(ibuf, 0, sizeof(ibuf)); ok(WriteFile(hFile, obuf, sizeof(obuf), &written, NULL), "WriteFile\n"); ok(written == sizeof(obuf), "write file len\n"); + ok(PeekNamedPipe(hnp, ibuf, 4, &readden, &avail, &left), "Peek\n"); + ok(readden == 4, "peek got %d bytes\n", readden); + ok(avail == sizeof(obuf), "peek got %d bytes available\n", avail); if (pipemode == PIPE_TYPE_BYTE) { + ok(left == -4, "peek got %d bytes left\n", left); ok(ReadFile(hnp, ibuf, 4, &readden, NULL), "ReadFile\n"); } else { + ok(left == sizeof(obuf)-4, "peek got %d bytes left\n", left); SetLastError(0xdeadbeef); ok(!ReadFile(hnp, ibuf, 4, &readden, NULL), "ReadFile\n"); ok(GetLastError() == ERROR_MORE_DATA, "wrong error\n"); @@ -316,15 +341,24 @@ static void test_CreateNamedPipe(int pipemode) ok(written == sizeof(obuf), "write file len 3a\n"); ok(WriteFile(hnp, obuf2, sizeof(obuf2), &written, NULL), " WriteFile3b\n"); ok(written == sizeof(obuf2), "write file len 3b\n"); - ok(PeekNamedPipe(hFile, ibuf, sizeof(ibuf), &readden, &avail, NULL), "Peek3\n"); + ok(PeekNamedPipe(hFile, ibuf, 4, &readden, &avail, &left), "Peek3\n"); + ok(readden == 4, "peek3 got %d bytes\n", readden); + if (pipemode == PIPE_TYPE_BYTE) + ok(left == -4, "peek3 got %d bytes left\n", left); + else + ok(left == sizeof(obuf)-4, "peek3 got %d bytes left\n", left); + ok(avail == sizeof(obuf) + sizeof(obuf2), "peek3 got %d bytes available\n", avail); + ok(PeekNamedPipe(hFile, ibuf, sizeof(ibuf), &readden, &avail, &left), "Peek3\n"); if (pipemode == PIPE_TYPE_BYTE) { /* currently the Wine behavior depends on the kernel version */ /* ok(readden == sizeof(obuf) + sizeof(obuf2), "peek3 got %d bytes\n", readden); */ if (readden != sizeof(obuf) + sizeof(obuf2)) todo_wine ok(0, "peek3 got %d bytes\n", readden); + ok(left == (DWORD) -(sizeof(obuf) + sizeof(obuf2)), "peek3 got %d bytes left\n", left); } else { ok(readden == sizeof(obuf), "peek3 got %d bytes\n", readden); + ok(left == 0, "peek3 got %d bytes left\n", left); } ok(avail == sizeof(obuf) + sizeof(obuf2), "peek3 got %d bytes available\n", avail); pbuf = ibuf; @@ -346,15 +380,24 @@ static void test_CreateNamedPipe(int pipemode) ok(written == sizeof(obuf), "write file len 4a\n"); ok(WriteFile(hFile, obuf2, sizeof(obuf2), &written, NULL), " WriteFile4b\n"); ok(written == sizeof(obuf2), "write file len 4b\n"); - ok(PeekNamedPipe(hnp, ibuf, sizeof(ibuf), &readden, &avail, NULL), "Peek4\n"); + ok(PeekNamedPipe(hnp, ibuf, 4, &readden, &avail, &left), "Peek3\n"); + ok(readden == 4, "peek3 got %d bytes\n", readden); + if (pipemode == PIPE_TYPE_BYTE) + ok(left == -4, "peek3 got %d bytes left\n", left); + else + ok(left == sizeof(obuf)-4, "peek3 got %d bytes left\n", left); + ok(avail == sizeof(obuf) + sizeof(obuf2), "peek3 got %d bytes available\n", avail); + ok(PeekNamedPipe(hnp, ibuf, sizeof(ibuf), &readden, &avail, &left), "Peek4\n"); if (pipemode == PIPE_TYPE_BYTE) { /* currently the Wine behavior depends on the kernel version */ /* ok(readden == sizeof(obuf) + sizeof(obuf2), "peek4 got %d bytes\n", readden); */ if (readden != sizeof(obuf) + sizeof(obuf2)) todo_wine ok(0, "peek4 got %d bytes\n", readden); + ok(left == (DWORD) -(sizeof(obuf) + sizeof(obuf2)), "peek4 got %d bytes left\n", left); } else { ok(readden == sizeof(obuf), "peek4 got %d bytes\n", readden); + ok(left == 0, "peek4 got %d bytes left\n", left); } ok(avail == sizeof(obuf) + sizeof(obuf2), "peek4 got %d bytes available\n", avail); pbuf = ibuf; @@ -392,10 +435,10 @@ static void test_CreateNamedPipe(int pipemode) ok(written == sizeof(obuf), "write file len 3a\n"); ok(WriteFile(hnp, obuf2, sizeof(obuf2), &written, NULL), " WriteFile5b\n"); ok(written == sizeof(obuf2), "write file len 3b\n"); - ok(PeekNamedPipe(hFile, ibuf, sizeof(ibuf), &readden, &avail, NULL), "Peek5\n"); + ok(PeekNamedPipe(hFile, ibuf, sizeof(ibuf), &readden, &avail, &left), "Peek5\n"); ok(readden == sizeof(obuf), "peek5 got %d bytes\n", readden); - ok(avail == sizeof(obuf) + sizeof(obuf2), "peek5 got %d bytes available\n", avail); + ok(left == 0, "peek5 got %d bytes left\n", left); pbuf = ibuf; ok(memcmp(obuf, pbuf, sizeof(obuf)) == 0, "content 5a check\n"); ok(ReadFile(hFile, ibuf, sizeof(ibuf), &readden, NULL), "ReadFile\n");

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2017