Skip to content

W
wine-winehq
Commit cd2c4585 authored by Hans Leidekker's avatar Hans Leidekker Committed by Alexandre Julliard
Browse files
Options

wininet: Win64 printf format warning fixes.

parent de3b5be3
Hide whitespace changes
Inline Side-by-side
Showing with 150 additions and 150 deletions
dlls/wininet/Makefile.in
View file @ cd2c4585
EXTRADEFS = -D_WINX32_ -DWINE_NO_LONG_AS_INT
EXTRADEFS = -D_WINX32_
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
......
dlls/wininet/cookie.c
View file @ cd2c4585
......@@ -519,7 +519,7 @@ BOOL WINAPI InternetSetCookieA(LPCSTR lpszUrl, LPCSTR lpszCookieName,
DWORD WINAPI InternetSetCookieExA( LPCSTR lpszURL, LPCSTR lpszCookieName, LPCSTR lpszCookieData,
DWORD dwFlags, DWORD_PTR dwReserved)
{
FIXME("(%s, %s, %s, 0x%08lx, 0x%08lx) stub\n",
FIXME("(%s, %s, %s, 0x%08x, 0x%08lx) stub\n",
debugstr_a(lpszURL), debugstr_a(lpszCookieName), debugstr_a(lpszCookieData),
dwFlags, dwReserved);
return TRUE;
......@@ -538,7 +538,7 @@ DWORD WINAPI InternetSetCookieExA( LPCSTR lpszURL, LPCSTR lpszCookieName, LPCSTR
DWORD WINAPI InternetSetCookieExW( LPCWSTR lpszURL, LPCWSTR lpszCookieName, LPCWSTR lpszCookieData,
DWORD dwFlags, DWORD_PTR dwReserved)
{
FIXME("(%s, %s, %s, 0x%08lx, 0x%08lx) stub\n",
FIXME("(%s, %s, %s, 0x%08x, 0x%08lx) stub\n",
debugstr_w(lpszURL), debugstr_w(lpszCookieName), debugstr_w(lpszCookieData),
dwFlags, dwReserved);
return TRUE;
......@@ -552,7 +552,7 @@ DWORD WINAPI InternetSetCookieExW( LPCWSTR lpszURL, LPCWSTR lpszCookieName, LPCW
BOOL WINAPI InternetGetCookieExA( LPCSTR pchURL, LPCSTR pchCookieName, LPSTR pchCookieData,
LPDWORD pcchCookieData, DWORD dwFlags, LPVOID lpReserved)
{
FIXME("(%s, %s, %s, %p, 0x%08lx, %p) stub\n",
FIXME("(%s, %s, %s, %p, 0x%08x, %p) stub\n",
debugstr_a(pchURL), debugstr_a(pchCookieName), debugstr_a(pchCookieData),
pcchCookieData, dwFlags, lpReserved);
return FALSE;
......@@ -571,7 +571,7 @@ BOOL WINAPI InternetGetCookieExA( LPCSTR pchURL, LPCSTR pchCookieName, LPSTR pch
BOOL WINAPI InternetGetCookieExW( LPCWSTR pchURL, LPCWSTR pchCookieName, LPWSTR pchCookieData,
LPDWORD pcchCookieData, DWORD dwFlags, LPVOID lpReserved)
{
FIXME("(%s, %s, %s, %p, 0x%08lx, %p) stub\n",
FIXME("(%s, %s, %s, %p, 0x%08x, %p) stub\n",
debugstr_w(pchURL), debugstr_w(pchCookieName), debugstr_w(pchCookieData),
pcchCookieData, dwFlags, lpReserved);
return FALSE;
......@@ -647,7 +647,7 @@ BOOL WINAPI InternetGetPerSiteCookieDecisionW( LPCWSTR pwchHostName, unsigned lo
*/
BOOL WINAPI InternetSetPerSiteCookieDecisionA( LPCSTR pchHostName, DWORD dwDecision )
{
FIXME("(%s, 0x%08lx) stub\n", debugstr_a(pchHostName), dwDecision);
FIXME("(%s, 0x%08x) stub\n", debugstr_a(pchHostName), dwDecision);
return FALSE;
}
......@@ -656,6 +656,6 @@ BOOL WINAPI InternetSetPerSiteCookieDecisionA( LPCSTR pchHostName, DWORD dwDecis
*/
BOOL WINAPI InternetSetPerSiteCookieDecisionW( LPCWSTR pchHostName, DWORD dwDecision )
{
FIXME("(%s, 0x%08lx) stub\n", debugstr_w(pchHostName), dwDecision);
FIXME("(%s, 0x%08x) stub\n", debugstr_w(pchHostName), dwDecision);
return FALSE;
}
dlls/wininet/dialogs.c
View file @ cd2c4585
......@@ -336,7 +336,7 @@ static INT WININET_GetConnectionStatus( HINTERNET hRequest )
return -1;
dwStatus = atoiW( szStatus );
TRACE("request %p status = %ld\n", hRequest, dwStatus );
TRACE("request %p status = %d\n", hRequest, dwStatus );
return dwStatus;
}
......@@ -352,7 +352,7 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest,
HMODULE hwininet = GetModuleHandleA( "wininet.dll" );
INT dwStatus;
TRACE("%p %p %ld %08lx %p\n", hWnd, hRequest, dwError, dwFlags, lppvData);
TRACE("%p %p %d %08x %p\n", hWnd, hRequest, dwError, dwFlags, lppvData);
params.hWnd = hWnd;
params.hRequest = hRequest;
......@@ -380,7 +380,7 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest,
case ERROR_INTERNET_POST_IS_NON_SECURE:
case ERROR_INTERNET_SEC_CERT_CN_INVALID:
case ERROR_INTERNET_SEC_CERT_DATE_INVALID:
FIXME("Need to display dialog for error %ld\n", dwError);
FIXME("Need to display dialog for error %d\n", dwError);
return ERROR_SUCCESS;
}
return ERROR_INVALID_PARAMETER;
......
dlls/wininet/ftp.c
View file @ cd2c4585
......@@ -791,7 +791,7 @@ BOOL WINAPI FtpGetCurrentDirectoryW(HINTERNET hFtpSession, LPWSTR lpszCurrentDir
LPWININETAPPINFOW hIC = NULL;
BOOL r = FALSE;
TRACE("len(%ld)\n", *lpdwCurrentDirectory);
TRACE("len(%d)\n", *lpdwCurrentDirectory);
lpwfs = (LPWININETFTPSESSIONW) WININET_GetObject( hFtpSession );
if (NULL == lpwfs || WH_HFTPSESSION != lpwfs->hdr.htype)
......@@ -845,7 +845,7 @@ BOOL WINAPI FTP_FtpGetCurrentDirectoryW(LPWININETFTPSESSIONW lpwfs, LPWSTR lpszC
LPWININETAPPINFOW hIC = NULL;
DWORD bSuccess = FALSE;
TRACE("len(%ld)\n", *lpdwCurrentDirectory);
TRACE("len(%d)\n", *lpdwCurrentDirectory);
if (NULL == lpwfs || WH_HFTPSESSION != lpwfs->hdr.htype)
{
......@@ -948,7 +948,7 @@ HINTERNET WINAPI FtpOpenFileW(HINTERNET hFtpSession,
LPWININETAPPINFOW hIC = NULL;
HINTERNET r = NULL;
TRACE("(%p,%s,0x%08lx,0x%08lx,0x%08lx)\n", hFtpSession,
TRACE("(%p,%s,0x%08x,0x%08x,0x%08x)\n", hFtpSession,
debugstr_w(lpszFileName), fdwAccess, dwFlags, dwContext);
lpwfs = (LPWININETFTPSESSIONW) WININET_GetObject( hFtpSession );
......@@ -1638,7 +1638,7 @@ lend:
BOOL WINAPI FtpCommandA( HINTERNET hConnect, BOOL fExpectResponse, DWORD dwFlags,
LPCSTR lpszCommand, DWORD_PTR dwContext, HINTERNET* phFtpCommand )
{
FIXME("%p %d 0x%08lx %s 0x%08lx %p\n", hConnect, fExpectResponse, dwFlags,
FIXME("%p %d 0x%08x %s 0x%08lx %p\n", hConnect, fExpectResponse, dwFlags,
debugstr_a(lpszCommand), dwContext, phFtpCommand);
return TRUE;
......@@ -1650,7 +1650,7 @@ BOOL WINAPI FtpCommandA( HINTERNET hConnect, BOOL fExpectResponse, DWORD dwFlags
BOOL WINAPI FtpCommandW( HINTERNET hConnect, BOOL fExpectResponse, DWORD dwFlags,
LPCWSTR lpszCommand, DWORD_PTR dwContext, HINTERNET* phFtpCommand )
{
FIXME("%p %d 0x%08lx %s 0x%08lx %p\n", hConnect, fExpectResponse, dwFlags,
FIXME("%p %d 0x%08x %s 0x%08lx %p\n", hConnect, fExpectResponse, dwFlags,
debugstr_w(lpszCommand), dwContext, phFtpCommand);
return TRUE;
......@@ -1938,7 +1938,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(%ld)\n", buf, len);
TRACE("Sending (%s) len(%d)\n", buf, len);
while((nBytesSent < len) && (nRC != -1))
{
nRC = send(nSocket, buf+nBytesSent, len - nBytesSent, 0);
......@@ -1958,7 +1958,7 @@ static BOOL FTP_SendCommandA(INT nSocket, FTP_COMMAND ftpCmd, LPCSTR lpszParam,
}
}
TRACE("Sent %ld bytes\n", nBytesSent);
TRACE("Sent %d bytes\n", nBytesSent);
return (nRC != -1);
}
......@@ -2546,13 +2546,13 @@ static BOOL FTP_SendData(LPWININETFTPSESSIONW lpwfs, INT nDataSocket, HANDLE hFi
nSeconds = e_long_time - s_long_time;
if( nSeconds / 60 > 0 )
{
TRACE( "%ld bytes of %ld bytes (%ld%%) in %ld min %ld sec estimated remaining time %ld sec\n",
TRACE( "%d bytes of %d bytes (%d%%) in %d min %d sec estimated remaining time %d sec\n",
nTotalSent, fi.nFileSizeLow, nTotalSent*100/fi.nFileSizeLow, nSeconds / 60,
nSeconds % 60, (fi.nFileSizeLow - nTotalSent) * nSeconds / nTotalSent );
}
else
{
TRACE( "%ld bytes of %ld bytes (%ld%%) in %ld sec estimated remaining time %ld sec\n",
TRACE( "%d bytes of %d bytes (%d%%) in %d sec estimated remaining time %d sec\n",
nTotalSent, fi.nFileSizeLow, nTotalSent*100/fi.nFileSizeLow, nSeconds,
(fi.nFileSizeLow - nTotalSent) * nSeconds / nTotalSent);
}
......@@ -2594,7 +2594,7 @@ static DWORD FTP_SendRetrieve(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszRemoteFile
if (!FTP_GetFileSize(lpwfs, lpszRemoteFile, &nResult))
goto lend;
TRACE("Waiting to receive %ld bytes\n", nResult);
TRACE("Waiting to receive %d bytes\n", nResult);
if (!FTP_SendCommand(lpwfs->sndSocket, FTP_CMD_RETR, lpszRemoteFile, 0, 0, 0))
goto lend;
......@@ -2657,7 +2657,7 @@ static BOOL FTP_RetrieveFileData(LPWININETFTPSESSIONW lpwfs, INT nDataSocket, DW
nBytesReceived += nRC;
}
TRACE("%ld bytes of %ld (%ld%%)\r", nBytesReceived, nBytes,
TRACE("%d bytes of %d (%d%%)\r", nBytesReceived, nBytes,
nBytesReceived * 100 / nBytes);
}
......@@ -2775,7 +2775,7 @@ static HINTERNET FTP_ReceiveFileList(LPWININETFTPSESSIONW lpwfs, INT nSocket, LP
LPWININETFINDNEXTW lpwfn = NULL;
HINTERNET handle = 0;
TRACE("(%p,%d,%s,%p,%ld)\n", lpwfs, nSocket, debugstr_w(lpszSearchFile), lpFindFileData, dwContext);
TRACE("(%p,%d,%s,%p,%d)\n", lpwfs, nSocket, debugstr_w(lpszSearchFile), lpFindFileData, dwContext);
if (FTP_ParseDirectory(lpwfs, nSocket, lpszSearchFile, &lpafp, &dwSize))
{
......@@ -2802,7 +2802,7 @@ static HINTERNET FTP_ReceiveFileList(LPWININETFTPSESSIONW lpwfs, INT nSocket, LP
if( lpwfn )
WININET_Release( &lpwfn->hdr );
TRACE("Matched %ld files\n", dwSize);
TRACE("Matched %d files\n", dwSize);
return handle;
}
......@@ -2984,7 +2984,7 @@ static BOOL FTP_ParseNextFile(INT nSocket, LPCWSTR lpszSearchFile, LPFILEPROPERT
else {
lpfp->bIsDirectory = FALSE;
lpfp->nSize = atol(pszToken);
TRACE("Size: %ld\n", lpfp->nSize);
TRACE("Size: %d\n", lpfp->nSize);
}
pszToken = strtok(NULL, szSpace);
......
dlls/wininet/http.c
View file @ cd2c4585
......@@ -460,7 +460,7 @@ BOOL WINAPI HttpAddRequestHeadersW(HINTERNET hHttpRequest,
BOOL bSuccess = FALSE;
LPWININETHTTPREQW lpwhr;
TRACE("%p, %s, %li, %li\n", hHttpRequest, debugstr_w(lpszHeader), dwHeaderLength,
TRACE("%p, %s, %i, %i\n", hHttpRequest, debugstr_w(lpszHeader), dwHeaderLength,
dwModifier);
if (!lpszHeader)
......@@ -497,7 +497,7 @@ BOOL WINAPI HttpAddRequestHeadersA(HINTERNET hHttpRequest,
LPWSTR hdr;
BOOL r;
TRACE("%p, %s, %li, %li\n", hHttpRequest, debugstr_a(lpszHeader), dwHeaderLength,
TRACE("%p, %s, %i, %i\n", hHttpRequest, debugstr_a(lpszHeader), dwHeaderLength,
dwModifier);
len = MultiByteToWideChar( CP_ACP, 0, lpszHeader, dwHeaderLength, NULL, 0 );
......@@ -530,7 +530,7 @@ BOOL WINAPI HttpEndRequestA(HINTERNET hRequest,
LPINTERNET_BUFFERSW lpBuffersOutW,ptrW;
BOOL rc = FALSE;
TRACE("(%p, %p, %08lx, %08lx): stub\n", hRequest, lpBuffersOut, dwFlags,
TRACE("(%p, %p, %08x, %08x): stub\n", hRequest, lpBuffersOut, dwFlags,
dwContext);
ptr = lpBuffersOut;
......@@ -663,7 +663,7 @@ HINTERNET WINAPI HttpOpenRequestW(HINTERNET hHttpSession,
LPWININETHTTPSESSIONW lpwhs;
HINTERNET handle = NULL;
TRACE("(%p, %s, %s, %s, %s, %p, %08lx, %08lx)\n", hHttpSession,
TRACE("(%p, %s, %s, %s, %s, %p, %08x, %08x)\n", hHttpSession,
debugstr_w(lpszVerb), debugstr_w(lpszObjectName),
debugstr_w(lpszVersion), debugstr_w(lpszReferrer), lpszAcceptTypes,
dwFlags, dwContext);
......@@ -719,7 +719,7 @@ HINTERNET WINAPI HttpOpenRequestA(HINTERNET hHttpSession,
INT len;
INT acceptTypesCount;
HINTERNET rc = FALSE;
TRACE("(%p, %s, %s, %s, %s, %p, %08lx, %08lx)\n", hHttpSession,
TRACE("(%p, %s, %s, %s, %s, %p, %08x, %08x)\n", hHttpSession,
debugstr_a(lpszVerb), debugstr_a(lpszObjectName),
debugstr_a(lpszVersion), debugstr_a(lpszReferrer), lpszAcceptTypes,
dwFlags, dwContext);
......@@ -1035,7 +1035,7 @@ HINTERNET WINAPI HTTP_HttpOpenRequestW(LPWININETHTTPSESSIONW lpwhs,
URL_ESCAPE_SPACES_ONLY);
if (rc)
{
ERR("Unable to escape string!(%s) (%ld)\n",debugstr_w(lpszObjectName),rc);
ERR("Unable to escape string!(%s) (%d)\n",debugstr_w(lpszObjectName),rc);
strcpyW(lpwhr->lpszPath,lpszObjectName);
}
}
......@@ -1577,7 +1577,7 @@ BOOL WINAPI HttpQueryInfoW(HINTERNET hHttpRequest, DWORD dwInfoLevel,
DWORD info = dwInfoLevel & HTTP_QUERY_HEADER_MASK;
DWORD i;
TRACE("(%p, 0x%08lx)--> %ld\n", hHttpRequest, dwInfoLevel, dwInfoLevel);
TRACE("(%p, 0x%08x)--> %d\n", hHttpRequest, dwInfoLevel, dwInfoLevel);
TRACE(" Attribute:");
for (i = 0; i < (sizeof(query_flags) / sizeof(query_flags[0])); i++) {
if (query_flags[i].val == info) {
......@@ -1586,7 +1586,7 @@ BOOL WINAPI HttpQueryInfoW(HINTERNET hHttpRequest, DWORD dwInfoLevel,
}
}
if (i == (sizeof(query_flags) / sizeof(query_flags[0]))) {
TRACE(" Unknown (%08lx)", info);
TRACE(" Unknown (%08x)", info);
}
TRACE(" Modifier:");
......@@ -1598,7 +1598,7 @@ BOOL WINAPI HttpQueryInfoW(HINTERNET hHttpRequest, DWORD dwInfoLevel,
}
if (info_mod) {
TRACE(" Unknown (%08lx)", info_mod);
TRACE(" Unknown (%08x)", info_mod);
}
TRACE("\n");
}
......@@ -1690,7 +1690,7 @@ BOOL WINAPI HttpSendRequestExA(HINTERNET hRequest,
BOOL rc = FALSE;
DWORD headerlen;
TRACE("(%p, %p, %p, %08lx, %08lx): stub\n", hRequest, lpBuffersIn,
TRACE("(%p, %p, %p, %08x, %08x): stub\n", hRequest, lpBuffersIn,
lpBuffersOut, dwFlags, dwContext);
if (lpBuffersIn)
......@@ -1748,7 +1748,7 @@ BOOL WINAPI HttpSendRequestExW(HINTERNET hRequest,
LPWININETHTTPSESSIONW lpwhs;
LPWININETAPPINFOW hIC;
TRACE("(%p, %p, %p, %08lx, %08lx)\n", hRequest, lpBuffersIn,
TRACE("(%p, %p, %p, %08x, %08x)\n", hRequest, lpBuffersIn,
lpBuffersOut, dwFlags, dwContext);
lpwhr = (LPWININETHTTPREQW) WININET_GetObject( hRequest );
......@@ -1832,7 +1832,7 @@ BOOL WINAPI HttpSendRequestW(HINTERNET hHttpRequest, LPCWSTR lpszHeaders,
LPWININETAPPINFOW hIC = NULL;
BOOL r;
TRACE("%p, %p (%s), %li, %p, %li)\n", hHttpRequest,
TRACE("%p, %p (%s), %i, %p, %i)\n", hHttpRequest,
lpszHeaders, debugstr_w(lpszHeaders), dwHeaderLength, lpOptional, dwOptionalLength);
lpwhr = (LPWININETHTTPREQW) WININET_GetObject( hHttpRequest );
......@@ -2129,7 +2129,7 @@ static BOOL HTTP_HandleRedirect(LPWININETHTTPREQW lpwhr, LPCWSTR lpszUrl, LPCWST
URL_ESCAPE_SPACES_ONLY);
if (rc)
{
ERR("Unable to escape string!(%s) (%ld)\n",debugstr_w(path),rc);
ERR("Unable to escape string!(%s) (%d)\n",debugstr_w(path),rc);
strcpyW(lpwhr->lpszPath,path);
}
}
......@@ -2780,7 +2780,7 @@ static BOOL HTTP_ProcessHeader(LPWININETHTTPREQW lpwhr, LPCWSTR field, LPCWSTR v
static const WCHAR szConnection[] = { 'C','o','n','n','e','c','t','i','o','n',0 };
BOOL request_only = dwModifier & HTTP_ADDHDR_FLAG_REQ;
TRACE("--> %s: %s - 0x%08lx\n", debugstr_w(field), debugstr_w(value), dwModifier);
TRACE("--> %s: %s - 0x%08x\n", debugstr_w(field), debugstr_w(value), dwModifier);
/* Don't let applications add Connection header to request */
if (strcmpW(szConnection,field)==0 && (dwModifier & HTTP_ADDHDR_FLAG_REQ))
......@@ -3006,7 +3006,7 @@ static INT HTTP_GetCustomHeaderIndex(LPWININETHTTPREQW lpwhr, LPCWSTR lpszField,
if (index >= lpwhr->nCustHeaders)
index = -1;
TRACE("Return: %ld\n", index);
TRACE("Return: %d\n", index);
return index;
}
......@@ -3078,6 +3078,6 @@ static BOOL HTTP_DeleteCustomHeader(LPWININETHTTPREQW lpwhr, DWORD index)
*/
BOOL WINAPI IsHostInProxyBypassList(DWORD flags, LPCSTR szHost, DWORD length)
{
FIXME("STUB: flags=%ld host=%s length=%ld\n",flags,szHost,length);
FIXME("STUB: flags=%d host=%s length=%d\n",flags,szHost,length);
return FALSE;
}
dlls/wininet/internet.c
View file @ cd2c4585
......@@ -181,7 +181,7 @@ HINTERNET WININET_FindHandle( LPWININETHANDLEHEADER info )
LPWININETHANDLEHEADER WININET_AddRef( LPWININETHANDLEHEADER info )
{
info->dwRefCount++;
TRACE("%p -> refcount = %ld\n", info, info->dwRefCount );
TRACE("%p -> refcount = %d\n", info, info->dwRefCount );
return info;
}
......@@ -206,7 +206,7 @@ LPWININETHANDLEHEADER WININET_GetObject( HINTERNET hinternet )
BOOL WININET_Release( LPWININETHANDLEHEADER info )
{
info->dwRefCount--;
TRACE( "object %p refcount = %ld\n", info, info->dwRefCount );
TRACE( "object %p refcount = %d\n", info, info->dwRefCount );
if( !info->dwRefCount )
{
TRACE( "destroying object %p\n", info);
......@@ -260,7 +260,7 @@ BOOL WININET_FreeHandle( HINTERNET hinternet )
BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{
TRACE("%p,%lx,%p\n", hinstDLL, fdwReason, lpvReserved);
TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved);
switch (fdwReason) {
case DLL_PROCESS_ATTACH:
......@@ -468,7 +468,7 @@ static void dump_INTERNET_FLAGS(DWORD dwFlags)
}
}
if (dwFlags)
TRACE(" Unknown flags (%08lx)\n", dwFlags);
TRACE(" Unknown flags (%08x)\n", dwFlags);
else
TRACE("\n");
}
......@@ -501,7 +501,7 @@ HINTERNET WINAPI InternetOpenW(LPCWSTR lpszAgent, DWORD dwAccessType,
DWORD i;
const char *access_type_str = "Unknown";
TRACE("(%s, %li, %s, %s, %li)\n", debugstr_w(lpszAgent), dwAccessType,
TRACE("(%s, %i, %s, %s, %i)\n", debugstr_w(lpszAgent), dwAccessType,
debugstr_w(lpszProxy), debugstr_w(lpszProxyBypass), dwFlags);
for (i = 0; i < (sizeof(access_type) / sizeof(access_type[0])); i++) {
if (access_type[i].val == dwAccessType) {
......@@ -594,7 +594,7 @@ HINTERNET WINAPI InternetOpenA(LPCSTR lpszAgent, DWORD dwAccessType,
INT len;
WCHAR *szAgent = NULL, *szProxy = NULL, *szBypass = NULL;
TRACE("(%s, 0x%08lx, %s, %s, 0x%08lx)\n", debugstr_a(lpszAgent),
TRACE("(%s, 0x%08x, %s, %s, 0x%08x)\n", debugstr_a(lpszAgent),
dwAccessType, debugstr_a(lpszProxy), debugstr_a(lpszProxyBypass), dwFlags);
if( lpszAgent )
......@@ -714,7 +714,7 @@ BOOL WINAPI InternetGetLastResponseInfoW(LPDWORD lpdwError,
*/
BOOL WINAPI InternetGetConnectedState(LPDWORD lpdwStatus, DWORD dwReserved)
{
TRACE("(%p, 0x%08lx)\n", lpdwStatus, dwReserved);
TRACE("(%p, 0x%08x)\n", lpdwStatus, dwReserved);
if (lpdwStatus) {
FIXME("always returning LAN connection.\n");
......@@ -754,7 +754,7 @@ BOOL WINAPI InternetGetConnectedState(LPDWORD lpdwStatus, DWORD dwReserved)
BOOL WINAPI InternetGetConnectedStateExW(LPDWORD lpdwStatus, LPWSTR lpszConnectionName,
DWORD dwNameLen, DWORD dwReserved)
{
TRACE("(%p, %p, %ld, 0x%08lx)\n", lpdwStatus, lpszConnectionName, dwNameLen, dwReserved);
TRACE("(%p, %p, %d, 0x%08x)\n", lpdwStatus, lpszConnectionName, dwNameLen, dwReserved);
/* Must be zero */
if(dwReserved)
......@@ -777,7 +777,7 @@ BOOL WINAPI InternetGetConnectedStateExA(LPDWORD lpdwStatus, LPSTR lpszConnectio
LPWSTR lpwszConnectionName = NULL;
BOOL rc;
TRACE("(%p, %p, %ld, 0x%08lx)\n", lpdwStatus, lpszConnectionName, dwNameLen, dwReserved);
TRACE("(%p, %p, %d, 0x%08x)\n", lpdwStatus, lpszConnectionName, dwNameLen, dwReserved);
if (lpszConnectionName && dwNameLen > 0)
lpwszConnectionName= HeapAlloc(GetProcessHeap(), 0, dwNameLen * sizeof(WCHAR));
......@@ -814,7 +814,7 @@ HINTERNET WINAPI InternetConnectW(HINTERNET hInternet,
LPWININETAPPINFOW hIC;
HINTERNET rc = NULL;
TRACE("(%p, %s, %i, %s, %s, %li, %li, %li)\n", hInternet, debugstr_w(lpszServerName),
TRACE("(%p, %s, %i, %s, %s, %i, %i, %i)\n", hInternet, debugstr_w(lpszServerName),
nServerPort, debugstr_w(lpszUserName), debugstr_w(lpszPassword),
dwService, dwFlags, dwContext);
......@@ -1007,7 +1007,7 @@ BOOL WINAPI INTERNET_FindNextFileW(LPWININETFINDNEXTW lpwh, LPVOID lpvFindData)
return FALSE;
}
TRACE("index(%ld) size(%ld)\n", lpwh->index, lpwh->size);
TRACE("index(%d) size(%d)\n", lpwh->index, lpwh->size);
lpFindFileData = (LPWIN32_FIND_DATAW) lpvFindData;
ZeroMemory(lpFindFileData, sizeof(WIN32_FIND_DATAA));
......@@ -1022,7 +1022,7 @@ BOOL WINAPI INTERNET_FindNextFileW(LPWININETFINDNEXTW lpwh, LPVOID lpvFindData)
FTP_ConvertFileProp(&lpwh->lpafp[lpwh->index], lpFindFileData);
lpwh->index++;
TRACE("\nName: %s\nSize: %ld\n", debugstr_w(lpFindFileData->cFileName), lpFindFileData->nFileSizeLow);
TRACE("\nName: %s\nSize: %d\n", debugstr_w(lpFindFileData->cFileName), lpFindFileData->nFileSizeLow);
lend:
......@@ -1115,7 +1115,7 @@ static void ConvertUrlComponentValue(LPSTR* lppszComponent, LPDWORD dwComponentL
LPWSTR lpwszComponent, DWORD dwwComponentLen,
LPCSTR lpszStart, LPCWSTR lpwszStart)
{
TRACE("%p %ld %p %ld %p %p\n", lppszComponent, *dwComponentLen, lpwszComponent, dwwComponentLen, lpszStart, lpwszStart);
TRACE("%p %d %p %d %p %p\n", lppszComponent, *dwComponentLen, lpwszComponent, dwwComponentLen, lpszStart, lpwszStart);
if (*dwComponentLen != 0)
{
DWORD nASCIILength=WideCharToMultiByte(CP_ACP,0,lpwszComponent,dwwComponentLen,NULL,0,NULL,NULL);
......@@ -1151,7 +1151,7 @@ BOOL WINAPI InternetCrackUrlA(LPCSTR lpszUrl, DWORD dwUrlLength, DWORD dwFlags,
URL_COMPONENTSW UCW;
WCHAR* lpwszUrl;
TRACE("(%s %lu %lx %p)\n", debugstr_a(lpszUrl), dwUrlLength, dwFlags, lpUrlComponents);
TRACE("(%s %u %x %p)\n", debugstr_a(lpszUrl), dwUrlLength, dwFlags, lpUrlComponents);
if(dwUrlLength<=0)
dwUrlLength=-1;
nLength=MultiByteToWideChar(CP_ACP,0,lpszUrl,dwUrlLength,NULL,0);
......@@ -1239,7 +1239,7 @@ static INTERNET_SCHEME GetInternetSchemeW(LPCWSTR lpszScheme, DWORD nMaxCmp)
{
int i;
TRACE("%s %ld\n",debugstr_wn(lpszScheme, nMaxCmp), nMaxCmp);
TRACE("%s %d\n",debugstr_wn(lpszScheme, nMaxCmp), nMaxCmp);
if(lpszScheme==NULL)
return INTERNET_SCHEME_UNKNOWN;
......@@ -1270,7 +1270,7 @@ static INTERNET_SCHEME GetInternetSchemeW(LPCWSTR lpszScheme, DWORD nMaxCmp)
*/
static BOOL SetUrlComponentValueW(LPWSTR* lppszComponent, LPDWORD dwComponentLen, LPCWSTR lpszStart, DWORD len)
{
TRACE("%s (%ld)\n", debugstr_wn(lpszStart,len), len);
TRACE("%s (%d)\n", debugstr_wn(lpszStart,len), len);
if ( (*dwComponentLen == 0) && (*lppszComponent == NULL) )
return FALSE;
......@@ -1322,7 +1322,7 @@ BOOL WINAPI InternetCrackUrlW(LPCWSTR lpszUrl_orig, DWORD dwUrlLength_orig, DWOR
if(dwUrlLength==0)
dwUrlLength=strlenW(lpszUrl);
TRACE("(%s %lu %lx %p)\n", debugstr_w(lpszUrl), dwUrlLength, dwFlags, lpUC);
TRACE("(%s %u %x %p)\n", debugstr_w(lpszUrl), dwUrlLength, dwFlags, lpUC);
if (!lpszUrl_orig || !*lpszUrl_orig)
{
......@@ -1602,8 +1602,8 @@ BOOL WINAPI InternetCanonicalizeUrlA(LPCSTR lpszUrl, LPSTR lpszBuffer,
dwFlags &= ~ICU_BROWSER_MODE;
}
if(dwFlags)
FIXME("Unhandled flags 0x%08lx\n", dwFlags);
TRACE("%s %p %p %08lx\n", debugstr_a(lpszUrl), lpszBuffer,
FIXME("Unhandled flags 0x%08x\n", dwFlags);
TRACE("%s %p %p %08x\n", debugstr_a(lpszUrl), lpszBuffer,
lpdwBufferLength, dwURLFlags);
/* Flip this bit to correspond to URL_ESCAPE_UNSAFE */
......@@ -1646,8 +1646,8 @@ BOOL WINAPI InternetCanonicalizeUrlW(LPCWSTR lpszUrl, LPWSTR lpszBuffer,
dwFlags &= ~ICU_BROWSER_MODE;
}
if(dwFlags)
FIXME("Unhandled flags 0x%08lx\n", dwFlags);
TRACE("%s %p %p %08lx\n", debugstr_w(lpszUrl), lpszBuffer,
FIXME("Unhandled flags 0x%08x\n", dwFlags);
TRACE("%s %p %p %08x\n", debugstr_w(lpszUrl), lpszBuffer,
lpdwBufferLength, dwURLFlags);
/* Flip this bit to correspond to URL_ESCAPE_UNSAFE */
......@@ -1676,7 +1676,7 @@ INTERNET_STATUS_CALLBACK WINAPI InternetSetStatusCallbackA(
INTERNET_STATUS_CALLBACK retVal;
LPWININETHANDLEHEADER lpwh;
TRACE("0x%08lx\n", (ULONG)hInternet);
TRACE("0x%08x\n", (ULONG)hInternet);
lpwh = WININET_GetObject(hInternet);
if (!lpwh)
......@@ -1708,7 +1708,7 @@ INTERNET_STATUS_CALLBACK WINAPI InternetSetStatusCallbackW(
INTERNET_STATUS_CALLBACK retVal;
LPWININETHANDLEHEADER lpwh;
TRACE("0x%08lx\n", (ULONG)hInternet);
TRACE("0x%08x\n", (ULONG)hInternet);
lpwh = WININET_GetObject(hInternet);
if (!lpwh)
......@@ -1762,7 +1762,7 @@ BOOL WINAPI InternetWriteFile(HINTERNET hFile, LPCVOID lpBuffer ,
LPWININETHTTPREQW lpwhr;
lpwhr = (LPWININETHTTPREQW)lpwh;
TRACE("HTTPREQ %li\n",dwNumOfBytesToWrite);
TRACE("HTTPREQ %i\n",dwNumOfBytesToWrite);
retval = NETCON_send(&lpwhr->netConnection, lpBuffer,
dwNumOfBytesToWrite, 0, (LPINT)lpdwNumOfBytesWritten);
......@@ -1858,7 +1858,7 @@ BOOL WINAPI InternetReadFile(HINTERNET hFile, LPVOID lpBuffer,
LPWININETHANDLEHEADER lpwh;
BOOL retval;
TRACE("%p %p %ld %p\n", hFile, lpBuffer, dwNumOfBytesToRead, pdwNumOfBytesRead);
TRACE("%p %p %d %p\n", hFile, lpBuffer, dwNumOfBytesToRead, pdwNumOfBytesRead);
lpwh = WININET_GetObject( hFile );
if (!lpwh)
......@@ -1870,7 +1870,7 @@ BOOL WINAPI InternetReadFile(HINTERNET hFile, LPVOID lpBuffer,
retval = INTERNET_ReadFile(lpwh, lpBuffer, dwNumOfBytesToRead, pdwNumOfBytesRead, TRUE, FALSE);
WININET_Release( lpwh );
TRACE("-- %s (bytes read: %ld)\n", retval ? "TRUE": "FALSE", pdwNumOfBytesRead ? *pdwNumOfBytesRead : -1);
TRACE("-- %s (bytes read: %d)\n", retval ? "TRUE": "FALSE", pdwNumOfBytesRead ? *pdwNumOfBytesRead : -1);
return retval;
}
......@@ -1907,10 +1907,10 @@ BOOL WINAPI InternetReadFileExA(HINTERNET hFile, LPINTERNET_BUFFERSA lpBuffersOu
BOOL retval = FALSE;
LPWININETHANDLEHEADER lpwh;
TRACE("(%p %p 0x%lx 0x%lx)\n", hFile, lpBuffersOut, dwFlags, dwContext);
TRACE("(%p %p 0x%x 0x%x)\n", hFile, lpBuffersOut, dwFlags, dwContext);
if (dwFlags & ~(IRF_ASYNC|IRF_NO_WAIT))
FIXME("these dwFlags aren't implemented: 0x%lx\n", dwFlags & ~(IRF_ASYNC|IRF_NO_WAIT));
FIXME("these dwFlags aren't implemented: 0x%x\n", dwFlags & ~(IRF_ASYNC|IRF_NO_WAIT));
if (lpBuffersOut->dwStructSize != sizeof(*lpBuffersOut))
{
......@@ -1953,7 +1953,7 @@ BOOL WINAPI InternetReadFileExA(HINTERNET hFile, LPINTERNET_BUFFERSA lpBuffersOu
WININET_Release( lpwh );
TRACE("-- %s (bytes read: %ld)\n", retval ? "TRUE": "FALSE", lpBuffersOut->dwBufferLength);
TRACE("-- %s (bytes read: %d)\n", retval ? "TRUE": "FALSE", lpBuffersOut->dwBufferLength);
return retval;
}
......@@ -1978,7 +1978,7 @@ BOOL WINAPI InternetReadFileExA(HINTERNET hFile, LPINTERNET_BUFFERSA lpBuffersOu
BOOL WINAPI InternetReadFileExW(HINTERNET hFile, LPINTERNET_BUFFERSW lpBuffer,
DWORD dwFlags, DWORD dwContext)
{
ERR("(%p, %p, 0x%lx, 0x%lx): not implemented in native\n", hFile, lpBuffer, dwFlags, dwContext);
ERR("(%p, %p, 0x%x, 0x%x): not implemented in native\n", hFile, lpBuffer, dwFlags, dwContext);
INTERNET_SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
......@@ -1993,7 +1993,7 @@ static BOOL INET_QueryOptionHelper(BOOL bIsUnicode, HINTERNET hInternet, DWORD d
LPWININETHANDLEHEADER lpwhh;
BOOL bSuccess = FALSE;
TRACE("(%p, 0x%08lx, %p, %p)\n", hInternet, dwOption, lpBuffer, lpdwBufferLength);
TRACE("(%p, 0x%08x, %p, %p)\n", hInternet, dwOption, lpBuffer, lpdwBufferLength);
lpwhh = (LPWININETHANDLEHEADER) WININET_GetObject( hInternet );
if (!lpwhh)
......@@ -2017,7 +2017,7 @@ static BOOL INET_QueryOptionHelper(BOOL bIsUnicode, HINTERNET hInternet, DWORD d
type = lpwhh->htype;
TRACE("INTERNET_OPTION_HANDLE_TYPE: %ld\n", type);
TRACE("INTERNET_OPTION_HANDLE_TYPE: %d\n", type);
if (*lpdwBufferLength < sizeof(ULONG))
INTERNET_SetLastError(ERROR_INSUFFICIENT_BUFFER);
......@@ -2033,7 +2033,7 @@ static BOOL INET_QueryOptionHelper(BOOL bIsUnicode, HINTERNET hInternet, DWORD d
case INTERNET_OPTION_REQUEST_FLAGS:
{
ULONG flags = 4;
TRACE("INTERNET_OPTION_REQUEST_FLAGS: %ld\n", flags);
TRACE("INTERNET_OPTION_REQUEST_FLAGS: %d\n", flags);
if (*lpdwBufferLength < sizeof(ULONG))
INTERNET_SetLastError(ERROR_INSUFFICIENT_BUFFER);
else
......@@ -2242,7 +2242,7 @@ static BOOL INET_QueryOptionHelper(BOOL bIsUnicode, HINTERNET hInternet, DWORD d
case INTERNET_OPTION_MAX_CONNS_PER_SERVER:
{
ULONG conn = 2;
TRACE("INTERNET_OPTION_MAX_CONNS_PER_SERVER: %ld\n", conn);
TRACE("INTERNET_OPTION_MAX_CONNS_PER_SERVER: %d\n", conn);
if (*lpdwBufferLength < sizeof(ULONG))
INTERNET_SetLastError(ERROR_INSUFFICIENT_BUFFER);
else
......@@ -2256,7 +2256,7 @@ static BOOL INET_QueryOptionHelper(BOOL bIsUnicode, HINTERNET hInternet, DWORD d
case INTERNET_OPTION_MAX_CONNS_PER_1_0_SERVER:
{
ULONG conn = 4;
TRACE("INTERNET_OPTION_MAX_CONNS_1_0_SERVER: %ld\n", conn);
TRACE("INTERNET_OPTION_MAX_CONNS_1_0_SERVER: %d\n", conn);
if (*lpdwBufferLength < sizeof(ULONG))
INTERNET_SetLastError(ERROR_INSUFFICIENT_BUFFER);
else
......@@ -2348,7 +2348,7 @@ static BOOL INET_QueryOptionHelper(BOOL bIsUnicode, HINTERNET hInternet, DWORD d
}
break;
default:
FIXME("Stub! %ld\n", dwOption);
FIXME("Stub! %d\n", dwOption);
break;
}
if (lpwhh)
......@@ -2406,7 +2406,7 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption,
LPWININETHANDLEHEADER lpwhh;
BOOL ret = TRUE;
TRACE("0x%08lx\n", dwOption);
TRACE("0x%08x\n", dwOption);
lpwhh = (LPWININETHANDLEHEADER) WININET_GetObject( hInternet );
if( !lpwhh )
......@@ -2417,7 +2417,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(%ld,%ld): STUB\n",pVersion->dwMajorVersion,pVersion->dwMinorVersion);
FIXME("Option INTERNET_OPTION_HTTP_VERSION(%d,%d): STUB\n",pVersion->dwMajorVersion,pVersion->dwMinorVersion);
}
break;
case INTERNET_OPTION_ERROR_MASK:
......@@ -2508,7 +2508,7 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption,
FIXME("Option INTERNET_OPTION_SECURITY_FLAGS; STUB\n");
break;
default:
FIXME("Option %ld STUB\n",dwOption);
FIXME("Option %d STUB\n",dwOption);
INTERNET_SetLastError(ERROR_INVALID_PARAMETER);
ret = FALSE;
break;
......@@ -2588,7 +2588,7 @@ BOOL WINAPI InternetSetOptionA(HINTERNET hInternet, DWORD dwOption,
BOOL WINAPI InternetSetOptionExA(HINTERNET hInternet, DWORD dwOption,
LPVOID lpBuffer, DWORD dwBufferLength, DWORD dwFlags)
{
FIXME("Flags %08lx ignored\n", dwFlags);
FIXME("Flags %08x ignored\n", dwFlags);
return InternetSetOptionA( hInternet, dwOption, lpBuffer, dwBufferLength );
}
......@@ -2598,7 +2598,7 @@ BOOL WINAPI InternetSetOptionExA(HINTERNET hInternet, DWORD dwOption,
BOOL WINAPI InternetSetOptionExW(HINTERNET hInternet, DWORD dwOption,
LPVOID lpBuffer, DWORD dwBufferLength, DWORD dwFlags)
{
FIXME("Flags %08lx ignored\n", dwFlags);
FIXME("Flags %08x ignored\n", dwFlags);
if( dwFlags & ~ISO_VALID_FLAGS )
{
SetLastError( ERROR_INVALID_PARAMETER );
......@@ -2623,7 +2623,7 @@ BOOL WINAPI InternetTimeFromSystemTimeA( const SYSTEMTIME* time, DWORD format, L
BOOL ret;
WCHAR stringW[INTERNET_RFC1123_BUFSIZE];
TRACE( "%p 0x%08lx %p 0x%08lx\n", time, format, string, size );
TRACE( "%p 0x%08x %p 0x%08x\n", time, format, string, size );
ret = InternetTimeFromSystemTimeW( time, format, stringW, sizeof(stringW) );
if (ret) WideCharToMultiByte( CP_ACP, 0, stringW, -1, string, size, NULL, NULL );
......@@ -2640,7 +2640,7 @@ BOOL WINAPI InternetTimeFromSystemTimeW( const SYSTEMTIME* time, DWORD format, L
{ '%','s',',',' ','%','0','2','d',' ','%','s',' ','%','4','d',' ','%','0',
'2','d',':','%','0','2','d',':','%','0','2','d',' ','G','M','T', 0 };
TRACE( "%p 0x%08lx %p 0x%08lx\n", time, format, string, size );
TRACE( "%p 0x%08x %p 0x%08x\n", time, format, string, size );
if (!time || !string) return FALSE;
......@@ -2668,7 +2668,7 @@ BOOL WINAPI InternetTimeToSystemTimeA( LPCSTR string, SYSTEMTIME* time, DWORD re
WCHAR *stringW;
int len;
TRACE( "%s %p 0x%08lx\n", debugstr_a(string), time, reserved );
TRACE( "%s %p 0x%08x\n", debugstr_a(string), time, reserved );
len = MultiByteToWideChar( CP_ACP, 0, string, -1, NULL, 0 );
stringW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) );
......@@ -2690,7 +2690,7 @@ BOOL WINAPI InternetTimeToSystemTimeW( LPCWSTR string, SYSTEMTIME* time, DWORD r
unsigned int i;
WCHAR *s = (LPWSTR)string;
TRACE( "%s %p 0x%08lx\n", debugstr_w(string), time, reserved );
TRACE( "%s %p 0x%08x\n", debugstr_w(string), time, reserved );
if (!string || !time) return FALSE;
......@@ -2885,7 +2885,7 @@ HINTERNET WINAPI INTERNET_InternetOpenUrlW(LPWININETAPPINFOW hIC, LPCWSTR lpszUr
WCHAR password[1024], path[2048], extra[1024];
HINTERNET client = NULL, client1 = NULL;
TRACE("(%p, %s, %s, %08lx, %08lx, %08lx)\n", hIC, debugstr_w(lpszUrl), debugstr_w(lpszHeaders),
TRACE("(%p, %s, %s, %08x, %08x, %08x)\n", hIC, debugstr_w(lpszUrl), debugstr_w(lpszHeaders),
dwHeadersLength, dwFlags, dwContext);
urlComponents.dwStructSize = sizeof(URL_COMPONENTSW);
......@@ -2973,7 +2973,7 @@ HINTERNET WINAPI InternetOpenUrlW(HINTERNET hInternet, LPCWSTR lpszUrl,
LPWININETAPPINFOW hIC = NULL;
if (TRACE_ON(wininet)) {
TRACE("(%p, %s, %s, %08lx, %08lx, %08lx)\n", hInternet, debugstr_w(lpszUrl), debugstr_w(lpszHeaders),
TRACE("(%p, %s, %s, %08x, %08x, %08x)\n", hInternet, debugstr_w(lpszUrl), debugstr_w(lpszHeaders),
dwHeadersLength, dwFlags, dwContext);
TRACE(" flags :");
dump_INTERNET_FLAGS(dwFlags);
......@@ -3732,7 +3732,7 @@ BOOL WINAPI InternetCombineUrlA(LPCSTR lpszBaseUrl, LPCSTR lpszRelativeUrl,
{
HRESULT hr=S_OK;
TRACE("(%s, %s, %p, %p, 0x%08lx)\n", debugstr_a(lpszBaseUrl), debugstr_a(lpszRelativeUrl), lpszBuffer, lpdwBufferLength, dwFlags);
TRACE("(%s, %s, %p, %p, 0x%08x)\n", debugstr_a(lpszBaseUrl), debugstr_a(lpszRelativeUrl), lpszBuffer, lpdwBufferLength, dwFlags);
/* Flip this bit to correspond to URL_ESCAPE_UNSAFE */
dwFlags ^= ICU_NO_ENCODE;
......@@ -3758,7 +3758,7 @@ BOOL WINAPI InternetCombineUrlW(LPCWSTR lpszBaseUrl, LPCWSTR lpszRelativeUrl,
{
HRESULT hr=S_OK;
TRACE("(%s, %s, %p, %p, 0x%08lx)\n", debugstr_w(lpszBaseUrl), debugstr_w(lpszRelativeUrl), lpszBuffer, lpdwBufferLength, dwFlags);
TRACE("(%s, %s, %p, %p, 0x%08x)\n", debugstr_w(lpszBaseUrl), debugstr_w(lpszRelativeUrl), lpszBuffer, lpdwBufferLength, dwFlags);
/* Flip this bit to correspond to URL_ESCAPE_UNSAFE */
dwFlags ^= ICU_NO_ENCODE;
......@@ -3970,7 +3970,7 @@ BOOL WINAPI InternetCreateUrlA(LPURL_COMPONENTSA lpUrlComponents, DWORD dwFlags,
LPWSTR urlW = NULL;
URL_COMPONENTSW urlCompW;
TRACE("(%p,%ld,%p,%p)\n", lpUrlComponents, dwFlags, lpszUrl, lpdwUrlLength);
TRACE("(%p,%d,%p,%p)\n", lpUrlComponents, dwFlags, lpszUrl, lpdwUrlLength);
if (!lpUrlComponents)
return FALSE;
......@@ -4040,7 +4040,7 @@ BOOL WINAPI InternetCreateUrlW(LPURL_COMPONENTSW lpUrlComponents, DWORD dwFlags,
static const WCHAR slashSlashW[] = {'/','/'};
static const WCHAR percentD[] = {'%','d',0};
TRACE("(%p,%ld,%p,%p)\n", lpUrlComponents, dwFlags, lpszUrl, lpdwUrlLength);
TRACE("(%p,%d,%p,%p)\n", lpUrlComponents, dwFlags, lpszUrl, lpdwUrlLength);
if (!lpUrlComponents)
return FALSE;
......@@ -4180,7 +4180,7 @@ DWORD WINAPI InternetConfirmZoneCrossingW( HWND hWnd, LPWSTR szUrlPrev, LPWSTR s
DWORD WINAPI InternetDialA( HWND hwndParent, LPSTR lpszConnectoid, DWORD dwFlags,
LPDWORD lpdwConnection, DWORD dwReserved )
{
FIXME("(%p, %p, 0x%08lx, %p, 0x%08lx) stub\n", hwndParent, lpszConnectoid, dwFlags,
FIXME("(%p, %p, 0x%08x, %p, 0x%08x) stub\n", hwndParent, lpszConnectoid, dwFlags,
lpdwConnection, dwReserved);
return ERROR_SUCCESS;
}
......@@ -4188,26 +4188,26 @@ DWORD WINAPI InternetDialA( HWND hwndParent, LPSTR lpszConnectoid, DWORD dwFlags
DWORD WINAPI InternetDialW( HWND hwndParent, LPWSTR lpszConnectoid, DWORD dwFlags,
LPDWORD lpdwConnection, DWORD dwReserved )
{
FIXME("(%p, %p, 0x%08lx, %p, 0x%08lx) stub\n", hwndParent, lpszConnectoid, dwFlags,
FIXME("(%p, %p, 0x%08x, %p, 0x%08x) stub\n", hwndParent, lpszConnectoid, dwFlags,
lpdwConnection, dwReserved);
return ERROR_SUCCESS;
}
BOOL WINAPI InternetGoOnlineA( LPSTR lpszURL, HWND hwndParent, DWORD dwReserved )
{
FIXME("(%s, %p, 0x%08lx) stub\n", debugstr_a(lpszURL), hwndParent, dwReserved);
FIXME("(%s, %p, 0x%08x) stub\n", debugstr_a(lpszURL), hwndParent, dwReserved);
return TRUE;
}
BOOL WINAPI InternetGoOnlineW( LPWSTR lpszURL, HWND hwndParent, DWORD dwReserved )
{
FIXME("(%s, %p, 0x%08lx) stub\n", debugstr_w(lpszURL), hwndParent, dwReserved);
FIXME("(%s, %p, 0x%08x) stub\n", debugstr_w(lpszURL), hwndParent, dwReserved);
return TRUE;
}
DWORD WINAPI InternetHangUp( DWORD dwConnection, DWORD dwReserved )
{
FIXME("(0x%08lx, 0x%08lx) stub\n", dwConnection, dwReserved);
FIXME("(0x%08x, 0x%08x) stub\n", dwConnection, dwReserved);
return ERROR_SUCCESS;
}
......@@ -4221,6 +4221,6 @@ BOOL WINAPI CreateMD5SSOHash( PWSTR pszChallengeInfo, PWSTR pwszRealm, PWSTR pws
BOOL WINAPI ResumeSuspendedDownload( HINTERNET hInternet, DWORD dwError )
{
FIXME("(%p, 0x%08lx) stub\n", hInternet, dwError);
FIXME("(%p, 0x%08x) stub\n", hInternet, dwError);
return FALSE;
}
dlls/wininet/netconnection.c
View file @ cd2c4585
......@@ -624,7 +624,7 @@ BOOL NETCON_getNextLine(WININET_NETCONNECTION *connection, LPSTR lpszBuffer, LPD
{
lpszBuffer[nRecv++] = '\0';
*dwBuffer = nRecv;
TRACE(":%lu %s\n", nRecv, lpszBuffer);
TRACE(":%u %s\n", nRecv, lpszBuffer);
return TRUE;
}
else
......@@ -665,7 +665,7 @@ BOOL NETCON_getNextLine(WININET_NETCONNECTION *connection, LPSTR lpszBuffer, LPD
{
lpszBuffer[nRecv++] = '\0';
*dwBuffer = nRecv;
TRACE("_SSL:%lu %s\n", nRecv, lpszBuffer);
TRACE("_SSL:%u %s\n", nRecv, lpszBuffer);
return TRUE;
}
return FALSE;
......
dlls/wininet/urlcache.c
View file @ cd2c4585
......@@ -436,7 +436,7 @@ static BOOL URLCacheContainer_OpenIndex(URLCACHECONTAINER * pContainer)
CloseHandle(hFile);
if (!pContainer->hMapping)
{
ERR("Couldn't create file mapping (error is %ld)\n", GetLastError());
ERR("Couldn't create file mapping (error is %d)\n", GetLastError());
return FALSE;
}
......@@ -496,7 +496,7 @@ static BOOL URLCacheContainers_AddContainer(LPCWSTR cache_prefix, LPCWSTR path,
if ((pContainer->hMutex = CreateMutexW(NULL, FALSE, mutex_name)) == NULL)
{
ERR("couldn't create mutex (error is %ld)\n", GetLastError());
ERR("couldn't create mutex (error is %d)\n", GetLastError());
HeapFree(GetProcessHeap(), 0, pContainer->path);
HeapFree(GetProcessHeap(), 0, pContainer);
return FALSE;
......@@ -547,7 +547,7 @@ void URLCacheContainers_CreateDefaults(void)
if (FAILED(SHGetSpecialFolderPathW(NULL, wszCachePath, DefaultContainerData[i].nFolder, TRUE)))
{
ERR("Couldn't get path for default container %lu\n", i);
ERR("Couldn't get path for default container %u\n", i);
continue;
}
path_len = strlenW(wszCachePath);
......@@ -638,7 +638,7 @@ static LPURLCACHE_HEADER URLCacheContainer_LockIndex(URLCACHECONTAINER * pContai
if (!pIndexData)
{
ReleaseMutex(pContainer->hMutex);
ERR("Couldn't MapViewOfFile. Error: %ld\n", GetLastError());
ERR("Couldn't MapViewOfFile. Error: %d\n", GetLastError());
return FALSE;
}
pHeader = (URLCACHE_HEADER *)pIndexData;
......@@ -659,13 +659,13 @@ static LPURLCACHE_HEADER URLCacheContainer_LockIndex(URLCACHECONTAINER * pContai
if (!pIndexData)
{
ReleaseMutex(pContainer->hMutex);
ERR("Couldn't MapViewOfFile. Error: %ld\n", GetLastError());
ERR("Couldn't MapViewOfFile. Error: %d\n", GetLastError());
return FALSE;
}
pHeader = (URLCACHE_HEADER *)pIndexData;
}
TRACE("Signature: %s, file size: %ld bytes\n", pHeader->szSignature, pHeader->dwFileSize);
TRACE("Signature: %s, file size: %d bytes\n", pHeader->szSignature, pHeader->dwFileSize);
for (index = 0; index < pHeader->DirectoryCount; index++)
{
......@@ -760,12 +760,12 @@ static BOOL URLCache_FindFirstFreeEntry(URLCACHE_HEADER * pHeader, DWORD dwBlock
dwFreeCounter + dwBlockNumber < pHeader->dwIndexCapacityInBlocks &&
URLCache_Allocation_BlockIsFree(AllocationTable, dwBlockNumber + dwFreeCounter);
dwFreeCounter++)
TRACE("Found free block at no. %ld (0x%lx)\n", dwBlockNumber, ENTRY_START_OFFSET + dwBlockNumber * BLOCKSIZE);
TRACE("Found free block at no. %d (0x%x)\n", dwBlockNumber, ENTRY_START_OFFSET + dwBlockNumber * BLOCKSIZE);
if (dwFreeCounter == dwBlocksNeeded)
{
DWORD index;
TRACE("Found free blocks starting at no. %ld (0x%lx)\n", dwBlockNumber, ENTRY_START_OFFSET + dwBlockNumber * BLOCKSIZE);
TRACE("Found free blocks starting at no. %d (0x%x)\n", dwBlockNumber, ENTRY_START_OFFSET + dwBlockNumber * BLOCKSIZE);
for (index = 0; index < dwBlocksNeeded; index++)
URLCache_Allocation_BlockAllocate(AllocationTable, dwBlockNumber + index);
*ppEntry = (CACHEFILE_ENTRY *)((LPBYTE)pHeader + ENTRY_START_OFFSET + dwBlockNumber * BLOCKSIZE);
......@@ -1136,7 +1136,7 @@ static BOOL URLCache_FindHash(LPCURLCACHE_HEADER pHeader, LPCSTR lpszUrl, struct
int i;
if (pHashEntry->dwHashTableNumber != dwHashTableNumber++)
{
ERR("Error: not right hash table number (%ld) expected %ld\n", pHashEntry->dwHashTableNumber, dwHashTableNumber);
ERR("Error: not right hash table number (%d) expected %d\n", pHashEntry->dwHashTableNumber, dwHashTableNumber);
continue;
}
/* make sure that it is in fact a hash entry */
......@@ -1262,7 +1262,7 @@ static BOOL URLCache_AddEntryToHash(LPURLCACHE_HEADER pHeader, LPCSTR lpszUrl, D
int i;
if (pHashEntry->dwHashTableNumber != dwHashTableNumber++)
{
ERR("not right hash table number (%ld) expected %ld\n", pHashEntry->dwHashTableNumber, dwHashTableNumber);
ERR("not right hash table number (%d) expected %d\n", pHashEntry->dwHashTableNumber, dwHashTableNumber);
break;
}
/* make sure that it is in fact a hash entry */
......@@ -1335,7 +1335,7 @@ BOOL WINAPI GetUrlCacheEntryInfoExA(
LPVOID lpReserved,
DWORD dwFlags)
{
TRACE("(%s, %p, %p, %p, %p, %p, %lx)\n",
TRACE("(%s, %p, %p, %p, %p, %p, %x)\n",
debugstr_a(lpszUrl),
lpCacheEntryInfo,
lpdwCacheEntryInfoBufSize,
......@@ -1353,7 +1353,7 @@ BOOL WINAPI GetUrlCacheEntryInfoExA(
return FALSE;
}
if (dwFlags != 0)
FIXME("Undocumented flag(s): %lx\n", dwFlags);
FIXME("Undocumented flag(s): %x\n", dwFlags);
return GetUrlCacheEntryInfoA(lpszUrl, lpCacheEntryInfo, lpdwCacheEntryInfoBufSize);
}
......@@ -1519,7 +1519,7 @@ BOOL WINAPI GetUrlCacheEntryInfoExW(
LPVOID lpReserved,
DWORD dwFlags)
{
TRACE("(%s, %p, %p, %p, %p, %p, %lx)\n",
TRACE("(%s, %p, %p, %p, %p, %p, %x)\n",
debugstr_w(lpszUrl),
lpCacheEntryInfo,
lpdwCacheEntryInfoBufSize,
......@@ -1537,7 +1537,7 @@ BOOL WINAPI GetUrlCacheEntryInfoExW(
return FALSE;
}
if (dwFlags != 0)
FIXME("Undocumented flag(s): %lx\n", dwFlags);
FIXME("Undocumented flag(s): %x\n", dwFlags);
return GetUrlCacheEntryInfoW(lpszUrl, lpCacheEntryInfo, lpdwCacheEntryInfoBufSize);
}
......@@ -1553,7 +1553,7 @@ BOOL WINAPI SetUrlCacheEntryInfoA(
CACHEFILE_ENTRY * pEntry;
URLCACHECONTAINER * pContainer;
TRACE("(%s, %p, 0x%08lx)\n", debugstr_a(lpszUrlName), lpCacheEntryInfo, dwFieldControl);
TRACE("(%s, %p, 0x%08x)\n", debugstr_a(lpszUrlName), lpCacheEntryInfo, dwFieldControl);
if (!URLCacheContainers_FindContainerA(lpszUrlName, &pContainer))
return FALSE;
......@@ -1601,7 +1601,7 @@ BOOL WINAPI SetUrlCacheEntryInfoW(LPCWSTR lpszUrl, LPINTERNET_CACHE_ENTRY_INFOW
LPSTR lpszUrlA;
int url_len;
TRACE("(%s, %p, 0x%08lx)\n", debugstr_w(lpszUrl), lpCacheEntryInfo, dwFieldControl);
TRACE("(%s, %p, 0x%08x)\n", debugstr_w(lpszUrl), lpCacheEntryInfo, dwFieldControl);
url_len = WideCharToMultiByte(CP_ACP, 0, lpszUrl, -1, NULL, 0, NULL, NULL);
lpszUrlA = HeapAlloc(GetProcessHeap(), 0, url_len * sizeof(CHAR));
......@@ -1674,7 +1674,7 @@ BOOL WINAPI RetrieveUrlCacheEntryFileA(
URL_CACHEFILE_ENTRY * pUrlEntry;
URLCACHECONTAINER * pContainer;
TRACE("(%s, %p, %p, 0x%08lx)\n",
TRACE("(%s, %p, %p, 0x%08x)\n",
debugstr_a(lpszUrlName),
lpCacheEntryInfo,
lpdwCacheEntryInfoBufferSize,
......@@ -1736,7 +1736,7 @@ BOOL WINAPI RetrieveUrlCacheEntryFileW(
IN DWORD dwReserved
)
{
TRACE("(%s, %p, %p, 0x%08lx)\n",
TRACE("(%s, %p, %p, 0x%08x)\n",
debugstr_w(lpszUrlName),
lpCacheEntryInfo,
lpdwCacheEntryInfoBufferSize,
......@@ -1759,7 +1759,7 @@ BOOL WINAPI UnlockUrlCacheEntryFileA(
URL_CACHEFILE_ENTRY * pUrlEntry;
URLCACHECONTAINER * pContainer;
TRACE("(%s, 0x%08lx)\n", debugstr_a(lpszUrlName), dwReserved);
TRACE("(%s, 0x%08x)\n", debugstr_a(lpszUrlName), dwReserved);
if (dwReserved)
{
......@@ -1814,7 +1814,7 @@ BOOL WINAPI UnlockUrlCacheEntryFileA(
*/
BOOL WINAPI UnlockUrlCacheEntryFileW( LPCWSTR lpszUrlName, DWORD dwReserved )
{
FIXME("(%s, 0x%08lx)\n", debugstr_w(lpszUrlName), dwReserved);
FIXME("(%s, 0x%08x)\n", debugstr_w(lpszUrlName), dwReserved);
return TRUE;
}
......@@ -1900,7 +1900,7 @@ BOOL WINAPI CreateUrlCacheEntryW(
int count;
static const WCHAR szWWW[] = {'w','w','w',0};
TRACE("(%s, 0x%08lx, %s, %p, 0x%08lx)\n",
TRACE("(%s, 0x%08x, %s, %p, 0x%08x)\n",
debugstr_w(lpszUrlName),
dwExpectedFileSize,
debugstr_w(lpszFileExtension),
......@@ -2047,7 +2047,7 @@ static BOOL WINAPI CommitUrlCacheEntryInternal(
char achUrl[MAX_PATH];
char *pchLocalFileName = 0;
TRACE("(%s, %s, ..., ..., %lx, %p, %ld, %s, %s)\n",
TRACE("(%s, %s, ..., ..., %x, %p, %d, %s, %s)\n",
debugstr_w(lpszUrlName),
debugstr_w(lpszLocalFileName),
CacheEntryType,
......@@ -2066,7 +2066,7 @@ static BOOL WINAPI CommitUrlCacheEntryInternal(
hFile = CreateFileW(lpszLocalFileName, FILE_READ_ATTRIBUTES, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, NULL);
if (hFile == INVALID_HANDLE_VALUE)
{
ERR("couldn't open file %s (error is %ld)\n", debugstr_w(lpszLocalFileName), GetLastError());
ERR("couldn't open file %s (error is %d)\n", debugstr_w(lpszLocalFileName), GetLastError());
return FALSE;
}
......@@ -2074,7 +2074,7 @@ static BOOL WINAPI CommitUrlCacheEntryInternal(
dwFileSizeLow = GetFileSize(hFile, &dwFileSizeHigh);
if ((dwFileSizeLow == INVALID_FILE_SIZE) && (GetLastError() != NO_ERROR))
{
ERR("couldn't get file size (error is %ld)\n", GetLastError());
ERR("couldn't get file size (error is %d)\n", GetLastError());
CloseHandle(hFile);
return FALSE;
}
......@@ -2243,7 +2243,7 @@ BOOL WINAPI CommitUrlCacheEntryA(
BOOL bSuccess = FALSE;
DWORD dwError = 0;
TRACE("(%s, %s, ..., ..., %lx, %p, %ld, %s, %s)\n",
TRACE("(%s, %s, ..., ..., %x, %p, %d, %s, %s)\n",
debugstr_a(lpszUrlName),
debugstr_a(lpszLocalFileName),
CacheEntryType,
......@@ -2321,7 +2321,7 @@ BOOL WINAPI CommitUrlCacheEntryW(
DWORD len = 0;
CHAR *header_info = NULL;
TRACE("(%s, %s, ..., ..., %lx, %p, %ld, %s, %s)\n",
TRACE("(%s, %s, ..., ..., %x, %p, %d, %s, %s)\n",
debugstr_w(lpszUrlName),
debugstr_w(lpszLocalFileName),
CacheEntryType,
......@@ -2409,7 +2409,7 @@ HANDLE WINAPI RetrieveUrlCacheEntryStreamA(
STREAM_HANDLE * pStream;
HANDLE hFile;
TRACE( "(%s, %p, %p, %x, 0x%08lx)\n", debugstr_a(lpszUrlName), lpCacheEntryInfo,
TRACE( "(%s, %p, %p, %x, 0x%08x)\n", debugstr_a(lpszUrlName), lpCacheEntryInfo,
lpdwCacheEntryInfoBufferSize, fRandomRead, dwReserved );
if (!RetrieveUrlCacheEntryFileA(lpszUrlName,
......@@ -2456,7 +2456,7 @@ HANDLE WINAPI RetrieveUrlCacheEntryStreamW(
IN DWORD dwReserved
)
{
FIXME( "(%s, %p, %p, %x, 0x%08lx)\n", debugstr_w(lpszUrlName), lpCacheEntryInfo,
FIXME( "(%s, %p, %p, %x, 0x%08x)\n", debugstr_w(lpszUrlName), lpCacheEntryInfo,
lpdwCacheEntryInfoBufferSize, fRandomRead, dwReserved );
return NULL;
}
......@@ -2548,13 +2548,13 @@ BOOL WINAPI DeleteUrlCacheEntryW(LPCWSTR lpszUrlName)
BOOL WINAPI DeleteUrlCacheContainerA(DWORD d1, DWORD d2)
{
FIXME("(0x%08lx, 0x%08lx) stub\n", d1, d2);
FIXME("(0x%08x, 0x%08x) stub\n", d1, d2);
return TRUE;
}
BOOL WINAPI DeleteUrlCacheContainerW(DWORD d1, DWORD d2)
{
FIXME("(0x%08lx, 0x%08lx) stub\n", d1, d2);
FIXME("(0x%08x, 0x%08x) stub\n", d1, d2);
return TRUE;
}
......@@ -2564,7 +2564,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%08lx, 0x%08lx, 0x%08lx, 0x%08lx, 0x%08lx, 0x%08lx, 0x%08lx, 0x%08lx) stub\n",
FIXME("(0x%08x, 0x%08x, 0x%08x, 0x%08x, 0x%08x, 0x%08x, 0x%08x, 0x%08x) stub\n",
d1, d2, d3, d4, d5, d6, d7, d8);
return TRUE;
}
......@@ -2575,7 +2575,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%08lx, 0x%08lx, 0x%08lx, 0x%08lx, 0x%08lx, 0x%08lx, 0x%08lx, 0x%08lx) stub\n",
FIXME("(0x%08x, 0x%08x, 0x%08x, 0x%08x, 0x%08x, 0x%08x, 0x%08x, 0x%08x) stub\n",
d1, d2, d3, d4, d5, d6, d7, d8);
return TRUE;
}
......@@ -2594,7 +2594,7 @@ BOOL WINAPI FindCloseUrlCache(HANDLE hEnumHandle)
*/
HANDLE WINAPI FindFirstUrlCacheContainerA( LPVOID p1, LPVOID p2, LPVOID p3, DWORD d1 )
{
FIXME("(%p, %p, %p, 0x%08lx) stub\n", p1, p2, p3, d1 );
FIXME("(%p, %p, %p, 0x%08x) stub\n", p1, p2, p3, d1 );
return NULL;
}
......@@ -2603,7 +2603,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%08lx) stub\n", p1, p2, p3, d1 );
FIXME("(%p, %p, %p, 0x%08x) stub\n", p1, p2, p3, d1 );
return NULL;
}
......@@ -2637,7 +2637,7 @@ HANDLE WINAPI FindFirstUrlCacheEntryExA(
LPVOID lpReserved3
)
{
FIXME("(%s, 0x%08lx, 0x%08lx, 0x%08lx%08lx, %p, %p, %p, %p, %p) stub\n", debugstr_a(lpszUrlSearchPattern),
FIXME("(%s, 0x%08x, 0x%08x, 0x%08x%08x, %p, %p, %p, %p, %p) stub\n", debugstr_a(lpszUrlSearchPattern),
dwFlags, dwFilter, (ULONG)(GroupId >> 32), (ULONG)GroupId, lpFirstCacheEntryInfo,
lpdwFirstCacheEntryInfoBufferSize, lpReserved, pcbReserved2,lpReserved3);
SetLastError(ERROR_FILE_NOT_FOUND);
......@@ -2656,7 +2656,7 @@ HANDLE WINAPI FindFirstUrlCacheEntryExW(
LPVOID lpReserved3
)
{
FIXME("(%s, 0x%08lx, 0x%08lx, 0x%08lx%08lx, %p, %p, %p, %p, %p) stub\n", debugstr_w(lpszUrlSearchPattern),
FIXME("(%s, 0x%08x, 0x%08x, 0x%08x%08x, %p, %p, %p, %p, %p) stub\n", debugstr_w(lpszUrlSearchPattern),
dwFlags, dwFilter, (ULONG)(GroupId >> 32), (ULONG)GroupId, lpFirstCacheEntryInfo,
lpdwFirstCacheEntryInfoBufferSize, lpReserved, pcbReserved2,lpReserved3);
SetLastError(ERROR_FILE_NOT_FOUND);
......@@ -2689,7 +2689,7 @@ INTERNETAPI HANDLE WINAPI FindFirstUrlCacheEntryW(LPCWSTR lpszUrlSearchPattern,
HANDLE WINAPI FindFirstUrlCacheGroup( DWORD dwFlags, DWORD dwFilter, LPVOID lpSearchCondition,
DWORD dwSearchCondition, GROUPID* lpGroupId, LPVOID lpReserved )
{
FIXME("(0x%08lx, 0x%08lx, %p, 0x%08lx, %p, %p) stub\n", dwFlags, dwFilter, lpSearchCondition,
FIXME("(0x%08x, 0x%08x, %p, 0x%08x, %p, %p) stub\n", dwFlags, dwFilter, lpSearchCondition,
dwSearchCondition, lpGroupId, lpReserved);
return NULL;
}
......@@ -2754,7 +2754,7 @@ BOOL WINAPI FindNextUrlCacheGroup( HANDLE hFind, GROUPID* lpGroupId, LPVOID lpRe
*/
INTERNETAPI GROUPID WINAPI CreateUrlCacheGroup(DWORD dwFlags, LPVOID lpReserved)
{
FIXME("(0x%08lx, %p): stub\n", dwFlags, lpReserved);
FIXME("(0x%08x, %p): stub\n", dwFlags, lpReserved);
return FALSE;
}
......@@ -2764,7 +2764,7 @@ INTERNETAPI GROUPID WINAPI CreateUrlCacheGroup(DWORD dwFlags, LPVOID lpReserved)
*/
BOOL WINAPI DeleteUrlCacheGroup(GROUPID GroupId, DWORD dwFlags, LPVOID lpReserved)
{
FIXME("(0x%08lx%08lx, 0x%08lx, %p) stub\n",
FIXME("(0x%08x%08x, 0x%08x, %p) stub\n",
(ULONG)(GroupId >> 32), (ULONG)GroupId, dwFlags, lpReserved);
return FALSE;
}
......@@ -2777,7 +2777,7 @@ BOOL WINAPI SetUrlCacheEntryGroupA(LPCSTR lpszUrlName, DWORD dwFlags,
GROUPID GroupId, LPBYTE pbGroupAttributes, DWORD cbGroupAttributes,
LPVOID lpReserved)
{
FIXME("(%s, 0x%08lx, 0x%08lx%08lx, %p, 0x%08lx, %p) stub\n",
FIXME("(%s, 0x%08x, 0x%08x%08x, %p, 0x%08x, %p) stub\n",
debugstr_a(lpszUrlName), dwFlags, (ULONG)(GroupId >> 32), (ULONG)GroupId,
pbGroupAttributes, cbGroupAttributes, lpReserved);
SetLastError(ERROR_FILE_NOT_FOUND);
......@@ -2792,7 +2792,7 @@ BOOL WINAPI SetUrlCacheEntryGroupW(LPCWSTR lpszUrlName, DWORD dwFlags,
GROUPID GroupId, LPBYTE pbGroupAttributes, DWORD cbGroupAttributes,
LPVOID lpReserved)
{
FIXME("(%s, 0x%08lx, 0x%08lx%08lx, %p, 0x%08lx, %p) stub\n",
FIXME("(%s, 0x%08x, 0x%08x%08x, %p, 0x%08x, %p) stub\n",
debugstr_w(lpszUrlName), dwFlags, (ULONG)(GroupId >> 32), (ULONG)GroupId,
pbGroupAttributes, cbGroupAttributes, lpReserved);
SetLastError(ERROR_FILE_NOT_FOUND);
......@@ -2804,7 +2804,7 @@ BOOL WINAPI SetUrlCacheEntryGroupW(LPCWSTR lpszUrlName, DWORD dwFlags,
*/
BOOL WINAPI GetUrlCacheConfigInfoW(LPDWORD CacheInfo, LPDWORD size, DWORD bitmask)
{
FIXME("(%p, %p, %lx)\n", CacheInfo, size, bitmask);
FIXME("(%p, %p, %x)\n", CacheInfo, size, bitmask);
INTERNET_SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
}
......@@ -2816,7 +2816,7 @@ BOOL WINAPI GetUrlCacheConfigInfoW(LPDWORD CacheInfo, LPDWORD size, DWORD bitmas
*/
BOOL WINAPI GetUrlCacheConfigInfoA(LPDWORD CacheInfo, LPDWORD size, DWORD bitmask)
{
FIXME("(%p, %p, %lx)\n", CacheInfo, size, bitmask);
FIXME("(%p, %p, %x)\n", CacheInfo, size, bitmask);
INTERNET_SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
}
......@@ -2825,7 +2825,7 @@ BOOL WINAPI GetUrlCacheGroupAttributeA( GROUPID gid, DWORD dwFlags, DWORD dwAttr
LPINTERNET_CACHE_GROUP_INFOA lpGroupInfo,
LPDWORD lpdwGroupInfo, LPVOID lpReserved )
{
FIXME("(0x%08lx%08lx, 0x%08lx, 0x%08lx, %p, %p, %p) stub\n",
FIXME("(0x%08x%08x, 0x%08x, 0x%08x, %p, %p, %p) stub\n",
(ULONG)(gid >> 32), (ULONG)gid, dwFlags, dwAttributes, lpGroupInfo,
lpdwGroupInfo, lpReserved);
return FALSE;
......@@ -2835,7 +2835,7 @@ BOOL WINAPI GetUrlCacheGroupAttributeW( GROUPID gid, DWORD dwFlags, DWORD dwAttr
LPINTERNET_CACHE_GROUP_INFOW lpGroupInfo,
LPDWORD lpdwGroupInfo, LPVOID lpReserved )
{
FIXME("(0x%08lx%08lx, 0x%08lx, 0x%08lx, %p, %p, %p) stub\n",
FIXME("(0x%08x%08x, 0x%08x, 0x%08x, %p, %p, %p) stub\n",
(ULONG)(gid >> 32), (ULONG)gid, dwFlags, dwAttributes, lpGroupInfo,
lpdwGroupInfo, lpReserved);
return FALSE;
......@@ -2844,7 +2844,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%08lx%08lx, 0x%08lx, 0x%08lx, %p, %p) stub\n",
FIXME("(0x%08x%08x, 0x%08x, 0x%08x, %p, %p) stub\n",
(ULONG)(gid >> 32), (ULONG)gid, dwFlags, dwAttributes, lpGroupInfo, lpReserved);
return TRUE;
}
......@@ -2852,20 +2852,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%08lx%08lx, 0x%08lx, 0x%08lx, %p, %p) stub\n",
FIXME("(0x%08x%08x, 0x%08x, 0x%08x, %p, %p) stub\n",
(ULONG)(gid >> 32), (ULONG)gid, dwFlags, dwAttributes, lpGroupInfo, lpReserved);
return TRUE;
}
BOOL WINAPI SetUrlCacheConfigInfoA( LPDWORD lpCacheConfigInfo, DWORD dwFieldControl )
{
FIXME("(%p, 0x%08lx) stub\n", lpCacheConfigInfo, dwFieldControl);
FIXME("(%p, 0x%08x) stub\n", lpCacheConfigInfo, dwFieldControl);
return TRUE;
}
BOOL WINAPI SetUrlCacheConfigInfoW( LPDWORD lpCacheConfigInfo, DWORD dwFieldControl )
{
FIXME("(%p, 0x%08lx) stub\n", lpCacheConfigInfo, dwFieldControl);
FIXME("(%p, 0x%08x) stub\n", lpCacheConfigInfo, dwFieldControl);
return TRUE;
}
......
dlls/wininet/utility.c
View file @ cd2c4585
......@@ -248,7 +248,7 @@ VOID INTERNET_SendCallback(LPWININETHANDLEHEADER hdr, DWORD dwContext,
}
}
TRACE(" callback(%p) (%p (%p), %08lx, %ld (%s), %p, %ld)\n",
TRACE(" callback(%p) (%p (%p), %08x, %d (%s), %p, %d)\n",
hdr->lpfnStatusCB, hHttpSession, hdr, dwContext, dwInternetStatus, get_callback_name(dwInternetStatus),
lpvNewInfo, dwStatusInfoLength);
......@@ -269,7 +269,7 @@ VOID SendAsyncCallback(LPWININETHANDLEHEADER hdr, DWORD dwContext,
DWORD dwInternetStatus, LPVOID lpvStatusInfo,
DWORD dwStatusInfoLength)
{
TRACE("(%p, %08lx, %ld (%s), %p, %ld): %sasync call with callback %p\n",
TRACE("(%p, %08x, %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 ",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment