Module: wine Branch: master Commit: f1349aa51496540254406c77c5dcbf8dfb42ff3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1349aa51496540254406c77c...
Author: Huw Davies huw@codeweavers.com Date: Fri Jul 9 09:09:28 2021 +0100
iphlpapi: Return the TCPIP device name in MIB_IFROW.
Signed-off-by: Huw Davies huw@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/iphlpapi/iphlpapi_main.c | 7 ++++--- dlls/iphlpapi/tests/iphlpapi.c | 1 - 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index dac84ee2afb..4ff9feb57f2 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1736,12 +1736,13 @@ DWORD WINAPI GetFriendlyIfIndex(DWORD IfIndex) return IfIndex; }
-static void if_counted_string_copy( WCHAR *dst, unsigned int len, IF_COUNTED_STRING *src ); - static void if_row_fill( MIB_IFROW *row, struct nsi_ndis_ifinfo_rw *rw, struct nsi_ndis_ifinfo_dynamic *dyn, struct nsi_ndis_ifinfo_static *stat ) { - if_counted_string_copy( row->wszName, ARRAY_SIZE(row->wszName), &rw->alias ); + static const WCHAR name_prefix[] = {'\','D','E','V','I','C','E','\','T','C','P','I','P','_',0}; + + memcpy( row->wszName, name_prefix, sizeof(name_prefix) ); + ConvertGuidToStringW( &stat->if_guid, row->wszName + ARRAY_SIZE(name_prefix) - 1, CHARS_IN_GUID ); row->dwIndex = stat->if_index; row->dwType = stat->type; row->dwMtu = dyn->mtu; diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 1e8950f3482..893d6041287 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -275,7 +275,6 @@ static void testGetIfTable(void) guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]); -todo_wine ok( !wcscmp( row->wszName, name ), "got %s vs %s\n", debugstr_w( row->wszName ), debugstr_w( name ) ); } }