Module: wine Branch: master Commit: 4050ceb22f6cb935f535502dfa8dbbd1afe2c28f URL: https://gitlab.winehq.org/wine/wine/-/commit/4050ceb22f6cb935f535502dfa8dbbd...
Author: Alex Henrie alexhenrie24@gmail.com Date: Tue May 30 21:20:27 2023 -0600
iphlpapi: Add GetCurrentThreadCompartmentId stub and a test.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54599
---
dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 9 +++++++++ dlls/iphlpapi/tests/iphlpapi.c | 9 +++++++++ include/netioapi.h | 1 + 4 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 90bf290c9bd..76701d686e0 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -80,7 +80,7 @@ @ stdcall GetBestRoute( long long ptr ) @ stdcall GetBestRoute2( ptr long ptr ptr long ptr ptr ) @ stub GetBestRouteFromStack -#@ stub GetCurrentThreadCompartmentId +@ stdcall GetCurrentThreadCompartmentId() @ stdcall GetExtendedTcpTable( ptr ptr long long long long ) @ stdcall GetExtendedUdpTable( ptr ptr long long long long ) @ stdcall GetFriendlyIfIndex( long ) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index d22209ff719..c4921d4a5ac 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -4750,3 +4750,12 @@ DWORD WINAPI Icmp6SendEcho2( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc_ro SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return 0; } + +/*********************************************************************** + * GetCurrentThreadCompartmentId (IPHLPAPI.@) + */ +NET_IF_COMPARTMENT_ID WINAPI GetCurrentThreadCompartmentId( void ) +{ + FIXME( "stub\n" ); + return NET_IF_COMPARTMENT_ID_PRIMARY; +} diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 5301a409126..8002afc0a89 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -2893,6 +2893,14 @@ static void test_ConvertGuidToString( void ) ok( err == ERROR_INVALID_PARAMETER, "got %ld\n", err ); }
+static void test_compartments(void) +{ + NET_IF_COMPARTMENT_ID id; + + id = GetCurrentThreadCompartmentId(); + ok(id == NET_IF_COMPARTMENT_ID_PRIMARY, "got %u\n", id); +} + START_TEST(iphlpapi) {
@@ -2927,6 +2935,7 @@ START_TEST(iphlpapi) test_ParseNetworkString(); test_NotifyUnicastIpAddressChange(); test_ConvertGuidToString(); + test_compartments(); freeIPHlpApi(); } } diff --git a/include/netioapi.h b/include/netioapi.h index 6005e58e216..40f0674c1d8 100644 --- a/include/netioapi.h +++ b/include/netioapi.h @@ -250,6 +250,7 @@ DWORD WINAPI ConvertInterfaceNameToLuidA(const char*,NET_LUID*); DWORD WINAPI ConvertInterfaceNameToLuidW(const WCHAR*,NET_LUID*); DWORD WINAPI ConvertLengthToIpv4Mask(ULONG,ULONG*); void WINAPI FreeMibTable(void*); +NET_IF_COMPARTMENT_ID WINAPI GetCurrentThreadCompartmentId(void); DWORD WINAPI GetIfEntry2(MIB_IF_ROW2*); DWORD WINAPI GetIfEntry2Ex(MIB_IF_TABLE_LEVEL,MIB_IF_ROW2*); DWORD WINAPI GetIfTable2(MIB_IF_TABLE2**);