Jacek Caban : wininet:
Use proc instead of enum in FTPFINDFIRSTFILEW request.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Dec 26 06:49:21 CST 2006
Module: wine
Branch: master
Commit: 0d464ba8db986f50b5a6ba771853817470924090
URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d464ba8db986f50b5a6ba771853817470924090
Author: Jacek Caban <jacek at codeweavers.com>
Date: Mon Dec 25 21:35:11 2006 +0100
wininet: Use proc instead of enum in FTPFINDFIRSTFILEW request.
---
dlls/wininet/ftp.c | 17 +++++++++++++++--
dlls/wininet/internet.c | 14 --------------
dlls/wininet/internet.h | 1 -
3 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c
index e69256a..85aef92 100644
--- a/dlls/wininet/ftp.c
+++ b/dlls/wininet/ftp.c
@@ -643,6 +643,18 @@ HINTERNET WINAPI FtpFindFirstFileA(HINTE
* NULL on failure
*
*/
+static void AsyncFtpFindFirstFileProc(WORKREQUEST *workRequest)
+{
+ struct WORKREQ_FTPFINDFIRSTFILEW const *req = &workRequest->u.FtpFindFirstFileW;
+ LPWININETFTPSESSIONW lpwfs = (LPWININETFTPSESSIONW) workRequest->hdr;
+
+ TRACE("%p\n", lpwfs);
+
+ FTP_FtpFindFirstFileW(lpwfs, req->lpszSearchFile,
+ req->lpFindFileData, req->dwFlags, req->dwContext);
+ HeapFree(GetProcessHeap(), 0, req->lpszSearchFile);
+}
+
HINTERNET WINAPI FtpFindFirstFileW(HINTERNET hConnect,
LPCWSTR lpszSearchFile, LPWIN32_FIND_DATAW lpFindFileData, DWORD dwFlags, DWORD dwContext)
{
@@ -663,8 +675,9 @@ HINTERNET WINAPI FtpFindFirstFileW(HINTE
WORKREQUEST workRequest;
struct WORKREQ_FTPFINDFIRSTFILEW *req;
- workRequest.asyncall = FTPFINDFIRSTFILEW;
- workRequest.hdr = WININET_AddRef( &lpwfs->hdr );
+ workRequest.asyncall = CALLASYNCPROC;
+ workRequest.asyncproc = AsyncFtpFindFirstFileProc;
+ workRequest.hdr = WININET_AddRef( &lpwfs->hdr );
req = &workRequest.u.FtpFindFirstFileW;
req->lpszSearchFile = (lpszSearchFile == NULL) ? NULL : WININET_strdupW(lpszSearchFile);
req->lpFindFileData = lpFindFileData;
diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c
index 0ff59e3..ddacd7e 100644
--- a/dlls/wininet/internet.c
+++ b/dlls/wininet/internet.c
@@ -3243,20 +3243,6 @@ static VOID INTERNET_ExecuteWork(void)
workRequest.asyncproc(&workRequest);
break;
- case FTPFINDFIRSTFILEW:
- {
- struct WORKREQ_FTPFINDFIRSTFILEW *req;
- LPWININETFTPSESSIONW lpwfs = (LPWININETFTPSESSIONW) workRequest.hdr;
-
- TRACE("FTPFINDFIRSTFILEW %p\n", lpwfs);
-
- req = &workRequest.u.FtpFindFirstFileW;
- FTP_FtpFindFirstFileW(lpwfs, req->lpszSearchFile,
- req->lpFindFileData, req->dwFlags, req->dwContext);
- HeapFree(GetProcessHeap(), 0, req->lpszSearchFile);
- }
- break;
-
case FTPGETCURRENTDIRECTORYW:
{
struct WORKREQ_FTPGETCURRENTDIRECTORYW *req;
diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h
index 85373b0..d27dbe4 100644
--- a/dlls/wininet/internet.h
+++ b/dlls/wininet/internet.h
@@ -250,7 +250,6 @@ typedef struct
typedef enum
{
CALLASYNCPROC,
- FTPFINDFIRSTFILEW,
FTPGETCURRENTDIRECTORYW,
FTPOPENFILEW,
FTPGETFILEW,
More information about the wine-cvs
mailing list