Jacek Caban : wininet: Moved WORKREQ_FTPDELETEFILEW out of WORKREQUEST.
Alexandre Julliard
julliard at winehq.org
Wed Jan 30 13:43:22 CST 2013
Module: wine
Branch: master
Commit: 302fd67e61dbfba205b0afd496667416fbde5b8a
URL: http://source.winehq.org/git/wine.git/?a=commit;h=302fd67e61dbfba205b0afd496667416fbde5b8a
Author: Jacek Caban <jacek at codeweavers.com>
Date: Wed Jan 30 11:39:23 2013 +0100
wininet: Moved WORKREQ_FTPDELETEFILEW out of WORKREQUEST.
---
dlls/wininet/ftp.c | 25 ++++++++++++++-----------
dlls/wininet/internet.h | 10 ----------
2 files changed, 14 insertions(+), 21 deletions(-)
diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c
index f3764ed..152e336 100644
--- a/dlls/wininet/ftp.c
+++ b/dlls/wininet/ftp.c
@@ -1786,15 +1786,20 @@ BOOL WINAPI FtpDeleteFileA(HINTERNET hFtpSession, LPCSTR lpszFileName)
return ret;
}
-static void AsyncFtpDeleteFileProc(WORKREQUEST *workRequest)
+typedef struct {
+ task_header_t hdr;
+ WCHAR *file_name;
+} delete_file_task_t;
+
+static void AsyncFtpDeleteFileProc(task_header_t *hdr)
{
- struct WORKREQ_FTPDELETEFILEW const *req = &workRequest->u.FtpDeleteFileW;
- ftp_session_t *lpwfs = (ftp_session_t*) workRequest->hdr;
+ delete_file_task_t *task = (delete_file_task_t*)hdr;
+ ftp_session_t *session = (ftp_session_t*)task->hdr.hdr;
- TRACE("%p\n", lpwfs);
+ TRACE("%p\n", session);
- FTP_FtpDeleteFileW(lpwfs, req->lpszFilename);
- heap_free(req->lpszFilename);
+ FTP_FtpDeleteFileW(session, task->file_name);
+ heap_free(task->file_name);
}
/***********************************************************************
@@ -1841,14 +1846,12 @@ BOOL WINAPI FtpDeleteFileW(HINTERNET hFtpSession, LPCWSTR lpszFileName)
hIC = lpwfs->lpAppInfo;
if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC)
{
- WORKREQUEST *task;
- struct WORKREQ_FTPDELETEFILEW *req;
+ delete_file_task_t *task;
task = alloc_async_task(&lpwfs->hdr, AsyncFtpDeleteFileProc, sizeof(*task));
- req = &task->u.FtpDeleteFileW;
- req->lpszFilename = heap_strdupW(lpszFileName);
+ task->file_name = heap_strdupW(lpszFileName);
- 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 82a15ae..bcb7fe6 100644
--- a/dlls/wininet/internet.h
+++ b/dlls/wininet/internet.h
@@ -354,12 +354,6 @@ typedef struct
netconn_stream_t netconn_stream;
} http_request_t;
-
-struct WORKREQ_FTPDELETEFILEW
-{
- LPWSTR lpszFilename;
-};
-
typedef struct WORKREQ task_header_t;
typedef void (*async_task_proc_t)(task_header_t*);
@@ -367,10 +361,6 @@ typedef struct WORKREQ
{
async_task_proc_t proc;
object_header_t *hdr;
-
- union {
- struct WORKREQ_FTPDELETEFILEW FtpDeleteFileW;
- } u;
} WORKREQUEST, *LPWORKREQUEST;
void *alloc_async_task(object_header_t*,async_task_proc_t,size_t) DECLSPEC_HIDDEN;
More information about the wine-cvs
mailing list