November 2015 - Wine-Commits

Nikolay Sivov : d2d1: Fix a copy-paste issue in EndDraw() (Coverity).
by Alexandre Julliard Nov. 23, 2015

Nov. 23, 2015

Module: wine Branch: master Commit: a5612e0275cd38deea67d81adad581accdab82c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5612e0275cd38deea67d81ad… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 23 14:02:30 2015 +0300 d2d1: Fix a copy-paste issue in EndDraw() (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/render_target.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index bd20d5d..4dd94cb 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -1409,7 +1409,7 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_EndDraw(ID2D1RenderTarget if (tag1) *tag1 = render_target->error.tag1; if (tag2) - *tag1 = render_target->error.tag2; + *tag2 = render_target->error.tag2; return render_target->error.code; }

1 0

Bruno Jesus : msacm32: Remove dead code from acmFormatDetailsW.
by Alexandre Julliard Nov. 23, 2015

Nov. 23, 2015

Module: wine Branch: master Commit: cff5c73e68e7a13a56b536f87bdd412e8061e20d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cff5c73e68e7a13a56b536f87… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Nov 23 19:49:52 2015 +0800 msacm32: Remove dead code from acmFormatDetailsW. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/format.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c index 1ab05ae..de07cba 100644 --- a/dlls/msacm32/format.c +++ b/dlls/msacm32/format.c @@ -400,13 +400,9 @@ MMRESULT WINAPI acmFormatDetailsW(HACMDRIVER had, PACMFORMATDETAILSW pafd, DWORD MMRESULT mmr; static const WCHAR fmt1[] = {'%','d',' ','H','z',0}; static const WCHAR fmt2[] = {';',' ','%','d',' ','b','i','t','s',0}; - ACMFORMATTAGDETAILSA aftd; TRACE("(%p, %p, %d)\n", had, pafd, fdwDetails); - memset(&aftd, 0, sizeof(aftd)); - aftd.cbStruct = sizeof(aftd); - if (pafd->cbStruct < sizeof(*pafd)) return MMSYSERR_INVALPARAM; switch (fdwDetails) {

1 0

Stefan Dösinger : wined3d: Support loading renderbuffers in surface_load_location.
by Alexandre Julliard Nov. 23, 2015

Nov. 23, 2015

Module: wine Branch: master Commit: 61ad9284d0a6c140380669ca4ff4286856e620bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=61ad9284d0a6c140380669ca4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Nov 22 01:00:58 2015 +0100 wined3d: Support loading renderbuffers in surface_load_location. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0a7112c..6a93de4 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4084,16 +4084,23 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, } /* Context activation is done by the caller. */ -static void surface_multisample_resolve(struct wined3d_surface *surface, struct wined3d_context *context) +static void surface_load_renderbuffer(struct wined3d_surface *surface, struct wined3d_context *context, + DWORD dst_location) { - RECT rect = {0, 0, surface->resource.width, surface->resource.height}; + const RECT rect = {0, 0, surface->resource.width, surface->resource.height}; + DWORD src_location; - if (!(surface->locations & WINED3D_LOCATION_RB_MULTISAMPLE)) - ERR("Trying to resolve multisampled surface %p, but location WINED3D_LOCATION_RB_MULTISAMPLE not current.\n", - surface); + if (surface->locations & WINED3D_LOCATION_RB_MULTISAMPLE) + src_location = WINED3D_LOCATION_RB_MULTISAMPLE; + else if (surface->locations & WINED3D_LOCATION_RB_RESOLVED) + src_location = WINED3D_LOCATION_RB_RESOLVED; + else if (surface->locations & WINED3D_LOCATION_TEXTURE_SRGB) + src_location = WINED3D_LOCATION_TEXTURE_SRGB; + else /* surface_blt_fbo will load the source location if necessary. */ + src_location = WINED3D_LOCATION_TEXTURE_RGB; surface_blt_fbo(surface->resource.device, context, WINED3D_TEXF_POINT, - surface, WINED3D_LOCATION_RB_MULTISAMPLE, &rect, surface, WINED3D_LOCATION_RB_RESOLVED, &rect); + surface, src_location, &rect, surface, dst_location, &rect); } /* Context activation is done by the caller. Context may be NULL in ddraw-only mode. */ @@ -4161,7 +4168,8 @@ HRESULT surface_load_location(struct wined3d_surface *surface, struct wined3d_co break; case WINED3D_LOCATION_RB_RESOLVED: - surface_multisample_resolve(surface, context); + case WINED3D_LOCATION_RB_MULTISAMPLE: + surface_load_renderbuffer(surface, context, location); break; case WINED3D_LOCATION_TEXTURE_RGB:

1 0

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

Nov. 23, 2015

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 : wininet: Remove a bit of dead code (Coverity).
by Alexandre Julliard Nov. 23, 2015

Nov. 23, 2015

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 Nov. 23, 2015

Nov. 23, 2015

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

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

Nov. 23, 2015

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

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

Nov. 23, 2015

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 : server: Fix crash when calling GetNamedPipeHandleState on partially closed pipe.
by Alexandre Julliard Nov. 23, 2015

Nov. 23, 2015

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

Alexandre Julliard : winex11: Fix a copy&paste typo in the initial position of a window.
by Alexandre Julliard Nov. 23, 2015

Nov. 23, 2015

Module: wine Branch: master Commit: 9f5147e08ff67bd46f9800124c3bc4639e6ce6d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f5147e08ff67bd46f9800124… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 23 17:16:03 2015 +0900 winex11: Fix a copy&paste typo in the initial position of a window. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index b763677..836e62c 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1501,7 +1501,7 @@ static void create_whole_window( struct x11drv_win_data *data ) else if (cy > 65535) cy = 65535; pos = virtual_screen_to_root( data->whole_rect.left, data->whole_rect.top ); - data->whole_window = XCreateWindow( data->display, root_window, pos.y, pos.y, + data->whole_window = XCreateWindow( data->display, root_window, pos.x, pos.y, cx, cy, 0, data->vis.depth, InputOutput, data->vis.visual, mask, &attr ); if (!data->whole_window) goto done;

1 0