Jacek Caban : wininet: Moved WORKREQ_FTPREMOVEDIRECTORYW out of WORKREQUEST .
Alexandre Julliard
julliard at winehq.org
Tue Jan 29 12:35:42 CST 2013
Module: wine
Branch: master
Commit: ffa7d1673196da6fadabd0d0fcd00db41887b0f1
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffa7d1673196da6fadabd0d0fcd00db41887b0f1
Author: Jacek Caban <jacek at codeweavers.com>
Date: Tue Jan 29 12:05:13 2013 +0100
wininet: Moved WORKREQ_FTPREMOVEDIRECTORYW out of WORKREQUEST.
---
dlls/wininet/ftp.c | 20 +++++++++-----------
dlls/wininet/internet.h | 6 ------
2 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c
index 21163d5..599b38e 100644
--- a/dlls/wininet/ftp.c
+++ b/dlls/wininet/ftp.c
@@ -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
{
diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h
index 01bf5b3..382cae9 100644
--- a/dlls/wininet/internet.h
+++ b/dlls/wininet/internet.h
@@ -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;
More information about the wine-cvs
mailing list