Jacek Caban : wininet: Moved WORKREQ_FTPCREATEDIRECTORYW out of WORKREQUEST .
Alexandre Julliard
julliard at winehq.org
Tue Jan 29 12:35:42 CST 2013
Module: wine
Branch: master
Commit: d816de27fbeb24c4de14aa056d3694b6b846dff3
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d816de27fbeb24c4de14aa056d3694b6b846dff3
Author: Jacek Caban <jacek at codeweavers.com>
Date: Tue Jan 29 12:05:03 2013 +0100
wininet: Moved WORKREQ_FTPCREATEDIRECTORYW 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 9007d56..21163d5 100644
--- a/dlls/wininet/ftp.c
+++ b/dlls/wininet/ftp.c
@@ -589,15 +589,15 @@ BOOL WINAPI FtpCreateDirectoryA(HINTERNET hConnect, LPCSTR lpszDirectory)
}
-static void AsyncFtpCreateDirectoryProc(WORKREQUEST *workRequest)
+static void AsyncFtpCreateDirectoryProc(task_header_t *hdr)
{
- struct WORKREQ_FTPCREATEDIRECTORYW const *req = &workRequest->u.FtpCreateDirectoryW;
- 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_FtpCreateDirectoryW(lpwfs, req->lpszDirectory);
- heap_free(req->lpszDirectory);
+ FTP_FtpCreateDirectoryW(session, task->directory);
+ heap_free(task->directory);
}
/***********************************************************************
@@ -644,14 +644,12 @@ BOOL WINAPI FtpCreateDirectoryW(HINTERNET hConnect, LPCWSTR lpszDirectory)
hIC = lpwfs->lpAppInfo;
if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC)
{
- WORKREQUEST *task;
- struct WORKREQ_FTPCREATEDIRECTORYW *req;
+ directory_task_t *task;
task = alloc_async_task(&lpwfs->hdr, AsyncFtpCreateDirectoryProc, sizeof(*task));
- req = &task->u.FtpCreateDirectoryW;
- 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 83cc750..01bf5b3 100644
--- a/dlls/wininet/internet.h
+++ b/dlls/wininet/internet.h
@@ -355,11 +355,6 @@ typedef struct
} http_request_t;
-struct WORKREQ_FTPCREATEDIRECTORYW
-{
- LPWSTR lpszDirectory;
-};
-
struct WORKREQ_FTPFINDFIRSTFILEW
{
LPWSTR lpszSearchFile;
@@ -422,7 +417,6 @@ typedef struct WORKREQ
object_header_t *hdr;
union {
- struct WORKREQ_FTPCREATEDIRECTORYW FtpCreateDirectoryW;
struct WORKREQ_FTPFINDFIRSTFILEW FtpFindFirstFileW;
struct WORKREQ_FTPGETCURRENTDIRECTORYW FtpGetCurrentDirectoryW;
struct WORKREQ_FTPOPENFILEW FtpOpenFileW;
More information about the wine-cvs
mailing list