Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-29 01:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

[WLANCONF] Fix getting the interface GUID value

Browse source 
GetInterfaceInfo returns interface name in Windows XP and 2003
in this format: `\DEVICE\TCPIP_{GUID}`.

MSDN says that the `Name` member of the `IP_ADAPTER_INDEX_MAP`
may start with '{' character on Windows Vista and later.
https://docs.microsoft.com/en-us/windows/win32/api/ipexport/ns-ipexport-ip_adapter_index_map

Change the code to support both cases. CORE-18032
This commit is contained in:
Stanislav Motylkov 2022-10-01 14:56:01 +03:00
parent c1c127932d
commit 311fcc612e
No known key found for this signature in database
GPG key ID: AFE513258CBA9E92
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
base/applications/network/wlanconf/wlanconf.c
View file

@ -1,9 +1,8 @@
/*
* PROJECT: ReactOS WLAN command-line configuration utility
* LICENSE: GPL - See COPYING in the top level directory
* FILE: base/applications/network/wlanconf/wlanconf.c
* LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
* PURPOSE: Allows WLAN configuration via the command prompt
* COPYRIGHT: Copyright 2012 Cameron Gutman (cameron.gutman@reactos.org)
* COPYRIGHT: Copyright 2012 Cameron Gutman <cameron.gutman@reactos.org>
*/
#include <stdio.h>
@ -183,8 +182,13 @@ OpenAdapterHandle(DWORD Index, HANDLE *hAdapter, IP_ADAPTER_INDEX_MAP *IpInfo)
for (i = 0; i < InterfaceInfo->NumAdapters; i++)
{
PWCHAR InterfaceGuid = wcschr(InterfaceInfo->Adapter[i].Name, L'{');
if (InterfaceGuid == NULL)
continue;
if (wcsstr((PWCHAR)((PUCHAR)QueryBinding + QueryBinding->DeviceNameOffset),
InterfaceInfo->Adapter[i].Name))
InterfaceGuid))
{
*IpInfo = InterfaceInfo->Adapter[i];
*hAdapter = hDriver;