Jacek Caban : wininet: Moved freeing object to WININET_Release.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 923498da03859ea0840e905c25fe35c15e6327cf
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=923498da03859ea0840e905c25...

Author: Jacek Caban <jacek(a)codeweavers.com>
Date:   Thu Feb  3 20:45:12 2011 +0100

wininet: Moved freeing object to WININET_Release.

---

 dlls/wininet/ftp.c      |    4 ----
 dlls/wininet/http.c     |    2 --
 dlls/wininet/internet.c |    3 ++-
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c
index 41537b8..e57f356 100644
--- a/dlls/wininet/ftp.c
+++ b/dlls/wininet/ftp.c
@@ -1127,8 +1127,6 @@ static void FTPFILE_Destroy(object_header_t *hdr)
     if (nResCode > 0 && nResCode != 226) WARN("server reports failed transfer\n");
 
     WININET_Release(&lpwh->lpFtpSession->hdr);
-
-    HeapFree(GetProcessHeap(), 0, lpwh);
 }
 
 static DWORD FTPFILE_QueryOption(object_header_t *hdr, DWORD option, void *buffer, DWORD *size, BOOL unicode)
@@ -2346,7 +2344,6 @@ static void FTPSESSION_Destroy(object_header_t *hdr)
     HeapFree(GetProcessHeap(), 0, lpwfs->lpszPassword);
     HeapFree(GetProcessHeap(), 0, lpwfs->lpszUserName);
     HeapFree(GetProcessHeap(), 0, lpwfs->servername);
-    HeapFree(GetProcessHeap(), 0, lpwfs);
 }
 
 static void FTPSESSION_CloseConnection(object_header_t *hdr)
@@ -3399,7 +3396,6 @@ static void FTPFINDNEXT_Destroy(object_header_t *hdr)
     }
 
     HeapFree(GetProcessHeap(), 0, lpwfn->lpafp);
-    HeapFree(GetProcessHeap(), 0, lpwfn);
 }
 
 static DWORD FTPFINDNEXT_FindNextFileProc(WININETFTPFINDNEXTW *find, LPVOID data)
diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
index 9215c34..0b723c3 100644
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
@@ -1601,7 +1601,6 @@ static void HTTPREQ_Destroy(object_header_t *hdr)
 #endif
 
     HeapFree(GetProcessHeap(), 0, lpwhr->pCustHeaders);
-    HeapFree(GetProcessHeap(), 0, lpwhr);
 }
 
 static void HTTPREQ_CloseConnection(object_header_t *hdr)
@@ -4358,7 +4357,6 @@ static void HTTPSESSION_Destroy(object_header_t *hdr)
     HeapFree(GetProcessHeap(), 0, lpwhs->lpszServerName);
     HeapFree(GetProcessHeap(), 0, lpwhs->lpszPassword);
     HeapFree(GetProcessHeap(), 0, lpwhs->lpszUserName);
-    HeapFree(GetProcessHeap(), 0, lpwhs);
 }
 
 static DWORD HTTPSESSION_QueryOption(object_header_t *hdr, DWORD option, void *buffer, DWORD *size, BOOL unicode)
diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c
index 0df56a6..5b42d98 100644
--- a/dlls/wininet/internet.c
+++ b/dlls/wininet/internet.c
@@ -261,6 +261,8 @@ BOOL WININET_Release( object_header_t *info )
 
             LeaveCriticalSection( &WININET_cs );
         }
+
+        heap_free(info);
     }
     return TRUE;
 }
@@ -684,7 +686,6 @@ static VOID APPINFO_Destroy(object_header_t *hdr)
     HeapFree(GetProcessHeap(), 0, lpwai->lpszProxyBypass);
     HeapFree(GetProcessHeap(), 0, lpwai->lpszProxyUsername);
     HeapFree(GetProcessHeap(), 0, lpwai->lpszProxyPassword);
-    HeapFree(GetProcessHeap(), 0, lpwai);
 }
 
 static DWORD APPINFO_QueryOption(object_header_t *hdr, DWORD option, void *buffer, DWORD *size, BOOL unicode)