September 2020 - Wine-Commits

Nikolay Sivov : comctl32/datetime: Do not call default procedure for WM_NCCREATE.
by Alexandre Julliard Sept. 25, 2020

Sept. 25, 2020

Module: wine Branch: master Commit: 9a5c9be164beddf21d7ff4ca18128085d1050c4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a5c9be164beddf21d7ff4ca… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 25 10:36:16 2020 +0300 comctl32/datetime: Do not call default procedure for WM_NCCREATE. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/datetime.c | 2 +- dlls/comctl32/tests/datetime.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index ace00c7550..8c403dde13 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -1277,7 +1277,7 @@ DATETIME_NCCreate (HWND hwnd, const CREATESTRUCTW *lpcs) dwExStyle |= WS_EX_CLIENTEDGE; SetWindowLongW(hwnd, GWL_EXSTYLE, dwExStyle); - return DefWindowProcW(hwnd, WM_NCCREATE, 0, (LPARAM)lpcs); + return 1; } diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c index 111f0bee89..47d7a8fbe5 100644 --- a/dlls/comctl32/tests/datetime.c +++ b/dlls/comctl32/tests/datetime.c @@ -765,6 +765,7 @@ static void test_wm_set_get_text(void) { static const CHAR a_str[] = "a"; CHAR buff[16], time[16], caltype[3]; + WCHAR buffW[16]; HWND hWnd; LRESULT ret; @@ -802,6 +803,16 @@ static void test_wm_set_get_text(void) } DestroyWindow(hWnd); + + /* Window text is not preserved. */ + hWnd = CreateWindowExA(0, DATETIMEPICK_CLASSA, "testname", 0, 0, 50, 300, 120, + NULL, NULL, NULL, NULL); + + buffW[0] = 1; + InternalGetWindowText(hWnd, buffW, ARRAY_SIZE(buffW)); + ok(!buffW[0], "Unexpected window text %s.\n", wine_dbgstr_w(buffW)); + + DestroyWindow(hWnd); } static void test_dts_shownone(void)

1 0

Nikolay Sivov : comctl32/tests: Use wide strings literals.
by Alexandre Julliard Sept. 25, 2020

Sept. 25, 2020

Module: wine Branch: master Commit: 4c86e860e60de954059ddbb09931c52ca1d198f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c86e860e60de954059ddbb0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 25 10:36:17 2020 +0300 comctl32/tests: Use wide strings literals. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/button.c | 16 +++++----------- dlls/comctl32/tests/combo.c | 6 +++--- dlls/comctl32/tests/dpa.c | 6 ++---- dlls/comctl32/tests/listview.c | 17 +++++------------ dlls/comctl32/tests/misc.c | 13 +++++-------- dlls/comctl32/tests/mru.c | 22 ++++++++++------------ dlls/comctl32/tests/pager.c | 20 ++++++-------------- dlls/comctl32/tests/propsheet.c | 3 +-- dlls/comctl32/tests/syslink.c | 10 +++------- dlls/comctl32/tests/taskdialog.c | 14 +++++--------- dlls/comctl32/tests/toolbar.c | 30 ++++++++++++------------------ dlls/comctl32/tests/tooltips.c | 3 +-- dlls/comctl32/tests/treeview.c | 11 ++++++----- 13 files changed, 64 insertions(+), 107 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4c86e860e60de954059d…

1 0

Zebediah Figura : ws2_32: Translate WSA_FLAG_OVERLAPPED to NT overlapped flags.
by Alexandre Julliard Sept. 25, 2020

Sept. 25, 2020

Module: wine Branch: master Commit: 8fb897a5718767bb86c734c8ea90245aeb7bee47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8fb897a5718767bb86c734c8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 24 22:21:00 2020 -0500 ws2_32: Translate WSA_FLAG_OVERLAPPED to NT overlapped flags. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 5 +++-- server/sock.c | 12 ++++++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 1136ec87b9..f43c57bf9a 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -7716,7 +7716,8 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, RtlInitUnicodeString(&string, afdW); InitializeObjectAttributes(&attr, &string, (flags & WSA_FLAG_NO_HANDLE_INHERIT) ? 0 : OBJ_INHERIT, NULL, NULL); - if ((status = NtOpenFile(&handle, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, &attr, &io, 0, 0))) + if ((status = NtOpenFile(&handle, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, &attr, + &io, 0, (flags & WSA_FLAG_OVERLAPPED) ? 0 : FILE_SYNCHRONOUS_IO_NONALERT))) { WARN("Failed to create socket, status %#x.\n", status); WSASetLastError(NtStatusToWSAError(status)); @@ -7726,7 +7727,7 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, create_params.family = unixaf; create_params.type = unixtype; create_params.protocol = protocol; - create_params.flags = flags & ~WSA_FLAG_NO_HANDLE_INHERIT; + create_params.flags = flags & ~(WSA_FLAG_NO_HANDLE_INHERIT | WSA_FLAG_OVERLAPPED); if ((status = NtDeviceIoControlFile(handle, NULL, NULL, NULL, &io, IOCTL_AFD_CREATE, &create_params, sizeof(create_params), NULL, 0))) { diff --git a/server/sock.c b/server/sock.c index 3f19c77964..43a17d46ee 100644 --- a/server/sock.c +++ b/server/sock.c @@ -315,7 +315,7 @@ static inline int sock_error( struct fd *fd ) static int sock_dispatch_asyncs( struct sock *sock, int event, int error ) { - if ( sock->flags & WSA_FLAG_OVERLAPPED ) + if (is_fd_overlapped( sock->fd )) { if (event & (POLLIN|POLLPRI) && async_waiting( &sock->read_q )) { @@ -680,6 +680,7 @@ static struct sock *create_socket(void) static int init_socket( struct sock *sock, int family, int type, int protocol, unsigned int flags ) { + unsigned int options = 0; int sockfd; sockfd = socket( family, type, protocol ); @@ -696,10 +697,13 @@ static int init_socket( struct sock *sock, int family, int type, int protocol, u sock->type = type; sock->family = family; - if (sock->fd) release_object( sock->fd ); + if (sock->fd) + { + options = get_fd_options( sock->fd ); + release_object( sock->fd ); + } - if (!(sock->fd = create_anonymous_fd( &sock_fd_ops, sockfd, &sock->obj, - (flags & WSA_FLAG_OVERLAPPED) ? 0 : FILE_SYNCHRONOUS_IO_NONALERT ))) + if (!(sock->fd = create_anonymous_fd( &sock_fd_ops, sockfd, &sock->obj, options ))) { return -1; }

1 0

Zebediah Figura : ws2_32/tests: Add more tests for WSASocket() parameters.
by Alexandre Julliard Sept. 25, 2020

Sept. 25, 2020

Module: wine Branch: master Commit: 088b7c5814e8aee5676d0c999a2995533f21a4ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=088b7c5814e8aee5676d0c99… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 24 22:21:03 2020 -0500 ws2_32/tests: Add more tests for WSASocket() parameters. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 165 +++++++++++++++++++---------------------------- 1 file changed, 68 insertions(+), 97 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 7835246397..cbbc1db1ee 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2471,107 +2471,78 @@ static void test_WSASocket(void) int items, err, size, socktype, i, j; UINT pi_size; - SetLastError(0xdeadbeef); - ok(WSASocketA(0, 0, 0, NULL, 0, 0) == INVALID_SOCKET, - "WSASocketA should have failed\n"); - err = WSAGetLastError(); - ok(err == WSAEINVAL, "Expected 10022, received %d\n", err); - - sock = WSASocketA(AF_INET, 0, 0, NULL, 0, 0); - ok(sock != INVALID_SOCKET, "WSASocketA should have succeeded\n"); - closesocket(sock); - - sock = WSASocketA(AF_INET, SOCK_STREAM, 0, NULL, 0, 0); - ok(sock != INVALID_SOCKET, "WSASocketA should have succeeded\n"); - closesocket(sock); - - SetLastError(0xdeadbeef); - ok(WSASocketA(0, SOCK_STREAM, -1, NULL, 0, 0) == INVALID_SOCKET, - "WSASocketA should have failed\n"); - err = WSAGetLastError(); - ok(err == WSAEPROTONOSUPPORT, "Expected 10043, received %d\n", err); - - SetLastError(0xdeadbeef); - ok(WSASocketA(0, -1, IPPROTO_UDP, NULL, 0, 0) == INVALID_SOCKET, - "WSASocketA should have failed\n"); - err = WSAGetLastError(); - ok(err == WSAESOCKTNOSUPPORT, "Expected 10044, received %d\n", err); - - SetLastError(0xdeadbeef); - ok(WSASocketA(0, -1, 0, NULL, 0, 0) == INVALID_SOCKET, - "WSASocketA should have failed\n"); - err = WSAGetLastError(); - ok(err == WSAEINVAL, "Expected 10022, received %d\n", err); - - SetLastError(0xdeadbeef); - ok(WSASocketA(AF_INET, -1, 0, NULL, 0, 0) == INVALID_SOCKET, - "WSASocketA should have failed\n"); - err = WSAGetLastError(); - ok(err == WSAESOCKTNOSUPPORT, "Expected 10044, received %d\n", err); - - SetLastError(0xdeadbeef); - ok(WSASocketA(AF_INET, 0, -1, NULL, 0, 0) == INVALID_SOCKET, - "WSASocketA should have failed\n"); - err = WSAGetLastError(); - ok(err == WSAEPROTONOSUPPORT, "Expected 10043, received %d\n", err); - - SetLastError(0xdeadbeef); - ok(WSASocketA(0, -1, -1, NULL, 0, 0) == INVALID_SOCKET, - "WSASocketA should have failed\n"); - err = WSAGetLastError(); - ok(err == WSAESOCKTNOSUPPORT, "Expected 10044, received %d\n", err); - - SetLastError(0xdeadbeef); - ok(WSASocketA(-1, SOCK_STREAM, IPPROTO_UDP, NULL, 0, 0) == INVALID_SOCKET, - "WSASocketA should have failed\n"); - err = WSAGetLastError(); - ok(err == WSAEAFNOSUPPORT, "Expected 10047, received %d\n", err); - - sock = WSASocketA(AF_INET, 0, IPPROTO_TCP, NULL, 0, 0); - ok(sock != INVALID_SOCKET, "WSASocketA should have succeeded\n"); - closesocket(sock); - - SetLastError(0xdeadbeef); - ok(WSASocketA(0, SOCK_STREAM, 0, NULL, 0, 0) == INVALID_SOCKET, - "WSASocketA should have failed\n"); - err = WSAGetLastError(); - ok(err == WSAEINVAL, "Expected 10022, received %d\n", err); - - SetLastError(0xdeadbeef); - ok(WSASocketA(0, 0, 0xdead, NULL, 0, 0) == INVALID_SOCKET, - "WSASocketA should have failed\n"); - err = WSAGetLastError(); - ok(err == WSAEPROTONOSUPPORT, "Expected 10043, received %d\n", err); - - SetLastError(0xdeadbeef); - ok(WSASocketA(AF_INET, 0xdead, 0, NULL, 0, 0) == INVALID_SOCKET, - "WSASocketA should have failed\n"); - err = WSAGetLastError(); - ok(err == WSAESOCKTNOSUPPORT, "Expected 10044, received %d\n", err); + static const struct + { + int family, type, protocol; + DWORD error; + int ret_family, ret_type, ret_protocol; + } + tests[] = + { + /* 0 */ + {0xdead, SOCK_STREAM, IPPROTO_TCP, WSAEAFNOSUPPORT}, + {-1, SOCK_STREAM, IPPROTO_TCP, WSAEAFNOSUPPORT}, + {AF_INET, 0xdead, IPPROTO_TCP, WSAESOCKTNOSUPPORT}, + {AF_INET, -1, IPPROTO_TCP, WSAESOCKTNOSUPPORT}, + {AF_INET, SOCK_STREAM, 0xdead, WSAEPROTONOSUPPORT}, + {AF_INET, SOCK_STREAM, -1, WSAEPROTONOSUPPORT}, + {0xdead, 0xdead, IPPROTO_TCP, WSAESOCKTNOSUPPORT}, + {0xdead, SOCK_STREAM, 0xdead, WSAEAFNOSUPPORT}, + {AF_INET, 0xdead, 0xdead, WSAESOCKTNOSUPPORT}, + {0xdead, SOCK_STREAM, IPPROTO_UDP, WSAEAFNOSUPPORT}, + + /* 10 */ + {AF_INET, SOCK_STREAM, 0, 0, AF_INET, SOCK_STREAM, IPPROTO_TCP}, + {AF_INET, SOCK_DGRAM, 0, 0, AF_INET, SOCK_DGRAM, IPPROTO_UDP}, + {AF_INET, 0xdead, 0, WSAESOCKTNOSUPPORT}, + {AF_INET, 0, IPPROTO_TCP, 0, AF_INET, SOCK_STREAM, IPPROTO_TCP}, + {AF_INET, 0, IPPROTO_UDP, 0, AF_INET, SOCK_DGRAM, IPPROTO_UDP}, + {AF_INET, 0, 0xdead, WSAEPROTONOSUPPORT}, + {AF_INET, 0, 0, 0, AF_INET, SOCK_STREAM, IPPROTO_TCP}, + {AF_INET, SOCK_STREAM, IPPROTO_UDP, WSAEPROTONOSUPPORT}, + {AF_INET, SOCK_DGRAM, IPPROTO_TCP, WSAEPROTONOSUPPORT}, + + /* 19 */ + {AF_UNSPEC, SOCK_STREAM, IPPROTO_TCP, 0, AF_INET, SOCK_STREAM, IPPROTO_TCP}, + {AF_UNSPEC, SOCK_STREAM, 0xdead, WSAEPROTONOSUPPORT}, + {AF_UNSPEC, 0xdead, IPPROTO_UDP, WSAESOCKTNOSUPPORT}, + {AF_UNSPEC, SOCK_STREAM, 0, WSAEINVAL}, + {AF_UNSPEC, SOCK_DGRAM, 0, WSAEINVAL}, + {AF_UNSPEC, 0xdead, 0, WSAEINVAL}, + {AF_UNSPEC, 0, IPPROTO_TCP, 0, AF_INET, SOCK_STREAM, IPPROTO_TCP}, + {AF_UNSPEC, 0, IPPROTO_UDP, 0, AF_INET, SOCK_DGRAM, IPPROTO_UDP}, + {AF_UNSPEC, 0, 0xdead, WSAEPROTONOSUPPORT}, + {AF_UNSPEC, 0, 0, WSAEINVAL}, + }; - SetLastError(0xdeadbeef); - ok(WSASocketA(0, 0xdead, 0, NULL, 0, 0) == INVALID_SOCKET, - "WSASocketA should have failed\n"); - err = WSAGetLastError(); - ok(err == WSAEINVAL, "Expected 10022, received %d\n", err); + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + SetLastError( 0xdeadbeef ); + sock = WSASocketA( tests[i].family, tests[i].type, tests[i].protocol, NULL, 0, 0 ); + todo_wine_if (!tests[i].error || i == 7) + ok(WSAGetLastError() == tests[i].error, "Test %u: got wrong error %u\n", i, WSAGetLastError()); + if (tests[i].error) + { + ok(sock == INVALID_SOCKET, "Test %u: expected failure\n", i); + } + else + { + WSAPROTOCOL_INFOA info; - sock = WSASocketA(0, 0, IPPROTO_TCP, NULL, 0, 0); - ok(sock != INVALID_SOCKET, "WSASocketA should have succeeded\n"); - closesocket(sock); + todo_wine_if (i == 19) ok(sock != INVALID_SOCKET, "Text %u: expected success\n", i); + if (sock == INVALID_SOCKET) continue; - /* SOCK_STREAM does not support IPPROTO_UDP */ - SetLastError(0xdeadbeef); - ok(WSASocketA(AF_INET, SOCK_STREAM, IPPROTO_UDP, NULL, 0, 0) == INVALID_SOCKET, - "WSASocketA should have failed\n"); - err = WSAGetLastError(); - ok(err == WSAEPROTONOSUPPORT, "Expected 10043, received %d\n", err); + size = sizeof(info); + err = getsockopt( sock, SOL_SOCKET, SO_PROTOCOL_INFOA, (char *)&info, &size ); + ok(!err, "Test %u: getsockopt failed, error %u\n", i, WSAGetLastError()); + ok(info.iAddressFamily == tests[i].ret_family, "Test %u: got wrong family %d\n", i, info.iAddressFamily); + ok(info.iSocketType == tests[i].ret_type, "Test %u: got wrong type %d\n", i, info.iSocketType); + todo_wine_if (i == 10 || i == 11 || i == 16) + ok(info.iProtocol == tests[i].ret_protocol, "Test %u: got wrong protocol %d\n", i, info.iProtocol); - /* SOCK_DGRAM does not support IPPROTO_TCP */ - SetLastError(0xdeadbeef); - ok(WSASocketA(AF_INET, SOCK_DGRAM, IPPROTO_TCP, NULL, 0, 0) == INVALID_SOCKET, - "WSASocketA should have failed\n"); - err = WSAGetLastError(); - ok(err == WSAEPROTONOSUPPORT, "Expected 10043, received %d\n", err); + closesocket( sock ); + } + } /* Set pi_size explicitly to a value below 2*sizeof(WSAPROTOCOL_INFOA) * to avoid a crash on win98.

1 0

Zebediah Figura : ws2_32: Always return WSAEINVAL if AF_UNSPEC is used with a zero protocol.
by Alexandre Julliard Sept. 25, 2020

Sept. 25, 2020

Module: wine Branch: master Commit: 2a573c6f4899e7ccdb0492ba5029c7f8506590e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a573c6f4899e7ccdb0492ba… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 24 22:21:04 2020 -0500 ws2_32: Always return WSAEINVAL if AF_UNSPEC is used with a zero protocol. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 1ac1f77d6e..5089029f4b 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -7648,7 +7648,13 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, protocol = lpProtocolInfo->iProtocol; } - if (!type && (af || protocol)) + if (!af && !protocol) + { + WSASetLastError(WSAEINVAL); + return INVALID_SOCKET; + } + + if (!type) { int autoproto = protocol; WSAPROTOCOL_INFOW infow;

1 0

Zebediah Figura : ws2_32: Translate SIO_ADDRESS_LIST_CHANGE into a proper NT ioctl.
by Alexandre Julliard Sept. 25, 2020

Sept. 25, 2020

Module: wine Branch: master Commit: c6806e3f204413294bd16a7b93dc5893bc00fe83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6806e3f204413294bd16a7b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 24 22:21:01 2020 -0500 ws2_32: Translate SIO_ADDRESS_LIST_CHANGE into a proper NT ioctl. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 4 ++++ include/wine/afd.h | 2 ++ server/sock.c | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f43c57bf9a..1ac1f77d6e 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5164,6 +5164,10 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID case 0x667e: /* Netscape tries hard to use bogus ioctl 0x667e */ SetLastError(WSAEOPNOTSUPP); return SOCKET_ERROR; + case WS_SIO_ADDRESS_LIST_CHANGE: + code = IOCTL_AFD_ADDRESS_LIST_CHANGE; + status = WSAEOPNOTSUPP; + break; default: status = WSAEOPNOTSUPP; break; diff --git a/include/wine/afd.h b/include/wine/afd.h index 41caaa7b4f..24e6c31f22 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -25,6 +25,8 @@ #define IOCTL_AFD_CREATE CTL_CODE(FILE_DEVICE_NETWORK, 200, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_AFD_ADDRESS_LIST_CHANGE CTL_CODE(FILE_DEVICE_NETWORK, 323, METHOD_BUFFERED, 0) + struct afd_create_params { int family, type, protocol; diff --git a/server/sock.c b/server/sock.c index 43a17d46ee..a0191d15e5 100644 --- a/server/sock.c +++ b/server/sock.c @@ -562,7 +562,7 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 0; } - case WS_SIO_ADDRESS_LIST_CHANGE: + case IOCTL_AFD_ADDRESS_LIST_CHANGE: if ((sock->state & FD_WINE_NONBLOCKING) && async_is_blocking( async )) { set_win32_error( WSAEWOULDBLOCK ); @@ -572,6 +572,7 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) queue_async( &sock->ifchange_q, async ); set_error( STATUS_PENDING ); return 1; + default: set_error( STATUS_NOT_SUPPORTED ); return 0;

1 0

Zebediah Figura : server: Move sock_ioctl() down to avoid forward declarations.
by Alexandre Julliard Sept. 25, 2020

Sept. 25, 2020

Module: wine Branch: master Commit: c2b089aae52c1d275098e1e8b87c0f9a5340b206 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2b089aae52c1d275098e1e8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 24 22:21:02 2020 -0500 server: Move sock_ioctl() down to avoid forward declarations. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 81 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 40 insertions(+), 41 deletions(-) diff --git a/server/sock.c b/server/sock.c index a0191d15e5..3bc4780f94 100644 --- a/server/sock.c +++ b/server/sock.c @@ -134,7 +134,6 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); static void sock_queue_async( struct fd *fd, struct async *async, int type, int count ); static void sock_reselect_async( struct fd *fd, struct async_queue *queue ); -static int init_socket( struct sock *sock, int family, int type, int protocol, unsigned int flags ); static int sock_get_ntstatus( int err ); static unsigned int sock_get_error( int err ); @@ -539,46 +538,6 @@ static enum server_fd_type sock_get_fd_type( struct fd *fd ) return FD_TYPE_SOCKET; } -static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) -{ - struct sock *sock = get_fd_user( fd ); - - assert( sock->obj.ops == &sock_ops ); - - if (get_unix_fd( fd ) == -1 && code != IOCTL_AFD_CREATE) return 0; - - switch(code) - { - case IOCTL_AFD_CREATE: - { - const struct afd_create_params *params = get_req_data(); - - if (get_req_data_size() != sizeof(*params)) - { - set_error( STATUS_INVALID_PARAMETER ); - return 0; - } - init_socket( sock, params->family, params->type, params->protocol, params->flags ); - return 0; - } - - case IOCTL_AFD_ADDRESS_LIST_CHANGE: - if ((sock->state & FD_WINE_NONBLOCKING) && async_is_blocking( async )) - { - set_win32_error( WSAEWOULDBLOCK ); - return 0; - } - if (!sock_get_ifchange( sock )) return 0; - queue_async( &sock->ifchange_q, async ); - set_error( STATUS_PENDING ); - return 1; - - default: - set_error( STATUS_NOT_SUPPORTED ); - return 0; - } -} - static void sock_queue_async( struct fd *fd, struct async *async, int type, int count ) { struct sock *sock = get_fd_user( fd ); @@ -958,6 +917,46 @@ static int sock_get_ntstatus( int err ) } } +static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) +{ + struct sock *sock = get_fd_user( fd ); + + assert( sock->obj.ops == &sock_ops ); + + if (get_unix_fd( fd ) == -1 && code != IOCTL_AFD_CREATE) return 0; + + switch(code) + { + case IOCTL_AFD_CREATE: + { + const struct afd_create_params *params = get_req_data(); + + if (get_req_data_size() != sizeof(*params)) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + init_socket( sock, params->family, params->type, params->protocol, params->flags ); + return 0; + } + + case IOCTL_AFD_ADDRESS_LIST_CHANGE: + if ((sock->state & FD_WINE_NONBLOCKING) && async_is_blocking( async )) + { + set_win32_error( WSAEWOULDBLOCK ); + return 0; + } + if (!sock_get_ifchange( sock )) return 0; + queue_async( &sock->ifchange_q, async ); + set_error( STATUS_PENDING ); + return 1; + + default: + set_error( STATUS_NOT_SUPPORTED ); + return 0; + } +} + #ifdef HAVE_LINUX_RTNETLINK_H /* only keep one ifchange object around, all sockets waiting for wakeups will look to it */

1 0

Michael Stefaniuc : dmime: dmutils.h is no longer needed.
by Alexandre Julliard Sept. 25, 2020

Sept. 25, 2020

Module: wine Branch: master Commit: 59aa29cd1db00bb09b6faa1d7a65de00ae827ff1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59aa29cd1db00bb09b6faa1d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Sep 24 22:03:57 2020 +0200 dmime: dmutils.h is no longer needed. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/dmime_private.h | 2 -- dlls/dmime/dmutils.h | 30 ------------------------------ 2 files changed, 32 deletions(-) diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h index 9759039a03..69067fca55 100644 --- a/dlls/dmime/dmime_private.h +++ b/dlls/dmime/dmime_private.h @@ -114,6 +114,4 @@ static inline void DMIME_UnlockModule(void) { InterlockedDecrement( &DMIME_refCo * Misc. */ -#include "dmutils.h" - #endif /* __WINE_DMIME_PRIVATE_H */ diff --git a/dlls/dmime/dmutils.h b/dlls/dmime/dmutils.h deleted file mode 100644 index 521b148604..0000000000 --- a/dlls/dmime/dmutils.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Debug and Helper Functions - * - * Copyright (C) 2003-2004 Rok Mandeljc - * Copyright (C) 2003-2004 Raphael Junqueira - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef __WINE_DMUTILS_H -#define __WINE_DMUTILS_H - -/* for simpler reading */ -typedef struct _DMUS_PRIVATE_CHUNK { - FOURCC fccID; /* FOURCC ID of the chunk */ - DWORD dwSize; /* size of the chunk */ -} DMUS_PRIVATE_CHUNK, *LPDMUS_PRIVATE_CHUNK; - -#endif /* __WINE_DMUTILS_H */

1 0

Michael Stefaniuc : dmcompos: Remove the unused DMUS_PRIVATE_CHUNK struct.
by Alexandre Julliard Sept. 25, 2020

Sept. 25, 2020

Module: wine Branch: master Commit: 657a78f1a6f6429ccfc905e8f44bf64d15fae1de URL: https://source.winehq.org/git/wine.git/?a=commit;h=657a78f1a6f6429ccfc905e8… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Sep 24 22:17:45 2020 +0200 dmcompos: Remove the unused DMUS_PRIVATE_CHUNK struct. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmcompos/dmcompos_private.h | 9 --------- 1 file changed, 9 deletions(-) diff --git a/dlls/dmcompos/dmcompos_private.h b/dlls/dmcompos/dmcompos_private.h index 98796875b8..bfee61e5be 100644 --- a/dlls/dmcompos/dmcompos_private.h +++ b/dlls/dmcompos/dmcompos_private.h @@ -56,13 +56,4 @@ extern LONG DMCOMPOS_refCount DECLSPEC_HIDDEN; static inline void DMCOMPOS_LockModule(void) { InterlockedIncrement( &DMCOMPOS_refCount ); } static inline void DMCOMPOS_UnlockModule(void) { InterlockedDecrement( &DMCOMPOS_refCount ); } -/***************************************************************************** - * Misc. - */ -/* for simpler reading */ -typedef struct _DMUS_PRIVATE_CHUNK { - FOURCC fccID; /* FOURCC ID of the chunk */ - DWORD dwSize; /* size of the chunk */ -} DMUS_PRIVATE_CHUNK, *LPDMUS_PRIVATE_CHUNK; - #endif /* __WINE_DMCOMPOS_PRIVATE_H */

1 0

Michael Stefaniuc : dmime: Get rid of the DMUS_PRIVATE_SEGMENT_ITEM typedef.
by Alexandre Julliard Sept. 25, 2020

Sept. 25, 2020

Module: wine Branch: master Commit: ee2e44f790a4c070b7916a619ed147d6ab15fcc6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee2e44f790a4c070b7916a61… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Sep 24 22:03:58 2020 +0200 dmime: Get rid of the DMUS_PRIVATE_SEGMENT_ITEM typedef. Also move the struct to its only user. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/dmime_private.h | 7 ------- dlls/dmime/segtriggertrack.c | 23 +++++++++++++++-------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h index 69067fca55..c2221a15fd 100644 --- a/dlls/dmime/dmime_private.h +++ b/dlls/dmime/dmime_private.h @@ -86,13 +86,6 @@ typedef struct _DMUS_PRIVATE_TEMPO_ITEM { DMUS_IO_TEMPO_ITEM item; } DMUS_PRIVATE_TEMPO_ITEM, *LPDMUS_PRIVATE_TEMPO_ITEM; -typedef struct _DMUS_PRIVATE_SEGMENT_ITEM { - struct list entry; /* for listing elements */ - DMUS_IO_SEGMENT_ITEM_HEADER header; - IDirectMusicObject* pObject; - WCHAR wszName[DMUS_MAX_NAME]; -} DMUS_PRIVATE_SEGMENT_ITEM, *LPDMUS_PRIVATE_SEGMENT_ITEM; - typedef struct _DMUS_PRIVATE_GRAPH_TOOL { struct list entry; /* for listing elements */ DWORD dwIndex; diff --git a/dlls/dmime/segtriggertrack.c b/dlls/dmime/segtriggertrack.c index ec1da7e1ed..9a7602f58d 100644 --- a/dlls/dmime/segtriggertrack.c +++ b/dlls/dmime/segtriggertrack.c @@ -28,6 +28,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime); /***************************************************************************** * IDirectMusicSegTriggerTrack implementation */ +struct segment_item { + struct list entry; + DMUS_IO_SEGMENT_ITEM_HEADER header; + IDirectMusicObject *dmobj; + WCHAR name[DMUS_MAX_NAME]; +}; + typedef struct IDirectMusicSegTriggerTrack { IDirectMusicTrack8 IDirectMusicTrack8_iface; struct dmobject dmobj;/* IPersistStream only */ @@ -83,14 +90,14 @@ static ULONG WINAPI segment_track_Release(IDirectMusicTrack8 *iface) if (!ref) { struct list *cursor, *cursor2; - DMUS_PRIVATE_SEGMENT_ITEM *item; + struct segment_item *item; LIST_FOR_EACH_SAFE(cursor, cursor2, &This->Items) { - item = LIST_ENTRY(cursor, DMUS_PRIVATE_SEGMENT_ITEM, entry); + item = LIST_ENTRY(cursor, struct segment_item, entry); list_remove(cursor); - if (item->pObject) - IDirectMusicObject_Release(item->pObject); + if (item->dmobj) + IDirectMusicObject_Release(item->dmobj); heap_free(item); } @@ -262,7 +269,7 @@ static HRESULT parse_segment_item(IDirectMusicSegTriggerTrack *This, IStream *st const struct chunk_entry *lseg) { struct chunk_entry chunk = {.parent = lseg}; - DMUS_PRIVATE_SEGMENT_ITEM *item; + struct segment_item *item; HRESULT hr; /* First chunk is a header */ @@ -286,7 +293,7 @@ static HRESULT parse_segment_item(IDirectMusicSegTriggerTrack *This, IStream *st hr = DMUS_E_INVALID_SEGMENTTRIGGERTRACK; goto error; } - if (FAILED(hr = dmobj_parsereference(stream, &chunk, &item->pObject))) + if (FAILED(hr = dmobj_parsereference(stream, &chunk, &item->dmobj))) goto error; /* Optional third chunk if the reference is a motif */ @@ -294,10 +301,10 @@ static HRESULT parse_segment_item(IDirectMusicSegTriggerTrack *This, IStream *st if (FAILED(hr = stream_next_chunk(stream, &chunk))) goto error; if (chunk.id == DMUS_FOURCC_SEGMENTITEMNAME_CHUNK) - if (FAILED(hr = stream_chunk_get_wstr(stream, &chunk, item->wszName, DMUS_MAX_NAME))) + if (FAILED(hr = stream_chunk_get_wstr(stream, &chunk, item->name, DMUS_MAX_NAME))) goto error; - TRACE("Found motif name: %s\n", debugstr_w(item->wszName)); + TRACE("Found motif name: %s\n", debugstr_w(item->name)); } list_add_tail(&This->Items, &item->entry);

1 0