iphlpapi-TCP_Table: Fix an incorrect TRACE message.

This commit is contained in:
Sebastian Lackner 2015-02-08 20:16:54 +01:00
parent b7770327f1
commit e2cd273303
2 changed files with 15 additions and 10 deletions

4
debian/changelog vendored
View File

@ -1,3 +1,7 @@
wine-staging (1.7.37) UNRELEASED; urgency=low
* Fix a TRACE line in the iphlpapi-TCP_Table patchset.
-- Sebastian Lackner <sebastian@fds-team.de> Sun, 08 Feb 2015 20:29:38 +0100
wine-staging (1.7.36) unstable; urgency=low
* Fix an incompatibility of patchinstall.sh with non-bash shells under specific situations.
* Improve dinput-Events patch to be compatible with applications which do not explicitly poll for input.

View File

@ -1,17 +1,17 @@
From f6de001c5e6c579b55d361cb6191fe0419767c65 Mon Sep 17 00:00:00 2001
From 9bd0134fa68f09921a9eaabd17fde1f81154c204 Mon Sep 17 00:00:00 2001
From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
Date: Sat, 26 Jul 2014 12:31:50 -0600
Subject: iphlpapi: Implement AllocateAndGetTcpExTableFromStack.
Based on a patch by Ralf Habacker.
---
dlls/iphlpapi/iphlpapi.spec | 1 +
dlls/iphlpapi/ipstats.c | 34 ++++++++++++++++++++++++++++++++++
dlls/iphlpapi/ipstats.h | 1 +
3 files changed, 36 insertions(+)
dlls/iphlpapi/iphlpapi.spec | 1 +
dlls/iphlpapi/ipstats.c | 35 +++++++++++++++++++++++++++++++++++
dlls/iphlpapi/ipstats.h | 1 +
3 files changed, 37 insertions(+)
diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec
index 36ba13f..4f56e23 100644
index 228f64f..1fdfbe9 100644
--- a/dlls/iphlpapi/iphlpapi.spec
+++ b/dlls/iphlpapi/iphlpapi.spec
@@ -5,6 +5,7 @@
@ -23,10 +23,10 @@ index 36ba13f..4f56e23 100644
@ stdcall AllocateAndGetUdpTableFromStack( ptr long long long )
@ stdcall CancelIPChangeNotify( ptr )
diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c
index 3ff30f3..b94ff5d 100644
index 3ff30f3..460f688 100644
--- a/dlls/iphlpapi/ipstats.c
+++ b/dlls/iphlpapi/ipstats.c
@@ -2327,6 +2327,40 @@ DWORD WINAPI AllocateAndGetTcpTableFromStack( PMIB_TCPTABLE *ppTcpTable, BOOL bO
@@ -2327,6 +2327,41 @@ DWORD WINAPI AllocateAndGetTcpTableFromStack( PMIB_TCPTABLE *ppTcpTable, BOOL bO
return build_tcp_table( TCP_TABLE_BASIC_ALL, (void **)ppTcpTable, bOrder, heap, flags, NULL );
}
@ -51,7 +51,8 @@ index 3ff30f3..b94ff5d 100644
+DWORD WINAPI AllocateAndGetTcpExTableFromStack( VOID **ppTcpTable, BOOL bOrder,
+ HANDLE heap, DWORD flags, DWORD family )
+{
+ TRACE("table %p, bOrder %d, heap %p, flags 0x%08x\n", ppTcpTable, bOrder, heap, flags);
+ TRACE("table %p, bOrder %d, heap %p, flags 0x%08x, family %u\n",
+ ppTcpTable, bOrder, heap, flags, family);
+
+ if (!ppTcpTable) return ERROR_INVALID_PARAMETER;
+
@ -80,5 +81,5 @@ index bf5bb92..d8835aa 100644
DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *ppIpForwardTable, BOOL bOrder, HANDLE heap, DWORD flags) DECLSPEC_HIDDEN;
--
1.7.9.5
2.2.2