ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wininet: Moved WORKREQ_FTPRENAMEFILEW out of WORKREQUEST.

This commit is contained in:
Jacek Caban 2013-01-30 11:38:59 +01:00 committed by Alexandre Julliard
parent 228d6a6064
commit d5c0b17ae7
2 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dlls/wininet/ftp.c
View File

@ -2076,16 +2076,22 @@ BOOL WINAPI FtpRenameFileA(HINTERNET hFtpSession, LPCSTR lpszSrc, LPCSTR lpszDes
return ret; return ret;
} }
static void AsyncFtpRenameFileProc(WORKREQUEST *workRequest) typedef struct {
task_header_t hdr;
WCHAR *src_file;
WCHAR *dst_file;
} rename_file_task_t;
static void AsyncFtpRenameFileProc(task_header_t *hdr)
{ {
struct WORKREQ_FTPRENAMEFILEW const *req = &workRequest->u.FtpRenameFileW; rename_file_task_t *task = (rename_file_task_t*)hdr;
ftp_session_t *lpwfs = (ftp_session_t*) workRequest->hdr; ftp_session_t *session = (ftp_session_t*)task->hdr.hdr;
TRACE("%p\n", lpwfs); TRACE("%p\n", session);
FTP_FtpRenameFileW(lpwfs, req->lpszSrcFile, req->lpszDestFile); FTP_FtpRenameFileW(session, task->src_file, task->dst_file);
heap_free(req->lpszSrcFile); heap_free(task->src_file);
heap_free(req->lpszDestFile); heap_free(task->dst_file);
} }
/*********************************************************************** /***********************************************************************
@ -2132,15 +2138,13 @@ BOOL WINAPI FtpRenameFileW(HINTERNET hFtpSession, LPCWSTR lpszSrc, LPCWSTR lpszD
hIC = lpwfs->lpAppInfo; hIC = lpwfs->lpAppInfo;
if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC)
{ {
WORKREQUEST *task; rename_file_t *task;
struct WORKREQ_FTPRENAMEFILEW *req;
task = alloc_async_task(&lpwfs->hdr, AsyncFtpRenameFileProc, sizeof(*task)); task = alloc_async_task(&lpwfs->hdr, AsyncFtpRenameFileProc, sizeof(*task));
req = &task->u.FtpRenameFileW; task->src_file = heap_strdupW(lpszSrc);
req->lpszSrcFile = heap_strdupW(lpszSrc); task->dst_file = heap_strdupW(lpszDest);
req->lpszDestFile = heap_strdupW(lpszDest);
r = res_to_le(INTERNET_AsyncCall(task)); r = res_to_le(INTERNET_AsyncCall(&task->hdr));
} }
else else
{ {

7
dlls/wininet/internet.h
View File

@ -360,12 +360,6 @@ struct WORKREQ_FTPDELETEFILEW
LPWSTR lpszFilename; LPWSTR lpszFilename;
}; };
struct WORKREQ_FTPRENAMEFILEW
{
LPWSTR lpszSrcFile;
LPWSTR lpszDestFile;
};
struct WORKREQ_FTPFINDNEXTW struct WORKREQ_FTPFINDNEXTW
{ {
LPWIN32_FIND_DATAW lpFindFileData; LPWIN32_FIND_DATAW lpFindFileData;
@ -381,7 +375,6 @@ typedef struct WORKREQ
union { union {
struct WORKREQ_FTPDELETEFILEW FtpDeleteFileW; struct WORKREQ_FTPDELETEFILEW FtpDeleteFileW;
struct WORKREQ_FTPRENAMEFILEW FtpRenameFileW;
struct WORKREQ_FTPFINDNEXTW FtpFindNextW; struct WORKREQ_FTPFINDNEXTW FtpFindNextW;
} u; } u;
} WORKREQUEST, *LPWORKREQUEST; } WORKREQUEST, *LPWORKREQUEST;