December 2006 - Wine-commits

Jacek Caban : wininet: Use proc instead of enum in FTPFINDNEXTW request.
by Alexandre Julliard 26 Dec '06

26 Dec '06

Module: wine Branch: master Commit: f08ff892be06cbef33fa7f73bcadf2d6742c76b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f08ff892be06cbef33fa7f73b… Author: Jacek Caban <jacek(a)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

1 0

Jacek Caban : wininet: Get rid of ASYNC_FUNC enum.
by Alexandre Julliard 26 Dec '06

26 Dec '06

Module: wine Branch: master Commit: 49f5ee746c362e18b6fd1b88e021d0a61405995d URL: http://source.winehq.org/git/wine.git/?a=commit;h=49f5ee746c362e18b6fd1b88e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 25 21:37:00 2006 +0100 wininet: Get rid of ASYNC_FUNC enum. --- dlls/wininet/ftp.c | 10 ---------- dlls/wininet/http.c | 2 -- dlls/wininet/internet.c | 11 ++--------- dlls/wininet/internet.h | 6 ------ dlls/wininet/utility.c | 1 - 5 files changed, 2 insertions(+), 28 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 66b196d..e473b5b 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -214,7 +214,6 @@ BOOL WINAPI FtpPutFileW(HINTERNET hConne WORKREQUEST workRequest; struct WORKREQ_FTPPUTFILEW *req = &workRequest.u.FtpPutFileW; - workRequest.asyncall = CALLASYNCPROC; workRequest.asyncproc = AsyncFtpPutFileProc; workRequest.hdr = WININET_AddRef( &lpwfs->hdr ); req->lpszLocalFile = WININET_strdupW(lpszLocalFile); @@ -390,7 +389,6 @@ BOOL WINAPI FtpSetCurrentDirectoryW(HINT WORKREQUEST workRequest; struct WORKREQ_FTPSETCURRENTDIRECTORYW *req; - workRequest.asyncall = CALLASYNCPROC; workRequest.asyncproc = AsyncFtpSetCurrentDirectoryProc; workRequest.hdr = WININET_AddRef( &lpwfs->hdr ); req = &workRequest.u.FtpSetCurrentDirectoryW; @@ -529,7 +527,6 @@ BOOL WINAPI FtpCreateDirectoryW(HINTERNE WORKREQUEST workRequest; struct WORKREQ_FTPCREATEDIRECTORYW *req; - workRequest.asyncall = CALLASYNCPROC; workRequest.asyncproc = AsyncFtpCreateDirectoryProc; workRequest.hdr = WININET_AddRef( &lpwfs->hdr ); req = &workRequest.u.FtpCreateDirectoryW; @@ -675,7 +672,6 @@ HINTERNET WINAPI FtpFindFirstFileW(HINTE WORKREQUEST workRequest; struct WORKREQ_FTPFINDFIRSTFILEW *req; - workRequest.asyncall = CALLASYNCPROC; workRequest.asyncproc = AsyncFtpFindFirstFileProc; workRequest.hdr = WININET_AddRef( &lpwfs->hdr ); req = &workRequest.u.FtpFindFirstFileW; @@ -868,7 +864,6 @@ BOOL WINAPI FtpGetCurrentDirectoryW(HINT WORKREQUEST workRequest; struct WORKREQ_FTPGETCURRENTDIRECTORYW *req; - workRequest.asyncall = CALLASYNCPROC; workRequest.asyncproc = AsyncFtpGetCurrentDirectoryProc; workRequest.hdr = WININET_AddRef( &lpwfs->hdr ); req = &workRequest.u.FtpGetCurrentDirectoryW; @@ -1043,7 +1038,6 @@ HINTERNET WINAPI FtpOpenFileW(HINTERNET WORKREQUEST workRequest; struct WORKREQ_FTPOPENFILEW *req; - workRequest.asyncall = CALLASYNCPROC; workRequest.asyncproc = AsyncFtpOpenFileProc; workRequest.hdr = WININET_AddRef( &lpwfs->hdr ); req = &workRequest.u.FtpOpenFileW; @@ -1238,7 +1232,6 @@ BOOL WINAPI FtpGetFileW(HINTERNET hInter WORKREQUEST workRequest; struct WORKREQ_FTPGETFILEW *req; - workRequest.asyncall = CALLASYNCPROC; workRequest.asyncproc = AsyncFtpGetFileProc; workRequest.hdr = WININET_AddRef( &lpwfs->hdr ); req = &workRequest.u.FtpGetFileW; @@ -1418,7 +1411,6 @@ BOOL WINAPI FtpDeleteFileW(HINTERNET hFt WORKREQUEST workRequest; struct WORKREQ_FTPDELETEFILEW *req; - workRequest.asyncall = CALLASYNCPROC; workRequest.asyncproc = AsyncFtpDeleteFileProc; workRequest.hdr = WININET_AddRef( &lpwfs->hdr ); req = &workRequest.u.FtpDeleteFileW; @@ -1549,7 +1541,6 @@ BOOL WINAPI FtpRemoveDirectoryW(HINTERNE WORKREQUEST workRequest; struct WORKREQ_FTPREMOVEDIRECTORYW *req; - workRequest.asyncall = CALLASYNCPROC; workRequest.asyncproc = AsyncFtpRemoveDirectoryProc; workRequest.hdr = WININET_AddRef( &lpwfs->hdr ); req = &workRequest.u.FtpRemoveDirectoryW; @@ -1685,7 +1676,6 @@ BOOL WINAPI FtpRenameFileW(HINTERNET hFt WORKREQUEST workRequest; struct WORKREQ_FTPRENAMEFILEW *req; - workRequest.asyncall = CALLASYNCPROC; workRequest.asyncproc = AsyncFtpRenameFileProc; workRequest.hdr = WININET_AddRef( &lpwfs->hdr ); req = &workRequest.u.FtpRenameFileW; diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index ff66390..813d99e 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1792,7 +1792,6 @@ BOOL WINAPI HttpSendRequestExW(HINTERNET WORKREQUEST workRequest; struct WORKREQ_HTTPSENDREQUESTW *req; - workRequest.asyncall = CALLASYNCPROC; workRequest.asyncproc = AsyncHttpSendRequestProc; workRequest.hdr = WININET_AddRef( &lpwhr->hdr ); req = &workRequest.u.HttpSendRequestW; @@ -1888,7 +1887,6 @@ BOOL WINAPI HttpSendRequestW(HINTERNET h WORKREQUEST workRequest; struct WORKREQ_HTTPSENDREQUESTW *req; - workRequest.asyncall = CALLASYNCPROC; workRequest.asyncproc = AsyncHttpSendRequestProc; workRequest.hdr = WININET_AddRef( &lpwhr->hdr ); req = &workRequest.u.HttpSendRequestW; diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index ceee5d6..6a155c5 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -947,7 +947,6 @@ BOOL WINAPI InternetFindNextFileW(HINTER WORKREQUEST workRequest; struct WORKREQ_FTPFINDNEXTW *req; - workRequest.asyncall = CALLASYNCPROC; workRequest.asyncproc = AsyncFtpFindNextFileProc; workRequest.hdr = WININET_AddRef( &lpwh->hdr ); req = &workRequest.u.FtpFindNextW; @@ -1866,7 +1865,6 @@ BOOL WINAPI InternetReadFileExA(HINTERNE WORKREQUEST workRequest; struct WORKREQ_INTERNETREADFILEEXA *req; - workRequest.asyncall = CALLASYNCPROC; workRequest.asyncproc = AsyncInternetReadFileExProc; workRequest.hdr = WININET_AddRef( lpwh ); req = &workRequest.u.InternetReadFileExA; @@ -2940,7 +2938,6 @@ HINTERNET WINAPI InternetOpenUrlW(HINTER WORKREQUEST workRequest; struct WORKREQ_INTERNETOPENURLW *req; - workRequest.asyncall = CALLASYNCPROC; workRequest.asyncproc = AsyncInternetOpenUrlProc; workRequest.hdr = WININET_AddRef( &hIC->hdr ); req = &workRequest.u.InternetOpenUrlW; @@ -3248,12 +3245,8 @@ static VOID INTERNET_ExecuteWork(void) if (!INTERNET_GetWorkRequest(&workRequest)) return; - switch (workRequest.asyncall) - { - case CALLASYNCPROC: - workRequest.asyncproc(&workRequest); - break; - } + workRequest.asyncproc(&workRequest); + WININET_Release( workRequest.hdr ); } diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 9f689a0..4015ee0 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -247,11 +247,6 @@ typedef struct LPFILEPROPERTIESW lpafp; } WININETFTPFINDNEXTW, *LPWININETFTPFINDNEXTW; -typedef enum -{ - CALLASYNCPROC, -} ASYNC_FUNC; - struct WORKREQ_FTPPUTFILEW { LPWSTR lpszLocalFile; @@ -358,7 +353,6 @@ struct WORKREQ_INTERNETREADFILEEXA typedef struct WORKREQ { - ASYNC_FUNC asyncall; void (*asyncproc)(struct WORKREQ*); WININETHANDLEHEADER *hdr; diff --git a/dlls/wininet/utility.c b/dlls/wininet/utility.c index 0269365..baf04a6 100644 --- a/dlls/wininet/utility.c +++ b/dlls/wininet/utility.c @@ -293,7 +293,6 @@ VOID SendAsyncCallback(LPWININETHANDLEHE memcpy(lpvStatusInfo_copy, lpvStatusInfo, dwStatusInfoLength); } - workRequest.asyncall = CALLASYNCPROC; workRequest.asyncproc = SendAsyncCallbackProc; workRequest.hdr = WININET_AddRef( hdr ); req = &workRequest.u.SendCallback;

1 0

Jacek Caban : wininet: Use proc instead of enum in FTPREMOVEDIRECTORYW request.
by Alexandre Julliard 26 Dec '06

26 Dec '06

Module: wine Branch: master Commit: 97157ccee068d0f28f9b947b04b688e8b71747d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97157ccee068d0f28f9b947b0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 25 21:36:15 2006 +0100 wininet: Use proc instead of enum in FTPREMOVEDIRECTORYW request. --- dlls/wininet/ftp.c | 16 ++++++++++++++-- dlls/wininet/internet.c | 13 ------------- dlls/wininet/internet.h | 1 - 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 4b65fa7..24e3084 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1519,6 +1519,17 @@ BOOL WINAPI FtpRemoveDirectoryA(HINTERNE * FALSE on failure * */ +static void AsyncFtpRemoveDirectoryProc(WORKREQUEST *workRequest) +{ + struct WORKREQ_FTPREMOVEDIRECTORYW const *req = &workRequest->u.FtpRemoveDirectoryW; + LPWININETFTPSESSIONW lpwfs = (LPWININETFTPSESSIONW) workRequest->hdr; + + TRACE("%p\n", lpwfs); + + FTP_FtpRemoveDirectoryW(lpwfs, req->lpszDirectory); + HeapFree(GetProcessHeap(), 0, req->lpszDirectory); +} + BOOL WINAPI FtpRemoveDirectoryW(HINTERNET hFtpSession, LPCWSTR lpszDirectory) { LPWININETFTPSESSIONW lpwfs; @@ -1538,8 +1549,9 @@ BOOL WINAPI FtpRemoveDirectoryW(HINTERNE WORKREQUEST workRequest; struct WORKREQ_FTPREMOVEDIRECTORYW *req; - workRequest.asyncall = FTPREMOVEDIRECTORYW; - workRequest.hdr = WININET_AddRef( &lpwfs->hdr ); + workRequest.asyncall = CALLASYNCPROC; + workRequest.asyncproc = AsyncFtpRemoveDirectoryProc; + workRequest.hdr = WININET_AddRef( &lpwfs->hdr ); req = &workRequest.u.FtpRemoveDirectoryW; req->lpszDirectory = WININET_strdupW(lpszDirectory); diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 6f9a1ce..fd5513a 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 FTPREMOVEDIRECTORYW: - { - struct WORKREQ_FTPREMOVEDIRECTORYW *req; - LPWININETFTPSESSIONW lpwfs = (LPWININETFTPSESSIONW) workRequest.hdr; - - TRACE("FTPREMOVEDIRECTORYW %p\n", lpwfs); - - req = &workRequest.u.FtpRemoveDirectoryW; - FTP_FtpRemoveDirectoryW(lpwfs, req->lpszDirectory); - HeapFree(GetProcessHeap(), 0, req->lpszDirectory); - } - break; - case FTPRENAMEFILEW: { struct WORKREQ_FTPRENAMEFILEW *req = &workRequest.u.FtpRenameFileW; diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 1d68a7c..b9f7161 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -250,7 +250,6 @@ typedef struct typedef enum { CALLASYNCPROC, - FTPREMOVEDIRECTORYW, FTPRENAMEFILEW, FTPFINDNEXTW, } ASYNC_FUNC;

1 0

Jacek Caban : wininet: Use proc instead of enum in FTPDELETEFILEW request.
by Alexandre Julliard 26 Dec '06

26 Dec '06

Module: wine Branch: master Commit: ee99b3f0c5b51ffbe017ace89be9f101d31fd0b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee99b3f0c5b51ffbe017ace89… Author: Jacek Caban <jacek(a)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,

1 0

Jacek Caban : wininet: Use proc instead of enum in FTPOPENFILEW request.
by Alexandre Julliard 26 Dec '06

26 Dec '06

Module: wine Branch: master Commit: 3c90016f2f362e2d368f7dafba2baabfe01bf9e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c90016f2f362e2d368f7dafb… Author: Jacek Caban <jacek(a)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,

1 0

Jacek Caban : wininet: Use proc instead of enum in FTPGETFILEW request.
by Alexandre Julliard 26 Dec '06

26 Dec '06

Module: wine Branch: master Commit: 054108368e1191f44a35eddd6ea0f80454ef9e65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=054108368e1191f44a35eddd6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 25 21:35:46 2006 +0100 wininet: Use proc instead of enum in FTPGETFILEW request. --- dlls/wininet/ftp.c | 19 +++++++++++++++++-- dlls/wininet/internet.c | 15 --------------- dlls/wininet/internet.h | 1 - 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 2b4093b..31a0157 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1198,6 +1198,20 @@ BOOL WINAPI FtpGetFileA(HINTERNET hInter * FALSE on failure * */ +static void AsyncFtpGetFileProc(WORKREQUEST *workRequest) +{ + struct WORKREQ_FTPGETFILEW const *req = &workRequest->u.FtpGetFileW; + LPWININETFTPSESSIONW lpwfs = (LPWININETFTPSESSIONW) workRequest->hdr; + + TRACE("%p\n", lpwfs); + + FTP_FtpGetFileW(lpwfs, req->lpszRemoteFile, + req->lpszNewFile, req->fFailIfExists, + req->dwLocalFlagsAttribute, req->dwFlags, req->dwContext); + HeapFree(GetProcessHeap(), 0, req->lpszRemoteFile); + HeapFree(GetProcessHeap(), 0, req->lpszNewFile); +} + BOOL WINAPI FtpGetFileW(HINTERNET hInternet, LPCWSTR lpszRemoteFile, LPCWSTR lpszNewFile, BOOL fFailIfExists, DWORD dwLocalFlagsAttribute, DWORD dwInternetFlags, DWORD dwContext) @@ -1224,8 +1238,9 @@ BOOL WINAPI FtpGetFileW(HINTERNET hInter WORKREQUEST workRequest; struct WORKREQ_FTPGETFILEW *req; - workRequest.asyncall = FTPGETFILEW; - workRequest.hdr = WININET_AddRef( &lpwfs->hdr ); + workRequest.asyncall = CALLASYNCPROC; + workRequest.asyncproc = AsyncFtpGetFileProc; + workRequest.hdr = WININET_AddRef( &lpwfs->hdr ); req = &workRequest.u.FtpGetFileW; req->lpszRemoteFile = WININET_strdupW(lpszRemoteFile); req->lpszNewFile = WININET_strdupW(lpszNewFile); diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index e98544c..9e94676 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3243,21 +3243,6 @@ static VOID INTERNET_ExecuteWork(void) workRequest.asyncproc(&workRequest); break; - case FTPGETFILEW: - { - struct WORKREQ_FTPGETFILEW *req = &workRequest.u.FtpGetFileW; - LPWININETFTPSESSIONW lpwfs = (LPWININETFTPSESSIONW) workRequest.hdr; - - TRACE("FTPGETFILEW %p\n", lpwfs); - - FTP_FtpGetFileW(lpwfs, req->lpszRemoteFile, - req->lpszNewFile, req->fFailIfExists, - req->dwLocalFlagsAttribute, req->dwFlags, req->dwContext); - HeapFree(GetProcessHeap(), 0, req->lpszRemoteFile); - HeapFree(GetProcessHeap(), 0, req->lpszNewFile); - } - break; - case FTPDELETEFILEW: { struct WORKREQ_FTPDELETEFILEW *req = &workRequest.u.FtpDeleteFileW; diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index cf02e92..0938068 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -250,7 +250,6 @@ typedef struct typedef enum { CALLASYNCPROC, - FTPGETFILEW, FTPDELETEFILEW, FTPREMOVEDIRECTORYW, FTPRENAMEFILEW,

1 0

Jacek Caban : wininet: Use proc instead of enum in FTPGETCURRENTDIRECTORYW request.
by Alexandre Julliard 26 Dec '06

26 Dec '06

Module: wine Branch: master Commit: 3b77ff24c2f72cd5b27f4c4452eb083b96f6f919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b77ff24c2f72cd5b27f4c445… Author: Jacek Caban <jacek(a)codeweavers.com> 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,

1 0

Jacek Caban : wininet: Use proc instead of enum in FTPFINDFIRSTFILEW request.
by Alexandre Julliard 26 Dec '06

26 Dec '06

Module: wine Branch: master Commit: 0d464ba8db986f50b5a6ba771853817470924090 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d464ba8db986f50b5a6ba771… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 25 21:35:11 2006 +0100 wininet: Use proc instead of enum in FTPFINDFIRSTFILEW request. --- dlls/wininet/ftp.c | 17 +++++++++++++++-- dlls/wininet/internet.c | 14 -------------- dlls/wininet/internet.h | 1 - 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index e69256a..85aef92 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -643,6 +643,18 @@ HINTERNET WINAPI FtpFindFirstFileA(HINTE * NULL on failure * */ +static void AsyncFtpFindFirstFileProc(WORKREQUEST *workRequest) +{ + struct WORKREQ_FTPFINDFIRSTFILEW const *req = &workRequest->u.FtpFindFirstFileW; + LPWININETFTPSESSIONW lpwfs = (LPWININETFTPSESSIONW) workRequest->hdr; + + TRACE("%p\n", lpwfs); + + FTP_FtpFindFirstFileW(lpwfs, req->lpszSearchFile, + req->lpFindFileData, req->dwFlags, req->dwContext); + HeapFree(GetProcessHeap(), 0, req->lpszSearchFile); +} + HINTERNET WINAPI FtpFindFirstFileW(HINTERNET hConnect, LPCWSTR lpszSearchFile, LPWIN32_FIND_DATAW lpFindFileData, DWORD dwFlags, DWORD dwContext) { @@ -663,8 +675,9 @@ HINTERNET WINAPI FtpFindFirstFileW(HINTE WORKREQUEST workRequest; struct WORKREQ_FTPFINDFIRSTFILEW *req; - workRequest.asyncall = FTPFINDFIRSTFILEW; - workRequest.hdr = WININET_AddRef( &lpwfs->hdr ); + workRequest.asyncall = CALLASYNCPROC; + workRequest.asyncproc = AsyncFtpFindFirstFileProc; + workRequest.hdr = WININET_AddRef( &lpwfs->hdr ); req = &workRequest.u.FtpFindFirstFileW; req->lpszSearchFile = (lpszSearchFile == NULL) ? NULL : WININET_strdupW(lpszSearchFile); req->lpFindFileData = lpFindFileData; diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 0ff59e3..ddacd7e 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3243,20 +3243,6 @@ static VOID INTERNET_ExecuteWork(void) workRequest.asyncproc(&workRequest); break; - case FTPFINDFIRSTFILEW: - { - struct WORKREQ_FTPFINDFIRSTFILEW *req; - LPWININETFTPSESSIONW lpwfs = (LPWININETFTPSESSIONW) workRequest.hdr; - - TRACE("FTPFINDFIRSTFILEW %p\n", lpwfs); - - req = &workRequest.u.FtpFindFirstFileW; - FTP_FtpFindFirstFileW(lpwfs, req->lpszSearchFile, - req->lpFindFileData, req->dwFlags, req->dwContext); - HeapFree(GetProcessHeap(), 0, req->lpszSearchFile); - } - break; - case FTPGETCURRENTDIRECTORYW: { struct WORKREQ_FTPGETCURRENTDIRECTORYW *req; diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 85373b0..d27dbe4 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -250,7 +250,6 @@ typedef struct typedef enum { CALLASYNCPROC, - FTPFINDFIRSTFILEW, FTPGETCURRENTDIRECTORYW, FTPOPENFILEW, FTPGETFILEW,

1 0

Jacek Caban : wininet: Use proc instead of enum in FTPSETCURRENTDIRECTORY request.
by Alexandre Julliard 26 Dec '06

26 Dec '06

Module: wine Branch: master Commit: f28b0e3b1068aff3178d85c2de91280883ee13b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f28b0e3b1068aff3178d85c2d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 25 21:34:53 2006 +0100 wininet: Use proc instead of enum in FTPSETCURRENTDIRECTORY request. --- dlls/wininet/ftp.c | 16 ++++++++++++++-- dlls/wininet/internet.c | 13 ------------- dlls/wininet/internet.h | 1 - 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 5c97758..92dba6f 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -352,6 +352,17 @@ BOOL WINAPI FtpSetCurrentDirectoryA(HINT * FALSE on failure * */ +static void AsyncFtpSetCurrentDirectoryProc(WORKREQUEST *workRequest) +{ + struct WORKREQ_FTPSETCURRENTDIRECTORYW const *req = &workRequest->u.FtpSetCurrentDirectoryW; + LPWININETFTPSESSIONW lpwfs = (LPWININETFTPSESSIONW) workRequest->hdr; + + TRACE("%p\n", lpwfs); + + FTP_FtpSetCurrentDirectoryW(lpwfs, req->lpszDirectory); + HeapFree(GetProcessHeap(), 0, req->lpszDirectory); +} + BOOL WINAPI FtpSetCurrentDirectoryW(HINTERNET hConnect, LPCWSTR lpszDirectory) { LPWININETFTPSESSIONW lpwfs = NULL; @@ -379,8 +390,9 @@ BOOL WINAPI FtpSetCurrentDirectoryW(HINT WORKREQUEST workRequest; struct WORKREQ_FTPSETCURRENTDIRECTORYW *req; - workRequest.asyncall = FTPSETCURRENTDIRECTORYW; - workRequest.hdr = WININET_AddRef( &lpwfs->hdr ); + workRequest.asyncall = CALLASYNCPROC; + workRequest.asyncproc = AsyncFtpSetCurrentDirectoryProc; + workRequest.hdr = WININET_AddRef( &lpwfs->hdr ); req = &workRequest.u.FtpSetCurrentDirectoryW; req->lpszDirectory = WININET_strdupW(lpszDirectory); diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index eb45c95..0e57aef 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 FTPSETCURRENTDIRECTORYW: - { - struct WORKREQ_FTPSETCURRENTDIRECTORYW *req; - LPWININETFTPSESSIONW lpwfs = (LPWININETFTPSESSIONW) workRequest.hdr; - - TRACE("FTPSETCURRENTDIRECTORYW %p\n", lpwfs); - - req = &workRequest.u.FtpSetCurrentDirectoryW; - FTP_FtpSetCurrentDirectoryW(lpwfs, req->lpszDirectory); - HeapFree(GetProcessHeap(), 0, req->lpszDirectory); - } - break; - case FTPCREATEDIRECTORYW: { struct WORKREQ_FTPCREATEDIRECTORYW *req; diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 3e0a034..1a7b2b6 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -250,7 +250,6 @@ typedef struct typedef enum { CALLASYNCPROC, - FTPSETCURRENTDIRECTORYW, FTPCREATEDIRECTORYW, FTPFINDFIRSTFILEW, FTPGETCURRENTDIRECTORYW,

1 0

Jacek Caban : wininet: Use proc instead of enum in FTPCREATEDIRECTORY request.
by Alexandre Julliard 26 Dec '06

26 Dec '06

Module: wine Branch: master Commit: c4aa47badd7417f863d6114da1ffe4b333c3cb85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4aa47badd7417f863d6114da… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 25 21:35:03 2006 +0100 wininet: Use proc instead of enum in FTPCREATEDIRECTORY request. --- dlls/wininet/ftp.c | 16 ++++++++++++++-- dlls/wininet/internet.c | 13 ------------- dlls/wininet/internet.h | 1 - 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 92dba6f..e69256a 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -499,6 +499,17 @@ BOOL WINAPI FtpCreateDirectoryA(HINTERNE * FALSE on failure * */ +static void AsyncFtpCreateDirectoryProc(WORKREQUEST *workRequest) +{ + struct WORKREQ_FTPCREATEDIRECTORYW const *req = &workRequest->u.FtpCreateDirectoryW; + LPWININETFTPSESSIONW lpwfs = (LPWININETFTPSESSIONW) workRequest->hdr; + + TRACE(" %p\n", lpwfs); + + FTP_FtpCreateDirectoryW(lpwfs, req->lpszDirectory); + HeapFree(GetProcessHeap(), 0, req->lpszDirectory); +} + BOOL WINAPI FtpCreateDirectoryW(HINTERNET hConnect, LPCWSTR lpszDirectory) { LPWININETFTPSESSIONW lpwfs; @@ -518,8 +529,9 @@ BOOL WINAPI FtpCreateDirectoryW(HINTERNE WORKREQUEST workRequest; struct WORKREQ_FTPCREATEDIRECTORYW *req; - workRequest.asyncall = FTPCREATEDIRECTORYW; - workRequest.hdr = WININET_AddRef( &lpwfs->hdr ); + workRequest.asyncall = CALLASYNCPROC; + workRequest.asyncproc = AsyncFtpCreateDirectoryProc; + workRequest.hdr = WININET_AddRef( &lpwfs->hdr ); req = &workRequest.u.FtpCreateDirectoryW; req->lpszDirectory = WININET_strdupW(lpszDirectory); diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 0e57aef..0ff59e3 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 FTPCREATEDIRECTORYW: - { - struct WORKREQ_FTPCREATEDIRECTORYW *req; - LPWININETFTPSESSIONW lpwfs = (LPWININETFTPSESSIONW) workRequest.hdr; - - TRACE("FTPCREATEDIRECTORYW %p\n", lpwfs); - - req = &workRequest.u.FtpCreateDirectoryW; - FTP_FtpCreateDirectoryW(lpwfs, req->lpszDirectory); - HeapFree(GetProcessHeap(), 0, req->lpszDirectory); - } - break; - case FTPFINDFIRSTFILEW: { struct WORKREQ_FTPFINDFIRSTFILEW *req; diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 1a7b2b6..85373b0 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -250,7 +250,6 @@ typedef struct typedef enum { CALLASYNCPROC, - FTPCREATEDIRECTORYW, FTPFINDFIRSTFILEW, FTPGETCURRENTDIRECTORYW, FTPOPENFILEW,

1 0