Merge branch 'master' of github.com:compholio/wine-compholio

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 <example.email@email-provider.com>
+    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.

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 <erich.e.hoover@gmail.com>  Sat, 26 Jul 2014 12:41:50 -0600
 

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" <erich.e.hoover@gmail.com>
 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()