Jacek Caban : wininet:
Revert commit 760043c2455a90cd74178d98b7c81bfbfc81793f.
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Nov 2 15:46:18 CST 2006
Module: wine
Branch: master
Commit: 1031c5f9c6ef9504be25e22f179013b5d7f0b677
URL: http://source.winehq.org/git/wine.git/?a=commit;h=1031c5f9c6ef9504be25e22f179013b5d7f0b677
Author: Jacek Caban <jacek at codeweavers.com>
Date: Thu Nov 2 17:27:06 2006 +0100
wininet: Revert commit 760043c2455a90cd74178d98b7c81bfbfc81793f.
After more testing I've checked that current code is bad, but my patch
was also wrong and causes regression in WoW.
---
dlls/wininet/ftp.c | 12 ------------
dlls/wininet/http.c | 8 --------
dlls/wininet/internet.c | 10 ++++++----
3 files changed, 6 insertions(+), 24 deletions(-)
diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c
index 32e1655..961a915 100644
--- a/dlls/wininet/ftp.c
+++ b/dlls/wininet/ftp.c
@@ -2679,10 +2679,6 @@ static void FTP_CloseSessionHandle(LPWIN
TRACE("\n");
- INTERNET_SendCallback(hdr, hdr->dwContext,
- INTERNET_STATUS_HANDLE_CLOSING, &hdr->hInternet,
- sizeof(HINTERNET));
-
WININET_Release(&lpwfs->lpAppInfo->hdr);
if (lpwfs->download_in_progress != NULL)
@@ -2773,10 +2769,6 @@ static void FTP_CloseFindNextHandle(LPWI
TRACE("\n");
- INTERNET_SendCallback(hdr, hdr->dwContext,
- INTERNET_STATUS_HANDLE_CLOSING, &hdr->hInternet,
- sizeof(HINTERNET));
-
WININET_Release(&lpwfn->lpFtpSession->hdr);
for (i = 0; i < lpwfn->size; i++)
@@ -2803,10 +2795,6 @@ static void FTP_CloseFileTransferHandle(
TRACE("\n");
- INTERNET_SendCallback(hdr, hdr->dwContext,
- INTERNET_STATUS_HANDLE_CLOSING, &hdr->hInternet,
- sizeof(HINTERNET));
-
WININET_Release(&lpwh->lpFtpSession->hdr);
if (!lpwh->session_deleted)
diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
index c9a5698..36c85da 100644
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
@@ -2940,10 +2940,6 @@ static void HTTP_CloseHTTPRequestHandle(
TRACE("\n");
- INTERNET_SendCallback(hdr, hdr->dwContext,
- INTERNET_STATUS_HANDLE_CLOSING, &hdr->hInternet,
- sizeof(HINTERNET));
-
WININET_Release(&lpwhr->hdr);
if (NETCON_connected(&lpwhr->netConnection))
@@ -2978,10 +2974,6 @@ static void HTTP_CloseHTTPSessionHandle(
TRACE("%p\n", lpwhs);
- INTERNET_SendCallback(hdr, hdr->dwContext,
- INTERNET_STATUS_HANDLE_CLOSING, &hdr->hInternet,
- sizeof(HINTERNET));
-
WININET_Release(&lpwhs->lpAppInfo->hdr);
HeapFree(GetProcessHeap(), 0, lpwhs->lpszHostName);
diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c
index 1308e40..27a3382 100644
--- a/dlls/wininet/internet.c
+++ b/dlls/wininet/internet.c
@@ -969,10 +969,6 @@ static VOID INTERNET_CloseHandle(LPWININ
TRACE("%p\n",lpwai);
- INTERNET_SendCallback(hdr, hdr->dwContext,
- INTERNET_STATUS_HANDLE_CLOSING, &hdr->hInternet,
- sizeof(HINTERNET));
-
HeapFree(GetProcessHeap(), 0, lpwai->lpszAgent);
HeapFree(GetProcessHeap(), 0, lpwai->lpszProxy);
HeapFree(GetProcessHeap(), 0, lpwai->lpszProxyBypass);
@@ -1005,6 +1001,12 @@ BOOL WINAPI InternetCloseHandle(HINTERNE
return FALSE;
}
+ /* FIXME: native appears to send this from the equivalent of
+ * WININET_Release */
+ INTERNET_SendCallback(lpwh, lpwh->dwContext,
+ INTERNET_STATUS_HANDLE_CLOSING, &hInternet,
+ sizeof(HINTERNET));
+
WININET_FreeHandle( hInternet );
WININET_Release( lpwh );
More information about the wine-cvs
mailing list