July 2021 - Wine-commits - list.winehq.org

Esme Povirk : rundll32: Only call LoadLibrary16 on x86.
by Alexandre Julliard 07 Jul '21

07 Jul '21

Module: wine Branch: master Commit: 53ec99daeb0551fb2f7dd48c03c63951b8ff6824 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53ec99daeb0551fb2f7dd48c… Author: Esme Povirk <esme(a)codeweavers.com> Date: Tue Jul 6 16:31:47 2021 -0500 rundll32: Only call LoadLibrary16 on x86. These are imported by ordinal, so on other architectures we end up calling whatever ends up on that ordinal, which is currently Beep on x86_64. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/rundll32/rundll32.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/programs/rundll32/rundll32.c b/programs/rundll32/rundll32.c index eb7713518a9..fe9d17f0f48 100644 --- a/programs/rundll32/rundll32.c +++ b/programs/rundll32/rundll32.c @@ -83,8 +83,6 @@ static void call_entry_point( void *func, HWND hwnd, HINSTANCE inst, void *cmdli } #endif -static HINSTANCE16 (WINAPI *pLoadLibrary16)(LPCSTR libname); -static FARPROC16 (WINAPI *pGetProcAddress16)(HMODULE16 hModule, LPCSTR name); static void (WINAPI *pRunDLL_CallEntry16)( FARPROC proc, HWND hwnd, HINSTANCE inst, LPCSTR cmdline, INT cmdshow ); @@ -112,8 +110,11 @@ static ATOM register_class(void) return RegisterClassExW(&wcex); } +#ifdef __i386__ + static HINSTANCE16 load_dll16( LPCWSTR dll ) { + HINSTANCE16 (WINAPI *pLoadLibrary16)(LPCSTR libname); HINSTANCE16 ret = 0; DWORD len = WideCharToMultiByte( CP_ACP, 0, dll, -1, NULL, 0, NULL, NULL ); char *dllA = HeapAlloc( GetProcessHeap(), 0, len ); @@ -130,6 +131,7 @@ static HINSTANCE16 load_dll16( LPCWSTR dll ) static FARPROC16 get_entry_point16( HINSTANCE16 inst, LPCWSTR entry ) { + FARPROC16 (WINAPI *pGetProcAddress16)(HMODULE16 hModule, LPCSTR name); FARPROC16 ret = 0; DWORD len = WideCharToMultiByte( CP_ACP, 0, entry, -1, NULL, 0, NULL, NULL ); char *entryA = HeapAlloc( GetProcessHeap(), 0, len ); @@ -143,6 +145,7 @@ static FARPROC16 get_entry_point16( HINSTANCE16 inst, LPCWSTR entry ) } return ret; } +#endif static void *get_entry_point32( HMODULE module, LPCWSTR entry, BOOL *unicode ) { @@ -272,8 +275,8 @@ int WINAPI wWinMain(HINSTANCE instance, HINSTANCE hOldInstance, LPWSTR szCmdLine { HWND hWnd; LPWSTR szDllName,szEntryPoint; - void *entry_point; - BOOL unicode = FALSE, win16; + void *entry_point = NULL; + BOOL unicode = FALSE, win16 = FALSE; STARTUPINFOW info; HMODULE hDll; @@ -300,11 +303,8 @@ int WINAPI wWinMain(HINSTANCE instance, HINSTANCE hOldInstance, LPWSTR szCmdLine /* Load the library */ hDll=LoadLibraryW(szDllName); - if (hDll) - { - win16 = FALSE; - entry_point = get_entry_point32( hDll, szEntryPoint, &unicode ); - } + if (hDll) entry_point = get_entry_point32( hDll, szEntryPoint, &unicode ); +#ifdef __i386__ else { HINSTANCE16 dll = load_dll16( szDllName ); @@ -315,9 +315,9 @@ int WINAPI wWinMain(HINSTANCE instance, HINSTANCE hOldInstance, LPWSTR szCmdLine goto CLEANUP; } win16 = TRUE; - unicode = FALSE; entry_point = get_entry_point16( dll, szEntryPoint ); } +#endif if (!entry_point) {

1 0

Zebediah Figura : server: Clear the connection error after a successful connection.
by Alexandre Julliard 07 Jul '21

07 Jul '21

Module: wine Branch: master Commit: ddb922391512f4d596b604017b329536285e65a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddb922391512f4d596b60401… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jul 6 23:48:41 2021 -0500 server: Clear the connection error after a successful connection. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 2 +- server/sock.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 9e7cd3a1d39..75e83927007 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3344,7 +3344,7 @@ static void test_select(void) id = 0xdeadbeef; ret = getsockopt(fdWrite, SOL_SOCKET, SO_ERROR, (char *)&id, &len); ok(!ret, "getsockopt failed with %d\n", WSAGetLastError()); - todo_wine ok(!id, "got error %u\n", id); + ok(!id, "got error %u\n", id); closesocket(fdWrite); diff --git a/server/sock.c b/server/sock.c index 58e9cf4302a..5fdbf0bd9ba 100644 --- a/server/sock.c +++ b/server/sock.c @@ -983,7 +983,10 @@ static void sock_dispatch_events( struct sock *sock, enum connection_state prevs case SOCK_CONNECTING: if (event & POLLOUT) + { post_socket_event( sock, AFD_POLL_BIT_CONNECT, 0 ); + sock->errors[AFD_POLL_BIT_CONNECT_ERR] = 0; + } if (event & (POLLERR | POLLHUP)) post_socket_event( sock, AFD_POLL_BIT_CONNECT_ERR, error ); break;

1 0

Zebediah Figura : ws2_32/tests: Add more tests for invalid calls to connect() and ConnectEx().
by Alexandre Julliard 07 Jul '21

07 Jul '21

Module: wine Branch: master Commit: 34e3301b190e17bedb0a6adc7541865e5d721470 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34e3301b190e17bedb0a6adc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jul 6 23:48:42 2021 -0500 ws2_32/tests: Add more tests for invalid calls to connect() and ConnectEx(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 95 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 85 insertions(+), 10 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 75e83927007..3e0ac405447 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -6576,7 +6576,7 @@ static void test_WSAPoll(void) closesocket(server); } -static void test_ConnectEx(void) +static void test_connect(void) { SOCKET listener = INVALID_SOCKET; SOCKET acceptor = INVALID_SOCKET; @@ -6610,6 +6610,9 @@ static void test_ConnectEx(void) iret = getsockname(listener, (struct sockaddr*)&address, &addrlen); ok(!iret, "failed to get address, error %u\n", WSAGetLastError()); + iret = listen(listener, 1); + ok(!iret, "failed to listen, error %u\n", WSAGetLastError()); + iret = set_blocking(listener, TRUE); ok(!iret, "failed to set nonblocking, error %u\n", WSAGetLastError()); @@ -6620,6 +6623,20 @@ static void test_ConnectEx(void) ok(bytesReturned == sizeof(pConnectEx), "expected sizeof(pConnectEx), got %u\n", bytesReturned); + WSASetLastError(0xdeadbeef); + iret = connect(listener, (struct sockaddr *)&address, sizeof(address)); + ok(iret == -1, "got %d\n", iret); + todo_wine ok(WSAGetLastError() == WSAEINVAL, "got error %u\n", WSAGetLastError()); + + WSASetLastError(0xdeadbeef); + overlapped.Internal = 0xdeadbeef; + overlapped.InternalHigh = 0xdeadbeef; + iret = pConnectEx(listener, (struct sockaddr *)&address, sizeof(address), NULL, 0, &bytesReturned, &overlapped); + ok(!iret, "got %d\n", iret); + todo_wine ok(WSAGetLastError() == WSAEINVAL, "got error %u\n", WSAGetLastError()); + ok(overlapped.Internal == STATUS_PENDING, "got status %#x\n", (NTSTATUS)overlapped.Internal); + todo_wine ok(overlapped.InternalHigh == 0xdeadbeef, "got size %Iu\n", overlapped.InternalHigh); + bret = pConnectEx(INVALID_SOCKET, (struct sockaddr*)&address, addrlen, NULL, 0, &bytesReturned, &overlapped); ok(bret == FALSE && WSAGetLastError() == WSAENOTSOCK, "ConnectEx on invalid socket " "returned %d + errno %d\n", bret, WSAGetLastError()); @@ -6641,9 +6658,6 @@ static void test_ConnectEx(void) overlapped.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); - iret = listen(listener, 1); - ok(!iret, "failed to listen, error %u\n", WSAGetLastError()); - bret = pConnectEx(connector, (struct sockaddr*)&address, addrlen, NULL, 0, &bytesReturned, &overlapped); ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "ConnectEx failed: " "returned %d + errno %d\n", bret, WSAGetLastError()); @@ -6690,7 +6704,73 @@ static void test_ConnectEx(void) ok(buffer[0] == '1' && buffer[1] == '2' && buffer[2] == '3', "Failed to get the right data, expected '123', got '%s'\n", buffer); + WSASetLastError(0xdeadbeef); + iret = connect(connector, (struct sockaddr *)&address, sizeof(address)); + todo_wine ok(iret == -1, "got %d\n", iret); + todo_wine ok(WSAGetLastError() == WSAEINVAL, "got error %u\n", WSAGetLastError()); + + WSASetLastError(0xdeadbeef); + iret = connect(acceptor, (struct sockaddr *)&address, sizeof(address)); + ok(iret == -1, "got %d\n", iret); + ok(WSAGetLastError() == WSAEISCONN, "got error %u\n", WSAGetLastError()); + + WSASetLastError(0xdeadbeef); + overlapped.Internal = 0xdeadbeef; + overlapped.InternalHigh = 0xdeadbeef; + bret = pConnectEx(connector, (struct sockaddr *)&address, sizeof(address), NULL, 0, &bytesReturned, &overlapped); + ok(!bret, "got %d\n", bret); + ok(WSAGetLastError() == WSAEISCONN, "got error %u\n", WSAGetLastError()); + ok(overlapped.Internal == STATUS_PENDING, "got status %#x\n", (NTSTATUS)overlapped.Internal); + todo_wine ok(overlapped.InternalHigh == 0xdeadbeef, "got size %Iu\n", overlapped.InternalHigh); + + WSASetLastError(0xdeadbeef); + overlapped.Internal = 0xdeadbeef; + overlapped.InternalHigh = 0xdeadbeef; + bret = pConnectEx(acceptor, (struct sockaddr *)&address, sizeof(address), NULL, 0, &bytesReturned, &overlapped); + ok(!bret, "got %d\n", bret); + ok(WSAGetLastError() == WSAEISCONN, "got error %u\n", WSAGetLastError()); + ok(overlapped.Internal == STATUS_PENDING, "got status %#x\n", (NTSTATUS)overlapped.Internal); + todo_wine ok(overlapped.InternalHigh == 0xdeadbeef, "got size %Iu\n", overlapped.InternalHigh); + + closesocket(connector); + closesocket(acceptor); + closesocket(listener); + + tcp_socketpair(&connector, &acceptor); + + WSASetLastError(0xdeadbeef); + iret = connect(connector, (struct sockaddr *)&address, sizeof(address)); + todo_wine ok(iret == -1, "got %d\n", iret); + todo_wine ok(WSAGetLastError() == WSAEISCONN, "got error %u\n", WSAGetLastError()); + + WSASetLastError(0xdeadbeef); + iret = connect(acceptor, (struct sockaddr *)&address, sizeof(address)); + ok(iret == -1, "got %d\n", iret); + ok(WSAGetLastError() == WSAEISCONN, "got error %u\n", WSAGetLastError()); + + WSASetLastError(0xdeadbeef); + overlapped.Internal = 0xdeadbeef; + overlapped.InternalHigh = 0xdeadbeef; + bret = pConnectEx(connector, (struct sockaddr *)&address, sizeof(address), NULL, 0, &bytesReturned, &overlapped); + ok(!bret, "got %d\n", bret); + ok(WSAGetLastError() == WSAEISCONN, "got error %u\n", WSAGetLastError()); + ok(overlapped.Internal == STATUS_PENDING, "got status %#x\n", (NTSTATUS)overlapped.Internal); + todo_wine ok(overlapped.InternalHigh == 0xdeadbeef, "got size %Iu\n", overlapped.InternalHigh); + + WSASetLastError(0xdeadbeef); + overlapped.Internal = 0xdeadbeef; + overlapped.InternalHigh = 0xdeadbeef; + bret = pConnectEx(acceptor, (struct sockaddr *)&address, sizeof(address), NULL, 0, &bytesReturned, &overlapped); + ok(!bret, "got %d\n", bret); + ok(WSAGetLastError() == WSAEISCONN, "got error %u\n", WSAGetLastError()); + ok(overlapped.Internal == STATUS_PENDING, "got status %#x\n", (NTSTATUS)overlapped.Internal); + todo_wine ok(overlapped.InternalHigh == 0xdeadbeef, "got size %Iu\n", overlapped.InternalHigh); + closesocket(connector); + closesocket(acceptor); + + /* Connect with error */ + connector = socket(AF_INET, SOCK_STREAM, 0); ok(connector != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); /* ConnectEx needs a bound socket */ @@ -6700,11 +6780,6 @@ static void test_ConnectEx(void) iret = bind(connector, (struct sockaddr*)&conaddress, sizeof(conaddress)); ok(!iret, "failed to bind, error %u\n", WSAGetLastError()); - closesocket(acceptor); - closesocket(listener); - - /* Connect with error */ - address.sin_port = htons(1); bret = pConnectEx(connector, (struct sockaddr*)&address, addrlen, NULL, 0, &bytesReturned, &overlapped); @@ -11264,7 +11339,7 @@ START_TEST( sock ) test_ipv6only(); test_TransmitFile(); test_AcceptEx(); - test_ConnectEx(); + test_connect(); test_shutdown(); test_DisconnectEx();

1 0

Zebediah Figura : server: Explicitly forbid connecting a listening or connected socket.
by Alexandre Julliard 07 Jul '21

07 Jul '21

Module: wine Branch: master Commit: 3b33a6b4873d2d75418c298880766f63b82d4534 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b33a6b4873d2d75418c2988… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jul 6 23:48:43 2021 -0500 server: Explicitly forbid connecting a listening or connected socket. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51381 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 10 +++++----- server/sock.c | 23 ++++++++++++++++++----- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 3e0ac405447..97b772e12d9 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -6626,14 +6626,14 @@ static void test_connect(void) WSASetLastError(0xdeadbeef); iret = connect(listener, (struct sockaddr *)&address, sizeof(address)); ok(iret == -1, "got %d\n", iret); - todo_wine ok(WSAGetLastError() == WSAEINVAL, "got error %u\n", WSAGetLastError()); + ok(WSAGetLastError() == WSAEINVAL, "got error %u\n", WSAGetLastError()); WSASetLastError(0xdeadbeef); overlapped.Internal = 0xdeadbeef; overlapped.InternalHigh = 0xdeadbeef; iret = pConnectEx(listener, (struct sockaddr *)&address, sizeof(address), NULL, 0, &bytesReturned, &overlapped); ok(!iret, "got %d\n", iret); - todo_wine ok(WSAGetLastError() == WSAEINVAL, "got error %u\n", WSAGetLastError()); + ok(WSAGetLastError() == WSAEINVAL, "got error %u\n", WSAGetLastError()); ok(overlapped.Internal == STATUS_PENDING, "got status %#x\n", (NTSTATUS)overlapped.Internal); todo_wine ok(overlapped.InternalHigh == 0xdeadbeef, "got size %Iu\n", overlapped.InternalHigh); @@ -6706,7 +6706,7 @@ static void test_connect(void) WSASetLastError(0xdeadbeef); iret = connect(connector, (struct sockaddr *)&address, sizeof(address)); - todo_wine ok(iret == -1, "got %d\n", iret); + ok(iret == -1, "got %d\n", iret); todo_wine ok(WSAGetLastError() == WSAEINVAL, "got error %u\n", WSAGetLastError()); WSASetLastError(0xdeadbeef); @@ -6740,8 +6740,8 @@ static void test_connect(void) WSASetLastError(0xdeadbeef); iret = connect(connector, (struct sockaddr *)&address, sizeof(address)); - todo_wine ok(iret == -1, "got %d\n", iret); - todo_wine ok(WSAGetLastError() == WSAEISCONN, "got error %u\n", WSAGetLastError()); + ok(iret == -1, "got %d\n", iret); + ok(WSAGetLastError() == WSAEISCONN, "got error %u\n", WSAGetLastError()); WSASetLastError(0xdeadbeef); iret = connect(acceptor, (struct sockaddr *)&address, sizeof(address)); diff --git a/server/sock.c b/server/sock.c index 5fdbf0bd9ba..3f0526016f9 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2164,12 +2164,25 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 0; } - if (sock->state == SOCK_CONNECTING) + switch (sock->state) { - /* FIXME: STATUS_ADDRESS_ALREADY_ASSOCIATED probably isn't right, - * but there's no status code that maps to WSAEALREADY... */ - set_error( params->synchronous ? STATUS_ADDRESS_ALREADY_ASSOCIATED : STATUS_INVALID_PARAMETER ); - return 0; + case SOCK_LISTENING: + set_error( STATUS_INVALID_PARAMETER ); + return 0; + + case SOCK_CONNECTING: + /* FIXME: STATUS_ADDRESS_ALREADY_ASSOCIATED probably isn't right, + * but there's no status code that maps to WSAEALREADY... */ + set_error( params->synchronous ? STATUS_ADDRESS_ALREADY_ASSOCIATED : STATUS_INVALID_PARAMETER ); + return 0; + + case SOCK_CONNECTED: + set_error( STATUS_CONNECTION_ACTIVE ); + return 0; + + case SOCK_UNCONNECTED: + case SOCK_CONNECTIONLESS: + break; } unix_len = sockaddr_to_unix( addr, params->addr_len, &unix_addr );

1 0

Zebediah Figura : ws2_32: Move the setsockopt(IP_DROP_MEMBERSHIP) implementation to ntdll.
by Alexandre Julliard 07 Jul '21

07 Jul '21

Module: wine Branch: master Commit: af3efd38ab11fdec33bf5335b61750cfd259d6a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af3efd38ab11fdec33bf5335… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jul 6 23:48:44 2021 -0500 ws2_32: Move the setsockopt(IP_DROP_MEMBERSHIP) implementation to ntdll. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 3 +++ dlls/ws2_32/socket.c | 4 +++- include/wine/afd.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 3f2dfe7c1f2..04917d19e92 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1736,6 +1736,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc } #endif + case IOCTL_AFD_WINE_SET_IP_DROP_MEMBERSHIP: + return do_setsockopt( handle, io, IPPROTO_IP, IP_DROP_MEMBERSHIP, in_buffer, in_size ); + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 10e79d3f8ff..48b9fe8c594 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3637,6 +3637,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_IP_DONTFRAGMENT: return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_DONTFRAGMENT, optval, optlen ); + case WS_IP_DROP_MEMBERSHIP: + return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_DROP_MEMBERSHIP, optval, optlen ); + case WS_IP_DROP_SOURCE_MEMBERSHIP: case WS_IP_UNBLOCK_SOURCE: { @@ -3651,7 +3654,6 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, convert_sockopt(&level, &optname); break; } - case WS_IP_DROP_MEMBERSHIP: #ifdef IP_HDRINCL case WS_IP_HDRINCL: #endif diff --git a/include/wine/afd.h b/include/wine/afd.h index 5b4114f4d77..c660e982d0e 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -186,6 +186,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_SET_IP_BLOCK_SOURCE WINE_AFD_IOC(241) #define IOCTL_AFD_WINE_GET_IP_DONTFRAGMENT WINE_AFD_IOC(242) #define IOCTL_AFD_WINE_SET_IP_DONTFRAGMENT WINE_AFD_IOC(243) +#define IOCTL_AFD_WINE_SET_IP_DROP_MEMBERSHIP WINE_AFD_IOC(244) struct afd_create_params {

1 0

Zebediah Figura : ws2_32: Move the setsockopt(IP_DROP_SOURCE_MEMBERSHIP) implementation to ntdll.
by Alexandre Julliard 07 Jul '21

07 Jul '21

Module: wine Branch: master Commit: e49e79de99c9a6b43e470f6f60ab1f71f0e6ba6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e49e79de99c9a6b43e470f6f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jul 6 23:48:45 2021 -0500 ws2_32: Move the setsockopt(IP_DROP_SOURCE_MEMBERSHIP) implementation to ntdll. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 3 +++ dlls/ws2_32/socket.c | 2 ++ include/wine/afd.h | 1 + 3 files changed, 6 insertions(+) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 04917d19e92..46ed673b81e 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1739,6 +1739,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc case IOCTL_AFD_WINE_SET_IP_DROP_MEMBERSHIP: return do_setsockopt( handle, io, IPPROTO_IP, IP_DROP_MEMBERSHIP, in_buffer, in_size ); + case IOCTL_AFD_WINE_SET_IP_DROP_SOURCE_MEMBERSHIP: + return do_setsockopt( handle, io, IPPROTO_IP, IP_DROP_SOURCE_MEMBERSHIP, in_buffer, in_size ); + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 48b9fe8c594..09f04fff60f 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3641,6 +3641,8 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_DROP_MEMBERSHIP, optval, optlen ); case WS_IP_DROP_SOURCE_MEMBERSHIP: + return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_DROP_SOURCE_MEMBERSHIP, optval, optlen ); + case WS_IP_UNBLOCK_SOURCE: { WS_IP_MREQ_SOURCE* val = (void*)optval; diff --git a/include/wine/afd.h b/include/wine/afd.h index c660e982d0e..93c1744c031 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -187,6 +187,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_GET_IP_DONTFRAGMENT WINE_AFD_IOC(242) #define IOCTL_AFD_WINE_SET_IP_DONTFRAGMENT WINE_AFD_IOC(243) #define IOCTL_AFD_WINE_SET_IP_DROP_MEMBERSHIP WINE_AFD_IOC(244) +#define IOCTL_AFD_WINE_SET_IP_DROP_SOURCE_MEMBERSHIP WINE_AFD_IOC(245) struct afd_create_params {

1 0

Huw Davies : dhcpcsvc: Pass a luid instead of the adapter name.
by Alexandre Julliard 07 Jul '21

07 Jul '21

Module: wine Branch: master Commit: e5b90e93b22a37202fd270470e99a43eaf3209bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5b90e93b22a37202fd27047… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 7 09:05:54 2021 +0100 dhcpcsvc: Pass a luid instead of the adapter name. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dhcpcsvc/Makefile.in | 1 + dlls/dhcpcsvc/dhcpcsvc.c | 35 ++++++++++++++++++++++++++++++----- dlls/mountmgr.sys/dbus.c | 24 +++++++----------------- dlls/mountmgr.sys/diskarb.c | 25 +++++-------------------- dlls/mountmgr.sys/mountmgr.c | 5 ++--- dlls/mountmgr.sys/mountmgr.h | 2 +- include/ddk/mountmgr.h | 4 +++- 7 files changed, 49 insertions(+), 47 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e5b90e93b22a37202fd2…

1 0

Huw Davies : iphlpapi: Implement ConvertInterfaceAliasToLuid().
by Alexandre Julliard 07 Jul '21

07 Jul '21

Module: wine Branch: master Commit: e62eadadd539fb44e83c88d2bed7cf6f4ea612ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=e62eadadd539fb44e83c88d2… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 7 09:05:55 2021 +0100 iphlpapi: Implement ConvertInterfaceAliasToLuid(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 33 +++++++++++++++++++++++++++++++++ include/netioapi.h | 1 + 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index ded265f5719..9180eb84af7 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -12,7 +12,7 @@ @ stdcall CancelMibChangeNotify2( ptr ) #@ stub ConvertGuidToStringA #@ stub ConvertGuidToStringW -#@ stub ConvertInterfaceAliasToLuid +@ stdcall ConvertInterfaceAliasToLuid( ptr ptr ) @ stdcall ConvertInterfaceGuidToLuid( ptr ptr ) @ stdcall ConvertInterfaceIndexToLuid( long ptr ) #@ stub ConvertInterfaceLuidToAlias diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 403b51391af..448c1d873af 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3159,6 +3159,39 @@ ULONG WINAPI GetTcp6Table2(PMIB_TCP6TABLE2 table, PULONG size, BOOL order) return ERROR_NOT_SUPPORTED; } +/****************************************************************** + * ConvertInterfaceAliasToLuid (IPHLPAPI.@) + */ +DWORD WINAPI ConvertInterfaceAliasToLuid( const WCHAR *alias, NET_LUID *luid ) +{ + struct nsi_ndis_ifinfo_rw *data; + DWORD err, count, i, len; + NET_LUID *keys; + + TRACE( "(%s %p)\n", debugstr_w(alias), luid ); + + if (!alias || !*alias || !luid) return ERROR_INVALID_PARAMETER; + luid->Value = 0; + len = strlenW( alias ); + + err = NsiAllocateAndGetTable( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, (void **)&keys, sizeof(*keys), + (void **)&data, sizeof(*data), NULL, 0, NULL, 0, &count, 0 ); + if (err) return err; + + err = ERROR_INVALID_PARAMETER; + for (i = 0; i < count; i++) + { + if (data[i].alias.Length == len * 2 && !memcmp( data[i].alias.String, alias, len * 2 )) + { + luid->Value = keys[i].Value; + err = ERROR_SUCCESS; + break; + } + } + NsiFreeTable( keys, data, NULL, NULL ); + return err; +} + /****************************************************************** * ConvertInterfaceGuidToLuid (IPHLPAPI.@) */ diff --git a/include/netioapi.h b/include/netioapi.h index 7238d527ad4..6d08d54a444 100644 --- a/include/netioapi.h +++ b/include/netioapi.h @@ -238,6 +238,7 @@ typedef VOID (WINAPI *PUNICAST_IPADDRESS_CHANGE_CALLBACK)(PVOID, PMIB_UNICASTIPA typedef VOID (WINAPI *PIPFORWARD_CHANGE_CALLBACK)(VOID*,MIB_IPFORWARD_ROW2*,MIB_NOTIFICATION_TYPE); +DWORD WINAPI ConvertInterfaceAliasToLuid(const WCHAR*,NET_LUID*); DWORD WINAPI ConvertInterfaceGuidToLuid(const GUID*,NET_LUID*); DWORD WINAPI ConvertInterfaceIndexToLuid(NET_IFINDEX,NET_LUID*); DWORD WINAPI ConvertInterfaceLuidToGuid(const NET_LUID*,GUID*);

1 0

Huw Davies : iphlpapi: Implement ConvertInterfaceLuidToAlias().
by Alexandre Julliard 07 Jul '21

07 Jul '21

Module: wine Branch: master Commit: 79c12f15b472e617d0a537e484d19e362d933202 URL: https://source.winehq.org/git/wine.git/?a=commit;h=79c12f15b472e617d0a537e4… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 7 09:05:56 2021 +0100 iphlpapi: Implement ConvertInterfaceLuidToAlias(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 24 ++++++++++++++++++++++++ dlls/iphlpapi/tests/iphlpapi.c | 11 +++++++++++ include/netioapi.h | 1 + 4 files changed, 37 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 9180eb84af7..604852a754d 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -15,7 +15,7 @@ @ stdcall ConvertInterfaceAliasToLuid( ptr ptr ) @ stdcall ConvertInterfaceGuidToLuid( ptr ptr ) @ stdcall ConvertInterfaceIndexToLuid( long ptr ) -#@ stub ConvertInterfaceLuidToAlias +@ stdcall ConvertInterfaceLuidToAlias( ptr ptr long ) @ stdcall ConvertInterfaceLuidToGuid( ptr ptr ) @ stdcall ConvertInterfaceLuidToIndex( ptr ptr ) @ stdcall ConvertInterfaceLuidToNameA( ptr ptr long ) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 448c1d873af..e5dc1012cb0 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3241,6 +3241,30 @@ DWORD WINAPI ConvertInterfaceIndexToLuid(NET_IFINDEX index, NET_LUID *luid) return err; } +/****************************************************************** + * ConvertInterfaceLuidToAlias (IPHLPAPI.@) + */ +DWORD WINAPI ConvertInterfaceLuidToAlias( const NET_LUID *luid, WCHAR *alias, SIZE_T len ) +{ + DWORD err; + IF_COUNTED_STRING name; + + TRACE( "(%p %p %u)\n", luid, alias, (DWORD)len ); + + if (!luid || !alias) return ERROR_INVALID_PARAMETER; + + err = NsiGetParameter( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, luid, sizeof(*luid), + NSI_PARAM_TYPE_RW, &name, sizeof(name), + FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, alias) ); + if (err) return err; + + if (len <= name.Length / sizeof(WCHAR)) return ERROR_NOT_ENOUGH_MEMORY; + memcpy( alias, name.String, name.Length ); + alias[name.Length / sizeof(WCHAR)] = '\0'; + + return err; +} + /****************************************************************** * ConvertInterfaceLuidToGuid (IPHLPAPI.@) */ diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 480d6ac06c5..e43cb9b1f78 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1625,6 +1625,7 @@ static void test_interface_identifier_conversion(void) GUID guid; SIZE_T len; WCHAR nameW[IF_MAX_STRING_SIZE + 1]; + WCHAR alias[IF_MAX_STRING_SIZE + 1]; char nameA[IF_MAX_STRING_SIZE + 1], *name; NET_IFINDEX index; MIB_IF_TABLE2 *table; @@ -1779,6 +1780,16 @@ static void test_interface_identifier_conversion(void) ok( !ret, "got %u\n", ret ); ok( luid.Value == row->InterfaceLuid.Value, "mismatch\n" ); + /* ConvertInterfaceAliasToLuid */ + ret = ConvertInterfaceAliasToLuid( row->Alias, &luid ); + ok( !ret, "got %u\n", ret ); + ok( luid.Value == row->InterfaceLuid.Value, "mismatch\n" ); + + /* ConvertInterfaceLuidToAlias */ + ret = ConvertInterfaceLuidToAlias( &row->InterfaceLuid, alias, ARRAY_SIZE(alias) ); + ok( !ret, "got %u\n", ret ); + ok( !wcscmp( alias, row->Alias ), "got %s vs %s\n", wine_dbgstr_w( alias ), wine_dbgstr_w( row->Alias ) ); + index = if_nametoindex( NULL ); ok( !index, "Got unexpected index %u\n", index ); index = if_nametoindex( nameA ); diff --git a/include/netioapi.h b/include/netioapi.h index 6d08d54a444..055266d946e 100644 --- a/include/netioapi.h +++ b/include/netioapi.h @@ -241,6 +241,7 @@ typedef VOID (WINAPI *PIPFORWARD_CHANGE_CALLBACK)(VOID*,MIB_IPFORWARD_ROW2*,MIB_ DWORD WINAPI ConvertInterfaceAliasToLuid(const WCHAR*,NET_LUID*); DWORD WINAPI ConvertInterfaceGuidToLuid(const GUID*,NET_LUID*); DWORD WINAPI ConvertInterfaceIndexToLuid(NET_IFINDEX,NET_LUID*); +DWORD WINAPI ConvertInterfaceLuidToAlias(const NET_LUID*,WCHAR*,SIZE_T); DWORD WINAPI ConvertInterfaceLuidToGuid(const NET_LUID*,GUID*); DWORD WINAPI ConvertInterfaceLuidToIndex(const NET_LUID*,NET_IFINDEX*); DWORD WINAPI ConvertInterfaceLuidToNameA(const NET_LUID*,char*,SIZE_T);

1 0

Huw Davies : mountmgr: Retrieve the unix-name from the alias.
by Alexandre Julliard 07 Jul '21

07 Jul '21

Module: wine Branch: master Commit: 76b31a2ed8fa7c160e67076d507ff44c5c7474a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=76b31a2ed8fa7c160e67076d… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 7 09:05:57 2021 +0100 mountmgr: Retrieve the unix-name from the alias. If, at some point, we change that, we can add a Wine-only nsi table that holds the luid to unix-name mapping. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/dbus.c | 2 +- dlls/mountmgr.sys/diskarb.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mountmgr.sys/dbus.c b/dlls/mountmgr.sys/dbus.c index 6998ef43688..b7624d1cb37 100644 --- a/dlls/mountmgr.sys/dbus.c +++ b/dlls/mountmgr.sys/dbus.c @@ -1003,7 +1003,7 @@ static BOOL map_adapter_name( const NET_LUID *luid, char *unix_name, DWORD len ) { WCHAR unix_nameW[IF_NAMESIZE]; - if (ConvertInterfaceLuidToNameW( luid, unix_nameW, ARRAY_SIZE(unix_nameW) )) return FALSE; + if (ConvertInterfaceLuidToAlias( luid, unix_nameW, ARRAY_SIZE(unix_nameW) )) return FALSE; return WideCharToMultiByte( CP_UNIXCP, 0, unix_nameW, -1, unix_name, len, NULL, NULL ) != 0; } diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c index 1232f450599..e33365f6301 100644 --- a/dlls/mountmgr.sys/diskarb.c +++ b/dlls/mountmgr.sys/diskarb.c @@ -260,7 +260,7 @@ static UInt8 map_option( ULONG option ) #define IF_NAMESIZE 16 static BOOL map_adapter_name( const NET_LUID *luid, WCHAR *unix_name, DWORD len ) { - return !ConvertInterfaceLuidToNameW( luid, unix_name, len ); + return !ConvertInterfaceLuidToAlias( luid, unix_name, len ); } static CFStringRef find_service_id( const NET_LUID *adapter )

1 0