Huw Davies : mountmgr: Retrieve the unix-name from the alias.
Alexandre Julliard
julliard at winehq.org
Wed Jul 7 15:01:29 CDT 2021
Module: wine
Branch: master
Commit: 76b31a2ed8fa7c160e67076d507ff44c5c7474a6
URL: https://source.winehq.org/git/wine.git/?a=commit;h=76b31a2ed8fa7c160e67076d507ff44c5c7474a6
Author: Huw Davies <huw at codeweavers.com>
Date: Wed Jul 7 09:05:57 2021 +0100
mountmgr: Retrieve the unix-name from the alias.
If, at some point, we change that, we can add a Wine-only nsi table
that holds the luid to unix-name mapping.
Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/mountmgr.sys/dbus.c | 2 +-
dlls/mountmgr.sys/diskarb.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/mountmgr.sys/dbus.c b/dlls/mountmgr.sys/dbus.c
index 6998ef43688..b7624d1cb37 100644
--- a/dlls/mountmgr.sys/dbus.c
+++ b/dlls/mountmgr.sys/dbus.c
@@ -1003,7 +1003,7 @@ static BOOL map_adapter_name( const NET_LUID *luid, char *unix_name, DWORD len )
{
WCHAR unix_nameW[IF_NAMESIZE];
- if (ConvertInterfaceLuidToNameW( luid, unix_nameW, ARRAY_SIZE(unix_nameW) )) return FALSE;
+ if (ConvertInterfaceLuidToAlias( luid, unix_nameW, ARRAY_SIZE(unix_nameW) )) return FALSE;
return WideCharToMultiByte( CP_UNIXCP, 0, unix_nameW, -1, unix_name, len, NULL, NULL ) != 0;
}
diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c
index 1232f450599..e33365f6301 100644
--- a/dlls/mountmgr.sys/diskarb.c
+++ b/dlls/mountmgr.sys/diskarb.c
@@ -260,7 +260,7 @@ static UInt8 map_option( ULONG option )
#define IF_NAMESIZE 16
static BOOL map_adapter_name( const NET_LUID *luid, WCHAR *unix_name, DWORD len )
{
- return !ConvertInterfaceLuidToNameW( luid, unix_name, len );
+ return !ConvertInterfaceLuidToAlias( luid, unix_name, len );
}
static CFStringRef find_service_id( const NET_LUID *adapter )
More information about the wine-cvs
mailing list