Jacek Caban : wininet: Use proc instead of enum in FTPGETCURRENTDIRECTORYW request.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 3b77ff24c2f72cd5b27f4c4452eb083b96f6f919
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3b77ff24c2f72cd5b27f4c4452...

Author: Jacek Caban 
Date:   Mon Dec 25 21:35:20 2006 +0100

wininet: Use proc instead of enum in FTPGETCURRENTDIRECTORYW request.

---

dlls/wininet/ftp.c      |   15 +++++++++++++--
 dlls/wininet/internet.c |   13 -------------
 dlls/wininet/internet.h |    1 -
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c
index 85aef92..778017c 100644
--- a/dlls/wininet/ftp.c
+++ b/dlls/wininet/ftp.c
@@ -836,6 +836,16 @@ BOOL WINAPI FtpGetCurrentDirectoryA(HINT
  *    FALSE on failure
  *
  */
+static void AsyncFtpGetCurrentDirectoryProc(WORKREQUEST *workRequest)
+{
+    struct WORKREQ_FTPGETCURRENTDIRECTORYW const *req = &workRequest->u.FtpGetCurrentDirectoryW;
+    LPWININETFTPSESSIONW lpwfs = (LPWININETFTPSESSIONW) workRequest->hdr;
+
+    TRACE("%p\n", lpwfs);
+
+    FTP_FtpGetCurrentDirectoryW(lpwfs, req->lpszDirectory, req->lpdwDirectory);
+}
+
 BOOL WINAPI FtpGetCurrentDirectoryW(HINTERNET hFtpSession, LPWSTR lpszCurrentDirectory,
     LPDWORD lpdwCurrentDirectory)
 {
@@ -858,8 +868,9 @@ BOOL WINAPI FtpGetCurrentDirectoryW(HINT
         WORKREQUEST workRequest;
         struct WORKREQ_FTPGETCURRENTDIRECTORYW *req;

-        workRequest.asyncall =  FTPGETCURRENTDIRECTORYW;
-	workRequest.hdr = WININET_AddRef( &lpwfs->hdr );
+        workRequest.asyncall = CALLASYNCPROC;
+        workRequest.asyncproc = AsyncFtpGetCurrentDirectoryProc;
+        workRequest.hdr = WININET_AddRef( &lpwfs->hdr );
         req = &workRequest.u.FtpGetCurrentDirectoryW;
    req->lpszDirectory = lpszCurrentDirectory;
    req->lpdwDirectory = lpdwCurrentDirectory;
diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c
index ddacd7e..2a80eed 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 FTPGETCURRENTDIRECTORYW:
-        {
-        struct WORKREQ_FTPGETCURRENTDIRECTORYW *req;
-        LPWININETFTPSESSIONW lpwfs = (LPWININETFTPSESSIONW) workRequest.hdr;
-
-        TRACE("FTPGETCURRENTDIRECTORYW %p\n", lpwfs);
-
-        req = &workRequest.u.FtpGetCurrentDirectoryW;
-        FTP_FtpGetCurrentDirectoryW(lpwfs,
-		req->lpszDirectory, req->lpdwDirectory);
-        }
-	break;
-
     case FTPOPENFILEW:
         {
         struct WORKREQ_FTPOPENFILEW *req = &workRequest.u.FtpOpenFileW;
diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h
index d27dbe4..449930a 100644
--- a/dlls/wininet/internet.h
+++ b/dlls/wininet/internet.h
@@ -250,7 +250,6 @@ typedef struct
 typedef enum
 {
     CALLASYNCPROC,
-    FTPGETCURRENTDIRECTORYW,
     FTPOPENFILEW,
     FTPGETFILEW,
     FTPDELETEFILEW,