wininet: Revert commit 760043c2.

dlls/wininet/ftp.c

@@ -2679,10 +2679,6 @@ static void FTP_CloseSessionHandle(LPWININETHANDLEHEADER hdr)
 
     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(LPWININETHANDLEHEADER hdr)
 
     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(LPWININETHANDLEHEADER hdr)
 
     TRACE("\n");
 
-    INTERNET_SendCallback(hdr, hdr->dwContext,
-                          INTERNET_STATUS_HANDLE_CLOSING, &hdr->hInternet,
-                          sizeof(HINTERNET));
-
     WININET_Release(&lpwh->lpFtpSession->hdr);
 
     if (!lpwh->session_deleted)

dlls/wininet/http.c

@@ -2940,10 +2940,6 @@ static void HTTP_CloseHTTPRequestHandle(LPWININETHANDLEHEADER hdr)
 
     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(LPWININETHANDLEHEADER hdr)
 
     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);

dlls/wininet/internet.c

@@ -969,10 +969,6 @@ static VOID INTERNET_CloseHandle(LPWININETHANDLEHEADER hdr)
 
     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(HINTERNET hInternet)
         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 );