commit 917df92356e57c00798dca1a6a659bc738e79a06
author Kevin Koltzau <kevin@plop.org> Thu May 13 05:17:25 2004 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu May 13 05:17:25 2004 +0000
tree 548e2fbcc8a13c142ff98f7478808cafe35368c7
parent adc86dccaaebd05e849bb4ed3323584b5ca4a7fd

Prevent memory leak and superfluous status notifications.

dlls/wininet/http.c

diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
index 0d31d64..64f87ab 100644
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
@@ -1789,7 +1789,8 @@
  */
 HINTERNET HTTP_Connect(HINTERNET hInternet, LPCWSTR lpszServerName,
 	INTERNET_PORT nServerPort, LPCWSTR lpszUserName,
-	LPCWSTR lpszPassword, DWORD dwFlags, DWORD dwContext)
+	LPCWSTR lpszPassword, DWORD dwFlags, DWORD dwContext,
+	DWORD dwInternalFlags)
 {
     BOOL bSuccess = FALSE;
     LPWININETAPPINFOW hIC = NULL;
@@ -1830,6 +1831,7 @@
     lpwhs->hdr.lpwhparent = &hIC->hdr;
     lpwhs->hdr.dwFlags = dwFlags;
     lpwhs->hdr.dwContext = dwContext;
+    lpwhs->hdr.dwInternalFlags = dwInternalFlags;
     if(hIC->lpszProxy && hIC->dwAccessType == INTERNET_OPEN_TYPE_PROXY) {
         if(strchrW(hIC->lpszProxy, ' '))
             FIXME("Several proxies not implemented.\n");
@@ -1842,7 +1844,8 @@
         lpwhs->lpszUserName = WININET_strdupW(lpszUserName);
     lpwhs->nServerPort = nServerPort;
 
-    if (hIC->lpfnStatusCB)
+    /* Don't send a handle created callback if this handle was created with InternetOpenUrl */
+    if (hIC->lpfnStatusCB && !(lpwhs->hdr.dwInternalFlags & INET_OPENURL))
     {
         INTERNET_ASYNC_RESULT iar;
 
@@ -2408,6 +2411,15 @@
 
     HeapFree(GetProcessHeap(), 0, lpwhr->pCustHeaders);
     HeapFree(GetProcessHeap(), 0, lpwhr);
+    
+    /* If this handle was opened with InternetOpenUrl, we need to close the parent to prevent
+       a memory leek
+     */
+    if(lpwhs->hdr.dwInternalFlags & INET_OPENURL)
+    {
+        handle = WININET_FindHandle( &lpwhs->hdr );
+        InternetCloseHandle(handle);
+    }
 }
 
 
@@ -2426,10 +2438,14 @@
 
     hIC = (LPWININETAPPINFOW) lpwhs->hdr.lpwhparent;
 
-    handle = WININET_FindHandle( &lpwhs->hdr );
-    SendAsyncCallback(hIC, handle, lpwhs->hdr.dwContext,
-                      INTERNET_STATUS_HANDLE_CLOSING, lpwhs,
-                      sizeof(HINTERNET));
+    /* Don't send a handle closing callback if this handle was created with InternetOpenUrl */
+    if(!(lpwhs->hdr.dwInternalFlags & INET_OPENURL))
+    {
+        handle = WININET_FindHandle( &lpwhs->hdr );
+        SendAsyncCallback(hIC, handle, lpwhs->hdr.dwContext,
+                          INTERNET_STATUS_HANDLE_CLOSING, lpwhs,
+                          sizeof(HINTERNET));
+    }
 
     if (lpwhs->lpszServerName)
         HeapFree(GetProcessHeap(), 0, lpwhs->lpszServerName);