| Index: net/base/net_util_win.h
|
| diff --git a/net/base/net_util_win.h b/net/base/net_util_win.h
|
| index afa888b1320cf25b96be6555cc10acd9196aaa65..4f5659f77c20b504b4026b06260fd9d290db55af 100644
|
| --- a/net/base/net_util_win.h
|
| +++ b/net/base/net_util_win.h
|
| @@ -17,17 +17,25 @@ namespace net {
|
| namespace internal {
|
|
|
| struct NET_EXPORT WlanApi {
|
| - typedef DWORD (WINAPI *WlanOpenHandleFunc)(
|
| - DWORD, VOID*, DWORD*, HANDLE*);
|
| - typedef DWORD (WINAPI *WlanEnumInterfacesFunc)(
|
| - HANDLE, VOID*, WLAN_INTERFACE_INFO_LIST**);
|
| - typedef DWORD (WINAPI *WlanQueryInterfaceFunc)(
|
| - HANDLE, const GUID*, WLAN_INTF_OPCODE, VOID*, DWORD*, VOID**,
|
| - WLAN_OPCODE_VALUE_TYPE*);
|
| - typedef DWORD (WINAPI *WlanSetInterfaceFunc)(
|
| - HANDLE, const GUID*, WLAN_INTF_OPCODE, DWORD, const VOID*, VOID*);
|
| - typedef VOID (WINAPI *WlanFreeMemoryFunc)(VOID*);
|
| - typedef DWORD (WINAPI *WlanCloseHandleFunc)(HANDLE, VOID*);
|
| + typedef DWORD(WINAPI* WlanOpenHandleFunc)(DWORD, VOID*, DWORD*, HANDLE*);
|
| + typedef DWORD(WINAPI* WlanEnumInterfacesFunc)(HANDLE,
|
| + VOID*,
|
| + WLAN_INTERFACE_INFO_LIST**);
|
| + typedef DWORD(WINAPI* WlanQueryInterfaceFunc)(HANDLE,
|
| + const GUID*,
|
| + WLAN_INTF_OPCODE,
|
| + VOID*,
|
| + DWORD*,
|
| + VOID**,
|
| + WLAN_OPCODE_VALUE_TYPE*);
|
| + typedef DWORD(WINAPI* WlanSetInterfaceFunc)(HANDLE,
|
| + const GUID*,
|
| + WLAN_INTF_OPCODE,
|
| + DWORD,
|
| + const VOID*,
|
| + VOID*);
|
| + typedef VOID(WINAPI* WlanFreeMemoryFunc)(VOID*);
|
| + typedef DWORD(WINAPI* WlanCloseHandleFunc)(HANDLE, VOID*);
|
|
|
| WlanApi();
|
| static WlanApi& GetInstance();
|
| @@ -35,8 +43,8 @@ struct NET_EXPORT WlanApi {
|
| template <typename T>
|
| DWORD OpenHandle(DWORD client_version, DWORD* cur_version, T* handle) const {
|
| HANDLE temp_handle;
|
| - DWORD result = open_handle_func(client_version, NULL, cur_version,
|
| - &temp_handle);
|
| + DWORD result =
|
| + open_handle_func(client_version, NULL, cur_version, &temp_handle);
|
| if (result != ERROR_SUCCESS)
|
| return result;
|
| handle->Set(temp_handle);
|
| @@ -58,19 +66,17 @@ struct WlanApiHandleTraits {
|
|
|
| static bool CloseHandle(HANDLE handle) {
|
| return WlanApi::GetInstance().close_handle_func(handle, NULL) ==
|
| - ERROR_SUCCESS;
|
| + ERROR_SUCCESS;
|
| }
|
| static bool IsHandleValid(HANDLE handle) {
|
| return base::win::HandleTraits::IsHandleValid(handle);
|
| }
|
| - static HANDLE NullHandle() {
|
| - return base::win::HandleTraits::NullHandle();
|
| - }
|
| + static HANDLE NullHandle() { return base::win::HandleTraits::NullHandle(); }
|
| };
|
|
|
| -typedef base::win::GenericScopedHandle<
|
| - WlanApiHandleTraits,
|
| - base::win::DummyVerifierTraits> WlanHandle;
|
| +typedef base::win::GenericScopedHandle<WlanApiHandleTraits,
|
| + base::win::DummyVerifierTraits>
|
| + WlanHandle;
|
|
|
| struct WlanApiDeleter {
|
| inline void operator()(void* ptr) const {
|
| @@ -82,4 +88,4 @@ struct WlanApiDeleter {
|
|
|
| } // namespace net
|
|
|
| -#endif // NET_BASE_NET_UTIL_WIN_H_
|
| +#endif // NET_BASE_NET_UTIL_WIN_H_
|
|
|