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

wininet: Fix callbacks sent on connection error.

This commit is contained in:
Piotr Caban 2010-05-19 01:48:58 +02:00 committed by Alexandre Julliard
parent 8e10c65367
commit 4ba60d265a
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/wininet/http.c
View File

@ -3668,7 +3668,7 @@ lend:
HTTP_ReceiveRequestData(lpwhr, TRUE); HTTP_ReceiveRequestData(lpwhr, TRUE);
else else
{ {
iar.dwResult = (DWORD_PTR)lpwhr->hdr.hInternet; iar.dwResult = 0;
iar.dwError = res; iar.dwError = res;
INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext,
@ -4360,6 +4360,10 @@ static DWORD HTTP_OpenConnection(http_request_t *lpwhr)
if(res != ERROR_SUCCESS) if(res != ERROR_SUCCESS)
goto lend; goto lend;
INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext,
INTERNET_STATUS_CONNECTED_TO_SERVER,
szaddr, strlen(szaddr)+1);
if (lpwhr->hdr.dwFlags & INTERNET_FLAG_SECURE) if (lpwhr->hdr.dwFlags & INTERNET_FLAG_SECURE)
{ {
/* Note: we differ from Microsoft's WinINet here. they seem to have /* Note: we differ from Microsoft's WinINet here. they seem to have
@ -4368,20 +4372,20 @@ static DWORD HTTP_OpenConnection(http_request_t *lpwhr)
* behaviour to be more correct and to not cause any incompatibilities * behaviour to be more correct and to not cause any incompatibilities
* because using a secure connection through a proxy server is a rare * because using a secure connection through a proxy server is a rare
* case that would be hard for anyone to depend on */ * case that would be hard for anyone to depend on */
if (hIC->lpszProxy && (res = HTTP_SecureProxyConnect(lpwhr)) != ERROR_SUCCESS) if (hIC->lpszProxy && (res = HTTP_SecureProxyConnect(lpwhr)) != ERROR_SUCCESS) {
HTTPREQ_CloseConnection(&lpwhr->hdr);
goto lend; goto lend;
}
res = NETCON_secure_connect(&lpwhr->netConnection, lpwhs->lpszHostName); res = NETCON_secure_connect(&lpwhr->netConnection, lpwhs->lpszHostName);
if(res != ERROR_SUCCESS) if(res != ERROR_SUCCESS)
{ {
WARN("Couldn't connect securely to host\n"); WARN("Couldn't connect securely to host\n");
HTTPREQ_CloseConnection(&lpwhr->hdr);
goto lend; goto lend;
} }
} }
INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext,
INTERNET_STATUS_CONNECTED_TO_SERVER,
szaddr, strlen(szaddr)+1);
lend: lend:
lpwhr->read_pos = lpwhr->read_size = 0; lpwhr->read_pos = lpwhr->read_size = 0;