Jacek Caban : wininet:
Use proc instead of enum in FTPREMOVEDIRECTORYW request.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Dec 26 06:49:26 CST 2006
Module: wine
Branch: master
Commit: 97157ccee068d0f28f9b947b04b688e8b71747d9
URL: http://source.winehq.org/git/wine.git/?a=commit;h=97157ccee068d0f28f9b947b04b688e8b71747d9
Author: Jacek Caban <jacek at codeweavers.com>
Date: Mon Dec 25 21:36:15 2006 +0100
wininet: Use proc instead of enum in FTPREMOVEDIRECTORYW request.
---
dlls/wininet/ftp.c | 16 ++++++++++++++--
dlls/wininet/internet.c | 13 -------------
dlls/wininet/internet.h | 1 -
3 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c
index 4b65fa7..24e3084 100644
--- a/dlls/wininet/ftp.c
+++ b/dlls/wininet/ftp.c
@@ -1519,6 +1519,17 @@ BOOL WINAPI FtpRemoveDirectoryA(HINTERNE
* FALSE on failure
*
*/
+static void AsyncFtpRemoveDirectoryProc(WORKREQUEST *workRequest)
+{
+ struct WORKREQ_FTPREMOVEDIRECTORYW const *req = &workRequest->u.FtpRemoveDirectoryW;
+ LPWININETFTPSESSIONW lpwfs = (LPWININETFTPSESSIONW) workRequest->hdr;
+
+ TRACE("%p\n", lpwfs);
+
+ FTP_FtpRemoveDirectoryW(lpwfs, req->lpszDirectory);
+ HeapFree(GetProcessHeap(), 0, req->lpszDirectory);
+}
+
BOOL WINAPI FtpRemoveDirectoryW(HINTERNET hFtpSession, LPCWSTR lpszDirectory)
{
LPWININETFTPSESSIONW lpwfs;
@@ -1538,8 +1549,9 @@ BOOL WINAPI FtpRemoveDirectoryW(HINTERNE
WORKREQUEST workRequest;
struct WORKREQ_FTPREMOVEDIRECTORYW *req;
- workRequest.asyncall = FTPREMOVEDIRECTORYW;
- workRequest.hdr = WININET_AddRef( &lpwfs->hdr );
+ workRequest.asyncall = CALLASYNCPROC;
+ workRequest.asyncproc = AsyncFtpRemoveDirectoryProc;
+ workRequest.hdr = WININET_AddRef( &lpwfs->hdr );
req = &workRequest.u.FtpRemoveDirectoryW;
req->lpszDirectory = WININET_strdupW(lpszDirectory);
diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c
index 6f9a1ce..fd5513a 100644
--- a/dlls/wininet/internet.c
+++ b/dlls/wininet/internet.c
@@ -3243,19 +3243,6 @@ static VOID INTERNET_ExecuteWork(void)
workRequest.asyncproc(&workRequest);
break;
- case FTPREMOVEDIRECTORYW:
- {
- struct WORKREQ_FTPREMOVEDIRECTORYW *req;
- LPWININETFTPSESSIONW lpwfs = (LPWININETFTPSESSIONW) workRequest.hdr;
-
- TRACE("FTPREMOVEDIRECTORYW %p\n", lpwfs);
-
- req = &workRequest.u.FtpRemoveDirectoryW;
- FTP_FtpRemoveDirectoryW(lpwfs, req->lpszDirectory);
- HeapFree(GetProcessHeap(), 0, req->lpszDirectory);
- }
- break;
-
case FTPRENAMEFILEW:
{
struct WORKREQ_FTPRENAMEFILEW *req = &workRequest.u.FtpRenameFileW;
diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h
index 1d68a7c..b9f7161 100644
--- a/dlls/wininet/internet.h
+++ b/dlls/wininet/internet.h
@@ -250,7 +250,6 @@ typedef struct
typedef enum
{
CALLASYNCPROC,
- FTPREMOVEDIRECTORYW,
FTPRENAMEFILEW,
FTPFINDNEXTW,
} ASYNC_FUNC;
More information about the wine-cvs
mailing list