November 2015 - Wine-commits

Nikolay Sivov : comctl32: Item with negative cChildren acts as if it actually had children.
by Alexandre Julliard 23 Nov '15

23 Nov '15

Module: wine Branch: master Commit: 1d19eb15d4abfdd14dccc5ac05b83c0ee1a1ace1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d19eb15d4abfdd14dccc5ac0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 23 00:25:11 2015 +0300 comctl32: Item with negative cChildren acts as if it actually had children. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/treeview.c | 22 +++++++++++++++++++++- dlls/comctl32/treeview.c | 5 +++-- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 917df23..92504c1 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1193,7 +1193,9 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, case TVN_ENDLABELEDITA: return TRUE; case TVN_ITEMEXPANDINGA: - ok(pTreeView->itemNew.mask == + { + UINT newmask = pTreeView->itemNew.mask & ~TVIF_CHILDREN; + ok(newmask == (TVIF_HANDLE | TVIF_SELECTEDIMAGE | TVIF_IMAGE | TVIF_PARAM | TVIF_STATE), "got wrong mask %x\n", pTreeView->itemNew.mask); ok(pTreeView->itemOld.mask == 0, @@ -1207,6 +1209,7 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, ok(ret == TRUE, "got %lu\n", ret); } break; + } case TVN_ITEMEXPANDEDA: ok(pTreeView->itemNew.mask & TVIF_STATE, "got wrong mask %x\n", pTreeView->itemNew.mask); ok(pTreeView->itemNew.state & (TVIS_EXPANDED|TVIS_EXPANDEDONCE), @@ -1529,6 +1532,7 @@ static void test_get_insertmarkcolor(void) static void test_expandnotify(void) { + HTREEITEM hitem; HWND hTree; BOOL ret; TVITEMA item; @@ -1679,6 +1683,22 @@ static void test_expandnotify(void) expect(FALSE, ret); ok_sequence(sequences, PARENT_SEQ_INDEX, parent_expand_empty_kb_seq, "expand node with no children", FALSE); + /* stay on current selection and set non-zero children count */ + hitem = (HTREEITEM)SendMessageA(hTree, TVM_GETNEXTITEM, TVGN_CARET, 0); + ok(hitem != NULL, "got %p\n", hitem); + + item.hItem = hitem; + item.mask = TVIF_CHILDREN; + item.cChildren = 0x80000000; + + ret = SendMessageA(hTree, TVM_SETITEMA, 0, (LPARAM)&item); + expect(TRUE, ret); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + ret = SendMessageA(hTree, WM_KEYDOWN, VK_ADD, 0); + expect(FALSE, ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_collapse_2nd_kb_seq, "expand node with children", FALSE); + DestroyWindow(hTree); } diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index ffb5981..695745c 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -816,8 +816,9 @@ static BOOL TREEVIEW_HasChildren(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item) { TREEVIEW_UpdateDispInfo(infoPtr, item, TVIF_CHILDREN); - - return item->cChildren > 0; + /* Protect for a case when callback field is not changed by a host, + otherwise negative values trigger normal notifications. */ + return item->cChildren != 0 && item->cChildren != I_CHILDRENCALLBACK; } static INT TREEVIEW_NotifyFormat (TREEVIEW_INFO *infoPtr, HWND hwndFrom, UINT nCommand)

1 0

Rafał Harabień : include/ddk: Fix memory layout of IRP and IO_STACK_LOCATION in wine64.
by Alexandre Julliard 23 Nov '15

23 Nov '15

Module: wine Branch: master Commit: 3acac5b2212c4d040ff2294e0a3e782a0af5e65a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3acac5b2212c4d040ff2294e0… Author: Rafał Harabień <rafalh1992(a)o2.pl> Date: Sun Nov 22 22:25:03 2015 +0100 include/ddk: Fix memory layout of IRP and IO_STACK_LOCATION in wine64. Signed-off-by: Rafał Harabień <rafalh1992(a)o2.pl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddk/wdm.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 0c51527..fc296a6 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -400,7 +400,6 @@ typedef struct _KAPC { BOOLEAN Inserted; } KAPC, *PKAPC, *RESTRICTED_POINTER PRKAPC; -#include <pshpack1.h> typedef struct _IRP { CSHORT Type; USHORT Size; @@ -456,7 +455,6 @@ typedef struct _IRP { } Tail; } IRP; typedef struct _IRP *PIRP; -#include <poppack.h> typedef VOID (WINAPI *PINTERFACE_REFERENCE)( PVOID Context); @@ -833,7 +831,9 @@ typedef NTSTATUS (WINAPI *PIO_COMPLETION_ROUTINE)( #define SL_INVOKE_ON_SUCCESS 0x40 #define SL_INVOKE_ON_ERROR 0x80 -#include <pshpack1.h> +#if !defined(_WIN64) +#include <pshpack4.h> +#endif typedef struct _IO_STACK_LOCATION { UCHAR MajorFunction; UCHAR MinorFunction; @@ -974,7 +974,9 @@ typedef struct _IO_STACK_LOCATION { PIO_COMPLETION_ROUTINE CompletionRoutine; PVOID Context; } IO_STACK_LOCATION, *PIO_STACK_LOCATION; +#if !defined(_WIN64) #include <poppack.h> +#endif /* MDL definitions */

1 0

Nikolay Sivov : dplayx: Fix a possible memory leak on error path (Coverity ).
by Alexandre Julliard 23 Nov '15

23 Nov '15

Module: wine Branch: master Commit: bd9701add87316d94f72294b947683dc265d1c82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd9701add87316d94f72294b9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 22 18:31:20 2015 +0300 dplayx: Fix a possible memory leak on error path (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dplayx/dplay.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 861c090..92062d3 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -1593,17 +1593,12 @@ static HRESULT DP_IF_CreatePlayer( IDirectPlayImpl *This, void *lpMsgHdr, DPID * player total */ lpPData = DP_CreatePlayer( This, lpidPlayer, lpPlayerName, dwCreateFlags, hEvent, bAnsi ); - - if( lpPData == NULL ) - { - return DPERR_CANTADDPLAYER; - } - /* Create the list object and link it in */ lpPList = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( *lpPList ) ); - if( lpPList == NULL ) + if( !lpPData || !lpPList ) { - FIXME( "Memory leak\n" ); + HeapFree( GetProcessHeap(), 0, lpPData ); + HeapFree( GetProcessHeap(), 0, lpPList ); return DPERR_CANTADDPLAYER; }

1 0

Nikolay Sivov : ddeml: Don't trash 'cb' field of structure returned by DdeQueryConvInfo16() (Coverity).
by Alexandre Julliard 23 Nov '15

23 Nov '15

Module: wine Branch: master Commit: b22d4e45886122cce25e596f177d9a225c9f899c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b22d4e45886122cce25e596f1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 22 22:55:52 2015 +0300 ddeml: Don't trash 'cb' field of structure returned by DdeQueryConvInfo16() (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddeml.dll16/ddeml.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ddeml.dll16/ddeml.c b/dlls/ddeml.dll16/ddeml.c index 94c947b..5ecb35e 100644 --- a/dlls/ddeml.dll16/ddeml.c +++ b/dlls/ddeml.dll16/ddeml.c @@ -496,6 +496,7 @@ UINT16 WINAPI DdeQueryConvInfo16(HCONV hConv, DWORD idTransaction, ret = DdeQueryConvInfo(hConv, idTransaction, &ci32); if (ret == 0) return 0; + ci16.cb = lpConvInfo->cb; ci16.hUser = ci32.hUser; ci16.hConvPartner = ci32.hConvPartner; ci16.hszSvcPartner = ci32.hszSvcPartner;

1 0

Thomas Faber : d3dxof: Avoid undefined behavior in parse_object_parts.
by Alexandre Julliard 23 Nov '15

23 Nov '15

Module: wine Branch: master Commit: 73eff6652ac9671522a07155a97104f36ca7f8da URL: http://source.winehq.org/git/wine.git/?a=commit;h=73eff6652ac9671522a07155a… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sun Nov 22 21:37:20 2015 +0100 d3dxof: Avoid undefined behavior in parse_object_parts. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dxof/parsing.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 769e815..54566b0 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -1349,7 +1349,8 @@ _exit: return FALSE; } - buf->pxo = buf->pxo->children[buf->pxo->nb_children] = &buf->pxo_tab[buf->pxo->root->nb_subobjects++]; + buf->pxo = buf->pxo->children[buf->pxo->nb_children] = &buf->pxo_tab[buf->pxo->root->nb_subobjects]; + pxo->root->nb_subobjects++; TRACE("Enter optional %s\n", (char*)buf->value); buf->level++;

1 0

Nikolay Sivov : wininet: Remove a bit of dead code (Coverity).
by Alexandre Julliard 23 Nov '15

23 Nov '15

Module: wine Branch: master Commit: bb59c3f77e0fe4a7526f2adcefee7e7264dc9f51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb59c3f77e0fe4a7526f2adce… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 23 02:17:18 2015 +0300 wininet: Remove a bit of dead code (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/dialogs.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index bf4121b..938daa8 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -416,8 +416,6 @@ static INT_PTR WINAPI WININET_InvalidCertificateDialog( case WM_COMMAND: if( wParam == IDOK ) { - BOOL res = TRUE; - if( params->dwFlags & FLAGS_ERROR_UI_FLAGS_CHANGE_OPTIONS ) { http_request_t *req = params->req; @@ -456,7 +454,7 @@ static INT_PTR WINAPI WININET_InvalidCertificateDialog( req->netconn->security_flags |= flags; } - EndDialog( hdlg, res ? ERROR_SUCCESS : ERROR_NOT_SUPPORTED ); + EndDialog( hdlg, ERROR_SUCCESS ); return TRUE; } if( wParam == IDCANCEL )

1 0

Adam Martinson : kernel32/tests: Add tests for closing named pipes with CloseHandle.
by Alexandre Julliard 23 Nov '15

23 Nov '15

Module: wine Branch: master Commit: 563865c6547ea65a763047c0350626ce7f05c0b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=563865c6547ea65a763047c03… Author: Adam Martinson <adam.r.martinson(a)gmail.com> Date: Mon Nov 23 07:22:27 2015 +0100 kernel32/tests: Add tests for closing named pipes with CloseHandle. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index ae09ef6..7ce6ae3 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -1384,6 +1384,98 @@ static void test_CreatePipe(void) SleepEx(0, TRUE); /* get rid of apc */ } +static void test_CloseHandle(void) +{ + static const char testdata[] = "Hello World"; + HANDLE hpipe, hfile; + char buffer[32]; + DWORD numbytes; + BOOL ret; + + hpipe = CreateNamedPipeA(PIPENAME, PIPE_ACCESS_DUPLEX, + PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, + 1, 1024, 1024, NMPWAIT_USE_DEFAULT_WAIT, NULL); + ok(hpipe != INVALID_HANDLE_VALUE, "CreateNamedPipe failed with %u\n", GetLastError()); + + hfile = CreateFileA(PIPENAME, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); + ok(hfile != INVALID_HANDLE_VALUE, "CreateFile failed with %u\n", GetLastError()); + + numbytes = 0xdeadbeef; + ret = WriteFile(hpipe, testdata, sizeof(testdata), &numbytes, NULL); + ok(ret, "WriteFile failed with %u\n", GetLastError()); + ok(numbytes == sizeof(testdata), "expected sizeof(testdata), got %u\n", numbytes); + + numbytes = 0xdeadbeef; + ret = PeekNamedPipe(hfile, NULL, 0, NULL, &numbytes, NULL); + ok(ret, "PeekNamedPipe failed with %u\n", GetLastError()); + ok(numbytes == sizeof(testdata), "expected sizeof(testdata), got %u\n", numbytes); + + ret = CloseHandle(hpipe); + ok(ret, "CloseHandle failed with %u\n", GetLastError()); + + 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(numbytes == 0, "expected 0, got %u\n", numbytes); + + numbytes = 0xdeadbeef; + memset(buffer, 0, sizeof(buffer)); + ret = ReadFile(hfile, buffer, sizeof(buffer), &numbytes, NULL); + ok(ret, "ReadFile failed with %u\n", GetLastError()); + ok(numbytes == sizeof(testdata), "expected sizeof(testdata), got %u\n", numbytes); + + SetLastError(0xdeadbeef); + ret = ReadFile(hfile, buffer, 0, &numbytes, NULL); + ok(!ret, "ReadFile unexpectedly succeeded\n"); + ok(GetLastError() == ERROR_BROKEN_PIPE, "expected ERROR_BROKEN_PIPE, got %u\n", GetLastError()); + + CloseHandle(hfile); + + /* repeat test with hpipe <-> hfile swapped */ + + hpipe = CreateNamedPipeA(PIPENAME, PIPE_ACCESS_DUPLEX, + PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, + 1, 1024, 1024, NMPWAIT_USE_DEFAULT_WAIT, NULL); + ok(hpipe != INVALID_HANDLE_VALUE, "CreateNamedPipe failed with %u\n", GetLastError()); + + hfile = CreateFileA(PIPENAME, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); + ok(hfile != INVALID_HANDLE_VALUE, "CreateFile failed with %u\n", GetLastError()); + + numbytes = 0xdeadbeef; + ret = WriteFile(hfile, testdata, sizeof(testdata), &numbytes, NULL); + ok(ret, "WriteFile failed with %u\n", GetLastError()); + ok(numbytes == sizeof(testdata), "expected sizeof(testdata), got %u\n", numbytes); + + numbytes = 0xdeadbeef; + ret = PeekNamedPipe(hpipe, NULL, 0, NULL, &numbytes, NULL); + ok(ret, "PeekNamedPipe failed with %u\n", GetLastError()); + ok(numbytes == sizeof(testdata), "expected sizeof(testdata), got %u\n", numbytes); + + ret = CloseHandle(hfile); + ok(ret, "CloseHandle failed with %u\n", GetLastError()); + + numbytes = 0xdeadbeef; + memset(buffer, 0, sizeof(buffer)); + ret = ReadFile(hpipe, buffer, 0, &numbytes, NULL); + todo_wine ok(ret || broken(GetLastError() == ERROR_MORE_DATA) /* >= Win 8 */, + "ReadFile failed with %u\n", GetLastError()); + ok(numbytes == 0, "expected 0, got %u\n", numbytes); + + numbytes = 0xdeadbeef; + memset(buffer, 0, sizeof(buffer)); + ret = ReadFile(hpipe, buffer, sizeof(buffer), &numbytes, NULL); + ok(ret, "ReadFile failed with %u\n", GetLastError()); + ok(numbytes == sizeof(testdata), "expected sizeof(testdata), got %u\n", numbytes); + + SetLastError(0xdeadbeef); + ret = ReadFile(hpipe, buffer, 0, &numbytes, NULL); + ok(!ret, "ReadFile unexpectedly succeeded\n"); + ok(GetLastError() == ERROR_BROKEN_PIPE, "expected ERROR_BROKEN_PIPE, got %u\n", GetLastError()); + + CloseHandle(hpipe); +} + struct named_pipe_client_params { DWORD security_flags; @@ -2175,6 +2267,7 @@ START_TEST(pipe) test_CreateNamedPipe(PIPE_TYPE_BYTE); test_CreateNamedPipe(PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE); test_CreatePipe(); + test_CloseHandle(); test_impersonation(); test_overlapped(); test_NamedPipeHandleState();

1 0

Sebastian Lackner : kernel32/tests: Add tests for sending empty message in combination with CloseHandle.
by Alexandre Julliard 23 Nov '15

23 Nov '15

Module: wine Branch: master Commit: e235b0670d7b2986df2bacce60ca6f2bb39834b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e235b0670d7b2986df2bacce6… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Nov 23 07:22:43 2015 +0100 kernel32/tests: Add tests for sending empty message in combination with CloseHandle. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 7ce6ae3..4f1b238 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -1432,6 +1432,35 @@ static void test_CloseHandle(void) CloseHandle(hfile); + hpipe = CreateNamedPipeA(PIPENAME, PIPE_ACCESS_DUPLEX, + PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, + 1, 1024, 1024, NMPWAIT_USE_DEFAULT_WAIT, NULL); + ok(hpipe != INVALID_HANDLE_VALUE, "CreateNamedPipe failed with %u\n", GetLastError()); + + hfile = CreateFileA(PIPENAME, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); + ok(hfile != INVALID_HANDLE_VALUE, "CreateFile failed with %u\n", GetLastError()); + + numbytes = 0xdeadbeef; + ret = WriteFile(hpipe, testdata, 0, &numbytes, NULL); + ok(ret, "WriteFile failed with %u\n", GetLastError()); + ok(numbytes == 0, "expected 0, got %u\n", numbytes); + + ret = CloseHandle(hpipe); + ok(ret, "CloseHandle failed with %u\n", GetLastError()); + + 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(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()); + + CloseHandle(hfile); + /* repeat test with hpipe <-> hfile swapped */ hpipe = CreateNamedPipeA(PIPENAME, PIPE_ACCESS_DUPLEX, @@ -1474,6 +1503,35 @@ static void test_CloseHandle(void) ok(GetLastError() == ERROR_BROKEN_PIPE, "expected ERROR_BROKEN_PIPE, got %u\n", GetLastError()); CloseHandle(hpipe); + + hpipe = CreateNamedPipeA(PIPENAME, PIPE_ACCESS_DUPLEX, + PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, + 1, 1024, 1024, NMPWAIT_USE_DEFAULT_WAIT, NULL); + ok(hpipe != INVALID_HANDLE_VALUE, "CreateNamedPipe failed with %u\n", GetLastError()); + + hfile = CreateFileA(PIPENAME, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); + ok(hfile != INVALID_HANDLE_VALUE, "CreateFile failed with %u\n", GetLastError()); + + numbytes = 0xdeadbeef; + ret = WriteFile(hfile, testdata, 0, &numbytes, NULL); + ok(ret, "WriteFile failed with %u\n", GetLastError()); + ok(numbytes == 0, "expected 0, got %u\n", numbytes); + + ret = CloseHandle(hfile); + ok(ret, "CloseHandle failed with %u\n", GetLastError()); + + 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(numbytes == 0, "expected 0, got %u\n", numbytes); + + SetLastError(0xdeadbeef); + ret = ReadFile(hpipe, buffer, 0, &numbytes, NULL); + ok(!ret, "ReadFile unexpectedly succeeded\n"); + ok(GetLastError() == ERROR_BROKEN_PIPE, "expected ERROR_BROKEN_PIPE, got %u\n", GetLastError()); + + CloseHandle(hpipe); } struct named_pipe_client_params

1 0

Sebastian Lackner : kernel32/tests: Add tests for calling WriteFile on pipe when other end is closed.
by Alexandre Julliard 23 Nov '15

23 Nov '15

Module: wine Branch: master Commit: 78948b24b72aeb6c5b33e2630ccb817097829251 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78948b24b72aeb6c5b33e2630… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Nov 23 07:23:04 2015 +0100 kernel32/tests: Add tests for calling WriteFile on pipe when other end is closed. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 4f1b238..1095279 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -1430,6 +1430,11 @@ static void test_CloseHandle(void) ok(!ret, "ReadFile unexpectedly succeeded\n"); ok(GetLastError() == ERROR_BROKEN_PIPE, "expected ERROR_BROKEN_PIPE, got %u\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = WriteFile(hfile, testdata, sizeof(testdata), &numbytes, NULL); + ok(!ret, "WriteFile unexpectedly succeeded\n"); + todo_wine ok(GetLastError() == ERROR_NO_DATA, "expected ERROR_NO_DATA, got %u\n", GetLastError()); + CloseHandle(hfile); hpipe = CreateNamedPipeA(PIPENAME, PIPE_ACCESS_DUPLEX, @@ -1459,6 +1464,11 @@ static void test_CloseHandle(void) ok(!ret, "ReadFile unexpectedly succeeded\n"); todo_wine ok(GetLastError() == ERROR_BROKEN_PIPE, "expected ERROR_BROKEN_PIPE, got %u\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = WriteFile(hfile, testdata, sizeof(testdata), &numbytes, NULL); + ok(!ret, "WriteFile unexpectedly succeeded\n"); + todo_wine ok(GetLastError() == ERROR_NO_DATA, "expected ERROR_NO_DATA, got %u\n", GetLastError()); + CloseHandle(hfile); /* repeat test with hpipe <-> hfile swapped */ @@ -1502,6 +1512,11 @@ static void test_CloseHandle(void) ok(!ret, "ReadFile unexpectedly succeeded\n"); ok(GetLastError() == ERROR_BROKEN_PIPE, "expected ERROR_BROKEN_PIPE, got %u\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = WriteFile(hpipe, testdata, sizeof(testdata), &numbytes, NULL); + ok(!ret, "WriteFile unexpectedly succeeded\n"); + todo_wine ok(GetLastError() == ERROR_NO_DATA, "expected ERROR_NO_DATA, got %u\n", GetLastError()); + CloseHandle(hpipe); hpipe = CreateNamedPipeA(PIPENAME, PIPE_ACCESS_DUPLEX, @@ -1531,6 +1546,11 @@ static void test_CloseHandle(void) ok(!ret, "ReadFile unexpectedly succeeded\n"); ok(GetLastError() == ERROR_BROKEN_PIPE, "expected ERROR_BROKEN_PIPE, got %u\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = WriteFile(hpipe, testdata, sizeof(testdata), &numbytes, NULL); + ok(!ret, "WriteFile unexpectedly succeeded\n"); + todo_wine ok(GetLastError() == ERROR_NO_DATA, "expected ERROR_NO_DATA, got %u\n", GetLastError()); + CloseHandle(hpipe); }

1 0

Sebastian Lackner : server: Fix crash when calling GetNamedPipeHandleState on partially closed pipe.
by Alexandre Julliard 23 Nov '15

23 Nov '15

Module: wine Branch: master Commit: ee02530bc4ab4a85f6b7b0db847b8fe566f76f16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee02530bc4ab4a85f6b7b0db8… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Nov 23 07:23:45 2015 +0100 server: Fix crash when calling GetNamedPipeHandleState on partially closed pipe. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 14 +++++++++++++- server/named_pipe.c | 13 ++++++++----- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 1095279..842376a 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -1387,9 +1387,9 @@ static void test_CreatePipe(void) static void test_CloseHandle(void) { static const char testdata[] = "Hello World"; + DWORD state, numbytes; HANDLE hpipe, hfile; char buffer[32]; - DWORD numbytes; BOOL ret; hpipe = CreateNamedPipeA(PIPENAME, PIPE_ACCESS_DUPLEX, @@ -1425,6 +1425,9 @@ static void test_CloseHandle(void) ok(ret, "ReadFile failed with %u\n", GetLastError()); ok(numbytes == sizeof(testdata), "expected sizeof(testdata), got %u\n", numbytes); + ret = GetNamedPipeHandleStateA(hfile, &state, NULL, NULL, NULL, NULL, 0); + ok(ret, "GetNamedPipeHandleState failed with %u\n", GetLastError()); + SetLastError(0xdeadbeef); ret = ReadFile(hfile, buffer, 0, &numbytes, NULL); ok(!ret, "ReadFile unexpectedly succeeded\n"); @@ -1459,6 +1462,9 @@ static void test_CloseHandle(void) todo_wine ok(ret, "ReadFile failed with %u\n", GetLastError()); ok(numbytes == 0, "expected 0, got %u\n", numbytes); + ret = GetNamedPipeHandleStateA(hfile, &state, NULL, NULL, NULL, NULL, 0); + ok(ret, "GetNamedPipeHandleState failed with %u\n", GetLastError()); + SetLastError(0xdeadbeef); ret = ReadFile(hfile, buffer, 0, &numbytes, NULL); ok(!ret, "ReadFile unexpectedly succeeded\n"); @@ -1507,6 +1513,9 @@ static void test_CloseHandle(void) ok(ret, "ReadFile failed with %u\n", GetLastError()); ok(numbytes == sizeof(testdata), "expected sizeof(testdata), got %u\n", numbytes); + ret = GetNamedPipeHandleStateA(hpipe, &state, NULL, NULL, NULL, NULL, 0); + ok(ret, "GetNamedPipeHandleState failed with %u\n", GetLastError()); + SetLastError(0xdeadbeef); ret = ReadFile(hpipe, buffer, 0, &numbytes, NULL); ok(!ret, "ReadFile unexpectedly succeeded\n"); @@ -1541,6 +1550,9 @@ static void test_CloseHandle(void) todo_wine ok(ret, "ReadFile failed with %u\n", GetLastError()); ok(numbytes == 0, "expected 0, got %u\n", numbytes); + ret = GetNamedPipeHandleStateA(hpipe, &state, NULL, NULL, NULL, NULL, 0); + ok(ret, "GetNamedPipeHandleState failed with %u\n", GetLastError()); + SetLastError(0xdeadbeef); ret = ReadFile(hpipe, buffer, 0, &numbytes, NULL); ok(!ret, "ReadFile unexpectedly succeeded\n"); diff --git a/server/named_pipe.c b/server/named_pipe.c index fbabc5a..1c9143f 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -1013,11 +1013,14 @@ DECL_HANDLER(get_named_pipe_info) } reply->flags = client ? client->pipe_flags : server->pipe_flags; - reply->sharing = server->pipe->sharing; - reply->maxinstances = server->pipe->maxinstances; - reply->instances = server->pipe->instances; - reply->insize = server->pipe->insize; - reply->outsize = server->pipe->outsize; + if (server) + { + reply->sharing = server->pipe->sharing; + reply->maxinstances = server->pipe->maxinstances; + reply->instances = server->pipe->instances; + reply->insize = server->pipe->insize; + reply->outsize = server->pipe->outsize; + } if (client) release_object(client);

1 0