[PATCH 11/21] dlls/wininet: enable compilation with long types
Eric Pouech
eric.pouech at gmail.com
Tue Feb 22 02:42:58 CST 2022
Signed-off-by: Eric Pouech <eric.pouech at gmail.com>
---
dlls/wininet/Makefile.in | 1
dlls/wininet/cookie.c | 28 ++++----
dlls/wininet/dialogs.c | 24 +++----
dlls/wininet/ftp.c | 34 +++++-----
dlls/wininet/http.c | 104 +++++++++++++++---------------
dlls/wininet/internet.c | 146 +++++++++++++++++++++---------------------
dlls/wininet/netconnection.c | 28 ++++----
dlls/wininet/urlcache.c | 106 +++++++++++++++---------------
dlls/wininet/utility.c | 4 +
9 files changed, 237 insertions(+), 238 deletions(-)
diff --git a/dlls/wininet/Makefile.in b/dlls/wininet/Makefile.in
index b3c497fd67f..7e8111f811d 100644
--- a/dlls/wininet/Makefile.in
+++ b/dlls/wininet/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = wininet.dll
IMPORTLIB = wininet
IMPORTS = $(ZLIB_PE_LIBS) mpr shlwapi shell32 user32 ws2_32 advapi32
diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c
index 6def9ebf9d9..7db5f4d2f5b 100644
--- a/dlls/wininet/cookie.c
+++ b/dlls/wininet/cookie.c
@@ -355,7 +355,7 @@ static BOOL load_persistent_cookie(substr_t domain, substr_t path)
pbeg = strchr(pend+1, '\n');
if(!pbeg)
break;
- sscanf(pbeg, "%u %u %u %u %u", &flags, &expiry.dwLowDateTime, &expiry.dwHighDateTime,
+ sscanf(pbeg, "%lu %lu %lu %lu %lu", &flags, &expiry.dwLowDateTime, &expiry.dwHighDateTime,
&create.dwLowDateTime, &create.dwHighDateTime);
/* skip "*\n" */
@@ -481,7 +481,7 @@ static BOOL save_persistent_cookie(cookie_container_t *container)
}
heap_free(dyn_buf);
- sprintf(buf, "\n%u\n%u\n%u\n%u\n%u\n*\n", cookie_container->flags,
+ sprintf(buf, "\n%lu\n%lu\n%lu\n%lu\n%lu\n*\n", cookie_container->flags,
cookie_container->expiry.dwLowDateTime, cookie_container->expiry.dwHighDateTime,
cookie_container->create.dwLowDateTime, cookie_container->create.dwHighDateTime);
if(!WriteFile(cookie_handle, buf, strlen(buf), &bytes_written, NULL)) {
@@ -730,10 +730,10 @@ BOOL WINAPI InternetGetCookieExW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName,
DWORD res;
BOOL ret;
- TRACE("(%s, %s, %p, %p, %x, %p)\n", debugstr_w(lpszUrl),debugstr_w(lpszCookieName), lpCookieData, lpdwSize, flags, reserved);
+ TRACE("(%s, %s, %p, %p, %lx, %p)\n", debugstr_w(lpszUrl),debugstr_w(lpszCookieName), lpCookieData, lpdwSize, flags, reserved);
if (flags & ~INTERNET_COOKIE_HTTPONLY)
- FIXME("flags 0x%08x not supported\n", flags);
+ FIXME("flags 0x%08lx not supported\n", flags);
if (!lpszUrl)
{
@@ -759,7 +759,7 @@ BOOL WINAPI InternetGetCookieExW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName,
if(cookie_set.cnt) {
if(!lpCookieData || cookie_set.string_len+1 > *lpdwSize) {
*lpdwSize = (cookie_set.string_len + 1) * sizeof(WCHAR);
- TRACE("returning %u\n", *lpdwSize);
+ TRACE("returning %lu\n", *lpdwSize);
if(lpCookieData) {
SetLastError(ERROR_INSUFFICIENT_BUFFER);
ret = FALSE;
@@ -809,7 +809,7 @@ BOOL WINAPI InternetGetCookieExA(LPCSTR lpszUrl, LPCSTR lpszCookieName,
DWORD len, size = 0;
BOOL r;
- TRACE("(%s %s %p %p(%u) %x %p)\n", debugstr_a(lpszUrl), debugstr_a(lpszCookieName),
+ TRACE("(%s %s %p %p(%lu) %lx %p)\n", debugstr_a(lpszUrl), debugstr_a(lpszCookieName),
lpCookieData, lpdwSize, lpdwSize ? *lpdwSize : 0, flags, reserved);
url = heap_strdupAtoW(lpszUrl);
@@ -915,7 +915,7 @@ DWORD set_cookie(substr_t domain, substr_t path, substr_t name, substr_t data, D
BOOL expired = FALSE, update_persistent = FALSE;
DWORD cookie_flags = 0, len;
- TRACE("%s %s %s=%s %x\n", debugstr_wn(domain.str, domain.len), debugstr_wn(path.str, path.len),
+ TRACE("%s %s %s=%s %lx\n", debugstr_wn(domain.str, domain.len), debugstr_wn(path.str, path.len),
debugstr_wn(name.str, name.len), debugstr_wn(data.str, data.len), flags);
memset(&expiry,0,sizeof(expiry));
@@ -1076,11 +1076,11 @@ DWORD WINAPI InternetSetCookieExW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName,
substr_t host, path, name, data;
BOOL ret;
- TRACE("(%s, %s, %s, %x, %lx)\n", debugstr_w(lpszUrl), debugstr_w(lpszCookieName),
+ TRACE("(%s, %s, %s, %lx, %Ix)\n", debugstr_w(lpszUrl), debugstr_w(lpszCookieName),
debugstr_w(lpCookieData), flags, reserved);
if (flags & ~INTERNET_COOKIE_HTTPONLY)
- FIXME("flags %x not supported\n", flags);
+ FIXME("flags %lx not supported\n", flags);
if (!lpszUrl || !lpCookieData)
{
@@ -1164,7 +1164,7 @@ DWORD WINAPI InternetSetCookieExA( LPCSTR lpszURL, LPCSTR lpszCookieName, LPCSTR
WCHAR *data, *url, *name;
DWORD r;
- TRACE("(%s, %s, %s, %x, %lx)\n", debugstr_a(lpszURL), debugstr_a(lpszCookieName),
+ TRACE("(%s, %s, %s, %lx, %Ix)\n", debugstr_a(lpszURL), debugstr_a(lpszCookieName),
debugstr_a(lpszCookieData), dwFlags, dwReserved);
url = heap_strdupAtoW(lpszURL);
@@ -1203,7 +1203,7 @@ BOOL WINAPI InternetClearAllPerSiteCookieDecisions( VOID )
BOOL WINAPI InternetEnumPerSiteCookieDecisionA( LPSTR pszSiteName, ULONG *pcSiteNameSize,
ULONG *pdwDecision, ULONG dwIndex )
{
- FIXME("(%s, %p, %p, 0x%08x) stub\n",
+ FIXME("(%s, %p, %p, 0x%08lx) stub\n",
debugstr_a(pszSiteName), pcSiteNameSize, pdwDecision, dwIndex);
return FALSE;
}
@@ -1221,7 +1221,7 @@ BOOL WINAPI InternetEnumPerSiteCookieDecisionA( LPSTR pszSiteName, ULONG *pcSite
BOOL WINAPI InternetEnumPerSiteCookieDecisionW( LPWSTR pszSiteName, ULONG *pcSiteNameSize,
ULONG *pdwDecision, ULONG dwIndex )
{
- FIXME("(%s, %p, %p, 0x%08x) stub\n",
+ FIXME("(%s, %p, %p, 0x%08lx) stub\n",
debugstr_w(pszSiteName), pcSiteNameSize, pdwDecision, dwIndex);
return FALSE;
}
@@ -1249,7 +1249,7 @@ BOOL WINAPI InternetGetPerSiteCookieDecisionW( LPCWSTR pwchHostName, ULONG *pRes
*/
BOOL WINAPI InternetSetPerSiteCookieDecisionA( LPCSTR pchHostName, DWORD dwDecision )
{
- FIXME("(%s, 0x%08x) stub\n", debugstr_a(pchHostName), dwDecision);
+ FIXME("(%s, 0x%08lx) stub\n", debugstr_a(pchHostName), dwDecision);
return FALSE;
}
@@ -1258,7 +1258,7 @@ BOOL WINAPI InternetSetPerSiteCookieDecisionA( LPCSTR pchHostName, DWORD dwDecis
*/
BOOL WINAPI InternetSetPerSiteCookieDecisionW( LPCWSTR pchHostName, DWORD dwDecision )
{
- FIXME("(%s, 0x%08x) stub\n", debugstr_w(pchHostName), dwDecision);
+ FIXME("(%s, 0x%08lx) stub\n", debugstr_w(pchHostName), dwDecision);
return FALSE;
}
diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c
index a48c75865ac..abd8621e76c 100644
--- a/dlls/wininet/dialogs.c
+++ b/dlls/wininet/dialogs.c
@@ -214,7 +214,7 @@ static INT_PTR WINAPI WININET_ProxyPasswordDialog(
if( uMsg == WM_INITDIALOG )
{
- TRACE("WM_INITDIALOG (%08lx)\n", lParam);
+ TRACE("WM_INITDIALOG (%08Ix)\n", lParam);
/* save the parameter list */
params = (struct WININET_ErrorDlgParams*) lParam;
@@ -289,7 +289,7 @@ static INT_PTR WINAPI WININET_PasswordDialog(
if( uMsg == WM_INITDIALOG )
{
- TRACE("WM_INITDIALOG (%08lx)\n", lParam);
+ TRACE("WM_INITDIALOG (%08Ix)\n", lParam);
/* save the parameter list */
params = (struct WININET_ErrorDlgParams*) lParam;
@@ -366,7 +366,7 @@ static INT_PTR WINAPI WININET_InvalidCertificateDialog(
if( uMsg == WM_INITDIALOG )
{
- TRACE("WM_INITDIALOG (%08lx)\n", lParam);
+ TRACE("WM_INITDIALOG (%08Ix)\n", lParam);
/* save the parameter list */
params = (struct WININET_ErrorDlgParams*) lParam;
@@ -390,7 +390,7 @@ static INT_PTR WINAPI WININET_InvalidCertificateDialog(
LoadStringW( WININET_hModule, IDS_CERT_ERRORS, buf, 1024 );
break;
default:
- FIXME( "No message for error %d\n", params->dwError );
+ FIXME( "No message for error %ld\n", params->dwError );
buf[0] = '\0';
}
@@ -472,7 +472,7 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest,
http_request_t *req = NULL;
DWORD res = ERROR_SUCCESS;
- TRACE("%p %p %d %08x %p\n", hWnd, hRequest, dwError, dwFlags, lppvData);
+ TRACE("%p %p %ld %08lx %p\n", hWnd, hRequest, dwError, dwFlags, lppvData);
if( !hWnd && !(dwFlags & FLAGS_ERROR_UI_FLAGS_NO_UI) )
return ERROR_INVALID_HANDLE;
@@ -510,7 +510,7 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest,
hWnd, WININET_PasswordDialog, (LPARAM) ¶ms );
break;
default:
- WARN("unhandled status %u\n", req->status_code);
+ WARN("unhandled status %lu\n", req->status_code);
}
break;
}
@@ -531,7 +531,7 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest,
}
if( dwFlags & ~FLAGS_ERROR_UI_FLAGS_CHANGE_OPTIONS )
- FIXME("%08x contains unsupported flags.\n", dwFlags);
+ FIXME("%08lx contains unsupported flags.\n", dwFlags);
res = DialogBoxParamW( WININET_hModule, MAKEINTRESOURCEW( IDD_INVCERTDLG ),
hWnd, WININET_InvalidCertificateDialog, (LPARAM) ¶ms );
@@ -542,7 +542,7 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest,
res = ERROR_HTTP_COOKIE_DECLINED;
break;
}
- FIXME("Need to display dialog for error %d\n", dwError);
+ FIXME("Need to display dialog for error %ld\n", dwError);
res = ERROR_CANCELLED;
break;
@@ -556,7 +556,7 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest,
case ERROR_INTERNET_MIXED_SECURITY:
case ERROR_INTERNET_HTTPS_HTTP_SUBMIT_REDIR:
if(!(dwFlags & FLAGS_ERROR_UI_FLAGS_NO_UI))
- FIXME("Need to display dialog for error %d\n", dwError);
+ FIXME("Need to display dialog for error %ld\n", dwError);
res = ERROR_CANCELLED;
break;
@@ -566,14 +566,14 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest,
res = ERROR_SUCCESS;
break;
}
- FIXME("Need to display dialog for error %d\n", dwError);
+ FIXME("Need to display dialog for error %ld\n", dwError);
res = ERROR_CANCELLED;
break;
case ERROR_INTERNET_HTTP_TO_HTTPS_ON_REDIR:
case ERROR_INTERNET_POST_IS_NON_SECURE:
if (!(dwFlags & FLAGS_ERROR_UI_FLAGS_NO_UI))
- FIXME("Need to display dialog for error %d\n", dwError);
+ FIXME("Need to display dialog for error %ld\n", dwError);
res = ERROR_SUCCESS;
break;
@@ -611,7 +611,7 @@ BOOL WINAPI InternetShowSecurityInfoByURLW(LPCWSTR url, HWND window)
*/
DWORD WINAPI ParseX509EncodedCertificateForListBoxEntry(LPBYTE cert, DWORD len, LPSTR szlistbox, LPDWORD listbox)
{
- FIXME("stub: %p %d %s %p\n", cert, len, debugstr_a(szlistbox), listbox);
+ FIXME("stub: %p %ld %s %p\n", cert, len, debugstr_a(szlistbox), listbox);
return ERROR_CALL_NOT_IMPLEMENTED;
}
diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c
index 05236972b26..80efeb2bf37 100644
--- a/dlls/wininet/ftp.c
+++ b/dlls/wininet/ftp.c
@@ -1203,7 +1203,7 @@ static DWORD FTPFILE_ReadFile(object_header_t *hdr, void *buffer, DWORD size, DW
DWORD bytes_written;
if (!WriteFile(file->cache_file_handle, buffer, *read, &bytes_written, NULL))
- WARN("WriteFile failed: %u\n", GetLastError());
+ WARN("WriteFile failed: %lu\n", GetLastError());
}
return error;
}
@@ -1254,11 +1254,11 @@ static DWORD FTPFILE_QueryDataAvailable(object_header_t *hdr, DWORD *available,
ULONG unread = 0;
int retval;
- TRACE("(%p %p %x %lx)\n", file, available, flags, ctx);
+ TRACE("(%p %p %lx %Ix)\n", file, available, flags, ctx);
retval = ioctlsocket(file->nDataSocket, FIONREAD, &unread);
if (!retval)
- TRACE("%d bytes of queued, but unread data\n", unread);
+ TRACE("%ld bytes of queued, but unread data\n", unread);
*available = unread;
@@ -1386,7 +1386,7 @@ static HINTERNET FTP_FtpOpenFileW(ftp_session_t *lpwfs,
NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
if (lpwh->cache_file_handle == INVALID_HANDLE_VALUE)
{
- WARN("Could not create cache file: %u\n", GetLastError());
+ WARN("Could not create cache file: %lu\n", GetLastError());
heap_free(lpwh->cache_file);
lpwh->cache_file = NULL;
}
@@ -1486,7 +1486,7 @@ HINTERNET WINAPI FtpOpenFileW(HINTERNET hFtpSession,
appinfo_t *hIC = NULL;
HINTERNET r = NULL;
- TRACE("(%p,%s,0x%08x,0x%08x,0x%08lx)\n", hFtpSession,
+ TRACE("(%p,%s,0x%08lx,0x%08lx,0x%08Ix)\n", hFtpSession,
debugstr_w(lpszFileName), fdwAccess, dwFlags, dwContext);
lpwfs = (ftp_session_t*) get_handle_object( hFtpSession );
@@ -2217,7 +2217,7 @@ BOOL WINAPI FtpCommandA( HINTERNET hConnect, BOOL fExpectResponse, DWORD dwFlags
BOOL r;
WCHAR *cmdW;
- TRACE("%p %d 0x%08x %s 0x%08lx %p\n", hConnect, fExpectResponse, dwFlags,
+ TRACE("%p %d 0x%08lx %s 0x%08Ix %p\n", hConnect, fExpectResponse, dwFlags,
debugstr_a(lpszCommand), dwContext, phFtpCommand);
if (fExpectResponse)
@@ -2256,7 +2256,7 @@ BOOL WINAPI FtpCommandW( HINTERNET hConnect, BOOL fExpectResponse, DWORD dwFlags
DWORD len, nBytesSent= 0;
INT nResCode, nRC = 0;
- TRACE("%p %d 0x%08x %s 0x%08lx %p\n", hConnect, fExpectResponse, dwFlags,
+ TRACE("%p %d 0x%08lx %s 0x%08Ix %p\n", hConnect, fExpectResponse, dwFlags,
debugstr_w(lpszCommand), dwContext, phFtpCommand);
if (!lpszCommand || !lpszCommand[0])
@@ -2302,7 +2302,7 @@ BOOL WINAPI FtpCommandW( HINTERNET hConnect, BOOL fExpectResponse, DWORD dwFlags
strcat(cmd, szCRLF);
len--;
- TRACE("Sending (%s) len(%d)\n", debugstr_a(cmd), len);
+ TRACE("Sending (%s) len(%ld)\n", debugstr_a(cmd), len);
while ((nBytesSent < len) && (nRC != -1))
{
nRC = sock_send(lpwfs->sndSocket, cmd + nBytesSent, len - nBytesSent, 0);
@@ -2711,7 +2711,7 @@ static BOOL FTP_SendCommandA(INT nSocket, FTP_COMMAND ftpCmd, LPCSTR lpszParam,
sprintf(buf, "%s%s%s%s", szFtpCommands[ftpCmd], dwParamLen ? " " : "",
dwParamLen ? lpszParam : "", szCRLF);
- TRACE("Sending (%s) len(%d)\n", debugstr_a(buf), len);
+ TRACE("Sending (%s) len(%ld)\n", debugstr_a(buf), len);
while((nBytesSent < len) && (nRC != -1))
{
nRC = sock_send(nSocket, buf+nBytesSent, len - nBytesSent, 0);
@@ -2725,7 +2725,7 @@ static BOOL FTP_SendCommandA(INT nSocket, FTP_COMMAND ftpCmd, LPCSTR lpszParam,
&nBytesSent, sizeof(DWORD));
}
- TRACE("Sent %d bytes\n", nBytesSent);
+ TRACE("Sent %ld bytes\n", nBytesSent);
return (nRC != -1);
}
@@ -3307,13 +3307,13 @@ static BOOL FTP_SendData(ftp_session_t *lpwfs, INT nDataSocket, HANDLE hFile)
nSeconds = e_long_time - s_long_time;
if( nSeconds / 60 > 0 )
{
- TRACE( "%d bytes of %d bytes (%d%%) in %d min %d sec estimated remaining time %d sec\n",
+ TRACE( "%ld bytes of %ld bytes (%ld%%) in %ld min %ld sec estimated remaining time %ld sec\n",
nTotalSent, fi.nFileSizeLow, nTotalSent*100/fi.nFileSizeLow, nSeconds / 60,
nSeconds % 60, (fi.nFileSizeLow - nTotalSent) * nSeconds / nTotalSent );
}
else
{
- TRACE( "%d bytes of %d bytes (%d%%) in %d sec estimated remaining time %d sec\n",
+ TRACE( "%ld bytes of %ld bytes (%ld%%) in %ld sec estimated remaining time %ld sec\n",
nTotalSent, fi.nFileSizeLow, nTotalSent*100/fi.nFileSizeLow, nSeconds,
(fi.nFileSizeLow - nTotalSent) * nSeconds / nTotalSent);
}
@@ -3442,7 +3442,7 @@ static DWORD FTPFINDNEXT_FindNextFileProc(WININETFTPFINDNEXTW *find, LPVOID data
WIN32_FIND_DATAW *find_data = data;
DWORD res = ERROR_SUCCESS;
- TRACE("index(%d) size(%d)\n", find->index, find->size);
+ TRACE("index(%ld) size(%ld)\n", find->index, find->size);
ZeroMemory(find_data, sizeof(WIN32_FIND_DATAW));
@@ -3450,7 +3450,7 @@ static DWORD FTPFINDNEXT_FindNextFileProc(WININETFTPFINDNEXTW *find, LPVOID data
FTP_ConvertFileProp(&find->lpafp[find->index], find_data);
find->index++;
- TRACE("Name: %s\nSize: %d\n", debugstr_w(find_data->cFileName), find_data->nFileSizeLow);
+ TRACE("Name: %s\nSize: %ld\n", debugstr_w(find_data->cFileName), find_data->nFileSizeLow);
}else {
res = ERROR_NO_MORE_FILES;
}
@@ -3545,7 +3545,7 @@ static HINTERNET FTP_ReceiveFileList(ftp_session_t *lpwfs, INT nSocket, LPCWSTR
LPFILEPROPERTIESW lpafp = NULL;
LPWININETFTPFINDNEXTW lpwfn = NULL;
- TRACE("(%p,%d,%s,%p,%08lx)\n", lpwfs, nSocket, debugstr_w(lpszSearchFile), lpFindFileData, dwContext);
+ TRACE("(%p,%d,%s,%p,%08Ix)\n", lpwfs, nSocket, debugstr_w(lpszSearchFile), lpFindFileData, dwContext);
if (FTP_ParseDirectory(lpwfs, nSocket, lpszSearchFile, &lpafp, &dwSize))
{
@@ -3567,7 +3567,7 @@ static HINTERNET FTP_ReceiveFileList(ftp_session_t *lpwfs, INT nSocket, LPCWSTR
}
}
- TRACE("Matched %d files\n", dwSize);
+ TRACE("Matched %ld files\n", dwSize);
return lpwfn ? lpwfn->hdr.hInternet : NULL;
}
@@ -3743,7 +3743,7 @@ static BOOL FTP_ParseNextFile(INT nSocket, LPCWSTR lpszSearchFile, LPFILEPROPERT
else {
lpfp->bIsDirectory = FALSE;
lpfp->nSize = atol(pszToken);
- TRACE("Size: %d\n", lpfp->nSize);
+ TRACE("Size: %ld\n", lpfp->nSize);
}
pszToken = strtok(NULL, szSpace);
diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
index c493137896a..55698467cda 100644
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
@@ -371,7 +371,7 @@ static DWORD gzip_read(data_stream_t *stream, http_request_t *req, BYTE *buf, DW
int zres;
DWORD res = ERROR_SUCCESS;
- TRACE("(%d %x)\n", size, allow_blocking);
+ TRACE("(%ld %x)\n", size, allow_blocking);
while(size && !gzip_stream->end_of_data) {
if(!gzip_stream->buf_size) {
@@ -418,7 +418,7 @@ static DWORD gzip_read(data_stream_t *stream, http_request_t *req, BYTE *buf, DW
allow_blocking = FALSE;
}
- TRACE("read %u bytes\n", ret_read);
+ TRACE("read %lu bytes\n", ret_read);
if(ret_read)
res = ERROR_SUCCESS;
*read = ret_read;
@@ -1052,7 +1052,7 @@ static BOOL HTTP_DoAuthorization( http_request_t *request, LPCWSTR pszAuthValue,
}
if (sec_status != SEC_E_OK)
{
- WARN("AcquireCredentialsHandleW for scheme %s failed with error 0x%08x\n",
+ WARN("AcquireCredentialsHandleW for scheme %s failed with error 0x%08lx\n",
debugstr_w(pAuthInfo->scheme), sec_status);
heap_free(pAuthInfo->scheme);
heap_free(pAuthInfo);
@@ -1176,7 +1176,7 @@ static BOOL HTTP_DoAuthorization( http_request_t *request, LPCWSTR pszAuthValue,
}
else
{
- ERR("InitializeSecurityContextW returned error 0x%08x\n", sec_status);
+ ERR("InitializeSecurityContextW returned error 0x%08lx\n", sec_status);
heap_free(out.pvBuffer);
destroy_authinfo(pAuthInfo);
*ppAuthInfo = NULL;
@@ -1275,7 +1275,7 @@ BOOL WINAPI HttpAddRequestHeadersW(HINTERNET hHttpRequest,
http_request_t *request;
DWORD res = ERROR_INTERNET_INCORRECT_HANDLE_TYPE;
- TRACE("%p, %s, %u, %08x\n", hHttpRequest, debugstr_wn(lpszHeader, dwHeaderLength), dwHeaderLength, dwModifier);
+ TRACE("%p, %s, %lu, %08lx\n", hHttpRequest, debugstr_wn(lpszHeader, dwHeaderLength), dwHeaderLength, dwModifier);
if (!lpszHeader)
return TRUE;
@@ -1307,7 +1307,7 @@ BOOL WINAPI HttpAddRequestHeadersA(HINTERNET hHttpRequest,
WCHAR *headers = NULL;
BOOL r;
- TRACE("%p, %s, %u, %08x\n", hHttpRequest, debugstr_an(lpszHeader, dwHeaderLength), dwHeaderLength, dwModifier);
+ TRACE("%p, %s, %lu, %08lx\n", hHttpRequest, debugstr_an(lpszHeader, dwHeaderLength), dwHeaderLength, dwModifier);
if(lpszHeader)
headers = heap_strndupAtoW(lpszHeader, dwHeaderLength, &dwHeaderLength);
@@ -1391,7 +1391,7 @@ HINTERNET WINAPI HttpOpenRequestA(HINTERNET hHttpSession,
LPWSTR szVersion = NULL, szReferrer = NULL, *szAcceptTypes = NULL;
HINTERNET rc = NULL;
- TRACE("(%p, %s, %s, %s, %s, %p, %08x, %08lx)\n", hHttpSession,
+ TRACE("(%p, %s, %s, %s, %s, %p, %08lx, %08Ix)\n", hHttpSession,
debugstr_a(lpszVerb), debugstr_a(lpszObjectName),
debugstr_a(lpszVersion), debugstr_a(lpszReferrer), lpszAcceptTypes,
dwFlags, dwContext);
@@ -2067,7 +2067,7 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe
flags = is_valid_netconn(req->netconn) ? req->netconn->security_flags : req->security_flags | req->server->security_flags;
*(DWORD *)buffer = flags;
- TRACE("INTERNET_OPTION_SECURITY_FLAGS %x\n", flags);
+ TRACE("INTERNET_OPTION_SECURITY_FLAGS %lx\n", flags);
return ERROR_SUCCESS;
}
@@ -2245,7 +2245,7 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe
"%s:\t(null)\r\n"
"%s:\t(null)\r\n"
"%s:\t(null)\r\n"
- "%s:\t%s (%u %s)",
+ "%s:\t%s (%lu %s)",
subject, info.lpszSubjectInfo,
issuer, info.lpszIssuerInfo,
effective, start_date, start_time,
@@ -2263,7 +2263,7 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe
"%s:\t(null)\r\n"
"%s:\t(null)\r\n"
"%s:\t(null)\r\n"
- "%s:\t%s (%u %s)",
+ "%s:\t%s (%lu %s)",
subject, info.lpszSubjectInfo,
issuer, info.lpszIssuerInfo,
effective, start_date, start_time,
@@ -2305,7 +2305,7 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe
if(!req->status_code)
flags |= INTERNET_REQFLAG_NO_HEADERS;
- TRACE("INTERNET_OPTION_REQUEST_FLAGS returning %x\n", flags);
+ TRACE("INTERNET_OPTION_REQUEST_FLAGS returning %lx\n", flags);
*size = sizeof(DWORD);
*(DWORD*)buffer = flags;
@@ -2359,7 +2359,7 @@ static DWORD HTTPREQ_SetOption(object_header_t *hdr, DWORD option, void *buffer,
if (!buffer || size != sizeof(DWORD))
return ERROR_INVALID_PARAMETER;
flags = *(DWORD *)buffer;
- TRACE("INTERNET_OPTION_SECURITY_FLAGS %08x\n", flags);
+ TRACE("INTERNET_OPTION_SECURITY_FLAGS %08lx\n", flags);
flags &= SECURITY_SET_MASK;
req->security_flags |= flags;
if(is_valid_netconn(req->netconn))
@@ -2425,7 +2425,7 @@ static void commit_cache_entry(http_request_t *req)
if(res)
req->req_file->is_committed = TRUE;
else
- WARN("CommitUrlCacheEntry failed: %u\n", GetLastError());
+ WARN("CommitUrlCacheEntry failed: %lu\n", GetLastError());
heap_free(header);
}
@@ -2497,7 +2497,7 @@ static void create_cache_entry(http_request_t *req)
b = CreateUrlCacheEntryW(url, req->contentLength == ~0 ? 0 : req->contentLength, NULL, file_name, 0);
if(!b) {
- WARN("Could not create cache entry: %08x\n", GetLastError());
+ WARN("Could not create cache entry: %08lx\n", GetLastError());
return;
}
@@ -2507,7 +2507,7 @@ static void create_cache_entry(http_request_t *req)
req->hCacheFile = CreateFileW(file_name, GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE,
NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
if(req->hCacheFile == INVALID_HANDLE_VALUE) {
- WARN("Could not create file: %u\n", GetLastError());
+ WARN("Could not create file: %lu\n", GetLastError());
req->hCacheFile = NULL;
return;
}
@@ -2517,7 +2517,7 @@ static void create_cache_entry(http_request_t *req)
b = WriteFile(req->hCacheFile, req->read_buf+req->read_pos, req->read_size, &written, NULL);
if(!b)
- FIXME("WriteFile failed: %u\n", GetLastError());
+ FIXME("WriteFile failed: %lu\n", GetLastError());
if(req->data_stream->vtbl->end_of_data(req->data_stream, req))
commit_cache_entry(req);
@@ -2580,7 +2580,7 @@ static DWORD read_line( http_request_t *req, LPSTR buffer, DWORD *len )
if ((res = read_more_data( req, -1 )))
{
- WARN( "read failed %u\n", res );
+ WARN( "read failed %lu\n", res );
LeaveCriticalSection( &req->read_section );
return res;
}
@@ -2626,7 +2626,7 @@ static DWORD read_http_stream(http_request_t *req, BYTE *buf, DWORD size, DWORD
bres = WriteFile(req->hCacheFile, buf, *read, &written, NULL);
if(!bres)
- FIXME("WriteFile failed: %u\n", GetLastError());
+ FIXME("WriteFile failed: %lu\n", GetLastError());
}
if((res == ERROR_SUCCESS && !*read) || req->data_stream->vtbl->end_of_data(req->data_stream, req))
@@ -2657,7 +2657,7 @@ static DWORD refill_read_buffer(http_request_t *req, BOOL allow_blocking, DWORD
req->read_size += read;
- TRACE("read %u bytes, read_size %u\n", read, req->read_size);
+ TRACE("read %lu bytes, read_size %lu\n", read, req->read_size);
if(read_bytes)
*read_bytes = read;
return res;
@@ -2687,7 +2687,7 @@ static DWORD netconn_read(data_stream_t *stream, http_request_t *req, BYTE *buf,
}
}
- TRACE("res %u read %u bytes\n", res, ret);
+ TRACE("res %lu read %u bytes\n", res, ret);
*read = ret;
return res;
}
@@ -2802,7 +2802,7 @@ static DWORD chunked_read(data_stream_t *stream, http_request_t *req, BYTE *buf,
}else if (ch >= 'A' && ch <= 'F') {
chunked_stream->chunk_size = chunked_stream->chunk_size * 16 + ch - 'A' + 10;
}else if (ch == ';' || ch == '\r' || ch == '\n') {
- TRACE("reading %u byte chunk\n", chunked_stream->chunk_size);
+ TRACE("reading %lu byte chunk\n", chunked_stream->chunk_size);
chunked_stream->buf_size++;
chunked_stream->buf_pos--;
if(req->contentLength == ~0) req->contentLength = chunked_stream->chunk_size;
@@ -2886,7 +2886,7 @@ static DWORD chunked_read(data_stream_t *stream, http_request_t *req, BYTE *buf,
if(res != ERROR_SUCCESS)
return res;
- TRACE("read %d bytes\n", ret_read);
+ TRACE("read %ld bytes\n", ret_read);
*read = ret_read;
return ERROR_SUCCESS;
}
@@ -3025,7 +3025,7 @@ static void HTTP_ReceiveRequestData(http_request_t *req)
LeaveCriticalSection( &req->read_section );
if(res != WSAEWOULDBLOCK && (res != ERROR_SUCCESS || !read)) {
- WARN("res %u read %u, closing connection\n", res, read);
+ WARN("res %lu read %lu, closing connection\n", res, read);
http_release_netconn(req, FALSE);
}
@@ -3064,7 +3064,7 @@ static DWORD HTTPREQ_Read(http_request_t *req, void *buffer, DWORD size, DWORD *
LeaveCriticalSection( &req->read_section );
*read = ret_read;
- TRACE( "retrieved %u bytes (res %u)\n", ret_read, res );
+ TRACE( "retrieved %lu bytes (res %lu)\n", ret_read, res );
if(res != WSAEWOULDBLOCK) {
if(res != ERROR_SUCCESS)
@@ -3108,7 +3108,7 @@ static void async_read_file_proc(task_header_t *hdr)
http_request_t *req = (http_request_t*)task->hdr.hdr;
DWORD res = ERROR_SUCCESS, read = task->read_pos, complete_arg = 0;
- TRACE("req %p buf %p size %u read_pos %u ret_read %p\n", req, task->buf, task->size, task->read_pos, task->ret_read);
+ TRACE("req %p buf %p size %lu read_pos %lu ret_read %p\n", req, task->buf, task->size, task->read_pos, task->ret_read);
if(task->buf) {
DWORD read_bytes;
@@ -3129,7 +3129,7 @@ static void async_read_file_proc(task_header_t *hdr)
http_release_netconn(req, drain_content(req, FALSE) == ERROR_SUCCESS);
}
- TRACE("res %u read %u\n", res, read);
+ TRACE("res %lu read %lu\n", res, read);
if(task->ret_read)
*task->ret_read = read;
@@ -3166,10 +3166,10 @@ static DWORD HTTPREQ_ReadFile(object_header_t *hdr, void *buf, DWORD size, DWORD
DWORD res = ERROR_SUCCESS, read = 0, cread, error = ERROR_SUCCESS;
BOOL allow_blocking, notify_received = FALSE;
- TRACE("(%p %p %u %x)\n", req, buf, size, flags);
+ TRACE("(%p %p %lu %lx)\n", req, buf, size, flags);
if (flags & ~(IRF_ASYNC|IRF_NO_WAIT))
- FIXME("these dwFlags aren't implemented: 0x%x\n", flags & ~(IRF_ASYNC|IRF_NO_WAIT));
+ FIXME("these dwFlags aren't implemented: 0x%lx\n", flags & ~(IRF_ASYNC|IRF_NO_WAIT));
allow_blocking = !(req->session->appInfo->hdr.dwFlags & INTERNET_FLAG_ASYNC);
@@ -3252,10 +3252,10 @@ static DWORD HTTPREQ_QueryDataAvailable(object_header_t *hdr, DWORD *available,
DWORD res = ERROR_SUCCESS, avail = 0, error = ERROR_SUCCESS;
BOOL allow_blocking, notify_received = FALSE;
- TRACE("(%p %p %x %lx)\n", req, available, flags, ctx);
+ TRACE("(%p %p %lx %Ix)\n", req, available, flags, ctx);
if (flags & ~(IRF_ASYNC|IRF_NO_WAIT))
- FIXME("these dwFlags aren't implemented: 0x%x\n", flags & ~(IRF_ASYNC|IRF_NO_WAIT));
+ FIXME("these dwFlags aren't implemented: 0x%lx\n", flags & ~(IRF_ASYNC|IRF_NO_WAIT));
*available = 0;
allow_blocking = !(req->session->appInfo->hdr.dwFlags & INTERNET_FLAG_ASYNC);
@@ -3405,7 +3405,7 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session,
URL_ESCAPE_SPACES_ONLY);
if (rc != S_OK)
{
- ERR("Unable to escape string!(%s) (%d)\n",debugstr_w(lpszObjectName),rc);
+ ERR("Unable to escape string!(%s) (%ld)\n",debugstr_w(lpszObjectName),rc);
lstrcpyW(request->path,lpszObjectName);
}
}else {
@@ -3463,7 +3463,7 @@ HINTERNET WINAPI HttpOpenRequestW(HINTERNET hHttpSession,
HINTERNET handle = NULL;
DWORD res;
- TRACE("(%p, %s, %s, %s, %s, %p, %08x, %08lx)\n", hHttpSession,
+ TRACE("(%p, %s, %s, %s, %s, %p, %08lx, %08Ix)\n", hHttpSession,
debugstr_w(lpszVerb), debugstr_w(lpszObjectName),
debugstr_w(lpszVersion), debugstr_w(lpszReferrer), lpszAcceptTypes,
dwFlags, dwContext);
@@ -3797,7 +3797,7 @@ static DWORD HTTP_HttpQueryInfoW(http_request_t *request, DWORD dwInfoLevel,
}
*(DWORD *)lpBuffer = value;
- TRACE(" returning number: %u\n", *(DWORD *)lpBuffer);
+ TRACE(" returning number: %lu\n", *(DWORD *)lpBuffer);
}
else if (dwInfoLevel & HTTP_QUERY_FLAG_SYSTEMTIME && lpBuffer)
{
@@ -3945,7 +3945,7 @@ BOOL WINAPI HttpQueryInfoW(HINTERNET hHttpRequest, DWORD dwInfoLevel,
DWORD info = dwInfoLevel & HTTP_QUERY_HEADER_MASK;
DWORD i;
- TRACE("(%p, 0x%08x)--> %d\n", hHttpRequest, dwInfoLevel, info);
+ TRACE("(%p, 0x%08lx)--> %ld\n", hHttpRequest, dwInfoLevel, info);
TRACE(" Attribute:");
for (i = 0; i < ARRAY_SIZE(query_flags); i++) {
if (query_flags[i].val == info) {
@@ -3954,7 +3954,7 @@ BOOL WINAPI HttpQueryInfoW(HINTERNET hHttpRequest, DWORD dwInfoLevel,
}
}
if (i == ARRAY_SIZE(query_flags)) {
- TRACE(" Unknown (%08x)", info);
+ TRACE(" Unknown (%08lx)", info);
}
TRACE(" Modifier:");
@@ -3966,7 +3966,7 @@ BOOL WINAPI HttpQueryInfoW(HINTERNET hHttpRequest, DWORD dwInfoLevel,
}
if (info_mod) {
- TRACE(" Unknown (%08x)", info_mod);
+ TRACE(" Unknown (%08lx)", info_mod);
}
TRACE("\n");
}
@@ -3987,7 +3987,7 @@ lend:
if( request )
WININET_Release( &request->hdr );
- TRACE("%u <--\n", res);
+ TRACE("%lu <--\n", res);
SetLastError(res);
return res == ERROR_SUCCESS;
@@ -4010,7 +4010,7 @@ BOOL WINAPI HttpQueryInfoA(HINTERNET hHttpRequest, DWORD dwInfoLevel,
DWORD len;
WCHAR* bufferW;
- TRACE("%p %x\n", hHttpRequest, dwInfoLevel);
+ TRACE("%p %lx\n", hHttpRequest, dwInfoLevel);
if((dwInfoLevel & HTTP_QUERY_FLAG_NUMBER) ||
(dwInfoLevel & HTTP_QUERY_FLAG_SYSTEMTIME))
@@ -4220,13 +4220,13 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, WCHAR *url)
path = heap_strndupW(urlComponents.lpszUrlPath, urlComponents.dwUrlPathLength);
rc = UrlEscapeW(path, dummy, &needed, URL_ESCAPE_SPACES_ONLY);
if (rc != E_POINTER)
- ERR("Unable to escape string!(%s) (%d)\n",debugstr_w(path),rc);
+ ERR("Unable to escape string!(%s) (%ld)\n",debugstr_w(path),rc);
request->path = heap_alloc(needed*sizeof(WCHAR));
rc = UrlEscapeW(path, request->path, &needed,
URL_ESCAPE_SPACES_ONLY);
if (rc != S_OK)
{
- ERR("Unable to escape string!(%s) (%d)\n",debugstr_w(path),rc);
+ ERR("Unable to escape string!(%s) (%ld)\n",debugstr_w(path),rc);
lstrcpyW(request->path, path);
}
heap_free(path);
@@ -4849,7 +4849,7 @@ static DWORD open_http_connection(http_request_t *request, BOOL *reusing)
(request->hdr.ErrorMask & INTERNET_ERROR_MASK_COMBINED_SEC_CERT) != 0,
request->connect_timeout, &netconn);
if(res != ERROR_SUCCESS) {
- ERR("create_netconn failed: %u\n", res);
+ ERR("create_netconn failed: %lu\n", res);
return res;
}
@@ -5040,7 +5040,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders,
res = NETCON_send(request->netconn, ascii_req, len, 0, &cnt);
heap_free( ascii_req );
if(res != ERROR_SUCCESS) {
- TRACE("send failed: %u\n", res);
+ TRACE("send failed: %lu\n", res);
if(!reusing_connection)
break;
http_release_netconn(request, FALSE);
@@ -5341,7 +5341,7 @@ static DWORD HTTP_HttpEndRequestW(http_request_t *request, DWORD dwFlags, DWORD_
BOOL WINAPI HttpEndRequestA(HINTERNET hRequest,
LPINTERNET_BUFFERSA lpBuffersOut, DWORD dwFlags, DWORD_PTR dwContext)
{
- TRACE("(%p, %p, %08x, %08lx)\n", hRequest, lpBuffersOut, dwFlags, dwContext);
+ TRACE("(%p, %p, %08lx, %08Ix)\n", hRequest, lpBuffersOut, dwFlags, dwContext);
if (lpBuffersOut)
{
@@ -5384,7 +5384,7 @@ BOOL WINAPI HttpEndRequestW(HINTERNET hRequest,
http_request_t *request;
DWORD res;
- TRACE("%p %p %x %lx -->\n", hRequest, lpBuffersOut, dwFlags, dwContext);
+ TRACE("%p %p %lx %Ix -->\n", hRequest, lpBuffersOut, dwFlags, dwContext);
if (lpBuffersOut)
{
@@ -5418,7 +5418,7 @@ BOOL WINAPI HttpEndRequestW(HINTERNET hRequest,
res = HTTP_HttpEndRequestW(request, dwFlags, dwContext);
WININET_Release( &request->hdr );
- TRACE("%u <--\n", res);
+ TRACE("%lu <--\n", res);
if(res != ERROR_SUCCESS)
SetLastError(res);
return res == ERROR_SUCCESS;
@@ -5444,7 +5444,7 @@ BOOL WINAPI HttpSendRequestExA(HINTERNET hRequest,
DWORD headerlen;
LPWSTR header = NULL;
- TRACE("(%p, %p, %p, %08x, %08lx)\n", hRequest, lpBuffersIn,
+ TRACE("(%p, %p, %p, %08lx, %08Ix)\n", hRequest, lpBuffersIn,
lpBuffersOut, dwFlags, dwContext);
if (lpBuffersIn)
@@ -5499,7 +5499,7 @@ BOOL WINAPI HttpSendRequestExW(HINTERNET hRequest,
appinfo_t *hIC;
DWORD res;
- TRACE("(%p, %p, %p, %08x, %08lx)\n", hRequest, lpBuffersIn,
+ TRACE("(%p, %p, %p, %08lx, %08Ix)\n", hRequest, lpBuffersIn,
lpBuffersOut, dwFlags, dwContext);
request = (http_request_t*) get_handle_object( hRequest );
@@ -5592,7 +5592,7 @@ BOOL WINAPI HttpSendRequestW(HINTERNET hHttpRequest, LPCWSTR lpszHeaders,
appinfo_t *hIC = NULL;
DWORD res = ERROR_SUCCESS;
- TRACE("%p, %s, %i, %p, %i)\n", hHttpRequest,
+ TRACE("%p, %s, %li, %p, %li)\n", hHttpRequest,
debugstr_wn(lpszHeaders, dwHeaderLength), dwHeaderLength, lpOptional, dwOptionalLength);
request = (http_request_t*) get_handle_object( hHttpRequest );
@@ -6113,7 +6113,7 @@ static DWORD HTTP_ProcessHeader(http_request_t *request, LPCWSTR field, LPCWSTR
BOOL request_only = !!(dwModifier & HTTP_ADDHDR_FLAG_REQ);
DWORD res = ERROR_HTTP_INVALID_HEADER;
- TRACE("--> %s: %s - 0x%08x\n", debugstr_w(field), debugstr_w(value), dwModifier);
+ TRACE("--> %s: %s - 0x%08lx\n", debugstr_w(field), debugstr_w(value), dwModifier);
EnterCriticalSection( &request->headers_section );
@@ -6229,7 +6229,7 @@ static DWORD HTTP_ProcessHeader(http_request_t *request, LPCWSTR field, LPCWSTR
res = ERROR_OUTOFMEMORY;
}
}
- TRACE("<-- %d\n", res);
+ TRACE("<-- %ld\n", res);
LeaveCriticalSection( &request->headers_section );
return res;
}
@@ -6266,7 +6266,7 @@ static INT HTTP_GetCustomHeaderIndex(http_request_t *request, LPCWSTR lpszField,
if (index >= request->nCustHeaders)
index = -1;
- TRACE("Return: %d\n", index);
+ TRACE("Return: %ld\n", index);
return index;
}
@@ -6334,6 +6334,6 @@ static BOOL HTTP_DeleteCustomHeader(http_request_t *request, DWORD index)
*/
BOOL WINAPI IsHostInProxyBypassList(INTERNET_SCHEME scheme, LPCSTR szHost, DWORD length)
{
- FIXME("STUB: scheme=%d host=%s length=%d\n", scheme, szHost, length);
+ FIXME("STUB: scheme=%d host=%s length=%ld\n", scheme, szHost, length);
return FALSE;
}
diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c
index 59fae2fbc95..c17916bb2bd 100644
--- a/dlls/wininet/internet.c
+++ b/dlls/wininet/internet.c
@@ -163,7 +163,7 @@ void *alloc_object(object_header_t *parent, const object_vtbl_t *vtbl, size_t si
object_header_t *WININET_AddRef( object_header_t *info )
{
ULONG refs = InterlockedIncrement(&info->refs);
- TRACE("%p -> refcount = %d\n", info, refs );
+ TRACE("%p -> refcount = %ld\n", info, refs );
return info;
}
@@ -179,7 +179,7 @@ object_header_t *get_handle_object( HINTERNET hinternet )
LeaveCriticalSection( &WININET_cs );
- TRACE("handle %ld -> %p\n", handle, info);
+ TRACE("handle %Id -> %p\n", handle, info);
return info;
}
@@ -205,7 +205,7 @@ static void invalidate_handle(object_header_t *info)
BOOL WININET_Release( object_header_t *info )
{
ULONG refs = InterlockedDecrement(&info->refs);
- TRACE( "object %p refcount = %d\n", info, refs );
+ TRACE( "object %p refcount = %ld\n", info, refs );
if( !refs )
{
invalidate_handle(info);
@@ -259,7 +259,7 @@ BOOL WININET_Release( object_header_t *info )
BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{
- TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved);
+ TRACE("%p,%lx,%p\n", hinstDLL, fdwReason, lpvReserved);
switch (fdwReason) {
case DLL_PROCESS_ATTACH:
@@ -755,7 +755,7 @@ static void dump_INTERNET_FLAGS(DWORD dwFlags)
}
}
if (dwFlags)
- TRACE(" Unknown flags (%08x)\n", dwFlags);
+ TRACE(" Unknown flags (%08lx)\n", dwFlags);
else
TRACE("\n");
}
@@ -987,7 +987,7 @@ HINTERNET WINAPI InternetOpenW(LPCWSTR lpszAgent, DWORD dwAccessType,
DWORD i;
const char *access_type_str = "Unknown";
- TRACE("(%s, %i, %s, %s, %i)\n", debugstr_w(lpszAgent), dwAccessType,
+ TRACE("(%s, %li, %s, %s, %li)\n", debugstr_w(lpszAgent), dwAccessType,
debugstr_w(lpszProxy), debugstr_w(lpszProxyBypass), dwFlags);
for (i = 0; i < ARRAY_SIZE(access_type); i++) {
if (access_type[i].val == dwAccessType) {
@@ -1051,7 +1051,7 @@ HINTERNET WINAPI InternetOpenA(LPCSTR lpszAgent, DWORD dwAccessType,
WCHAR *szAgent, *szProxy, *szBypass;
HINTERNET rc;
- TRACE("(%s, 0x%08x, %s, %s, 0x%08x)\n", debugstr_a(lpszAgent),
+ TRACE("(%s, 0x%08lx, %s, %s, 0x%08lx)\n", debugstr_a(lpszAgent),
dwAccessType, debugstr_a(lpszProxy), debugstr_a(lpszProxyBypass), dwFlags);
szAgent = heap_strdupAtoW(lpszAgent);
@@ -1170,7 +1170,7 @@ BOOL WINAPI InternetGetLastResponseInfoW(LPDWORD lpdwError,
*/
BOOL WINAPI InternetGetConnectedState(LPDWORD lpdwStatus, DWORD dwReserved)
{
- TRACE("(%p, 0x%08x)\n", lpdwStatus, dwReserved);
+ TRACE("(%p, 0x%08lx)\n", lpdwStatus, dwReserved);
return InternetGetConnectedStateExW(lpdwStatus, NULL, 0, dwReserved);
}
@@ -1206,7 +1206,7 @@ BOOL WINAPI InternetGetConnectedState(LPDWORD lpdwStatus, DWORD dwReserved)
BOOL WINAPI InternetGetConnectedStateExW(LPDWORD lpdwStatus, LPWSTR lpszConnectionName,
DWORD dwNameLen, DWORD dwReserved)
{
- TRACE("(%p, %p, %d, 0x%08x)\n", lpdwStatus, lpszConnectionName, dwNameLen, dwReserved);
+ TRACE("(%p, %p, %ld, 0x%08lx)\n", lpdwStatus, lpszConnectionName, dwNameLen, dwReserved);
/* Must be zero */
if(dwReserved)
@@ -1237,7 +1237,7 @@ BOOL WINAPI InternetGetConnectedStateExA(LPDWORD lpdwStatus, LPSTR lpszConnectio
LPWSTR lpwszConnectionName = NULL;
BOOL rc;
- TRACE("(%p, %p, %d, 0x%08x)\n", lpdwStatus, lpszConnectionName, dwNameLen, dwReserved);
+ TRACE("(%p, %p, %ld, 0x%08lx)\n", lpdwStatus, lpszConnectionName, dwNameLen, dwReserved);
if (lpszConnectionName && dwNameLen > 0)
lpwszConnectionName = heap_alloc(dwNameLen * sizeof(WCHAR));
@@ -1272,7 +1272,7 @@ HINTERNET WINAPI InternetConnectW(HINTERNET hInternet,
HINTERNET rc = NULL;
DWORD res = ERROR_SUCCESS;
- TRACE("(%p, %s, %u, %s, %p, %u, %x, %lx)\n", hInternet, debugstr_w(lpszServerName),
+ TRACE("(%p, %s, %u, %s, %p, %lu, %lx, %Ix)\n", hInternet, debugstr_w(lpszServerName),
nServerPort, debugstr_w(lpszUserName), lpszPassword, dwService, dwFlags, dwContext);
if (!lpszServerName)
@@ -1439,7 +1439,7 @@ BOOL WINAPI InternetCloseHandle(HINTERNET hInternet)
static BOOL set_url_component(WCHAR **component, DWORD *component_length, const WCHAR *value, DWORD len)
{
- TRACE("%s (%d)\n", debugstr_wn(value, len), len);
+ TRACE("%s (%ld)\n", debugstr_wn(value, len), len);
if (!*component_length)
return TRUE;
@@ -1518,7 +1518,7 @@ BOOL WINAPI InternetCrackUrlA(const char *url, DWORD url_length, DWORD flags, UR
WCHAR *url_w = NULL;
BOOL ret;
- TRACE("(%s %u %x %p)\n", url_length ? debugstr_an(url, url_length) : debugstr_a(url), url_length, flags, ret_comp);
+ TRACE("(%s %lu %lx %p)\n", url_length ? debugstr_an(url, url_length) : debugstr_a(url), url_length, flags, ret_comp);
if (!url || !*url || !ret_comp || ret_comp->dwStructSize != sizeof(URL_COMPONENTSA)) {
SetLastError(ERROR_INVALID_PARAMETER);
@@ -1609,7 +1609,7 @@ static INTERNET_SCHEME GetInternetSchemeW(LPCWSTR lpszScheme, DWORD nMaxCmp)
{
int i;
- TRACE("%s %d\n",debugstr_wn(lpszScheme, nMaxCmp), nMaxCmp);
+ TRACE("%s %ld\n",debugstr_wn(lpszScheme, nMaxCmp), nMaxCmp);
if(lpszScheme==NULL)
return INTERNET_SCHEME_UNKNOWN;
@@ -1642,7 +1642,7 @@ BOOL WINAPI InternetCrackUrlW(const WCHAR *lpszUrl, DWORD dwUrlLength, DWORD dwF
LPCWSTR lpszap;
LPCWSTR lpszcp = NULL, lpszNetLoc;
- TRACE("(%s %u %x %p)\n",
+ TRACE("(%s %lu %lx %p)\n",
lpszUrl ? debugstr_wn(lpszUrl, dwUrlLength ? dwUrlLength : lstrlenW(lpszUrl)) : "(null)",
dwUrlLength, dwFlags, lpUC);
@@ -1994,7 +1994,7 @@ BOOL WINAPI InternetCanonicalizeUrlA(LPCSTR lpszUrl, LPSTR lpszBuffer,
{
HRESULT hr;
- TRACE("(%s, %p, %p, 0x%08x) buffer length: %d\n", debugstr_a(lpszUrl), lpszBuffer,
+ TRACE("(%s, %p, %p, 0x%08lx) buffer length: %ld\n", debugstr_a(lpszUrl), lpszBuffer,
lpdwBufferLength, dwFlags, lpdwBufferLength ? *lpdwBufferLength : -1);
dwFlags = convert_url_canonicalization_flags(dwFlags);
@@ -2020,7 +2020,7 @@ BOOL WINAPI InternetCanonicalizeUrlW(LPCWSTR lpszUrl, LPWSTR lpszBuffer,
{
HRESULT hr;
- TRACE("(%s, %p, %p, 0x%08x) buffer length: %d\n", debugstr_w(lpszUrl), lpszBuffer,
+ TRACE("(%s, %p, %p, 0x%08lx) buffer length: %ld\n", debugstr_w(lpszUrl), lpszBuffer,
lpdwBufferLength, dwFlags, lpdwBufferLength ? *lpdwBufferLength : -1);
dwFlags = convert_url_canonicalization_flags(dwFlags);
@@ -2109,7 +2109,7 @@ INTERNET_STATUS_CALLBACK WINAPI InternetSetStatusCallbackW(
DWORD WINAPI InternetSetFilePointer(HINTERNET hFile, LONG lDistanceToMove,
PVOID pReserved, DWORD dwMoveContext, DWORD_PTR dwContext)
{
- FIXME("(%p %d %p %d %lx): stub\n", hFile, lDistanceToMove, pReserved, dwMoveContext, dwContext);
+ FIXME("(%p %ld %p %ld %Ix): stub\n", hFile, lDistanceToMove, pReserved, dwMoveContext, dwContext);
SetLastError(ERROR_INTERNET_INVALID_OPERATION);
return INVALID_SET_FILE_POINTER;
@@ -2131,7 +2131,7 @@ BOOL WINAPI InternetWriteFile(HINTERNET hFile, LPCVOID lpBuffer,
object_header_t *lpwh;
BOOL res;
- TRACE("(%p %p %d %p)\n", hFile, lpBuffer, dwNumOfBytesToWrite, lpdwNumOfBytesWritten);
+ TRACE("(%p %p %ld %p)\n", hFile, lpBuffer, dwNumOfBytesToWrite, lpdwNumOfBytesWritten);
lpwh = get_handle_object( hFile );
if (!lpwh) {
@@ -2171,7 +2171,7 @@ BOOL WINAPI InternetReadFile(HINTERNET hFile, LPVOID lpBuffer,
object_header_t *hdr;
DWORD res = ERROR_INTERNET_INCORRECT_HANDLE_TYPE;
- TRACE("%p %p %d %p\n", hFile, lpBuffer, dwNumOfBytesToRead, pdwNumOfBytesRead);
+ TRACE("%p %p %ld %p\n", hFile, lpBuffer, dwNumOfBytesToRead, pdwNumOfBytesRead);
hdr = get_handle_object(hFile);
if (!hdr) {
@@ -2187,7 +2187,7 @@ BOOL WINAPI InternetReadFile(HINTERNET hFile, LPVOID lpBuffer,
WININET_Release(hdr);
- TRACE("-- %s (%u) (bytes read: %d)\n", res == ERROR_SUCCESS ? "TRUE": "FALSE", res,
+ TRACE("-- %s (%lu) (bytes read: %ld)\n", res == ERROR_SUCCESS ? "TRUE": "FALSE", res,
pdwNumOfBytesRead ? *pdwNumOfBytesRead : -1);
SetLastError(res);
@@ -2227,7 +2227,7 @@ BOOL WINAPI InternetReadFileExA(HINTERNET hFile, LPINTERNET_BUFFERSA lpBuffersOu
object_header_t *hdr;
DWORD res = ERROR_INTERNET_INCORRECT_HANDLE_TYPE;
- TRACE("(%p %p 0x%x 0x%lx)\n", hFile, lpBuffersOut, dwFlags, dwContext);
+ TRACE("(%p %p 0x%lx 0x%Ix)\n", hFile, lpBuffersOut, dwFlags, dwContext);
if (lpBuffersOut->dwStructSize != sizeof(*lpBuffersOut)) {
SetLastError(ERROR_INVALID_PARAMETER);
@@ -2246,7 +2246,7 @@ BOOL WINAPI InternetReadFileExA(HINTERNET hFile, LPINTERNET_BUFFERSA lpBuffersOu
WININET_Release(hdr);
- TRACE("-- %s (%u, bytes read: %d)\n", res == ERROR_SUCCESS ? "TRUE": "FALSE",
+ TRACE("-- %s (%lu, bytes read: %ld)\n", res == ERROR_SUCCESS ? "TRUE": "FALSE",
res, lpBuffersOut->dwBufferLength);
if(res != ERROR_SUCCESS)
@@ -2265,7 +2265,7 @@ BOOL WINAPI InternetReadFileExW(HINTERNET hFile, LPINTERNET_BUFFERSW lpBuffer,
object_header_t *hdr;
DWORD res = ERROR_INTERNET_INCORRECT_HANDLE_TYPE;
- TRACE("(%p %p 0x%x 0x%lx)\n", hFile, lpBuffer, dwFlags, dwContext);
+ TRACE("(%p %p 0x%lx 0x%Ix)\n", hFile, lpBuffer, dwFlags, dwContext);
if (!lpBuffer || lpBuffer->dwStructSize != sizeof(*lpBuffer)) {
SetLastError(ERROR_INVALID_PARAMETER);
@@ -2284,7 +2284,7 @@ BOOL WINAPI InternetReadFileExW(HINTERNET hFile, LPINTERNET_BUFFERSW lpBuffer,
WININET_Release(hdr);
- TRACE("-- %s (%u, bytes read: %d)\n", res == ERROR_SUCCESS ? "TRUE": "FALSE",
+ TRACE("-- %s (%lu, bytes read: %ld)\n", res == ERROR_SUCCESS ? "TRUE": "FALSE",
res, lpBuffer->dwBufferLength);
if(res != ERROR_SUCCESS)
@@ -2331,7 +2331,7 @@ static WCHAR *detect_proxy_autoconfig_url_dhcp(void)
for (ptr = adapters; ptr; ptr = ptr->Next)
{
MultiByteToWideChar( CP_ACP, 0, ptr->AdapterName, -1, name, ARRAY_SIZE(name) );
- TRACE( "adapter '%s' type %u dhcpv4 enabled %d\n", wine_dbgstr_w(name), ptr->IfType, ptr->Dhcpv4Enabled );
+ TRACE( "adapter '%s' type %lu dhcpv4 enabled %d\n", wine_dbgstr_w(name), ptr->IfType, ptr->Dhcpv4Enabled );
if (ptr->IfType == IF_TYPE_SOFTWARE_LOOPBACK) continue;
/* FIXME: also skip adapters where DHCP is disabled */
@@ -2621,12 +2621,12 @@ static DWORD query_global_option(DWORD option, void *buffer, DWORD *size, BOOL u
case INTERNET_PER_CONN_AUTOCONFIG_RELOAD_DELAY_MINS:
case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_TIME:
case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_URL:
- FIXME("Unhandled dwOption %d\n", optionW->dwOption);
+ FIXME("Unhandled dwOption %ld\n", optionW->dwOption);
memset(&optionW->Value, 0, sizeof(optionW->Value));
break;
default:
- FIXME("Unknown dwOption %d\n", optionW->dwOption);
+ FIXME("Unknown dwOption %ld\n", optionW->dwOption);
res = ERROR_INVALID_PARAMETER;
break;
}
@@ -2654,7 +2654,7 @@ static DWORD query_global_option(DWORD option, void *buffer, DWORD *size, BOOL u
return ERROR_SUCCESS;
}
- FIXME("Stub for %d\n", option);
+ FIXME("Stub for %ld\n", option);
return ERROR_INTERNET_INCORRECT_HANDLE_TYPE;
}
@@ -2683,7 +2683,7 @@ DWORD INET_QueryOption(object_header_t *hdr, DWORD option, void *buffer, DWORD *
case INTERNET_OPTION_MAX_CONNS_PER_SERVER:
case INTERNET_OPTION_MAX_CONNS_PER_1_0_SERVER:
- WARN("Called on global option %u\n", option);
+ WARN("Called on global option %lu\n", option);
return ERROR_INTERNET_INVALID_OPERATION;
}
@@ -2707,7 +2707,7 @@ BOOL WINAPI InternetQueryOptionW(HINTERNET hInternet, DWORD dwOption,
object_header_t *hdr;
DWORD res = ERROR_INVALID_HANDLE;
- TRACE("%p %d %p %p\n", hInternet, dwOption, lpBuffer, lpdwBufferLength);
+ TRACE("%p %ld %p %p\n", hInternet, dwOption, lpBuffer, lpdwBufferLength);
if(hInternet) {
hdr = get_handle_object(hInternet);
@@ -2740,7 +2740,7 @@ BOOL WINAPI InternetQueryOptionA(HINTERNET hInternet, DWORD dwOption,
object_header_t *hdr;
DWORD res = ERROR_INVALID_HANDLE;
- TRACE("%p %d %p %p\n", hInternet, dwOption, lpBuffer, lpdwBufferLength);
+ TRACE("%p %ld %p %p\n", hInternet, dwOption, lpBuffer, lpdwBufferLength);
if(hInternet) {
hdr = get_handle_object(hInternet);
@@ -2765,11 +2765,11 @@ DWORD INET_SetOption(object_header_t *hdr, DWORD option, void *buf, DWORD size)
collect_connections(COLLECT_CONNECTIONS);
return ERROR_SUCCESS;
case INTERNET_OPTION_CALLBACK:
- WARN("Not settable option %u\n", option);
+ WARN("Not settable option %lu\n", option);
return ERROR_INTERNET_OPTION_NOT_SETTABLE;
case INTERNET_OPTION_MAX_CONNS_PER_SERVER:
case INTERNET_OPTION_MAX_CONNS_PER_1_0_SERVER:
- WARN("Called on global option %u\n", option);
+ WARN("Called on global option %lu\n", option);
return ERROR_INTERNET_INVALID_OPERATION;
case INTERNET_OPTION_REFRESH:
return ERROR_INTERNET_INCORRECT_HANDLE_TYPE;
@@ -2782,7 +2782,7 @@ static DWORD set_global_option(DWORD option, void *buf, DWORD size)
{
switch(option) {
case INTERNET_OPTION_CALLBACK:
- WARN("Not global option %u\n", option);
+ WARN("Not global option %lu\n", option);
return ERROR_INTERNET_INCORRECT_HANDLE_TYPE;
case INTERNET_OPTION_MAX_CONNS_PER_SERVER:
@@ -2824,7 +2824,7 @@ static DWORD set_global_option(DWORD option, void *buf, DWORD size)
if(size != sizeof(ULONG))
return ERROR_INTERNET_BAD_OPTION_LENGTH;
- FIXME("%08x\n", *(ULONG*)buf);
+ FIXME("%08lx\n", *(ULONG*)buf);
return ERROR_SUCCESS;
}
@@ -2848,7 +2848,7 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption,
BOOL ret = TRUE;
DWORD res;
- TRACE("(%p %d %p %d)\n", hInternet, dwOption, lpBuffer, dwBufferLength);
+ TRACE("(%p %ld %p %ld)\n", hInternet, dwOption, lpBuffer, dwBufferLength);
lpwhh = (object_header_t*) get_handle_object( hInternet );
if(lpwhh)
@@ -2871,7 +2871,7 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption,
case INTERNET_OPTION_HTTP_VERSION:
{
HTTP_VERSION_INFO* pVersion=(HTTP_VERSION_INFO*)lpBuffer;
- FIXME("Option INTERNET_OPTION_HTTP_VERSION(%d,%d): STUB\n",pVersion->dwMajorVersion,pVersion->dwMinorVersion);
+ FIXME("Option INTERNET_OPTION_HTTP_VERSION(%ld,%ld): STUB\n",pVersion->dwMajorVersion,pVersion->dwMinorVersion);
}
break;
case INTERNET_OPTION_ERROR_MASK:
@@ -2888,7 +2888,7 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption,
SetLastError(ERROR_INTERNET_BAD_OPTION_LENGTH);
ret = FALSE;
} else {
- TRACE("INTERNET_OPTION_ERROR_MASK: %x\n", *(ULONG*)lpBuffer);
+ TRACE("INTERNET_OPTION_ERROR_MASK: %lx\n", *(ULONG*)lpBuffer);
lpwhh->ErrorMask = *(ULONG*)lpBuffer;
}
}
@@ -2938,25 +2938,25 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption,
case INTERNET_OPTION_CODEPAGE:
{
ULONG codepage = *(ULONG *)lpBuffer;
- FIXME("Option INTERNET_OPTION_CODEPAGE (%d): STUB\n", codepage);
+ FIXME("Option INTERNET_OPTION_CODEPAGE (%ld): STUB\n", codepage);
}
break;
case INTERNET_OPTION_REQUEST_PRIORITY:
{
ULONG priority = *(ULONG *)lpBuffer;
- FIXME("Option INTERNET_OPTION_REQUEST_PRIORITY (%d): STUB\n", priority);
+ FIXME("Option INTERNET_OPTION_REQUEST_PRIORITY (%ld): STUB\n", priority);
}
break;
case INTERNET_OPTION_CONNECT_TIMEOUT:
{
ULONG connecttimeout = *(ULONG *)lpBuffer;
- FIXME("Option INTERNET_OPTION_CONNECT_TIMEOUT (%d): STUB\n", connecttimeout);
+ FIXME("Option INTERNET_OPTION_CONNECT_TIMEOUT (%ld): STUB\n", connecttimeout);
}
break;
case INTERNET_OPTION_DATA_RECEIVE_TIMEOUT:
{
ULONG receivetimeout = *(ULONG *)lpBuffer;
- FIXME("Option INTERNET_OPTION_DATA_RECEIVE_TIMEOUT (%d): STUB\n", receivetimeout);
+ FIXME("Option INTERNET_OPTION_DATA_RECEIVE_TIMEOUT (%ld): STUB\n", receivetimeout);
}
break;
case INTERNET_OPTION_RESET_URLCACHE_SESSION:
@@ -2981,13 +2981,13 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption,
case INTERNET_OPTION_DATA_SEND_TIMEOUT:
{
ULONG timeout = *(ULONG *)lpBuffer;
- FIXME("INTERNET_OPTION_SEND/RECEIVE_TIMEOUT/DATA_SEND_TIMEOUT %d\n", timeout);
+ FIXME("INTERNET_OPTION_SEND/RECEIVE_TIMEOUT/DATA_SEND_TIMEOUT %ld\n", timeout);
break;
}
case INTERNET_OPTION_CONNECT_RETRIES:
{
ULONG retries = *(ULONG *)lpBuffer;
- FIXME("INTERNET_OPTION_CONNECT_RETRIES %d\n", retries);
+ FIXME("INTERNET_OPTION_CONNECT_RETRIES %ld\n", retries);
break;
}
case INTERNET_OPTION_CONTEXT_VALUE:
@@ -3078,7 +3078,7 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption,
else
{
if(option->Value.dwValue != PROXY_TYPE_DIRECT)
- FIXME("Unhandled flags: 0x%x\n", option->Value.dwValue);
+ FIXME("Unhandled flags: 0x%lx\n", option->Value.dwValue);
pi.proxyEnabled = 0;
}
break;
@@ -3094,11 +3094,11 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption,
case INTERNET_PER_CONN_AUTOCONFIG_RELOAD_DELAY_MINS:
case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_TIME:
case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_URL:
- FIXME("Unhandled dwOption %d\n", option->dwOption);
+ FIXME("Unhandled dwOption %ld\n", option->dwOption);
break;
default:
- FIXME("Unknown dwOption %d\n", option->dwOption);
+ FIXME("Unknown dwOption %ld\n", option->dwOption);
SetLastError(ERROR_INVALID_PARAMETER);
break;
}
@@ -3113,7 +3113,7 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption,
break;
}
default:
- FIXME("Option %d STUB\n",dwOption);
+ FIXME("Option %ld STUB\n",dwOption);
SetLastError(ERROR_INTERNET_INVALID_OPTION);
ret = FALSE;
break;
@@ -3226,7 +3226,7 @@ BOOL WINAPI InternetSetOptionA(HINTERNET hInternet, DWORD dwOption,
optW->Value.ftValue = optA->Value.ftValue;
break;
default:
- WARN("Unknown PER_CONN dwOption: %d, guessing at conversion to Wide\n", optA->dwOption);
+ WARN("Unknown PER_CONN dwOption: %ld, guessing at conversion to Wide\n", optA->dwOption);
optW->Value.dwValue = optA->Value.dwValue;
break;
}
@@ -3275,7 +3275,7 @@ BOOL WINAPI InternetSetOptionA(HINTERNET hInternet, DWORD dwOption,
BOOL WINAPI InternetSetOptionExA(HINTERNET hInternet, DWORD dwOption,
LPVOID lpBuffer, DWORD dwBufferLength, DWORD dwFlags)
{
- FIXME("Flags %08x ignored\n", dwFlags);
+ FIXME("Flags %08lx ignored\n", dwFlags);
return InternetSetOptionA( hInternet, dwOption, lpBuffer, dwBufferLength );
}
@@ -3285,7 +3285,7 @@ BOOL WINAPI InternetSetOptionExA(HINTERNET hInternet, DWORD dwOption,
BOOL WINAPI InternetSetOptionExW(HINTERNET hInternet, DWORD dwOption,
LPVOID lpBuffer, DWORD dwBufferLength, DWORD dwFlags)
{
- FIXME("Flags %08x ignored\n", dwFlags);
+ FIXME("Flags %08lx ignored\n", dwFlags);
if( dwFlags & ~ISO_VALID_FLAGS )
{
SetLastError( ERROR_INVALID_PARAMETER );
@@ -3310,7 +3310,7 @@ BOOL WINAPI InternetTimeFromSystemTimeA( const SYSTEMTIME* time, DWORD format, L
BOOL ret;
WCHAR stringW[INTERNET_RFC1123_BUFSIZE];
- TRACE( "%p 0x%08x %p 0x%08x\n", time, format, string, size );
+ TRACE( "%p 0x%08lx %p 0x%08lx\n", time, format, string, size );
if (!time || !string || format != INTERNET_RFC1123_FORMAT)
{
@@ -3335,7 +3335,7 @@ BOOL WINAPI InternetTimeFromSystemTimeA( const SYSTEMTIME* time, DWORD format, L
*/
BOOL WINAPI InternetTimeFromSystemTimeW( const SYSTEMTIME* time, DWORD format, LPWSTR string, DWORD size )
{
- TRACE( "%p 0x%08x %p 0x%08x\n", time, format, string, size );
+ TRACE( "%p 0x%08lx %p 0x%08lx\n", time, format, string, size );
if (!time || !string || format != INTERNET_RFC1123_FORMAT)
{
@@ -3369,7 +3369,7 @@ BOOL WINAPI InternetTimeToSystemTimeA( LPCSTR string, SYSTEMTIME* time, DWORD re
BOOL ret = FALSE;
WCHAR *stringW;
- TRACE( "%s %p 0x%08x\n", debugstr_a(string), time, reserved );
+ TRACE( "%s %p 0x%08lx\n", debugstr_a(string), time, reserved );
stringW = heap_strdupAtoW(string);
if (stringW)
@@ -3389,7 +3389,7 @@ BOOL WINAPI InternetTimeToSystemTimeW( LPCWSTR string, SYSTEMTIME* time, DWORD r
const WCHAR *s = string;
WCHAR *end;
- TRACE( "%s %p 0x%08x\n", debugstr_w(string), time, reserved );
+ TRACE( "%s %p 0x%08lx\n", debugstr_w(string), time, reserved );
if (!string || !time) return FALSE;
@@ -3482,7 +3482,7 @@ BOOL WINAPI InternetCheckConnectionW( LPCWSTR lpszUrl, DWORD dwFlags, DWORD dwRe
INTERNET_PORT port;
int status = -1;
- FIXME("(%s %x %x)\n", debugstr_w(lpszUrl), dwFlags, dwReserved);
+ FIXME("(%s %lx %lx)\n", debugstr_w(lpszUrl), dwFlags, dwReserved);
/*
* Crack or set the Address
@@ -3616,7 +3616,7 @@ static HINTERNET INTERNET_InternetOpenUrlW(appinfo_t *hIC, LPCWSTR lpszUrl,
HINTERNET client = NULL, client1 = NULL;
DWORD res;
- TRACE("(%p, %s, %s, %08x, %08x, %08lx)\n", hIC, debugstr_w(lpszUrl), debugstr_w(lpszHeaders),
+ TRACE("(%p, %s, %s, %08lx, %08lx, %08Ix)\n", hIC, debugstr_w(lpszUrl), debugstr_w(lpszHeaders),
dwHeadersLength, dwFlags, dwContext);
urlComponents.dwHostNameLength = 1;
@@ -3734,7 +3734,7 @@ HINTERNET WINAPI InternetOpenUrlW(HINTERNET hInternet, LPCWSTR lpszUrl,
appinfo_t *hIC = NULL;
if (TRACE_ON(wininet)) {
- TRACE("(%p, %s, %s, %08x, %08x, %08lx)\n", hInternet, debugstr_w(lpszUrl), debugstr_w(lpszHeaders),
+ TRACE("(%p, %s, %s, %08lx, %08lx, %08Ix)\n", hInternet, debugstr_w(lpszUrl), debugstr_w(lpszHeaders),
dwHeadersLength, dwFlags, dwContext);
TRACE(" flags :");
dump_INTERNET_FLAGS(dwFlags);
@@ -3971,7 +3971,7 @@ BOOL WINAPI InternetQueryDataAvailable( HINTERNET hFile,
object_header_t *hdr;
DWORD res;
- TRACE("(%p %p %x %lx)\n", hFile, lpdwNumberOfBytesAvailable, dwFlags, dwContext);
+ TRACE("(%p %p %lx %Ix)\n", hFile, lpdwNumberOfBytesAvailable, dwFlags, dwContext);
hdr = get_handle_object( hFile );
if (!hdr) {
@@ -4132,7 +4132,7 @@ BOOL WINAPI InternetCombineUrlA(LPCSTR lpszBaseUrl, LPCSTR lpszRelativeUrl,
{
HRESULT hr=S_OK;
- TRACE("(%s, %s, %p, %p, 0x%08x)\n", debugstr_a(lpszBaseUrl), debugstr_a(lpszRelativeUrl), lpszBuffer, lpdwBufferLength, dwFlags);
+ TRACE("(%s, %s, %p, %p, 0x%08lx)\n", debugstr_a(lpszBaseUrl), debugstr_a(lpszRelativeUrl), lpszBuffer, lpdwBufferLength, dwFlags);
/* Flip this bit to correspond to URL_ESCAPE_UNSAFE */
dwFlags ^= ICU_NO_ENCODE;
@@ -4158,7 +4158,7 @@ BOOL WINAPI InternetCombineUrlW(LPCWSTR lpszBaseUrl, LPCWSTR lpszRelativeUrl,
{
HRESULT hr=S_OK;
- TRACE("(%s, %s, %p, %p, 0x%08x)\n", debugstr_w(lpszBaseUrl), debugstr_w(lpszRelativeUrl), lpszBuffer, lpdwBufferLength, dwFlags);
+ TRACE("(%s, %s, %p, %p, 0x%08lx)\n", debugstr_w(lpszBaseUrl), debugstr_w(lpszRelativeUrl), lpszBuffer, lpdwBufferLength, dwFlags);
/* Flip this bit to correspond to URL_ESCAPE_UNSAFE */
dwFlags ^= ICU_NO_ENCODE;
@@ -4373,7 +4373,7 @@ BOOL WINAPI InternetCreateUrlA(LPURL_COMPONENTSA lpUrlComponents, DWORD dwFlags,
LPWSTR urlW = NULL;
URL_COMPONENTSW urlCompW;
- TRACE("(%p,%d,%p,%p)\n", lpUrlComponents, dwFlags, lpszUrl, lpdwUrlLength);
+ TRACE("(%p,%ld,%p,%p)\n", lpUrlComponents, dwFlags, lpszUrl, lpdwUrlLength);
if (!lpUrlComponents || lpUrlComponents->dwStructSize != sizeof(URL_COMPONENTSW) || !lpdwUrlLength)
{
@@ -4438,7 +4438,7 @@ BOOL WINAPI InternetCreateUrlW(LPURL_COMPONENTSW lpUrlComponents, DWORD dwFlags,
static const WCHAR slashSlashW[] = {'/','/'};
- TRACE("(%p,%d,%p,%p)\n", lpUrlComponents, dwFlags, lpszUrl, lpdwUrlLength);
+ TRACE("(%p,%ld,%p,%p)\n", lpUrlComponents, dwFlags, lpszUrl, lpdwUrlLength);
if (!lpUrlComponents || lpUrlComponents->dwStructSize != sizeof(URL_COMPONENTSW) || !lpdwUrlLength)
{
@@ -4580,7 +4580,7 @@ static DWORD zone_preference = 3;
*/
DWORD WINAPI PrivacySetZonePreferenceW( DWORD zone, DWORD type, DWORD template, LPCWSTR preference )
{
- FIXME( "%x %x %x %s: stub\n", zone, type, template, debugstr_w(preference) );
+ FIXME( "%lx %lx %lx %s: stub\n", zone, type, template, debugstr_w(preference) );
zone_preference = template;
return 0;
@@ -4592,7 +4592,7 @@ DWORD WINAPI PrivacySetZonePreferenceW( DWORD zone, DWORD type, DWORD template,
DWORD WINAPI PrivacyGetZonePreferenceW( DWORD zone, DWORD type, LPDWORD template,
LPWSTR preference, LPDWORD length )
{
- FIXME( "%x %x %p %p %p: stub\n", zone, type, template, preference, length );
+ FIXME( "%lx %lx %p %p %p: stub\n", zone, type, template, preference, length );
if (template) *template = zone_preference;
return 0;
@@ -4664,7 +4664,7 @@ BOOL WINAPI InternetGetSecurityInfoByURLW(LPCWSTR lpszURL, PCCERT_CHAIN_CONTEXT
DWORD WINAPI InternetDialA( HWND hwndParent, LPSTR lpszConnectoid, DWORD dwFlags,
DWORD_PTR* lpdwConnection, DWORD dwReserved )
{
- FIXME("(%p, %p, 0x%08x, %p, 0x%08x) stub\n", hwndParent, lpszConnectoid, dwFlags,
+ FIXME("(%p, %p, 0x%08lx, %p, 0x%08lx) stub\n", hwndParent, lpszConnectoid, dwFlags,
lpdwConnection, dwReserved);
return ERROR_SUCCESS;
}
@@ -4672,26 +4672,26 @@ DWORD WINAPI InternetDialA( HWND hwndParent, LPSTR lpszConnectoid, DWORD dwFlags
DWORD WINAPI InternetDialW( HWND hwndParent, LPWSTR lpszConnectoid, DWORD dwFlags,
DWORD_PTR* lpdwConnection, DWORD dwReserved )
{
- FIXME("(%p, %p, 0x%08x, %p, 0x%08x) stub\n", hwndParent, lpszConnectoid, dwFlags,
+ FIXME("(%p, %p, 0x%08lx, %p, 0x%08lx) stub\n", hwndParent, lpszConnectoid, dwFlags,
lpdwConnection, dwReserved);
return ERROR_SUCCESS;
}
BOOL WINAPI InternetGoOnlineA( LPSTR lpszURL, HWND hwndParent, DWORD dwReserved )
{
- FIXME("(%s, %p, 0x%08x) stub\n", debugstr_a(lpszURL), hwndParent, dwReserved);
+ FIXME("(%s, %p, 0x%08lx) stub\n", debugstr_a(lpszURL), hwndParent, dwReserved);
return TRUE;
}
BOOL WINAPI InternetGoOnlineW( LPWSTR lpszURL, HWND hwndParent, DWORD dwReserved )
{
- FIXME("(%s, %p, 0x%08x) stub\n", debugstr_w(lpszURL), hwndParent, dwReserved);
+ FIXME("(%s, %p, 0x%08lx) stub\n", debugstr_w(lpszURL), hwndParent, dwReserved);
return TRUE;
}
DWORD WINAPI InternetHangUp( DWORD_PTR dwConnection, DWORD dwReserved )
{
- FIXME("(0x%08lx, 0x%08x) stub\n", dwConnection, dwReserved);
+ FIXME("(0x%08Ix, 0x%08lx) stub\n", dwConnection, dwReserved);
return ERROR_SUCCESS;
}
@@ -4705,13 +4705,13 @@ BOOL WINAPI CreateMD5SSOHash( PWSTR pszChallengeInfo, PWSTR pwszRealm, PWSTR pws
BOOL WINAPI ResumeSuspendedDownload( HINTERNET hInternet, DWORD dwError )
{
- FIXME("(%p, 0x%08x) stub\n", hInternet, dwError);
+ FIXME("(%p, 0x%08lx) stub\n", hInternet, dwError);
return FALSE;
}
BOOL WINAPI InternetQueryFortezzaStatus(DWORD *a, DWORD_PTR b)
{
- FIXME("(%p, %08lx) stub\n", a, b);
+ FIXME("(%p, %08Ix) stub\n", a, b);
return FALSE;
}
diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c
index 71ce3401cdd..f89493967a2 100644
--- a/dlls/wininet/netconnection.c
+++ b/dlls/wininet/netconnection.c
@@ -81,7 +81,7 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR
}
if (chain->TrustStatus.dwErrorStatus & ~supportedErrors) {
- WARN("error status %x\n", chain->TrustStatus.dwErrorStatus & ~supportedErrors);
+ WARN("error status %lx\n", chain->TrustStatus.dwErrorStatus & ~supportedErrors);
err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_INVALID_CERT;
errors &= supportedErrors;
if(!conn->mask_errors)
@@ -181,9 +181,9 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR
conn->security_flags |= _SECURITY_FLAG_CERT_INVALID_CN;
err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_CERT_CN_INVALID;
}else if(policyStatus.dwError) {
- WARN("policyStatus.dwError %x\n", policyStatus.dwError);
+ WARN("policyStatus.dwError %lx\n", policyStatus.dwError);
if(conn->mask_errors)
- WARN("unknown error flags for policy status %x\n", policyStatus.dwError);
+ WARN("unknown error flags for policy status %lx\n", policyStatus.dwError);
err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_INVALID_CERT;
}
}else {
@@ -192,7 +192,7 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR
}
if(err) {
- WARN("failed %u\n", err);
+ WARN("failed %lu\n", err);
CertFreeCertificateChain(chain);
if(conn->server->cert_chain) {
CertFreeCertificateChain(conn->server->cert_chain);
@@ -251,7 +251,7 @@ static BOOL ensure_cred_handle(void)
LeaveCriticalSection(&init_sechandle_cs);
if(res != SEC_E_OK) {
- WARN("Failed: %08x\n", res);
+ WARN("Failed: %08lx\n", res);
return FALSE;
}
@@ -269,7 +269,7 @@ static BOOL WINAPI winsock_startup(INIT_ONCE *once, void *param, void **context)
if(res == ERROR_SUCCESS)
winsock_loaded = TRUE;
else
- ERR("WSAStartup failed: %u\n", res);
+ ERR("WSAStartup failed: %lu\n", res);
return TRUE;
}
@@ -474,7 +474,7 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, BOOL compat_mode
if(out_buf.cbBuffer) {
assert(status == SEC_I_CONTINUE_NEEDED);
- TRACE("sending %u bytes\n", out_buf.cbBuffer);
+ TRACE("sending %lu bytes\n", out_buf.cbBuffer);
size = sock_send(connection->socket, out_buf.pvBuffer, out_buf.cbBuffer, 0);
if(size != out_buf.cbBuffer) {
@@ -522,13 +522,13 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, BOOL compat_mode
break;
}
- TRACE("recv %lu bytes\n", size);
+ TRACE("recv %Iu bytes\n", size);
in_bufs[0].cbBuffer += size;
in_bufs[0].pvBuffer = read_buf;
status = InitializeSecurityContextW(cred, &ctx, connection->server->name, isc_req_flags, 0, 0, &in_desc,
0, NULL, &out_desc, &attrs, NULL);
- TRACE("InitializeSecurityContext ret %08x\n", status);
+ TRACE("InitializeSecurityContext ret %08lx\n", status);
if(status == SEC_E_OK) {
if(SecIsValidHandle(&connection->ssl_ctx))
@@ -549,7 +549,7 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, BOOL compat_mode
res = netconn_verify_cert(connection, cert, cert->hCertStore);
CertFreeCertificateContext(cert);
if(res != ERROR_SUCCESS) {
- WARN("cert verify failed: %u\n", res);
+ WARN("cert verify failed: %lu\n", res);
break;
}
}else {
@@ -569,7 +569,7 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, BOOL compat_mode
heap_free(read_buf);
if(status != SEC_E_OK || res != ERROR_SUCCESS) {
- WARN("Failed to establish SSL connection: %08x (%u)\n", status, res);
+ WARN("Failed to establish SSL connection: %08lx (%lu)\n", status, res);
heap_free(connection->ssl_buf);
connection->ssl_buf = NULL;
return res ? res : ERROR_INTERNET_SECURITY_CHANNEL_ERROR;
@@ -775,7 +775,7 @@ static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, BOOL blo
buf_len += size;
continue;
default:
- WARN("failed: %08x\n", res);
+ WARN("failed: %08lx\n", res);
return ERROR_INTERNET_CONNECTION_ABORTED;
}
} while(res != SEC_E_OK);
@@ -862,7 +862,7 @@ DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, BOOL blocking, i
}
}while(!size && !eof);
- TRACE("received %ld bytes\n", size);
+ TRACE("received %Id bytes\n", size);
*recvd = size;
return res;
}
@@ -898,7 +898,7 @@ int NETCON_GetCipherStrength(netconn_t *connection)
res = QueryContextAttributesW(&connection->ssl_ctx, SECPKG_ATTR_CONNECTION_INFO, (void*)&conn_info);
if(res != SEC_E_OK)
- WARN("QueryContextAttributesW failed: %08x\n", res);
+ WARN("QueryContextAttributesW failed: %08lx\n", res);
return res == SEC_E_OK ? conn_info.dwCipherStrength : 0;
}
diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c
index 22d0f5bf11d..8b175ea2b3c 100644
--- a/dlls/wininet/urlcache.c
+++ b/dlls/wininet/urlcache.c
@@ -291,7 +291,7 @@ static DWORD urlcache_entry_alloc(urlcache_header *header, DWORD blocks_needed,
{
DWORD index;
- TRACE("Found free blocks starting at no. %d (0x%x)\n", block, ENTRY_START_OFFSET+block*BLOCKSIZE);
+ TRACE("Found free blocks starting at no. %ld (0x%lx)\n", block, ENTRY_START_OFFSET+block*BLOCKSIZE);
for(index=0; index<blocks_needed; index++)
urlcache_block_alloc(header->allocation_table, block+index);
@@ -650,7 +650,7 @@ static DWORD cache_container_open_index(cache_container *container, DWORD blocks
if(!container->mapping)
{
- ERR("Couldn't create file mapping (error is %d)\n", GetLastError());
+ ERR("Couldn't create file mapping (error is %ld)\n", GetLastError());
ReleaseMutex(container->mutex);
return GetLastError();
}
@@ -711,7 +711,7 @@ static BOOL cache_containers_add(const char *cache_prefix, LPCWSTR path,
if ((pContainer->mutex = CreateMutexW(NULL, FALSE, mutex_name)) == NULL)
{
- ERR("couldn't create mutex (error is %d)\n", GetLastError());
+ ERR("couldn't create mutex (error is %ld)\n", GetLastError());
heap_free(pContainer->path);
heap_free(pContainer);
return FALSE;
@@ -758,7 +758,7 @@ static void cache_containers_init(void)
if (!SHGetSpecialFolderPathW(NULL, wszCachePath, DefaultContainerData[i].nFolder, TRUE))
{
- ERR("Couldn't get path for default container %u\n", i);
+ ERR("Couldn't get path for default container %lu\n", i);
continue;
}
path_len = lstrlenW(wszCachePath);
@@ -893,7 +893,7 @@ static urlcache_header* cache_container_lock_index(cache_container *pContainer)
if (!pIndexData)
{
ReleaseMutex(pContainer->mutex);
- ERR("Couldn't MapViewOfFile. Error: %d\n", GetLastError());
+ ERR("Couldn't MapViewOfFile. Error: %ld\n", GetLastError());
return NULL;
}
pHeader = (urlcache_header*)pIndexData;
@@ -917,13 +917,13 @@ static urlcache_header* cache_container_lock_index(cache_container *pContainer)
if (!pIndexData)
{
ReleaseMutex(pContainer->mutex);
- ERR("Couldn't MapViewOfFile. Error: %d\n", GetLastError());
+ ERR("Couldn't MapViewOfFile. Error: %ld\n", GetLastError());
return NULL;
}
pHeader = (urlcache_header*)pIndexData;
}
- TRACE("Signature: %s, file size: %d bytes\n", pHeader->signature, pHeader->size);
+ TRACE("Signature: %s, file size: %ld bytes\n", pHeader->signature, pHeader->size);
for (index = 0; index < pHeader->dirs_no; index++)
{
@@ -1507,7 +1507,7 @@ static BOOL urlcache_find_hash_entry(const urlcache_header *pHeader, LPCSTR lpsz
int i;
if (pHashEntry->id != id++)
{
- ERR("Error: not right hash table number (%d) expected %d\n", pHashEntry->id, id);
+ ERR("Error: not right hash table number (%ld) expected %ld\n", pHashEntry->id, id);
continue;
}
/* make sure that it is in fact a hash entry */
@@ -1599,7 +1599,7 @@ static DWORD urlcache_hash_entry_create(urlcache_header *pHeader, LPCSTR lpszUrl
if (pHashEntry->id != id++)
{
- ERR("not right hash table number (%d) expected %d\n", pHashEntry->id, id);
+ ERR("not right hash table number (%ld) expected %ld\n", pHashEntry->id, id);
break;
}
/* make sure that it is in fact a hash entry */
@@ -1644,7 +1644,7 @@ static BOOL urlcache_enum_hash_tables(const urlcache_header *pHeader, DWORD *id,
for (*ppHashEntry = urlcache_get_hash_table(pHeader, pHeader->hash_table_off);
*ppHashEntry; *ppHashEntry = urlcache_get_hash_table(pHeader, (*ppHashEntry)->next))
{
- TRACE("looking at hash table number %d\n", (*ppHashEntry)->id);
+ TRACE("looking at hash table number %ld\n", (*ppHashEntry)->id);
if ((*ppHashEntry)->id != *id)
continue;
/* make sure that it is in fact a hash entry */
@@ -1655,7 +1655,7 @@ static BOOL urlcache_enum_hash_tables(const urlcache_header *pHeader, DWORD *id,
continue;
}
- TRACE("hash table number %d found\n", *id);
+ TRACE("hash table number %ld found\n", *id);
return TRUE;
}
return FALSE;
@@ -1681,10 +1681,10 @@ static BOOL urlcache_enum_hash_table_entries(const urlcache_header *pHeader, con
continue;
*ppHashEntry = &pHashEntry->hash_table[*index];
- TRACE("entry found %d\n", *index);
+ TRACE("entry found %ld\n", *index);
return TRUE;
}
- TRACE("no more entries (%d)\n", *index);
+ TRACE("no more entries (%ld)\n", *index);
return FALSE;
}
@@ -1763,10 +1763,10 @@ static BOOL urlcache_get_entry_info(const char *url, void *entry_info,
cache_container *container;
DWORD error;
- TRACE("(%s, %p, %p, %x, %x)\n", debugstr_a(url), entry_info, size, flags, unicode);
+ TRACE("(%s, %p, %p, %lx, %x)\n", debugstr_a(url), entry_info, size, flags, unicode);
if(flags & ~GET_INSTALLED_ENTRY)
- FIXME("ignoring unsupported flags: %x\n", flags);
+ FIXME("ignoring unsupported flags: %lx\n", flags);
error = cache_containers_find(url, &container);
if(error != ERROR_SUCCESS) {
@@ -1913,7 +1913,7 @@ static int urlcache_encode_url(const WCHAR *url, char *encoded_url, int encoded_
return 0;
len += part_len;
- TRACE("got (%d)%s\n", len, debugstr_a(encoded_url));
+ TRACE("got (%ld)%s\n", len, debugstr_a(encoded_url));
return len;
}
@@ -1995,7 +1995,7 @@ BOOL WINAPI SetUrlCacheEntryInfoA(LPCSTR lpszUrlName,
cache_container *pContainer;
DWORD error;
- TRACE("(%s, %p, 0x%08x)\n", debugstr_a(lpszUrlName), lpCacheEntryInfo, dwFieldControl);
+ TRACE("(%s, %p, 0x%08lx)\n", debugstr_a(lpszUrlName), lpCacheEntryInfo, dwFieldControl);
error = cache_containers_find(lpszUrlName, &pContainer);
if (error != ERROR_SUCCESS)
@@ -2341,7 +2341,7 @@ BOOL WINAPI FreeUrlCacheSpaceW(LPCWSTR cache_path, DWORD size, DWORD filter)
cache_container *container;
DWORD path_len, err;
- TRACE("(%s, %x, %x)\n", debugstr_w(cache_path), size, filter);
+ TRACE("(%s, %lx, %lx)\n", debugstr_w(cache_path), size, filter);
if(size<1 || size>100) {
SetLastError(ERROR_INVALID_PARAMETER);
@@ -2450,7 +2450,7 @@ BOOL WINAPI FreeUrlCacheSpaceW(LPCWSTR cache_path, DWORD size, DWORD filter)
delete_factor = delete_factor*rate_no/100;
delete_factor = rate[delete_factor];
- TRACE("deleting files with rating %d or less\n", delete_factor);
+ TRACE("deleting files with rating %ld or less\n", delete_factor);
hash_table_off = 0;
while(urlcache_next_entry(header, &hash_table_off, &hash_table_entry, &hash_entry, &entry)) {
@@ -2516,7 +2516,7 @@ BOOL WINAPI UnlockUrlCacheEntryFileA(LPCSTR lpszUrlName, DWORD dwReserved)
cache_container *pContainer;
DWORD error;
- TRACE("(%s, 0x%08x)\n", debugstr_a(lpszUrlName), dwReserved);
+ TRACE("(%s, 0x%08lx)\n", debugstr_a(lpszUrlName), dwReserved);
if (dwReserved)
{
@@ -2676,7 +2676,7 @@ static BOOL urlcache_entry_create(const char *url, const char *ext, WCHAR *full_
full_path_len = MAX_PATH * sizeof(WCHAR);
if(!urlcache_create_file_pathW(container, header, file_name, cache_dir, full_path, &full_path_len, TRUE)) {
- WARN("Failed to get full path for filename %s, needed %u bytes.\n",
+ WARN("Failed to get full path for filename %s, needed %lu bytes.\n",
debugstr_a(file_name), full_path_len);
cache_container_unlock_index(container, header);
return FALSE;
@@ -2764,7 +2764,7 @@ BOOL WINAPI CreateUrlCacheEntryA(LPCSTR lpszUrlName, DWORD dwExpectedFileSize,
WCHAR file_name[MAX_PATH];
if(dwReserved)
- FIXME("dwReserved 0x%08x\n", dwReserved);
+ FIXME("dwReserved 0x%08lx\n", dwReserved);
if(!urlcache_entry_create(lpszUrlName, lpszFileExtension, file_name))
return FALSE;
@@ -2784,7 +2784,7 @@ BOOL WINAPI CreateUrlCacheEntryW(LPCWSTR lpszUrlName, DWORD dwExpectedFileSize,
BOOL ret;
if(dwReserved)
- FIXME("dwReserved 0x%08x\n", dwReserved);
+ FIXME("dwReserved 0x%08lx\n", dwReserved);
if(lpszFileExtension) {
ext = heap_strdupWtoUTF8(lpszFileExtension);
@@ -2827,7 +2827,7 @@ static BOOL urlcache_entry_commit(const char *url, const WCHAR *file_name,
DWORD exempt_delta = 0;
DWORD error;
- TRACE("(%s, %s, ..., ..., %x, %p, %d, %s, %s)\n", debugstr_a(url), debugstr_w(file_name),
+ TRACE("(%s, %s, ..., ..., %lx, %p, %ld, %s, %s)\n", debugstr_a(url), debugstr_w(file_name),
entry_type, header_info, header_size, debugstr_a(file_ext), debugstr_a(original_url));
if(entry_type & STICKY_CACHE_ENTRY && !file_name) {
@@ -3141,7 +3141,7 @@ HANDLE WINAPI RetrieveUrlCacheEntryStreamA(LPCSTR lpszUrlName,
stream_handle *stream;
HANDLE file;
- TRACE("(%s, %p, %p, %x, 0x%08x)\n", debugstr_a(lpszUrlName), lpCacheEntryInfo,
+ TRACE("(%s, %p, %p, %x, 0x%08lx)\n", debugstr_a(lpszUrlName), lpCacheEntryInfo,
lpdwCacheEntryInfoBufferSize, fRandomRead, dwReserved);
if(!RetrieveUrlCacheEntryFileA(lpszUrlName, lpCacheEntryInfo,
@@ -3187,7 +3187,7 @@ HANDLE WINAPI RetrieveUrlCacheEntryStreamW(LPCWSTR lpszUrlName,
stream_handle *stream;
HANDLE file;
- TRACE("(%s, %p, %p, %x, 0x%08x)\n", debugstr_w(lpszUrlName), lpCacheEntryInfo,
+ TRACE("(%s, %p, %p, %x, 0x%08lx)\n", debugstr_w(lpszUrlName), lpCacheEntryInfo,
lpdwCacheEntryInfoBufferSize, fRandomRead, dwReserved);
if(!(len = urlcache_encode_url(lpszUrlName, NULL, 0)))
@@ -3321,13 +3321,13 @@ BOOL WINAPI DeleteUrlCacheEntryW(LPCWSTR lpszUrlName)
BOOL WINAPI DeleteUrlCacheContainerA(DWORD d1, DWORD d2)
{
- FIXME("(0x%08x, 0x%08x) stub\n", d1, d2);
+ FIXME("(0x%08lx, 0x%08lx) stub\n", d1, d2);
return TRUE;
}
BOOL WINAPI DeleteUrlCacheContainerW(DWORD d1, DWORD d2)
{
- FIXME("(0x%08x, 0x%08x) stub\n", d1, d2);
+ FIXME("(0x%08lx, 0x%08lx) stub\n", d1, d2);
return TRUE;
}
@@ -3337,7 +3337,7 @@ BOOL WINAPI DeleteUrlCacheContainerW(DWORD d1, DWORD d2)
BOOL WINAPI CreateUrlCacheContainerA(DWORD d1, DWORD d2, DWORD d3, DWORD d4,
DWORD d5, DWORD d6, DWORD d7, DWORD d8)
{
- FIXME("(0x%08x, 0x%08x, 0x%08x, 0x%08x, 0x%08x, 0x%08x, 0x%08x, 0x%08x) stub\n",
+ FIXME("(0x%08lx, 0x%08lx, 0x%08lx, 0x%08lx, 0x%08lx, 0x%08lx, 0x%08lx, 0x%08lx) stub\n",
d1, d2, d3, d4, d5, d6, d7, d8);
return TRUE;
}
@@ -3348,7 +3348,7 @@ BOOL WINAPI CreateUrlCacheContainerA(DWORD d1, DWORD d2, DWORD d3, DWORD d4,
BOOL WINAPI CreateUrlCacheContainerW(DWORD d1, DWORD d2, DWORD d3, DWORD d4,
DWORD d5, DWORD d6, DWORD d7, DWORD d8)
{
- FIXME("(0x%08x, 0x%08x, 0x%08x, 0x%08x, 0x%08x, 0x%08x, 0x%08x, 0x%08x) stub\n",
+ FIXME("(0x%08lx, 0x%08lx, 0x%08lx, 0x%08lx, 0x%08lx, 0x%08lx, 0x%08lx, 0x%08lx) stub\n",
d1, d2, d3, d4, d5, d6, d7, d8);
return TRUE;
}
@@ -3358,7 +3358,7 @@ BOOL WINAPI CreateUrlCacheContainerW(DWORD d1, DWORD d2, DWORD d3, DWORD d4,
*/
HANDLE WINAPI FindFirstUrlCacheContainerA( LPVOID p1, LPVOID p2, LPVOID p3, DWORD d1 )
{
- FIXME("(%p, %p, %p, 0x%08x) stub\n", p1, p2, p3, d1 );
+ FIXME("(%p, %p, %p, 0x%08lx) stub\n", p1, p2, p3, d1 );
return NULL;
}
@@ -3367,7 +3367,7 @@ HANDLE WINAPI FindFirstUrlCacheContainerA( LPVOID p1, LPVOID p2, LPVOID p3, DWOR
*/
HANDLE WINAPI FindFirstUrlCacheContainerW( LPVOID p1, LPVOID p2, LPVOID p3, DWORD d1 )
{
- FIXME("(%p, %p, %p, 0x%08x) stub\n", p1, p2, p3, d1 );
+ FIXME("(%p, %p, %p, 0x%08lx) stub\n", p1, p2, p3, d1 );
return NULL;
}
@@ -3401,7 +3401,7 @@ HANDLE WINAPI FindFirstUrlCacheEntryExA(
LPVOID lpReserved3
)
{
- FIXME("(%s, 0x%08x, 0x%08x, 0x%s, %p, %p, %p, %p, %p) stub\n", debugstr_a(lpszUrlSearchPattern),
+ FIXME("(%s, 0x%08lx, 0x%08lx, 0x%s, %p, %p, %p, %p, %p) stub\n", debugstr_a(lpszUrlSearchPattern),
dwFlags, dwFilter, wine_dbgstr_longlong(GroupId), lpFirstCacheEntryInfo,
lpdwFirstCacheEntryInfoBufferSize, lpReserved, pcbReserved2,lpReserved3);
SetLastError(ERROR_FILE_NOT_FOUND);
@@ -3420,7 +3420,7 @@ HANDLE WINAPI FindFirstUrlCacheEntryExW(
LPVOID lpReserved3
)
{
- FIXME("(%s, 0x%08x, 0x%08x, 0x%s, %p, %p, %p, %p, %p) stub\n", debugstr_w(lpszUrlSearchPattern),
+ FIXME("(%s, 0x%08lx, 0x%08lx, 0x%s, %p, %p, %p, %p, %p) stub\n", debugstr_w(lpszUrlSearchPattern),
dwFlags, dwFilter, wine_dbgstr_longlong(GroupId), lpFirstCacheEntryInfo,
lpdwFirstCacheEntryInfoBufferSize, lpReserved, pcbReserved2,lpReserved3);
SetLastError(ERROR_FILE_NOT_FOUND);
@@ -3642,7 +3642,7 @@ BOOL WINAPI FindCloseUrlCache(HANDLE hEnumHandle)
HANDLE WINAPI FindFirstUrlCacheGroup( DWORD dwFlags, DWORD dwFilter, LPVOID lpSearchCondition,
DWORD dwSearchCondition, GROUPID* lpGroupId, LPVOID lpReserved )
{
- FIXME("(0x%08x, 0x%08x, %p, 0x%08x, %p, %p) stub\n", dwFlags, dwFilter, lpSearchCondition,
+ FIXME("(0x%08lx, 0x%08lx, %p, 0x%08lx, %p, %p) stub\n", dwFlags, dwFilter, lpSearchCondition,
dwSearchCondition, lpGroupId, lpReserved);
return NULL;
}
@@ -3687,7 +3687,7 @@ BOOL WINAPI FindNextUrlCacheGroup( HANDLE hFind, GROUPID* lpGroupId, LPVOID lpRe
*/
INTERNETAPI GROUPID WINAPI CreateUrlCacheGroup(DWORD dwFlags, LPVOID lpReserved)
{
- FIXME("(0x%08x, %p): stub\n", dwFlags, lpReserved);
+ FIXME("(0x%08lx, %p): stub\n", dwFlags, lpReserved);
return FALSE;
}
@@ -3697,7 +3697,7 @@ INTERNETAPI GROUPID WINAPI CreateUrlCacheGroup(DWORD dwFlags, LPVOID lpReserved)
*/
BOOL WINAPI DeleteUrlCacheGroup(GROUPID GroupId, DWORD dwFlags, LPVOID lpReserved)
{
- FIXME("(0x%s, 0x%08x, %p) stub\n",
+ FIXME("(0x%s, 0x%08lx, %p) stub\n",
wine_dbgstr_longlong(GroupId), dwFlags, lpReserved);
return FALSE;
}
@@ -3708,7 +3708,7 @@ BOOL WINAPI DeleteUrlCacheGroup(GROUPID GroupId, DWORD dwFlags, LPVOID lpReserve
*/
BOOL WINAPI DeleteWpadCacheForNetworks(DWORD unk1)
{
- FIXME("(%d) stub\n", unk1);
+ FIXME("(%ld) stub\n", unk1);
return FALSE;
}
@@ -3720,7 +3720,7 @@ BOOL WINAPI SetUrlCacheEntryGroupA(LPCSTR lpszUrlName, DWORD dwFlags,
GROUPID GroupId, LPBYTE pbGroupAttributes, DWORD cbGroupAttributes,
LPVOID lpReserved)
{
- FIXME("(%s, 0x%08x, 0x%s, %p, 0x%08x, %p) stub\n",
+ FIXME("(%s, 0x%08lx, 0x%s, %p, 0x%08lx, %p) stub\n",
debugstr_a(lpszUrlName), dwFlags, wine_dbgstr_longlong(GroupId),
pbGroupAttributes, cbGroupAttributes, lpReserved);
SetLastError(ERROR_FILE_NOT_FOUND);
@@ -3735,7 +3735,7 @@ BOOL WINAPI SetUrlCacheEntryGroupW(LPCWSTR lpszUrlName, DWORD dwFlags,
GROUPID GroupId, LPBYTE pbGroupAttributes, DWORD cbGroupAttributes,
LPVOID lpReserved)
{
- FIXME("(%s, 0x%08x, 0x%s, %p, 0x%08x, %p) stub\n",
+ FIXME("(%s, 0x%08lx, 0x%s, %p, 0x%08lx, %p) stub\n",
debugstr_w(lpszUrlName), dwFlags, wine_dbgstr_longlong(GroupId),
pbGroupAttributes, cbGroupAttributes, lpReserved);
SetLastError(ERROR_FILE_NOT_FOUND);
@@ -3767,7 +3767,7 @@ static cache_container *find_container(DWORD flags)
break;
default:
- FIXME("flags %08x not handled\n", flags);
+ FIXME("flags %08lx not handled\n", flags);
break;
}
}
@@ -3783,7 +3783,7 @@ BOOL WINAPI GetUrlCacheConfigInfoW(LPINTERNET_CACHE_CONFIG_INFOW info, LPDWORD s
cache_container *container;
DWORD error;
- FIXME("(%p, %p, %x): semi-stub\n", info, size, flags);
+ FIXME("(%p, %p, %lx): semi-stub\n", info, size, flags);
if (!info || !(container = find_container(flags)))
{
@@ -3823,7 +3823,7 @@ BOOL WINAPI GetUrlCacheConfigInfoA(LPINTERNET_CACHE_CONFIG_INFOA info, LPDWORD s
{
INTERNET_CACHE_CONFIG_INFOW infoW;
- TRACE("(%p, %p, %x)\n", info, size, flags);
+ TRACE("(%p, %p, %lx)\n", info, size, flags);
if (!info)
{
@@ -3853,7 +3853,7 @@ BOOL WINAPI GetUrlCacheGroupAttributeA( GROUPID gid, DWORD dwFlags, DWORD dwAttr
LPINTERNET_CACHE_GROUP_INFOA lpGroupInfo,
LPDWORD lpdwGroupInfo, LPVOID lpReserved )
{
- FIXME("(0x%s, 0x%08x, 0x%08x, %p, %p, %p) stub\n",
+ FIXME("(0x%s, 0x%08lx, 0x%08lx, %p, %p, %p) stub\n",
wine_dbgstr_longlong(gid), dwFlags, dwAttributes, lpGroupInfo,
lpdwGroupInfo, lpReserved);
return FALSE;
@@ -3863,7 +3863,7 @@ BOOL WINAPI GetUrlCacheGroupAttributeW( GROUPID gid, DWORD dwFlags, DWORD dwAttr
LPINTERNET_CACHE_GROUP_INFOW lpGroupInfo,
LPDWORD lpdwGroupInfo, LPVOID lpReserved )
{
- FIXME("(0x%s, 0x%08x, 0x%08x, %p, %p, %p) stub\n",
+ FIXME("(0x%s, 0x%08lx, 0x%08lx, %p, %p, %p) stub\n",
wine_dbgstr_longlong(gid), dwFlags, dwAttributes, lpGroupInfo,
lpdwGroupInfo, lpReserved);
return FALSE;
@@ -3872,7 +3872,7 @@ BOOL WINAPI GetUrlCacheGroupAttributeW( GROUPID gid, DWORD dwFlags, DWORD dwAttr
BOOL WINAPI SetUrlCacheGroupAttributeA( GROUPID gid, DWORD dwFlags, DWORD dwAttributes,
LPINTERNET_CACHE_GROUP_INFOA lpGroupInfo, LPVOID lpReserved )
{
- FIXME("(0x%s, 0x%08x, 0x%08x, %p, %p) stub\n",
+ FIXME("(0x%s, 0x%08lx, 0x%08lx, %p, %p) stub\n",
wine_dbgstr_longlong(gid), dwFlags, dwAttributes, lpGroupInfo, lpReserved);
return TRUE;
}
@@ -3880,20 +3880,20 @@ BOOL WINAPI SetUrlCacheGroupAttributeA( GROUPID gid, DWORD dwFlags, DWORD dwAttr
BOOL WINAPI SetUrlCacheGroupAttributeW( GROUPID gid, DWORD dwFlags, DWORD dwAttributes,
LPINTERNET_CACHE_GROUP_INFOW lpGroupInfo, LPVOID lpReserved )
{
- FIXME("(0x%s, 0x%08x, 0x%08x, %p, %p) stub\n",
+ FIXME("(0x%s, 0x%08lx, 0x%08lx, %p, %p) stub\n",
wine_dbgstr_longlong(gid), dwFlags, dwAttributes, lpGroupInfo, lpReserved);
return TRUE;
}
BOOL WINAPI SetUrlCacheConfigInfoA( LPINTERNET_CACHE_CONFIG_INFOA lpCacheConfigInfo, DWORD dwFieldControl )
{
- FIXME("(%p, 0x%08x) stub\n", lpCacheConfigInfo, dwFieldControl);
+ FIXME("(%p, 0x%08lx) stub\n", lpCacheConfigInfo, dwFieldControl);
return TRUE;
}
BOOL WINAPI SetUrlCacheConfigInfoW( LPINTERNET_CACHE_CONFIG_INFOW lpCacheConfigInfo, DWORD dwFieldControl )
{
- FIXME("(%p, 0x%08x) stub\n", lpCacheConfigInfo, dwFieldControl);
+ FIXME("(%p, 0x%08lx) stub\n", lpCacheConfigInfo, dwFieldControl);
return TRUE;
}
@@ -3949,12 +3949,12 @@ BOOL WINAPI IsUrlCacheEntryExpiredA(LPCSTR url, DWORD dwFlags, FILETIME* pftLast
cache_container *pContainer;
BOOL expired;
- TRACE("(%s, %08x, %p)\n", debugstr_a(url), dwFlags, pftLastModified);
+ TRACE("(%s, %08lx, %p)\n", debugstr_a(url), dwFlags, pftLastModified);
if (!url || !pftLastModified)
return TRUE;
if (dwFlags)
- FIXME("unknown flags 0x%08x\n", dwFlags);
+ FIXME("unknown flags 0x%08lx\n", dwFlags);
/* Any error implies that the URL is expired, i.e. not in the cache */
if (cache_containers_find(url, &pContainer))
@@ -4051,7 +4051,7 @@ BOOL WINAPI GetDiskInfoA(PCSTR path, PDWORD cluster_size, PDWORDLONG free, PDWOR
*/
DWORD WINAPI RegisterUrlCacheNotification(LPVOID a, DWORD b, DWORD c, DWORD d, DWORD e, DWORD f)
{
- FIXME("(%p %x %x %x %x %x)\n", a, b, c, d, e, f);
+ FIXME("(%p %lx %lx %lx %lx %lx)\n", a, b, c, d, e, f);
return 0;
}
@@ -4060,7 +4060,7 @@ DWORD WINAPI RegisterUrlCacheNotification(LPVOID a, DWORD b, DWORD c, DWORD d, D
*/
BOOL WINAPI IncrementUrlCacheHeaderData(DWORD index, LPDWORD data)
{
- FIXME("(%u, %p)\n", index, data);
+ FIXME("(%lu, %p)\n", index, data);
return FALSE;
}
diff --git a/dlls/wininet/utility.c b/dlls/wininet/utility.c
index ba58c264c92..96d9d520ad9 100644
--- a/dlls/wininet/utility.c
+++ b/dlls/wininet/utility.c
@@ -225,7 +225,7 @@ static const char *debugstr_status_info(DWORD status, void *info)
switch(status) {
case INTERNET_STATUS_REQUEST_COMPLETE: {
INTERNET_ASYNC_RESULT *iar = info;
- return wine_dbg_sprintf("{%s, %d}", wine_dbgstr_longlong(iar->dwResult), iar->dwError);
+ return wine_dbg_sprintf("{%s, %ld}", wine_dbgstr_longlong(iar->dwResult), iar->dwError);
}
default:
return wine_dbg_sprintf("%p", info);
@@ -264,7 +264,7 @@ void INTERNET_SendCallback(object_header_t *hdr, DWORD_PTR context, DWORD status
}
}
- TRACE(" callback(%p) (%p (%p), %08lx, %d (%s), %s, %d)\n",
+ TRACE(" callback(%p) (%p (%p), %08Ix, %ld (%s), %s, %ld)\n",
hdr->lpfnStatusCB, hdr->hInternet, hdr, context, status, get_callback_name(status),
debugstr_status_info(status, new_info), info_len);
More information about the wine-devel
mailing list