[PATCH v2 0/1] MR2946: iphlpapi: Add GetPerTcpConnectionEStats stub.

[Alex Henrie (＠alexhenrie)]

Based on a patch by Austin English.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52868

--
  v2: iphlpapi: Add GetPerTcpConnectionEStats stub.

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

[PATCH v2 1/1] iphlpapi: Add GetPerTcpConnectionEStats stub.

[Alex Henrie]

From: Alex Henrie

Based on a patch by Austin English.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52868
---
 dlls/iphlpapi/iphlpapi.spec   |  2 +-
 dlls/iphlpapi/iphlpapi_main.c | 14 +++++++++++++-
 include/iphlpapi.h            |  9 +++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec
index 76701d686e0..ef2c576947d 100644
--- a/dlls/iphlpapi/iphlpapi.spec
+++ b/dlls/iphlpapi/iphlpapi.spec
@@ -130,7 +130,7 @@
 @ stdcall GetPerAdapterInfo( long ptr ptr )
 #@ stub GetPerTcp6ConnectionEStats
 #@ stub GetPerTcp6ConnectionStats
-#@ stub GetPerTcpConnectionEStats
+@ stdcall GetPerTcpConnectionEStats( ptr long ptr long long ptr long long ptr long long )
 #@ stub GetPerTcpConnectionStats
 @ stdcall GetRTTAndHopCount( long ptr long ptr )
 #@ stub GetSessionCompartmentId
diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c
index c4921d4a5ac..f8ecb89c328 100644
--- a/dlls/iphlpapi/iphlpapi_main.c
+++ b/dlls/iphlpapi/iphlpapi_main.c
@@ -32,7 +32,6 @@
 #include "fltdefs.h"
 #include "ifdef.h"
 #include "netioapi.h"
-#include "tcpestats.h"
 #include "ip2string.h"
 #include "netiodef.h"
 #include "icmpapi.h"
@@ -4031,6 +4030,19 @@ DWORD WINAPI SetTcpEntry(PMIB_TCPROW pTcpRow)
   return 0;
 }

+/***********************************************************************
+ *    GetPerTcpConnectionEStats (IPHLPAPI.@)
+ */
+ULONG WINAPI GetPerTcpConnectionEStats(MIB_TCPROW *row, TCP_ESTATS_TYPE stats, UCHAR *rw, ULONG rw_version,
+                                       ULONG rw_size, UCHAR *ro_static, ULONG ro_static_version,
+                                       ULONG ro_static_size, UCHAR *ro_dynamic, ULONG ro_dynamic_version,
+                                       ULONG ro_dynamic_size)
+{
+    FIXME( "(%p, %d, %p, %ld, %ld, %p, %ld, %ld, %p, %ld, %ld): stub\n", row, stats, rw, rw_version, rw_size,
+           ro_static, ro_static_version, ro_static_size, ro_dynamic, ro_dynamic_version, ro_dynamic_size );
+    return ERROR_CALL_NOT_IMPLEMENTED;
+}
+
 /******************************************************************
  *    SetPerTcpConnectionEStats (IPHLPAPI.@)
  */
diff --git a/include/iphlpapi.h b/include/iphlpapi.h
index da5819c8423..35e0f134899 100644
--- a/include/iphlpapi.h
+++ b/include/iphlpapi.h
@@ -25,6 +25,7 @@ extern "C" {
 #include <iprtrmib.h>
 #include <ipexport.h>
 #include <iptypes.h>
+#include <tcpestats.h>

#define NET_STRING_IPV4_ADDRESS           0x00000001
 #define NET_STRING_IPV4_SERVICE           0x00000002
@@ -85,6 +86,11 @@ DWORD WINAPI GetTcpStatistics(PMIB_TCPSTATS pStats);

DWORD WINAPI GetTcpStatisticsEx(PMIB_TCPSTATS pStats, DWORD dwFamily);

+ULONG WINAPI GetPerTcpConnectionEStats(MIB_TCPROW *row, TCP_ESTATS_TYPE stats, UCHAR *rw, ULONG rw_version,
+                                       ULONG rw_size, UCHAR *ro_static, ULONG ro_static_version,
+                                       ULONG ro_static_size, UCHAR *ro_dynamic, ULONG ro_dynamic_version,
+                                       ULONG ro_dynamic_size);
+
 DWORD WINAPI GetUdpStatistics(PMIB_UDPSTATS pStats);

DWORD WINAPI GetUdpStatisticsEx(PMIB_UDPSTATS pStats, DWORD dwFamily);
@@ -99,6 +105,9 @@ DWORD WINAPI DeleteIpForwardEntry(PMIB_IPFORWARDROW pRoute);

DWORD WINAPI SetIpStatistics(PMIB_IPSTATS pIpStats);

+DWORD WINAPI SetPerTcpConnectionEStats(MIB_TCPROW *row, TCP_ESTATS_TYPE state, BYTE *rw,
+                                       ULONG version, ULONG size, ULONG offset);
+
 DWORD WINAPI SetIpTTL(UINT nTTL);

DWORD WINAPI CreateIpNetEntry(PMIB_IPNETROW pArpEntry);

[Alex Henrie (＠alexhenrie)]

On Fri Jun  2 04:14:41 2023 +0000, Huw Davies wrote:
> Could we add the prototype to `iphlpapi.h` and while we're at it, add
> `SetPerTcpConnectionEStats()`'s prototype too?  Doing this all in the
> same commit is fine.

Done.

[PATCH v2 0/1] MR2946: iphlpapi: Add GetPerTcpConnectionEStats stub. - approved

[Huw Davies (＠huw)]

This merge request was approved by Huw Davies.