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

Hans Leidekker : advapi32/tests: Initialize input parameters (Valgrind).
by Alexandre Julliard March 24, 2017

March 24, 2017

Module: wine Branch: master Commit: 5786705ab88ade53c75557783d3279c75a819d78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5786705ab88ade53c75557783… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 24 15:49:23 2017 +0100 advapi32/tests: Initialize input parameters (Valgrind). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 82f5015..eb9ab67 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -771,11 +771,10 @@ cleanup: static void test_query_value_ex(void) { - DWORD ret; - DWORD size; - DWORD type; + DWORD ret, size, type; BYTE buffer[10]; - + + size = sizeof(buffer); ret = RegQueryValueExA(hkey_main, "TP1_SZ", NULL, &type, NULL, &size); ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); ok(size == strlen(sTestpath1) + 1, "(%d,%d)\n", (DWORD)strlen(sTestpath1) + 1, size); @@ -1832,7 +1831,7 @@ static void test_reg_query_info(void) ok(classbufferW[0] == 0x5555, "classbufferW[0] = 0x%x\n", classbufferW[0]); /* empty key */ - sdlen = 0; + sdlen = classlen =0; ret = RegQueryInfoKeyA(subkey, NULL, &classlen, NULL, &subkeys, &maxsubkeylen, &maxclasslen, &values, &maxvaluenamelen, &maxvaluelen, &sdlen, &lastwrite); ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); ok(classlen == strlen(subkey_class), "classlen = %u\n", classlen); @@ -1846,7 +1845,7 @@ static void test_reg_query_info(void) ok(lastwrite.dwLowDateTime != 0, "lastwrite.dwLowDateTime = %u\n", lastwrite.dwLowDateTime); ok(lastwrite.dwHighDateTime != 0, "lastwrite.dwHighDateTime = %u\n", lastwrite.dwHighDateTime); - sdlen = 0; + sdlen = classlen = 0; ret = RegQueryInfoKeyW(subkey, NULL, &classlen, NULL, &subkeys, &maxsubkeylen, &maxclasslen, &values, &maxvaluenamelen, &maxvaluelen, &sdlen, &lastwrite); ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); ok(classlen == strlen(subkey_class), "classlen = %u\n", classlen); @@ -1867,7 +1866,7 @@ static void test_reg_query_info(void) ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); /* with subkey & default value */ - sdlen = 0; + sdlen = classlen = 0; ret = RegQueryInfoKeyA(subkey, NULL, &classlen, NULL, &subkeys, &maxsubkeylen, &maxclasslen, &values, &maxvaluenamelen, &maxvaluelen, &sdlen, &lastwrite); ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); ok(classlen == strlen(subkey_class), "classlen = %u\n", classlen); @@ -1881,7 +1880,7 @@ static void test_reg_query_info(void) ok(lastwrite.dwLowDateTime != 0, "lastwrite.dwLowDateTime = %u\n", lastwrite.dwLowDateTime); ok(lastwrite.dwHighDateTime != 0, "lastwrite.dwHighDateTime = %u\n", lastwrite.dwHighDateTime); - sdlen = 0; + sdlen = classlen = 0; ret = RegQueryInfoKeyW(subkey, NULL, &classlen, NULL, &subkeys, &maxsubkeylen, &maxclasslen, &values, &maxvaluenamelen, &maxvaluelen, &sdlen, &lastwrite); ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); ok(classlen == strlen(subkey_class), "classlen = %u\n", classlen); @@ -1902,12 +1901,14 @@ static void test_reg_query_info(void) ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); /* with named value */ + classlen = 0; ret = RegQueryInfoKeyA(subkey, NULL, &classlen, NULL, &subkeys, &maxsubkeylen, &maxclasslen, &values, &maxvaluenamelen, &maxvaluelen, &sdlen, &lastwrite); ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); ok(values == 3, "values = %u\n", values); ok(maxvaluenamelen == strlen("value one"), "maxvaluenamelen = %u\n", maxvaluenamelen); ok(maxvaluelen == sizeof("second value data") * sizeof(WCHAR), "maxvaluelen = %u\n", maxvaluelen); + classlen = 0; ret = RegQueryInfoKeyW(subkey, NULL, &classlen, NULL, &subkeys, &maxsubkeylen, &maxclasslen, &values, &maxvaluenamelen, &maxvaluelen, &sdlen, &lastwrite); ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); ok(values == 3, "values = %u\n", values);

1 0

Jacek Caban : server: Don' t release client fd in do_disconnect for pipes in server-side I/O mode.
by Alexandre Julliard March 24, 2017

March 24, 2017

Module: wine Branch: master Commit: 197674669ec7d29f9470730129044f7263c62f13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=197674669ec7d29f947073012… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 23 15:42:13 2017 +0100 server: Don't release client fd in do_disconnect for pipes in server-side I/O mode. If server closes without disconnect, it should be still possible to read remaining buffered data. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index 1e6bb4e..0dfef01 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -452,8 +452,11 @@ static void do_disconnect( struct pipe_server *server ) { assert( server->client->server == server ); assert( server->client->pipe_end.fd ); - release_object( server->client->pipe_end.fd ); - server->client->pipe_end.fd = NULL; + if (!use_server_io( &server->pipe_end )) + { + release_object( server->client->pipe_end.fd ); + server->client->pipe_end.fd = NULL; + } } assert( server->pipe_end.fd ); if (!use_server_io( &server->pipe_end ))

1 0

Jacek Caban : kernel32/tests: Added more named pipe tests.
by Alexandre Julliard March 24, 2017

March 24, 2017

Module: wine Branch: master Commit: a83b5cdb937f8248b38393f6dc1c049054cb5884 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a83b5cdb937f8248b38393f6d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 23 15:42:47 2017 +0100 kernel32/tests: Added more named pipe tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 413 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 413 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a83b5cdb937f8248b3839…

1 0

Can Taşan : wine.desktop: Add Turkish translation.
by Alexandre Julliard March 24, 2017

March 24, 2017

Module: wine Branch: master Commit: 5c2d6211f6590d3856dc9188593b3d3597c8b441 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c2d6211f6590d3856dc91885… Author: Can Taşan <betax34(a)hotmail.com> Date: Fri Mar 24 21:14:20 2017 +0100 wine.desktop: Add Turkish translation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.desktop b/loader/wine.desktop index 04f7da8..36dd921 100644 --- a/loader/wine.desktop +++ b/loader/wine.desktop @@ -21,6 +21,7 @@ Name[nb]=Wine - for kjøring av Windows-programmer Name[nn]=Wine - for køyring av Windows-program Name[sr]=Wine - дизач Windows програма Name[sr(a)latin]=Wine - dizač Windows programa +Name[tr]=Wine - Windows programı yükleyicisi Name[hr]=Wine - dizač Windows programa Name[he]=Wine — מריץ תכניות Windows Name[ja]=Wine Windowsプログラムローダー

1 0

Can Taşan : kernel32: Add Unicode character for Turkish lira.
by Alexandre Julliard March 24, 2017

March 24, 2017

Module: wine Branch: master Commit: 42ed54b5d8e67aeb647d5a4fc8af7c8962285c7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=42ed54b5d8e67aeb647d5a4fc… Author: Can Taşan <betax34(a)hotmail.com> Date: Fri Mar 24 21:17:23 2017 +0100 kernel32: Add Unicode character for Turkish lira. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/trk.nls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/nls/trk.nls b/dlls/kernel32/nls/trk.nls index 3c50fe5..fad46a3 100644 --- a/dlls/kernel32/nls/trk.nls +++ b/dlls/kernel32/nls/trk.nls @@ -87,7 +87,7 @@ STRINGTABLE LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT LOCALE_SABBREVMONTHNAME12 "Ara" LOCALE_SABBREVMONTHNAME13 "" LOCALE_SCOUNTRY "Turkey" - LOCALE_SCURRENCY "TL" + LOCALE_SCURRENCY "₺" LOCALE_SDATE "." LOCALE_SDAYNAME1 "Pazartesi" LOCALE_SDAYNAME2 "Salı"

1 0

Alex Henrie : kernel32: Simplify Linux implementation of GlobalMemoryStatusEx.
by Alexandre Julliard March 24, 2017

March 24, 2017

Module: wine Branch: master Commit: fd7acb03ed27c9373631666a23b260fb37bf984f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd7acb03ed27c9373631666a2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Mar 23 08:59:49 2017 -0600 kernel32: Simplify Linux implementation of GlobalMemoryStatusEx. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/heap.c | 40 +++++++++++++--------------------------- 1 file changed, 13 insertions(+), 27 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 6c64d57..fd6414a 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1200,38 +1200,24 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex ) if (f) { char buffer[256]; - unsigned long total, used, free, shared, buffers, cached; + unsigned long value; lpmemex->ullTotalPhys = lpmemex->ullAvailPhys = 0; lpmemex->ullTotalPageFile = lpmemex->ullAvailPageFile = 0; while (fgets( buffer, sizeof(buffer), f )) { - /* old style /proc/meminfo ... */ - if (sscanf( buffer, "Mem: %lu %lu %lu %lu %lu %lu", - &total, &used, &free, &shared, &buffers, &cached )) - { - lpmemex->ullTotalPhys += total; - lpmemex->ullAvailPhys += free + buffers + cached; - } - if (sscanf( buffer, "Swap: %lu %lu %lu", &total, &used, &free )) - { - lpmemex->ullTotalPageFile += total; - lpmemex->ullAvailPageFile += free; - } - - /* new style /proc/meminfo ... */ - if (sscanf(buffer, "MemTotal: %lu", &total)) - lpmemex->ullTotalPhys = (ULONG64)total*1024; - if (sscanf(buffer, "MemFree: %lu", &free)) - lpmemex->ullAvailPhys = (ULONG64)free*1024; - if (sscanf(buffer, "SwapTotal: %lu", &total)) - lpmemex->ullTotalPageFile = (ULONG64)total*1024; - if (sscanf(buffer, "SwapFree: %lu", &free)) - lpmemex->ullAvailPageFile = (ULONG64)free*1024; - if (sscanf(buffer, "Buffers: %lu", &buffers)) - lpmemex->ullAvailPhys += (ULONG64)buffers*1024; - if (sscanf(buffer, "Cached: %lu", &cached)) - lpmemex->ullAvailPhys += (ULONG64)cached*1024; + if (sscanf(buffer, "MemTotal: %lu", &value)) + lpmemex->ullTotalPhys = (ULONG64)value*1024; + else if (sscanf(buffer, "MemFree: %lu", &value)) + lpmemex->ullAvailPhys = (ULONG64)value*1024; + else if (sscanf(buffer, "SwapTotal: %lu", &value)) + lpmemex->ullTotalPageFile = (ULONG64)value*1024; + else if (sscanf(buffer, "SwapFree: %lu", &value)) + lpmemex->ullAvailPageFile = (ULONG64)value*1024; + else if (sscanf(buffer, "Buffers: %lu", &value)) + lpmemex->ullAvailPhys += (ULONG64)value*1024; + else if (sscanf(buffer, "Cached: %lu", &value)) + lpmemex->ullAvailPhys += (ULONG64)value*1024; } fclose( f ); }

1 0

Francois Gouget : readme: Update and rewrap the French translation.
by Alexandre Julliard March 24, 2017

March 24, 2017

Module: wine Branch: master Commit: 2c392176096ba9401093e362eaa20b0f288e6d5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c392176096ba9401093e362e… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 24 03:43:37 2017 +0100 readme: Update and rewrap the French translation. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- documentation/README.fr | 165 +++++++++++++++++++++++++----------------------- 1 file changed, 87 insertions(+), 78 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2c392176096ba9401093e…

1 0

Francois Gouget : readme: Note that Wine may also use Mac APIs.
by Alexandre Julliard March 24, 2017

March 24, 2017

Module: wine Branch: master Commit: aa2a90c4189c250ef168da033ca20cb7167aba5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa2a90c4189c250ef168da033… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 24 03:42:27 2017 +0100 readme: Note that Wine may also use Mac APIs. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index b1ca54f..5cd2151 100644 --- a/README +++ b/README @@ -4,7 +4,7 @@ Wine is a program which allows running Microsoft Windows programs (including DOS, Windows 3.x, Win32, and Win64 executables) on Unix. It consists of a program loader which loads and executes a Microsoft Windows binary, and a library (called Winelib) that implements Windows -API calls using their Unix or X11 equivalents. The library may also +API calls using their Unix, X11 or Mac equivalents. The library may also be used for porting Windows code into native Unix executables. Wine is free software, released under the GNU LGPL; see the file

1 0

Jacek Caban : server: Use server-side I/O for message mode named pipes.
by Alexandre Julliard March 24, 2017

March 24, 2017

Module: wine Branch: master Commit: b682e1c41d89c9303d30312c83a402d0cdee4ece URL: http://source.winehq.org/git/wine.git/?a=commit;h=b682e1c41d89c9303d30312c8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 23 15:42:25 2017 +0100 server: Use server-side I/O for message mode named pipes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 28 +++++++++++----------------- dlls/ntdll/tests/file.c | 2 +- server/named_pipe.c | 4 ++-- 3 files changed, 14 insertions(+), 20 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 45c6fd9..aafebd6 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -308,8 +308,7 @@ static void test_CreateNamedPipe(int pipemode) } else { - /* ok(readden == sizeof(obuf), "peek3 got %d bytes\n", readden); */ - if (readden != sizeof(obuf)) todo_wine ok(0, "peek3 got %d bytes\n", readden); + ok(readden == sizeof(obuf), "peek3 got %d bytes\n", readden); } ok(avail == sizeof(obuf) + sizeof(obuf2), "peek3 got %d bytes available\n", avail); pbuf = ibuf; @@ -339,8 +338,7 @@ static void test_CreateNamedPipe(int pipemode) } else { - /* ok(readden == sizeof(obuf), "peek4 got %d bytes\n", readden); */ - if (readden != sizeof(obuf)) todo_wine ok(0, "peek4 got %d bytes\n", readden); + ok(readden == sizeof(obuf), "peek4 got %d bytes\n", readden); } ok(avail == sizeof(obuf) + sizeof(obuf2), "peek4 got %d bytes available\n", avail); pbuf = ibuf; @@ -381,9 +379,7 @@ static void test_CreateNamedPipe(int pipemode) 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"); - /* currently the Wine behavior depends on the kernel version */ - /* ok(readden == sizeof(obuf), "peek5 got %d bytes\n", readden); */ - if (readden != sizeof(obuf)) todo_wine ok(0, "peek5 got %d bytes\n", readden); + ok(readden == sizeof(obuf), "peek5 got %d bytes\n", readden); ok(avail == sizeof(obuf) + sizeof(obuf2), "peek5 got %d bytes available\n", avail); pbuf = ibuf; @@ -416,9 +412,7 @@ static void test_CreateNamedPipe(int pipemode) ok(WriteFile(hFile, obuf2, sizeof(obuf2), &written, NULL), " WriteFile6b\n"); ok(written == sizeof(obuf2), "write file len 6b\n"); ok(PeekNamedPipe(hnp, ibuf, sizeof(ibuf), &readden, &avail, NULL), "Peek6\n"); - /* currently the Wine behavior depends on the kernel version */ - /* ok(readden == sizeof(obuf), "peek6 got %d bytes\n", readden); */ - if (readden != sizeof(obuf)) todo_wine ok(0, "peek6 got %d bytes\n", readden); + ok(readden == sizeof(obuf), "peek6 got %d bytes\n", readden); ok(avail == sizeof(obuf) + sizeof(obuf2), "peek6b got %d bytes available\n", avail); pbuf = ibuf; @@ -496,7 +490,6 @@ static void test_CreateNamedPipe(int pipemode) ok(GetLastError() == ERROR_MORE_DATA, "wrong error 9\n"); ok(readden == 4, "read got %d bytes 9\n", readden); SetLastError(0xdeadbeef); - todo_wine ok(!ReadFile(hFile, ibuf + 4, 4, &readden, NULL), "ReadFile 9\n"); todo_wine ok(GetLastError() == ERROR_MORE_DATA, "wrong error 9\n"); @@ -536,6 +529,7 @@ static void test_CreateNamedPipe(int pipemode) memset(ibuf, 0, sizeof(ibuf)); SetLastError(0xdeadbeef); ret = RpcReadFile(hnp, ibuf, 4, &readden, NULL); + todo_wine ok(!ret, "RpcReadFile 10\n"); todo_wine ok(GetLastError() == ERROR_MORE_DATA, "wrong error 10\n"); @@ -1424,7 +1418,7 @@ static void test_CloseHandle(void) numbytes = 0xdeadbeef; memset(buffer, 0, sizeof(buffer)); ret = ReadFile(hfile, buffer, 0, &numbytes, NULL); - todo_wine ok(ret, "ReadFile failed with %u\n", GetLastError()); + ok(ret, "ReadFile failed with %u\n", GetLastError()); ok(numbytes == 0, "expected 0, got %u\n", numbytes); numbytes = 0xdeadbeef; @@ -1470,13 +1464,13 @@ static void test_CloseHandle(void) numbytes = 0xdeadbeef; memset(buffer, 0, sizeof(buffer)); ret = ReadFile(hfile, buffer, sizeof(buffer), &numbytes, NULL); - todo_wine ok(ret, "ReadFile failed with %u\n", GetLastError()); + ok(ret, "ReadFile failed with %u\n", GetLastError()); ok(numbytes == 0, "expected 0, got %u\n", numbytes); SetLastError(0xdeadbeef); ret = ReadFile(hfile, buffer, 0, &numbytes, NULL); ok(!ret, "ReadFile unexpectedly succeeded\n"); - todo_wine ok(GetLastError() == ERROR_BROKEN_PIPE, "expected ERROR_BROKEN_PIPE, got %u\n", GetLastError()); + ok(GetLastError() == ERROR_BROKEN_PIPE, "expected ERROR_BROKEN_PIPE, got %u\n", GetLastError()); ret = GetNamedPipeHandleStateA(hfile, &state, NULL, NULL, NULL, NULL, 0); ok(ret, "GetNamedPipeHandleState failed with %u\n", GetLastError()); @@ -1487,7 +1481,7 @@ static void test_CloseHandle(void) SetLastError(0xdeadbeef); ret = ReadFile(hfile, buffer, 0, &numbytes, NULL); ok(!ret, "ReadFile unexpectedly succeeded\n"); - todo_wine ok(GetLastError() == ERROR_BROKEN_PIPE, "expected ERROR_BROKEN_PIPE, got %u\n", GetLastError()); + ok(GetLastError() == ERROR_BROKEN_PIPE, "expected ERROR_BROKEN_PIPE, got %u\n", GetLastError()); SetLastError(0xdeadbeef); ret = WriteFile(hfile, testdata, sizeof(testdata), &numbytes, NULL); @@ -1522,7 +1516,7 @@ static void test_CloseHandle(void) numbytes = 0xdeadbeef; memset(buffer, 0, sizeof(buffer)); ret = ReadFile(hpipe, buffer, 0, &numbytes, NULL); - todo_wine ok(ret || GetLastError() == ERROR_MORE_DATA /* >= Win 8 */, + ok(ret || GetLastError() == ERROR_MORE_DATA /* >= Win 8 */, "ReadFile failed with %u\n", GetLastError()); ok(numbytes == 0, "expected 0, got %u\n", numbytes); @@ -1569,7 +1563,7 @@ static void test_CloseHandle(void) numbytes = 0xdeadbeef; memset(buffer, 0, sizeof(buffer)); ret = ReadFile(hpipe, buffer, sizeof(buffer), &numbytes, NULL); - todo_wine ok(ret, "ReadFile failed with %u\n", GetLastError()); + ok(ret, "ReadFile failed with %u\n", GetLastError()); ok(numbytes == 0, "expected 0, got %u\n", numbytes); SetLastError(0xdeadbeef); diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index a228d50..6df239a 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1272,7 +1272,7 @@ static void test_iocp_fileio(HANDLE h) ok( completionKey == CKEY_SECOND, "Invalid completion key: %lx\n", completionKey ); ok( ioSb.Information == 0, "Invalid ioSb.Information: %ld\n", ioSb.Information ); /* wine sends wrong status here */ - todo_wine ok( U(ioSb).Status == STATUS_PIPE_BROKEN, "Invalid ioSb.Status: %x\n", U(ioSb).Status); + ok( U(ioSb).Status == STATUS_PIPE_BROKEN, "Invalid ioSb.Status: %x\n", U(ioSb).Status); ok( completionValue == (ULONG_PTR)&o, "Invalid completion value: %lx\n", completionValue ); } } diff --git a/server/named_pipe.c b/server/named_pipe.c index 0dfef01..11e7457 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -296,10 +296,10 @@ static const struct fd_ops named_pipe_device_fd_ops = default_fd_reselect_async /* reselect_async */ }; -/* Returns if we handle I/O via server calls. Currently disabled. */ +/* Returns if we handle I/O via server calls. Currently message-mode pipes are handled this way. */ static int use_server_io( struct pipe_end *pipe_end ) { - return 0; /* FIXME */ + return pipe_end->flags & NAMED_PIPE_MESSAGE_STREAM_WRITE; } static void named_pipe_dump( struct object *obj, int verbose )

1 0

Jacek Caban : server Introduce read queue for server-side named pipe I/O.
by Alexandre Julliard March 24, 2017

March 24, 2017

Module: wine Branch: master Commit: d4139833c11133d458ee4b1e6afe6bd0e91b9e38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4139833c11133d458ee4b1e6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 23 15:41:43 2017 +0100 server Introduce read queue for server-side named pipe I/O. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 9 ++++++ server/file.h | 1 + server/named_pipe.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 95 insertions(+) diff --git a/server/async.c b/server/async.c index 4e30c2e..e113681 100644 --- a/server/async.c +++ b/server/async.c @@ -474,6 +474,15 @@ struct iosb *async_get_iosb( struct async *async ) return async->iosb ? (struct iosb *)grab_object( async->iosb ) : NULL; } +/* find the first pending async in queue */ +struct async *find_pending_async( struct async_queue *queue ) +{ + struct async *async; + if (queue) LIST_FOR_EACH_ENTRY( async, &queue->queue, struct async, queue_entry ) + if (async->status == STATUS_PENDING) return (struct async *)grab_object( async ); + return NULL; +} + /* cancels all async I/O */ DECL_HANDLER(cancel_async) { diff --git a/server/file.h b/server/file.h index 8e906d3..398733c 100644 --- a/server/file.h +++ b/server/file.h @@ -188,6 +188,7 @@ extern struct completion *fd_get_completion( struct fd *fd, apc_param_t *p_key ) extern void fd_copy_completion( struct fd *src, struct fd *dst ); extern struct iosb *create_iosb( const void *in_data, data_size_t in_size, data_size_t out_size ); extern struct iosb *async_get_iosb( struct async *async ); +extern struct async *find_pending_async( struct async_queue *queue ); extern void cancel_process_asyncs( struct process *process ); /* access rights that require Unix read permission */ diff --git a/server/named_pipe.c b/server/named_pipe.c index 85521e0..e83f773 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -81,6 +81,7 @@ struct pipe_end struct pipe_end *connection; /* the other end of the pipe */ data_size_t buffer_size;/* size of buffered data that doesn't block caller */ struct list message_queue; + struct async_queue *read_q; /* read queue */ struct async_queue *write_q; /* write queue */ }; @@ -425,6 +426,7 @@ static void pipe_end_disconnect( struct pipe_end *pipe_end, unsigned int status struct pipe_message *message, *next; struct async *async; if (pipe_end->fd) fd_async_wake_up( pipe_end->fd, ASYNC_TYPE_WAIT, status ); + async_wake_up( pipe_end->read_q, status ); LIST_FOR_EACH_ENTRY_SAFE( message, next, &pipe_end->message_queue, struct pipe_message, entry ) { async = message->async; @@ -470,6 +472,7 @@ static void pipe_end_destroy( struct pipe_end *pipe_end ) free_message( message ); } + free_async_queue( pipe_end->read_q ); free_async_queue( pipe_end->write_q ); } @@ -681,10 +684,89 @@ static obj_handle_t pipe_client_flush( struct fd *fd, struct async *async, int b return 0; } +static void message_queue_read( struct pipe_end *pipe_end, struct iosb *iosb ) +{ + struct pipe_message *message; + data_size_t avail = 0; + + LIST_FOR_EACH_ENTRY( message, &pipe_end->message_queue, struct pipe_message, entry ) + { + avail += message->iosb->in_size - message->read_pos; + if (avail >= iosb->out_size) break; + } + iosb->out_size = min( iosb->out_size, avail ); + iosb->status = STATUS_SUCCESS; + + message = LIST_ENTRY( list_head(&pipe_end->message_queue), struct pipe_message, entry ); + if (!message->read_pos && message->iosb->in_size == iosb->out_size) /* fast path */ + { + iosb->out_data = message->iosb->in_data; + message->iosb->in_data = NULL; + wake_message( message ); + free_message( message ); + } + else + { + data_size_t write_pos = 0, writing; + char *buf = NULL; + + if (iosb->out_size && !(buf = iosb->out_data = malloc( iosb->out_size ))) + { + iosb->out_size = 0; + iosb->status = STATUS_NO_MEMORY; + return; + } + + do + { + message = LIST_ENTRY( list_head(&pipe_end->message_queue), struct pipe_message, entry ); + writing = min( iosb->out_size - write_pos, message->iosb->in_size - message->read_pos ); + if (writing) memcpy( buf + write_pos, (const char *)message->iosb->in_data + message->read_pos, writing ); + write_pos += writing; + message->read_pos += writing; + if (message->read_pos == message->iosb->in_size) + { + wake_message(message); + free_message(message); + } + } while (write_pos < iosb->out_size); + } + iosb->result = iosb->out_size; +} + /* We call async_terminate in our reselect implementation, which causes recursive reselect. * We're not interested in such reselect calls, so we ignore them. */ static int ignore_reselect; +static void reselect_write_queue( struct pipe_end *pipe_end ); + +static void reselect_read_queue( struct pipe_end *pipe_end ) +{ + struct async *async; + struct iosb *iosb; + int read_done = 0; + + ignore_reselect = 1; + while (!list_empty( &pipe_end->message_queue) && (async = find_pending_async( pipe_end->read_q ))) + { + iosb = async_get_iosb( async ); + message_queue_read( pipe_end, iosb ); + async_terminate( async, iosb->result ? STATUS_ALERTED : iosb->status ); + release_object( async ); + release_object( iosb ); + read_done = 1; + } + ignore_reselect = 0; + + if (pipe_end->connection) + { + if (list_empty( &pipe_end->message_queue )) + fd_async_wake_up( pipe_end->connection->fd, ASYNC_TYPE_WAIT, STATUS_SUCCESS ); + else if (read_done) + reselect_write_queue( pipe_end->connection ); + } +} + static void reselect_write_queue( struct pipe_end *pipe_end ) { struct pipe_message *message, *next; @@ -777,6 +859,8 @@ static void pipe_end_reselect_async( struct fd *fd, struct async_queue *queue ) default_fd_reselect_async( fd, queue ); else if (pipe_end->write_q && pipe_end->write_q == queue) reselect_write_queue( pipe_end ); + else if (pipe_end->read_q && pipe_end->read_q == queue) + reselect_read_queue( pipe_end ); } static inline int is_overlapped( unsigned int options ) @@ -937,6 +1021,7 @@ static void init_pipe_end( struct pipe_end *pipe_end, unsigned int pipe_flags, d pipe_end->flags = pipe_flags; pipe_end->connection = NULL; pipe_end->buffer_size = buffer_size; + pipe_end->read_q = NULL; pipe_end->write_q = NULL; list_init( &pipe_end->message_queue ); }

1 0