[PATCH v2 1/2] iphlpapi: Correctly include tcpestats.h.
This is needed to add prototypes with TCP_ESTATS_TYPE argument types. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- This is how it is in the Windows SDK file. --- dlls/iphlpapi/iphlpapi_main.c | 1 - include/iphlpapi.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 0bd7cdc06c8..e002e12e2fd 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" diff --git a/include/iphlpapi.h b/include/iphlpapi.h index da5819c8423..4e156913426 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 -- 2.36.0
From: Austin English <austinenglish(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52677 Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v2: - Formatting. - Add prototype. - Remove rw = ro_static = ro_dynamic = NULL. I don't think the above line is needed. Screenshot: https://i.imgur.com/RkzgjBG.png Austin signed-off on his original patch but I didn't add it here because of the above changes. Please don't commit this unless Austin signs off on it. Thanks again, Austin. :) --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 13 +++++++++++++ include/iphlpapi.h | 4 ++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 90bf290c9bd..565c98305c5 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 e002e12e2fd..5370f758281 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2750,6 +2750,19 @@ DWORD WINAPI GetPerAdapterInfo( ULONG index, IP_PER_ADAPTER_INFO *info, ULONG *s } +/*********************************************************************** + * 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; +} + /****************************************************************** * GetRTTAndHopCount (IPHLPAPI.@) * diff --git a/include/iphlpapi.h b/include/iphlpapi.h index 4e156913426..50267d199c0 100644 --- a/include/iphlpapi.h +++ b/include/iphlpapi.h @@ -158,6 +158,10 @@ DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen); DWORD WINAPI GetPerAdapterInfo(ULONG IfIndex, PIP_PER_ADAPTER_INFO pPerAdapterInfo, PULONG pOutBufLen); +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 IpReleaseAddress(PIP_ADAPTER_INDEX_MAP AdapterInfo); DWORD WINAPI IpRenewAddress(PIP_ADAPTER_INDEX_MAP AdapterInfo); -- 2.36.0
On Tue, Apr 26, 2022 at 12:03 AM Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> wrote:
Sorry, this should be https://bugs.winehq.org/show_bug.cgi?id=52868 -- Kind regards, Mohamad
On Tue, Apr 26, 2022 at 12:00:10AM -0400, Mohamad Al-Jaf wrote:
From: Austin English <austinenglish(a)gmail.com>
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52677 Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v2: - Formatting. - Add prototype. - Remove rw = ro_static = ro_dynamic = NULL.
I don't think the above line is needed.
Screenshot: https://i.imgur.com/RkzgjBG.png
Austin signed-off on his original patch but I didn't add it here because of the above changes.
Please don't commit this unless Austin signs off on it.
Thanks again, Austin. :)
I don't think it's unreasonable to wait for Austin to send in his own patches (especially as you're asking the reviewer to wait until Austin sends his sign-off). I appreciate that you've made some changes, but this would be better done in response to a patch that's actually on the mailing list. That way the reviewer can easily follow the progress, unlike the way this was done, which just left me confused about where v1 was. Huw.
On Tue, Apr 26, 2022 at 2:38 AM Huw Davies <huw(a)codeweavers.com> wrote:
I don't think it's unreasonable to wait for Austin to send in his own patches (especially as you're asking the reviewer to wait until Austin sends his sign-off). I appreciate that you've made some changes, but this would be better done in response to a patch that's actually on the mailing list. That way the reviewer can easily follow the progress, unlike the way this was done, which just left me confused about where v1 was.
You're right, it's not unreasonable to wait for him to send it on his own, but I just appreciated his input in the mshtmlmedia thread and wanted to show my gratitude by confirming the wine-bug, and confirming his patch, hence the sign-off from me. I made a Twitch account just to test his patch. I normally wouldn't do something like this, people can submit their patch on their own and they should, it's their work after all. And to be honest I'd much rather stick to my own work. I just wanted to save him the trouble of doing it himself. I take no credit for this patch. If he wants to resubmit under his name it's completely fine by me and I'm more than happy to sign-off on the patch, well, that is if my sign-off has any bearing. I apologize in advance if he didn't want this. -- Kind regards, Mohamad
On Tue, Apr 26, 2022, 11:11 Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> wrote:
On Tue, Apr 26, 2022 at 2:38 AM Huw Davies <huw(a)codeweavers.com> wrote:
I don't think it's unreasonable to wait for Austin to send in his own patches (especially as you're asking the reviewer to wait until Austin sends his sign-off). I appreciate that you've made some changes, but this would be better done in response to a patch that's actually on the mailing list. That way the reviewer can easily follow the progress, unlike the way this was done, which just left me confused about where v1 was.
You're right, it's not unreasonable to wait for him to send it on his own, but I just appreciated his input in the mshtmlmedia thread and wanted to show my gratitude by confirming the wine-bug, and confirming his patch, hence the sign-off from me. I made a Twitch account just to test his patch.
I normally wouldn't do something like this, people can submit their patch on their own and they should, it's their work after all. And to be honest I'd much rather stick to my own work. I just wanted to save him the trouble of doing it himself. I take no credit for this patch.
If he wants to resubmit under his name it's completely fine by me and I'm more than happy to sign-off on the patch, well, that is if my sign-off has any bearing.
I apologize in advance if he didn't want this.
-- Kind regards, Mohamad
I didn't originally add my sign of because the patch wasn't tested. I have no problem with you taking over the patch, thanks for checking. I'm traveling for the next couple weeks, anyway, so won't have a chance to do much with it for a while.
On Fri, Apr 29, 2022 at 1:12 AM Austin English <austinenglish(a)gmail.com> wrote:
I didn't originally add my sign of because the patch wasn't tested.
I have no problem with you taking over the patch, thanks for checking.
I'm traveling for the next couple weeks, anyway, so won't have a chance to do much with it for a while.
Sounds good. I wanted to make sure you were okay with the changes. -- Kind regards, Mohamad
participants (3)
-
Austin English -
Huw Davies -
Mohamad Al-Jaf