Jacek Caban : wininet: Directly return error status from NETCON_close.

[Alexandre Julliard]

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

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Mon Nov 30 00:14:25 2009 +0100

wininet: Directly return error status from NETCON_close.

---

 dlls/wininet/internet.h      |    2 +-
 dlls/wininet/netconnection.c |   11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h
index e1044e9..04a4a65 100644
--- a/dlls/wininet/internet.h
+++ b/dlls/wininet/internet.h
@@ -432,7 +432,7 @@ BOOL NETCON_init(WININET_NETCONNECTION *connnection, BOOL useSSL);
 void NETCON_unload(void);
 DWORD NETCON_create(WININET_NETCONNECTION *connection, int domain,
 	      int type, int protocol);
-BOOL NETCON_close(WININET_NETCONNECTION *connection);
+DWORD NETCON_close(WININET_NETCONNECTION *connection);
 DWORD NETCON_connect(WININET_NETCONNECTION *connection, const struct sockaddr *serv_addr,
 		    unsigned int addrlen);
 DWORD NETCON_secure_connect(WININET_NETCONNECTION *connection, LPCWSTR hostname);
diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c
index 64513ac..36599e9 100644
--- a/dlls/wininet/netconnection.c
+++ b/dlls/wininet/netconnection.c
@@ -404,11 +404,11 @@ DWORD NETCON_create(WININET_NETCONNECTION *connection, int domain,
  * NETCON_close
  * Basically calls 'close()' unless we should use SSL
  */
-BOOL NETCON_close(WININET_NETCONNECTION *connection)
+DWORD NETCON_close(WININET_NETCONNECTION *connection)
 {
     int result;
 
-    if (!NETCON_connected(connection)) return FALSE;
+    if (!NETCON_connected(connection)) return ERROR_SUCCESS;
 
 #ifdef SONAME_LIBSSL
     if (connection->useSSL)
@@ -425,11 +425,8 @@ BOOL NETCON_close(WININET_NETCONNECTION *connection)
     connection->socketFD = -1;
 
     if (result == -1)
-    {
-        INTERNET_SetLastError(sock_get_error(errno));
-        return FALSE;
-    }
-    return TRUE;
+        return sock_get_error(errno);
+    return ERROR_SUCCESS;
 }
 #ifdef SONAME_LIBSSL
 static BOOL check_hostname(X509 *cert, char *hostname)