Jacek Caban : wininet: Use SSL_pending in NETCON_query_data_available.

Alexandre Julliard julliard at winehq.org
Mon Jan 12 10:40:31 CST 2009


Module: wine
Branch: master
Commit: 4a43c308b58862e78d3ef44ed3f1560458adc1a8
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4a43c308b58862e78d3ef44ed3f1560458adc1a8

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Sat Jan 10 17:02:31 2009 +0100

wininet: Use SSL_pending in NETCON_query_data_available.

---

 dlls/wininet/netconnection.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c
index 4a46327..c573407 100644
--- a/dlls/wininet/netconnection.c
+++ b/dlls/wininet/netconnection.c
@@ -118,6 +118,7 @@ MAKE_FUNCPTR(SSL_connect);
 MAKE_FUNCPTR(SSL_shutdown);
 MAKE_FUNCPTR(SSL_write);
 MAKE_FUNCPTR(SSL_read);
+MAKE_FUNCPTR(SSL_pending);
 MAKE_FUNCPTR(SSL_get_verify_result);
 MAKE_FUNCPTR(SSL_get_peer_certificate);
 MAKE_FUNCPTR(SSL_CTX_get_timeout);
@@ -181,6 +182,7 @@ BOOL NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL)
 	DYNSSL(SSL_shutdown);
 	DYNSSL(SSL_write);
 	DYNSSL(SSL_read);
+	DYNSSL(SSL_pending);
 	DYNSSL(SSL_get_verify_result);
 	DYNSSL(SSL_get_peer_certificate);
 	DYNSSL(SSL_CTX_get_timeout);
@@ -606,7 +608,7 @@ BOOL NETCON_query_data_available(WININET_NETCONNECTION *connection, DWORD *avail
         return FALSE;
 
 #ifdef SONAME_LIBSSL
-    if (connection->peek_msg) *available = connection->peek_len;
+    if (connection->peek_msg) *available = connection->peek_len + pSSL_pending(connection->ssl_s);
 #endif
 
 #ifdef FIONREAD




More information about the wine-cvs mailing list