Jacek Caban : wininet:
Use proc instead of enum in FTPSETCURRENTDIRECTORY request.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Dec 26 06:49:20 CST 2006
Module: wine
Branch: master
Commit: f28b0e3b1068aff3178d85c2de91280883ee13b3
URL: http://source.winehq.org/git/wine.git/?a=commit;h=f28b0e3b1068aff3178d85c2de91280883ee13b3
Author: Jacek Caban <jacek at codeweavers.com>
Date: Mon Dec 25 21:34:53 2006 +0100
wininet: Use proc instead of enum in FTPSETCURRENTDIRECTORY 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 5c97758..92dba6f 100644
--- a/dlls/wininet/ftp.c
+++ b/dlls/wininet/ftp.c
@@ -352,6 +352,17 @@ BOOL WINAPI FtpSetCurrentDirectoryA(HINT
* FALSE on failure
*
*/
+static void AsyncFtpSetCurrentDirectoryProc(WORKREQUEST *workRequest)
+{
+ struct WORKREQ_FTPSETCURRENTDIRECTORYW const *req = &workRequest->u.FtpSetCurrentDirectoryW;
+ LPWININETFTPSESSIONW lpwfs = (LPWININETFTPSESSIONW) workRequest->hdr;
+
+ TRACE("%p\n", lpwfs);
+
+ FTP_FtpSetCurrentDirectoryW(lpwfs, req->lpszDirectory);
+ HeapFree(GetProcessHeap(), 0, req->lpszDirectory);
+}
+
BOOL WINAPI FtpSetCurrentDirectoryW(HINTERNET hConnect, LPCWSTR lpszDirectory)
{
LPWININETFTPSESSIONW lpwfs = NULL;
@@ -379,8 +390,9 @@ BOOL WINAPI FtpSetCurrentDirectoryW(HINT
WORKREQUEST workRequest;
struct WORKREQ_FTPSETCURRENTDIRECTORYW *req;
- workRequest.asyncall = FTPSETCURRENTDIRECTORYW;
- workRequest.hdr = WININET_AddRef( &lpwfs->hdr );
+ workRequest.asyncall = CALLASYNCPROC;
+ workRequest.asyncproc = AsyncFtpSetCurrentDirectoryProc;
+ workRequest.hdr = WININET_AddRef( &lpwfs->hdr );
req = &workRequest.u.FtpSetCurrentDirectoryW;
req->lpszDirectory = WININET_strdupW(lpszDirectory);
diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c
index eb45c95..0e57aef 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 FTPSETCURRENTDIRECTORYW:
- {
- struct WORKREQ_FTPSETCURRENTDIRECTORYW *req;
- LPWININETFTPSESSIONW lpwfs = (LPWININETFTPSESSIONW) workRequest.hdr;
-
- TRACE("FTPSETCURRENTDIRECTORYW %p\n", lpwfs);
-
- req = &workRequest.u.FtpSetCurrentDirectoryW;
- FTP_FtpSetCurrentDirectoryW(lpwfs, req->lpszDirectory);
- HeapFree(GetProcessHeap(), 0, req->lpszDirectory);
- }
- break;
-
case FTPCREATEDIRECTORYW:
{
struct WORKREQ_FTPCREATEDIRECTORYW *req;
diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h
index 3e0a034..1a7b2b6 100644
--- a/dlls/wininet/internet.h
+++ b/dlls/wininet/internet.h
@@ -250,7 +250,6 @@ typedef struct
typedef enum
{
CALLASYNCPROC,
- FTPSETCURRENTDIRECTORYW,
FTPCREATEDIRECTORYW,
FTPFINDFIRSTFILEW,
FTPGETCURRENTDIRECTORYW,
More information about the wine-cvs
mailing list