From afe4658dfc12458c67f1f579e00e1e81ad8ed8ff Mon Sep 17 00:00:00 2001 From: "Erich E. Hoover" Date: Sat, 26 Jul 2014 13:09:56 -0600 Subject: [PATCH 1/3] Add a markdown document about attribution. --- ATTRIBUTION.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 ATTRIBUTION.md diff --git a/ATTRIBUTION.md b/ATTRIBUTION.md new file mode 100644 index 00000000..3986ad95 --- /dev/null +++ b/ATTRIBUTION.md @@ -0,0 +1,20 @@ +Patch attribution for wine-compholio +============== + +The Wine "Compholio" Edition repository expects all patches to conform to Wine's attribution guidelines. There are a variety of ways to attribute patches, but they all involve an additional line to the patch subject: + + commit 0000000000000000000000000000000000000000 + Author: Example Author + Date: Sat Jul 26 12:31:50 2014 -0600 + + Name of patch. + + TYPE-OF-ATTRIBUTION. + +TYPE-OF-ATTRIBUTION can be any of the following: + +Found/Spotted by FINDER: +The resolved issue was found by FINDER, they should receive appropriate credit for finding the problem - even though their patch was not used in the final implementation. + +Based on patch by AUTHOR: +The patch created by AUTHOR was a starting point for the patch, some modifications were made to their patch - but they should receive credit since the original implementation was theirs. From 9032f33a16d731df927cc354b0196dbdc6088ae6 Mon Sep 17 00:00:00 2001 From: "Erich E. Hoover" Date: Sat, 26 Jul 2014 13:11:11 -0600 Subject: [PATCH 2/3] Up the version number for next release (whoops). --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 7e76328e..bc5b32d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -wine-compholio (1.7.23) UNRELEASED; urgency=low +wine-compholio (1.7.24) UNRELEASED; urgency=low * Added patch to implement AllocateAndGetTcpExTableFromStack. -- Erich E. Hoover Sat, 26 Jul 2014 12:41:50 -0600 From 5ea2e4b5e265d5df433830638adcd7fa1251efcc Mon Sep 17 00:00:00 2001 From: "Erich E. Hoover" Date: Sat, 26 Jul 2014 13:15:00 -0600 Subject: [PATCH 3/3] Add missing comment to AllocateAndGetTcpExTableFromStack patch. --- ...hlpapi-Implement-AllocateAndGetTcpExTableFromStack.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/patches/iphlpapi-TCP_Table/0001-iphlpapi-Implement-AllocateAndGetTcpExTableFromStack.patch b/patches/iphlpapi-TCP_Table/0001-iphlpapi-Implement-AllocateAndGetTcpExTableFromStack.patch index 8caad2b8..89289808 100644 --- a/patches/iphlpapi-TCP_Table/0001-iphlpapi-Implement-AllocateAndGetTcpExTableFromStack.patch +++ b/patches/iphlpapi-TCP_Table/0001-iphlpapi-Implement-AllocateAndGetTcpExTableFromStack.patch @@ -1,4 +1,4 @@ -From 1b79f1bc06ec42137a91e30e6543835b6b081250 Mon Sep 17 00:00:00 2001 +From f6de001c5e6c579b55d361cb6191fe0419767c65 Mon Sep 17 00:00:00 2001 From: "Erich E. Hoover" Date: Sat, 26 Jul 2014 12:31:50 -0600 Subject: iphlpapi: Implement AllocateAndGetTcpExTableFromStack. @@ -23,7 +23,7 @@ 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..cf42ee9 100644 +index 3ff30f3..b94ff5d 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -2327,6 +2327,40 @@ DWORD WINAPI AllocateAndGetTcpTableFromStack( PMIB_TCPTABLE *ppTcpTable, BOOL bO @@ -42,7 +42,7 @@ index 3ff30f3..cf42ee9 100644 + * bOrder [In] whether to sort the table + * heap [In] heap from which the table is allocated + * flags [In] flags to HeapAlloc -+ * family [In] ++ * family [In] address family [AF_INET|AF_INET6] + * + * RETURNS + * ERROR_INVALID_PARAMETER if ppTcpTable is NULL, whatever GetTcpTable()