wininet: Use proc instead of enum in FTPUTFILE request.

This commit is contained in:
Jacek Caban 2006-12-25 21:34:39 +01:00 committed by Alexandre Julliard
parent 662c885a0b
commit 4adce67cf6
3 changed files with 17 additions and 18 deletions

View File

@ -180,6 +180,20 @@ BOOL WINAPI FtpPutFileA(HINTERNET hConnect, LPCSTR lpszLocalFile,
* FALSE on failure * FALSE on failure
* *
*/ */
static void AsyncFtpPutFileProc(WORKREQUEST *workRequest)
{
struct WORKREQ_FTPPUTFILEW const *req = &workRequest->u.FtpPutFileW;
LPWININETFTPSESSIONW lpwfs = (LPWININETFTPSESSIONW) workRequest->hdr;
TRACE("%p\n", lpwfs);
FTP_FtpPutFileW(lpwfs, req->lpszLocalFile,
req->lpszNewRemoteFile, req->dwFlags, req->dwContext);
HeapFree(GetProcessHeap(), 0, req->lpszLocalFile);
HeapFree(GetProcessHeap(), 0, req->lpszNewRemoteFile);
}
BOOL WINAPI FtpPutFileW(HINTERNET hConnect, LPCWSTR lpszLocalFile, BOOL WINAPI FtpPutFileW(HINTERNET hConnect, LPCWSTR lpszLocalFile,
LPCWSTR lpszNewRemoteFile, DWORD dwFlags, DWORD dwContext) LPCWSTR lpszNewRemoteFile, DWORD dwFlags, DWORD dwContext)
{ {
@ -200,8 +214,9 @@ BOOL WINAPI FtpPutFileW(HINTERNET hConnect, LPCWSTR lpszLocalFile,
WORKREQUEST workRequest; WORKREQUEST workRequest;
struct WORKREQ_FTPPUTFILEW *req = &workRequest.u.FtpPutFileW; struct WORKREQ_FTPPUTFILEW *req = &workRequest.u.FtpPutFileW;
workRequest.asyncall = FTPPUTFILEW; workRequest.asyncall = CALLASYNCPROC;
workRequest.hdr = WININET_AddRef( &lpwfs->hdr ); workRequest.asyncproc = AsyncFtpPutFileProc;
workRequest.hdr = WININET_AddRef( &lpwfs->hdr );
req->lpszLocalFile = WININET_strdupW(lpszLocalFile); req->lpszLocalFile = WININET_strdupW(lpszLocalFile);
req->lpszNewRemoteFile = WININET_strdupW(lpszNewRemoteFile); req->lpszNewRemoteFile = WININET_strdupW(lpszNewRemoteFile);
req->dwFlags = dwFlags; req->dwFlags = dwFlags;

View File

@ -3243,21 +3243,6 @@ static VOID INTERNET_ExecuteWork(void)
workRequest.asyncproc(&workRequest); workRequest.asyncproc(&workRequest);
break; break;
case FTPPUTFILEW:
{
struct WORKREQ_FTPPUTFILEW *req = &workRequest.u.FtpPutFileW;
LPWININETFTPSESSIONW lpwfs = (LPWININETFTPSESSIONW) workRequest.hdr;
TRACE("FTPPUTFILEW %p\n", lpwfs);
FTP_FtpPutFileW(lpwfs, req->lpszLocalFile,
req->lpszNewRemoteFile, req->dwFlags, req->dwContext);
HeapFree(GetProcessHeap(), 0, req->lpszLocalFile);
HeapFree(GetProcessHeap(), 0, req->lpszNewRemoteFile);
}
break;
case FTPSETCURRENTDIRECTORYW: case FTPSETCURRENTDIRECTORYW:
{ {
struct WORKREQ_FTPSETCURRENTDIRECTORYW *req; struct WORKREQ_FTPSETCURRENTDIRECTORYW *req;

View File

@ -250,7 +250,6 @@ typedef struct
typedef enum typedef enum
{ {
CALLASYNCPROC, CALLASYNCPROC,
FTPPUTFILEW,
FTPSETCURRENTDIRECTORYW, FTPSETCURRENTDIRECTORYW,
FTPCREATEDIRECTORYW, FTPCREATEDIRECTORYW,
FTPFINDFIRSTFILEW, FTPFINDFIRSTFILEW,