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

[Alexandre Julliard]

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

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Mon Dec 25 21:36:01 2006 +0100

wininet: Use proc instead of enum in FTPDELETEFILEW request.

---

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

diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c
index 31a0157..4b65fa7 100644
--- a/dlls/wininet/ftp.c
+++ b/dlls/wininet/ftp.c
@@ -1388,6 +1388,17 @@ BOOL WINAPI FtpDeleteFileA(HINTERNET hFt
  *    FALSE on failure
  *
  */
+static void AsyncFtpDeleteFileProc(WORKREQUEST *workRequest)
+{
+    struct WORKREQ_FTPDELETEFILEW const *req = &workRequest->u.FtpDeleteFileW;
+    LPWININETFTPSESSIONW lpwfs = (LPWININETFTPSESSIONW) workRequest->hdr;
+
+    TRACE("%p\n", lpwfs);
+
+    FTP_FtpDeleteFileW(lpwfs, req->lpszFilename);
+    HeapFree(GetProcessHeap(), 0, req->lpszFilename);
+}
+
 BOOL WINAPI FtpDeleteFileW(HINTERNET hFtpSession, LPCWSTR lpszFileName)
 {
     LPWININETFTPSESSIONW lpwfs;
@@ -1407,8 +1418,9 @@ BOOL WINAPI FtpDeleteFileW(HINTERNET hFt
         WORKREQUEST workRequest;
         struct WORKREQ_FTPDELETEFILEW *req;
 
-        workRequest.asyncall = FTPDELETEFILEW;
-	workRequest.hdr = WININET_AddRef( &lpwfs->hdr );
+        workRequest.asyncall = CALLASYNCPROC;
+        workRequest.asyncproc = AsyncFtpDeleteFileProc;
+        workRequest.hdr = WININET_AddRef( &lpwfs->hdr );
         req = &workRequest.u.FtpDeleteFileW;
         req->lpszFilename = WININET_strdupW(lpszFileName);
 
diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c
index 9e94676..6f9a1ce 100644
--- a/dlls/wininet/internet.c
+++ b/dlls/wininet/internet.c
@@ -3243,18 +3243,6 @@ static VOID INTERNET_ExecuteWork(void)
         workRequest.asyncproc(&workRequest);
         break;
 
-    case FTPDELETEFILEW:
-        {
-        struct WORKREQ_FTPDELETEFILEW *req = &workRequest.u.FtpDeleteFileW;
-        LPWININETFTPSESSIONW lpwfs = (LPWININETFTPSESSIONW) workRequest.hdr;
-
-        TRACE("FTPDELETEFILEW %p\n", lpwfs);
-
-        FTP_FtpDeleteFileW(lpwfs, req->lpszFilename);
-	HeapFree(GetProcessHeap(), 0, req->lpszFilename);
-        }
-	break;
-
     case FTPREMOVEDIRECTORYW:
         {
         struct WORKREQ_FTPREMOVEDIRECTORYW *req;
diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h
index 0938068..1d68a7c 100644
--- a/dlls/wininet/internet.h
+++ b/dlls/wininet/internet.h
@@ -250,7 +250,6 @@ typedef struct
 typedef enum
 {
     CALLASYNCPROC,
-    FTPDELETEFILEW,
     FTPREMOVEDIRECTORYW,
     FTPRENAMEFILEW,
     FTPFINDNEXTW,