Skip to content

W
wine-cw
Commit 49f5ee74 authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard
Browse files
Options

wininet: Get rid of ASYNC_FUNC enum.

parent f08ff892
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 28 deletions
dlls/wininet/ftp.c
View file @ 49f5ee74
...@@ -214,7 +214,6 @@ BOOL WINAPI FtpPutFileW(HINTERNET hConnect, LPCWSTR lpszLocalFile, ...@@ -214,7 +214,6 @@ BOOL WINAPI FtpPutFileW(HINTERNET hConnect, LPCWSTR lpszLocalFile,
WORKREQUEST workRequest; WORKREQUEST workRequest;
struct WORKREQ_FTPPUTFILEW *req = &workRequest.u.FtpPutFileW; struct WORKREQ_FTPPUTFILEW *req = &workRequest.u.FtpPutFileW;
workRequest.asyncall = CALLASYNCPROC;
workRequest.asyncproc = AsyncFtpPutFileProc; workRequest.asyncproc = AsyncFtpPutFileProc;
workRequest.hdr = WININET_AddRef( &lpwfs->hdr ); workRequest.hdr = WININET_AddRef( &lpwfs->hdr );
req->lpszLocalFile = WININET_strdupW(lpszLocalFile); req->lpszLocalFile = WININET_strdupW(lpszLocalFile);
...@@ -390,7 +389,6 @@ BOOL WINAPI FtpSetCurrentDirectoryW(HINTERNET hConnect, LPCWSTR lpszDirectory) ...@@ -390,7 +389,6 @@ BOOL WINAPI FtpSetCurrentDirectoryW(HINTERNET hConnect, LPCWSTR lpszDirectory)
WORKREQUEST workRequest; WORKREQUEST workRequest;
struct WORKREQ_FTPSETCURRENTDIRECTORYW *req; struct WORKREQ_FTPSETCURRENTDIRECTORYW *req;
workRequest.asyncall = CALLASYNCPROC;
workRequest.asyncproc = AsyncFtpSetCurrentDirectoryProc; workRequest.asyncproc = AsyncFtpSetCurrentDirectoryProc;
workRequest.hdr = WININET_AddRef( &lpwfs->hdr ); workRequest.hdr = WININET_AddRef( &lpwfs->hdr );
req = &workRequest.u.FtpSetCurrentDirectoryW; req = &workRequest.u.FtpSetCurrentDirectoryW;
...@@ -529,7 +527,6 @@ BOOL WINAPI FtpCreateDirectoryW(HINTERNET hConnect, LPCWSTR lpszDirectory) ...@@ -529,7 +527,6 @@ BOOL WINAPI FtpCreateDirectoryW(HINTERNET hConnect, LPCWSTR lpszDirectory)
WORKREQUEST workRequest; WORKREQUEST workRequest;
struct WORKREQ_FTPCREATEDIRECTORYW *req; struct WORKREQ_FTPCREATEDIRECTORYW *req;
workRequest.asyncall = CALLASYNCPROC;
workRequest.asyncproc = AsyncFtpCreateDirectoryProc; workRequest.asyncproc = AsyncFtpCreateDirectoryProc;
workRequest.hdr = WININET_AddRef( &lpwfs->hdr ); workRequest.hdr = WININET_AddRef( &lpwfs->hdr );
req = &workRequest.u.FtpCreateDirectoryW; req = &workRequest.u.FtpCreateDirectoryW;
...@@ -675,7 +672,6 @@ HINTERNET WINAPI FtpFindFirstFileW(HINTERNET hConnect, ...@@ -675,7 +672,6 @@ HINTERNET WINAPI FtpFindFirstFileW(HINTERNET hConnect,
WORKREQUEST workRequest; WORKREQUEST workRequest;
struct WORKREQ_FTPFINDFIRSTFILEW *req; struct WORKREQ_FTPFINDFIRSTFILEW *req;
workRequest.asyncall = CALLASYNCPROC;
workRequest.asyncproc = AsyncFtpFindFirstFileProc; workRequest.asyncproc = AsyncFtpFindFirstFileProc;
workRequest.hdr = WININET_AddRef( &lpwfs->hdr ); workRequest.hdr = WININET_AddRef( &lpwfs->hdr );
req = &workRequest.u.FtpFindFirstFileW; req = &workRequest.u.FtpFindFirstFileW;
...@@ -868,7 +864,6 @@ BOOL WINAPI FtpGetCurrentDirectoryW(HINTERNET hFtpSession, LPWSTR lpszCurrentDir ...@@ -868,7 +864,6 @@ BOOL WINAPI FtpGetCurrentDirectoryW(HINTERNET hFtpSession, LPWSTR lpszCurrentDir
WORKREQUEST workRequest; WORKREQUEST workRequest;
struct WORKREQ_FTPGETCURRENTDIRECTORYW *req; struct WORKREQ_FTPGETCURRENTDIRECTORYW *req;
workRequest.asyncall = CALLASYNCPROC;
workRequest.asyncproc = AsyncFtpGetCurrentDirectoryProc; workRequest.asyncproc = AsyncFtpGetCurrentDirectoryProc;
workRequest.hdr = WININET_AddRef( &lpwfs->hdr ); workRequest.hdr = WININET_AddRef( &lpwfs->hdr );
req = &workRequest.u.FtpGetCurrentDirectoryW; req = &workRequest.u.FtpGetCurrentDirectoryW;
...@@ -1043,7 +1038,6 @@ HINTERNET WINAPI FtpOpenFileW(HINTERNET hFtpSession, ...@@ -1043,7 +1038,6 @@ HINTERNET WINAPI FtpOpenFileW(HINTERNET hFtpSession,
WORKREQUEST workRequest; WORKREQUEST workRequest;
struct WORKREQ_FTPOPENFILEW *req; struct WORKREQ_FTPOPENFILEW *req;
workRequest.asyncall = CALLASYNCPROC;
workRequest.asyncproc = AsyncFtpOpenFileProc; workRequest.asyncproc = AsyncFtpOpenFileProc;
workRequest.hdr = WININET_AddRef( &lpwfs->hdr ); workRequest.hdr = WININET_AddRef( &lpwfs->hdr );
req = &workRequest.u.FtpOpenFileW; req = &workRequest.u.FtpOpenFileW;
...@@ -1238,7 +1232,6 @@ BOOL WINAPI FtpGetFileW(HINTERNET hInternet, LPCWSTR lpszRemoteFile, LPCWSTR lps ...@@ -1238,7 +1232,6 @@ BOOL WINAPI FtpGetFileW(HINTERNET hInternet, LPCWSTR lpszRemoteFile, LPCWSTR lps
WORKREQUEST workRequest; WORKREQUEST workRequest;
struct WORKREQ_FTPGETFILEW *req; struct WORKREQ_FTPGETFILEW *req;
workRequest.asyncall = CALLASYNCPROC;
workRequest.asyncproc = AsyncFtpGetFileProc; workRequest.asyncproc = AsyncFtpGetFileProc;
workRequest.hdr = WININET_AddRef( &lpwfs->hdr ); workRequest.hdr = WININET_AddRef( &lpwfs->hdr );
req = &workRequest.u.FtpGetFileW; req = &workRequest.u.FtpGetFileW;
...@@ -1418,7 +1411,6 @@ BOOL WINAPI FtpDeleteFileW(HINTERNET hFtpSession, LPCWSTR lpszFileName) ...@@ -1418,7 +1411,6 @@ BOOL WINAPI FtpDeleteFileW(HINTERNET hFtpSession, LPCWSTR lpszFileName)
WORKREQUEST workRequest; WORKREQUEST workRequest;
struct WORKREQ_FTPDELETEFILEW *req; struct WORKREQ_FTPDELETEFILEW *req;
workRequest.asyncall = CALLASYNCPROC;
workRequest.asyncproc = AsyncFtpDeleteFileProc; workRequest.asyncproc = AsyncFtpDeleteFileProc;
workRequest.hdr = WININET_AddRef( &lpwfs->hdr ); workRequest.hdr = WININET_AddRef( &lpwfs->hdr );
req = &workRequest.u.FtpDeleteFileW; req = &workRequest.u.FtpDeleteFileW;
...@@ -1549,7 +1541,6 @@ BOOL WINAPI FtpRemoveDirectoryW(HINTERNET hFtpSession, LPCWSTR lpszDirectory) ...@@ -1549,7 +1541,6 @@ BOOL WINAPI FtpRemoveDirectoryW(HINTERNET hFtpSession, LPCWSTR lpszDirectory)
WORKREQUEST workRequest; WORKREQUEST workRequest;
struct WORKREQ_FTPREMOVEDIRECTORYW *req; struct WORKREQ_FTPREMOVEDIRECTORYW *req;
workRequest.asyncall = CALLASYNCPROC;
workRequest.asyncproc = AsyncFtpRemoveDirectoryProc; workRequest.asyncproc = AsyncFtpRemoveDirectoryProc;
workRequest.hdr = WININET_AddRef( &lpwfs->hdr ); workRequest.hdr = WININET_AddRef( &lpwfs->hdr );
req = &workRequest.u.FtpRemoveDirectoryW; req = &workRequest.u.FtpRemoveDirectoryW;
...@@ -1685,7 +1676,6 @@ BOOL WINAPI FtpRenameFileW(HINTERNET hFtpSession, LPCWSTR lpszSrc, LPCWSTR lpszD ...@@ -1685,7 +1676,6 @@ BOOL WINAPI FtpRenameFileW(HINTERNET hFtpSession, LPCWSTR lpszSrc, LPCWSTR lpszD
WORKREQUEST workRequest; WORKREQUEST workRequest;
struct WORKREQ_FTPRENAMEFILEW *req; struct WORKREQ_FTPRENAMEFILEW *req;
workRequest.asyncall = CALLASYNCPROC;
workRequest.asyncproc = AsyncFtpRenameFileProc; workRequest.asyncproc = AsyncFtpRenameFileProc;
workRequest.hdr = WININET_AddRef( &lpwfs->hdr ); workRequest.hdr = WININET_AddRef( &lpwfs->hdr );
req = &workRequest.u.FtpRenameFileW; req = &workRequest.u.FtpRenameFileW;
......
dlls/wininet/http.c
View file @ 49f5ee74
...@@ -1792,7 +1792,6 @@ BOOL WINAPI HttpSendRequestExW(HINTERNET hRequest, ...@@ -1792,7 +1792,6 @@ BOOL WINAPI HttpSendRequestExW(HINTERNET hRequest,
WORKREQUEST workRequest; WORKREQUEST workRequest;
struct WORKREQ_HTTPSENDREQUESTW *req; struct WORKREQ_HTTPSENDREQUESTW *req;
workRequest.asyncall = CALLASYNCPROC;
workRequest.asyncproc = AsyncHttpSendRequestProc; workRequest.asyncproc = AsyncHttpSendRequestProc;
workRequest.hdr = WININET_AddRef( &lpwhr->hdr ); workRequest.hdr = WININET_AddRef( &lpwhr->hdr );
req = &workRequest.u.HttpSendRequestW; req = &workRequest.u.HttpSendRequestW;
...@@ -1888,7 +1887,6 @@ BOOL WINAPI HttpSendRequestW(HINTERNET hHttpRequest, LPCWSTR lpszHeaders, ...@@ -1888,7 +1887,6 @@ BOOL WINAPI HttpSendRequestW(HINTERNET hHttpRequest, LPCWSTR lpszHeaders,
WORKREQUEST workRequest; WORKREQUEST workRequest;
struct WORKREQ_HTTPSENDREQUESTW *req; struct WORKREQ_HTTPSENDREQUESTW *req;
workRequest.asyncall = CALLASYNCPROC;
workRequest.asyncproc = AsyncHttpSendRequestProc; workRequest.asyncproc = AsyncHttpSendRequestProc;
workRequest.hdr = WININET_AddRef( &lpwhr->hdr ); workRequest.hdr = WININET_AddRef( &lpwhr->hdr );
req = &workRequest.u.HttpSendRequestW; req = &workRequest.u.HttpSendRequestW;
......
dlls/wininet/internet.c
View file @ 49f5ee74
...@@ -947,7 +947,6 @@ BOOL WINAPI InternetFindNextFileW(HINTERNET hFind, LPVOID lpvFindData) ...@@ -947,7 +947,6 @@ BOOL WINAPI InternetFindNextFileW(HINTERNET hFind, LPVOID lpvFindData)
WORKREQUEST workRequest; WORKREQUEST workRequest;
struct WORKREQ_FTPFINDNEXTW *req; struct WORKREQ_FTPFINDNEXTW *req;
workRequest.asyncall = CALLASYNCPROC;
workRequest.asyncproc = AsyncFtpFindNextFileProc; workRequest.asyncproc = AsyncFtpFindNextFileProc;
workRequest.hdr = WININET_AddRef( &lpwh->hdr ); workRequest.hdr = WININET_AddRef( &lpwh->hdr );
req = &workRequest.u.FtpFindNextW; req = &workRequest.u.FtpFindNextW;
...@@ -1866,7 +1865,6 @@ BOOL WINAPI InternetReadFileExA(HINTERNET hFile, LPINTERNET_BUFFERSA lpBuffersOu ...@@ -1866,7 +1865,6 @@ BOOL WINAPI InternetReadFileExA(HINTERNET hFile, LPINTERNET_BUFFERSA lpBuffersOu
WORKREQUEST workRequest; WORKREQUEST workRequest;
struct WORKREQ_INTERNETREADFILEEXA *req; struct WORKREQ_INTERNETREADFILEEXA *req;
workRequest.asyncall = CALLASYNCPROC;
workRequest.asyncproc = AsyncInternetReadFileExProc; workRequest.asyncproc = AsyncInternetReadFileExProc;
workRequest.hdr = WININET_AddRef( lpwh ); workRequest.hdr = WININET_AddRef( lpwh );
req = &workRequest.u.InternetReadFileExA; req = &workRequest.u.InternetReadFileExA;
...@@ -2940,7 +2938,6 @@ HINTERNET WINAPI InternetOpenUrlW(HINTERNET hInternet, LPCWSTR lpszUrl, ...@@ -2940,7 +2938,6 @@ HINTERNET WINAPI InternetOpenUrlW(HINTERNET hInternet, LPCWSTR lpszUrl,
WORKREQUEST workRequest; WORKREQUEST workRequest;
struct WORKREQ_INTERNETOPENURLW *req; struct WORKREQ_INTERNETOPENURLW *req;
workRequest.asyncall = CALLASYNCPROC;
workRequest.asyncproc = AsyncInternetOpenUrlProc; workRequest.asyncproc = AsyncInternetOpenUrlProc;
workRequest.hdr = WININET_AddRef( &hIC->hdr ); workRequest.hdr = WININET_AddRef( &hIC->hdr );
req = &workRequest.u.InternetOpenUrlW; req = &workRequest.u.InternetOpenUrlW;
...@@ -3248,12 +3245,8 @@ static VOID INTERNET_ExecuteWork(void) ...@@ -3248,12 +3245,8 @@ static VOID INTERNET_ExecuteWork(void)
if (!INTERNET_GetWorkRequest(&workRequest)) if (!INTERNET_GetWorkRequest(&workRequest))
return; return;
switch (workRequest.asyncall) workRequest.asyncproc(&workRequest);
{
case CALLASYNCPROC:
workRequest.asyncproc(&workRequest);
break;
}
WININET_Release( workRequest.hdr ); WININET_Release( workRequest.hdr );
} }
......
dlls/wininet/internet.h
View file @ 49f5ee74
...@@ -247,11 +247,6 @@ typedef struct ...@@ -247,11 +247,6 @@ typedef struct
LPFILEPROPERTIESW lpafp; LPFILEPROPERTIESW lpafp;
} WININETFTPFINDNEXTW, *LPWININETFTPFINDNEXTW; } WININETFTPFINDNEXTW, *LPWININETFTPFINDNEXTW;
typedef enum
{
CALLASYNCPROC,
} ASYNC_FUNC;
struct WORKREQ_FTPPUTFILEW struct WORKREQ_FTPPUTFILEW
{ {
LPWSTR lpszLocalFile; LPWSTR lpszLocalFile;
...@@ -358,7 +353,6 @@ struct WORKREQ_INTERNETREADFILEEXA ...@@ -358,7 +353,6 @@ struct WORKREQ_INTERNETREADFILEEXA
typedef struct WORKREQ typedef struct WORKREQ
{ {
ASYNC_FUNC asyncall;
void (*asyncproc)(struct WORKREQ*); void (*asyncproc)(struct WORKREQ*);
WININETHANDLEHEADER *hdr; WININETHANDLEHEADER *hdr;
......
dlls/wininet/utility.c
View file @ 49f5ee74
...@@ -293,7 +293,6 @@ VOID SendAsyncCallback(LPWININETHANDLEHEADER hdr, DWORD dwContext, ...@@ -293,7 +293,6 @@ VOID SendAsyncCallback(LPWININETHANDLEHEADER hdr, DWORD dwContext,
memcpy(lpvStatusInfo_copy, lpvStatusInfo, dwStatusInfoLength); memcpy(lpvStatusInfo_copy, lpvStatusInfo, dwStatusInfoLength);
} }
workRequest.asyncall = CALLASYNCPROC;
workRequest.asyncproc = SendAsyncCallbackProc; workRequest.asyncproc = SendAsyncCallbackProc;
workRequest.hdr = WININET_AddRef( hdr ); workRequest.hdr = WININET_AddRef( hdr );
req = &workRequest.u.SendCallback; req = &workRequest.u.SendCallback;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment