Jacek Caban : wininet: Remove lpwhparent from WININETHANDLERHEADER.

Alexandre Julliard julliard at wine.codeweavers.com
Mon Oct 30 05:22:29 CST 2006


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

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Sun Oct 29 18:56:10 2006 +0100

wininet: Remove lpwhparent from WININETHANDLERHEADER.

---

 dlls/wininet/ftp.c      |    5 -----
 dlls/wininet/http.c     |    2 --
 dlls/wininet/internet.c |    3 ---
 dlls/wininet/internet.h |    1 -
 4 files changed, 0 insertions(+), 11 deletions(-)

diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c
index 06b0153..c615611 100644
--- a/dlls/wininet/ftp.c
+++ b/dlls/wininet/ftp.c
@@ -1037,7 +1037,6 @@ HINTERNET FTP_FtpOpenFileW(LPWININETFTPS
         lpwh->hdr.htype = WH_HFILE;
         lpwh->hdr.dwFlags = dwFlags;
         lpwh->hdr.dwContext = dwContext;
-        lpwh->hdr.lpwhparent = WININET_AddRef( &lpwfs->hdr );
         lpwh->hdr.dwRefCount = 1;
         lpwh->hdr.destroy = FTP_CloseFileTransferHandle;
         lpwh->hdr.lpfnStatusCB = lpwfs->hdr.lpfnStatusCB;
@@ -1722,7 +1721,6 @@ HINTERNET FTP_Connect(LPWININETAPPINFOW
 	nServerPort = INTERNET_DEFAULT_FTP_PORT;
 
     lpwfs->hdr.htype = WH_HFTPSESSION;
-    lpwfs->hdr.lpwhparent = WININET_AddRef( &hIC->hdr );
     lpwfs->hdr.dwFlags = dwFlags;
     lpwfs->hdr.dwContext = dwContext;
     lpwfs->hdr.dwInternalFlags = dwInternalFlags;
@@ -2730,8 +2728,6 @@ BOOL WINAPI FTP_FindNextFileW(LPWININETF
     /* Clear any error information */
     INTERNET_SetLastError(0);
 
-    assert(lpwh->hdr.lpwhparent->htype == WH_HFTPSESSION);
-
     lpFindFileData = (LPWIN32_FIND_DATAW) lpvFindData;
     ZeroMemory(lpFindFileData, sizeof(WIN32_FIND_DATAA));
 
@@ -2856,7 +2852,6 @@ static HINTERNET FTP_ReceiveFileList(LPW
         if (lpwfn)
         {
             lpwfn->hdr.htype = WH_HFTPFINDNEXT;
-            lpwfn->hdr.lpwhparent = WININET_AddRef( &lpwfs->hdr );
             lpwfn->hdr.dwContext = dwContext;
             lpwfn->hdr.dwRefCount = 1;
             lpwfn->hdr.destroy = FTP_CloseFindNextHandle;
diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
index 3ae442e..d9aee10 100644
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
@@ -1002,7 +1002,6 @@ HINTERNET WINAPI HTTP_HttpOpenRequestW(L
         goto lend;
     }
     lpwhr->hdr.htype = WH_HHTTPREQ;
-    lpwhr->hdr.lpwhparent = WININET_AddRef( &lpwhs->hdr );
     lpwhr->hdr.dwFlags = dwFlags;
     lpwhr->hdr.dwContext = dwContext;
     lpwhr->hdr.dwRefCount = 1;
@@ -2400,7 +2399,6 @@ HINTERNET HTTP_Connect(LPWININETAPPINFOW
     */
 
     lpwhs->hdr.htype = WH_HHTTPSESSION;
-    lpwhs->hdr.lpwhparent = WININET_AddRef( &hIC->hdr );
     lpwhs->hdr.dwFlags = dwFlags;
     lpwhs->hdr.dwContext = dwContext;
     lpwhs->hdr.dwInternalFlags = dwInternalFlags;
diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c
index dda7872..4f2256a 100644
--- a/dlls/wininet/internet.c
+++ b/dlls/wininet/internet.c
@@ -521,7 +521,6 @@ #undef FE
  
     memset(lpwai, 0, sizeof(WININETAPPINFOW));
     lpwai->hdr.htype = WH_HINIT;
-    lpwai->hdr.lpwhparent = NULL;
     lpwai->hdr.dwFlags = dwFlags;
     lpwai->hdr.dwRefCount = 1;
     lpwai->hdr.destroy = INTERNET_CloseHandle;
@@ -1027,8 +1026,6 @@ BOOL WINAPI InternetCloseHandle(HINTERNE
                           INTERNET_STATUS_HANDLE_CLOSING, &hInternet,
                           sizeof(HINTERNET));
 
-    if( lpwh->lpwhparent )
-        WININET_Release( lpwh->lpwhparent );
     WININET_FreeHandle( hInternet );
     WININET_Release( lpwh );
 
diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h
index 9b2fd1f..c57cef7 100644
--- a/dlls/wininet/internet.h
+++ b/dlls/wininet/internet.h
@@ -146,7 +146,6 @@ struct _WININETHANDLEHEADER
     DWORD  dwRefCount;
     WININET_object_destructor destroy;
     INTERNET_STATUS_CALLBACK lpfnStatusCB;
-    struct _WININETHANDLEHEADER *lpwhparent;
 };
 
 




More information about the wine-cvs mailing list