Module: wine Branch: master Commit: 2a50d52c049e540cecb025d477edb59239d29979 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a50d52c049e540cecb025d477...
Author: Jacek Caban jacek@codeweavers.com Date: Sun Oct 29 18:52:47 2006 +0100
wininet: Use lpAppInfo instead of lpwhparent where possible.
---
dlls/wininet/dialogs.c | 4 ++-- dlls/wininet/ftp.c | 42 +++++++++++++++++++++--------------------- dlls/wininet/internet.c | 2 +- 3 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index fc95762..fc473be 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -72,7 +72,7 @@ static BOOL WININET_GetProxyServer( HINT if (NULL == lpwhs) return FALSE;
- hIC = (LPWININETAPPINFOW) lpwhs->hdr.lpwhparent; + hIC = lpwhs->lpAppInfo; if (NULL == hIC) return FALSE;
@@ -216,7 +216,7 @@ static BOOL WININET_SetProxyAuthorizatio return FALSE; }
- hIC = (LPWININETAPPINFOW) lpwhs->hdr.lpwhparent; + hIC = lpwhs->lpAppInfo;
p = HeapAlloc( GetProcessHeap(), 0, (strlenW( username ) + 1)*sizeof(WCHAR) ); if( !p ) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 9be0e74..9252bb9 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -194,7 +194,7 @@ BOOL WINAPI FtpPutFileW(HINTERNET hConne goto lend; }
- hIC = (LPWININETAPPINFOW) lpwfs->hdr.lpwhparent; + hIC = lpwfs->lpAppInfo; if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) { WORKREQUEST workRequest; @@ -252,7 +252,7 @@ BOOL WINAPI FTP_FtpPutFileW(LPWININETFTP
/* Clear any error information */ INTERNET_SetLastError(0); - hIC = (LPWININETAPPINFOW) lpwfs->hdr.lpwhparent; + hIC = lpwfs->lpAppInfo;
/* Open file to be uploaded */ if (INVALID_HANDLE_VALUE == @@ -358,7 +358,7 @@ BOOL WINAPI FtpSetCurrentDirectoryW(HINT
TRACE("lpszDirectory(%s)\n", debugstr_w(lpszDirectory));
- hIC = (LPWININETAPPINFOW) lpwfs->hdr.lpwhparent; + hIC = lpwfs->lpAppInfo; if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) { WORKREQUEST workRequest; @@ -411,7 +411,7 @@ BOOL WINAPI FTP_FtpSetCurrentDirectoryW( /* Clear any error information */ INTERNET_SetLastError(0);
- hIC = (LPWININETAPPINFOW) lpwfs->hdr.lpwhparent; + hIC = lpwfs->lpAppInfo; if (!FTP_SendCommand(lpwfs->sndSocket, FTP_CMD_CWD, lpszDirectory, lpwfs->hdr.lpfnStatusCB, &lpwfs->hdr, lpwfs->hdr.dwContext)) goto lend; @@ -485,7 +485,7 @@ BOOL WINAPI FtpCreateDirectoryW(HINTERNE goto lend; }
- hIC = (LPWININETAPPINFOW) lpwfs->hdr.lpwhparent; + hIC = lpwfs->lpAppInfo; if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) { WORKREQUEST workRequest; @@ -550,7 +550,7 @@ BOOL WINAPI FTP_FtpCreateDirectoryW(LPWI }
lend: - hIC = (LPWININETAPPINFOW) lpwfs->hdr.lpwhparent; + hIC = lpwfs->lpAppInfo; if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) { INTERNET_ASYNC_RESULT iar; @@ -618,7 +618,7 @@ HINTERNET WINAPI FtpFindFirstFileW(HINTE goto lend; }
- hIC = (LPWININETAPPINFOW) lpwfs->hdr.lpwhparent; + hIC = lpwfs->lpAppInfo; if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) { WORKREQUEST workRequest; @@ -681,7 +681,7 @@ HINTERNET WINAPI FTP_FtpFindFirstFileW(L if (!FTP_SendPortOrPasv(lpwfs)) goto lend;
- hIC = (LPWININETAPPINFOW) lpwfs->hdr.lpwhparent; + hIC = lpwfs->lpAppInfo; if (!FTP_SendCommand(lpwfs->sndSocket, FTP_CMD_LIST, NULL, lpwfs->hdr.lpfnStatusCB, &lpwfs->hdr, lpwfs->hdr.dwContext)) goto lend; @@ -800,7 +800,7 @@ BOOL WINAPI FtpGetCurrentDirectoryW(HINT goto lend; }
- hIC = (LPWININETAPPINFOW) lpwfs->hdr.lpwhparent; + hIC = lpwfs->lpAppInfo; if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) { WORKREQUEST workRequest; @@ -858,7 +858,7 @@ BOOL WINAPI FTP_FtpGetCurrentDirectoryW(
ZeroMemory(lpszCurrentDirectory, *lpdwCurrentDirectory);
- hIC = (LPWININETAPPINFOW) lpwfs->hdr.lpwhparent; + hIC = lpwfs->lpAppInfo; if (!FTP_SendCommand(lpwfs->sndSocket, FTP_CMD_PWD, NULL, lpwfs->hdr.lpfnStatusCB, &lpwfs->hdr, lpwfs->hdr.dwContext)) goto lend; @@ -962,7 +962,7 @@ HINTERNET WINAPI FtpOpenFileW(HINTERNET INTERNET_SetLastError(ERROR_FTP_TRANSFER_IN_PROGRESS); goto lend; } - hIC = (LPWININETAPPINFOW) lpwfs->hdr.lpwhparent; + hIC = lpwfs->lpAppInfo; if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) { WORKREQUEST workRequest; @@ -1055,7 +1055,7 @@ HINTERNET FTP_FtpOpenFileW(LPWININETFTPS if (lpwfs->lstnSocket != -1) closesocket(lpwfs->lstnSocket);
- hIC = (LPWININETAPPINFOW) lpwfs->hdr.lpwhparent; + hIC = lpwfs->lpAppInfo; if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) { INTERNET_ASYNC_RESULT iar; @@ -1140,7 +1140,7 @@ BOOL WINAPI FtpGetFileW(HINTERNET hInter goto lend; }
- hIC = (LPWININETAPPINFOW) lpwfs->hdr.lpwhparent; + hIC = lpwfs->lpAppInfo; if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) { WORKREQUEST workRequest; @@ -1237,7 +1237,7 @@ lend: if (hFile) CloseHandle(hFile);
- hIC = (LPWININETAPPINFOW) lpwfs->hdr.lpwhparent; + hIC = lpwfs->lpAppInfo; if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) { INTERNET_ASYNC_RESULT iar; @@ -1308,7 +1308,7 @@ BOOL WINAPI FtpDeleteFileW(HINTERNET hFt goto lend; }
- hIC = (LPWININETAPPINFOW) lpwfs->hdr.lpwhparent; + hIC = lpwfs->lpAppInfo; if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) { WORKREQUEST workRequest; @@ -1368,7 +1368,7 @@ BOOL FTP_FtpDeleteFileW(LPWININETFTPSESS FTP_SetResponseError(nResCode); } lend: - hIC = (LPWININETAPPINFOW) lpwfs->hdr.lpwhparent; + hIC = lpwfs->lpAppInfo; if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) { INTERNET_ASYNC_RESULT iar; @@ -1427,7 +1427,7 @@ BOOL WINAPI FtpRemoveDirectoryW(HINTERNE goto lend; }
- hIC = (LPWININETAPPINFOW) lpwfs->hdr.lpwhparent; + hIC = lpwfs->lpAppInfo; if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) { WORKREQUEST workRequest; @@ -1488,7 +1488,7 @@ BOOL FTP_FtpRemoveDirectoryW(LPWININETFT }
lend: - hIC = (LPWININETAPPINFOW) lpwfs->hdr.lpwhparent; + hIC = lpwfs->lpAppInfo; if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) { INTERNET_ASYNC_RESULT iar; @@ -1550,7 +1550,7 @@ BOOL WINAPI FtpRenameFileW(HINTERNET hFt goto lend; }
- hIC = (LPWININETAPPINFOW) lpwfs->hdr.lpwhparent; + hIC = lpwfs->lpAppInfo; if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) { WORKREQUEST workRequest; @@ -1618,7 +1618,7 @@ BOOL FTP_FtpRenameFileW( LPWININETFTPSES FTP_SetResponseError(nResCode);
lend: - hIC = (LPWININETAPPINFOW) lpwfs->hdr.lpwhparent; + hIC = lpwfs->lpAppInfo; if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) { INTERNET_ASYNC_RESULT iar; @@ -2006,7 +2006,7 @@ INT FTP_ReceiveResponse(LPWININETFTPSESS
TRACE("socket(%d)\n", lpwfs->sndSocket);
- hIC = (LPWININETAPPINFOW) lpwfs->hdr.lpwhparent; + hIC = lpwfs->lpAppInfo; SendAsyncCallback(&lpwfs->hdr, dwContext, INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0);
while(1) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 92d961d..d9385c8 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -75,7 +75,7 @@ #define MAX_WORKER_THREADS 10 #define RESPONSE_TIMEOUT 30
#define GET_HWININET_FROM_LPWININETFINDNEXT(lpwh) \ -(LPWININETAPPINFOW)(((LPWININETFTPSESSIONW)(lpwh->hdr.lpwhparent))->hdr.lpwhparent) +(((LPWININETFTPSESSIONW)(lpwh->hdr.lpwhparent))->lpAppInfo)
typedef struct
-
Alexandre Julliard