From e2cd2733033c4bdd15de5604a6b2c437811088f5 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sun, 8 Feb 2015 20:16:54 +0100 Subject: [PATCH] iphlpapi-TCP_Table: Fix an incorrect TRACE message. --- debian/changelog | 4 ++++ ...nt-AllocateAndGetTcpExTableFromStack.patch | 21 ++++++++++--------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index bf71cad3..0b8590de 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,7 @@ +wine-staging (1.7.37) UNRELEASED; urgency=low + * Fix a TRACE line in the iphlpapi-TCP_Table patchset. + -- Sebastian Lackner 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. diff --git a/patches/iphlpapi-TCP_Table/0001-iphlpapi-Implement-AllocateAndGetTcpExTableFromStack.patch b/patches/iphlpapi-TCP_Table/0001-iphlpapi-Implement-AllocateAndGetTcpExTableFromStack.patch index 89289808..d18e6bb3 100644 --- a/patches/iphlpapi-TCP_Table/0001-iphlpapi-Implement-AllocateAndGetTcpExTableFromStack.patch +++ b/patches/iphlpapi-TCP_Table/0001-iphlpapi-Implement-AllocateAndGetTcpExTableFromStack.patch @@ -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" 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