ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wininet: Directly return error status from NETCON_close.

This commit is contained in:
Jacek Caban 2009-11-30 00:14:25 +01:00 committed by Alexandre Julliard
parent 36cb1ef3d3
commit c55d0a8516
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/wininet/internet.h
View File

@ -432,7 +432,7 @@ BOOL NETCON_init(WININET_NETCONNECTION *connnection, BOOL useSSL);
void NETCON_unload(void); void NETCON_unload(void);
DWORD NETCON_create(WININET_NETCONNECTION *connection, int domain, DWORD NETCON_create(WININET_NETCONNECTION *connection, int domain,
int type, int protocol); 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, DWORD NETCON_connect(WININET_NETCONNECTION *connection, const struct sockaddr *serv_addr,
unsigned int addrlen); unsigned int addrlen);
DWORD NETCON_secure_connect(WININET_NETCONNECTION *connection, LPCWSTR hostname); DWORD NETCON_secure_connect(WININET_NETCONNECTION *connection, LPCWSTR hostname);

11
dlls/wininet/netconnection.c
View File

@ -404,11 +404,11 @@ DWORD NETCON_create(WININET_NETCONNECTION *connection, int domain,
* NETCON_close * NETCON_close
* Basically calls 'close()' unless we should use SSL * Basically calls 'close()' unless we should use SSL
*/ */
BOOL NETCON_close(WININET_NETCONNECTION *connection) DWORD NETCON_close(WININET_NETCONNECTION *connection)
{ {
int result; int result;
if (!NETCON_connected(connection)) return FALSE; if (!NETCON_connected(connection)) return ERROR_SUCCESS;
#ifdef SONAME_LIBSSL #ifdef SONAME_LIBSSL
if (connection->useSSL) if (connection->useSSL)
@ -425,11 +425,8 @@ BOOL NETCON_close(WININET_NETCONNECTION *connection)
connection->socketFD = -1; connection->socketFD = -1;
if (result == -1) if (result == -1)
{ return sock_get_error(errno);
INTERNET_SetLastError(sock_get_error(errno)); return ERROR_SUCCESS;
return FALSE;
}
return TRUE;
} }
#ifdef SONAME_LIBSSL #ifdef SONAME_LIBSSL
static BOOL check_hostname(X509 *cert, char *hostname) static BOOL check_hostname(X509 *cert, char *hostname)