July 2021 - Wine-commits - list.winehq.org

Alexandre Julliard : Release 6.12.
by Alexandre Julliard 02 Jul '21

02 Jul '21

Module: wine Branch: master Commit: 12d33d21d33788fd46898ea42e9592d33b6e7c8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=12d33d21d33788fd46898ea4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 2 21:45:02 2021 +0200 Release 6.12. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 881 +++++++++++++++++++++++++++++++++----------------------------- AUTHORS | 3 + VERSION | 2 +- configure | 18 +- 4 files changed, 487 insertions(+), 417 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=12d33d21d33788fd4689…

1 0

Tag wine-6.12 : Alexandre Julliard : Release 6.12
by Alexandre Julliard 02 Jul '21

02 Jul '21

Module: wine Branch: refs/tags/wine-6.12 Tag: e78e2e92dc221332c3627b4a8a3e4583cc6e2701 URL: https://source.winehq.org/git/wine.git/?a=tag;h=e78e2e92dc221332c3627b4a8a3… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 2 21:45:02 2021 +0200 Release 6.12

1 0

Jacek Caban : gdi32: Reimplement SelectObject on top of ntgdi interface.
by Alexandre Julliard 02 Jul '21

02 Jul '21

Module: wine Branch: master Commit: 341be5f3f22029de527697a04f782a0f238bafe0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=341be5f3f22029de527697a0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 2 12:41:01 2021 +0200 gdi32: Reimplement SelectObject on top of ntgdi interface. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/Makefile.in | 1 + dlls/gdi32/bitmap.c | 10 ----- dlls/gdi32/brush.c | 13 ------ dlls/gdi32/dc.c | 1 - dlls/gdi32/dib.c | 11 ----- dlls/gdi32/font.c | 11 ----- dlls/gdi32/gdi_private.h | 1 - dlls/gdi32/gdiobj.c | 36 ----------------- dlls/gdi32/objects.c | 102 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/palette.c | 1 - dlls/gdi32/pen.c | 12 ------ dlls/gdi32/region.c | 10 ----- 12 files changed, 103 insertions(+), 106 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=341be5f3f22029de5276…

1 0

Jacek Caban : gdi32: Use get_object_type for GetObjectType implementation.
by Alexandre Julliard 02 Jul '21

02 Jul '21

Module: wine Branch: master Commit: 7c957ec998bf9c8ba74c7180e2e90e42d8f0c185 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c957ec998bf9c8ba74c7180… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 2 12:41:12 2021 +0200 gdi32: Use get_object_type for GetObjectType implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/gdiobj.c | 17 ----------------- dlls/gdi32/objects.c | 11 +++++++++++ 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index c6eb15ce2ab..2f795a3f12f 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -1090,23 +1090,6 @@ INT WINAPI GetObjectW( HGDIOBJ handle, INT count, LPVOID buffer ) return result; } -/*********************************************************************** - * GetObjectType (GDI32.@) - */ -DWORD WINAPI GetObjectType( HGDIOBJ handle ) -{ - GDI_HANDLE_ENTRY *entry; - DWORD result = 0; - - EnterCriticalSection( &gdi_section ); - if ((entry = handle_entry( handle ))) result = entry->Type; - LeaveCriticalSection( &gdi_section ); - - TRACE("%p -> %u\n", handle, result ); - if (!result) SetLastError( ERROR_INVALID_HANDLE ); - return result; -} - /*********************************************************************** * GetCurrentObject (GDI32.@) * diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 53335fd48df..854f4783f5b 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -64,6 +64,17 @@ static WORD get_object_type( HGDIOBJ obj ) return entry ? entry->Type : 0; } +/*********************************************************************** + * GetObjectType (GDI32.@) + */ +DWORD WINAPI GetObjectType( HGDIOBJ handle ) +{ + DWORD result = get_object_type( handle ); + TRACE("%p -> %u\n", handle, result ); + if (!result) SetLastError( ERROR_INVALID_HANDLE ); + return result; +} + /*********************************************************************** * SelectObject (GDI32.@) *

1 0

Jacek Caban : gdi32: Directly use ntgdi interface to select objects.
by Alexandre Julliard 02 Jul '21

02 Jul '21

Module: wine Branch: master Commit: dc73184c299a2998f9f2cc78a8056a9576b59946 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc73184c299a2998f9f2cc78… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 2 12:41:27 2021 +0200 gdi32: Directly use ntgdi interface to select objects. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitblt.c | 30 +++++++++++++++--------------- dlls/gdi32/dc.c | 26 +++++++++++++------------- dlls/gdi32/dib.c | 6 +++--- dlls/gdi32/font.c | 16 ++++++++-------- dlls/gdi32/painting.c | 8 ++++---- 5 files changed, 43 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dc73184c299a2998f9f2…

1 0

Jacek Caban : gdi32/tests: Add more SelectObject tests.
by Alexandre Julliard 02 Jul '21

02 Jul '21

Module: wine Branch: master Commit: be6295abb0549073725160790bb03f2b244f2567 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be6295abb054907372516079… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 2 12:41:39 2021 +0200 gdi32/tests: Add more SelectObject tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/bitmap.c | 6 ++++++ dlls/gdi32/tests/font.c | 27 +++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index fe3482671b2..0293d881fd9 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -2673,6 +2673,12 @@ static void test_select_object(void) hbm_old = SelectObject(hdc, hbm_old); ok(hbm_old == hbm, "SelectObject failed\n"); + SetLastError(0xdeadbeef); + hbm_old = SelectObject(NULL, hbm); + ok(!hbm_old, "SelectObject returned %p\n", hbm_old); + ok(GetLastError() == ERROR_INVALID_HANDLE, "GetLastError() = %u\n", + GetLastError()); + DeleteObject(hbm); /* test an 1-bpp bitmap */ diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 8a4137d7fd1..7aee0a86d23 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -7743,6 +7743,32 @@ done: ReleaseDC(0, hdc); } +static void test_select_object(void) +{ + HFONT hfont, old_font; + LOGFONTA lf; + + memset(&lf, 0, sizeof lf); + + lf.lfCharSet = ANSI_CHARSET; + lf.lfClipPrecision = CLIP_DEFAULT_PRECIS; + lf.lfWeight = FW_DONTCARE; + lf.lfHeight = 16; + lf.lfWidth = 16; + lf.lfQuality = DEFAULT_QUALITY; + + lstrcpyA(lf.lfFaceName, "Arial"); + hfont = create_font("Arial", &lf); + + SetLastError(0xdeadbeef); + old_font = SelectObject(NULL, hfont); + ok(!old_font, "SelectObject returned %p\n", old_font); + ok(GetLastError() == ERROR_INVALID_HANDLE, "GetLastError() = %u\n", + GetLastError()); + + DeleteObject(hfont); +} + START_TEST(font) { static const char *test_names[] = @@ -7829,6 +7855,7 @@ START_TEST(font) test_ttf_names(); test_lang_names(); test_char_width(); + test_select_object(); /* These tests should be last test until RemoveFontResource * is properly implemented.

1 0

Hugh McMaster : reg/tests: Check all error codes in delete_tree() before returning.
by Alexandre Julliard 02 Jul '21

02 Jul '21

Module: wine Branch: master Commit: 48c73868720606ab62ae089ee3b9c978736bd530 URL: https://source.winehq.org/git/wine.git/?a=commit;h=48c73868720606ab62ae089e… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jul 2 22:44:06 2021 +1000 reg/tests: Check all error codes in delete_tree() before returning. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/add.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index 2c1a2cf35e3..1be34602408 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -194,9 +194,8 @@ LONG delete_tree_(const char *file, unsigned line, HKEY root, const char *path, else ret = RegDeleteKeyExA(hkey, empty, sam, 0); - lok(!ret, "Failed to delete registry key, got error %d\n", ret); - cleanup: + lok(!ret, "Failed to delete registry key, got error %d\n", ret); HeapFree(GetProcessHeap(), 0, subkey_name); RegCloseKey(hkey); return ret;

1 0

Hugh McMaster : reg: Support use of registry views in the 'query' operation.
by Alexandre Julliard 02 Jul '21

02 Jul '21

Module: wine Branch: master Commit: 8eef4a873513cca9ffea61fb225fa8a9c8ac784d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8eef4a873513cca9ffea61fb… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jul 2 22:44:07 2021 +1000 reg: Support use of registry views in the 'query' operation. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/query.c | 24 +++++++++++++++++++----- programs/reg/tests/query.c | 24 ++++++++++++------------ 2 files changed, 31 insertions(+), 17 deletions(-) diff --git a/programs/reg/query.c b/programs/reg/query.c index 4886fb84bc1..c1d08541c68 100644 --- a/programs/reg/query.c +++ b/programs/reg/query.c @@ -140,6 +140,7 @@ static void output_value(const WCHAR *value_name, DWORD type, BYTE *data, DWORD } static unsigned int num_values_found = 0; +static REGSAM sam = 0; static int query_value(HKEY hkey, WCHAR *value_name, WCHAR *path, BOOL recurse) { @@ -203,7 +204,7 @@ static int query_value(HKEY hkey, WCHAR *value_name, WCHAR *path, BOOL recurse) if (rc == ERROR_SUCCESS) { subkey_path = build_subkey_path(path, path_len, subkey_name, subkey_len); - if (!RegOpenKeyExW(hkey, subkey_name, 0, KEY_READ, &subkey)) + if (!RegOpenKeyExW(hkey, subkey_name, 0, KEY_READ|sam, &subkey)) { query_value(subkey, value_name, subkey_path, recurse); RegCloseKey(subkey); @@ -290,7 +291,7 @@ static int query_all(HKEY hkey, WCHAR *path, BOOL recurse, BOOL recursing) if (recurse) { subkey_path = build_subkey_path(path, path_len, subkey_name, subkey_len); - if (!RegOpenKeyExW(hkey, subkey_name, 0, KEY_READ, &subkey)) + if (!RegOpenKeyExW(hkey, subkey_name, 0, KEY_READ|sam, &subkey)) { query_all(subkey, subkey_path, recurse, TRUE); RegCloseKey(subkey); @@ -308,12 +309,12 @@ static int query_all(HKEY hkey, WCHAR *path, BOOL recurse, BOOL recursing) } static int run_query(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, - BOOL value_empty, BOOL recurse) + BOOL value_empty, BOOL recurse) { HKEY hkey; int ret; - if (RegOpenKeyExW(root, path, 0, KEY_READ, &hkey) != ERROR_SUCCESS) + if (RegOpenKeyExW(root, path, 0, KEY_READ|sam, &hkey)) { output_message(STRING_KEY_NONEXIST); return 1; @@ -360,8 +361,18 @@ int reg_query(int argc, WCHAR *argvW[]) value_empty = TRUE; continue; } - else if (!lstrcmpiW(str, L"reg:32") || !lstrcmpiW(str, L"reg:64")) + else if (!lstrcmpiW(str, L"reg:32")) + { + if (sam & KEY_WOW64_32KEY) goto invalid; + sam |= KEY_WOW64_32KEY; + continue; + } + else if (!lstrcmpiW(str, L"reg:64")) + { + if (sam & KEY_WOW64_64KEY) goto invalid; + sam |= KEY_WOW64_64KEY; continue; + } else if (!str[0] || str[1]) goto invalid; @@ -383,6 +394,9 @@ int reg_query(int argc, WCHAR *argvW[]) if (value_name && value_empty) goto invalid; + if (sam == (KEY_WOW64_32KEY|KEY_WOW64_64KEY)) + goto invalid; + key_name = get_long_key(root, path); return run_query(root, path, key_name, value_name, value_empty, recurse); diff --git a/programs/reg/tests/query.c b/programs/reg/tests/query.c index dcc98a9a0c4..a63b341546f 100644 --- a/programs/reg/tests/query.c +++ b/programs/reg/tests/query.c @@ -414,16 +414,16 @@ static void test_registry_view_win64(void) create_test_key(KEY_WOW64_32KEY); read_reg_output("reg query HKLM\\" KEY_BASE " /reg:32", buf, sizeof(buf), &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - compare_query(buf, test9a, FALSE, TODO_REG_COMPARE); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test9a, FALSE, 0); read_reg_output("reg query HKLM\\" KEY_BASE " /s /reg:32", buf, sizeof(buf), &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - compare_query(buf, test9b, FALSE, TODO_REG_COMPARE); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test9b, FALSE, 0); read_reg_output("reg query HKLM\\" KEY_BASE " /v Wine /s /reg:32", buf, sizeof(buf), &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - compare_query(buf, test9c, TRUE, TODO_REG_COMPARE); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test9c, TRUE, 0); delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); @@ -480,16 +480,16 @@ static void test_registry_view_wow64(void) create_test_key(KEY_WOW64_64KEY); read_reg_output("reg query HKLM\\" KEY_BASE " /reg:64", buf, sizeof(buf), &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - compare_query(buf, test9a, FALSE, TODO_REG_COMPARE); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test9a, FALSE, 0); read_reg_output("reg query HKLM\\" KEY_BASE " /s /reg:64", buf, sizeof(buf), &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - compare_query(buf, test9b, FALSE, TODO_REG_COMPARE); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test9b, FALSE, 0); read_reg_output("reg query HKLM\\" KEY_BASE " /v Wine /s /reg:64", buf, sizeof(buf), &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - compare_query(buf, test9c, TRUE, TODO_REG_COMPARE); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test9c, TRUE, 0); delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); }

1 0

Huw Davies : nsiproxy: Implement NDIS index to luid get_parameter.
by Alexandre Julliard 02 Jul '21

02 Jul '21

Module: wine Branch: master Commit: ecbd99781934266874b582e965aeb6a28889c8bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=ecbd99781934266874b582e9… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jul 2 09:41:32 2021 +0100 nsiproxy: Implement NDIS index to luid get_parameter. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsi/tests/nsi.c | 30 ++++++++++++++++++++++++++++++ dlls/nsiproxy.sys/ndis.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index d7f6ac9c739..cefd42983d4 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -382,9 +382,39 @@ static void test_ndis_ifinfo( void ) NsiFreeTable( luid_tbl, rw_tbl, dyn_tbl, stat_tbl ); } +static void test_ndis_index_luid( void ) +{ + DWORD err, count, i; + NET_LUID *luids, luid; + DWORD index; + + /* index -> luid map. NsiAllocateAndGetTable and NsiGetAllParameters fail */ + + /* first get the luids */ + err = NsiAllocateAndGetTable( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, (void **)&luids, sizeof(*luids), + NULL, 0, NULL, 0, NULL, 0, &count, 0 ); + ok( !err, "got %d\n", err ); + + for (i = 0; i < count; i++) + { + ConvertInterfaceLuidToIndex( luids + i, &index ); + err = NsiGetParameter( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_INDEX_LUID_TABLE, &index, sizeof(index), + NSI_PARAM_TYPE_STATIC, &luid, sizeof(luid), 0 ); + ok( !err, "got %d\n", err ); + ok( luid.Value == luids[i].Value, "%d: luid mismatch\n", i ); + } + NsiFreeTable( luids, NULL, NULL, NULL ); + + index = ~0u; + err = NsiGetParameter( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_INDEX_LUID_TABLE, &index, sizeof(index), + NSI_PARAM_TYPE_STATIC, &luid, sizeof(luid), 0 ); + ok( err == ERROR_FILE_NOT_FOUND, "got %d\n", err ); +} + START_TEST( nsi ) { test_nsi_api(); test_ndis_ifinfo(); + test_ndis_index_luid(); } diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index 647fd650cd3..38e6802e3bd 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -584,6 +584,31 @@ static NTSTATUS ifinfo_get_parameter( const void *key, DWORD key_size, DWORD par return status; } +static NTSTATUS index_luid_get_parameter( const void *key, DWORD key_size, DWORD param_type, + void *data, DWORD data_size, DWORD data_offset ) +{ + struct if_entry *entry; + NTSTATUS status = STATUS_OBJECT_NAME_NOT_FOUND; + + TRACE( "%p %d %d %p %d %d\n", key, key_size, param_type, data, data_size, data_offset ); + + if (param_type != NSI_PARAM_TYPE_STATIC || data_size != sizeof(NET_LUID) || data_offset != 0) + return STATUS_INVALID_PARAMETER; + + EnterCriticalSection( &if_list_cs ); + + update_if_table(); + + entry = find_entry_from_index( *(DWORD *)key ); + if (entry) + { + *(NET_LUID *)data = entry->if_luid; + status = STATUS_SUCCESS; + } + LeaveCriticalSection( &if_list_cs ); + return status; +} + static const struct module_table tables[] = { { @@ -596,6 +621,16 @@ static const struct module_table tables[] = ifinfo_get_all_parameters, ifinfo_get_parameter }, + { + NSI_NDIS_INDEX_LUID_TABLE, + { + sizeof(DWORD), 0, + 0, sizeof(NET_LUID) + }, + NULL, + NULL, + index_luid_get_parameter + }, { ~0u } };

1 0

Huw Davies : iphlpapi: Use ConvertInterfaceIndexToLuid() where possible.
by Alexandre Julliard 02 Jul '21

02 Jul '21

Module: wine Branch: master Commit: 7bdd9894f43be40bfa6654c1a18f3c8ddbafd616 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bdd9894f43be40bfa6654c1… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jul 2 09:41:33 2021 +0100 iphlpapi: Use ConvertInterfaceIndexToLuid() where possible. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 7b104330ba7..a774e60c3d9 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1052,8 +1052,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index aa->PhysicalAddressLength = buflen; aa->IfType = typeFromMibType(type); aa->ConnectionType = connectionTypeFromMibType(type); - aa->Luid.Info.NetLuidIndex = index; - aa->Luid.Info.IfType = aa->IfType; + ConvertInterfaceIndexToLuid( index, &aa->Luid ); if (output_gateways && num_v4_gateways) { @@ -1796,10 +1795,8 @@ DWORD WINAPI GetIfEntry2( MIB_IF_ROW2 *row2 ) if ((ret = getInterfaceStatsByName( name, &row ))) return ret; memset( row2, 0, sizeof(*row2) ); - row2->InterfaceLuid.Info.Reserved = 0; - row2->InterfaceLuid.Info.NetLuidIndex = row.dwIndex; - row2->InterfaceLuid.Info.IfType = row.dwType; row2->InterfaceIndex = row.dwIndex; + ConvertInterfaceIndexToLuid( row2->InterfaceIndex, &row2->InterfaceLuid ); ConvertInterfaceLuidToGuid( &row2->InterfaceLuid, &row2->InterfaceGuid ); row2->Type = row.dwType; row2->Mtu = row.dwMtu;

1 0