From: Vibhav Pant vibhavp@gmail.com
--- dlls/ws2_32/tests/Makefile.in | 2 +- dlls/ws2_32/tests/protocol.c | 347 ++++++++++++++++++++++++++++++++++ include/winsock2.h | 5 + include/ws2bth.h | 6 + 4 files changed, 359 insertions(+), 1 deletion(-)
diff --git a/dlls/ws2_32/tests/Makefile.in b/dlls/ws2_32/tests/Makefile.in index 3ca9be37a78..f371e680183 100644 --- a/dlls/ws2_32/tests/Makefile.in +++ b/dlls/ws2_32/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = ws2_32.dll -IMPORTS = iphlpapi ws2_32 user32 +IMPORTS = iphlpapi ws2_32 user32 bluetoothapis
SOURCES = \ afd.c \ diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 09c56439ada..0542aad9ca8 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -536,6 +536,351 @@ static void test_WSALookupService(void) ok(!ret, "WSALookupServiceEnd failed unexpectedly\n"); }
+static DWORD get_nth_lookup_flags( SIZE_T n, const DWORD *flags, SIZE_T len ) +{ + SIZE_T i; + DWORD result = 0; + + if (!n) + return 0; + + for (i = 0; i < len; i++) + if (n & (1 << i)) + result |= flags[i]; + + return result; +} + +static void test_WSALookupServiceNext_bth_devices( HANDLE lookup_handle, DWORD flags, BOOL verbose ) +{ + WSAQUERYSETA *results; + DWORD buf_len, i = 0; + + buf_len = sizeof( *results ); + for (;;) + { + INT ret, err; + const BTH_DEVICE_INFO *info = NULL; + + results = calloc( 1, buf_len ); + results->dwSize = sizeof( *results ); + + SetLastError( 0xdeadbeef ); + ret = WSALookupServiceNextA( lookup_handle, flags, &buf_len, results ); + err = WSAGetLastError(); + + winetest_push_context( "device %lu", i); + if (ret) + { + ok( ret == -1, "%d != -1\n", ret ); + todo_wine ok( err == WSA_E_NO_MORE || err == WSAEFAULT, "WSALookupServiceNextA failed: %d\n", err ); + if (err != WSAEFAULT) + { + free( results ); + winetest_pop_context(); + return; + } + ok( buf_len >= sizeof( *results ), "Expected %lu to be greater than %lu\n", buf_len, (DWORD)sizeof( *results ) ); + free( results ); + winetest_pop_context(); + continue; + } + i++; + + if (flags & LUP_RETURN_NAME) + { + todo_wine ok( !!results->lpszServiceInstanceName, "Expected lpszServiceInstanceName to not be NULL\n" ); + if (verbose) + trace( "Name: %s\n", debugstr_a( results->lpszServiceInstanceName ) ); + } + + if (flags & LUP_RETURN_TYPE) + { + todo_wine ok( !!results->lpServiceClassId, "Expected lpServiceClassId to not be NULL\n" ); + if (results->lpServiceClassId && verbose) + trace( "CoD: %#lx\n", results->lpServiceClassId->Data1 ); + } + + if (flags & LUP_RETURN_BLOB) + { + todo_wine ok( !!results->lpBlob, "Expected lpBlob to not be NULL\n" ); + if (results->lpBlob) + { + info = (BTH_DEVICE_INFO *)results->lpBlob->pBlobData; + ok( results->lpBlob->cbSize >= sizeof( *info ), "%lu should be at least %lu\n", + results->lpBlob->cbSize, (DWORD)sizeof( *info ) ); + ok( !!info, "Expected pBlobData to not be NULL\n" ); + if (info) + { + if (results->lpszServiceInstanceName) + ok( !strcmp( info->name, results->lpszServiceInstanceName ), "%s != %s", debugstr_a( info->name ), + debugstr_a( results->lpszServiceInstanceName )); + if (verbose) + trace( "Device Flags: %#lx\n", info->flags ); + if (results->lpServiceClassId) + ok( info->classOfDevice == results->lpServiceClassId->Data1, "%lu != %lu\n", info->classOfDevice, + results->lpServiceClassId->Data1 ); + } + } + } + + if (flags & LUP_RETURN_ADDR) + { + todo_wine ok( !!results->lpcsaBuffer, "Expected lpcsaBuffer to not be NULL\n" ); + if (results->lpcsaBuffer) + { + const SOCKET_ADDRESS *remote_sock_addr = &results->lpcsaBuffer->RemoteAddr; + const SOCKADDR_BTH *remote_bth_addr = (SOCKADDR_BTH *)remote_sock_addr->lpSockaddr; + const SOCKET_ADDRESS *local_sock_addr = &results->lpcsaBuffer->LocalAddr; + const SOCKADDR_BTH *local_bth_addr = (SOCKADDR_BTH *)local_sock_addr->lpSockaddr; + + ok( remote_sock_addr->iSockaddrLength == sizeof( *remote_bth_addr ), "%d != %lu\n", + remote_sock_addr->iSockaddrLength, (DWORD)sizeof( *remote_bth_addr ) ); + ok( !!remote_bth_addr, "Expected RemoteAddr to not be NULL\n" ); + if (remote_bth_addr && remote_sock_addr->iSockaddrLength == sizeof( *remote_bth_addr )) + { + ok( remote_bth_addr->addressFamily == AF_BTH, "%d != %d\n", remote_bth_addr->addressFamily, AF_BTH ); + if (info && info->flags & BDIF_ADDRESS) + ok( remote_bth_addr->btAddr == info->address, "%I64x != %I64x\n", remote_bth_addr->btAddr, info->address ); + } + + if (flags & LUP_RES_SERVICE) + { + ok( local_sock_addr->iSockaddrLength == sizeof( *local_bth_addr ), "%d != %lu\n", + local_sock_addr->iSockaddrLength, (DWORD)sizeof( *local_bth_addr )); + ok( !!local_bth_addr, "Expected LocalAddr to not be NULL\n" ); + if (local_bth_addr && local_sock_addr->iSockaddrLength == sizeof( *local_bth_addr )) + { + ok( local_bth_addr->addressFamily == AF_BTH, "%d != %d\n", local_bth_addr->addressFamily, AF_BTH ); + todo_wine ok( local_bth_addr->btAddr, "Expected btAddr to not be zero\n" ); + } + } + } + } + + winetest_pop_context(); + free( results ); + } +} + +static const DWORD device_lookup_flags[] = {LUP_RETURN_TYPE, LUP_RETURN_NAME, LUP_RETURN_BLOB, LUP_RETURN_ADDR, + LUP_RES_SERVICE}; + +static void test_WSALookupService_bth_devices( void ) +{ + DWORD all_flags = LUP_RETURN_TYPE | LUP_RETURN_NAME | LUP_RETURN_BLOB | LUP_RETURN_ADDR | LUP_RES_SERVICE; + /* For NS_BTH, WSALookupService only looks for LUP_CONTAINERS. If this flag is set, then it performs device + * inquiry. Otherwise, it performs service discovery. Other flags seem to be ignored. */ + DWORD init_flags = LUP_CONTAINERS | LUP_NOCONTAINERS, i = 0, buf_len, orig_len; + BTH_QUERY_DEVICE query_device_params = {0}; + WSAQUERYSETA queryA = {0}, *results; + BLOB device_inquiry_blob = {0}; + HANDLE lookup_handle; + INT ret, err; + + queryA.dwSize = sizeof( queryA ); + queryA.dwNameSpace = NS_BTH; + if (winetest_interactive) + init_flags |= LUP_FLUSHCACHE; + + device_inquiry_blob.cbSize = sizeof( query_device_params ); + query_device_params.length = 5; + + for (i = 1; i < 1 << ARRAY_SIZE( device_lookup_flags ); i++) + { + DWORD next_flags = get_nth_lookup_flags( i, device_lookup_flags, ARRAY_SIZE( device_lookup_flags )); + lookup_handle = NULL; + + switch (i) + { + case 1: + /* WSASLookupServiceBeginA will ignore an invalid or NULL BLOB and perform device inquiry with the default + * timeout of 6 seconds. */ + queryA.lpBlob = NULL; + break; + case 2: + queryA.lpBlob = &device_inquiry_blob; + queryA.lpBlob->cbSize += 1; + device_inquiry_blob.pBlobData = (BYTE *)&query_device_params; + break; + case 3: + queryA.lpBlob->cbSize = sizeof( query_device_params ); + queryA.lpBlob->pBlobData = NULL; + break; + default: + queryA.lpBlob = &device_inquiry_blob; + queryA.lpBlob->cbSize = sizeof( query_device_params ); + queryA.lpBlob->pBlobData = (BYTE *)&query_device_params; + break; + } + winetest_push_context( "flags=%#lx", next_flags ); + SetLastError( 0xdeadbeef ); + + ret = WSALookupServiceBeginA( &queryA, init_flags, &lookup_handle ); + err = WSAGetLastError(); + if (ret) + { + /* WSASERVICE_NOT_FOUND indicates that no Bluetooth devices were found. */ + todo_wine ok( err == WSASERVICE_NOT_FOUND, "WSALookupServiceBeginA failed: %d\n", WSAGetLastError() ); + ok( !lookup_handle, "Handle should not have been filled\n"); + skip( "No Bluetooth devices found\n" ); + winetest_pop_context(); + continue; + } + + ok( !!lookup_handle, "Handle was not filled\n"); + test_WSALookupServiceNext_bth_devices( lookup_handle, next_flags, next_flags == all_flags ); + + ok( !WSALookupServiceEnd( lookup_handle ), "WSALookupServiceEnd failed: %d\n", WSAGetLastError() ); + winetest_pop_context(); + } + + /* Test that WSALookupServiceNext does not modify the buffer partially when there's insufficient space for other + * params. */ + lookup_handle = NULL; + SetLastError( 0xdeadbeef ); + ret = WSALookupServiceBeginA( &queryA, init_flags, &lookup_handle ); + err = WSAGetLastError(); + if (ret) + { + todo_wine ok( err == WSASERVICE_NOT_FOUND, "WSALookupServiceBeginA failed: %d\n", err ); + ok( !lookup_handle, "Handle should not have been filled\n"); + skip( "No Bluetooth devices found\n" ); + return; + } + + todo_wine ok( !!lookup_handle, "Handle was not filled\n" ); + /* Missing space for a BTH_DEVICE_INFO */ + orig_len = buf_len = sizeof( *results ) + sizeof( GUID ) + sizeof( BLOB ); + results = calloc( 1, buf_len ); + results->dwSize = sizeof( *results ); + SetLastError( 0xdeadbeef ); + ret = WSALookupServiceNextA( lookup_handle, LUP_RETURN_TYPE | LUP_RETURN_BLOB, &buf_len, results ); + err = WSAGetLastError(); + ok( ret == -1, "Expected WSALookupServiceNextA to fail\n" ); + todo_wine ok( err == WSAEFAULT, "%d != %d", err, WSAEFAULT ); + todo_wine ok( buf_len > orig_len, "%ld should be greater than %ld\n", buf_len, orig_len ); + ok( !results->lpServiceClassId, "lpServiceClassId should not have been filled\n" ); + ok( !results->lpBlob, "lpBlob should not have been filled\n" ); + free( results ); + ok( !WSALookupServiceEnd( lookup_handle ), "WSALookupServiceEnd failed: %d\n", WSAGetLastError() ); +} + +static void test_WSALookupServiceNext_bth_services( HANDLE lookup_handle ) +{ + WSAQUERYSETA *results; + DWORD buf_len, i = 0; + + buf_len = sizeof( *results ); + for (;;) + { + INT ret, err; + + results = calloc( 1, buf_len ); + results->dwSize = sizeof( *results ); + + SetLastError( 0xdeadbeef ); + ret = WSALookupServiceNextA( lookup_handle, LUP_RETURN_NAME, &buf_len, results ); + err = WSAGetLastError(); + + winetest_push_context( "service %lu", i ); + if (ret) + { + ok( ret == -1, "%d != -1\n", ret ); + ok( err == WSA_E_NO_MORE || err == WSAEFAULT, "WSALookupServiceNextA failed: %d\n", err ); + if (err != WSAEFAULT) + { + free( results ); + winetest_pop_context(); + return; + } + ok( buf_len >= sizeof( *results ), "Expected %lu to be greater than %lu\n", buf_len, (DWORD)sizeof( *results ) ); + free( results ); + winetest_pop_context(); + continue; + } + + i++; + ok( !!results->lpszServiceInstanceName, "Expected lpszServiceInstanceName to not be NULL\n" ); + if (results->lpszServiceInstanceName) + trace( "Service class ID: %s\n", debugstr_a( results->lpszServiceInstanceName ) ); + winetest_pop_context(); + free( results ); + } +} + +static void test_WSALookupService_bth_services( void ) +{ + GUID L2CAP_UUID = {0x0100, 0x0000, 0x1000, {0x80, 0x00, 0x00, 0x80, 0x5f, 0x9b, 0x34, 0xfb}}; + BLUETOOTH_FIND_RADIO_PARAMS find_params = {.dwSize = sizeof( find_params )}; + BLUETOOTH_RADIO_INFO radio_info = {0}; + HBLUETOOTH_RADIO_FIND radio_find; + SOCKADDR_BTH bth_addr = {0}; + WSAQUERYSETA query = {0}; + char addr_str[64]; + HANDLE radio, lookup = NULL; + DWORD ret, len = sizeof( addr_str ), init_flags = 0; + + + radio_find = BluetoothFindFirstRadio( &find_params, &radio ); + ret = GetLastError(); + if (!radio_find) + { + ok( ret == ERROR_NO_MORE_ITEMS, "BluetoothFindFirstRadio failed with %lu\n", ret ); + skip( "No Bluetooth radios found.\n" ); + return; + } + + radio_info.dwSize = sizeof( radio_info ); + ret = BluetoothGetRadioInfo( radio, &radio_info ); + CloseHandle( radio ); + ok( !ret, "BluetoothGetRadioInfo failed: %lu\n", ret ); + if (ret) + { + skip( "BluetoothGetRadioInfo failed.\n" ); + return; + } + + bth_addr.addressFamily = AF_BTH; + bth_addr.btAddr = radio_info.address.ullLong; + addr_str[0] = 0; + ret = WSAAddressToStringA( (SOCKADDR *)&bth_addr, sizeof( bth_addr ), NULL, addr_str, &len ); + ok( !ret, "WSAAddressToStringA failed: %d\n", WSAGetLastError() ); + + + query.dwSize = sizeof( query ); + query.dwNameSpace = NS_BTH; + query.lpServiceClassId = &L2CAP_UUID; + if (winetest_interactive) + init_flags |= LUP_FLUSHCACHE; + query.lpszContext = addr_str; + + ret = WSALookupServiceBeginA( &query, init_flags, &lookup ); + if (ret) + { + todo_wine ok( ret == WSASERVICE_NOT_FOUND, "WSALookupServiceBeginA failed: %d\n", WSAGetLastError() ); + skip( "WSALookupServiceBeginA failed.\n" ); + return; + } + + test_WSALookupServiceNext_bth_services( lookup ); + ret = WSALookupServiceEnd( lookup ); + ok( !ret, "WSALookupServiceEnd failed: %d\n", WSAGetLastError() ); + + /* As with device discovery, LUP_NOCONTAINERS is ignored here as well. */ + ret = WSALookupServiceBeginA( &query, init_flags | LUP_NOCONTAINERS, &lookup ); + if (ret) + { + todo_wine ok( ret == WSASERVICE_NOT_FOUND, "WSALookupServiceBeginA failed: %d\n", WSAGetLastError() ); + skip( "WSALookupServiceBeginA failed.\n" ); + return; + } + + test_WSALookupServiceNext_bth_services( lookup ); + ret = WSALookupServiceEnd( lookup ); + ok( !ret, "WSALookupServiceEnd failed: %d\n", WSAGetLastError() ); +} + #define WM_ASYNCCOMPLETE (WM_USER + 100) static HWND create_async_message_window(void) { @@ -3154,6 +3499,8 @@ START_TEST( protocol )
test_getservbyname(); test_WSALookupService(); + test_WSALookupService_bth_devices(); + test_WSALookupService_bth_services();
test_inet_ntoa(); test_inet_addr(); diff --git a/include/winsock2.h b/include/winsock2.h index f7b88322f49..8e1e5800a96 100644 --- a/include/winsock2.h +++ b/include/winsock2.h @@ -468,6 +468,8 @@ extern "C" {
/* Constants for WSALookupServiceBegin() */ #define LUP_DEEP 0x0001 +#define LUP_CONTAINERS 0x0002 +#define LUP_NOCONTAINERS 0x0004 #define LUP_RETURN_NAME 0x0010 #define LUP_RETURN_TYPE 0x0020 #define LUP_RETURN_VERSION 0x0040 @@ -476,6 +478,9 @@ extern "C" { #define LUP_RETURN_BLOB 0x0200 #define LUP_RETURN_ALIASES 0x0400 #define LUP_RETURN_QUERY_STRING 0x0800 +#define LUP_FLUSHCACHE 0x1000 +#define LUP_FLUSHPREVIOUS 0x2000 +#define LUP_RES_SERVICE 0x8000 #define LUP_RETURN_ALL (LUP_RETURN_ADDR|LUP_RETURN_BLOB|LUP_RETURN_ALIASES|LUP_RETURN_QUERY_STRING \ |LUP_RETURN_NAME|LUP_RETURN_TYPE|LUP_RETURN_VERSION|LUP_RETURN_COMMENT)
diff --git a/include/ws2bth.h b/include/ws2bth.h index ee28f0122cc..d6f7a328399 100644 --- a/include/ws2bth.h +++ b/include/ws2bth.h @@ -29,6 +29,12 @@ typedef struct _SOCKADDR_BTH ULONG port; } SOCKADDR_BTH, *PSOCKADDR_BTH;
+typedef struct _BTH_QUERY_DEVICE +{ + ULONG LAP; + UCHAR length; +} BTH_QUERY_DEVICE, *PBTH_QUERY_DEVICE, BTHNS_INQUIRYBLOB, *PBTHNS_INQUIRYBLOB; + #include <poppack.h>
#endif /* __WS2BTH_H__ */