Commit 957516f8 authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard

wininet: Remove lpwhparent from WININETHANDLERHEADER.

parent 550ffef2
...@@ -1037,7 +1037,6 @@ HINTERNET FTP_FtpOpenFileW(LPWININETFTPSESSIONW lpwfs, ...@@ -1037,7 +1037,6 @@ HINTERNET FTP_FtpOpenFileW(LPWININETFTPSESSIONW lpwfs,
lpwh->hdr.htype = WH_HFILE; lpwh->hdr.htype = WH_HFILE;
lpwh->hdr.dwFlags = dwFlags; lpwh->hdr.dwFlags = dwFlags;
lpwh->hdr.dwContext = dwContext; lpwh->hdr.dwContext = dwContext;
lpwh->hdr.lpwhparent = WININET_AddRef( &lpwfs->hdr );
lpwh->hdr.dwRefCount = 1; lpwh->hdr.dwRefCount = 1;
lpwh->hdr.destroy = FTP_CloseFileTransferHandle; lpwh->hdr.destroy = FTP_CloseFileTransferHandle;
lpwh->hdr.lpfnStatusCB = lpwfs->hdr.lpfnStatusCB; lpwh->hdr.lpfnStatusCB = lpwfs->hdr.lpfnStatusCB;
...@@ -1722,7 +1721,6 @@ HINTERNET FTP_Connect(LPWININETAPPINFOW hIC, LPCWSTR lpszServerName, ...@@ -1722,7 +1721,6 @@ HINTERNET FTP_Connect(LPWININETAPPINFOW hIC, LPCWSTR lpszServerName,
nServerPort = INTERNET_DEFAULT_FTP_PORT; nServerPort = INTERNET_DEFAULT_FTP_PORT;
lpwfs->hdr.htype = WH_HFTPSESSION; lpwfs->hdr.htype = WH_HFTPSESSION;
lpwfs->hdr.lpwhparent = WININET_AddRef( &hIC->hdr );
lpwfs->hdr.dwFlags = dwFlags; lpwfs->hdr.dwFlags = dwFlags;
lpwfs->hdr.dwContext = dwContext; lpwfs->hdr.dwContext = dwContext;
lpwfs->hdr.dwInternalFlags = dwInternalFlags; lpwfs->hdr.dwInternalFlags = dwInternalFlags;
...@@ -2730,8 +2728,6 @@ BOOL WINAPI FTP_FindNextFileW(LPWININETFTPFINDNEXTW lpwh, LPVOID lpvFindData) ...@@ -2730,8 +2728,6 @@ BOOL WINAPI FTP_FindNextFileW(LPWININETFTPFINDNEXTW lpwh, LPVOID lpvFindData)
/* Clear any error information */ /* Clear any error information */
INTERNET_SetLastError(0); INTERNET_SetLastError(0);
assert(lpwh->hdr.lpwhparent->htype == WH_HFTPSESSION);
lpFindFileData = (LPWIN32_FIND_DATAW) lpvFindData; lpFindFileData = (LPWIN32_FIND_DATAW) lpvFindData;
ZeroMemory(lpFindFileData, sizeof(WIN32_FIND_DATAA)); ZeroMemory(lpFindFileData, sizeof(WIN32_FIND_DATAA));
...@@ -2856,7 +2852,6 @@ static HINTERNET FTP_ReceiveFileList(LPWININETFTPSESSIONW lpwfs, INT nSocket, LP ...@@ -2856,7 +2852,6 @@ static HINTERNET FTP_ReceiveFileList(LPWININETFTPSESSIONW lpwfs, INT nSocket, LP
if (lpwfn) if (lpwfn)
{ {
lpwfn->hdr.htype = WH_HFTPFINDNEXT; lpwfn->hdr.htype = WH_HFTPFINDNEXT;
lpwfn->hdr.lpwhparent = WININET_AddRef( &lpwfs->hdr );
lpwfn->hdr.dwContext = dwContext; lpwfn->hdr.dwContext = dwContext;
lpwfn->hdr.dwRefCount = 1; lpwfn->hdr.dwRefCount = 1;
lpwfn->hdr.destroy = FTP_CloseFindNextHandle; lpwfn->hdr.destroy = FTP_CloseFindNextHandle;
......
...@@ -1002,7 +1002,6 @@ HINTERNET WINAPI HTTP_HttpOpenRequestW(LPWININETHTTPSESSIONW lpwhs, ...@@ -1002,7 +1002,6 @@ HINTERNET WINAPI HTTP_HttpOpenRequestW(LPWININETHTTPSESSIONW lpwhs,
goto lend; goto lend;
} }
lpwhr->hdr.htype = WH_HHTTPREQ; lpwhr->hdr.htype = WH_HHTTPREQ;
lpwhr->hdr.lpwhparent = WININET_AddRef( &lpwhs->hdr );
lpwhr->hdr.dwFlags = dwFlags; lpwhr->hdr.dwFlags = dwFlags;
lpwhr->hdr.dwContext = dwContext; lpwhr->hdr.dwContext = dwContext;
lpwhr->hdr.dwRefCount = 1; lpwhr->hdr.dwRefCount = 1;
...@@ -2400,7 +2399,6 @@ HINTERNET HTTP_Connect(LPWININETAPPINFOW hIC, LPCWSTR lpszServerName, ...@@ -2400,7 +2399,6 @@ HINTERNET HTTP_Connect(LPWININETAPPINFOW hIC, LPCWSTR lpszServerName,
*/ */
lpwhs->hdr.htype = WH_HHTTPSESSION; lpwhs->hdr.htype = WH_HHTTPSESSION;
lpwhs->hdr.lpwhparent = WININET_AddRef( &hIC->hdr );
lpwhs->hdr.dwFlags = dwFlags; lpwhs->hdr.dwFlags = dwFlags;
lpwhs->hdr.dwContext = dwContext; lpwhs->hdr.dwContext = dwContext;
lpwhs->hdr.dwInternalFlags = dwInternalFlags; lpwhs->hdr.dwInternalFlags = dwInternalFlags;
......
...@@ -521,7 +521,6 @@ HINTERNET WINAPI InternetOpenW(LPCWSTR lpszAgent, DWORD dwAccessType, ...@@ -521,7 +521,6 @@ HINTERNET WINAPI InternetOpenW(LPCWSTR lpszAgent, DWORD dwAccessType,
memset(lpwai, 0, sizeof(WININETAPPINFOW)); memset(lpwai, 0, sizeof(WININETAPPINFOW));
lpwai->hdr.htype = WH_HINIT; lpwai->hdr.htype = WH_HINIT;
lpwai->hdr.lpwhparent = NULL;
lpwai->hdr.dwFlags = dwFlags; lpwai->hdr.dwFlags = dwFlags;
lpwai->hdr.dwRefCount = 1; lpwai->hdr.dwRefCount = 1;
lpwai->hdr.destroy = INTERNET_CloseHandle; lpwai->hdr.destroy = INTERNET_CloseHandle;
...@@ -1027,8 +1026,6 @@ BOOL WINAPI InternetCloseHandle(HINTERNET hInternet) ...@@ -1027,8 +1026,6 @@ BOOL WINAPI InternetCloseHandle(HINTERNET hInternet)
INTERNET_STATUS_HANDLE_CLOSING, &hInternet, INTERNET_STATUS_HANDLE_CLOSING, &hInternet,
sizeof(HINTERNET)); sizeof(HINTERNET));
if( lpwh->lpwhparent )
WININET_Release( lpwh->lpwhparent );
WININET_FreeHandle( hInternet ); WININET_FreeHandle( hInternet );
WININET_Release( lpwh ); WININET_Release( lpwh );
......
...@@ -146,7 +146,6 @@ struct _WININETHANDLEHEADER ...@@ -146,7 +146,6 @@ struct _WININETHANDLEHEADER
DWORD dwRefCount; DWORD dwRefCount;
WININET_object_destructor destroy; WININET_object_destructor destroy;
INTERNET_STATUS_CALLBACK lpfnStatusCB; INTERNET_STATUS_CALLBACK lpfnStatusCB;
struct _WININETHANDLEHEADER *lpwhparent;
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment