Jacek Caban : wininet: Use handle stored in WININETHANDLEHEADER instead of WININET_FindHandle.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 7bd385b714ed46a56ff86f5f572a0e79cf63f7ee
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=7bd385b714ed46a56ff86f5f57...

Author: Jacek Caban <jacek(a)codeweavers.com>
Date:   Mon Oct 30 22:13:52 2006 +0100

wininet: Use handle stored in WININETHANDLEHEADER instead of WININET_FindHandle.

---

 dlls/wininet/ftp.c      |   16 +++-------------
 dlls/wininet/internet.c |    6 ------
 dlls/wininet/internet.h |    1 -
 3 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c
index ded0155..32e1655 100644
--- a/dlls/wininet/ftp.c
+++ b/dlls/wininet/ftp.c
@@ -1924,12 +1924,7 @@ static BOOL FTP_SendCommandA(INT nSocket
 
 	if (lpfnStatusCB)
         {
-             HINTERNET hHandle = WININET_FindHandle( hdr );
-	     if( hHandle )
-             {
-                 lpfnStatusCB(hHandle, dwContext, INTERNET_STATUS_SENDING_REQUEST, NULL, 0);
-                 WININET_Release( hdr );
-             }
+            lpfnStatusCB(hdr->hInternet, dwContext, INTERNET_STATUS_SENDING_REQUEST, NULL, 0);
         }
 
 	dwParamLen = lpszParam?strlen(lpszParam)+1:0;
@@ -1953,13 +1948,8 @@ static BOOL FTP_SendCommandA(INT nSocket
 
 	if (lpfnStatusCB)
         {
-             HINTERNET hHandle = WININET_FindHandle( hdr );
-	     if( hHandle )
-             {
-                 lpfnStatusCB(hHandle, dwContext, INTERNET_STATUS_REQUEST_SENT,
-                              &nBytesSent, sizeof(DWORD));
-                 WININET_Release( hdr );
-             }
+            lpfnStatusCB(hdr->hInternet, dwContext, INTERNET_STATUS_REQUEST_SENT,
+                         &nBytesSent, sizeof(DWORD));
         }
 
 	TRACE("Sent %d bytes\n", nBytesSent);
diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c
index 7ee0b88..1308e40 100644
--- a/dlls/wininet/internet.c
+++ b/dlls/wininet/internet.c
@@ -154,12 +154,6 @@ end:
     return info->hInternet = (HINTERNET) (handle+1);
 }
 
-HINTERNET WININET_FindHandle( LPWININETHANDLEHEADER info )
-{
-    WININET_AddRef(info);
-    return info->hInternet;
-}
-
 LPWININETHANDLEHEADER WININET_AddRef( LPWININETHANDLEHEADER info )
 {
     info->dwRefCount++;
diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h
index 43b1c85..235e320 100644
--- a/dlls/wininet/internet.h
+++ b/dlls/wininet/internet.h
@@ -416,7 +416,6 @@ LPWININETHANDLEHEADER WININET_GetObject(
 LPWININETHANDLEHEADER WININET_AddRef( LPWININETHANDLEHEADER info );
 BOOL WININET_Release( LPWININETHANDLEHEADER info );
 BOOL WININET_FreeHandle( HINTERNET hinternet );
-HINTERNET WININET_FindHandle( LPWININETHANDLEHEADER info );
 
 time_t ConvertTimeString(LPCWSTR asctime);