April 2018 - Wine-Devel - list.winehq.org

[PATCH appdb] Re-enable staging checkbox for new test reports
by Rosanne DiMesio April 11, 2018

April 11, 2018

Reverts 6150f43320843dd39da749437a7d73a9374a609e. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> --- include/testData.php | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/include/testData.php b/include/testData.php index cec7fec..2b6dbff 100644 --- a/include/testData.php +++ b/include/testData.php @@ -921,14 +921,11 @@ class testData{ echo "<span>Version not listed? Your Wine is too old, <a href=\"//winehq.org/download\">upgrade!</a></span><br>"; // Checkbox for Wine-staging echo '<label class="btn btn-secondary">'; - if($this->sState != 'accepted') - echo '<input type="checkbox" name="iStaging" value="1" disabled>'; + if($this->iStaging != 0) + echo '<input type="checkbox" name="iStaging" value="1" checked>'; else - if($this->iStaging != 0) - echo '<input type="checkbox" name="iStaging" value="1" checked>'; - else - echo '<input type="checkbox" name="iStaging" value="1">'; - echo ' Wine-staging <i>(discontinued; last official release was 2.21)</i>'; + echo '<input type="checkbox" name="iStaging" value="1">'; + echo ' Wine-staging'; echo '</label>'; echo '</td></tr>',"\n"; -- 2.12.3

1 0

[PATCH] wine.inf.in: create catroot-directory by default
by Louis Lenders April 11, 2018

April 11, 2018

This fixes https://bugs.winehq.org/show_bug.cgi?id=44944 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 3c55125..0df7622 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2580,6 +2580,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 10,inf, 10,logs, 10,temp, +11,catroot, 11,mui, 11,tasks, 11,spool\drivers\color, -- 2.7.4

1 0

Responder: Re: [PATCH 1/2] tools/make_unicode: Implement full Unicode character decomposition.
by sdelreal＠codeweavers.com April 11, 2018

April 11, 2018

---- Huw Davies escribió ---- > On Tue, Apr 10, 2018 at 04:25:54PM -0500, Sergio Gómez Del Real wrote: > > Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> > > --- > > libs/port/mbtowc.c | 14 +- > > tools/make_unicode | 423 +++++++++++++++++++++++++++++++++++++++++++++-------- > > 2 files changed, 370 insertions(+), 67 deletions(-) > > What this patch is doing is to add a 'compat' flag to wine_decompose() > and then always call that function with that flag set. So essentially > you've added a bunch of dead code (the compat not set case). > > The patch needs to make some material difference to the Wine's > implementation of the Win32 api, preferably demonstrated by a test; it > currently does not do that. > > Similar comments could be made about patch [2/2]. > > Huw. Yes, it effectively replaces wine_decompose with wine_unicode_decompose_string adding, among other things, the flag that tells it to use canonical or compatibility decomposition. In these patches, only the existing code in mbtowc.c use it; it already was using wine_unicode. Because it uses only canonical decomposition, there is no case in these patches for compatibility. The thing is that the third patch I have, which implements NormalizeString (and make full use of the mentioned flag) wouldn't work in Wine without first running the make_unicode script. I could send the whole patchset with this in mind.

1 0

[PATCH] user32: Add stub for EnableMouseInPointer().
by Józef Kucia April 11, 2018

April 11, 2018

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/user32/input.c | 11 +++++++++++ dlls/user32/user32.spec | 1 + 2 files changed, 12 insertions(+) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index ce4b13f926e1..19d1ec9d1dce 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -1514,3 +1514,14 @@ int WINAPI GetMouseMovePointsEx(UINT size, LPMOUSEMOVEPOINT ptin, LPMOUSEMOVEPOI SetLastError(ERROR_POINT_NOT_FOUND); return -1; } + +/*********************************************************************** + * EnableMouseInPointer (USER32.@) + */ +BOOL WINAPI EnableMouseInPointer(BOOL enable) +{ + FIXME("(%#x) stub\n", enable); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index d407a18f73ce..6d8a34b940be 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -203,6 +203,7 @@ @ stdcall EditWndProc(long long long long) EditWndProcA @ stdcall EmptyClipboard() @ stdcall EnableMenuItem(long long long) +@ stdcall EnableMouseInPointer(long) @ stdcall EnableScrollBar(long long long) @ stdcall EnableWindow(long long) @ stdcall EndDeferWindowPos(long) -- 2.16.1

1 0

[PATCH v2 2/2] kernel32: Add stub implementations of GetNamedPipeClient/ServerSessionId.
by Hans Leidekker April 11, 2018

April 11, 2018

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/kernel32/kernel32.spec | 4 +- dlls/kernel32/sync.c | 24 +++++++ dlls/kernel32/tests/pipe.c | 154 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 180 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index a3ecdf9f2f..b28fca1f55 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -728,12 +728,12 @@ # @ stub GetNamedPipeClientComputerNameA # @ stub GetNamedPipeClientComputerNameW @ stdcall GetNamedPipeClientProcessId(long ptr) -# @ stub GetNamedPipeClientSessionId +@ stdcall GetNamedPipeClientSessionId(long ptr) @ stdcall GetNamedPipeHandleStateA(long ptr ptr ptr ptr str long) @ stdcall GetNamedPipeHandleStateW(long ptr ptr ptr ptr wstr long) @ stdcall GetNamedPipeInfo(long ptr ptr ptr ptr) @ stdcall GetNamedPipeServerProcessId(long ptr) -# @ stub GetNamedPipeServerSessionId +@ stdcall GetNamedPipeServerSessionId(long ptr) @ stdcall GetNativeSystemInfo(ptr) @ stdcall -arch=x86_64 GetNextUmsListItem(ptr) @ stub GetNextVDMCommand diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 04e9779664..343998eeed 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1827,6 +1827,30 @@ BOOL WINAPI GetNamedPipeServerProcessId( HANDLE pipe, ULONG *id ) } /*********************************************************************** + * GetNamedPipeClientSessionId (KERNEL32.@) + */ +BOOL WINAPI GetNamedPipeClientSessionId( HANDLE pipe, ULONG *id ) +{ + FIXME( "%p, %p\n", pipe, id ); + + if (!id) return FALSE; + *id = NtCurrentTeb()->Peb->SessionId; + return TRUE; +} + +/*********************************************************************** + * GetNamedPipeServerSessionId (KERNEL32.@) + */ +BOOL WINAPI GetNamedPipeServerSessionId( HANDLE pipe, ULONG *id ) +{ + FIXME( "%p, %p\n", pipe, id ); + + if (!id) return FALSE; + *id = NtCurrentTeb()->Peb->SessionId; + return TRUE; +} + +/*********************************************************************** * GetNamedPipeHandleStateA (KERNEL32.@) */ BOOL WINAPI GetNamedPipeHandleStateA( diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 62f2ee3c2f..13570b032c 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -40,6 +40,8 @@ static DWORD (WINAPI *pQueueUserAPC)(PAPCFUNC pfnAPC, HANDLE hThread, ULONG_PTR static BOOL (WINAPI *pCancelIoEx)(HANDLE handle, LPOVERLAPPED lpOverlapped); static BOOL (WINAPI *pGetNamedPipeClientProcessId)(HANDLE,ULONG*); static BOOL (WINAPI *pGetNamedPipeServerProcessId)(HANDLE,ULONG*); +static BOOL (WINAPI *pGetNamedPipeClientSessionId)(HANDLE,ULONG*); +static BOOL (WINAPI *pGetNamedPipeServerSessionId)(HANDLE,ULONG*); static BOOL user_apc_ran; static void CALLBACK user_apc(ULONG_PTR param) @@ -3449,6 +3451,147 @@ static void test_namedpipe_process_id(void) CloseHandle(server); } +static void child_process_check_session_id(DWORD server_id) +{ + DWORD current; + HANDLE pipe; + ULONG id; + BOOL ret; + + ProcessIdToSessionId(GetProcessId(GetCurrentProcess()), &current); + + pipe = CreateFileA(PIPENAME, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); + ok(pipe != INVALID_HANDLE_VALUE, "got %u\n", GetLastError()); + + id = 0; + ret = pGetNamedPipeClientSessionId(pipe, &id); + ok(ret, "got %u\n", GetLastError()); + ok(id == current, "got %04x\n", id); + + id = 0; + ret = pGetNamedPipeServerSessionId(pipe, &id); + ok(ret, "got %u\n", GetLastError()); + ok(id == server_id, "got %04x expected %04x\n", id, server_id); + CloseHandle(pipe); +} + +static void test_namedpipe_session_id(void) +{ + HANDLE client, server, process; + OVERLAPPED overlapped; + DWORD current; + ULONG id; + BOOL ret; + + if (!pGetNamedPipeClientSessionId) + { + win_skip("GetNamedPipeClientSessionId not available\n"); + return; + } + + ProcessIdToSessionId(GetProcessId(GetCurrentProcess()), &current); + + create_overlapped_pipe(PIPE_TYPE_BYTE, &client, &server); + + SetLastError(0xdeadbeef); + ret = pGetNamedPipeClientSessionId(server, NULL); + ok(!ret, "success\n"); + todo_wine ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError()); + + id = 0; + ret = pGetNamedPipeClientSessionId(server, &id); + ok(ret, "got %u\n", GetLastError()); + ok(id == current, "got %u expected %u\n", id, current); + + id = 0; + ret = pGetNamedPipeClientSessionId(client, &id); + ok(ret, "got %u\n", GetLastError()); + ok(id == current, "got %u expected %u\n", id, current); + + SetLastError(0xdeadbeef); + ret = pGetNamedPipeServerSessionId(server, NULL); + ok(!ret, "success\n"); + todo_wine ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError()); + + id = 0; + ret = pGetNamedPipeServerSessionId(client, &id); + ok(ret, "got %u\n", GetLastError()); + ok(id == current, "got %u expected %u\n", id, current); + + id = 0; + ret = pGetNamedPipeServerSessionId(server, &id); + ok(ret, "got %u\n", GetLastError()); + ok(id == current, "got %u expected %u\n", id, current); + + /* closed client handle */ + CloseHandle(client); + + id = 0; + ret = pGetNamedPipeClientSessionId(server, &id); + ok(ret, "got %u\n", GetLastError()); + ok(id == current, "got %04x expected %04x\n", id, current); + + id = 0; + ret = pGetNamedPipeServerSessionId(server, &id); + ok(ret, "got %u\n", GetLastError()); + ok(id == current, "got %04x expected %04x\n", id, current); + CloseHandle(server); + + /* disconnected server */ + create_overlapped_pipe(PIPE_TYPE_BYTE, &client, &server); + DisconnectNamedPipe(server); + + SetLastError(0xdeadbeef); + ret = pGetNamedPipeClientSessionId(server, &id); + todo_wine ok(!ret, "success\n"); + todo_wine ok(GetLastError() == ERROR_NOT_FOUND, "got %u\n", GetLastError()); + + id = 0; + ret = pGetNamedPipeServerSessionId(server, &id); + ok(ret, "got %u\n", GetLastError()); + ok(id == current, "got %04x expected %04x\n", id, current); + + SetLastError(0xdeadbeef); + ret = pGetNamedPipeClientSessionId(client, &id); + todo_wine ok(!ret, "success\n"); + todo_wine ok(GetLastError() == ERROR_PIPE_NOT_CONNECTED, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetNamedPipeServerSessionId(client, &id); + todo_wine ok(!ret, "success\n"); + todo_wine ok(GetLastError() == ERROR_PIPE_NOT_CONNECTED, "got %u\n", GetLastError()); + CloseHandle(client); + CloseHandle(server); + + /* closed server handle */ + create_overlapped_pipe(PIPE_TYPE_BYTE, &client, &server); + CloseHandle(server); + + id = 0; + ret = pGetNamedPipeClientSessionId(client, &id); + ok(ret, "got %u\n", GetLastError()); + ok(id == current, "got %04x expected %04x\n", id, current); + + id = 0; + ret = pGetNamedPipeServerSessionId(client, &id); + ok(ret, "got %u\n", GetLastError()); + ok(id == current, "got %04x expected %04x\n", id, current); + CloseHandle(client); + + /* different process */ + memset(&overlapped, 0, sizeof(overlapped)); + overlapped.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + server = create_overlapped_server( &overlapped ); + ok(server != INVALID_HANDLE_VALUE, "got %u\n", GetLastError()); + + process = create_check_id_process("checksessionid", current); + winetest_wait_child_process(process); + + CloseHandle(overlapped.hEvent); + CloseHandle(process); + CloseHandle(server); +} + START_TEST(pipe) { char **argv; @@ -3462,6 +3605,8 @@ START_TEST(pipe) pCancelIoEx = (void *) GetProcAddress(hmod, "CancelIoEx"); pGetNamedPipeClientProcessId = (void *) GetProcAddress(hmod, "GetNamedPipeClientProcessId"); pGetNamedPipeServerProcessId = (void *) GetProcAddress(hmod, "GetNamedPipeServerProcessId"); + pGetNamedPipeClientSessionId = (void *) GetProcAddress(hmod, "GetNamedPipeClientSessionId"); + pGetNamedPipeServerSessionId = (void *) GetProcAddress(hmod, "GetNamedPipeServerSessionId"); argc = winetest_get_mainargs(&argv); @@ -3481,6 +3626,14 @@ START_TEST(pipe) child_process_check_pid(pid); return; } + if (!strcmp(argv[2], "checksessionid")) + { + DWORD id; + ProcessIdToSessionId(GetProcessId(GetCurrentProcess()), &id); + sscanf(argv[3], "%x", &id); + child_process_check_session_id(id); + return; + } } if (test_DisconnectNamedPipe()) @@ -3503,4 +3656,5 @@ START_TEST(pipe) test_overlapped_transport(FALSE, FALSE); test_TransactNamedPipe(); test_namedpipe_process_id(); + test_namedpipe_session_id(); } -- 2.11.0

2 1

[PATCH v2 1/2] kernel32: Implement GetNamedPipeClient/ServerProcessId.
by Hans Leidekker April 11, 2018

April 11, 2018

v2: Get rid of a variable and use set_reply_data. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/kernel32/kernel32.spec | 4 +- dlls/kernel32/sync.c | 40 ++++++++++ dlls/kernel32/tests/pipe.c | 189 ++++++++++++++++++++++++++++++++++++++++++-- include/winbase.h | 5 +- include/winioctl.h | 1 + server/named_pipe.c | 42 ++++++++++ 6 files changed, 273 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 2291530ac7..a3ecdf9f2f 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -727,12 +727,12 @@ # @ stub GetNamedPipeAttribute # @ stub GetNamedPipeClientComputerNameA # @ stub GetNamedPipeClientComputerNameW -# @ stub GetNamedPipeClientProcessId +@ stdcall GetNamedPipeClientProcessId(long ptr) # @ stub GetNamedPipeClientSessionId @ stdcall GetNamedPipeHandleStateA(long ptr ptr ptr ptr str long) @ stdcall GetNamedPipeHandleStateW(long ptr ptr ptr ptr wstr long) @ stdcall GetNamedPipeInfo(long ptr ptr ptr ptr) -# @ stub GetNamedPipeServerProcessId +@ stdcall GetNamedPipeServerProcessId(long ptr) # @ stub GetNamedPipeServerSessionId @ stdcall GetNativeSystemInfo(ptr) @ stdcall -arch=x86_64 GetNextUmsListItem(ptr) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index fcf1be7090..04e9779664 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1787,6 +1787,46 @@ BOOL WINAPI GetNamedPipeInfo( } /*********************************************************************** + * GetNamedPipeClientProcessId (KERNEL32.@) + */ +BOOL WINAPI GetNamedPipeClientProcessId( HANDLE pipe, ULONG *id ) +{ + IO_STATUS_BLOCK iosb; + NTSTATUS status; + + TRACE( "%p %p\n", pipe, id ); + + status = NtFsControlFile( pipe, NULL, NULL, NULL, &iosb, FSCTL_PIPE_GET_CONNECTION_ATTRIBUTE, + (void *)"ClientProcessId", sizeof("ClientProcessId"), id, sizeof(*id) ); + if (status) + { + SetLastError( RtlNtStatusToDosError(status) ); + return FALSE; + } + return TRUE; +} + +/*********************************************************************** + * GetNamedPipeServerProcessId (KERNEL32.@) + */ +BOOL WINAPI GetNamedPipeServerProcessId( HANDLE pipe, ULONG *id ) +{ + IO_STATUS_BLOCK iosb; + NTSTATUS status; + + TRACE( "%p, %p\n", pipe, id ); + + status = NtFsControlFile( pipe, NULL, NULL, NULL, &iosb, FSCTL_PIPE_GET_CONNECTION_ATTRIBUTE, + (void *)"ServerProcessId", sizeof("ServerProcessId"), id, sizeof(*id) ); + if (status) + { + SetLastError( RtlNtStatusToDosError(status) ); + return FALSE; + } + return TRUE; +} + +/*********************************************************************** * GetNamedPipeHandleStateA (KERNEL32.@) */ BOOL WINAPI GetNamedPipeHandleStateA( diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 72928ff371..62f2ee3c2f 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -38,6 +38,8 @@ static BOOL (WINAPI *pDuplicateTokenEx)(HANDLE,DWORD,LPSECURITY_ATTRIBUTES, SECURITY_IMPERSONATION_LEVEL,TOKEN_TYPE,PHANDLE); static DWORD (WINAPI *pQueueUserAPC)(PAPCFUNC pfnAPC, HANDLE hThread, ULONG_PTR dwData); static BOOL (WINAPI *pCancelIoEx)(HANDLE handle, LPOVERLAPPED lpOverlapped); +static BOOL (WINAPI *pGetNamedPipeClientProcessId)(HANDLE,ULONG*); +static BOOL (WINAPI *pGetNamedPipeServerProcessId)(HANDLE,ULONG*); static BOOL user_apc_ran; static void CALLBACK user_apc(ULONG_PTR param) @@ -3283,6 +3285,170 @@ static void test_TransactNamedPipe(void) CloseHandle(server); } +static HANDLE create_overlapped_server( OVERLAPPED *overlapped ) +{ + HANDLE pipe; + BOOL ret; + + pipe = CreateNamedPipeA(PIPENAME, FILE_FLAG_OVERLAPPED | PIPE_ACCESS_DUPLEX, PIPE_READMODE_BYTE | PIPE_WAIT, + 1, 5000, 6000, NMPWAIT_USE_DEFAULT_WAIT, NULL); + ok(pipe != INVALID_HANDLE_VALUE, "got %u\n", GetLastError()); + ret = ConnectNamedPipe(pipe, overlapped); + ok(!ret && GetLastError() == ERROR_IO_PENDING, "got %u\n", GetLastError()); + return pipe; +} + +static void child_process_check_pid(DWORD server_pid) +{ + DWORD current = GetProcessId(GetCurrentProcess()); + HANDLE pipe; + ULONG pid; + BOOL ret; + + pipe = CreateFileA(PIPENAME, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); + ok(pipe != INVALID_HANDLE_VALUE, "got %u\n", GetLastError()); + + pid = 0; + ret = pGetNamedPipeClientProcessId(pipe, &pid); + ok(ret, "got %u\n", GetLastError()); + ok(pid == current, "got %04x\n", pid); + + pid = 0; + ret = pGetNamedPipeServerProcessId(pipe, &pid); + ok(ret, "got %u\n", GetLastError()); + ok(pid == server_pid, "got %04x expected %04x\n", pid, server_pid); + CloseHandle(pipe); +} + +static HANDLE create_check_id_process(const char *verb, DWORD id) +{ + STARTUPINFOA si = {sizeof(si)}; + PROCESS_INFORMATION info; + char **argv, buf[MAX_PATH]; + BOOL ret; + + winetest_get_mainargs(&argv); + sprintf(buf, "\"%s\" pipe %s %x", argv[0], verb, id); + ret = CreateProcessA(NULL, buf, NULL, NULL, TRUE, 0, NULL, NULL, &si, &info); + ok(ret, "got %u\n", GetLastError()); + CloseHandle(info.hThread); + return info.hProcess; +} + +static void test_namedpipe_process_id(void) +{ + HANDLE client, server, process; + DWORD current = GetProcessId(GetCurrentProcess()); + OVERLAPPED overlapped; + ULONG pid; + BOOL ret; + + if (!pGetNamedPipeClientProcessId) + { + win_skip("GetNamedPipeClientProcessId not available\n"); + return; + } + + create_overlapped_pipe(PIPE_TYPE_BYTE, &client, &server); + + SetLastError(0xdeadbeef); + ret = pGetNamedPipeClientProcessId(server, NULL); + ok(!ret, "success\n"); + todo_wine ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError()); + + pid = 0; + ret = pGetNamedPipeClientProcessId(server, &pid); + ok(ret, "got %u\n", GetLastError()); + ok(pid == current, "got %04x expected %04x\n", pid, current); + + pid = 0; + ret = pGetNamedPipeClientProcessId(client, &pid); + ok(ret, "got %u\n", GetLastError()); + ok(pid == current, "got %04x expected %04x\n", pid, current); + + SetLastError(0xdeadbeef); + ret = pGetNamedPipeServerProcessId(server, NULL); + ok(!ret, "success\n"); + todo_wine ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError()); + + pid = 0; + ret = pGetNamedPipeServerProcessId(client, &pid); + ok(ret, "got %u\n", GetLastError()); + ok(pid == current, "got %04x expected %04x\n", pid, current); + + pid = 0; + ret = pGetNamedPipeServerProcessId(server, &pid); + ok(ret, "got %u\n", GetLastError()); + ok(pid == current, "got %04x expected %04x\n", pid, current); + + /* closed client handle */ + CloseHandle(client); + pid = 0; + ret = pGetNamedPipeClientProcessId(server, &pid); + ok(ret, "got %u\n", GetLastError()); + ok(pid == current, "got %04x expected %04x\n", pid, current); + + pid = 0; + ret = pGetNamedPipeServerProcessId(server, &pid); + ok(ret, "got %u\n", GetLastError()); + ok(pid == current, "got %04x expected %04x\n", pid, current); + CloseHandle(server); + + /* disconnected server */ + create_overlapped_pipe(PIPE_TYPE_BYTE, &client, &server); + DisconnectNamedPipe(server); + + SetLastError(0xdeadbeef); + ret = pGetNamedPipeClientProcessId(server, &pid); + todo_wine ok(!ret, "success\n"); + todo_wine ok(GetLastError() == ERROR_NOT_FOUND, "got %u\n", GetLastError()); + + pid = 0; + ret = pGetNamedPipeServerProcessId(server, &pid); + ok(ret, "got %u\n", GetLastError()); + ok(pid == current, "got %04x expected %04x\n", pid, current); + + SetLastError(0xdeadbeef); + ret = pGetNamedPipeClientProcessId(client, &pid); + todo_wine ok(!ret, "success\n"); + todo_wine ok(GetLastError() == ERROR_PIPE_NOT_CONNECTED, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetNamedPipeServerProcessId(client, &pid); + todo_wine ok(!ret, "success\n"); + todo_wine ok(GetLastError() == ERROR_PIPE_NOT_CONNECTED, "got %u\n", GetLastError()); + CloseHandle(client); + CloseHandle(server); + + /* closed server handle */ + create_overlapped_pipe(PIPE_TYPE_BYTE, &client, &server); + CloseHandle(server); + + pid = 0; + ret = pGetNamedPipeClientProcessId(client, &pid); + ok(ret, "got %u\n", GetLastError()); + ok(pid == current, "got %04x expected %04x\n", pid, current); + + pid = 0; + ret = pGetNamedPipeServerProcessId(client, &pid); + ok(ret, "got %u\n", GetLastError()); + ok(pid == current, "got %04x expected %04x\n", pid, current); + CloseHandle(client); + + /* different process */ + memset(&overlapped, 0, sizeof(overlapped)); + overlapped.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + server = create_overlapped_server( &overlapped ); + ok(server != INVALID_HANDLE_VALUE, "got %u\n", GetLastError()); + + process = create_check_id_process("checkpid", GetProcessId(GetCurrentProcess())); + winetest_wait_child_process(process); + + CloseHandle(overlapped.hEvent); + CloseHandle(process); + CloseHandle(server); +} + START_TEST(pipe) { char **argv; @@ -3294,15 +3460,27 @@ START_TEST(pipe) hmod = GetModuleHandleA("kernel32.dll"); pQueueUserAPC = (void *) GetProcAddress(hmod, "QueueUserAPC"); pCancelIoEx = (void *) GetProcAddress(hmod, "CancelIoEx"); + pGetNamedPipeClientProcessId = (void *) GetProcAddress(hmod, "GetNamedPipeClientProcessId"); + pGetNamedPipeServerProcessId = (void *) GetProcAddress(hmod, "GetNamedPipeServerProcessId"); argc = winetest_get_mainargs(&argv); - if (argc > 3 && !strcmp(argv[2], "writepipe")) + if (argc > 3) { - UINT_PTR handle; - sscanf(argv[3], "%lx", &handle); - child_process_write_pipe((HANDLE)handle); - return; + if (!strcmp(argv[2], "writepipe")) + { + UINT_PTR handle; + sscanf(argv[3], "%lx", &handle); + child_process_write_pipe((HANDLE)handle); + return; + } + if (!strcmp(argv[2], "checkpid")) + { + DWORD pid = GetProcessId(GetCurrentProcess()); + sscanf(argv[3], "%x", &pid); + child_process_check_pid(pid); + return; + } } if (test_DisconnectNamedPipe()) @@ -3324,4 +3502,5 @@ START_TEST(pipe) test_overlapped_transport(TRUE, TRUE); test_overlapped_transport(FALSE, FALSE); test_TransactNamedPipe(); + test_namedpipe_process_id(); } diff --git a/include/winbase.h b/include/winbase.h index 02e4194a37..4cc2c7e28f 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2141,11 +2141,14 @@ WINBASEAPI HMODULE WINAPI GetModuleHandleW(LPCWSTR); WINBASEAPI BOOL WINAPI GetModuleHandleExA(DWORD,LPCSTR,HMODULE*); WINBASEAPI BOOL WINAPI GetModuleHandleExW(DWORD,LPCWSTR,HMODULE*); #define GetModuleHandleEx WINELIB_NAME_AW(GetModuleHandleEx) +WINBASEAPI BOOL WINAPI GetNamedPipeClientProcessId(HANDLE,PULONG); +WINBASEAPI BOOL WINAPI GetNamedPipeClientSessionId(HANDLE,PULONG); WINBASEAPI BOOL WINAPI GetNamedPipeHandleStateA(HANDLE,LPDWORD,LPDWORD,LPDWORD,LPDWORD,LPSTR,DWORD); WINBASEAPI BOOL WINAPI GetNamedPipeHandleStateW(HANDLE,LPDWORD,LPDWORD,LPDWORD,LPDWORD,LPWSTR,DWORD); #define GetNamedPipeHandleState WINELIB_NAME_AW(GetNamedPipeHandleState) WINBASEAPI BOOL WINAPI GetNamedPipeInfo(HANDLE,LPDWORD,LPDWORD,LPDWORD,LPDWORD); -WINBASEAPI BOOL WINAPI GetNamedPipeClientProcessId(HANDLE,PULONG); +WINBASEAPI BOOL WINAPI GetNamedPipeServerProcessId(HANDLE,PULONG); +WINBASEAPI BOOL WINAPI GetNamedPipeServerSessionId(HANDLE,PULONG); WINBASEAPI VOID WINAPI GetNativeSystemInfo(LPSYSTEM_INFO); WINBASEAPI PUMS_CONTEXT WINAPI GetNextUmsListItem(PUMS_CONTEXT); WINBASEAPI BOOL WINAPI GetNumaProcessorNode(UCHAR,PUCHAR); diff --git a/include/winioctl.h b/include/winioctl.h index 269f771b57..7699579183 100644 --- a/include/winioctl.h +++ b/include/winioctl.h @@ -200,6 +200,7 @@ #define FSCTL_PIPE_IMPERSONATE CTL_CODE(FILE_DEVICE_NAMED_PIPE, 7, METHOD_BUFFERED, FILE_ANY_ACCESS) #define FSCTL_PIPE_SET_CLIENT_PROCESS CTL_CODE(FILE_DEVICE_NAMED_PIPE, 8, METHOD_BUFFERED, FILE_ANY_ACCESS) #define FSCTL_PIPE_QUERY_CLIENT_PROCESS CTL_CODE(FILE_DEVICE_NAMED_PIPE, 9, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_PIPE_GET_CONNECTION_ATTRIBUTE CTL_CODE(FILE_DEVICE_NAMED_PIPE, 12, METHOD_BUFFERED, FILE_ANY_ACCESS) #define FSCTL_PIPE_INTERNAL_READ CTL_CODE(FILE_DEVICE_NAMED_PIPE, 2045, METHOD_BUFFERED, FILE_READ_DATA) #define FSCTL_PIPE_INTERNAL_WRITE CTL_CODE(FILE_DEVICE_NAMED_PIPE, 2046, METHOD_BUFFERED, FILE_WRITE_DATA) #define FSCTL_PIPE_INTERNAL_TRANSCEIVE CTL_CODE(FILE_DEVICE_NAMED_PIPE, 2047, METHOD_NEITHER, FILE_READ_DATA | FILE_WRITE_DATA) diff --git a/server/named_pipe.c b/server/named_pipe.c index 3d260c792b..a1f3723729 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -40,6 +40,7 @@ #include "thread.h" #include "request.h" #include "security.h" +#include "process.h" enum pipe_state { @@ -66,6 +67,8 @@ struct pipe_end struct fd *fd; /* pipe file descriptor */ unsigned int flags; /* pipe flags */ struct pipe_end *connection; /* the other end of the pipe */ + process_id_t client_pid; /* process that created the client */ + process_id_t server_pid; /* process that created the server */ 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 */ @@ -940,10 +943,45 @@ static int pipe_end_transceive( struct pipe_end *pipe_end, struct async *async ) return 1; } +static int pipe_end_get_connection_attribute( struct pipe_end *pipe_end ) +{ + const char *attr = get_req_data(); + data_size_t value_size, attr_size = get_req_data_size(); + void *value; + + if (attr_size == sizeof("ClientProcessId") && !memcmp( attr, "ClientProcessId", attr_size )) + { + value = &pipe_end->client_pid; + value_size = sizeof(pipe_end->client_pid); + } + else if (attr_size == sizeof("ServerProcessId") && !memcmp( attr, "ServerProcessId", attr_size )) + { + value = &pipe_end->server_pid; + value_size = sizeof(pipe_end->server_pid); + } + else + { + set_error( STATUS_ILLEGAL_FUNCTION ); + return 0; + } + + if (get_reply_max_size() < value_size) + { + set_error( STATUS_INFO_LENGTH_MISMATCH ); + return 0; + } + + set_reply_data( value, value_size ); + return 1; +} + static int pipe_end_ioctl( struct pipe_end *pipe_end, ioctl_code_t code, struct async *async ) { switch(code) { + case FSCTL_PIPE_GET_CONNECTION_ATTRIBUTE: + return pipe_end_get_connection_attribute( pipe_end ); + case FSCTL_PIPE_PEEK: return pipe_end_peek( pipe_end ); @@ -1062,6 +1100,7 @@ static struct pipe_server *create_pipe_server( struct named_pipe *pipe, unsigned server->client = NULL; server->options = options; init_pipe_end( &server->pipe_end, pipe_flags, pipe->insize ); + server->pipe_end.server_pid = get_process_id( current->process ); list_add_head( &pipe->servers, &server->entry ); grab_object( pipe ); @@ -1087,6 +1126,7 @@ static struct pipe_client *create_pipe_client( unsigned int flags, unsigned int client->server = NULL; client->flags = flags; init_pipe_end( &client->pipe_end, pipe_flags, buffer_size ); + client->pipe_end.client_pid = get_process_id( current->process ); client->pipe_end.fd = alloc_pseudo_fd( &pipe_client_fd_ops, &client->pipe_end.obj, options ); if (!client->pipe_end.fd) @@ -1169,6 +1209,8 @@ static struct object *named_pipe_open_file( struct object *obj, unsigned int acc client->server = server; server->pipe_end.connection = &client->pipe_end; client->pipe_end.connection = &server->pipe_end; + server->pipe_end.client_pid = client->pipe_end.client_pid; + client->pipe_end.server_pid = server->pipe_end.server_pid; } release_object( server ); return &client->pipe_end.obj; -- 2.11.0

2 1

[PATCH 1/3] kernel32/tests: Fix typos.
by Hans Leidekker April 11, 2018

April 11, 2018

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/kernel32/tests/pipe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index fa677cfdf9..72928ff371 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -3086,7 +3086,7 @@ static void create_overlapped_pipe(DWORD mode, HANDLE *client, HANDLE *server) *server = CreateNamedPipeA(PIPENAME, FILE_FLAG_OVERLAPPED | PIPE_ACCESS_DUPLEX, PIPE_WAIT | mode, 1, 5000, 6000, NMPWAIT_USE_DEFAULT_WAIT, NULL); - ok(&server != INVALID_HANDLE_VALUE, "CreateNamedPipe failed: %u\n", GetLastError()); + ok(*server != INVALID_HANDLE_VALUE, "CreateNamedPipe failed: %u\n", GetLastError()); test_signaled(*server); memset(&overlapped, 0, sizeof(overlapped)); @@ -3097,7 +3097,7 @@ static void create_overlapped_pipe(DWORD mode, HANDLE *client, HANDLE *server) test_not_signaled(overlapped.hEvent); *client = CreateFileA(PIPENAME, GENERIC_READ | GENERIC_WRITE, 0, &sec_attr, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL); - ok(*server != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); + ok(*client != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); res = SetNamedPipeHandleState(*client, &read_mode, NULL, NULL); ok(res, "SetNamedPipeHandleState failed: %u\n", GetLastError()); -- 2.11.0

3 2

[PATCH 2/3] kernel32: Implement GetNamedPipeClient/ServerProcessId.
by Hans Leidekker April 11, 2018

April 11, 2018

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/kernel32/kernel32.spec | 4 +- dlls/kernel32/sync.c | 40 ++++++++++ dlls/kernel32/tests/pipe.c | 189 ++++++++++++++++++++++++++++++++++++++++++-- include/winbase.h | 5 +- include/winioctl.h | 1 + server/named_pipe.c | 45 +++++++++++ 6 files changed, 276 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 2291530ac7..a3ecdf9f2f 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -727,12 +727,12 @@ # @ stub GetNamedPipeAttribute # @ stub GetNamedPipeClientComputerNameA # @ stub GetNamedPipeClientComputerNameW -# @ stub GetNamedPipeClientProcessId +@ stdcall GetNamedPipeClientProcessId(long ptr) # @ stub GetNamedPipeClientSessionId @ stdcall GetNamedPipeHandleStateA(long ptr ptr ptr ptr str long) @ stdcall GetNamedPipeHandleStateW(long ptr ptr ptr ptr wstr long) @ stdcall GetNamedPipeInfo(long ptr ptr ptr ptr) -# @ stub GetNamedPipeServerProcessId +@ stdcall GetNamedPipeServerProcessId(long ptr) # @ stub GetNamedPipeServerSessionId @ stdcall GetNativeSystemInfo(ptr) @ stdcall -arch=x86_64 GetNextUmsListItem(ptr) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index fcf1be7090..04e9779664 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1787,6 +1787,46 @@ BOOL WINAPI GetNamedPipeInfo( } /*********************************************************************** + * GetNamedPipeClientProcessId (KERNEL32.@) + */ +BOOL WINAPI GetNamedPipeClientProcessId( HANDLE pipe, ULONG *id ) +{ + IO_STATUS_BLOCK iosb; + NTSTATUS status; + + TRACE( "%p %p\n", pipe, id ); + + status = NtFsControlFile( pipe, NULL, NULL, NULL, &iosb, FSCTL_PIPE_GET_CONNECTION_ATTRIBUTE, + (void *)"ClientProcessId", sizeof("ClientProcessId"), id, sizeof(*id) ); + if (status) + { + SetLastError( RtlNtStatusToDosError(status) ); + return FALSE; + } + return TRUE; +} + +/*********************************************************************** + * GetNamedPipeServerProcessId (KERNEL32.@) + */ +BOOL WINAPI GetNamedPipeServerProcessId( HANDLE pipe, ULONG *id ) +{ + IO_STATUS_BLOCK iosb; + NTSTATUS status; + + TRACE( "%p, %p\n", pipe, id ); + + status = NtFsControlFile( pipe, NULL, NULL, NULL, &iosb, FSCTL_PIPE_GET_CONNECTION_ATTRIBUTE, + (void *)"ServerProcessId", sizeof("ServerProcessId"), id, sizeof(*id) ); + if (status) + { + SetLastError( RtlNtStatusToDosError(status) ); + return FALSE; + } + return TRUE; +} + +/*********************************************************************** * GetNamedPipeHandleStateA (KERNEL32.@) */ BOOL WINAPI GetNamedPipeHandleStateA( diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 72928ff371..62f2ee3c2f 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -38,6 +38,8 @@ static BOOL (WINAPI *pDuplicateTokenEx)(HANDLE,DWORD,LPSECURITY_ATTRIBUTES, SECURITY_IMPERSONATION_LEVEL,TOKEN_TYPE,PHANDLE); static DWORD (WINAPI *pQueueUserAPC)(PAPCFUNC pfnAPC, HANDLE hThread, ULONG_PTR dwData); static BOOL (WINAPI *pCancelIoEx)(HANDLE handle, LPOVERLAPPED lpOverlapped); +static BOOL (WINAPI *pGetNamedPipeClientProcessId)(HANDLE,ULONG*); +static BOOL (WINAPI *pGetNamedPipeServerProcessId)(HANDLE,ULONG*); static BOOL user_apc_ran; static void CALLBACK user_apc(ULONG_PTR param) @@ -3283,6 +3285,170 @@ static void test_TransactNamedPipe(void) CloseHandle(server); } +static HANDLE create_overlapped_server( OVERLAPPED *overlapped ) +{ + HANDLE pipe; + BOOL ret; + + pipe = CreateNamedPipeA(PIPENAME, FILE_FLAG_OVERLAPPED | PIPE_ACCESS_DUPLEX, PIPE_READMODE_BYTE | PIPE_WAIT, + 1, 5000, 6000, NMPWAIT_USE_DEFAULT_WAIT, NULL); + ok(pipe != INVALID_HANDLE_VALUE, "got %u\n", GetLastError()); + ret = ConnectNamedPipe(pipe, overlapped); + ok(!ret && GetLastError() == ERROR_IO_PENDING, "got %u\n", GetLastError()); + return pipe; +} + +static void child_process_check_pid(DWORD server_pid) +{ + DWORD current = GetProcessId(GetCurrentProcess()); + HANDLE pipe; + ULONG pid; + BOOL ret; + + pipe = CreateFileA(PIPENAME, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); + ok(pipe != INVALID_HANDLE_VALUE, "got %u\n", GetLastError()); + + pid = 0; + ret = pGetNamedPipeClientProcessId(pipe, &pid); + ok(ret, "got %u\n", GetLastError()); + ok(pid == current, "got %04x\n", pid); + + pid = 0; + ret = pGetNamedPipeServerProcessId(pipe, &pid); + ok(ret, "got %u\n", GetLastError()); + ok(pid == server_pid, "got %04x expected %04x\n", pid, server_pid); + CloseHandle(pipe); +} + +static HANDLE create_check_id_process(const char *verb, DWORD id) +{ + STARTUPINFOA si = {sizeof(si)}; + PROCESS_INFORMATION info; + char **argv, buf[MAX_PATH]; + BOOL ret; + + winetest_get_mainargs(&argv); + sprintf(buf, "\"%s\" pipe %s %x", argv[0], verb, id); + ret = CreateProcessA(NULL, buf, NULL, NULL, TRUE, 0, NULL, NULL, &si, &info); + ok(ret, "got %u\n", GetLastError()); + CloseHandle(info.hThread); + return info.hProcess; +} + +static void test_namedpipe_process_id(void) +{ + HANDLE client, server, process; + DWORD current = GetProcessId(GetCurrentProcess()); + OVERLAPPED overlapped; + ULONG pid; + BOOL ret; + + if (!pGetNamedPipeClientProcessId) + { + win_skip("GetNamedPipeClientProcessId not available\n"); + return; + } + + create_overlapped_pipe(PIPE_TYPE_BYTE, &client, &server); + + SetLastError(0xdeadbeef); + ret = pGetNamedPipeClientProcessId(server, NULL); + ok(!ret, "success\n"); + todo_wine ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError()); + + pid = 0; + ret = pGetNamedPipeClientProcessId(server, &pid); + ok(ret, "got %u\n", GetLastError()); + ok(pid == current, "got %04x expected %04x\n", pid, current); + + pid = 0; + ret = pGetNamedPipeClientProcessId(client, &pid); + ok(ret, "got %u\n", GetLastError()); + ok(pid == current, "got %04x expected %04x\n", pid, current); + + SetLastError(0xdeadbeef); + ret = pGetNamedPipeServerProcessId(server, NULL); + ok(!ret, "success\n"); + todo_wine ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError()); + + pid = 0; + ret = pGetNamedPipeServerProcessId(client, &pid); + ok(ret, "got %u\n", GetLastError()); + ok(pid == current, "got %04x expected %04x\n", pid, current); + + pid = 0; + ret = pGetNamedPipeServerProcessId(server, &pid); + ok(ret, "got %u\n", GetLastError()); + ok(pid == current, "got %04x expected %04x\n", pid, current); + + /* closed client handle */ + CloseHandle(client); + pid = 0; + ret = pGetNamedPipeClientProcessId(server, &pid); + ok(ret, "got %u\n", GetLastError()); + ok(pid == current, "got %04x expected %04x\n", pid, current); + + pid = 0; + ret = pGetNamedPipeServerProcessId(server, &pid); + ok(ret, "got %u\n", GetLastError()); + ok(pid == current, "got %04x expected %04x\n", pid, current); + CloseHandle(server); + + /* disconnected server */ + create_overlapped_pipe(PIPE_TYPE_BYTE, &client, &server); + DisconnectNamedPipe(server); + + SetLastError(0xdeadbeef); + ret = pGetNamedPipeClientProcessId(server, &pid); + todo_wine ok(!ret, "success\n"); + todo_wine ok(GetLastError() == ERROR_NOT_FOUND, "got %u\n", GetLastError()); + + pid = 0; + ret = pGetNamedPipeServerProcessId(server, &pid); + ok(ret, "got %u\n", GetLastError()); + ok(pid == current, "got %04x expected %04x\n", pid, current); + + SetLastError(0xdeadbeef); + ret = pGetNamedPipeClientProcessId(client, &pid); + todo_wine ok(!ret, "success\n"); + todo_wine ok(GetLastError() == ERROR_PIPE_NOT_CONNECTED, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetNamedPipeServerProcessId(client, &pid); + todo_wine ok(!ret, "success\n"); + todo_wine ok(GetLastError() == ERROR_PIPE_NOT_CONNECTED, "got %u\n", GetLastError()); + CloseHandle(client); + CloseHandle(server); + + /* closed server handle */ + create_overlapped_pipe(PIPE_TYPE_BYTE, &client, &server); + CloseHandle(server); + + pid = 0; + ret = pGetNamedPipeClientProcessId(client, &pid); + ok(ret, "got %u\n", GetLastError()); + ok(pid == current, "got %04x expected %04x\n", pid, current); + + pid = 0; + ret = pGetNamedPipeServerProcessId(client, &pid); + ok(ret, "got %u\n", GetLastError()); + ok(pid == current, "got %04x expected %04x\n", pid, current); + CloseHandle(client); + + /* different process */ + memset(&overlapped, 0, sizeof(overlapped)); + overlapped.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + server = create_overlapped_server( &overlapped ); + ok(server != INVALID_HANDLE_VALUE, "got %u\n", GetLastError()); + + process = create_check_id_process("checkpid", GetProcessId(GetCurrentProcess())); + winetest_wait_child_process(process); + + CloseHandle(overlapped.hEvent); + CloseHandle(process); + CloseHandle(server); +} + START_TEST(pipe) { char **argv; @@ -3294,15 +3460,27 @@ START_TEST(pipe) hmod = GetModuleHandleA("kernel32.dll"); pQueueUserAPC = (void *) GetProcAddress(hmod, "QueueUserAPC"); pCancelIoEx = (void *) GetProcAddress(hmod, "CancelIoEx"); + pGetNamedPipeClientProcessId = (void *) GetProcAddress(hmod, "GetNamedPipeClientProcessId"); + pGetNamedPipeServerProcessId = (void *) GetProcAddress(hmod, "GetNamedPipeServerProcessId"); argc = winetest_get_mainargs(&argv); - if (argc > 3 && !strcmp(argv[2], "writepipe")) + if (argc > 3) { - UINT_PTR handle; - sscanf(argv[3], "%lx", &handle); - child_process_write_pipe((HANDLE)handle); - return; + if (!strcmp(argv[2], "writepipe")) + { + UINT_PTR handle; + sscanf(argv[3], "%lx", &handle); + child_process_write_pipe((HANDLE)handle); + return; + } + if (!strcmp(argv[2], "checkpid")) + { + DWORD pid = GetProcessId(GetCurrentProcess()); + sscanf(argv[3], "%x", &pid); + child_process_check_pid(pid); + return; + } } if (test_DisconnectNamedPipe()) @@ -3324,4 +3502,5 @@ START_TEST(pipe) test_overlapped_transport(TRUE, TRUE); test_overlapped_transport(FALSE, FALSE); test_TransactNamedPipe(); + test_namedpipe_process_id(); } diff --git a/include/winbase.h b/include/winbase.h index 02e4194a37..4cc2c7e28f 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2141,11 +2141,14 @@ WINBASEAPI HMODULE WINAPI GetModuleHandleW(LPCWSTR); WINBASEAPI BOOL WINAPI GetModuleHandleExA(DWORD,LPCSTR,HMODULE*); WINBASEAPI BOOL WINAPI GetModuleHandleExW(DWORD,LPCWSTR,HMODULE*); #define GetModuleHandleEx WINELIB_NAME_AW(GetModuleHandleEx) +WINBASEAPI BOOL WINAPI GetNamedPipeClientProcessId(HANDLE,PULONG); +WINBASEAPI BOOL WINAPI GetNamedPipeClientSessionId(HANDLE,PULONG); WINBASEAPI BOOL WINAPI GetNamedPipeHandleStateA(HANDLE,LPDWORD,LPDWORD,LPDWORD,LPDWORD,LPSTR,DWORD); WINBASEAPI BOOL WINAPI GetNamedPipeHandleStateW(HANDLE,LPDWORD,LPDWORD,LPDWORD,LPDWORD,LPWSTR,DWORD); #define GetNamedPipeHandleState WINELIB_NAME_AW(GetNamedPipeHandleState) WINBASEAPI BOOL WINAPI GetNamedPipeInfo(HANDLE,LPDWORD,LPDWORD,LPDWORD,LPDWORD); -WINBASEAPI BOOL WINAPI GetNamedPipeClientProcessId(HANDLE,PULONG); +WINBASEAPI BOOL WINAPI GetNamedPipeServerProcessId(HANDLE,PULONG); +WINBASEAPI BOOL WINAPI GetNamedPipeServerSessionId(HANDLE,PULONG); WINBASEAPI VOID WINAPI GetNativeSystemInfo(LPSYSTEM_INFO); WINBASEAPI PUMS_CONTEXT WINAPI GetNextUmsListItem(PUMS_CONTEXT); WINBASEAPI BOOL WINAPI GetNumaProcessorNode(UCHAR,PUCHAR); diff --git a/include/winioctl.h b/include/winioctl.h index 269f771b57..7699579183 100644 --- a/include/winioctl.h +++ b/include/winioctl.h @@ -200,6 +200,7 @@ #define FSCTL_PIPE_IMPERSONATE CTL_CODE(FILE_DEVICE_NAMED_PIPE, 7, METHOD_BUFFERED, FILE_ANY_ACCESS) #define FSCTL_PIPE_SET_CLIENT_PROCESS CTL_CODE(FILE_DEVICE_NAMED_PIPE, 8, METHOD_BUFFERED, FILE_ANY_ACCESS) #define FSCTL_PIPE_QUERY_CLIENT_PROCESS CTL_CODE(FILE_DEVICE_NAMED_PIPE, 9, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_PIPE_GET_CONNECTION_ATTRIBUTE CTL_CODE(FILE_DEVICE_NAMED_PIPE, 12, METHOD_BUFFERED, FILE_ANY_ACCESS) #define FSCTL_PIPE_INTERNAL_READ CTL_CODE(FILE_DEVICE_NAMED_PIPE, 2045, METHOD_BUFFERED, FILE_READ_DATA) #define FSCTL_PIPE_INTERNAL_WRITE CTL_CODE(FILE_DEVICE_NAMED_PIPE, 2046, METHOD_BUFFERED, FILE_WRITE_DATA) #define FSCTL_PIPE_INTERNAL_TRANSCEIVE CTL_CODE(FILE_DEVICE_NAMED_PIPE, 2047, METHOD_NEITHER, FILE_READ_DATA | FILE_WRITE_DATA) diff --git a/server/named_pipe.c b/server/named_pipe.c index 3d260c792b..c30fdcd299 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -40,6 +40,7 @@ #include "thread.h" #include "request.h" #include "security.h" +#include "process.h" enum pipe_state { @@ -66,6 +67,8 @@ struct pipe_end struct fd *fd; /* pipe file descriptor */ unsigned int flags; /* pipe flags */ struct pipe_end *connection; /* the other end of the pipe */ + process_id_t client_pid; /* process that created the client */ + process_id_t server_pid; /* process that created the server */ 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 */ @@ -940,10 +943,48 @@ static int pipe_end_transceive( struct pipe_end *pipe_end, struct async *async ) return 1; } +static int pipe_end_get_connection_attribute( struct pipe_end *pipe_end ) +{ + unsigned reply_size = get_reply_max_size(); + const char *attr = get_req_data(); + data_size_t value_size, attr_size = get_req_data_size(); + void *value, *buffer; + + if (attr_size == sizeof("ClientProcessId") && !memcmp( attr, "ClientProcessId", attr_size )) + { + value = &pipe_end->client_pid; + value_size = sizeof(pipe_end->client_pid); + } + else if (attr_size == sizeof("ServerProcessId") && !memcmp( attr, "ServerProcessId", attr_size )) + { + value = &pipe_end->server_pid; + value_size = sizeof(pipe_end->server_pid); + } + else + { + set_error( STATUS_ILLEGAL_FUNCTION ); + return 0; + } + + if (reply_size < value_size) + { + set_error( STATUS_INFO_LENGTH_MISMATCH ); + return 0; + } + + if (!(buffer = set_reply_data_size( value_size ))) return 0; + memcpy( buffer, value, value_size ); + + return 1; +} + static int pipe_end_ioctl( struct pipe_end *pipe_end, ioctl_code_t code, struct async *async ) { switch(code) { + case FSCTL_PIPE_GET_CONNECTION_ATTRIBUTE: + return pipe_end_get_connection_attribute( pipe_end ); + case FSCTL_PIPE_PEEK: return pipe_end_peek( pipe_end ); @@ -1062,6 +1103,7 @@ static struct pipe_server *create_pipe_server( struct named_pipe *pipe, unsigned server->client = NULL; server->options = options; init_pipe_end( &server->pipe_end, pipe_flags, pipe->insize ); + server->pipe_end.server_pid = get_process_id( current->process ); list_add_head( &pipe->servers, &server->entry ); grab_object( pipe ); @@ -1087,6 +1129,7 @@ static struct pipe_client *create_pipe_client( unsigned int flags, unsigned int client->server = NULL; client->flags = flags; init_pipe_end( &client->pipe_end, pipe_flags, buffer_size ); + client->pipe_end.client_pid = get_process_id( current->process ); client->pipe_end.fd = alloc_pseudo_fd( &pipe_client_fd_ops, &client->pipe_end.obj, options ); if (!client->pipe_end.fd) @@ -1169,6 +1212,8 @@ static struct object *named_pipe_open_file( struct object *obj, unsigned int acc client->server = server; server->pipe_end.connection = &client->pipe_end; client->pipe_end.connection = &server->pipe_end; + server->pipe_end.client_pid = client->pipe_end.client_pid; + client->pipe_end.server_pid = server->pipe_end.server_pid; } release_object( server ); return &client->pipe_end.obj; -- 2.11.0

2 1

[PATCH 3/3] kernel32: Add stub implementations of GetNamedPipeClient/ServerSessionId.
by Hans Leidekker April 11, 2018

April 11, 2018

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/kernel32/kernel32.spec | 4 +- dlls/kernel32/sync.c | 24 +++++++ dlls/kernel32/tests/pipe.c | 154 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 180 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index a3ecdf9f2f..b28fca1f55 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -728,12 +728,12 @@ # @ stub GetNamedPipeClientComputerNameA # @ stub GetNamedPipeClientComputerNameW @ stdcall GetNamedPipeClientProcessId(long ptr) -# @ stub GetNamedPipeClientSessionId +@ stdcall GetNamedPipeClientSessionId(long ptr) @ stdcall GetNamedPipeHandleStateA(long ptr ptr ptr ptr str long) @ stdcall GetNamedPipeHandleStateW(long ptr ptr ptr ptr wstr long) @ stdcall GetNamedPipeInfo(long ptr ptr ptr ptr) @ stdcall GetNamedPipeServerProcessId(long ptr) -# @ stub GetNamedPipeServerSessionId +@ stdcall GetNamedPipeServerSessionId(long ptr) @ stdcall GetNativeSystemInfo(ptr) @ stdcall -arch=x86_64 GetNextUmsListItem(ptr) @ stub GetNextVDMCommand diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 04e9779664..343998eeed 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1827,6 +1827,30 @@ BOOL WINAPI GetNamedPipeServerProcessId( HANDLE pipe, ULONG *id ) } /*********************************************************************** + * GetNamedPipeClientSessionId (KERNEL32.@) + */ +BOOL WINAPI GetNamedPipeClientSessionId( HANDLE pipe, ULONG *id ) +{ + FIXME( "%p, %p\n", pipe, id ); + + if (!id) return FALSE; + *id = NtCurrentTeb()->Peb->SessionId; + return TRUE; +} + +/*********************************************************************** + * GetNamedPipeServerSessionId (KERNEL32.@) + */ +BOOL WINAPI GetNamedPipeServerSessionId( HANDLE pipe, ULONG *id ) +{ + FIXME( "%p, %p\n", pipe, id ); + + if (!id) return FALSE; + *id = NtCurrentTeb()->Peb->SessionId; + return TRUE; +} + +/*********************************************************************** * GetNamedPipeHandleStateA (KERNEL32.@) */ BOOL WINAPI GetNamedPipeHandleStateA( diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 62f2ee3c2f..13570b032c 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -40,6 +40,8 @@ static DWORD (WINAPI *pQueueUserAPC)(PAPCFUNC pfnAPC, HANDLE hThread, ULONG_PTR static BOOL (WINAPI *pCancelIoEx)(HANDLE handle, LPOVERLAPPED lpOverlapped); static BOOL (WINAPI *pGetNamedPipeClientProcessId)(HANDLE,ULONG*); static BOOL (WINAPI *pGetNamedPipeServerProcessId)(HANDLE,ULONG*); +static BOOL (WINAPI *pGetNamedPipeClientSessionId)(HANDLE,ULONG*); +static BOOL (WINAPI *pGetNamedPipeServerSessionId)(HANDLE,ULONG*); static BOOL user_apc_ran; static void CALLBACK user_apc(ULONG_PTR param) @@ -3449,6 +3451,147 @@ static void test_namedpipe_process_id(void) CloseHandle(server); } +static void child_process_check_session_id(DWORD server_id) +{ + DWORD current; + HANDLE pipe; + ULONG id; + BOOL ret; + + ProcessIdToSessionId(GetProcessId(GetCurrentProcess()), &current); + + pipe = CreateFileA(PIPENAME, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); + ok(pipe != INVALID_HANDLE_VALUE, "got %u\n", GetLastError()); + + id = 0; + ret = pGetNamedPipeClientSessionId(pipe, &id); + ok(ret, "got %u\n", GetLastError()); + ok(id == current, "got %04x\n", id); + + id = 0; + ret = pGetNamedPipeServerSessionId(pipe, &id); + ok(ret, "got %u\n", GetLastError()); + ok(id == server_id, "got %04x expected %04x\n", id, server_id); + CloseHandle(pipe); +} + +static void test_namedpipe_session_id(void) +{ + HANDLE client, server, process; + OVERLAPPED overlapped; + DWORD current; + ULONG id; + BOOL ret; + + if (!pGetNamedPipeClientSessionId) + { + win_skip("GetNamedPipeClientSessionId not available\n"); + return; + } + + ProcessIdToSessionId(GetProcessId(GetCurrentProcess()), &current); + + create_overlapped_pipe(PIPE_TYPE_BYTE, &client, &server); + + SetLastError(0xdeadbeef); + ret = pGetNamedPipeClientSessionId(server, NULL); + ok(!ret, "success\n"); + todo_wine ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError()); + + id = 0; + ret = pGetNamedPipeClientSessionId(server, &id); + ok(ret, "got %u\n", GetLastError()); + ok(id == current, "got %u expected %u\n", id, current); + + id = 0; + ret = pGetNamedPipeClientSessionId(client, &id); + ok(ret, "got %u\n", GetLastError()); + ok(id == current, "got %u expected %u\n", id, current); + + SetLastError(0xdeadbeef); + ret = pGetNamedPipeServerSessionId(server, NULL); + ok(!ret, "success\n"); + todo_wine ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError()); + + id = 0; + ret = pGetNamedPipeServerSessionId(client, &id); + ok(ret, "got %u\n", GetLastError()); + ok(id == current, "got %u expected %u\n", id, current); + + id = 0; + ret = pGetNamedPipeServerSessionId(server, &id); + ok(ret, "got %u\n", GetLastError()); + ok(id == current, "got %u expected %u\n", id, current); + + /* closed client handle */ + CloseHandle(client); + + id = 0; + ret = pGetNamedPipeClientSessionId(server, &id); + ok(ret, "got %u\n", GetLastError()); + ok(id == current, "got %04x expected %04x\n", id, current); + + id = 0; + ret = pGetNamedPipeServerSessionId(server, &id); + ok(ret, "got %u\n", GetLastError()); + ok(id == current, "got %04x expected %04x\n", id, current); + CloseHandle(server); + + /* disconnected server */ + create_overlapped_pipe(PIPE_TYPE_BYTE, &client, &server); + DisconnectNamedPipe(server); + + SetLastError(0xdeadbeef); + ret = pGetNamedPipeClientSessionId(server, &id); + todo_wine ok(!ret, "success\n"); + todo_wine ok(GetLastError() == ERROR_NOT_FOUND, "got %u\n", GetLastError()); + + id = 0; + ret = pGetNamedPipeServerSessionId(server, &id); + ok(ret, "got %u\n", GetLastError()); + ok(id == current, "got %04x expected %04x\n", id, current); + + SetLastError(0xdeadbeef); + ret = pGetNamedPipeClientSessionId(client, &id); + todo_wine ok(!ret, "success\n"); + todo_wine ok(GetLastError() == ERROR_PIPE_NOT_CONNECTED, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetNamedPipeServerSessionId(client, &id); + todo_wine ok(!ret, "success\n"); + todo_wine ok(GetLastError() == ERROR_PIPE_NOT_CONNECTED, "got %u\n", GetLastError()); + CloseHandle(client); + CloseHandle(server); + + /* closed server handle */ + create_overlapped_pipe(PIPE_TYPE_BYTE, &client, &server); + CloseHandle(server); + + id = 0; + ret = pGetNamedPipeClientSessionId(client, &id); + ok(ret, "got %u\n", GetLastError()); + ok(id == current, "got %04x expected %04x\n", id, current); + + id = 0; + ret = pGetNamedPipeServerSessionId(client, &id); + ok(ret, "got %u\n", GetLastError()); + ok(id == current, "got %04x expected %04x\n", id, current); + CloseHandle(client); + + /* different process */ + memset(&overlapped, 0, sizeof(overlapped)); + overlapped.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + server = create_overlapped_server( &overlapped ); + ok(server != INVALID_HANDLE_VALUE, "got %u\n", GetLastError()); + + process = create_check_id_process("checksessionid", current); + winetest_wait_child_process(process); + + CloseHandle(overlapped.hEvent); + CloseHandle(process); + CloseHandle(server); +} + START_TEST(pipe) { char **argv; @@ -3462,6 +3605,8 @@ START_TEST(pipe) pCancelIoEx = (void *) GetProcAddress(hmod, "CancelIoEx"); pGetNamedPipeClientProcessId = (void *) GetProcAddress(hmod, "GetNamedPipeClientProcessId"); pGetNamedPipeServerProcessId = (void *) GetProcAddress(hmod, "GetNamedPipeServerProcessId"); + pGetNamedPipeClientSessionId = (void *) GetProcAddress(hmod, "GetNamedPipeClientSessionId"); + pGetNamedPipeServerSessionId = (void *) GetProcAddress(hmod, "GetNamedPipeServerSessionId"); argc = winetest_get_mainargs(&argv); @@ -3481,6 +3626,14 @@ START_TEST(pipe) child_process_check_pid(pid); return; } + if (!strcmp(argv[2], "checksessionid")) + { + DWORD id; + ProcessIdToSessionId(GetProcessId(GetCurrentProcess()), &id); + sscanf(argv[3], "%x", &id); + child_process_check_session_id(id); + return; + } } if (test_DisconnectNamedPipe()) @@ -3503,4 +3656,5 @@ START_TEST(pipe) test_overlapped_transport(FALSE, FALSE); test_TransactNamedPipe(); test_namedpipe_process_id(); + test_namedpipe_session_id(); } -- 2.11.0

1 0

[PATCH 2/2] wtsapi32: Improve the stub for WTSQuerySessionInformationW.
by Hans Leidekker April 11, 2018

April 11, 2018

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wtsapi32/Makefile.in | 1 + dlls/wtsapi32/tests/wtsapi.c | 16 ++++++++++++++++ dlls/wtsapi32/wtsapi32.c | 13 +++++++++++++ include/wtsapi32.h | 1 + 4 files changed, 31 insertions(+) diff --git a/dlls/wtsapi32/Makefile.in b/dlls/wtsapi32/Makefile.in index 784a91c978..e54c088f21 100644 --- a/dlls/wtsapi32/Makefile.in +++ b/dlls/wtsapi32/Makefile.in @@ -1,5 +1,6 @@ MODULE = wtsapi32.dll IMPORTLIB = wtsapi32 +IMPORTS = advapi32 C_SRCS = \ wtsapi32.c diff --git a/dlls/wtsapi32/tests/wtsapi.c b/dlls/wtsapi32/tests/wtsapi.c index 3b7aa1bf09..341d9e605f 100644 --- a/dlls/wtsapi32/tests/wtsapi.c +++ b/dlls/wtsapi32/tests/wtsapi.c @@ -90,7 +90,23 @@ static void test_WTSEnumerateProcessesW(void) WTSFreeMemory(info); } +static void test_WTSQuerySessionInformationW(void) +{ + BOOL ret; + WCHAR *buf; + DWORD count; + + count = 0; + buf = NULL; + ret = WTSQuerySessionInformationW(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, &buf, &count); + ok(ret, "got %u\n", GetLastError()); + ok(buf != NULL, "buf not set\n"); + ok(count == (lstrlenW(buf) + 1) * sizeof(WCHAR), "got %u\n", count); + WTSFreeMemory(buf); +} + START_TEST (wtsapi) { test_WTSEnumerateProcessesW(); + test_WTSQuerySessionInformationW(); } diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index 736e1995b6..5569502977 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -233,6 +233,19 @@ BOOL WINAPI WTSQuerySessionInformationW( FIXME("Stub %p 0x%08x %d %p %p\n", hServer, SessionId, WTSInfoClass, Buffer, BytesReturned); + if (WTSInfoClass == WTSUserName) + { + WCHAR *username; + DWORD count = 0; + + GetUserNameW(NULL, &count); + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) return FALSE; + if (!(username = heap_alloc(count * sizeof(WCHAR)))) return FALSE; + GetUserNameW(username, &count); + *Buffer = username; + *BytesReturned = count * sizeof(WCHAR); + return TRUE; + } return FALSE; } diff --git a/include/wtsapi32.h b/include/wtsapi32.h index 304a418726..f329bd5cf0 100644 --- a/include/wtsapi32.h +++ b/include/wtsapi32.h @@ -136,6 +136,7 @@ DECL_WINELIB_TYPE_AW(WTS_SERVER_INFO) DECL_WINELIB_TYPE_AW(PWTS_SERVER_INFO) #define WTS_CURRENT_SERVER_HANDLE ((HANDLE)NULL) +#define WTS_CURRENT_SESSION (~0u) void WINAPI WTSCloseServer(HANDLE); BOOL WINAPI WTSConnectSessionA(ULONG, ULONG, PSTR, BOOL); -- 2.11.0

1 0