Jacek Caban : wininet: Use proc instead of enum in FTPOPENFILEW
request.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Dec 26 06:49:24 CST 2006
Module: wine
Branch: master
Commit: 3c90016f2f362e2d368f7dafba2baabfe01bf9e5
URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c90016f2f362e2d368f7dafba2baabfe01bf9e5
Author: Jacek Caban <jacek at codeweavers.com>
Date: Mon Dec 25 21:35:36 2006 +0100
wininet: Use proc instead of enum in FTPOPENFILEW request.
---
dlls/wininet/ftp.c | 17 +++++++++++++++--
dlls/wininet/internet.c | 13 -------------
dlls/wininet/internet.h | 1 -
3 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c
index 778017c..2b4093b 100644
--- a/dlls/wininet/ftp.c
+++ b/dlls/wininet/ftp.c
@@ -1003,6 +1003,18 @@ HINTERNET WINAPI FtpOpenFileA(HINTERNET
* NULL on failure
*
*/
+static void AsyncFtpOpenFileProc(WORKREQUEST *workRequest)
+{
+ struct WORKREQ_FTPOPENFILEW const *req = &workRequest->u.FtpOpenFileW;
+ LPWININETFTPSESSIONW lpwfs = (LPWININETFTPSESSIONW) workRequest->hdr;
+
+ TRACE("%p\n", lpwfs);
+
+ FTP_FtpOpenFileW(lpwfs, req->lpszFilename,
+ req->dwAccess, req->dwFlags, req->dwContext);
+ HeapFree(GetProcessHeap(), 0, req->lpszFilename);
+}
+
HINTERNET WINAPI FtpOpenFileW(HINTERNET hFtpSession,
LPCWSTR lpszFileName, DWORD fdwAccess, DWORD dwFlags,
DWORD dwContext)
@@ -1031,8 +1043,9 @@ HINTERNET WINAPI FtpOpenFileW(HINTERNET
WORKREQUEST workRequest;
struct WORKREQ_FTPOPENFILEW *req;
- workRequest.asyncall = FTPOPENFILEW;
- workRequest.hdr = WININET_AddRef( &lpwfs->hdr );
+ workRequest.asyncall = CALLASYNCPROC;
+ workRequest.asyncproc = AsyncFtpOpenFileProc;
+ workRequest.hdr = WININET_AddRef( &lpwfs->hdr );
req = &workRequest.u.FtpOpenFileW;
req->lpszFilename = WININET_strdupW(lpszFileName);
req->dwAccess = fdwAccess;
diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c
index 2a80eed..e98544c 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 FTPOPENFILEW:
- {
- struct WORKREQ_FTPOPENFILEW *req = &workRequest.u.FtpOpenFileW;
- LPWININETFTPSESSIONW lpwfs = (LPWININETFTPSESSIONW) workRequest.hdr;
-
- TRACE("FTPOPENFILEW %p\n", lpwfs);
-
- FTP_FtpOpenFileW(lpwfs, req->lpszFilename,
- req->dwAccess, req->dwFlags, req->dwContext);
- HeapFree(GetProcessHeap(), 0, req->lpszFilename);
- }
- break;
-
case FTPGETFILEW:
{
struct WORKREQ_FTPGETFILEW *req = &workRequest.u.FtpGetFileW;
diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h
index 449930a..cf02e92 100644
--- a/dlls/wininet/internet.h
+++ b/dlls/wininet/internet.h
@@ -250,7 +250,6 @@ typedef struct
typedef enum
{
CALLASYNCPROC,
- FTPOPENFILEW,
FTPGETFILEW,
FTPDELETEFILEW,
FTPREMOVEDIRECTORYW,
More information about the wine-cvs
mailing list