comparison: libpurple/network.c
libpurple/network.c
- branch
- release-2.x.y
- changeset 38164
- a66a4f09ea6a
- parent 36028
- fc5300cb3617
- child 38165
- b3ad11cab64e
equal
deleted
inserted
replaced
| 38148:6016f081e2fa | 38164:a66a4f09ea6a |
|---|---|
| 622 | 622 |
| 623 memset(&qs, 0, sizeof(WSAQUERYSET)); | 623 memset(&qs, 0, sizeof(WSAQUERYSET)); |
| 624 qs.dwSize = sizeof(WSAQUERYSET); | 624 qs.dwSize = sizeof(WSAQUERYSET); |
| 625 qs.dwNameSpace = NS_NLA; | 625 qs.dwNameSpace = NS_NLA; |
| 626 | 626 |
| 627 retval = WSALookupServiceBegin(&qs, LUP_RETURN_ALL, &h); | 627 retval = WSALookupServiceBeginA(&qs, LUP_RETURN_ALL, &h); |
| 628 if (retval != ERROR_SUCCESS) { | 628 if (retval != ERROR_SUCCESS) { |
| 629 gchar *msg; | 629 gchar *msg; |
| 630 errorid = WSAGetLastError(); | 630 errorid = WSAGetLastError(); |
| 631 msg = g_win32_error_message(errorid); | 631 msg = g_win32_error_message(errorid); |
| 632 purple_debug_warning("network", "Couldn't retrieve NLA SP lookup handle. " | 632 purple_debug_warning("network", "Couldn't retrieve NLA SP lookup handle. " |
| 637 return -1; | 637 return -1; |
| 638 } else { | 638 } else { |
| 639 char buf[4096]; | 639 char buf[4096]; |
| 640 WSAQUERYSET *res = (LPWSAQUERYSET) buf; | 640 WSAQUERYSET *res = (LPWSAQUERYSET) buf; |
| 641 DWORD size = sizeof(buf); | 641 DWORD size = sizeof(buf); |
| 642 while ((retval = WSALookupServiceNext(h, 0, &size, res)) == ERROR_SUCCESS) { | 642 while ((retval = WSALookupServiceNextA(h, 0, &size, res)) == ERROR_SUCCESS) { |
| 643 net_cnt++; | 643 net_cnt++; |
| 644 purple_debug_info("network", "found network '%s'\n", | 644 purple_debug_info("network", "found network '%s'\n", |
| 645 res->lpszServiceInstanceName ? res->lpszServiceInstanceName : "(NULL)"); | 645 res->lpszServiceInstanceName ? res->lpszServiceInstanceName : "(NULL)"); |
| 646 size = sizeof(buf); | 646 size = sizeof(buf); |
| 647 } | 647 } |
| 732 | 732 |
| 733 if (network_change_handle == NULL) { | 733 if (network_change_handle == NULL) { |
| 734 memset(&qs, 0, sizeof(WSAQUERYSET)); | 734 memset(&qs, 0, sizeof(WSAQUERYSET)); |
| 735 qs.dwSize = sizeof(WSAQUERYSET); | 735 qs.dwSize = sizeof(WSAQUERYSET); |
| 736 qs.dwNameSpace = NS_NLA; | 736 qs.dwNameSpace = NS_NLA; |
| 737 if (WSALookupServiceBegin(&qs, 0, &network_change_handle) == SOCKET_ERROR) { | 737 if (WSALookupServiceBeginA(&qs, 0, &network_change_handle) == SOCKET_ERROR) { |
| 738 int errorid = WSAGetLastError(); | 738 int errorid = WSAGetLastError(); |
| 739 gchar *msg = g_win32_error_message(errorid); | 739 gchar *msg = g_win32_error_message(errorid); |
| 740 purple_timeout_add(0, _print_debug_msg, | 740 purple_timeout_add(0, _print_debug_msg, |
| 741 g_strdup_printf("Couldn't retrieve NLA SP lookup handle. " | 741 g_strdup_printf("Couldn't retrieve NLA SP lookup handle. " |
| 742 "NLA service is probably not running. Message: %s (%d).\n", | 742 "NLA service is probably not running. Message: %s (%d).\n", |
| 793 g_thread_exit(NULL); | 793 g_thread_exit(NULL); |
| 794 return NULL; | 794 return NULL; |
| 795 } | 795 } |
| 796 | 796 |
| 797 size = sizeof(buf); | 797 size = sizeof(buf); |
| 798 while ((retval = WSALookupServiceNext(network_change_handle, 0, &size, res)) == ERROR_SUCCESS) { | 798 while ((retval = WSALookupServiceNextA(network_change_handle, 0, &size, res)) == ERROR_SUCCESS) { |
| 799 /*purple_timeout_add(0, _print_debug_msg, | 799 /*purple_timeout_add(0, _print_debug_msg, |
| 800 g_strdup_printf("thread found network '%s'\n", | 800 g_strdup_printf("thread found network '%s'\n", |
| 801 res->lpszServiceInstanceName ? res->lpszServiceInstanceName : "(NULL)"));*/ | 801 res->lpszServiceInstanceName ? res->lpszServiceInstanceName : "(NULL)"));*/ |
| 802 size = sizeof(buf); | 802 size = sizeof(buf); |
| 803 } | 803 } |
