October 2006 - Wine-commits

Jacek Caban : wininet: Store WININETFTPSESSIONW pointer in WININETFTPFINDNEXTW.
by Alexandre Julliard 30 Oct '06

30 Oct '06

Module: wine Branch: master Commit: 51ba292716707be61a03547e58d0cd20ae4c5488 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51ba292716707be61a03547e5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 29 18:54:29 2006 +0100 wininet: Store WININETFTPSESSIONW pointer in WININETFTPFINDNEXTW. --- dlls/wininet/ftp.c | 5 +++++ dlls/wininet/internet.c | 6 +----- dlls/wininet/internet.h | 1 + 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index fd3a0e8..12a6d80 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -2780,6 +2780,8 @@ static void FTP_CloseFindNextHandle(LPWI TRACE("\n"); + WININET_Release(&lpwfn->lpFtpSession->hdr); + for (i = 0; i < lpwfn->size; i++) { HeapFree(GetProcessHeap(), 0, lpwfn->lpafp[i].lpszName); @@ -2858,6 +2860,9 @@ static HINTERNET FTP_ReceiveFileList(LPW lpwfn->size = dwSize; lpwfn->lpafp = lpafp; + WININET_AddRef( &lpwfs->hdr ); + lpwfn->lpFtpSession = lpwfs; + handle = WININET_AllocHandle( &lpwfn->hdr ); } } diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 63e3460..ebb581e 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -74,10 +74,6 @@ #define MAX_IDLE_WORKER 1000*60*1 #define MAX_WORKER_THREADS 10 #define RESPONSE_TIMEOUT 30 -#define GET_HWININET_FROM_LPWININETFINDNEXT(lpwh) \ -(((LPWININETFTPSESSIONW)(lpwh->hdr.lpwhparent))->lpAppInfo) - - typedef struct { DWORD dwError; @@ -955,7 +951,7 @@ BOOL WINAPI InternetFindNextFileW(HINTER goto lend; } - hIC = GET_HWININET_FROM_LPWININETFINDNEXT(lpwh); + hIC = lpwh->lpFtpSession->lpAppInfo; if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) { WORKREQUEST workRequest; diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 54bbef3..e7af552 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -238,6 +238,7 @@ typedef struct typedef struct { WININETHANDLEHEADER hdr; + WININETFTPSESSIONW *lpFtpSession; DWORD index; DWORD size; LPFILEPROPERTIESW lpafp;

1 0

Jacek Caban : wininet: Use lpAppInfo instead of lpwhparent where possible.
by Alexandre Julliard 30 Oct '06

30 Oct '06

Module: wine Branch: master Commit: 2a50d52c049e540cecb025d477edb59239d29979 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a50d52c049e540cecb025d47… Author: Jacek Caban <jacek(a)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

1 0

Jacek Caban : wininet: Move ftp FindNextFile implementation to ftp.c.
by Alexandre Julliard 30 Oct '06

30 Oct '06

Module: wine Branch: master Commit: 91312d7d57121b242e4af7b4134806c99bf657fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=91312d7d57121b242e4af7b41… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 29 18:53:41 2006 +0100 wininet: Move ftp FindNextFile implementation to ftp.c. --- dlls/wininet/ftp.c | 66 ++++++++++++++++++++++++++++++++-- dlls/wininet/internet.c | 91 +++++++---------------------------------------- dlls/wininet/internet.h | 11 +++--- 3 files changed, 81 insertions(+), 87 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=91312d7d57121b242e4af…

1 0

Jacek Caban : wininet: Use lpHttpSession instead of lpwhcalback where possible.
by Alexandre Julliard 30 Oct '06

30 Oct '06

Module: wine Branch: master Commit: 61a1cef6f65dbd2da6d92913060206d043f96e90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61a1cef6f65dbd2da6d929130… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 29 18:51:15 2006 +0100 wininet: Use lpHttpSession instead of lpwhcalback where possible. --- dlls/wininet/dialogs.c | 4 ++-- dlls/wininet/http.c | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index 2eae034..fc95762 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -68,7 +68,7 @@ static BOOL WININET_GetProxyServer( HINT if (NULL == lpwhr) return FALSE; - lpwhs = (LPWININETHTTPSESSIONW) lpwhr->hdr.lpwhparent; + lpwhs = lpwhr->lpHttpSession; if (NULL == lpwhs) return FALSE; @@ -209,7 +209,7 @@ static BOOL WININET_SetProxyAuthorizatio if( !lpwhr ) return FALSE; - lpwhs = (LPWININETHTTPSESSIONW) lpwhr->hdr.lpwhparent; + lpwhs = lpwhr->lpHttpSession; if (NULL == lpwhs || lpwhs->hdr.htype != WH_HHTTPSESSION) { INTERNET_SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index cfbda27..3ae442e 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -372,7 +372,7 @@ static void HTTP_ProcessHeaders( LPWININ static void HTTP_AddProxyInfo( LPWININETHTTPREQW lpwhr ) { - LPWININETHTTPSESSIONW lpwhs = (LPWININETHTTPSESSIONW)lpwhr->hdr.lpwhparent; + LPWININETHTTPSESSIONW lpwhs = lpwhr->lpHttpSession; LPWININETAPPINFOW hIC = lpwhs->lpAppInfo; assert(lpwhs->hdr.htype == WH_HHTTPSESSION); @@ -1761,7 +1761,7 @@ BOOL WINAPI HttpSendRequestExW(HINTERNET return FALSE; } - lpwhs = (LPWININETHTTPSESSIONW) lpwhr->hdr.lpwhparent; + lpwhs = lpwhr->lpHttpSession; assert(lpwhs->hdr.htype == WH_HHTTPSESSION); hIC = lpwhs->lpAppInfo; assert(hIC->hdr.htype == WH_HINIT); @@ -1845,7 +1845,7 @@ BOOL WINAPI HttpSendRequestW(HINTERNET h goto lend; } - lpwhs = (LPWININETHTTPSESSIONW) lpwhr->hdr.lpwhparent; + lpwhs = lpwhr->lpHttpSession; if (NULL == lpwhs || lpwhs->hdr.htype != WH_HHTTPSESSION) { INTERNET_SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); @@ -1932,7 +1932,7 @@ static BOOL HTTP_HandleRedirect(LPWININE DWORD dwHeaderLength, LPVOID lpOptional, DWORD dwOptionalLength, DWORD dwContentLength) { - LPWININETHTTPSESSIONW lpwhs = (LPWININETHTTPSESSIONW) lpwhr->hdr.lpwhparent; + LPWININETHTTPSESSIONW lpwhs = lpwhr->lpHttpSession; LPWININETAPPINFOW hIC = lpwhs->lpAppInfo; WCHAR path[2048]; char szaddr[32]; @@ -2174,7 +2174,7 @@ static BOOL HTTP_SecureProxyConnect(LPWI BOOL ret; static const WCHAR szConnect[] = {'C','O','N','N','E','C','T',0}; static const WCHAR szFormat[] = {'%','s',':','%','d',0}; - LPWININETHTTPSESSIONW lpwhs = (LPWININETHTTPSESSIONW)lpwhr->hdr.lpwhparent; + LPWININETHTTPSESSIONW lpwhs = lpwhr->lpHttpSession; TRACE("\n"); @@ -2485,7 +2485,7 @@ static BOOL HTTP_OpenConnection(LPWININE goto lend; } - lpwhs = (LPWININETHTTPSESSIONW)lpwhr->hdr.lpwhparent; + lpwhs = lpwhr->lpHttpSession; hIC = lpwhs->lpAppInfo; inet_ntop(lpwhs->socketAddress.sin_family, &lpwhs->socketAddress.sin_addr, @@ -2912,7 +2912,7 @@ static VOID HTTP_CloseConnection(LPWININ TRACE("%p\n",lpwhr); - lpwhs = (LPWININETHTTPSESSIONW) lpwhr->hdr.lpwhparent; + lpwhs = lpwhr->lpHttpSession; hIC = lpwhs->lpAppInfo; INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext,

1 0

Jacek Caban : wininet: Store WININETAPPINFOW pointer in WININETFTPSESSIONW.
by Alexandre Julliard 30 Oct '06

30 Oct '06

Module: wine Branch: master Commit: 96c0c6c5d9009969521ee3b3819a8122bf81d81c URL: http://source.winehq.org/git/wine.git/?a=commit;h=96c0c6c5d9009969521ee3b38… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 29 18:52:02 2006 +0100 wininet: Store WININETAPPINFOW pointer in WININETFTPSESSIONW. --- dlls/wininet/ftp.c | 5 +++++ dlls/wininet/internet.h | 1 + 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index cf37ac8..9be0e74 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1728,6 +1728,9 @@ HINTERNET FTP_Connect(LPWININETAPPINFOW lpwfs->hdr.lpfnStatusCB = hIC->hdr.lpfnStatusCB; lpwfs->download_in_progress = NULL; + WININET_AddRef( &hIC->hdr ); + lpwfs->lpAppInfo = hIC; + handle = WININET_AllocHandle( &lpwfs->hdr ); if( !handle ) { @@ -2685,6 +2688,8 @@ static void FTP_CloseSessionHandle(LPWIN TRACE("\n"); + WININET_Release(&lpwfs->lpAppInfo->hdr); + if (lpwfs->download_in_progress != NULL) lpwfs->download_in_progress->session_deleted = TRUE; diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index de53717..6d2e857 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -213,6 +213,7 @@ typedef struct typedef struct { WININETHANDLEHEADER hdr; + WININETAPPINFOW *lpAppInfo; int sndSocket; int lstnSocket; int pasvSocket; /* data socket connected by us in case of passive FTP */

1 0

Jacek Caban : wininet: Use lpAppInfo instead of lpwhparent where possible.
by Alexandre Julliard 30 Oct '06

30 Oct '06

Module: wine Branch: master Commit: a541a44f512d1151eb702408580e013e5096bff1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a541a44f512d1151eb7024085… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 29 18:49:39 2006 +0100 wininet: Use lpAppInfo instead of lpwhparent where possible. --- dlls/wininet/http.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index e56ea4e..2d39608 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -373,7 +373,7 @@ static void HTTP_ProcessHeaders( LPWININ static void HTTP_AddProxyInfo( LPWININETHTTPREQW lpwhr ) { LPWININETHTTPSESSIONW lpwhs = (LPWININETHTTPSESSIONW)lpwhr->hdr.lpwhparent; - LPWININETAPPINFOW hIC = (LPWININETAPPINFOW)lpwhs->hdr.lpwhparent; + LPWININETAPPINFOW hIC = lpwhs->lpAppInfo; assert(lpwhs->hdr.htype == WH_HHTTPSESSION); assert(hIC->hdr.htype == WH_HINIT); @@ -993,7 +993,7 @@ HINTERNET WINAPI HTTP_HttpOpenRequestW(L TRACE("-->\n"); assert( lpwhs->hdr.htype == WH_HHTTPSESSION ); - hIC = (LPWININETAPPINFOW) lpwhs->hdr.lpwhparent; + hIC = lpwhs->lpAppInfo; lpwhr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WININETHTTPREQW)); if (NULL == lpwhr) @@ -1760,7 +1760,7 @@ BOOL WINAPI HttpSendRequestExW(HINTERNET lpwhs = (LPWININETHTTPSESSIONW) lpwhr->hdr.lpwhparent; assert(lpwhs->hdr.htype == WH_HHTTPSESSION); - hIC = (LPWININETAPPINFOW) lpwhs->hdr.lpwhparent; + hIC = lpwhs->lpAppInfo; assert(hIC->hdr.htype == WH_HINIT); if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) @@ -1850,7 +1850,7 @@ BOOL WINAPI HttpSendRequestW(HINTERNET h goto lend; } - hIC = (LPWININETAPPINFOW) lpwhs->hdr.lpwhparent; + hIC = lpwhs->lpAppInfo; if (NULL == hIC || hIC->hdr.htype != WH_HINIT) { INTERNET_SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); @@ -1930,7 +1930,7 @@ static BOOL HTTP_HandleRedirect(LPWININE DWORD dwContentLength) { LPWININETHTTPSESSIONW lpwhs = (LPWININETHTTPSESSIONW) lpwhr->hdr.lpwhparent; - LPWININETAPPINFOW hIC = (LPWININETAPPINFOW) lpwhs->hdr.lpwhparent; + LPWININETAPPINFOW hIC = lpwhs->lpAppInfo; WCHAR path[2048]; char szaddr[32]; @@ -2484,7 +2484,7 @@ static BOOL HTTP_OpenConnection(LPWININE lpwhs = (LPWININETHTTPSESSIONW)lpwhr->hdr.lpwhparent; - hIC = (LPWININETAPPINFOW) lpwhs->hdr.lpwhparent; + hIC = lpwhs->lpAppInfo; inet_ntop(lpwhs->socketAddress.sin_family, &lpwhs->socketAddress.sin_addr, szaddr, sizeof(szaddr)); INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, @@ -2910,7 +2910,7 @@ static VOID HTTP_CloseConnection(LPWININ TRACE("%p\n",lpwhr); lpwhs = (LPWININETHTTPSESSIONW) lpwhr->hdr.lpwhparent; - hIC = (LPWININETAPPINFOW) lpwhs->hdr.lpwhparent; + hIC = lpwhs->lpAppInfo; INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, INTERNET_STATUS_CLOSING_CONNECTION, 0, 0);

1 0

Jacek Caban : wininet: Store pointer to WININETHTTPSESSIONW in WININETHTTPREQUESTW.
by Alexandre Julliard 30 Oct '06

30 Oct '06

Module: wine Branch: master Commit: a9bdc01e19ee5896706634ca5e633d136b81f60f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9bdc01e19ee5896706634ca5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 29 18:50:25 2006 +0100 wininet: Store pointer to WININETHTTPSESSIONW in WININETHTTPREQUESTW. --- dlls/wininet/http.c | 5 +++++ dlls/wininet/internet.h | 1 + 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 2d39608..cfbda27 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1009,6 +1009,9 @@ HINTERNET WINAPI HTTP_HttpOpenRequestW(L lpwhr->hdr.destroy = HTTP_CloseHTTPRequestHandle; lpwhr->hdr.lpfnStatusCB = lpwhs->hdr.lpfnStatusCB; + WININET_AddRef( &lpwhs->hdr ); + lpwhr->lpHttpSession = lpwhs; + handle = WININET_AllocHandle( &lpwhr->hdr ); if (NULL == handle) { @@ -2938,6 +2941,8 @@ static void HTTP_CloseHTTPRequestHandle( TRACE("\n"); + WININET_Release(&lpwhr->hdr); + if (NETCON_connected(&lpwhr->netConnection)) HTTP_CloseConnection(lpwhr); diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 9c4e7d2..de53717 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -190,6 +190,7 @@ typedef struct typedef struct { WININETHANDLEHEADER hdr; + WININETHTTPSESSIONW *lpHttpSession; LPWSTR lpszPath; LPWSTR lpszVerb; LPWSTR lpszRawHeaders;

1 0

Jacek Caban : wininet: Store WININETAPPINFOW pointer in WININETHTTPSESSIONW .
by Alexandre Julliard 30 Oct '06

30 Oct '06

Module: wine Branch: master Commit: c250617d8820040fcfc58d021ebbcaa5a4882502 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c250617d8820040fcfc58d021… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 29 18:48:48 2006 +0100 wininet: Store WININETAPPINFOW pointer in WININETHTTPSESSIONW. --- dlls/wininet/http.c | 5 +++++ dlls/wininet/internet.h | 1 + 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 0d564be..e56ea4e 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2405,6 +2405,9 @@ HINTERNET HTTP_Connect(LPWININETAPPINFOW lpwhs->hdr.destroy = HTTP_CloseHTTPSessionHandle; lpwhs->hdr.lpfnStatusCB = hIC->hdr.lpfnStatusCB; + WININET_AddRef( &hIC->hdr ); + lpwhs->lpAppInfo = hIC; + handle = WININET_AllocHandle( &lpwhs->hdr ); if (NULL == handle) { @@ -2967,6 +2970,8 @@ static void HTTP_CloseHTTPSessionHandle( TRACE("%p\n", lpwhs); + WININET_Release(&lpwhs->lpAppInfo->hdr); + HeapFree(GetProcessHeap(), 0, lpwhs->lpszHostName); HeapFree(GetProcessHeap(), 0, lpwhs->lpszServerName); HeapFree(GetProcessHeap(), 0, lpwhs->lpszUserName); diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 2f81db1..9c4e7d2 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -165,6 +165,7 @@ typedef struct typedef struct { WININETHANDLEHEADER hdr; + WININETAPPINFOW *lpAppInfo; LPWSTR lpszHostName; /* the final destination of the request */ LPWSTR lpszServerName; /* the name of the server we directly connect to */ LPWSTR lpszUserName;

1 0

Paul Vriens : shell32: Cast-qual warnings fix.
by Alexandre Julliard 30 Oct '06

30 Oct '06

Module: wine Branch: master Commit: 1af1ead894fa4ae369370d577d96a8617b90484c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1af1ead894fa4ae369370d577… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Sun Oct 29 10:36:57 2006 +0100 shell32: Cast-qual warnings fix. --- dlls/shell32/tests/shlfolder.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index a975391..6332d1f 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -624,7 +624,7 @@ static void test_GetAttributesOf(void) 'A','2','D','8','-','0','8','0','0','2','B','3','0','3','0','9','D','}',0 }; char cCurrDirA [MAX_PATH] = {0}; WCHAR cCurrDirW [MAX_PATH]; - static const WCHAR cTestDirW[] = {'t','e','s','t','d','i','r',0}; + static WCHAR cTestDirW[] = {'t','e','s','t','d','i','r',0}; static const WCHAR cBackSlash[] = {'\\',0}; IShellFolder *IDesktopFolder, *testIShellFolder; ITEMIDLIST *newPIDL; @@ -713,7 +713,7 @@ static void test_GetAttributesOf(void) IMalloc_Free(ppM, newPIDL); /* get relative PIDL */ - hr = IShellFolder_ParseDisplayName(testIShellFolder, NULL, NULL, (LPWSTR)cTestDirW, NULL, &newPIDL, 0); + hr = IShellFolder_ParseDisplayName(testIShellFolder, NULL, NULL, cTestDirW, NULL, &newPIDL, 0); ok(hr == S_OK, "ParseDisplayName failed %08x\n", hr); /* test the shell attributes of the test directory using the relative PIDL */

1 0

Andrew Talbot : dbghelp: Cast-qual warnings fix.
by Alexandre Julliard 30 Oct '06

30 Oct '06

Module: wine Branch: master Commit: 7da1d6d1ac1d74222a0ed027d113b64d1d9651e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7da1d6d1ac1d74222a0ed027d… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Oct 28 17:26:18 2006 +0100 dbghelp: Cast-qual warnings fix. --- dlls/dbghelp/path.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c index f297011..59e87de 100644 --- a/dlls/dbghelp/path.c +++ b/dlls/dbghelp/path.c @@ -349,6 +349,7 @@ BOOL WINAPI SymFindFileInPath(HANDLE hPr struct process* pcs = process_find_by_handle(hProcess); char tmp[MAX_PATH]; char* ptr; + char* buf = NULL; const char* filename; const char* searchPath = inSearchPath; @@ -360,7 +361,6 @@ BOOL WINAPI SymFindFileInPath(HANDLE hPr if (!searchPath) { unsigned len = WideCharToMultiByte(CP_ACP, 0, pcs->search_path, -1, NULL, 0, NULL, NULL); - char* buf; searchPath = buf = HeapAlloc(GetProcessHeap(), 0, len); if (!searchPath) return FALSE; @@ -381,8 +381,7 @@ BOOL WINAPI SymFindFileInPath(HANDLE hPr if (sffip_cb(full_path, &s)) { strcpy(buffer, full_path); - if (searchPath != inSearchPath) - HeapFree(GetProcessHeap(), 0, (char*)searchPath); + HeapFree(GetProcessHeap(), 0, buf); return TRUE; } @@ -403,12 +402,10 @@ BOOL WINAPI SymFindFileInPath(HANDLE hPr if (do_search(filename, tmp, FALSE, sffip_cb, &s)) { strcpy(buffer, tmp); - if (searchPath != inSearchPath) - HeapFree(GetProcessHeap(), 0, (char*)searchPath); + HeapFree(GetProcessHeap(), 0, buf); return TRUE; } } - if (searchPath != inSearchPath) - HeapFree(GetProcessHeap(), 0, (char*)searchPath); + HeapFree(GetProcessHeap(), 0, buf); return FALSE; }

1 0