[PATCH v2 0/3] MR4926: Adapter test

[John H. Freeman (＠tingling0072)]

--
  v2: updated comment before test to more accurately reflect

https://gitlab.winehq.org/wine/wine/-/merge_requests/4926

[PATCH v2 1/3] added test_GetAdaptersAddressesSizeZeroParam

[John Freeman]

From: John Freeman

---
 dlls/iphlpapi/tests/iphlpapi.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c
index cd192003345..5bb5ab13ee3 100644
--- a/dlls/iphlpapi/tests/iphlpapi.c
+++ b/dlls/iphlpapi/tests/iphlpapi.c
@@ -67,7 +67,7 @@ static DWORD (WINAPI *pParseNetworkString)(const WCHAR*,DWORD,NET_ADDRESS_INFO*,
 static DWORD (WINAPI *pNotifyUnicastIpAddressChange)(ADDRESS_FAMILY, PUNICAST_IPADDRESS_CHANGE_CALLBACK,
                                                 PVOID, BOOLEAN, HANDLE *);
 static DWORD (WINAPI *pCancelMibChangeNotify2)(HANDLE);
-
+static DWORD (WINAPI *pGetAdaptersAddresses)(ULONG, ULONG, void*, IP_ADAPTER_ADDRESSES*, ULONG*)
 DWORD WINAPI ConvertGuidToStringA( const GUID *, char *, DWORD );
 DWORD WINAPI ConvertGuidToStringW( const GUID *, WCHAR *, DWORD );
 DWORD WINAPI ConvertStringToGuidW( const WCHAR *, GUID * );
@@ -88,6 +88,7 @@ static void loadIPHlpApi(void)
     pParseNetworkString = (void *)GetProcAddress(hLibrary, "ParseNetworkString");
     pNotifyUnicastIpAddressChange = (void *)GetProcAddress(hLibrary, "NotifyUnicastIpAddressChange");
     pCancelMibChangeNotify2 = (void *)GetProcAddress(hLibrary, "CancelMibChangeNotify2");
+    pGetAdaptersAddresses = (void *)GetProcAddress(hLibrary, "GetAdaptersAddresses");
   }
 }

@@ -2913,6 +2914,18 @@ static void test_compartments(void)
     id = GetCurrentThreadCompartmentId();
     ok(id == NET_IF_COMPARTMENT_ID_PRIMARY, "got %u\n", id);
 }
+//Test passes no parameters of importance but returns error if size passed into
+//GetAdaptersAddresses is zero and is Ok if the returned value is ERROR_INVALID_PARAMETER
+static void test_GetAdaptersAddressesSizeZeroParamReturnInvalidParameterError(void)
+{
+    ULONG family = 0;
+    ULONG flags = 0;
+    void *reserved;
+    IP_ADAPTER_ADDRESSES *aa;
+    ULONG *size;
+    ULONG err = GetAdaptersAddresses(family, flags, reserved, aa, size);
+    ok(err == ERROR_INVALID_PARAMETER, "got %ld\n", err);
+}

START_TEST(iphlpapi)
 {
@@ -2949,6 +2962,7 @@ START_TEST(iphlpapi)
     test_NotifyUnicastIpAddressChange();
     test_ConvertGuidToString();
     test_compartments();
+    test_GetAdaptersAddressesSizeZeroParamReturnInvalidParameterError();
     freeIPHlpApi();
   }
 }

[PATCH v2 2/3] missing semi-colon

[John H. Freeman]

From: "John H. Freeman"

---
 dlls/iphlpapi/tests/iphlpapi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c
index 5bb5ab13ee3..013cb4de7e9 100644
--- a/dlls/iphlpapi/tests/iphlpapi.c
+++ b/dlls/iphlpapi/tests/iphlpapi.c
@@ -67,7 +67,7 @@ static DWORD (WINAPI *pParseNetworkString)(const WCHAR*,DWORD,NET_ADDRESS_INFO*,
 static DWORD (WINAPI *pNotifyUnicastIpAddressChange)(ADDRESS_FAMILY, PUNICAST_IPADDRESS_CHANGE_CALLBACK,
                                                 PVOID, BOOLEAN, HANDLE *);
 static DWORD (WINAPI *pCancelMibChangeNotify2)(HANDLE);
-static DWORD (WINAPI *pGetAdaptersAddresses)(ULONG, ULONG, void*, IP_ADAPTER_ADDRESSES*, ULONG*)
+static DWORD (WINAPI *pGetAdaptersAddresses)(ULONG, ULONG, void*, IP_ADAPTER_ADDRESSES*, ULONG*);
 DWORD WINAPI ConvertGuidToStringA( const GUID *, char *, DWORD );
 DWORD WINAPI ConvertGuidToStringW( const GUID *, WCHAR *, DWORD );
 DWORD WINAPI ConvertStringToGuidW( const WCHAR *, GUID * );

[PATCH v2 3/3] updated comment before test to more accurately reflect that test is to see if response from GetAdaptersAddresses is correct from a size null pointer

[John H. Freeman]

From: "John H. Freeman"

---
 dlls/iphlpapi/tests/iphlpapi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c
index 013cb4de7e9..8027a8500aa 100644
--- a/dlls/iphlpapi/tests/iphlpapi.c
+++ b/dlls/iphlpapi/tests/iphlpapi.c
@@ -2915,7 +2915,7 @@ static void test_compartments(void)
     ok(id == NET_IF_COMPARTMENT_ID_PRIMARY, "got %u\n", id);
 }
 //Test passes no parameters of importance but returns error if size passed into
-//GetAdaptersAddresses is zero and is Ok if the returned value is ERROR_INVALID_PARAMETER
+//GetAdaptersAddresses is a null pointer  and is Ok if the returned value is ERROR_INVALID_PARAMETER
 static void test_GetAdaptersAddressesSizeZeroParamReturnInvalidParameterError(void)
 {
     ULONG family = 0;

[Zhiyi Zhang (＠zhiyi)]

Zhiyi Zhang (@zhiyi) commented about dlls/iphlpapi/tests/iphlpapi.c:
> static DWORD (WINAPI *pNotifyUnicastIpAddressChange)(ADDRESS_FAMILY, PUNICAST_IPADDRESS_CHANGE_CALLBACK,
>                                                  PVOID, BOOLEAN, HANDLE *);
>  static DWORD (WINAPI *pCancelMibChangeNotify2)(HANDLE);
> -
>
> +static DWORD (WINAPI *pGetAdaptersAddresses)(ULONG, ULONG, void*, IP_ADAPTER_ADDRESSES*, ULONG*)

Don't add broken code and then add another commit to fix it. Please squash 2/3 together.

[Zhiyi Zhang (＠zhiyi)]

Zhiyi Zhang (@zhiyi) commented about dlls/iphlpapi/tests/iphlpapi.c:
>  id = GetCurrentThreadCompartmentId();
>  ok(id == NET_IF_COMPARTMENT_ID_PRIMARY, "got %u\n", id);
>
> }
> +//Test passes no parameters of importance but returns error if size passed into
> +//GetAdaptersAddresses is zero and is Ok if the returned value is ERROR_INVALID_PARAMETER

Don't use // to comment. Please use /* */ instead

[Zhiyi Zhang (＠zhiyi)]

Zhiyi Zhang (@zhiyi) commented about dlls/iphlpapi/tests/iphlpapi.c:
>  id = GetCurrentThreadCompartmentId();
>  ok(id == NET_IF_COMPARTMENT_ID_PRIMARY, "got %u\n", id);
>
> }
> +//Test passes no parameters of importance but returns error if size passed into
> +//GetAdaptersAddresses is zero and is Ok if the returned value is ERROR_INVALID_PARAMETER
> +static void test_GetAdaptersAddressesSizeZeroParamReturnInvalidParameterError(void)

Rename to test_GetAdaptersAddresses(). And then add your specific tests with comments about what it's testing for exactly. Instead of putting the description in the function name.

[Zhiyi Zhang (＠zhiyi)]

Zhiyi Zhang (@zhiyi) commented about dlls/iphlpapi/tests/iphlpapi.c:
>  ok(id == NET_IF_COMPARTMENT_ID_PRIMARY, "got %u\n", id);
>
> }
>  //Test passes no parameters of importance but returns error if size passed into
> -//GetAdaptersAddresses is zero and is Ok if the returned value is ERROR_INVALID_PARAMETER
> +//GetAdaptersAddresses is a null pointer  and is Ok if the returned value is ERROR_INVALID_PARAMETER

Same here. The comment should be correct from the start.