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

[Alexandre Julliard]

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

Author: Jacek Caban 
Date:   Mon Nov 30 00:12:59 2009 +0100

wininet: Directly return error status from NETCON_connect.

---

dlls/wininet/http.c          |    5 +++--
 dlls/wininet/internet.h      |    2 +-
 dlls/wininet/netconnection.c |    9 +++------
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
index c7e4d59..99abc3a 100644
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
@@ -4361,8 +4361,9 @@ static BOOL HTTP_OpenConnection(http_request_t *lpwhr)
         goto lend;
     }

-    if (!NETCON_connect(&lpwhr->netConnection, (struct sockaddr *)&lpwhs->socketAddress,
-                      lpwhs->sa_len))
+    res = NETCON_connect(&lpwhr->netConnection, (struct sockaddr *)&lpwhs->socketAddress,
+                         lpwhs->sa_len);
+    if(res != ERROR_SUCCESS)
        goto lend;

if (lpwhr->hdr.dwFlags & INTERNET_FLAG_SECURE)
diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h
index adebaf6..b665874 100644
--- a/dlls/wininet/internet.h
+++ b/dlls/wininet/internet.h
@@ -433,7 +433,7 @@ void NETCON_unload(void);
 DWORD NETCON_create(WININET_NETCONNECTION *connection, int domain,
          int type, int protocol);
 BOOL NETCON_close(WININET_NETCONNECTION *connection);
-BOOL NETCON_connect(WININET_NETCONNECTION *connection, const struct sockaddr *serv_addr,
+DWORD NETCON_connect(WININET_NETCONNECTION *connection, const struct sockaddr *serv_addr,
    	    unsigned int addrlen);
 BOOL NETCON_secure_connect(WININET_NETCONNECTION *connection, LPCWSTR hostname);
 BOOL NETCON_send(WININET_NETCONNECTION *connection, const void *msg, size_t len, int flags,
diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c
index 7ab33ae..1e4fc35 100644
--- a/dlls/wininet/netconnection.c
+++ b/dlls/wininet/netconnection.c
@@ -532,25 +532,22 @@ fail:
  * NETCON_connect
  * Connects to the specified address.
  */
-BOOL NETCON_connect(WININET_NETCONNECTION *connection, const struct sockaddr *serv_addr,
+DWORD NETCON_connect(WININET_NETCONNECTION *connection, const struct sockaddr *serv_addr,
    	    unsigned int addrlen)
 {
     int result;

-    if (!NETCON_connected(connection)) return FALSE;
-
     result = connect(connection->socketFD, serv_addr, addrlen);
     if (result == -1)
     {
         WARN("Unable to connect to host (%s)\n", strerror(errno));
-        INTERNET_SetLastError(sock_get_error(errno));

closesocket(connection->socketFD);
         connection->socketFD = -1;
-        return FALSE;
+        return sock_get_error(errno);
     }

-    return TRUE;
+    return ERROR_SUCCESS;
 }

/******************************************************************************