[pkg-wine-party] [SCM] Debian Wine packaging branch, wheezy, updated. wine-1.4-7-302-gb61b690

[Alexandre Julliard]

The following commit has been merged in the wheezy branch:
commit 364e515bf13f4eb97c19693f5ac2cb23a0472578
Author: Jacek Caban <jacek at codeweavers.com>
Date:   Thu Apr 19 13:35:47 2012 +0200

    winhttp: Fixed netconn_recv when read uses both SSL_recv and buffered data.
    (cherry picked from commit 9a82f6a812ab4c781a77b6627523e8af6b77fccc)

diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c
index c5d3e94..7e8c211 100644
--- a/dlls/winhttp/net.c
+++ b/dlls/winhttp/net.c
@@ -809,7 +809,7 @@ BOOL netconn_recv( netconn_t *conn, void *buf, size_t len, int flags, int *recvd
             }
             else memcpy( conn->peek_msg, buf, ret );
         }
-        *recvd = ret;
+        *recvd += ret;
         return TRUE;
 #else
         return FALSE;

-- 
Debian Wine packaging