Skip to content

Commit f723fad

Browse files
fix(network_info_plus): fix deprecated member use in Windows implementation (#3519)
1 parent 2d929e5 commit f723fad

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

packages/network_info_plus/network_info_plus/lib/src/network_info_plus_windows.dart

+13-13
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class NetworkInfoPlusWindowsPlugin extends NetworkInfoPlatform {
3636
pdwNegotiatedVersion,
3737
phClientHandle,
3838
);
39-
if (hr == WIN32_ERROR.ERROR_SERVICE_NOT_ACTIVE) return;
39+
if (hr == ERROR_SERVICE_NOT_ACTIVE) return;
4040
clientHandle = phClientHandle.value;
4141
} finally {
4242
free(pdwNegotiatedVersion);
@@ -58,7 +58,7 @@ class NetworkInfoPlusWindowsPlugin extends NetworkInfoPlatform {
5858

5959
try {
6060
var hr = WlanEnumInterfaces(clientHandle, nullptr, ppInterfaceList);
61-
if (hr != WIN32_ERROR.ERROR_SUCCESS) {
61+
if (hr != ERROR_SUCCESS) {
6262
return null; // no wifi interface available
6363
}
6464

@@ -81,7 +81,7 @@ class NetworkInfoPlusWindowsPlugin extends NetworkInfoPlatform {
8181
ppAttributes.cast(),
8282
nullptr,
8383
);
84-
if (hr != WIN32_ERROR.ERROR_SUCCESS) break;
84+
if (hr != ERROR_SUCCESS) break;
8585
if (ppAttributes.value.ref.isState != 0) {
8686
return query(pInterfaceGuid, ppAttributes.value);
8787
}
@@ -107,19 +107,19 @@ class NetworkInfoPlusWindowsPlugin extends NetworkInfoPlatform {
107107
String formatIPAddress(Pointer<SOCKADDR> addr) {
108108
final buffer = calloc<BYTE>(64).cast<Utf8>();
109109
try {
110-
if (addr.ref.sa_family == ADDRESS_FAMILY.AF_INET) {
110+
if (addr.ref.sa_family == AF_INET) {
111111
final sinAddr = addr.cast<SOCKADDR_IN>().ref.sin_addr;
112112
final sinAddrPtr = calloc<Int32>();
113113
sinAddrPtr.value = sinAddr;
114-
inet_ntop(ADDRESS_FAMILY.AF_INET, sinAddrPtr, buffer, 64);
114+
inet_ntop(AF_INET, sinAddrPtr, buffer, 64);
115115
free(sinAddrPtr);
116-
} else if (addr.ref.sa_family == ADDRESS_FAMILY.AF_INET6) {
116+
} else if (addr.ref.sa_family == AF_INET6) {
117117
final sinAddr = addr.cast<SOCKADDR_IN6>().ref.sin6_addr;
118118
final sinAddrPtr = calloc<Uint8>(16);
119119
for (var i = 0; i < 16; i++) {
120120
sinAddrPtr[i] = sinAddr[i];
121121
}
122-
inet_ntop(ADDRESS_FAMILY.AF_INET6, sinAddrPtr, buffer, 64);
122+
inet_ntop(AF_INET6, sinAddrPtr, buffer, 64);
123123
free(sinAddrPtr);
124124
}
125125
return buffer.cast<Utf8>().toDartString();
@@ -201,13 +201,13 @@ class NetworkInfoPlusWindowsPlugin extends NetworkInfoPlatform {
201201
/// Obtains the IP v4 address of the connected wifi network
202202
@override
203203
Future<String?> getWifiIP() {
204-
return getIPAddr(ADDRESS_FAMILY.AF_INET);
204+
return getIPAddr(AF_INET);
205205
}
206206

207207
/// Obtains the IP v6 address of the connected wifi network
208208
@override
209209
Future<String?> getWifiIPv6() {
210-
return getIPAddr(ADDRESS_FAMILY.AF_INET6);
210+
return getIPAddr(AF_INET6);
211211
}
212212

213213
/// Obtains the subnet mask of the connected wifi network
@@ -218,15 +218,15 @@ class NetworkInfoPlusWindowsPlugin extends NetworkInfoPlatform {
218218
Pointer<IP_ADAPTER_ADDRESSES_LH> pIpAdapterAddress = nullptr;
219219
try {
220220
GetAdaptersAddresses(
221-
ADDRESS_FAMILY.AF_INET,
221+
AF_INET,
222222
0,
223223
nullptr,
224224
nullptr,
225225
ulSize,
226226
);
227227
pIpAdapterAddress = HeapAlloc(GetProcessHeap(), 0, ulSize.value).cast();
228228
GetAdaptersAddresses(
229-
ADDRESS_FAMILY.AF_INET,
229+
AF_INET,
230230
0,
231231
nullptr,
232232
pIpAdapterAddress,
@@ -290,15 +290,15 @@ class NetworkInfoPlusWindowsPlugin extends NetworkInfoPlatform {
290290
Pointer<IP_ADAPTER_ADDRESSES_LH> pIpAdapterAddress = nullptr;
291291
try {
292292
GetAdaptersAddresses(
293-
ADDRESS_FAMILY.AF_INET,
293+
AF_INET,
294294
0x80,
295295
nullptr,
296296
nullptr,
297297
ulSize,
298298
);
299299
pIpAdapterAddress = HeapAlloc(GetProcessHeap(), 0, ulSize.value).cast();
300300
GetAdaptersAddresses(
301-
ADDRESS_FAMILY.AF_INET,
301+
AF_INET,
302302
0x80,
303303
nullptr,
304304
pIpAdapterAddress,

0 commit comments

Comments
 (0)