wine-commits August 2018

wine-commits@winehq.org

2 participants
618 discussions

Austin English : setupapi: Set LastError on success in SetupInstallFromInfSectionW.
by Alexandre Julliard 15 Aug '18

15 Aug '18

Module: wine Branch: master Commit: d45e6814d67c1f1a2eb6023f0fb5574d560fd9b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d45e6814d67c1f1a2eb6023f… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Aug 3 22:13:22 2018 +0200 setupapi: Set LastError on success in SetupInstallFromInfSectionW. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45167 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/install.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 0593df8..5a76e3a 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -1188,6 +1188,7 @@ BOOL WINAPI SetupInstallFromInfSectionW( HWND owner, HINF hinf, PCWSTR section, return FALSE; } + SetLastError(ERROR_SUCCESS); return TRUE; }

1 0

Alexandre Julliard : quartz: Remove some unnecessary casts.
by Alexandre Julliard 15 Aug '18

15 Aug '18

Module: wine Branch: master Commit: fc79250ff7f89b8918d7cecfeb62123a5c4b5de7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc79250ff7f89b8918d7cecf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 15 08:38:53 2018 +0200 quartz: Remove some unnecessary casts. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtermapper.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 0a41c71..1a5f76d 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -140,7 +140,7 @@ struct Vector }; /* returns the position it was added at */ -static int add_data(struct Vector * v, const BYTE * pData, int size) +static int add_data(struct Vector *v, const void *pData, int size) { int index = v->current; if (v->current + size > v->capacity) @@ -156,7 +156,7 @@ static int add_data(struct Vector * v, const BYTE * pData, int size) return index; } -static int find_data(const struct Vector * v, const BYTE * pData, int size) +static int find_data(const struct Vector *v, const void *pData, int size) { int index; for (index = 0; index < v->current; index++) @@ -404,7 +404,7 @@ static HRESULT FM2_WriteFilterData(const REGFILTER2 * prf2, BYTE **ppData, ULONG rrf.dwPins = prf2->u.s2.cPins2; rrf.dwUnused = 0; - add_data(&mainStore, (LPBYTE)&rrf, sizeof(rrf)); + add_data(&mainStore, &rrf, sizeof(rrf)); for (i = 0; i < prf2->u.s2.cPins2; i++) { @@ -432,15 +432,15 @@ static HRESULT FM2_WriteFilterData(const REGFILTER2 * prf2, BYTE **ppData, ULONG rrfp.dwMediums = rgPin2.nMediums; rrfp.bCategory = rgPin2.clsPinCategory ? 1 : 0; - add_data(&mainStore, (LPBYTE)&rrfp, sizeof(rrfp)); + add_data(&mainStore, &rrfp, sizeof(rrfp)); if (rrfp.bCategory) { - DWORD index = find_data(&clsidStore, (const BYTE*)rgPin2.clsPinCategory, sizeof(CLSID)); + DWORD index = find_data(&clsidStore, rgPin2.clsPinCategory, sizeof(CLSID)); if (index == -1) - index = add_data(&clsidStore, (const BYTE*)rgPin2.clsPinCategory, sizeof(CLSID)); + index = add_data(&clsidStore, rgPin2.clsPinCategory, sizeof(CLSID)); index += size; - add_data(&mainStore, (LPBYTE)&index, sizeof(index)); + add_data(&mainStore, &index, sizeof(index)); } for (j = 0; j < rgPin2.nMediaTypes; j++) @@ -453,26 +453,26 @@ static HRESULT FM2_WriteFilterData(const REGFILTER2 * prf2, BYTE **ppData, ULONG rt.signature[3] = '3'; rt.signature[0] += j; rt.dwUnused = 0; - rt.dwOffsetMajor = find_data(&clsidStore, (const BYTE*)rgPin2.lpMediaType[j].clsMajorType, sizeof(CLSID)); + rt.dwOffsetMajor = find_data(&clsidStore, rgPin2.lpMediaType[j].clsMajorType, sizeof(CLSID)); if (rt.dwOffsetMajor == -1) - rt.dwOffsetMajor = add_data(&clsidStore, (const BYTE*)rgPin2.lpMediaType[j].clsMajorType, sizeof(CLSID)); + rt.dwOffsetMajor = add_data(&clsidStore, rgPin2.lpMediaType[j].clsMajorType, sizeof(CLSID)); rt.dwOffsetMajor += size; - rt.dwOffsetMinor = find_data(&clsidStore, (const BYTE*)clsMinorType, sizeof(CLSID)); + rt.dwOffsetMinor = find_data(&clsidStore, clsMinorType, sizeof(CLSID)); if (rt.dwOffsetMinor == -1) - rt.dwOffsetMinor = add_data(&clsidStore, (const BYTE*)clsMinorType, sizeof(CLSID)); + rt.dwOffsetMinor = add_data(&clsidStore, clsMinorType, sizeof(CLSID)); rt.dwOffsetMinor += size; - add_data(&mainStore, (LPBYTE)&rt, sizeof(rt)); + add_data(&mainStore, &rt, sizeof(rt)); } for (j = 0; j < rgPin2.nMediums; j++) { - DWORD index = find_data(&clsidStore, (const BYTE*)(rgPin2.lpMedium + j), sizeof(REGPINMEDIUM)); + DWORD index = find_data(&clsidStore, rgPin2.lpMedium + j, sizeof(REGPINMEDIUM)); if (index == -1) - index = add_data(&clsidStore, (const BYTE*)(rgPin2.lpMedium + j), sizeof(REGPINMEDIUM)); + index = add_data(&clsidStore, rgPin2.lpMedium + j, sizeof(REGPINMEDIUM)); index += size; - add_data(&mainStore, (LPBYTE)&index, sizeof(index)); + add_data(&mainStore, &index, sizeof(index)); } } @@ -1036,7 +1036,7 @@ static HRESULT WINAPI FilterMapper3_EnumMatchingFilters( { struct MONIKER_MERIT mm = {pMoniker, rf2.dwMerit}; IMoniker_AddRef(pMoniker); - add_data(&monikers, (LPBYTE)&mm, sizeof(mm)); + add_data(&monikers, &mm, sizeof(mm)); } }

1 0

Alex Henrie : quartz: Rewrite add_data with CoTaskMemRealloc and error handling.
by Alexandre Julliard 15 Aug '18

15 Aug '18

Module: wine Branch: master Commit: 24703e4cd63401079bb6f3a734c25fadd4ae620d URL: https://source.winehq.org/git/wine.git/?a=commit;h=24703e4cd63401079bb6f3a7… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 14 09:25:10 2018 -0600 quartz: Rewrite add_data with CoTaskMemRealloc and error handling. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtermapper.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 0d26198..0a41c71 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -145,11 +145,11 @@ static int add_data(struct Vector * v, const BYTE * pData, int size) int index = v->current; if (v->current + size > v->capacity) { - LPBYTE pOldData = v->pData; - v->capacity = (v->capacity + size) * 2; - v->pData = CoTaskMemAlloc(v->capacity); - memcpy(v->pData, pOldData, v->current); - CoTaskMemFree(pOldData); + int new_capacity = (v->capacity + size) * 2; + BYTE *new_data = CoTaskMemRealloc(v->pData, new_capacity); + if (!new_data) return -1; + v->capacity = new_capacity; + v->pData = new_data; } memcpy(v->pData + v->current, pData, size); v->current += size;

1 0

Jacek Caban : server: Allow pipe server fd caching throughout its whole lifetime.
by Alexandre Julliard 15 Aug '18

15 Aug '18

Module: wine Branch: master Commit: 32169eafe23db1f8cbd65ec94d05c865bca0355e URL: https://source.winehq.org/git/wine.git/?a=commit;h=32169eafe23db1f8cbd65ec9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 8 22:01:20 2018 +0200 server: Allow pipe server fd caching throughout its whole lifetime. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 10 ---------- server/named_pipe.c | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index b39e931..932dc7e 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1693,16 +1693,6 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc if (!status) status = DIR_unmount_device( handle ); return status; - case FSCTL_PIPE_DISCONNECT: - status = server_ioctl_file( handle, event, apc, apc_context, io, code, - in_buffer, in_size, out_buffer, out_size ); - if (!status) - { - int fd = server_remove_fd_from_cache( handle ); - if (fd != -1) close( fd ); - } - return status; - case FSCTL_PIPE_IMPERSONATE: FIXME("FSCTL_PIPE_IMPERSONATE: impersonating self\n"); status = RtlImpersonateSelf( SecurityImpersonation ); diff --git a/server/named_pipe.c b/server/named_pipe.c index 66e3607..768567f 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -1126,6 +1126,7 @@ static struct pipe_server *create_pipe_server( struct named_pipe *pipe, unsigned release_object( server ); return NULL; } + allow_fd_caching( server->pipe_end.fd ); set_fd_signaled( server->pipe_end.fd, 1 ); set_server_state( server, ps_idle_server ); return server; @@ -1218,7 +1219,6 @@ static struct object *named_pipe_open_file( struct object *obj, unsigned int acc if ((client = create_pipe_client( options, pipe->flags, pipe->outsize, options ))) { - allow_fd_caching( server->pipe_end.fd ); if (server->state == ps_wait_open) fd_async_wake_up( server->pipe_end.fd, ASYNC_TYPE_WAIT, STATUS_SUCCESS ); server->pipe_end.state = FILE_PIPE_CONNECTED_STATE;

1 0

Jacek Caban : server: Don' t use set_no_fd_status for error handling in pipe objects.
by Alexandre Julliard 15 Aug '18

15 Aug '18

Module: wine Branch: master Commit: 584ffc23418a5611cef1a38c4532001f0e518960 URL: https://source.winehq.org/git/wine.git/?a=commit;h=584ffc23418a5611cef1a38c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 8 22:01:11 2018 +0200 server: Don't use set_no_fd_status for error handling in pipe objects. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 2 -- server/fd.c | 6 ------ server/file.h | 1 - server/named_pipe.c | 15 --------------- 4 files changed, 24 deletions(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index b312831..cb31956 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -1481,14 +1481,12 @@ static void pipe_for_each_state(HANDLE (*create_server)(void), ok(ret, "DisconnectNamedPipe failed: %u\n", GetLastError()); test(server, TRUE, FILE_PIPE_DISCONNECTED_STATE); - if(broken(1)) { /* FIXME: Remove once Wine can handle this case */ status = listen_pipe(server, event, &iosb, FALSE); ok(status == STATUS_PENDING, "listen_pipe returned %x\n", status); client = connect_client(server); test(server, TRUE, FILE_PIPE_CONNECTED_STATE); test(client, FALSE, FILE_PIPE_CONNECTED_STATE); CloseHandle(client); - } CloseHandle(server); CloseHandle(event); diff --git a/server/fd.c b/server/fd.c index 4fa5758..6118f52 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1713,12 +1713,6 @@ struct fd *get_fd_object_for_mapping( struct fd *fd, unsigned int access, unsign return NULL; } -/* set the status to return when the fd has no associated unix fd */ -void set_no_fd_status( struct fd *fd, unsigned int status ) -{ - fd->no_fd_status = status; -} - /* sets the user of an fd that previously had no user */ void set_fd_user( struct fd *fd, const struct fd_ops *user_ops, struct object *user ) { diff --git a/server/file.h b/server/file.h index 1d25961..8609db0 100644 --- a/server/file.h +++ b/server/file.h @@ -78,7 +78,6 @@ struct fd_ops extern struct fd *alloc_pseudo_fd( const struct fd_ops *fd_user_ops, struct object *user, unsigned int options ); -extern void set_no_fd_status( struct fd *fd, unsigned int status ); extern struct fd *open_fd( struct fd *root, const char *name, int flags, mode_t *mode, unsigned int access, unsigned int sharing, unsigned int options ); extern struct fd *create_anonymous_fd( const struct fd_ops *fd_user_ops, diff --git a/server/named_pipe.c b/server/named_pipe.c index f7b8b54..66e3607 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -338,20 +338,6 @@ static struct fd *pipe_end_get_fd( struct object *obj ) static void set_server_state( struct pipe_server *server, enum pipe_state state ) { server->state = state; - - switch(state) - { - case ps_connected_server: - case ps_wait_disconnect: - break; - case ps_wait_open: - case ps_idle_server: - set_no_fd_status( server->pipe_end.fd, STATUS_PIPE_LISTENING ); - break; - case ps_wait_connect: - set_no_fd_status( server->pipe_end.fd, STATUS_PIPE_DISCONNECTED ); - break; - } } @@ -1232,7 +1218,6 @@ static struct object *named_pipe_open_file( struct object *obj, unsigned int acc if ((client = create_pipe_client( options, pipe->flags, pipe->outsize, options ))) { - set_no_fd_status( server->pipe_end.fd, STATUS_BAD_DEVICE_TYPE ); allow_fd_caching( server->pipe_end.fd ); if (server->state == ps_wait_open) fd_async_wake_up( server->pipe_end.fd, ASYNC_TYPE_WAIT, STATUS_SUCCESS );

1 0

Jacek Caban : server: Improve FSCTL_PIPE_TRANSCEIVE error handling.
by Alexandre Julliard 15 Aug '18

15 Aug '18

Module: wine Branch: master Commit: 41e39c6a634c78f08eee0deb2ef4b754381d6f03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=41e39c6a634c78f08eee0deb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 8 22:01:02 2018 +0200 server: Improve FSCTL_PIPE_TRANSCEIVE error handling. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 2 +- server/named_pipe.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index d8ccdd1..b312831 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -1301,7 +1301,7 @@ static void test_pipe_state(HANDLE pipe, BOOL is_server, DWORD state) buf, 1, buf+1, 1); if (!status || status == STATUS_PENDING) status = io.Status; - todo_wine + todo_wine_if(expected_status == STATUS_PIPE_DISCONNECTED) ok(status == expected_status, "NtFsControlFile(FSCTL_PIPE_TRANSCEIVE) failed in %s state %u: %x\n", is_server ? "server" : "client", state, status); diff --git a/server/named_pipe.c b/server/named_pipe.c index 0806d99..f7b8b54 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -937,16 +937,16 @@ static int pipe_end_transceive( struct pipe_end *pipe_end, struct async *async ) struct pipe_message *message; struct iosb *iosb; - if ((pipe_end->flags & (NAMED_PIPE_MESSAGE_STREAM_WRITE | NAMED_PIPE_MESSAGE_STREAM_READ)) - != (NAMED_PIPE_MESSAGE_STREAM_WRITE | NAMED_PIPE_MESSAGE_STREAM_READ)) + if (!pipe_end->connection) { - set_error( STATUS_INVALID_READ_MODE ); + set_error( STATUS_INVALID_PIPE_STATE ); return 0; } - if (!pipe_end->connection) + if ((pipe_end->flags & (NAMED_PIPE_MESSAGE_STREAM_WRITE | NAMED_PIPE_MESSAGE_STREAM_READ)) + != (NAMED_PIPE_MESSAGE_STREAM_WRITE | NAMED_PIPE_MESSAGE_STREAM_READ)) { - set_error( STATUS_PIPE_BROKEN ); + set_error( STATUS_INVALID_READ_MODE ); return 0; }

1 0

Jacek Caban : server: Improve named pipe write error handling.
by Alexandre Julliard 15 Aug '18

15 Aug '18

Module: wine Branch: master Commit: 7038b9ef151c7946a376adff584e002b0eb2b039 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7038b9ef151c7946a376adff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 8 22:00:55 2018 +0200 server: Improve named pipe write error handling. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 10 +++++----- dlls/ntdll/tests/pipe.c | 1 - server/named_pipe.c | 11 ++++++++++- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 7187b3c..d724e00 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -1149,7 +1149,7 @@ static DWORD CALLBACK serverThreadMain4(LPVOID arg) SetLastError(ERROR_SUCCESS); success = WriteFile(hnp, buf, readden, &written, &oWrite); err = GetLastError(); - todo_wine_if (!success && err == ERROR_PIPE_NOT_CONNECTED) ok(!success && err == ERROR_NO_DATA, + ok(!success && err == ERROR_NO_DATA, "overlapped WriteFile on disconnected pipe returned %u, err=%i\n", success, err); /* No completion status is queued on immediate error. */ @@ -1605,7 +1605,7 @@ static void test_CloseHandle(void) 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()); + ok(GetLastError() == ERROR_NO_DATA, "expected ERROR_NO_DATA, got %u\n", GetLastError()); CloseHandle(hfile); @@ -1650,7 +1650,7 @@ static void test_CloseHandle(void) 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()); + ok(GetLastError() == ERROR_NO_DATA, "expected ERROR_NO_DATA, got %u\n", GetLastError()); CloseHandle(hfile); @@ -1715,7 +1715,7 @@ static void test_CloseHandle(void) 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()); + ok(GetLastError() == ERROR_NO_DATA, "expected ERROR_NO_DATA, got %u\n", GetLastError()); CloseHandle(hpipe); @@ -1760,7 +1760,7 @@ static void test_CloseHandle(void) 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()); + ok(GetLastError() == ERROR_NO_DATA, "expected ERROR_NO_DATA, got %u\n", GetLastError()); CloseHandle(hpipe); } diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index a2ef008..d8ccdd1 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -1419,7 +1419,6 @@ static void test_pipe_with_data_state(HANDLE pipe, BOOL is_server, DWORD state) break; } status = NtWriteFile(pipe, NULL, NULL, NULL, &io, buf, 1, NULL, NULL); - todo_wine_if(expected_status == STATUS_PIPE_CLOSING) ok(status == expected_status, "NtWriteFile failed in %s state %u: %x\n", is_server ? "server" : "client", state, status); diff --git a/server/named_pipe.c b/server/named_pipe.c index 425a369..0806d99 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -826,10 +826,19 @@ static int pipe_end_write( struct fd *fd, struct async *async, file_pos_t pos ) struct pipe_message *message; struct iosb *iosb; - if (!pipe_end->connection) + switch (pipe_end->state) { + case FILE_PIPE_CONNECTED_STATE: + break; + case FILE_PIPE_DISCONNECTED_STATE: set_error( STATUS_PIPE_DISCONNECTED ); return 0; + case FILE_PIPE_LISTENING_STATE: + set_error( STATUS_PIPE_LISTENING ); + return 0; + case FILE_PIPE_CLOSING_STATE: + set_error( STATUS_PIPE_CLOSING ); + return 0; } if (!(pipe_end->flags & NAMED_PIPE_MESSAGE_STREAM_WRITE) && !get_req_data_size()) return 1;

1 0

Jacek Caban : server: Improve named pipe read error handling.
by Alexandre Julliard 15 Aug '18

15 Aug '18

Module: wine Branch: master Commit: 91852564dc7f51ac8f18be600905d4aff4b156de URL: https://source.winehq.org/git/wine.git/?a=commit;h=91852564dc7f51ac8f18be60… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 8 22:00:48 2018 +0200 server: Improve named pipe read error handling. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 2 -- server/named_pipe.c | 12 +++++++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 67141f1..a2ef008 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -1338,7 +1338,6 @@ static void test_pipe_state(HANDLE pipe, BOOL is_server, DWORD state) break; } status = NtReadFile(pipe, NULL, NULL, NULL, &io, buf, 1, NULL, NULL); - todo_wine_if(state == FILE_PIPE_DISCONNECTED_STATE && !is_server) ok(status == expected_status, "NtReadFile failed in %s state %u: %x\n", is_server ? "server" : "client", state, status); } @@ -1427,7 +1426,6 @@ static void test_pipe_with_data_state(HANDLE pipe, BOOL is_server, DWORD state) if (state == FILE_PIPE_CLOSING_STATE) expected_status = STATUS_SUCCESS; status = NtReadFile(pipe, NULL, NULL, NULL, &io, buf, 1, NULL, NULL); - todo_wine_if(state == FILE_PIPE_DISCONNECTED_STATE && status != STATUS_PIPE_DISCONNECTED) ok(status == expected_status, "NtReadFile failed in %s state %u: %x\n", is_server ? "server" : "client", state, status); } diff --git a/server/named_pipe.c b/server/named_pipe.c index cb74051..425a369 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -798,8 +798,18 @@ static int pipe_end_read( struct fd *fd, struct async *async, file_pos_t pos ) { struct pipe_end *pipe_end = get_fd_user( fd ); - if (!pipe_end->connection && list_empty( &pipe_end->message_queue )) + switch (pipe_end->state) { + case FILE_PIPE_CONNECTED_STATE: + break; + case FILE_PIPE_DISCONNECTED_STATE: + set_error( STATUS_PIPE_DISCONNECTED ); + return 0; + case FILE_PIPE_LISTENING_STATE: + set_error( STATUS_PIPE_LISTENING ); + return 0; + case FILE_PIPE_CLOSING_STATE: + if (!list_empty( &pipe_end->message_queue )) break; set_error( STATUS_PIPE_BROKEN ); return 0; }

1 0

Jacek Caban : server: Improve FSCTL_PIPE_PEEK error handling.
by Alexandre Julliard 15 Aug '18

15 Aug '18

Module: wine Branch: master Commit: 0973b8d2c39e03ab2660b1509af687aa0a74e7db URL: https://source.winehq.org/git/wine.git/?a=commit;h=0973b8d2c39e03ab2660b150… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 8 22:00:41 2018 +0200 server: Improve FSCTL_PIPE_PEEK error handling. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 2 -- dlls/ntdll/tests/pipe.c | 4 ++-- server/named_pipe.c | 9 ++++++++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 0e6c7a3..7187b3c 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -214,7 +214,6 @@ static void test_CreateNamedPipe(int pipemode) 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()); @@ -1463,7 +1462,6 @@ static int test_DisconnectNamedPipe(void) 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"); diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 816ec3e..67141f1 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -1286,7 +1286,7 @@ static void test_pipe_state(HANDLE pipe, BOOL is_server, DWORD state) expected_status = STATUS_PIPE_BROKEN; break; } - todo_wine_if(expected_status && expected_status != STATUS_PIPE_BROKEN) + todo_wine_if(expected_status == STATUS_BUFFER_OVERFLOW || expected_status == STATUS_PIPE_DISCONNECTED) ok(status == expected_status, "status = %x, expected %x in %s state %u\n", status, expected_status, is_server ? "server" : "client", state); if (!status) @@ -1397,7 +1397,7 @@ static void test_pipe_with_data_state(HANDLE pipe, BOOL is_server, DWORD state) expected_status = STATUS_BUFFER_OVERFLOW; break; } - todo_wine + todo_wine_if(expected_status == STATUS_BUFFER_OVERFLOW || expected_status == STATUS_PIPE_DISCONNECTED) ok(status == expected_status, "status = %x, expected %x in %s state %u\n", status, expected_status, is_server ? "server" : "client", state); if (status == STATUS_BUFFER_OVERFLOW) diff --git a/server/named_pipe.c b/server/named_pipe.c index 1ee17b6..cb74051 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -868,10 +868,17 @@ 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 )) + switch (pipe_end->state) { + case FILE_PIPE_CONNECTED_STATE: + break; + case FILE_PIPE_CLOSING_STATE: + if (!list_empty( &pipe_end->message_queue )) break; set_error( STATUS_PIPE_BROKEN ); return 0; + default: + set_error( STATUS_INVALID_PIPE_STATE ); + return 0; } LIST_FOR_EACH_ENTRY( message, &pipe_end->message_queue, struct pipe_message, entry )

1 0

Jacek Caban : server: Store pipe state in pipe_end struct and return it in FSCTL_PIPE_PEEK.
by Alexandre Julliard 15 Aug '18

15 Aug '18

Module: wine Branch: master Commit: 8e5bc0daf730e4ee9fa1d43fb35d0a342d826548 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e5bc0daf730e4ee9fa1d43f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 8 22:00:32 2018 +0200 server: Store pipe state in pipe_end struct and return it in FSCTL_PIPE_PEEK. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 1 - server/named_pipe.c | 9 ++++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 7a722fe..816ec3e 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -1290,7 +1290,6 @@ static void test_pipe_state(HANDLE pipe, BOOL is_server, DWORD state) ok(status == expected_status, "status = %x, expected %x in %s state %u\n", status, expected_status, is_server ? "server" : "client", state); if (!status) - todo_wine ok(peek_buf.NamedPipeState == state, "NamedPipeState = %u, expected %u\n", peek_buf.NamedPipeState, state); diff --git a/server/named_pipe.c b/server/named_pipe.c index a1f3723..1ee17b6 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -66,6 +66,7 @@ struct pipe_end struct object obj; /* object header */ struct fd *fd; /* pipe file descriptor */ unsigned int flags; /* pipe flags */ + unsigned int state; /* pipe state */ 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 */ @@ -394,6 +395,8 @@ static void pipe_end_disconnect( struct pipe_end *pipe_end, unsigned int status pipe_end->connection = NULL; + pipe_end->state = status == STATUS_PIPE_DISCONNECTED + ? FILE_PIPE_DISCONNECTED_STATE : FILE_PIPE_CLOSING_STATE; fd_async_wake_up( pipe_end->fd, ASYNC_TYPE_WAIT, status ); async_wake_up( &pipe_end->read_q, status ); LIST_FOR_EACH_ENTRY_SAFE( message, next, &pipe_end->message_queue, struct pipe_message, entry ) @@ -883,7 +886,7 @@ static int pipe_end_peek( struct pipe_end *pipe_end ) } if (!(buffer = set_reply_data_size( offsetof( FILE_PIPE_PEEK_BUFFER, Data[reply_size] )))) return 0; - buffer->NamedPipeState = 0; /* FIXME */ + buffer->NamedPipeState = pipe_end->state; buffer->ReadDataAvailable = avail; buffer->NumberOfMessages = 0; /* FIXME */ buffer->MessageLength = message_length; @@ -1005,6 +1008,7 @@ static int pipe_server_ioctl( struct fd *fd, ioctl_code_t code, struct async *as case ps_idle_server: case ps_wait_connect: fd_queue_async( server->pipe_end.fd, async, ASYNC_TYPE_WAIT ); + server->pipe_end.state = FILE_PIPE_LISTENING_STATE; set_server_state( server, ps_wait_open ); async_wake_up( &server->pipe->waiters, STATUS_SUCCESS ); set_error( STATUS_PENDING ); @@ -1100,6 +1104,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.state = FILE_PIPE_LISTENING_STATE; server->pipe_end.server_pid = get_process_id( current->process ); list_add_head( &pipe->servers, &server->entry ); @@ -1126,6 +1131,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.state = FILE_PIPE_CONNECTED_STATE; 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 ); @@ -1204,6 +1210,7 @@ static struct object *named_pipe_open_file( struct object *obj, unsigned int acc allow_fd_caching( server->pipe_end.fd ); if (server->state == ps_wait_open) fd_async_wake_up( server->pipe_end.fd, ASYNC_TYPE_WAIT, STATUS_SUCCESS ); + server->pipe_end.state = FILE_PIPE_CONNECTED_STATE; set_server_state( server, ps_connected_server ); server->client = client; client->server = server;

1 0

← Newer
1
...
55
56
57
58
59
60
61
62
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2018