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

[Alexandre Julliard]

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

Author: Jacek Caban 
Date:   Mon Dec 25 21:36:30 2006 +0100

wininet: Use proc instead of enum in FTPRENAMEFILEW 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 24e3084..66b196d 100644
--- a/dlls/wininet/ftp.c
+++ b/dlls/wininet/ftp.c
@@ -1654,6 +1654,18 @@ BOOL WINAPI FtpRenameFileA(HINTERNET hFt
  *    FALSE on failure
  *
  */
+static void AsyncFtpRenameFileProc(WORKREQUEST *workRequest)
+{
+    struct WORKREQ_FTPRENAMEFILEW const *req = &workRequest->u.FtpRenameFileW;
+    LPWININETFTPSESSIONW lpwfs = (LPWININETFTPSESSIONW) workRequest->hdr;
+
+    TRACE("%p\n", lpwfs);
+
+    FTP_FtpRenameFileW(lpwfs, req->lpszSrcFile, req->lpszDestFile);
+    HeapFree(GetProcessHeap(), 0, req->lpszSrcFile);
+    HeapFree(GetProcessHeap(), 0, req->lpszDestFile);
+}
+
 BOOL WINAPI FtpRenameFileW(HINTERNET hFtpSession, LPCWSTR lpszSrc, LPCWSTR lpszDest)
 {
     LPWININETFTPSESSIONW lpwfs;
@@ -1673,8 +1685,9 @@ BOOL WINAPI FtpRenameFileW(HINTERNET hFt
         WORKREQUEST workRequest;
         struct WORKREQ_FTPRENAMEFILEW *req;

-        workRequest.asyncall = FTPRENAMEFILEW;
-	workRequest.hdr = WININET_AddRef( &lpwfs->hdr );
+        workRequest.asyncall = CALLASYNCPROC;
+        workRequest.asyncproc = AsyncFtpRenameFileProc;
+        workRequest.hdr = WININET_AddRef( &lpwfs->hdr );
         req = &workRequest.u.FtpRenameFileW;
         req->lpszSrcFile = WININET_strdupW(lpszSrc);
         req->lpszDestFile = WININET_strdupW(lpszDest);
diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c
index fd5513a..5e7ebf0 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 FTPRENAMEFILEW:
-        {
-        struct WORKREQ_FTPRENAMEFILEW *req = &workRequest.u.FtpRenameFileW;
-        LPWININETFTPSESSIONW lpwfs = (LPWININETFTPSESSIONW) workRequest.hdr;
-
-        TRACE("FTPRENAMEFILEW %p\n", lpwfs);
-
-        FTP_FtpRenameFileW(lpwfs, req->lpszSrcFile, req->lpszDestFile);
-	HeapFree(GetProcessHeap(), 0, req->lpszSrcFile);
-	HeapFree(GetProcessHeap(), 0, req->lpszDestFile);
-        }
-	break;
-
     case FTPFINDNEXTW:
         {
         struct WORKREQ_FTPFINDNEXTW *req;
diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h
index b9f7161..4a95d72 100644
--- a/dlls/wininet/internet.h
+++ b/dlls/wininet/internet.h
@@ -250,7 +250,6 @@ typedef struct
 typedef enum
 {
     CALLASYNCPROC,
-    FTPRENAMEFILEW,
     FTPFINDNEXTW,
 } ASYNC_FUNC;