October 2017 - Wine-Commits

Jacek Caban : server: Use server side named pipe implementation in byte mode.
by Alexandre Julliard Oct. 4, 2017

Oct. 4, 2017

Module: wine Branch: master Commit: 7eb785416193f7ca154872222b9cfcd3db7a7418 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7eb785416193f7ca154872222… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 4 15:18:29 2017 +0200 server: Use server side named pipe implementation in byte mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 6 +----- dlls/ntdll/tests/pipe.c | 6 ++---- server/named_pipe.c | 5 +++-- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 18ffa7a..87e64ef 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -2576,7 +2576,6 @@ static void test_readfileex_pending(void) SetLastError(0xdeadbeef); ret = ReadFile(server, read_buf, 0, &num_bytes, &overlapped); ok(!ret, "ReadFile should fail\n"); -todo_wine ok(GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %d\n", GetLastError()); ok(num_bytes == 0, "bytes %u\n", num_bytes); ok((NTSTATUS)overlapped.Internal == STATUS_PENDING, "expected STATUS_PENDING, got %#lx\n", overlapped.Internal); @@ -2592,11 +2591,9 @@ todo_wine ok(num_bytes == 1, "bytes %u\n", num_bytes); wait = WaitForSingleObject(event, 100); -todo_wine ok(wait == WAIT_OBJECT_0, "WaitForSingleObject returned %x\n", wait); ok(num_bytes == 1, "bytes %u\n", num_bytes); -todo_wine ok((NTSTATUS)overlapped.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", overlapped.Internal); ok(overlapped.InternalHigh == 0, "expected 0, got %lu\n", overlapped.InternalHigh); @@ -3132,6 +3129,5 @@ START_TEST(pipe) test_readfileex_pending(); test_overlapped_transport(TRUE, FALSE); test_overlapped_transport(TRUE, TRUE); - if (broken(1)) /* FIXME: Remove once Wine is ready. */ - test_overlapped_transport(FALSE, FALSE); + test_overlapped_transport(FALSE, FALSE); } diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 897c44b..9628cc2 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -726,7 +726,7 @@ static void WINAPI apc( void *arg, IO_STATUS_BLOCK *iosb, ULONG reserved ) ok( !reserved, "reserved is not 0: %x\n", reserved ); } -static void test_peek(HANDLE pipe, BOOL is_msgmode) +static void test_peek(HANDLE pipe) { FILE_PIPE_PEEK_BUFFER buf; IO_STATUS_BLOCK iosb; @@ -745,7 +745,6 @@ static void test_peek(HANDLE pipe, BOOL is_msgmode) ok(!status || status == STATUS_PENDING, "NtFsControlFile failed: %x\n", status); ok(buf.ReadDataAvailable == 1, "ReadDataAvailable = %u\n", buf.ReadDataAvailable); ok(!iosb.Status, "iosb.Status = %x\n", iosb.Status); - todo_wine_if(!is_msgmode) ok(is_signaled(event), "event is not signaled\n"); CloseHandle(event); @@ -857,7 +856,7 @@ static void read_pipe_test(ULONG pipe_flags, ULONG pipe_type) ret = WriteFile( write, buffer, 1, &written, NULL ); ok(ret && written == 1, "WriteFile error %d\n", GetLastError()); - test_peek(read, pipe_type & PIPE_TYPE_MESSAGE); + test_peek(read); status = NtReadFile( read, event, apc, &apc_count, &iosb, buffer, 1, NULL, NULL ); ok( status == STATUS_SUCCESS, "wrong status %x\n", status ); @@ -984,7 +983,6 @@ static void read_pipe_test(ULONG pipe_flags, ULONG pipe_type) ok( !apc_count, "apc was called\n" ); CloseHandle( write ); Sleep(1); /* FIXME: needed for wine to run the i/o apc */ - todo_wine_if(!(pipe_type & PIPE_TYPE_MESSAGE) && (pipe_flags & PIPE_ACCESS_OUTBOUND)) ok( U(iosb).Status == STATUS_PIPE_BROKEN, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information ); ok( is_signaled( event ), "event is not signaled\n" ); diff --git a/server/named_pipe.c b/server/named_pipe.c index a98041e..3566663 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -294,10 +294,11 @@ 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 message-mode pipes are handled this way. */ +/* Returns if we handle I/O via server calls. + * FIXME: no longer needed. */ static int use_server_io( struct pipe_end *pipe_end ) { - return pipe_end->flags & NAMED_PIPE_MESSAGE_STREAM_WRITE; + return 1; } static void named_pipe_dump( struct object *obj, int verbose )

1 0

Vincent Povirk : gdiplus/tests: Add tests for gdi32 transform and clip caching.
by Alexandre Julliard Oct. 4, 2017

Oct. 4, 2017

Module: wine Branch: master Commit: 2ea6c93bc419eab03921b48896b9985daea7b8bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ea6c93bc419eab03921b4889… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 4 14:54:19 2017 -0500 gdiplus/tests: Add tests for gdi32 transform and clip caching. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/graphics.c | 70 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 956ddb0..a96050b 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -6569,6 +6569,75 @@ static void test_cliphrgn_transform(void) ReleaseDC(hwnd, hdc); } +static void test_hdc_caching(void) +{ + GpStatus status; + HDC hdc; + HBITMAP hbm; + GpGraphics *graphics; + ULONG *bits; + BITMAPINFO bmi; + HRGN hrgn; + GpBrush *brush; + + hdc = CreateCompatibleDC(0); + ok(hdc != NULL, "CreateCompatibleDC failed\n"); + bmi.bmiHeader.biSize = sizeof(bmi.bmiHeader); + bmi.bmiHeader.biHeight = -5; + bmi.bmiHeader.biWidth = 5; + bmi.bmiHeader.biBitCount = 32; + bmi.bmiHeader.biPlanes = 1; + bmi.bmiHeader.biCompression = BI_RGB; + bmi.bmiHeader.biClrUsed = 0; + + hbm = CreateDIBSection(hdc, &bmi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + ok(hbm != NULL, "CreateDIBSection failed\n"); + + SelectObject(hdc, hbm); + + SetViewportOrgEx(hdc, 1, 1, NULL); + + hrgn = CreateRectRgn(0, 0, 3, 3); + SelectClipRgn(hdc, hrgn); + DeleteObject(hrgn); + + status = GdipCreateSolidFill((ARGB)0xffaaaaaa, (GpSolidFill**)&brush); + expect(Ok, status); + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + + memset(bits, 0, sizeof(*bits) * 25); + status = GdipFillRectangleI(graphics, brush, 0, 0, 4, 4); + expect(Ok, status); + + expect(0, bits[0]); + expect(0xffaaaaaa, bits[6]); + expect(0xffaaaaaa, bits[12]); + expect(0, bits[18]); + expect(0, bits[24]); + + SetViewportOrgEx(hdc, 0, 0, NULL); + OffsetClipRgn(hdc, 2, 2); + + memset(bits, 0, sizeof(*bits) * 25); + status = GdipFillRectangleI(graphics, brush, 0, 0, 4, 4); + expect(Ok, status); + + expect(0, bits[0]); + expect(0xffaaaaaa, bits[6]); + expect(0xffaaaaaa, bits[12]); + expect(0, bits[18]); + expect(0, bits[24]); + + GdipDeleteGraphics(graphics); + + GdipDeleteBrush(brush); + + DeleteDC(hdc); + DeleteObject(hbm); +} + START_TEST(graphics) { struct GdiplusStartupInput gdiplusStartupInput; @@ -6659,6 +6728,7 @@ START_TEST(graphics) test_container_rects(); test_GdipGraphicsSetAbort(); test_cliphrgn_transform(); + test_hdc_caching(); GdiplusShutdown(gdiplusToken); DestroyWindow( hwnd );

1 0

Jacek Caban : server: Support FSCTL_PIPE_PEEK in byte mode.
by Alexandre Julliard Oct. 4, 2017

Oct. 4, 2017

Module: wine Branch: master Commit: f68bea526f0edf5abab1e677aaa968dff1c2e51a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f68bea526f0edf5abab1e677a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 4 15:17:52 2017 +0200 server: Support FSCTL_PIPE_PEEK in byte mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index 1ec1ff4..2141f44 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -930,21 +930,33 @@ static int pipe_end_peek( struct pipe_end *pipe_end ) LIST_FOR_EACH_ENTRY( message, &pipe_end->message_queue, struct pipe_message, entry ) avail += message->iosb->in_size - message->read_pos; + reply_size = min( reply_size, avail ); - if (avail) + if (avail && (pipe_end->flags & NAMED_PIPE_MESSAGE_STREAM_WRITE)) { message = LIST_ENTRY( list_head(&pipe_end->message_queue), struct pipe_message, entry ); message_length = message->iosb->in_size - message->read_pos; reply_size = min( reply_size, message_length ); } - else reply_size = 0; if (!(buffer = set_reply_data_size( offsetof( FILE_PIPE_PEEK_BUFFER, Data[reply_size] )))) return 0; buffer->NamedPipeState = 0; /* FIXME */ buffer->ReadDataAvailable = avail; buffer->NumberOfMessages = 0; /* FIXME */ buffer->MessageLength = message_length; - if (reply_size) memcpy( buffer->Data, (const char *)message->iosb->in_data + message->read_pos, reply_size ); + + if (reply_size) + { + data_size_t write_pos = 0, writing; + LIST_FOR_EACH_ENTRY( message, &pipe_end->message_queue, struct pipe_message, entry ) + { + writing = min( reply_size - write_pos, message->iosb->in_size - message->read_pos ); + memcpy( buffer->Data + write_pos, (const char *)message->iosb->in_data + message->read_pos, + writing ); + write_pos += writing; + if (write_pos == reply_size) break; + } + } return 1; }

1 0

Piotr Caban : msvcp140: Skip _Reschedule_chore tests when CreateThreadpoolWork is not available.
by Alexandre Julliard Oct. 4, 2017

Oct. 4, 2017

Module: wine Branch: master Commit: e3af73716bb69269f818413333eae3322d1b7e60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3af73716bb69269f81841333… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 4 15:39:03 2017 +0200 msvcp140: Skip _Reschedule_chore tests when CreateThreadpoolWork is not available. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/tests/msvcp140.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 8252865..9b1d7b1 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -487,6 +487,14 @@ static void test_chore(void) wait = WaitForSingleObject(event, 500); ok(wait == WAIT_OBJECT_0, "WaitForSingleObject returned %d\n", wait); + if(!GetProcAddress(GetModuleHandleA("kernel32"), "CreateThreadpoolWork")) + { + win_skip("_Reschedule_chore not supported\n"); + p__Release_chore(&chore); + CloseHandle(event); + return; + } + old_chore = chore; ret = p__Schedule_chore(&chore); ok(!ret, "_Schedule_chore returned %d\n", ret); @@ -505,6 +513,8 @@ static void test_chore(void) ok(chore.callback == chore_callback, "chore.callback = %p, expected %p\n", chore.callback, chore_callback); ok(chore.arg == event, "chore.arg = %p, expected %p\n", chore.arg, event); p__Release_chore(&chore); + + CloseHandle(event); } static void test_to_byte(void)

1 0

Hans Leidekker : winhttp: Fix invalid reads with tracing on (Valgrind).
by Alexandre Julliard Oct. 4, 2017

Oct. 4, 2017

Module: wine Branch: master Commit: 6283f4ed96339d9e30e263572cfee8b92add1180 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6283f4ed96339d9e30e263572… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 4 16:49:42 2017 +0200 winhttp: Fix invalid reads with tracing on (Valgrind). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index a355887..96a2c91 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -519,7 +519,7 @@ BOOL WINAPI WinHttpAddRequestHeaders( HINTERNET hrequest, LPCWSTR headers, DWORD BOOL ret; request_t *request; - TRACE("%p, %s, 0x%x, 0x%08x\n", hrequest, debugstr_w(headers), len, flags); + TRACE("%p, %s, %u, 0x%08x\n", hrequest, debugstr_wn(headers, len), len, flags); if (!headers || !len) { @@ -2172,8 +2172,8 @@ BOOL WINAPI WinHttpSendRequest( HINTERNET hrequest, LPCWSTR headers, DWORD heade BOOL ret; request_t *request; - TRACE("%p, %s, 0x%x, %u, %u, %lx\n", - hrequest, debugstr_w(headers), headers_len, optional_len, total_len, context); + TRACE("%p, %s, %u, %u, %u, %lx\n", hrequest, debugstr_wn(headers, headers_len), headers_len, optional_len, + total_len, context); if (!(request = (request_t *)grab_object( hrequest ))) {

1 0

Hans Leidekker : msi: Fix an invalid write in build_default_format ( Valgrind).
by Alexandre Julliard Oct. 4, 2017

Oct. 4, 2017

Module: wine Branch: master Commit: f517022ecc8dfd23486b4cdc32343323ffd9ec9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f517022ecc8dfd23486b4cdc3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 4 16:49:41 2017 +0200 msi: Fix an invalid write in build_default_format (Valgrind). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/format.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/msi/format.c b/dlls/msi/format.c index 108b28d..3bcd0b8 100644 --- a/dlls/msi/format.c +++ b/dlls/msi/format.c @@ -339,29 +339,28 @@ static WCHAR *deformat_literal( FORMAT *format, FORMSTR *str, BOOL *propfound, return replaced; } -static LPWSTR build_default_format(const MSIRECORD* record) +static WCHAR *build_default_format( const MSIRECORD *record ) { - int i; - int count; - WCHAR *rc, buf[26]; static const WCHAR fmt[] = {'%','i',':',' ','[','%','i',']',' ',0}; - DWORD size; + int i, count = MSI_RecordGetFieldCount( record ); + WCHAR *ret, *tmp, buf[26]; + DWORD size = 1; - count = MSI_RecordGetFieldCount(record); - - rc = msi_alloc(1); - rc[0] = 0; - size = 1; + if (!(ret = msi_alloc( sizeof(*ret) ))) return NULL; + ret[0] = 0; for (i = 1; i <= count; i++) { - sprintfW(buf, fmt, i, i); - size += lstrlenW(buf); - rc = msi_realloc(rc, size * sizeof(WCHAR)); - lstrcatW(rc, buf); + size += sprintfW( buf, fmt, i, i ); + if (!(tmp = msi_realloc( ret, size * sizeof(*ret) ))) + { + msi_free( ret ); + return NULL; + } + ret = tmp; + strcatW( ret, buf ); } - - return rc; + return ret; } static BOOL format_is_number(WCHAR x)

1 0

Alexandre Julliard : server: Keep a reference to the shared PE mapping in mapped views.
by Alexandre Julliard Oct. 4, 2017

Oct. 4, 2017

Module: wine Branch: master Commit: 8c944f7a9d202be199ff2804e0236120fca9e95b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c944f7a9d202be199ff2804e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 4 10:08:31 2017 +0200 server: Keep a reference to the shared PE mapping in mapped views. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/mapping.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/server/mapping.c b/server/mapping.c index 57bf716..f9f50ed 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -123,6 +123,7 @@ struct memory_view struct list entry; /* entry in per-process view list */ struct fd *fd; /* fd for mapped file */ struct ranges *committed; /* list of committed ranges in this mapping */ + struct shared_map *shared; /* temp file for shared PE mapping */ unsigned int flags; /* SEC_* flags */ client_ptr_t base; /* view base address (in process addr space) */ mem_size_t size; /* view size */ @@ -311,6 +312,7 @@ static void free_memory_view( struct memory_view *view ) { if (view->fd) release_object( view->fd ); if (view->committed) release_object( view->committed ); + if (view->shared) release_object( view->shared ); list_remove( &view->entry ); free( view ); } @@ -958,6 +960,7 @@ DECL_HANDLER(map_view) view->flags = mapping->flags; view->fd = !is_fd_removable( mapping->fd ) ? (struct fd *)grab_object( mapping->fd ) : NULL; view->committed = mapping->committed ? (struct ranges *)grab_object( mapping->committed ) : NULL; + view->shared = mapping->shared ? (struct shared_map *)grab_object( mapping->shared ) : NULL; list_add_tail( &current->process->views, &view->entry ); }

1 0

Fabian Maurer : riched20: In ME_ProtectPartialTableDeletion properly set out parameter (cppcheck).
by Alexandre Julliard Oct. 4, 2017

Oct. 4, 2017

Module: wine Branch: master Commit: 6d62904497e81e167f1b916a5c7ee3ca0fd3c4c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d62904497e81e167f1b916a5… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Oct 3 17:31:11 2017 +0200 riched20: In ME_ProtectPartialTableDeletion properly set out parameter (cppcheck). Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/table.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index b834bc7..d2cab9a 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -400,7 +400,7 @@ void ME_ProtectPartialTableDeletion(ME_TextEditor *editor, ME_Cursor *c, int *nC } } if (*nChars < 0) - nChars = 0; + *nChars = 0; } }

1 0

Jacek Caban : server: Return error for FSCTL_PIPE_PEEK calls on disconnected pipes.
by Alexandre Julliard Oct. 4, 2017

Oct. 4, 2017

Module: wine Branch: master Commit: 688c7a99d2ce9dd60d39efb60138bdebb4fceace URL: http://source.winehq.org/git/wine.git/?a=commit;h=688c7a99d2ce9dd60d39efb60… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 4 15:17:35 2017 +0200 server: Return error for FSCTL_PIPE_PEEK calls on disconnected pipes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 37 +++++++++++++++++++++++++++++++++++++ server/named_pipe.c | 6 ++++++ 2 files changed, 43 insertions(+) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 84db14e..18ffa7a 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -209,6 +209,11 @@ static void test_CreateNamedPipe(int pipemode) ok(hnp != INVALID_HANDLE_VALUE, "CreateNamedPipe failed\n"); test_signaled(hnp); + ret = PeekNamedPipe(hnp, NULL, 0, NULL, &readden, NULL); + todo_wine + ok(!ret && GetLastError() == ERROR_BAD_PIPE, "PeekNamedPipe returned %x (%u)\n", + ret, GetLastError()); + ret = WaitNamedPipeA(PIPENAME, 2000); ok(ret, "WaitNamedPipe failed (%d)\n", GetLastError()); @@ -1387,10 +1392,20 @@ static int test_DisconnectNamedPipe(void) ok(ReadFile(hnp, ibuf, sizeof(ibuf), &readden, NULL) == 0 && GetLastError() == ERROR_PIPE_NOT_CONNECTED, "ReadFile from disconnected pipe with bytes waiting\n"); + ok(!DisconnectNamedPipe(hnp) && GetLastError() == ERROR_PIPE_NOT_CONNECTED, "DisconnectNamedPipe worked twice\n"); ret = WaitForSingleObject(hFile, 0); ok(ret == WAIT_TIMEOUT, "WaitForSingleObject returned %X\n", ret); + + ret = PeekNamedPipe(hFile, NULL, 0, NULL, &readden, NULL); + todo_wine + ok(!ret && GetLastError() == ERROR_PIPE_NOT_CONNECTED, "PeekNamedPipe returned %x (%u)\n", + ret, GetLastError()); + ret = PeekNamedPipe(hnp, NULL, 0, NULL, &readden, NULL); + todo_wine + ok(!ret && GetLastError() == ERROR_BAD_PIPE, "PeekNamedPipe returned %x (%u)\n", + ret, GetLastError()); ok(CloseHandle(hFile), "CloseHandle\n"); } @@ -1502,6 +1517,11 @@ static void test_CloseHandle(void) ok(numbytes == 0, "expected 0, 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); + + numbytes = 0xdeadbeef; memset(buffer, 0, sizeof(buffer)); ret = ReadFile(hfile, buffer, sizeof(buffer), &numbytes, NULL); ok(ret, "ReadFile failed with %u\n", GetLastError()); @@ -1518,6 +1538,12 @@ static void test_CloseHandle(void) ok(!ret, "ReadFile unexpectedly succeeded\n"); ok(GetLastError() == ERROR_BROKEN_PIPE, "expected ERROR_BROKEN_PIPE, got %u\n", GetLastError()); + numbytes = 0xdeadbeef; + ret = PeekNamedPipe(hfile, NULL, 0, NULL, &numbytes, NULL); + ok(!ret && GetLastError() == ERROR_BROKEN_PIPE, "PeekNamedPipe returned %x (%u)\n", + ret, GetLastError()); + ok(numbytes == 0xdeadbeef, "numbytes = %u\n", numbytes); + SetLastError(0xdeadbeef); ret = WriteFile(hfile, testdata, sizeof(testdata), &numbytes, NULL); ok(!ret, "WriteFile unexpectedly succeeded\n"); @@ -1601,6 +1627,11 @@ static void test_CloseHandle(void) ok(numbytes == 0, "expected 0, 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); + + numbytes = 0xdeadbeef; memset(buffer, 0, sizeof(buffer)); ret = ReadFile(hpipe, buffer, sizeof(buffer), &numbytes, NULL); ok(ret, "ReadFile failed with %u\n", GetLastError()); @@ -1617,6 +1648,12 @@ static void test_CloseHandle(void) ok(!ret, "ReadFile unexpectedly succeeded\n"); ok(GetLastError() == ERROR_BROKEN_PIPE, "expected ERROR_BROKEN_PIPE, got %u\n", GetLastError()); + numbytes = 0xdeadbeef; + ret = PeekNamedPipe(hpipe, NULL, 0, NULL, &numbytes, NULL); + ok(!ret && GetLastError() == ERROR_BROKEN_PIPE, "PeekNamedPipe returned %x (%u)\n", + ret, GetLastError()); + ok(numbytes == 0xdeadbeef, "numbytes = %u\n", numbytes); + SetLastError(0xdeadbeef); ret = WriteFile(hpipe, testdata, sizeof(testdata), &numbytes, NULL); ok(!ret, "WriteFile unexpectedly succeeded\n"); diff --git a/server/named_pipe.c b/server/named_pipe.c index d0ec38f..1ec1ff4 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -922,6 +922,12 @@ static int pipe_end_peek( struct pipe_end *pipe_end ) } reply_size -= offsetof( FILE_PIPE_PEEK_BUFFER, Data ); + if (!pipe_end->connection && list_empty( &pipe_end->message_queue )) + { + set_error( STATUS_PIPE_BROKEN ); + return 0; + } + LIST_FOR_EACH_ENTRY( message, &pipe_end->message_queue, struct pipe_message, entry ) avail += message->iosb->in_size - message->read_pos;

1 0

Alexandre Julliard : configure: Add pkg-config support for libcups.
by Alexandre Julliard Oct. 4, 2017

Oct. 4, 2017

Module: wine Branch: master Commit: 378931f85e5781c71b698399dc81284e75685cac URL: http://source.winehq.org/git/wine.git/?a=commit;h=378931f85e5781c71b698399d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 4 16:45:44 2017 +0200 configure: Add pkg-config support for libcups. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 74 ++++++++++++++++++++++++++++++++++++------------------------ configure.ac | 22 +++++++++--------- 2 files changed, 56 insertions(+), 40 deletions(-) diff --git a/configure b/configure index 74fd4d4..095aa39 100755 --- a/configure +++ b/configure @@ -650,6 +650,7 @@ JPEG_LIBS JPEG_CFLAGS FONTCONFIG_LIBS FONTCONFIG_CFLAGS +CUPS_LIBS CUPS_CFLAGS CAPI20_LIBS CAPI20_CFLAGS @@ -1714,6 +1715,8 @@ UDEV_CFLAGS UDEV_LIBS CAPI20_CFLAGS CAPI20_LIBS +CUPS_CFLAGS +CUPS_LIBS FONTCONFIG_CFLAGS FONTCONFIG_LIBS JPEG_CFLAGS @@ -2473,6 +2476,8 @@ Some influential environment variables: CAPI20_CFLAGS C compiler flags for capi20, overriding pkg-config CAPI20_LIBS Linker flags for capi20, overriding pkg-config + CUPS_CFLAGS C compiler flags for cups, overriding pkg-config + CUPS_LIBS Linker flags for cups, overriding pkg-config FONTCONFIG_CFLAGS C compiler flags for fontconfig, overriding pkg-config FONTCONFIG_LIBS @@ -13446,28 +13451,47 @@ esac fi -CUPS_CFLAGS="" - if test "x$with_cups" != "xno" then - ac_save_CPPFLAGS="$CPPFLAGS" - ac_cups_cflags=`${CUPS_CONFIG:-cups-config} --cflags 2>/dev/null` - ac_cups_libs=`${CUPS_CONFIG:-cups-config} --ldflags 2>/dev/null` - CPPFLAGS="$CPPFLAGS $ac_cups_cflags" - for ac_header in cups/cups.h + if ${CUPS_CFLAGS:+false} :; then : + if ${PKG_CONFIG+:} false; then : + CUPS_CFLAGS=`$PKG_CONFIG --cflags cups 2>/dev/null` +fi +fi +test "$cross_compiling" = yes || CUPS_CFLAGS=${CUPS_CFLAGS:-`${CUPS_CONFIG:-cups-config} --cflags 2>/dev/null`} +if ${CUPS_LIBS:+false} :; then : + if ${PKG_CONFIG+:} false; then : + CUPS_LIBS=`$PKG_CONFIG --libs cups 2>/dev/null` +fi +fi +test "$cross_compiling" = yes || CUPS_LIBS=${CUPS_LIBS:-`${CUPS_CONFIG:-cups-config} --libs 2>/dev/null`} +CUPS_LIBS=${CUPS_LIBS:-"-lcups"} +$as_echo "$as_me:${as_lineno-$LINENO}: cups cflags: $CUPS_CFLAGS" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: cups libs: $CUPS_LIBS" >&5 +ac_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$CPPFLAGS $CUPS_CFLAGS" +for ac_header in cups/cups.h cups/ppd.h do : - ac_fn_c_check_header_mongrel "$LINENO" "cups/cups.h" "ac_cv_header_cups_cups_h" "$ac_includes_default" -if test "x$ac_cv_header_cups_cups_h" = xyes; then : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF -#define HAVE_CUPS_CUPS_H 1 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lcups" >&5 + +fi + +done + + if test "$ac_cv_header_cups_cups_h" = "yes" + then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lcups" >&5 $as_echo_n "checking for -lcups... " >&6; } if ${ac_cv_lib_soname_cups+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_soname_save_LIBS=$LIBS -LIBS="-lcups $ac_cups_libs $LIBS" +LIBS="-lcups $CUPS_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -13503,7 +13527,7 @@ fi if ${ac_cv_lib_soname_cups:+false} :; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 $as_echo "not found" >&6; } - + CUPS_LIBS="" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_cups" >&5 $as_echo "$ac_cv_lib_soname_cups" >&6; } @@ -13512,25 +13536,16 @@ cat >>confdefs.h <<_ACEOF #define SONAME_LIBCUPS "$ac_cv_lib_soname_cups" _ACEOF - CUPS_CFLAGS="$ac_cups_cflags" -fi - for ac_header in cups/ppd.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "cups/ppd.h" "ac_cv_header_cups_ppd_h" "$ac_includes_default" -if test "x$ac_cv_header_cups_ppd_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_CUPS_PPD_H 1 -_ACEOF - -fi - -done fi + else + CUPS_CFLAGS="" + CUPS_LIBS="" + fi +CPPFLAGS=$ac_save_CPPFLAGS +test -z "$CUPS_CFLAGS" || CUPS_CFLAGS=`echo " $CUPS_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` +test -z "$CUPS_LIBS" || CUPS_LIBS=`echo " $CUPS_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` -done - - CPPFLAGS="$ac_save_CPPFLAGS" fi if test "x$ac_cv_lib_soname_cups" = "x"; then : case "x$with_cups" in @@ -17883,6 +17898,7 @@ UDEV_LIBS = $UDEV_LIBS CAPI20_CFLAGS = $CAPI20_CFLAGS CAPI20_LIBS = $CAPI20_LIBS CUPS_CFLAGS = $CUPS_CFLAGS +CUPS_LIBS = $CUPS_LIBS FONTCONFIG_CFLAGS = $FONTCONFIG_CFLAGS FONTCONFIG_LIBS = $FONTCONFIG_LIBS JPEG_CFLAGS = $JPEG_CFLAGS diff --git a/configure.ac b/configure.ac index 2f6922f..44c7eed 100644 --- a/configure.ac +++ b/configure.ac @@ -1585,19 +1585,19 @@ WINE_NOTICE_WITH(capi,[test "x$ac_cv_lib_soname_capi20" = "x"], [libcapi20 ${notice_platform}development files not found, ISDN won't be supported.]) dnl **** Check for cups **** -AC_SUBST(CUPS_CFLAGS,"") if test "x$with_cups" != "xno" then - ac_save_CPPFLAGS="$CPPFLAGS" - ac_cups_cflags=`${CUPS_CONFIG:-cups-config} --cflags 2>/dev/null` - ac_cups_libs=`${CUPS_CONFIG:-cups-config} --ldflags 2>/dev/null` - CPPFLAGS="$CPPFLAGS $ac_cups_cflags" - AC_CHECK_HEADERS(cups/cups.h, - [WINE_CHECK_SONAME(cups,cupsGetDefault, - [CUPS_CFLAGS="$ac_cups_cflags"],, - [$ac_cups_libs]) - AC_CHECK_HEADERS(cups/ppd.h)]) - CPPFLAGS="$ac_save_CPPFLAGS" + WINE_PACKAGE_FLAGS(CUPS,[cups],[-lcups], + [`${CUPS_CONFIG:-cups-config} --cflags 2>/dev/null`], + [`${CUPS_CONFIG:-cups-config} --libs 2>/dev/null`], + [AC_CHECK_HEADERS(cups/cups.h cups/ppd.h) + if test "$ac_cv_header_cups_cups_h" = "yes" + then + WINE_CHECK_SONAME(cups,cupsGetDefault,,[CUPS_LIBS=""],[$CUPS_LIBS]) + else + CUPS_CFLAGS="" + CUPS_LIBS="" + fi]) fi WINE_NOTICE_WITH(cups,[test "x$ac_cv_lib_soname_cups" = "x"], [libcups ${notice_platform}development files not found, CUPS won't be supported.])

1 0