Jacek Caban : wininet: Use proc instead of enum in FTPFINDNEXTW
request.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Dec 26 06:49:27 CST 2006
Module: wine
Branch: master
Commit: f08ff892be06cbef33fa7f73bcadf2d6742c76b6
URL: http://source.winehq.org/git/wine.git/?a=commit;h=f08ff892be06cbef33fa7f73bcadf2d6742c76b6
Author: Jacek Caban <jacek at codeweavers.com>
Date: Mon Dec 25 21:36:46 2006 +0100
wininet: Use proc instead of enum in FTPFINDNEXTW request.
---
dlls/wininet/internet.c | 29 ++++++++++++++---------------
dlls/wininet/internet.h | 1 -
2 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c
index 5e7ebf0..ceee5d6 100644
--- a/dlls/wininet/internet.c
+++ b/dlls/wininet/internet.c
@@ -915,6 +915,16 @@ BOOL WINAPI InternetFindNextFileA(HINTER
* FALSE on failure
*
*/
+static void AsyncFtpFindNextFileProc(WORKREQUEST *workRequest)
+{
+ struct WORKREQ_FTPFINDNEXTW *req = &workRequest->u.FtpFindNextW;
+ LPWININETFTPFINDNEXTW lpwh = (LPWININETFTPFINDNEXTW) workRequest->hdr;
+
+ TRACE("%p\n", lpwh);
+
+ FTP_FindNextFileW(lpwh, req->lpFindFileData);
+}
+
BOOL WINAPI InternetFindNextFileW(HINTERNET hFind, LPVOID lpvFindData)
{
LPWININETAPPINFOW hIC = NULL;
@@ -937,10 +947,11 @@ BOOL WINAPI InternetFindNextFileW(HINTER
WORKREQUEST workRequest;
struct WORKREQ_FTPFINDNEXTW *req;
- workRequest.asyncall = FTPFINDNEXTW;
- workRequest.hdr = WININET_AddRef( &lpwh->hdr );
+ workRequest.asyncall = CALLASYNCPROC;
+ workRequest.asyncproc = AsyncFtpFindNextFileProc;
+ workRequest.hdr = WININET_AddRef( &lpwh->hdr );
req = &workRequest.u.FtpFindNextW;
- req->lpFindFileData = lpvFindData;
+ req->lpFindFileData = lpvFindData;
bSuccess = INTERNET_AsyncCall(&workRequest);
}
@@ -3242,18 +3253,6 @@ static VOID INTERNET_ExecuteWork(void)
case CALLASYNCPROC:
workRequest.asyncproc(&workRequest);
break;
-
- case FTPFINDNEXTW:
- {
- struct WORKREQ_FTPFINDNEXTW *req;
- LPWININETFTPFINDNEXTW lpwh = (LPWININETFTPFINDNEXTW) workRequest.hdr;
-
- TRACE("INTERNETFINDNEXTW %p\n", lpwh);
-
- req = &workRequest.u.FtpFindNextW;
- FTP_FindNextFileW(lpwh, req->lpFindFileData);
- }
- break;
}
WININET_Release( workRequest.hdr );
}
diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h
index 4a95d72..9f689a0 100644
--- a/dlls/wininet/internet.h
+++ b/dlls/wininet/internet.h
@@ -250,7 +250,6 @@ typedef struct
typedef enum
{
CALLASYNCPROC,
- FTPFINDNEXTW,
} ASYNC_FUNC;
struct WORKREQ_FTPPUTFILEW
More information about the wine-cvs
mailing list