From d4337f2b5e26b341233b89f00b3e8791327a2b76 Mon Sep 17 00:00:00 2001 From: Francois Gouget Date: Thu, 30 Aug 2007 16:21:33 +0200 Subject: [PATCH] wininet: Fix many wininet prototypes: the context is a DWORD_PTR now. --- dlls/wininet/ftp.c | 44 ++++++++++++------------ dlls/wininet/gopher.c | 12 +++---- dlls/wininet/http.c | 26 +++++++-------- dlls/wininet/internet.c | 38 ++++++++++----------- dlls/wininet/internet.h | 32 +++++++++--------- dlls/wininet/tests/http.c | 2 +- dlls/wininet/utility.c | 8 ++--- include/wininet.h | 70 +++++++++++++++++++-------------------- 8 files changed, 116 insertions(+), 116 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index b0c36f94500..f54df2a9d8f 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -125,11 +125,11 @@ static void FTP_CloseFileTransferHandle(LPWININETHANDLEHEADER hdr); static void FTP_CloseSessionHandle(LPWININETHANDLEHEADER hdr); static void FTP_CloseFindNextHandle(LPWININETHANDLEHEADER hdr); static BOOL FTP_SendCommand(INT nSocket, FTP_COMMAND ftpCmd, LPCWSTR lpszParam, - INTERNET_STATUS_CALLBACK lpfnStatusCB, LPWININETHANDLEHEADER hdr, DWORD dwContext); + INTERNET_STATUS_CALLBACK lpfnStatusCB, LPWININETHANDLEHEADER hdr, DWORD_PTR dwContext); static BOOL FTP_SendStore(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszRemoteFile, DWORD dwType); static BOOL FTP_GetDataSocket(LPWININETFTPSESSIONW lpwfs, LPINT nDataSocket); static BOOL FTP_SendData(LPWININETFTPSESSIONW lpwfs, INT nDataSocket, HANDLE hFile); -static INT FTP_ReceiveResponse(LPWININETFTPSESSIONW lpwfs, DWORD dwContext); +static INT FTP_ReceiveResponse(LPWININETFTPSESSIONW lpwfs, DWORD_PTR dwContext); static DWORD FTP_SendRetrieve(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszRemoteFile, DWORD dwType); static BOOL FTP_RetrieveFileData(LPWININETFTPSESSIONW lpwfs, INT nDataSocket, DWORD nBytes, HANDLE hFile); static BOOL FTP_InitListenSocket(LPWININETFTPSESSIONW lpwfs); @@ -146,7 +146,7 @@ static BOOL FTP_ParseNextFile(INT nSocket, LPCWSTR lpszSearchFile, LPFILEPROPERT static BOOL FTP_ParseDirectory(LPWININETFTPSESSIONW lpwfs, INT nSocket, LPCWSTR lpszSearchFile, LPFILEPROPERTIESW *lpafp, LPDWORD dwfp); static HINTERNET FTP_ReceiveFileList(LPWININETFTPSESSIONW lpwfs, INT nSocket, LPCWSTR lpszSearchFile, - LPWIN32_FIND_DATAW lpFindFileData, DWORD dwContext); + LPWIN32_FIND_DATAW lpFindFileData, DWORD_PTR dwContext); static DWORD FTP_SetResponseError(DWORD dwResponse); /*********************************************************************** @@ -160,7 +160,7 @@ static DWORD FTP_SetResponseError(DWORD dwResponse); * */ BOOL WINAPI FtpPutFileA(HINTERNET hConnect, LPCSTR lpszLocalFile, - LPCSTR lpszNewRemoteFile, DWORD dwFlags, DWORD dwContext) + LPCSTR lpszNewRemoteFile, DWORD dwFlags, DWORD_PTR dwContext) { LPWSTR lpwzLocalFile; LPWSTR lpwzNewRemoteFile; @@ -200,7 +200,7 @@ static void AsyncFtpPutFileProc(WORKREQUEST *workRequest) * */ BOOL WINAPI FtpPutFileW(HINTERNET hConnect, LPCWSTR lpszLocalFile, - LPCWSTR lpszNewRemoteFile, DWORD dwFlags, DWORD dwContext) + LPCWSTR lpszNewRemoteFile, DWORD dwFlags, DWORD_PTR dwContext) { LPWININETFTPSESSIONW lpwfs; LPWININETAPPINFOW hIC = NULL; @@ -269,7 +269,7 @@ lend: * */ BOOL WINAPI FTP_FtpPutFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszLocalFile, - LPCWSTR lpszNewRemoteFile, DWORD dwFlags, DWORD dwContext) + LPCWSTR lpszNewRemoteFile, DWORD dwFlags, DWORD_PTR dwContext) { HANDLE hFile; BOOL bSuccess = FALSE; @@ -621,7 +621,7 @@ lend: * */ HINTERNET WINAPI FtpFindFirstFileA(HINTERNET hConnect, - LPCSTR lpszSearchFile, LPWIN32_FIND_DATAA lpFindFileData, DWORD dwFlags, DWORD dwContext) + LPCSTR lpszSearchFile, LPWIN32_FIND_DATAA lpFindFileData, DWORD dwFlags, DWORD_PTR dwContext) { LPWSTR lpwzSearchFile; WIN32_FIND_DATAW wfd; @@ -663,7 +663,7 @@ static void AsyncFtpFindFirstFileProc(WORKREQUEST *workRequest) * */ HINTERNET WINAPI FtpFindFirstFileW(HINTERNET hConnect, - LPCWSTR lpszSearchFile, LPWIN32_FIND_DATAW lpFindFileData, DWORD dwFlags, DWORD dwContext) + LPCWSTR lpszSearchFile, LPWIN32_FIND_DATAW lpFindFileData, DWORD dwFlags, DWORD_PTR dwContext) { LPWININETFTPSESSIONW lpwfs; LPWININETAPPINFOW hIC = NULL; @@ -717,7 +717,7 @@ lend: * */ HINTERNET WINAPI FTP_FtpFindFirstFileW(LPWININETFTPSESSIONW lpwfs, - LPCWSTR lpszSearchFile, LPWIN32_FIND_DATAW lpFindFileData, DWORD dwFlags, DWORD dwContext) + LPCWSTR lpszSearchFile, LPWIN32_FIND_DATAW lpFindFileData, DWORD dwFlags, DWORD_PTR dwContext) { INT nResCode; LPWININETAPPINFOW hIC = NULL; @@ -978,7 +978,7 @@ lend: */ HINTERNET WINAPI FtpOpenFileA(HINTERNET hFtpSession, LPCSTR lpszFileName, DWORD fdwAccess, DWORD dwFlags, - DWORD dwContext) + DWORD_PTR dwContext) { LPWSTR lpwzFileName; HINTERNET ret; @@ -1014,13 +1014,13 @@ static void AsyncFtpOpenFileProc(WORKREQUEST *workRequest) */ HINTERNET WINAPI FtpOpenFileW(HINTERNET hFtpSession, LPCWSTR lpszFileName, DWORD fdwAccess, DWORD dwFlags, - DWORD dwContext) + DWORD_PTR dwContext) { LPWININETFTPSESSIONW lpwfs; LPWININETAPPINFOW hIC = NULL; HINTERNET r = NULL; - TRACE("(%p,%s,0x%08x,0x%08x,0x%08x)\n", hFtpSession, + TRACE("(%p,%s,0x%08x,0x%08x,0x%08lx)\n", hFtpSession, debugstr_w(lpszFileName), fdwAccess, dwFlags, dwContext); lpwfs = (LPWININETFTPSESSIONW) WININET_GetObject( hFtpSession ); @@ -1089,7 +1089,7 @@ lend: */ HINTERNET FTP_FtpOpenFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszFileName, DWORD fdwAccess, DWORD dwFlags, - DWORD dwContext) + DWORD_PTR dwContext) { INT nDataSocket; BOOL bSuccess = FALSE; @@ -1180,7 +1180,7 @@ lend: */ BOOL WINAPI FtpGetFileA(HINTERNET hInternet, LPCSTR lpszRemoteFile, LPCSTR lpszNewFile, BOOL fFailIfExists, DWORD dwLocalFlagsAttribute, DWORD dwInternetFlags, - DWORD dwContext) + DWORD_PTR dwContext) { LPWSTR lpwzRemoteFile; LPWSTR lpwzNewFile; @@ -1223,7 +1223,7 @@ static void AsyncFtpGetFileProc(WORKREQUEST *workRequest) */ BOOL WINAPI FtpGetFileW(HINTERNET hInternet, LPCWSTR lpszRemoteFile, LPCWSTR lpszNewFile, BOOL fFailIfExists, DWORD dwLocalFlagsAttribute, DWORD dwInternetFlags, - DWORD dwContext) + DWORD_PTR dwContext) { LPWININETFTPSESSIONW lpwfs; LPWININETAPPINFOW hIC = NULL; @@ -1302,7 +1302,7 @@ lend: */ BOOL WINAPI FTP_FtpGetFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszRemoteFile, LPCWSTR lpszNewFile, BOOL fFailIfExists, DWORD dwLocalFlagsAttribute, DWORD dwInternetFlags, - DWORD dwContext) + DWORD_PTR dwContext) { DWORD nBytes; BOOL bSuccess = FALSE; @@ -1853,7 +1853,7 @@ BOOL WINAPI FtpCommandW( HINTERNET hConnect, BOOL fExpectResponse, DWORD dwFlags HINTERNET FTP_Connect(LPWININETAPPINFOW hIC, LPCWSTR lpszServerName, INTERNET_PORT nServerPort, LPCWSTR lpszUserName, - LPCWSTR lpszPassword, DWORD dwFlags, DWORD dwContext, + LPCWSTR lpszPassword, DWORD dwFlags, DWORD_PTR dwContext, DWORD dwInternalFlags) { static const WCHAR szKey[] = {'S','o','f','t','w','a','r','e','\\', @@ -2089,7 +2089,7 @@ lend: * */ static BOOL FTP_SendCommandA(INT nSocket, FTP_COMMAND ftpCmd, LPCSTR lpszParam, - INTERNET_STATUS_CALLBACK lpfnStatusCB, LPWININETHANDLEHEADER hdr, DWORD dwContext) + INTERNET_STATUS_CALLBACK lpfnStatusCB, LPWININETHANDLEHEADER hdr, DWORD_PTR dwContext) { DWORD len; CHAR *buf; @@ -2144,7 +2144,7 @@ static BOOL FTP_SendCommandA(INT nSocket, FTP_COMMAND ftpCmd, LPCSTR lpszParam, * */ static BOOL FTP_SendCommand(INT nSocket, FTP_COMMAND ftpCmd, LPCWSTR lpszParam, - INTERNET_STATUS_CALLBACK lpfnStatusCB, LPWININETHANDLEHEADER hdr, DWORD dwContext) + INTERNET_STATUS_CALLBACK lpfnStatusCB, LPWININETHANDLEHEADER hdr, DWORD_PTR dwContext) { BOOL ret; LPSTR lpszParamA = lpszParam?WININET_strdup_WtoA(lpszParam):NULL; @@ -2163,7 +2163,7 @@ static BOOL FTP_SendCommand(INT nSocket, FTP_COMMAND ftpCmd, LPCWSTR lpszParam, * 0 on failure * */ -INT FTP_ReceiveResponse(LPWININETFTPSESSIONW lpwfs, DWORD dwContext) +INT FTP_ReceiveResponse(LPWININETFTPSESSIONW lpwfs, DWORD_PTR dwContext) { LPSTR lpszResponse = INTERNET_GetResponseBuffer(); DWORD nRecv; @@ -2991,14 +2991,14 @@ static void FTP_CloseFileTransferHandle(LPWININETHANDLEHEADER hdr) * */ static HINTERNET FTP_ReceiveFileList(LPWININETFTPSESSIONW lpwfs, INT nSocket, LPCWSTR lpszSearchFile, - LPWIN32_FIND_DATAW lpFindFileData, DWORD dwContext) + LPWIN32_FIND_DATAW lpFindFileData, DWORD_PTR dwContext) { DWORD dwSize = 0; LPFILEPROPERTIESW lpafp = NULL; LPWININETFTPFINDNEXTW lpwfn = NULL; HINTERNET handle = 0; - TRACE("(%p,%d,%s,%p,%d)\n", lpwfs, nSocket, debugstr_w(lpszSearchFile), lpFindFileData, dwContext); + TRACE("(%p,%d,%s,%p,%08lx)\n", lpwfs, nSocket, debugstr_w(lpszSearchFile), lpFindFileData, dwContext); if (FTP_ParseDirectory(lpwfs, nSocket, lpszSearchFile, &lpafp, &dwSize)) { diff --git a/dlls/wininet/gopher.c b/dlls/wininet/gopher.c index b6f25eb9979..6688ce7a947 100644 --- a/dlls/wininet/gopher.c +++ b/dlls/wininet/gopher.c @@ -108,7 +108,7 @@ HINTERNET WINAPI GopherFindFirstFileA( LPGOPHER_FIND_DATAA lpFindData, DWORD dwFlags, - DWORD dwContext + DWORD_PTR dwContext ) { FIXME("stub\n"); @@ -127,7 +127,7 @@ HINTERNET WINAPI GopherFindFirstFileW( LPGOPHER_FIND_DATAW lpFindData, DWORD dwFlags, - DWORD dwContext + DWORD_PTR dwContext ) { FIXME("stub\n"); @@ -152,7 +152,7 @@ BOOL WINAPI GopherGetAttributeA( LPDWORD lpdwCharactersReturned, GOPHER_ATTRIBUTE_ENUMERATORA lpfnEnumerator, - DWORD dwContext + DWORD_PTR dwContext ) { FIXME("stub\n"); @@ -173,7 +173,7 @@ BOOL WINAPI GopherGetAttributeW( LPDWORD lpdwCharactersReturned, GOPHER_ATTRIBUTE_ENUMERATORW lpfnEnumerator, - DWORD dwContext + DWORD_PTR dwContext ) { FIXME("stub\n"); @@ -231,7 +231,7 @@ HINTERNET WINAPI GopherOpenFileA( LPCSTR lpszLocator, LPCSTR lpszView, DWORD dwFlags, - DWORD dwContext + DWORD_PTR dwContext ) { FIXME("stub\n"); @@ -248,7 +248,7 @@ HINTERNET WINAPI GopherOpenFileW( LPCWSTR lpszLocator, LPCWSTR lpszView, DWORD dwFlags, - DWORD dwContext + DWORD_PTR dwContext ) { FIXME("stub\n"); diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 08be913a1e8..c1b8864343b 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -753,13 +753,13 @@ static void HTTP_DrainContent(LPWININETHTTPREQW lpwhr) * */ BOOL WINAPI HttpEndRequestA(HINTERNET hRequest, - LPINTERNET_BUFFERSA lpBuffersOut, DWORD dwFlags, DWORD dwContext) + LPINTERNET_BUFFERSA lpBuffersOut, DWORD dwFlags, DWORD_PTR dwContext) { LPINTERNET_BUFFERSA ptr; LPINTERNET_BUFFERSW lpBuffersOutW,ptrW; BOOL rc = FALSE; - TRACE("(%p, %p, %08x, %08x): stub\n", hRequest, lpBuffersOut, dwFlags, + TRACE("(%p, %p, %08x, %08lx): stub\n", hRequest, lpBuffersOut, dwFlags, dwContext); ptr = lpBuffersOut; @@ -817,7 +817,7 @@ BOOL WINAPI HttpEndRequestA(HINTERNET hRequest, * */ BOOL WINAPI HttpEndRequestW(HINTERNET hRequest, - LPINTERNET_BUFFERSW lpBuffersOut, DWORD dwFlags, DWORD dwContext) + LPINTERNET_BUFFERSW lpBuffersOut, DWORD dwFlags, DWORD_PTR dwContext) { BOOL rc = FALSE; LPWININETHTTPREQW lpwhr; @@ -898,12 +898,12 @@ BOOL WINAPI HttpEndRequestW(HINTERNET hRequest, HINTERNET WINAPI HttpOpenRequestW(HINTERNET hHttpSession, LPCWSTR lpszVerb, LPCWSTR lpszObjectName, LPCWSTR lpszVersion, LPCWSTR lpszReferrer , LPCWSTR *lpszAcceptTypes, - DWORD dwFlags, DWORD dwContext) + DWORD dwFlags, DWORD_PTR dwContext) { LPWININETHTTPSESSIONW lpwhs; HINTERNET handle = NULL; - TRACE("(%p, %s, %s, %s, %s, %p, %08x, %08x)\n", hHttpSession, + TRACE("(%p, %s, %s, %s, %s, %p, %08x, %08lx)\n", hHttpSession, debugstr_w(lpszVerb), debugstr_w(lpszObjectName), debugstr_w(lpszVersion), debugstr_w(lpszReferrer), lpszAcceptTypes, dwFlags, dwContext); @@ -952,14 +952,14 @@ lend: HINTERNET WINAPI HttpOpenRequestA(HINTERNET hHttpSession, LPCSTR lpszVerb, LPCSTR lpszObjectName, LPCSTR lpszVersion, LPCSTR lpszReferrer , LPCSTR *lpszAcceptTypes, - DWORD dwFlags, DWORD dwContext) + DWORD dwFlags, DWORD_PTR dwContext) { LPWSTR szVerb = NULL, szObjectName = NULL; LPWSTR szVersion = NULL, szReferrer = NULL, *szAcceptTypes = NULL; INT len; INT acceptTypesCount; HINTERNET rc = FALSE; - TRACE("(%p, %s, %s, %s, %s, %p, %08x, %08x)\n", hHttpSession, + TRACE("(%p, %s, %s, %s, %s, %p, %08x, %08lx)\n", hHttpSession, debugstr_a(lpszVerb), debugstr_a(lpszObjectName), debugstr_a(lpszVersion), debugstr_a(lpszReferrer), lpszAcceptTypes, dwFlags, dwContext); @@ -1337,7 +1337,7 @@ static BOOL HTTP_ResolveName(LPWININETHTTPREQW lpwhr) HINTERNET WINAPI HTTP_HttpOpenRequestW(LPWININETHTTPSESSIONW lpwhs, LPCWSTR lpszVerb, LPCWSTR lpszObjectName, LPCWSTR lpszVersion, LPCWSTR lpszReferrer , LPCWSTR *lpszAcceptTypes, - DWORD dwFlags, DWORD dwContext) + DWORD dwFlags, DWORD_PTR dwContext) { LPWININETAPPINFOW hIC = NULL; LPWININETHTTPREQW lpwhr; @@ -2059,14 +2059,14 @@ BOOL WINAPI HttpQueryInfoA(HINTERNET hHttpRequest, DWORD dwInfoLevel, BOOL WINAPI HttpSendRequestExA(HINTERNET hRequest, LPINTERNET_BUFFERSA lpBuffersIn, LPINTERNET_BUFFERSA lpBuffersOut, - DWORD dwFlags, DWORD dwContext) + DWORD dwFlags, DWORD_PTR dwContext) { INTERNET_BUFFERSW BuffersInW; BOOL rc = FALSE; DWORD headerlen; LPWSTR header = NULL; - TRACE("(%p, %p, %p, %08x, %08x): stub\n", hRequest, lpBuffersIn, + TRACE("(%p, %p, %p, %08x, %08lx): stub\n", hRequest, lpBuffersIn, lpBuffersOut, dwFlags, dwContext); if (lpBuffersIn) @@ -2115,14 +2115,14 @@ BOOL WINAPI HttpSendRequestExA(HINTERNET hRequest, BOOL WINAPI HttpSendRequestExW(HINTERNET hRequest, LPINTERNET_BUFFERSW lpBuffersIn, LPINTERNET_BUFFERSW lpBuffersOut, - DWORD dwFlags, DWORD dwContext) + DWORD dwFlags, DWORD_PTR dwContext) { BOOL ret; LPWININETHTTPREQW lpwhr; LPWININETHTTPSESSIONW lpwhs; LPWININETAPPINFOW hIC; - TRACE("(%p, %p, %p, %08x, %08x)\n", hRequest, lpBuffersIn, + TRACE("(%p, %p, %p, %08x, %08lx)\n", hRequest, lpBuffersIn, lpBuffersOut, dwFlags, dwContext); lpwhr = (LPWININETHTTPREQW) WININET_GetObject( hRequest ); @@ -2791,7 +2791,7 @@ lend: */ HINTERNET HTTP_Connect(LPWININETAPPINFOW hIC, LPCWSTR lpszServerName, INTERNET_PORT nServerPort, LPCWSTR lpszUserName, - LPCWSTR lpszPassword, DWORD dwFlags, DWORD dwContext, + LPCWSTR lpszPassword, DWORD dwFlags, DWORD_PTR dwContext, DWORD dwInternalFlags) { BOOL bSuccess = FALSE; diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 9355500c220..99109557090 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -80,7 +80,7 @@ typedef struct static VOID INTERNET_CloseHandle(LPWININETHANDLEHEADER hdr); HINTERNET WINAPI INTERNET_InternetOpenUrlW(LPWININETAPPINFOW hIC, LPCWSTR lpszUrl, - LPCWSTR lpszHeaders, DWORD dwHeadersLength, DWORD dwFlags, DWORD dwContext); + LPCWSTR lpszHeaders, DWORD dwHeadersLength, DWORD dwFlags, DWORD_PTR dwContext); static DWORD g_dwTlsErrIndex = TLS_OUT_OF_INDEXES; static HMODULE WININET_hModule; @@ -766,12 +766,12 @@ BOOL WINAPI InternetGetConnectedStateExA(LPDWORD lpdwStatus, LPSTR lpszConnectio HINTERNET WINAPI InternetConnectW(HINTERNET hInternet, LPCWSTR lpszServerName, INTERNET_PORT nServerPort, LPCWSTR lpszUserName, LPCWSTR lpszPassword, - DWORD dwService, DWORD dwFlags, DWORD dwContext) + DWORD dwService, DWORD dwFlags, DWORD_PTR dwContext) { LPWININETAPPINFOW hIC; HINTERNET rc = NULL; - TRACE("(%p, %s, %i, %s, %s, %i, %i, %i)\n", hInternet, debugstr_w(lpszServerName), + TRACE("(%p, %s, %i, %s, %s, %i, %i, %lx)\n", hInternet, debugstr_w(lpszServerName), nServerPort, debugstr_w(lpszUserName), debugstr_w(lpszPassword), dwService, dwFlags, dwContext); @@ -828,7 +828,7 @@ lend: HINTERNET WINAPI InternetConnectA(HINTERNET hInternet, LPCSTR lpszServerName, INTERNET_PORT nServerPort, LPCSTR lpszUserName, LPCSTR lpszPassword, - DWORD dwService, DWORD dwFlags, DWORD dwContext) + DWORD dwService, DWORD dwFlags, DWORD_PTR dwContext) { HINTERNET rc = (HINTERNET)NULL; INT len = 0; @@ -1633,7 +1633,7 @@ INTERNET_STATUS_CALLBACK WINAPI InternetSetStatusCallbackW( * InternetSetFilePointer (WININET.@) */ DWORD WINAPI InternetSetFilePointer(HINTERNET hFile, LONG lDistanceToMove, - PVOID pReserved, DWORD dwMoveContext, DWORD dwContext) + PVOID pReserved, DWORD dwMoveContext, DWORD_PTR dwContext) { FIXME("stub\n"); return FALSE; @@ -1840,12 +1840,12 @@ void AsyncInternetReadFileExProc(WORKREQUEST *workRequest) } BOOL WINAPI InternetReadFileExA(HINTERNET hFile, LPINTERNET_BUFFERSA lpBuffersOut, - DWORD dwFlags, DWORD dwContext) + DWORD dwFlags, DWORD_PTR dwContext) { BOOL retval = FALSE; LPWININETHANDLEHEADER lpwh; - TRACE("(%p %p 0x%x 0x%x)\n", hFile, lpBuffersOut, dwFlags, dwContext); + TRACE("(%p %p 0x%x 0x%lx)\n", hFile, lpBuffersOut, dwFlags, dwContext); if (dwFlags & ~(IRF_ASYNC|IRF_NO_WAIT)) FIXME("these dwFlags aren't implemented: 0x%x\n", dwFlags & ~(IRF_ASYNC|IRF_NO_WAIT)); @@ -1932,9 +1932,9 @@ end: * */ BOOL WINAPI InternetReadFileExW(HINTERNET hFile, LPINTERNET_BUFFERSW lpBuffer, - DWORD dwFlags, DWORD dwContext) + DWORD dwFlags, DWORD_PTR dwContext) { - ERR("(%p, %p, 0x%x, 0x%x): not implemented in native\n", hFile, lpBuffer, dwFlags, dwContext); + ERR("(%p, %p, 0x%x, 0x%lx): not implemented in native\n", hFile, lpBuffer, dwFlags, dwContext); INTERNET_SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; @@ -2837,14 +2837,14 @@ BOOL WINAPI InternetCheckConnectionA(LPCSTR lpszUrl, DWORD dwFlags, DWORD dwRese * handle of connection or NULL on failure */ HINTERNET WINAPI INTERNET_InternetOpenUrlW(LPWININETAPPINFOW hIC, LPCWSTR lpszUrl, - LPCWSTR lpszHeaders, DWORD dwHeadersLength, DWORD dwFlags, DWORD dwContext) + LPCWSTR lpszHeaders, DWORD dwHeadersLength, DWORD dwFlags, DWORD_PTR dwContext) { URL_COMPONENTSW urlComponents; WCHAR protocol[32], hostName[MAXHOSTNAME], userName[1024]; WCHAR password[1024], path[2048], extra[1024]; HINTERNET client = NULL, client1 = NULL; - TRACE("(%p, %s, %s, %08x, %08x, %08x)\n", hIC, debugstr_w(lpszUrl), debugstr_w(lpszHeaders), + TRACE("(%p, %s, %s, %08x, %08x, %08lx)\n", hIC, debugstr_w(lpszUrl), debugstr_w(lpszHeaders), dwHeadersLength, dwFlags, dwContext); urlComponents.dwStructSize = sizeof(URL_COMPONENTSW); @@ -2957,13 +2957,13 @@ static void AsyncInternetOpenUrlProc(WORKREQUEST *workRequest) } HINTERNET WINAPI InternetOpenUrlW(HINTERNET hInternet, LPCWSTR lpszUrl, - LPCWSTR lpszHeaders, DWORD dwHeadersLength, DWORD dwFlags, DWORD dwContext) + LPCWSTR lpszHeaders, DWORD dwHeadersLength, DWORD dwFlags, DWORD_PTR dwContext) { HINTERNET ret = NULL; LPWININETAPPINFOW hIC = NULL; if (TRACE_ON(wininet)) { - TRACE("(%p, %s, %s, %08x, %08x, %08x)\n", hInternet, debugstr_w(lpszUrl), debugstr_w(lpszHeaders), + TRACE("(%p, %s, %s, %08x, %08x, %08lx)\n", hInternet, debugstr_w(lpszUrl), debugstr_w(lpszHeaders), dwHeadersLength, dwFlags, dwContext); TRACE(" flags :"); dump_INTERNET_FLAGS(dwFlags); @@ -3023,7 +3023,7 @@ HINTERNET WINAPI InternetOpenUrlW(HINTERNET hInternet, LPCWSTR lpszUrl, * handle of connection or NULL on failure */ HINTERNET WINAPI InternetOpenUrlA(HINTERNET hInternet, LPCSTR lpszUrl, - LPCSTR lpszHeaders, DWORD dwHeadersLength, DWORD dwFlags, DWORD dwContext) + LPCSTR lpszHeaders, DWORD dwHeadersLength, DWORD dwFlags, DWORD_PTR dwContext) { HINTERNET rc = (HINTERNET)NULL; @@ -3300,7 +3300,7 @@ void AsyncInternetQueryDataAvailableProc(WORKREQUEST *workRequest) BOOL WINAPI InternetQueryDataAvailable( HINTERNET hFile, LPDWORD lpdwNumberOfBytesAvailble, - DWORD dwFlags, DWORD dwConext) + DWORD dwFlags, DWORD_PTR dwContext) { LPWININETHTTPREQW lpwhr; BOOL retval = FALSE; @@ -3878,7 +3878,7 @@ DWORD WINAPI InternetConfirmZoneCrossingW( HWND hWnd, LPWSTR szUrlPrev, LPWSTR s } DWORD WINAPI InternetDialA( HWND hwndParent, LPSTR lpszConnectoid, DWORD dwFlags, - LPDWORD lpdwConnection, DWORD dwReserved ) + DWORD_PTR* lpdwConnection, DWORD dwReserved ) { FIXME("(%p, %p, 0x%08x, %p, 0x%08x) stub\n", hwndParent, lpszConnectoid, dwFlags, lpdwConnection, dwReserved); @@ -3886,7 +3886,7 @@ DWORD WINAPI InternetDialA( HWND hwndParent, LPSTR lpszConnectoid, DWORD dwFlags } DWORD WINAPI InternetDialW( HWND hwndParent, LPWSTR lpszConnectoid, DWORD dwFlags, - LPDWORD lpdwConnection, DWORD dwReserved ) + DWORD_PTR* lpdwConnection, DWORD dwReserved ) { FIXME("(%p, %p, 0x%08x, %p, 0x%08x) stub\n", hwndParent, lpszConnectoid, dwFlags, lpdwConnection, dwReserved); @@ -3905,9 +3905,9 @@ BOOL WINAPI InternetGoOnlineW( LPWSTR lpszURL, HWND hwndParent, DWORD dwReserved return TRUE; } -DWORD WINAPI InternetHangUp( DWORD dwConnection, DWORD dwReserved ) +DWORD WINAPI InternetHangUp( DWORD_PTR dwConnection, DWORD dwReserved ) { - FIXME("(0x%08x, 0x%08x) stub\n", dwConnection, dwReserved); + FIXME("(0x%08lx, 0x%08x) stub\n", dwConnection, dwReserved); return ERROR_SUCCESS; } diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 42ade48353f..c82097526ae 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -142,7 +142,7 @@ struct _WININETHANDLEHEADER WH_TYPE htype; HINTERNET hInternet; DWORD dwFlags; - DWORD dwContext; + DWORD_PTR dwContext; DWORD dwError; DWORD dwInternalFlags; DWORD dwRefCount; @@ -261,7 +261,7 @@ struct WORKREQ_FTPPUTFILEW LPWSTR lpszLocalFile; LPWSTR lpszNewRemoteFile; DWORD dwFlags; - DWORD dwContext; + DWORD_PTR dwContext; }; struct WORKREQ_FTPSETCURRENTDIRECTORYW @@ -279,7 +279,7 @@ struct WORKREQ_FTPFINDFIRSTFILEW LPWSTR lpszSearchFile; LPWIN32_FIND_DATAW lpFindFileData; DWORD dwFlags; - DWORD dwContext; + DWORD_PTR dwContext; }; struct WORKREQ_FTPGETCURRENTDIRECTORYW @@ -293,7 +293,7 @@ struct WORKREQ_FTPOPENFILEW LPWSTR lpszFilename; DWORD dwAccess; DWORD dwFlags; - DWORD dwContext; + DWORD_PTR dwContext; }; struct WORKREQ_FTPGETFILEW @@ -303,7 +303,7 @@ struct WORKREQ_FTPGETFILEW BOOL fFailIfExists; DWORD dwLocalFlagsAttribute; DWORD dwFlags; - DWORD dwContext; + DWORD_PTR dwContext; }; struct WORKREQ_FTPDELETEFILEW @@ -339,7 +339,7 @@ struct WORKREQ_HTTPSENDREQUESTW struct WORKREQ_SENDCALLBACK { - DWORD dwContext; + DWORD_PTR dwContext; DWORD dwInternetStatus; LPVOID lpvStatusInfo; DWORD dwStatusInfoLength; @@ -352,7 +352,7 @@ struct WORKREQ_INTERNETOPENURLW LPWSTR lpszHeaders; DWORD dwHeadersLength; DWORD dwFlags; - DWORD dwContext; + DWORD_PTR dwContext; }; struct WORKREQ_INTERNETREADFILEEXA @@ -395,12 +395,12 @@ time_t ConvertTimeString(LPCWSTR asctime); HINTERNET FTP_Connect(LPWININETAPPINFOW hIC, LPCWSTR lpszServerName, INTERNET_PORT nServerPort, LPCWSTR lpszUserName, - LPCWSTR lpszPassword, DWORD dwFlags, DWORD dwContext, + LPCWSTR lpszPassword, DWORD dwFlags, DWORD_PTR dwContext, DWORD dwInternalFlags); HINTERNET HTTP_Connect(LPWININETAPPINFOW hIC, LPCWSTR lpszServerName, INTERNET_PORT nServerPort, LPCWSTR lpszUserName, - LPCWSTR lpszPassword, DWORD dwFlags, DWORD dwContext, + LPCWSTR lpszPassword, DWORD dwFlags, DWORD_PTR dwContext, DWORD dwInternalFlags); BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort, @@ -416,11 +416,11 @@ BOOL INTERNET_ReadFile(LPWININETHANDLEHEADER lpwh, LPVOID lpBuffer, BOOL bWait, BOOL bSendCompletionStatus); BOOLAPI FTP_FtpPutFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszLocalFile, - LPCWSTR lpszNewRemoteFile, DWORD dwFlags, DWORD dwContext); + LPCWSTR lpszNewRemoteFile, DWORD dwFlags, DWORD_PTR dwContext); BOOLAPI FTP_FtpSetCurrentDirectoryW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszDirectory); BOOLAPI FTP_FtpCreateDirectoryW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszDirectory); INTERNETAPI HINTERNET WINAPI FTP_FtpFindFirstFileW(LPWININETFTPSESSIONW lpwfs, - LPCWSTR lpszSearchFile, LPWIN32_FIND_DATAW lpFindFileData, DWORD dwFlags, DWORD dwContext); + LPCWSTR lpszSearchFile, LPWIN32_FIND_DATAW lpFindFileData, DWORD dwFlags, DWORD_PTR dwContext); BOOL WINAPI FTP_FindNextFileW(LPWININETFTPFINDNEXTW lpwh, LPVOID lpvFindData); BOOLAPI FTP_FtpGetCurrentDirectoryW(LPWININETFTPSESSIONW lpwfs, LPWSTR lpszCurrentDirectory, LPDWORD lpdwCurrentDirectory); @@ -429,10 +429,10 @@ BOOL FTP_FtpRenameFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszSrc, LPCWSTR lps BOOL FTP_FtpRemoveDirectoryW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszDirectory); BOOL FTP_FtpDeleteFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszFileName); HINTERNET FTP_FtpOpenFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszFileName, - DWORD fdwAccess, DWORD dwFlags, DWORD dwContext); + DWORD fdwAccess, DWORD dwFlags, DWORD_PTR dwContext); BOOLAPI FTP_FtpGetFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszRemoteFile, LPCWSTR lpszNewFile, BOOL fFailIfExists, DWORD dwLocalFlagsAttribute, DWORD dwInternetFlags, - DWORD dwContext); + DWORD_PTR dwContext); BOOLAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders, DWORD dwHeaderLength, LPVOID lpOptional, DWORD dwOptionalLength, @@ -440,14 +440,14 @@ BOOLAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders, INTERNETAPI HINTERNET WINAPI HTTP_HttpOpenRequestW(LPWININETHTTPSESSIONW lpwhs, LPCWSTR lpszVerb, LPCWSTR lpszObjectName, LPCWSTR lpszVersion, LPCWSTR lpszReferrer , LPCWSTR *lpszAcceptTypes, - DWORD dwFlags, DWORD dwContext); + DWORD dwFlags, DWORD_PTR dwContext); BOOL HTTP_FinishedReading(LPWININETHTTPREQW lpwhr); -VOID SendAsyncCallback(LPWININETHANDLEHEADER hdr, DWORD dwContext, +VOID SendAsyncCallback(LPWININETHANDLEHEADER hdr, DWORD_PTR dwContext, DWORD dwInternetStatus, LPVOID lpvStatusInfo, DWORD dwStatusInfoLength); -VOID INTERNET_SendCallback(LPWININETHANDLEHEADER hdr, DWORD dwContext, +VOID INTERNET_SendCallback(LPWININETHANDLEHEADER hdr, DWORD_PTR dwContext, DWORD dwInternetStatus, LPVOID lpvStatusInfo, DWORD dwStatusInfoLength); diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index d69999895ae..10406894212 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -207,7 +207,7 @@ static VOID WINAPI callback( ok(dwStatusInformationLength == sizeof(INTERNET_ASYNC_RESULT), "info length should be sizeof(INTERNET_ASYNC_RESULT) instead of %d\n", dwStatusInformationLength); - trace("%04x:Callback %p 0x%lx INTERNET_STATUS_REQUEST_COMPLETE {%d,%d} %d\n", + trace("%04x:Callback %p 0x%lx INTERNET_STATUS_REQUEST_COMPLETE {%ld,%d} %d\n", GetCurrentThreadId(), hInternet, dwContext, iar->dwResult,iar->dwError,dwStatusInformationLength); SetEvent(hCompleteEvent); diff --git a/dlls/wininet/utility.c b/dlls/wininet/utility.c index 3d779a8cdd4..97b4be5ffa9 100644 --- a/dlls/wininet/utility.c +++ b/dlls/wininet/utility.c @@ -209,7 +209,7 @@ static const char *get_callback_name(DWORD dwInternetStatus) { return "Unknown"; } -VOID INTERNET_SendCallback(LPWININETHANDLEHEADER hdr, DWORD dwContext, +VOID INTERNET_SendCallback(LPWININETHANDLEHEADER hdr, DWORD_PTR dwContext, DWORD dwInternetStatus, LPVOID lpvStatusInfo, DWORD dwStatusInfoLength) { @@ -252,7 +252,7 @@ VOID INTERNET_SendCallback(LPWININETHANDLEHEADER hdr, DWORD dwContext, } } - TRACE(" callback(%p) (%p (%p), %08x, %d (%s), %p, %d)\n", + TRACE(" callback(%p) (%p (%p), %08lx, %d (%s), %p, %d)\n", hdr->lpfnStatusCB, hdr->hInternet, hdr, dwContext, dwInternetStatus, get_callback_name(dwInternetStatus), lpvNewInfo, dwStatusInfoLength); @@ -279,11 +279,11 @@ static void SendAsyncCallbackProc(WORKREQUEST *workRequest) HeapFree(GetProcessHeap(), 0, req->lpvStatusInfo); } -VOID SendAsyncCallback(LPWININETHANDLEHEADER hdr, DWORD dwContext, +VOID SendAsyncCallback(LPWININETHANDLEHEADER hdr, DWORD_PTR dwContext, DWORD dwInternetStatus, LPVOID lpvStatusInfo, DWORD dwStatusInfoLength) { - TRACE("(%p, %08x, %d (%s), %p, %d): %sasync call with callback %p\n", + TRACE("(%p, %08lx, %d (%s), %p, %d): %sasync call with callback %p\n", hdr, dwContext, dwInternetStatus, get_callback_name(dwInternetStatus), lpvStatusInfo, dwStatusInfoLength, hdr->dwFlags & INTERNET_FLAG_ASYNC ? "" : "non ", diff --git a/include/wininet.h b/include/wininet.h index 12e6c44c131..4f74cb3b466 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -149,7 +149,7 @@ typedef enum { } INTERNET_SCHEME,* LPINTERNET_SCHEME; typedef struct { - DWORD dwResult; + DWORD_PTR dwResult; DWORD dwError; } INTERNET_ASYNC_RESULT,* LPINTERNET_ASYNC_RESULT; @@ -357,9 +357,9 @@ INTERNETAPI HINTERNET WINAPI InternetOpenW(LPCWSTR ,DWORD ,LPCWSTR lpszProxy ,LP BOOLAPI InternetCloseHandle(HINTERNET); INTERNETAPI HINTERNET WINAPI InternetConnectA(HINTERNET ,LPCSTR ,INTERNET_PORT , - LPCSTR lpszUserName ,LPCSTR lpszPassword ,DWORD ,DWORD ,DWORD ); + LPCSTR lpszUserName ,LPCSTR lpszPassword ,DWORD ,DWORD ,DWORD_PTR ); INTERNETAPI HINTERNET WINAPI InternetConnectW(HINTERNET ,LPCWSTR ,INTERNET_PORT , - LPCWSTR lpszUserName ,LPCWSTR lpszPassword ,DWORD ,DWORD ,DWORD ); + LPCWSTR lpszUserName ,LPCWSTR lpszPassword ,DWORD ,DWORD ,DWORD_PTR ); #define InternetConnect WINELIB_NAME_AW(InternetConnect) #define INTERNET_SERVICE_URL 0 @@ -378,13 +378,13 @@ INTERNETAPI HINTERNET WINAPI InternetConnectW(HINTERNET ,LPCWSTR ,INTERNET_PORT dwContext \ ) -INTERNETAPI HINTERNET WINAPI InternetOpenUrlA(HINTERNET ,LPCSTR ,LPCSTR lpszHeaders ,DWORD ,DWORD ,DWORD); -INTERNETAPI HINTERNET WINAPI InternetOpenUrlW(HINTERNET ,LPCWSTR ,LPCWSTR lpszHeaders ,DWORD ,DWORD ,DWORD); +INTERNETAPI HINTERNET WINAPI InternetOpenUrlA(HINTERNET ,LPCSTR ,LPCSTR lpszHeaders ,DWORD ,DWORD ,DWORD_PTR); +INTERNETAPI HINTERNET WINAPI InternetOpenUrlW(HINTERNET ,LPCWSTR ,LPCWSTR lpszHeaders ,DWORD ,DWORD ,DWORD_PTR); #define InternetOpenUrl WINELIB_NAME_AW(InternetOpenUrl) BOOLAPI InternetReadFile( HINTERNET ,LPVOID ,DWORD ,LPDWORD ); -INTERNETAPI BOOL WINAPI InternetReadFileExA( HINTERNET ,LPINTERNET_BUFFERSA ,DWORD ,DWORD ); -INTERNETAPI BOOL WINAPI InternetReadFileExW( HINTERNET ,LPINTERNET_BUFFERSW ,DWORD ,DWORD ); +INTERNETAPI BOOL WINAPI InternetReadFileExA( HINTERNET ,LPINTERNET_BUFFERSA ,DWORD ,DWORD_PTR ); +INTERNETAPI BOOL WINAPI InternetReadFileExW( HINTERNET ,LPINTERNET_BUFFERSW ,DWORD ,DWORD_PTR ); #define InternetReadFileEx WINELIB_NAME_AW(InternetReadFileEx) #define IRF_ASYNC WININET_API_FLAG_ASYNC @@ -392,9 +392,9 @@ INTERNETAPI BOOL WINAPI InternetReadFileExW( HINTERNET ,LPINTERNET_BUFFERSW ,DWO #define IRF_USE_CONTEXT WININET_API_FLAG_USE_CONTEXT #define IRF_NO_WAIT 0x00000008 -INTERNETAPI DWORD WINAPI InternetSetFilePointer(HINTERNET ,LONG ,PVOID ,DWORD ,DWORD); +INTERNETAPI DWORD WINAPI InternetSetFilePointer(HINTERNET ,LONG ,PVOID ,DWORD ,DWORD_PTR); BOOLAPI InternetWriteFile(HINTERNET ,LPCVOID ,DWORD ,LPDWORD); -BOOLAPI InternetQueryDataAvailable(HINTERNET ,LPDWORD lpdwNumberOfBytesAvailable ,DWORD ,DWORD); +BOOLAPI InternetQueryDataAvailable(HINTERNET ,LPDWORD lpdwNumberOfBytesAvailable ,DWORD ,DWORD_PTR); BOOLAPI InternetFindNextFileA(HINTERNET ,LPVOID); BOOLAPI InternetFindNextFileW(HINTERNET ,LPVOID); #define InternetFindNextFile WINELIB_NAME_AW(InternetFindNextFile) @@ -609,19 +609,19 @@ BOOLAPI FtpCommandW(HINTERNET, BOOL, DWORD, LPCWSTR, DWORD_PTR, HINTERNET *); #define FtpCommand WINELIB_NAME_AW(FtpCommand) INTERNETAPI HINTERNET WINAPI FtpFindFirstFileA(HINTERNET ,LPCSTR lpszSearchFile , - LPWIN32_FIND_DATAA lpFindFileData ,DWORD ,DWORD); + LPWIN32_FIND_DATAA lpFindFileData ,DWORD ,DWORD_PTR); INTERNETAPI HINTERNET WINAPI FtpFindFirstFileW(HINTERNET ,LPCWSTR lpszSearchFile , - LPWIN32_FIND_DATAW lpFindFileData ,DWORD ,DWORD); + LPWIN32_FIND_DATAW lpFindFileData ,DWORD ,DWORD_PTR); #define FtpFindFirstFile WINELIB_NAME_AW(FtpFindFirstFile) -BOOLAPI FtpGetFileA(HINTERNET ,LPCSTR ,LPCSTR ,BOOL ,DWORD ,DWORD ,DWORD); -BOOLAPI FtpGetFileW(HINTERNET ,LPCWSTR ,LPCWSTR ,BOOL ,DWORD ,DWORD ,DWORD); +BOOLAPI FtpGetFileA(HINTERNET ,LPCSTR ,LPCSTR ,BOOL ,DWORD ,DWORD ,DWORD_PTR); +BOOLAPI FtpGetFileW(HINTERNET ,LPCWSTR ,LPCWSTR ,BOOL ,DWORD ,DWORD ,DWORD_PTR); #define FtpGetFile WINELIB_NAME_AW(FtpGetFile) DWORD WINAPI FtpGetFileSize(HINTERNET, LPDWORD); -BOOLAPI FtpPutFileA(HINTERNET ,LPCSTR ,LPCSTR ,DWORD ,DWORD); -BOOLAPI FtpPutFileW(HINTERNET ,LPCWSTR ,LPCWSTR ,DWORD ,DWORD); +BOOLAPI FtpPutFileA(HINTERNET ,LPCSTR ,LPCSTR ,DWORD ,DWORD_PTR); +BOOLAPI FtpPutFileW(HINTERNET ,LPCWSTR ,LPCWSTR ,DWORD ,DWORD_PTR); #define FtpPutFile WINELIB_NAME_AW(FtpPutFile) BOOLAPI FtpDeleteFileA(HINTERNET ,LPCSTR); @@ -632,8 +632,8 @@ BOOLAPI FtpRenameFileA(HINTERNET ,LPCSTR ,LPCSTR); BOOLAPI FtpRenameFileW(HINTERNET ,LPCWSTR ,LPCWSTR); #define FtpRenameFile WINELIB_NAME_AW(FtpRenameFile) -INTERNETAPI HINTERNET WINAPI FtpOpenFileA(HINTERNET ,LPCSTR ,DWORD ,DWORD ,DWORD); -INTERNETAPI HINTERNET WINAPI FtpOpenFileW(HINTERNET ,LPCWSTR ,DWORD ,DWORD ,DWORD); +INTERNETAPI HINTERNET WINAPI FtpOpenFileA(HINTERNET ,LPCSTR ,DWORD ,DWORD ,DWORD_PTR); +INTERNETAPI HINTERNET WINAPI FtpOpenFileW(HINTERNET ,LPCWSTR ,DWORD ,DWORD ,DWORD_PTR); #define FtpOpenFile WINELIB_NAME_AW(FtpOpenFile) BOOLAPI FtpCreateDirectoryA(HINTERNET ,LPCSTR); @@ -1013,13 +1013,13 @@ BOOLAPI GopherGetLocatorTypeW(LPCWSTR ,LPDWORD); #define GopherGetLocatorType WINELIB_NAME_AW(GopherGetLocatorType) INTERNETAPI HINTERNET WINAPI GopherFindFirstFileA(HINTERNET ,LPCSTR lpszLocator , - LPCSTR lpszSearchString ,LPGOPHER_FIND_DATAA lpFindData ,DWORD ,DWORD); + LPCSTR lpszSearchString ,LPGOPHER_FIND_DATAA lpFindData ,DWORD ,DWORD_PTR); INTERNETAPI HINTERNET WINAPI GopherFindFirstFileW(HINTERNET ,LPCWSTR lpszLocator , - LPCWSTR lpszSearchString ,LPGOPHER_FIND_DATAW lpFindData ,DWORD ,DWORD); + LPCWSTR lpszSearchString ,LPGOPHER_FIND_DATAW lpFindData ,DWORD ,DWORD_PTR); #define GopherFindFirstFile WINELIB_NAME_AW(GopherFindFirstFile) -INTERNETAPI HINTERNET WINAPI GopherOpenFileA(HINTERNET ,LPCSTR ,LPCSTR lpszView ,DWORD ,DWORD); -INTERNETAPI HINTERNET WINAPI GopherOpenFileW(HINTERNET ,LPCWSTR ,LPCWSTR lpszView ,DWORD ,DWORD); +INTERNETAPI HINTERNET WINAPI GopherOpenFileA(HINTERNET ,LPCSTR ,LPCSTR lpszView ,DWORD ,DWORD_PTR); +INTERNETAPI HINTERNET WINAPI GopherOpenFileW(HINTERNET ,LPCWSTR ,LPCWSTR lpszView ,DWORD ,DWORD_PTR); #define GopherOpenFile WINELIB_NAME_AW(GopherOpenFile) typedef BOOL (CALLBACK *GOPHER_ATTRIBUTE_ENUMERATORA)(LPGOPHER_ATTRIBUTE_TYPEA ,DWORD); @@ -1028,9 +1028,9 @@ typedef BOOL (CALLBACK *GOPHER_ATTRIBUTE_ENUMERATORW)(LPGOPHER_ATTRIBUTE_TYPEW , DECL_WINELIB_TYPE_AW(GOPHER_ATTRIBUTE_ENUMERATOR) BOOLAPI GopherGetAttributeA(HINTERNET ,LPCSTR ,LPCSTR lpszAttributeName ,LPBYTE , - DWORD ,LPDWORD ,GOPHER_ATTRIBUTE_ENUMERATORA lpfnEnumerator ,DWORD); + DWORD ,LPDWORD ,GOPHER_ATTRIBUTE_ENUMERATORA lpfnEnumerator ,DWORD_PTR); BOOLAPI GopherGetAttributeW(HINTERNET ,LPCWSTR ,LPCWSTR lpszAttributeName ,LPBYTE , - DWORD ,LPDWORD ,GOPHER_ATTRIBUTE_ENUMERATORW lpfnEnumerator ,DWORD); + DWORD ,LPDWORD ,GOPHER_ATTRIBUTE_ENUMERATORW lpfnEnumerator ,DWORD_PTR); #define GopherGetAttribute WINELIB_NAME_AW(GopherGetAttribute) #define HTTP_MAJOR_VERSION 1 @@ -1171,9 +1171,9 @@ BOOLAPI GopherGetAttributeW(HINTERNET ,LPCWSTR ,LPCWSTR lpszAttributeName ,LPBYT INTERNETAPI HINTERNET WINAPI HttpOpenRequestA(HINTERNET ,LPCSTR ,LPCSTR ,LPCSTR , - LPCSTR lpszReferrer ,LPCSTR * ,DWORD ,DWORD); + LPCSTR lpszReferrer ,LPCSTR * ,DWORD ,DWORD_PTR); INTERNETAPI HINTERNET WINAPI HttpOpenRequestW(HINTERNET ,LPCWSTR ,LPCWSTR ,LPCWSTR , - LPCWSTR lpszReferrer ,LPCWSTR * ,DWORD ,DWORD); + LPCWSTR lpszReferrer ,LPCWSTR * ,DWORD ,DWORD_PTR); #define HttpOpenRequest WINELIB_NAME_AW(HttpOpenRequest) BOOLAPI HttpAddRequestHeadersA(HINTERNET ,LPCSTR ,DWORD ,DWORD); @@ -1194,9 +1194,9 @@ BOOLAPI HttpSendRequestW(HINTERNET ,LPCWSTR lpszHeaders ,DWORD ,LPVOID lpOptiona #define HttpSendRequest WINELIB_NAME_AW(HttpSendRequest) INTERNETAPI BOOL WINAPI HttpSendRequestExA(HINTERNET ,LPINTERNET_BUFFERSA lpBuffersIn , - LPINTERNET_BUFFERSA lpBuffersOut ,DWORD ,DWORD); + LPINTERNET_BUFFERSA lpBuffersOut ,DWORD ,DWORD_PTR); INTERNETAPI BOOL WINAPI HttpSendRequestExW(HINTERNET ,LPINTERNET_BUFFERSW lpBuffersIn , - LPINTERNET_BUFFERSW lpBuffersOut ,DWORD ,DWORD); + LPINTERNET_BUFFERSW lpBuffersOut ,DWORD ,DWORD_PTR); #define HttpSendRequestEx WINELIB_NAME_AW(HttpSendRequestEx) #define HSR_ASYNC WININET_API_FLAG_ASYNC @@ -1206,8 +1206,8 @@ INTERNETAPI BOOL WINAPI HttpSendRequestExW(HINTERNET ,LPINTERNET_BUFFERSW lpBuff #define HSR_DOWNLOAD 0x00000010 #define HSR_CHUNKED 0x00000020 -INTERNETAPI BOOL WINAPI HttpEndRequestA(HINTERNET ,LPINTERNET_BUFFERSA lpBuffersOut ,DWORD ,DWORD); -INTERNETAPI BOOL WINAPI HttpEndRequestW(HINTERNET ,LPINTERNET_BUFFERSW lpBuffersOut ,DWORD ,DWORD); +INTERNETAPI BOOL WINAPI HttpEndRequestA(HINTERNET ,LPINTERNET_BUFFERSA lpBuffersOut ,DWORD ,DWORD_PTR); +INTERNETAPI BOOL WINAPI HttpEndRequestW(HINTERNET ,LPINTERNET_BUFFERSW lpBuffersOut ,DWORD ,DWORD_PTR); #define HttpEndRequest WINELIB_NAME_AW(HttpEndRequest) BOOLAPI HttpQueryInfoA(HINTERNET ,DWORD ,LPVOID lpBuffer ,LPDWORD ,LPDWORD lpdwIndex); @@ -1268,15 +1268,15 @@ BOOLAPI InternetCheckConnectionW(LPCWSTR ,DWORD ,DWORD); #define FLAGS_ERROR_UI_FLAGS_NO_UI 0x08 #define FLAGS_ERROR_UI_SERIALIZE_DIALOGS 0x10 -DWORD InternetAuthNotifyCallback ( DWORD ,DWORD ,LPVOID ); -typedef DWORD (CALLBACK *PFN_AUTH_NOTIFY) (DWORD,DWORD,LPVOID); +DWORD InternetAuthNotifyCallback ( DWORD_PTR ,DWORD ,LPVOID ); +typedef DWORD (CALLBACK *PFN_AUTH_NOTIFY) (DWORD_PTR,DWORD,LPVOID); typedef struct { DWORD cbStruct; DWORD dwOptions; PFN_AUTH_NOTIFY pfnNotify; - DWORD dwContext; + DWORD_PTR dwContext; } INTERNET_AUTH_NOTIFY_DATA; @@ -1543,14 +1543,14 @@ BOOLAPI DeleteUrlCacheEntryA(LPCSTR); BOOLAPI DeleteUrlCacheEntryW(LPCWSTR); #define DeleteUrlCacheEntry WINELIB_NAME_AW(DeleteUrlCacheEntry) -INTERNETAPI DWORD WINAPI InternetDialA(HWND ,LPSTR ,DWORD ,LPDWORD ,DWORD); -INTERNETAPI DWORD WINAPI InternetDialW(HWND ,LPWSTR ,DWORD ,LPDWORD ,DWORD); +INTERNETAPI DWORD WINAPI InternetDialA(HWND ,LPSTR ,DWORD ,DWORD_PTR* ,DWORD); +INTERNETAPI DWORD WINAPI InternetDialW(HWND ,LPWSTR ,DWORD ,DWORD_PTR* ,DWORD); #define InternetDial WINELIB_NAME_AW(InternetDial) #define INTERNET_DIAL_UNATTENDED 0x8000 -INTERNETAPI DWORD WINAPI InternetHangUp(DWORD ,DWORD); +INTERNETAPI DWORD WINAPI InternetHangUp(DWORD_PTR ,DWORD); BOOLAPI CreateMD5SSOHash(PWSTR,PWSTR,PWSTR,PBYTE); #define INTERENT_GOONLINE_REFRESH 0x00000001