Jacek Caban : wininet:
Use proc instead of enum in INTERNETREADFILEEXA request.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Dec 26 06:49:19 CST 2006
Module: wine
Branch: master
Commit: 662c885a0bb967c1cc80a26c0d4e67a140cf942f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=662c885a0bb967c1cc80a26c0d4e67a140cf942f
Author: Jacek Caban <jacek at codeweavers.com>
Date: Mon Dec 25 21:33:56 2006 +0100
wininet: Use proc instead of enum in INTERNETREADFILEEXA request.
---
dlls/wininet/internet.c | 26 +++++++++++++-------------
dlls/wininet/internet.h | 1 -
2 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c
index 78c9c90..5ef39ea 100644
--- a/dlls/wininet/internet.c
+++ b/dlls/wininet/internet.c
@@ -1810,6 +1810,17 @@ BOOL WINAPI InternetReadFile(HINTERNET h
* SEE
* InternetOpenUrlA(), HttpOpenRequestA()
*/
+void AsyncInternetReadFileExProc(WORKREQUEST *workRequest)
+{
+ struct WORKREQ_INTERNETREADFILEEXA const *req = &workRequest->u.InternetReadFileExA;
+
+ TRACE("INTERNETREADFILEEXA %p\n", workRequest->hdr);
+
+ INTERNET_ReadFile(workRequest->hdr, req->lpBuffersOut->lpvBuffer,
+ req->lpBuffersOut->dwBufferLength,
+ &req->lpBuffersOut->dwBufferLength, TRUE, TRUE);
+}
+
BOOL WINAPI InternetReadFileExA(HINTERNET hFile, LPINTERNET_BUFFERSA lpBuffersOut,
DWORD dwFlags, DWORD dwContext)
{
@@ -1844,7 +1855,8 @@ BOOL WINAPI InternetReadFileExA(HINTERNE
WORKREQUEST workRequest;
struct WORKREQ_INTERNETREADFILEEXA *req;
- workRequest.asyncall = INTERNETREADFILEEXA;
+ workRequest.asyncall = CALLASYNCPROC;
+ workRequest.asyncproc = AsyncInternetReadFileExProc;
workRequest.hdr = WININET_AddRef( lpwh );
req = &workRequest.u.InternetReadFileExA;
req->lpBuffersOut = lpBuffersOut;
@@ -3376,18 +3388,6 @@ static VOID INTERNET_ExecuteWork(void)
FTP_FindNextFileW(lpwh, req->lpFindFileData);
}
break;
-
- case INTERNETREADFILEEXA:
- {
- struct WORKREQ_INTERNETREADFILEEXA *req = &workRequest.u.InternetReadFileExA;
-
- TRACE("INTERNETREADFILEEXA %p\n", workRequest.hdr);
-
- INTERNET_ReadFile(workRequest.hdr, req->lpBuffersOut->lpvBuffer,
- req->lpBuffersOut->dwBufferLength,
- &req->lpBuffersOut->dwBufferLength, TRUE, TRUE);
- }
- break;
}
WININET_Release( workRequest.hdr );
}
diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h
index 989fb9a..ee9c2d6 100644
--- a/dlls/wininet/internet.h
+++ b/dlls/wininet/internet.h
@@ -261,7 +261,6 @@ typedef enum
FTPREMOVEDIRECTORYW,
FTPRENAMEFILEW,
FTPFINDNEXTW,
- INTERNETREADFILEEXA,
} ASYNC_FUNC;
struct WORKREQ_FTPPUTFILEW
More information about the wine-cvs
mailing list