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

wininet: Moved WORKREQ_FTPREMOVEDIRECTORYW out of WORKREQUEST.

This commit is contained in:
Jacek Caban 2013-01-29 12:05:13 +01:00 committed by Alexandre Julliard
parent d816de27fb
commit ffa7d16731
2 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dlls/wininet/ftp.c
View File

@ -1913,15 +1913,15 @@ BOOL WINAPI FtpRemoveDirectoryA(HINTERNET hFtpSession, LPCSTR lpszDirectory)
return ret;
}
static void AsyncFtpRemoveDirectoryProc(WORKREQUEST *workRequest)
static void AsyncFtpRemoveDirectoryProc(task_header_t *hdr)
{
struct WORKREQ_FTPREMOVEDIRECTORYW const *req = &workRequest->u.FtpRemoveDirectoryW;
ftp_session_t *lpwfs = (ftp_session_t*) workRequest->hdr;
directory_task_t *task = (directory_task_t*)hdr;
ftp_session_t *session = (ftp_session_t*)task->hdr.hdr;
TRACE("%p\n", lpwfs);
TRACE("%p\n", session);
FTP_FtpRemoveDirectoryW(lpwfs, req->lpszDirectory);
heap_free(req->lpszDirectory);
FTP_FtpRemoveDirectoryW(session, task->directory);
heap_free(task->directory);
}
/***********************************************************************
@ -1968,14 +1968,12 @@ BOOL WINAPI FtpRemoveDirectoryW(HINTERNET hFtpSession, LPCWSTR lpszDirectory)
hIC = lpwfs->lpAppInfo;
if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC)
{
WORKREQUEST *task;
struct WORKREQ_FTPREMOVEDIRECTORYW *req;
directory_task_t *task;
task = alloc_async_task(&lpwfs->hdr, AsyncFtpRemoveDirectoryProc, sizeof(*task));
req = &task->u.FtpRemoveDirectoryW;
req->lpszDirectory = heap_strdupW(lpszDirectory);
task->directory = heap_strdupW(lpszDirectory);
r = res_to_le(INTERNET_AsyncCall(task));
r = res_to_le(INTERNET_AsyncCall(&task->hdr));
}
else
{

6
dlls/wininet/internet.h
View File

@ -392,11 +392,6 @@ struct WORKREQ_FTPDELETEFILEW
LPWSTR lpszFilename;
};
struct WORKREQ_FTPREMOVEDIRECTORYW
{
LPWSTR lpszDirectory;
};
struct WORKREQ_FTPRENAMEFILEW
{
LPWSTR lpszSrcFile;
@ -422,7 +417,6 @@ typedef struct WORKREQ
struct WORKREQ_FTPOPENFILEW FtpOpenFileW;
struct WORKREQ_FTPGETFILEW FtpGetFileW;
struct WORKREQ_FTPDELETEFILEW FtpDeleteFileW;
struct WORKREQ_FTPREMOVEDIRECTORYW FtpRemoveDirectoryW;
struct WORKREQ_FTPRENAMEFILEW FtpRenameFileW;
struct WORKREQ_FTPFINDNEXTW FtpFindNextW;
} u;