Huw Davies : iphlpapi: Implement ConvertInterfaceLuidToGuid() on top of nsi.
Alexandre Julliard
julliard at winehq.org
Tue Jul 6 18:09:36 CDT 2021
Module: wine
Branch: master
Commit: 3bee9c080b620329b223f7ac6fda55a685c8b95e
URL: https://source.winehq.org/git/wine.git/?a=commit;h=3bee9c080b620329b223f7ac6fda55a685c8b95e
Author: Huw Davies <huw at codeweavers.com>
Date: Tue Jul 6 10:11:51 2021 +0100
iphlpapi: Implement ConvertInterfaceLuidToGuid() on top of nsi.
Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/iphlpapi/iphlpapi_main.c | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c
index ee5718e5d26..403b51391af 100644
--- a/dlls/iphlpapi/iphlpapi_main.c
+++ b/dlls/iphlpapi/iphlpapi_main.c
@@ -3213,20 +3213,17 @@ DWORD WINAPI ConvertInterfaceIndexToLuid(NET_IFINDEX index, NET_LUID *luid)
*/
DWORD WINAPI ConvertInterfaceLuidToGuid(const NET_LUID *luid, GUID *guid)
{
- DWORD ret;
- MIB_IFROW row;
+ DWORD err;
- TRACE("(%p %p)\n", luid, guid);
+ TRACE( "(%p %p)\n", luid, guid );
if (!luid || !guid) return ERROR_INVALID_PARAMETER;
- row.dwIndex = luid->Info.NetLuidIndex;
- if ((ret = GetIfEntry( &row ))) return ret;
-
- memset( guid, 0, sizeof(*guid) );
- guid->Data1 = luid->Info.NetLuidIndex;
- memcpy( guid->Data4+2, "NetDev", 6 );
- return NO_ERROR;
+ err = NsiGetParameter( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, luid, sizeof(*luid),
+ NSI_PARAM_TYPE_STATIC, guid, sizeof(*guid),
+ FIELD_OFFSET(struct nsi_ndis_ifinfo_static, if_guid) );
+ if (err) memset( guid, 0, sizeof(*guid) );
+ return err;
}
/******************************************************************
More information about the wine-cvs
mailing list