Skip to content

W
wine-cw
Commit 5151d1ac authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard
Browse files
Options

wininet: Enable compilation with long types.

Signed-off-by: 's avatarEric Pouech <eric.pouech@gmail.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 6ac552ed
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 60 deletions
dlls/wininet/Makefile.in
View file @ 5151d1ac
EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = wininet.dll MODULE = wininet.dll
IMPORTLIB = wininet IMPORTLIB = wininet
IMPORTS = $(ZLIB_PE_LIBS) mpr shlwapi shell32 user32 ws2_32 advapi32 IMPORTS = $(ZLIB_PE_LIBS) mpr shlwapi shell32 user32 ws2_32 advapi32
......
dlls/wininet/cookie.c
View file @ 5151d1ac
...@@ -355,7 +355,7 @@ static BOOL load_persistent_cookie(substr_t domain, substr_t path) ...@@ -355,7 +355,7 @@ static BOOL load_persistent_cookie(substr_t domain, substr_t path)
pbeg = strchr(pend+1, '\n'); pbeg = strchr(pend+1, '\n');
if(!pbeg) if(!pbeg)
break; 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); &create.dwLowDateTime, &create.dwHighDateTime);
/* skip "*\n" */ /* skip "*\n" */
...@@ -481,7 +481,7 @@ static BOOL save_persistent_cookie(cookie_container_t *container) ...@@ -481,7 +481,7 @@ static BOOL save_persistent_cookie(cookie_container_t *container)
} }
heap_free(dyn_buf); 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->expiry.dwLowDateTime, cookie_container->expiry.dwHighDateTime,
cookie_container->create.dwLowDateTime, cookie_container->create.dwHighDateTime); cookie_container->create.dwLowDateTime, cookie_container->create.dwHighDateTime);
if(!WriteFile(cookie_handle, buf, strlen(buf), &bytes_written, NULL)) { if(!WriteFile(cookie_handle, buf, strlen(buf), &bytes_written, NULL)) {
...@@ -730,10 +730,10 @@ BOOL WINAPI InternetGetCookieExW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, ...@@ -730,10 +730,10 @@ BOOL WINAPI InternetGetCookieExW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName,
DWORD res; DWORD res;
BOOL ret; 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) if (flags & ~INTERNET_COOKIE_HTTPONLY)
FIXME("flags 0x%08x not supported\n", flags); FIXME("flags 0x%08lx not supported\n", flags);
if (!lpszUrl) if (!lpszUrl)
{ {
...@@ -759,7 +759,7 @@ BOOL WINAPI InternetGetCookieExW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, ...@@ -759,7 +759,7 @@ BOOL WINAPI InternetGetCookieExW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName,
if(cookie_set.cnt) { if(cookie_set.cnt) {
if(!lpCookieData || cookie_set.string_len+1 > *lpdwSize) { if(!lpCookieData || cookie_set.string_len+1 > *lpdwSize) {
*lpdwSize = (cookie_set.string_len + 1) * sizeof(WCHAR); *lpdwSize = (cookie_set.string_len + 1) * sizeof(WCHAR);
TRACE("returning %u\n", *lpdwSize); TRACE("returning %lu\n", *lpdwSize);
if(lpCookieData) { if(lpCookieData) {
SetLastError(ERROR_INSUFFICIENT_BUFFER); SetLastError(ERROR_INSUFFICIENT_BUFFER);
ret = FALSE; ret = FALSE;
...@@ -809,7 +809,7 @@ BOOL WINAPI InternetGetCookieExA(LPCSTR lpszUrl, LPCSTR lpszCookieName, ...@@ -809,7 +809,7 @@ BOOL WINAPI InternetGetCookieExA(LPCSTR lpszUrl, LPCSTR lpszCookieName,
DWORD len, size = 0; DWORD len, size = 0;
BOOL r; 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); lpCookieData, lpdwSize, lpdwSize ? *lpdwSize : 0, flags, reserved);
url = heap_strdupAtoW(lpszUrl); url = heap_strdupAtoW(lpszUrl);
...@@ -915,7 +915,7 @@ DWORD set_cookie(substr_t domain, substr_t path, substr_t name, substr_t data, D ...@@ -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; BOOL expired = FALSE, update_persistent = FALSE;
DWORD cookie_flags = 0, len; 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); debugstr_wn(name.str, name.len), debugstr_wn(data.str, data.len), flags);
memset(&expiry,0,sizeof(expiry)); memset(&expiry,0,sizeof(expiry));
...@@ -1076,11 +1076,11 @@ DWORD WINAPI InternetSetCookieExW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, ...@@ -1076,11 +1076,11 @@ DWORD WINAPI InternetSetCookieExW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName,
substr_t host, path, name, data; substr_t host, path, name, data;
BOOL ret; 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); debugstr_w(lpCookieData), flags, reserved);
if (flags & ~INTERNET_COOKIE_HTTPONLY) if (flags & ~INTERNET_COOKIE_HTTPONLY)
FIXME("flags %x not supported\n", flags); FIXME("flags %lx not supported\n", flags);
if (!lpszUrl || !lpCookieData) if (!lpszUrl || !lpCookieData)
{ {
...@@ -1164,7 +1164,7 @@ DWORD WINAPI InternetSetCookieExA( LPCSTR lpszURL, LPCSTR lpszCookieName, LPCSTR ...@@ -1164,7 +1164,7 @@ DWORD WINAPI InternetSetCookieExA( LPCSTR lpszURL, LPCSTR lpszCookieName, LPCSTR
WCHAR *data, *url, *name; WCHAR *data, *url, *name;
DWORD r; 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); debugstr_a(lpszCookieData), dwFlags, dwReserved);
url = heap_strdupAtoW(lpszURL); url = heap_strdupAtoW(lpszURL);
...@@ -1203,7 +1203,7 @@ BOOL WINAPI InternetClearAllPerSiteCookieDecisions( VOID ) ...@@ -1203,7 +1203,7 @@ BOOL WINAPI InternetClearAllPerSiteCookieDecisions( VOID )
BOOL WINAPI InternetEnumPerSiteCookieDecisionA( LPSTR pszSiteName, ULONG *pcSiteNameSize, BOOL WINAPI InternetEnumPerSiteCookieDecisionA( LPSTR pszSiteName, ULONG *pcSiteNameSize,
ULONG *pdwDecision, ULONG dwIndex ) 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); debugstr_a(pszSiteName), pcSiteNameSize, pdwDecision, dwIndex);
return FALSE; return FALSE;
} }
...@@ -1221,7 +1221,7 @@ BOOL WINAPI InternetEnumPerSiteCookieDecisionA( LPSTR pszSiteName, ULONG *pcSite ...@@ -1221,7 +1221,7 @@ BOOL WINAPI InternetEnumPerSiteCookieDecisionA( LPSTR pszSiteName, ULONG *pcSite
BOOL WINAPI InternetEnumPerSiteCookieDecisionW( LPWSTR pszSiteName, ULONG *pcSiteNameSize, BOOL WINAPI InternetEnumPerSiteCookieDecisionW( LPWSTR pszSiteName, ULONG *pcSiteNameSize,
ULONG *pdwDecision, ULONG dwIndex ) 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); debugstr_w(pszSiteName), pcSiteNameSize, pdwDecision, dwIndex);
return FALSE; return FALSE;
} }
...@@ -1249,7 +1249,7 @@ BOOL WINAPI InternetGetPerSiteCookieDecisionW( LPCWSTR pwchHostName, ULONG *pRes ...@@ -1249,7 +1249,7 @@ BOOL WINAPI InternetGetPerSiteCookieDecisionW( LPCWSTR pwchHostName, ULONG *pRes
*/ */
BOOL WINAPI InternetSetPerSiteCookieDecisionA( LPCSTR pchHostName, DWORD dwDecision ) 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; return FALSE;
} }
...@@ -1258,7 +1258,7 @@ BOOL WINAPI InternetSetPerSiteCookieDecisionA( LPCSTR pchHostName, DWORD dwDecis ...@@ -1258,7 +1258,7 @@ BOOL WINAPI InternetSetPerSiteCookieDecisionA( LPCSTR pchHostName, DWORD dwDecis
*/ */
BOOL WINAPI InternetSetPerSiteCookieDecisionW( LPCWSTR pchHostName, DWORD dwDecision ) 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; return FALSE;
} }
......
dlls/wininet/dialogs.c
View file @ 5151d1ac
...@@ -214,7 +214,7 @@ static INT_PTR WINAPI WININET_ProxyPasswordDialog( ...@@ -214,7 +214,7 @@ static INT_PTR WINAPI WININET_ProxyPasswordDialog(
if( uMsg == WM_INITDIALOG ) if( uMsg == WM_INITDIALOG )
{ {
TRACE("WM_INITDIALOG (%08lx)\n", lParam); TRACE("WM_INITDIALOG (%08Ix)\n", lParam);
/* save the parameter list */ /* save the parameter list */
params = (struct WININET_ErrorDlgParams*) lParam; params = (struct WININET_ErrorDlgParams*) lParam;
...@@ -289,7 +289,7 @@ static INT_PTR WINAPI WININET_PasswordDialog( ...@@ -289,7 +289,7 @@ static INT_PTR WINAPI WININET_PasswordDialog(
if( uMsg == WM_INITDIALOG ) if( uMsg == WM_INITDIALOG )
{ {
TRACE("WM_INITDIALOG (%08lx)\n", lParam); TRACE("WM_INITDIALOG (%08Ix)\n", lParam);
/* save the parameter list */ /* save the parameter list */
params = (struct WININET_ErrorDlgParams*) lParam; params = (struct WININET_ErrorDlgParams*) lParam;
...@@ -366,7 +366,7 @@ static INT_PTR WINAPI WININET_InvalidCertificateDialog( ...@@ -366,7 +366,7 @@ static INT_PTR WINAPI WININET_InvalidCertificateDialog(
if( uMsg == WM_INITDIALOG ) if( uMsg == WM_INITDIALOG )
{ {
TRACE("WM_INITDIALOG (%08lx)\n", lParam); TRACE("WM_INITDIALOG (%08Ix)\n", lParam);
/* save the parameter list */ /* save the parameter list */
params = (struct WININET_ErrorDlgParams*) lParam; params = (struct WININET_ErrorDlgParams*) lParam;
...@@ -390,7 +390,7 @@ static INT_PTR WINAPI WININET_InvalidCertificateDialog( ...@@ -390,7 +390,7 @@ static INT_PTR WINAPI WININET_InvalidCertificateDialog(
LoadStringW( WININET_hModule, IDS_CERT_ERRORS, buf, 1024 ); LoadStringW( WININET_hModule, IDS_CERT_ERRORS, buf, 1024 );
break; break;
default: default:
FIXME( "No message for error %d\n", params->dwError ); FIXME( "No message for error %ld\n", params->dwError );
buf[0] = '\0'; buf[0] = '\0';
} }
...@@ -472,7 +472,7 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest, ...@@ -472,7 +472,7 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest,
http_request_t *req = NULL; http_request_t *req = NULL;
DWORD res = ERROR_SUCCESS; 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) ) if( !hWnd && !(dwFlags & FLAGS_ERROR_UI_FLAGS_NO_UI) )
return ERROR_INVALID_HANDLE; return ERROR_INVALID_HANDLE;
...@@ -510,7 +510,7 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest, ...@@ -510,7 +510,7 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest,
hWnd, WININET_PasswordDialog, (LPARAM) &params ); hWnd, WININET_PasswordDialog, (LPARAM) &params );
break; break;
default: default:
WARN("unhandled status %u\n", req->status_code); WARN("unhandled status %lu\n", req->status_code);
} }
break; break;
} }
...@@ -531,7 +531,7 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest, ...@@ -531,7 +531,7 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest,
} }
if( dwFlags & ~FLAGS_ERROR_UI_FLAGS_CHANGE_OPTIONS ) 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 ), res = DialogBoxParamW( WININET_hModule, MAKEINTRESOURCEW( IDD_INVCERTDLG ),
hWnd, WININET_InvalidCertificateDialog, (LPARAM) &params ); hWnd, WININET_InvalidCertificateDialog, (LPARAM) &params );
...@@ -542,7 +542,7 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest, ...@@ -542,7 +542,7 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest,
res = ERROR_HTTP_COOKIE_DECLINED; res = ERROR_HTTP_COOKIE_DECLINED;
break; break;
} }
FIXME("Need to display dialog for error %d\n", dwError); FIXME("Need to display dialog for error %ld\n", dwError);
res = ERROR_CANCELLED; res = ERROR_CANCELLED;
break; break;
...@@ -556,7 +556,7 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest, ...@@ -556,7 +556,7 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest,
case ERROR_INTERNET_MIXED_SECURITY: case ERROR_INTERNET_MIXED_SECURITY:
case ERROR_INTERNET_HTTPS_HTTP_SUBMIT_REDIR: case ERROR_INTERNET_HTTPS_HTTP_SUBMIT_REDIR:
if(!(dwFlags & FLAGS_ERROR_UI_FLAGS_NO_UI)) 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; res = ERROR_CANCELLED;
break; break;
...@@ -566,14 +566,14 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest, ...@@ -566,14 +566,14 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest,
res = ERROR_SUCCESS; res = ERROR_SUCCESS;
break; break;
} }
FIXME("Need to display dialog for error %d\n", dwError); FIXME("Need to display dialog for error %ld\n", dwError);
res = ERROR_CANCELLED; res = ERROR_CANCELLED;
break; break;
case ERROR_INTERNET_HTTP_TO_HTTPS_ON_REDIR: case ERROR_INTERNET_HTTP_TO_HTTPS_ON_REDIR:
case ERROR_INTERNET_POST_IS_NON_SECURE: case ERROR_INTERNET_POST_IS_NON_SECURE:
if (!(dwFlags & FLAGS_ERROR_UI_FLAGS_NO_UI)) 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; res = ERROR_SUCCESS;
break; break;
...@@ -611,7 +611,7 @@ BOOL WINAPI InternetShowSecurityInfoByURLW(LPCWSTR url, HWND window) ...@@ -611,7 +611,7 @@ BOOL WINAPI InternetShowSecurityInfoByURLW(LPCWSTR url, HWND window)
*/ */
DWORD WINAPI ParseX509EncodedCertificateForListBoxEntry(LPBYTE cert, DWORD len, LPSTR szlistbox, LPDWORD listbox) 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; return ERROR_CALL_NOT_IMPLEMENTED;
} }
......
dlls/wininet/ftp.c
View file @ 5151d1ac
...@@ -1203,7 +1203,7 @@ static DWORD FTPFILE_ReadFile(object_header_t *hdr, void *buffer, DWORD size, DW ...@@ -1203,7 +1203,7 @@ static DWORD FTPFILE_ReadFile(object_header_t *hdr, void *buffer, DWORD size, DW
DWORD bytes_written; DWORD bytes_written;
if (!WriteFile(file->cache_file_handle, buffer, *read, &bytes_written, NULL)) 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; return error;
} }
...@@ -1254,11 +1254,11 @@ static DWORD FTPFILE_QueryDataAvailable(object_header_t *hdr, DWORD *available, ...@@ -1254,11 +1254,11 @@ static DWORD FTPFILE_QueryDataAvailable(object_header_t *hdr, DWORD *available,
ULONG unread = 0; ULONG unread = 0;
int retval; 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); retval = ioctlsocket(file->nDataSocket, FIONREAD, &unread);
if (!retval) if (!retval)
TRACE("%d bytes of queued, but unread data\n", unread); TRACE("%ld bytes of queued, but unread data\n", unread);
*available = unread; *available = unread;
...@@ -1386,7 +1386,7 @@ static HINTERNET FTP_FtpOpenFileW(ftp_session_t *lpwfs, ...@@ -1386,7 +1386,7 @@ static HINTERNET FTP_FtpOpenFileW(ftp_session_t *lpwfs,
NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
if (lpwh->cache_file_handle == INVALID_HANDLE_VALUE) 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); heap_free(lpwh->cache_file);
lpwh->cache_file = NULL; lpwh->cache_file = NULL;
} }
...@@ -1486,7 +1486,7 @@ HINTERNET WINAPI FtpOpenFileW(HINTERNET hFtpSession, ...@@ -1486,7 +1486,7 @@ HINTERNET WINAPI FtpOpenFileW(HINTERNET hFtpSession,
appinfo_t *hIC = NULL; appinfo_t *hIC = NULL;
HINTERNET r = 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); debugstr_w(lpszFileName), fdwAccess, dwFlags, dwContext);
lpwfs = (ftp_session_t*) get_handle_object( hFtpSession ); lpwfs = (ftp_session_t*) get_handle_object( hFtpSession );
...@@ -2217,7 +2217,7 @@ BOOL WINAPI FtpCommandA( HINTERNET hConnect, BOOL fExpectResponse, DWORD dwFlags ...@@ -2217,7 +2217,7 @@ BOOL WINAPI FtpCommandA( HINTERNET hConnect, BOOL fExpectResponse, DWORD dwFlags
BOOL r; BOOL r;
WCHAR *cmdW; 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); debugstr_a(lpszCommand), dwContext, phFtpCommand);
if (fExpectResponse) if (fExpectResponse)
...@@ -2256,7 +2256,7 @@ BOOL WINAPI FtpCommandW( HINTERNET hConnect, BOOL fExpectResponse, DWORD dwFlags ...@@ -2256,7 +2256,7 @@ BOOL WINAPI FtpCommandW( HINTERNET hConnect, BOOL fExpectResponse, DWORD dwFlags
DWORD len, nBytesSent= 0; DWORD len, nBytesSent= 0;
INT nResCode, nRC = 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); debugstr_w(lpszCommand), dwContext, phFtpCommand);
if (!lpszCommand || !lpszCommand[0]) if (!lpszCommand || !lpszCommand[0])
...@@ -2302,7 +2302,7 @@ BOOL WINAPI FtpCommandW( HINTERNET hConnect, BOOL fExpectResponse, DWORD dwFlags ...@@ -2302,7 +2302,7 @@ BOOL WINAPI FtpCommandW( HINTERNET hConnect, BOOL fExpectResponse, DWORD dwFlags
strcat(cmd, szCRLF); strcat(cmd, szCRLF);
len--; 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)) while ((nBytesSent < len) && (nRC != -1))
{ {
nRC = sock_send(lpwfs->sndSocket, cmd + nBytesSent, len - nBytesSent, 0); 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, ...@@ -2711,7 +2711,7 @@ static BOOL FTP_SendCommandA(INT nSocket, FTP_COMMAND ftpCmd, LPCSTR lpszParam,
sprintf(buf, "%s%s%s%s", szFtpCommands[ftpCmd], dwParamLen ? " " : "", sprintf(buf, "%s%s%s%s", szFtpCommands[ftpCmd], dwParamLen ? " " : "",
dwParamLen ? lpszParam : "", szCRLF); 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)) while((nBytesSent < len) && (nRC != -1))
{ {
nRC = sock_send(nSocket, buf+nBytesSent, len - nBytesSent, 0); nRC = sock_send(nSocket, buf+nBytesSent, len - nBytesSent, 0);
...@@ -2725,7 +2725,7 @@ static BOOL FTP_SendCommandA(INT nSocket, FTP_COMMAND ftpCmd, LPCSTR lpszParam, ...@@ -2725,7 +2725,7 @@ static BOOL FTP_SendCommandA(INT nSocket, FTP_COMMAND ftpCmd, LPCSTR lpszParam,
&nBytesSent, sizeof(DWORD)); &nBytesSent, sizeof(DWORD));
} }
TRACE("Sent %d bytes\n", nBytesSent); TRACE("Sent %ld bytes\n", nBytesSent);
return (nRC != -1); return (nRC != -1);
} }
...@@ -3307,13 +3307,13 @@ static BOOL FTP_SendData(ftp_session_t *lpwfs, INT nDataSocket, HANDLE hFile) ...@@ -3307,13 +3307,13 @@ static BOOL FTP_SendData(ftp_session_t *lpwfs, INT nDataSocket, HANDLE hFile)
nSeconds = e_long_time - s_long_time; nSeconds = e_long_time - s_long_time;
if( nSeconds / 60 > 0 ) 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, nTotalSent, fi.nFileSizeLow, nTotalSent*100/fi.nFileSizeLow, nSeconds / 60,
nSeconds % 60, (fi.nFileSizeLow - nTotalSent) * nSeconds / nTotalSent ); nSeconds % 60, (fi.nFileSizeLow - nTotalSent) * nSeconds / nTotalSent );
} }
else 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, nTotalSent, fi.nFileSizeLow, nTotalSent*100/fi.nFileSizeLow, nSeconds,
(fi.nFileSizeLow - nTotalSent) * nSeconds / nTotalSent); (fi.nFileSizeLow - nTotalSent) * nSeconds / nTotalSent);
} }
...@@ -3442,7 +3442,7 @@ static DWORD FTPFINDNEXT_FindNextFileProc(WININETFTPFINDNEXTW *find, LPVOID data ...@@ -3442,7 +3442,7 @@ static DWORD FTPFINDNEXT_FindNextFileProc(WININETFTPFINDNEXTW *find, LPVOID data
WIN32_FIND_DATAW *find_data = data; WIN32_FIND_DATAW *find_data = data;
DWORD res = ERROR_SUCCESS; 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)); ZeroMemory(find_data, sizeof(WIN32_FIND_DATAW));
...@@ -3450,7 +3450,7 @@ static DWORD FTPFINDNEXT_FindNextFileProc(WININETFTPFINDNEXTW *find, LPVOID data ...@@ -3450,7 +3450,7 @@ static DWORD FTPFINDNEXT_FindNextFileProc(WININETFTPFINDNEXTW *find, LPVOID data
FTP_ConvertFileProp(&find->lpafp[find->index], find_data); FTP_ConvertFileProp(&find->lpafp[find->index], find_data);
find->index++; 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 { }else {
res = ERROR_NO_MORE_FILES; res = ERROR_NO_MORE_FILES;
} }
...@@ -3545,7 +3545,7 @@ static HINTERNET FTP_ReceiveFileList(ftp_session_t *lpwfs, INT nSocket, LPCWSTR ...@@ -3545,7 +3545,7 @@ static HINTERNET FTP_ReceiveFileList(ftp_session_t *lpwfs, INT nSocket, LPCWSTR
LPFILEPROPERTIESW lpafp = NULL; LPFILEPROPERTIESW lpafp = NULL;
LPWININETFTPFINDNEXTW lpwfn = 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)) if (FTP_ParseDirectory(lpwfs, nSocket, lpszSearchFile, &lpafp, &dwSize))
{ {
...@@ -3567,7 +3567,7 @@ static HINTERNET FTP_ReceiveFileList(ftp_session_t *lpwfs, INT nSocket, LPCWSTR ...@@ -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; return lpwfn ? lpwfn->hdr.hInternet : NULL;
} }
...@@ -3743,7 +3743,7 @@ static BOOL FTP_ParseNextFile(INT nSocket, LPCWSTR lpszSearchFile, LPFILEPROPERT ...@@ -3743,7 +3743,7 @@ static BOOL FTP_ParseNextFile(INT nSocket, LPCWSTR lpszSearchFile, LPFILEPROPERT
else { else {
lpfp->bIsDirectory = FALSE; lpfp->bIsDirectory = FALSE;
lpfp->nSize = atol(pszToken); lpfp->nSize = atol(pszToken);
TRACE("Size: %d\n", lpfp->nSize); TRACE("Size: %ld\n", lpfp->nSize);
} }
pszToken = strtok(NULL, szSpace); pszToken = strtok(NULL, szSpace);
......
dlls/wininet/netconnection.c
View file @ 5151d1ac
...@@ -81,7 +81,7 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR ...@@ -81,7 +81,7 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR
} }
if (chain->TrustStatus.dwErrorStatus & ~supportedErrors) { 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; err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_INVALID_CERT;
errors &= supportedErrors; errors &= supportedErrors;
if(!conn->mask_errors) if(!conn->mask_errors)
...@@ -181,9 +181,9 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR ...@@ -181,9 +181,9 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR
conn->security_flags |= _SECURITY_FLAG_CERT_INVALID_CN; conn->security_flags |= _SECURITY_FLAG_CERT_INVALID_CN;
err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_CERT_CN_INVALID; err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_CERT_CN_INVALID;
}else if(policyStatus.dwError) { }else if(policyStatus.dwError) {
WARN("policyStatus.dwError %x\n", policyStatus.dwError); WARN("policyStatus.dwError %lx\n", policyStatus.dwError);
if(conn->mask_errors) 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; err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_INVALID_CERT;
} }
}else { }else {
...@@ -192,7 +192,7 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR ...@@ -192,7 +192,7 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR
} }
if(err) { if(err) {
WARN("failed %u\n", err); WARN("failed %lu\n", err);
CertFreeCertificateChain(chain); CertFreeCertificateChain(chain);
if(conn->server->cert_chain) { if(conn->server->cert_chain) {
CertFreeCertificateChain(conn->server->cert_chain); CertFreeCertificateChain(conn->server->cert_chain);
...@@ -251,7 +251,7 @@ static BOOL ensure_cred_handle(void) ...@@ -251,7 +251,7 @@ static BOOL ensure_cred_handle(void)
LeaveCriticalSection(&init_sechandle_cs); LeaveCriticalSection(&init_sechandle_cs);
if(res != SEC_E_OK) { if(res != SEC_E_OK) {
WARN("Failed: %08x\n", res); WARN("Failed: %08lx\n", res);
return FALSE; return FALSE;
} }
...@@ -269,7 +269,7 @@ static BOOL WINAPI winsock_startup(INIT_ONCE *once, void *param, void **context) ...@@ -269,7 +269,7 @@ static BOOL WINAPI winsock_startup(INIT_ONCE *once, void *param, void **context)
if(res == ERROR_SUCCESS) if(res == ERROR_SUCCESS)
winsock_loaded = TRUE; winsock_loaded = TRUE;
else else
ERR("WSAStartup failed: %u\n", res); ERR("WSAStartup failed: %lu\n", res);
return TRUE; return TRUE;
} }
...@@ -474,7 +474,7 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, BOOL compat_mode ...@@ -474,7 +474,7 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, BOOL compat_mode
if(out_buf.cbBuffer) { if(out_buf.cbBuffer) {
assert(status == SEC_I_CONTINUE_NEEDED); 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); size = sock_send(connection->socket, out_buf.pvBuffer, out_buf.cbBuffer, 0);
if(size != out_buf.cbBuffer) { if(size != out_buf.cbBuffer) {
...@@ -522,13 +522,13 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, BOOL compat_mode ...@@ -522,13 +522,13 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, BOOL compat_mode
break; break;
} }
TRACE("recv %lu bytes\n", size); TRACE("recv %Iu bytes\n", size);
in_bufs[0].cbBuffer += size; in_bufs[0].cbBuffer += size;
in_bufs[0].pvBuffer = read_buf; in_bufs[0].pvBuffer = read_buf;
status = InitializeSecurityContextW(cred, &ctx, connection->server->name, isc_req_flags, 0, 0, &in_desc, status = InitializeSecurityContextW(cred, &ctx, connection->server->name, isc_req_flags, 0, 0, &in_desc,
0, NULL, &out_desc, &attrs, NULL); 0, NULL, &out_desc, &attrs, NULL);
TRACE("InitializeSecurityContext ret %08x\n", status); TRACE("InitializeSecurityContext ret %08lx\n", status);
if(status == SEC_E_OK) { if(status == SEC_E_OK) {
if(SecIsValidHandle(&connection->ssl_ctx)) if(SecIsValidHandle(&connection->ssl_ctx))
...@@ -549,7 +549,7 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, BOOL compat_mode ...@@ -549,7 +549,7 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, BOOL compat_mode
res = netconn_verify_cert(connection, cert, cert->hCertStore); res = netconn_verify_cert(connection, cert, cert->hCertStore);
CertFreeCertificateContext(cert); CertFreeCertificateContext(cert);
if(res != ERROR_SUCCESS) { if(res != ERROR_SUCCESS) {
WARN("cert verify failed: %u\n", res); WARN("cert verify failed: %lu\n", res);
break; break;
} }
}else { }else {
...@@ -569,7 +569,7 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, BOOL compat_mode ...@@ -569,7 +569,7 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, BOOL compat_mode
heap_free(read_buf); heap_free(read_buf);
if(status != SEC_E_OK || res != ERROR_SUCCESS) { 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); heap_free(connection->ssl_buf);
connection->ssl_buf = NULL; connection->ssl_buf = NULL;
return res ? res : ERROR_INTERNET_SECURITY_CHANNEL_ERROR; 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 ...@@ -775,7 +775,7 @@ static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, BOOL blo
buf_len += size; buf_len += size;
continue; continue;
default: default:
WARN("failed: %08x\n", res); WARN("failed: %08lx\n", res);
return ERROR_INTERNET_CONNECTION_ABORTED; return ERROR_INTERNET_CONNECTION_ABORTED;
} }
} while(res != SEC_E_OK); } while(res != SEC_E_OK);
...@@ -862,7 +862,7 @@ DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, BOOL blocking, i ...@@ -862,7 +862,7 @@ DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, BOOL blocking, i
} }
}while(!size && !eof); }while(!size && !eof);
TRACE("received %ld bytes\n", size); TRACE("received %Id bytes\n", size);
*recvd = size; *recvd = size;
return res; return res;
} }
...@@ -898,7 +898,7 @@ int NETCON_GetCipherStrength(netconn_t *connection) ...@@ -898,7 +898,7 @@ int NETCON_GetCipherStrength(netconn_t *connection)
res = QueryContextAttributesW(&connection->ssl_ctx, SECPKG_ATTR_CONNECTION_INFO, (void*)&conn_info); res = QueryContextAttributesW(&connection->ssl_ctx, SECPKG_ATTR_CONNECTION_INFO, (void*)&conn_info);
if(res != SEC_E_OK) 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; return res == SEC_E_OK ? conn_info.dwCipherStrength : 0;
} }
......
dlls/wininet/utility.c
View file @ 5151d1ac
...@@ -225,7 +225,7 @@ static const char *debugstr_status_info(DWORD status, void *info) ...@@ -225,7 +225,7 @@ static const char *debugstr_status_info(DWORD status, void *info)
switch(status) { switch(status) {
case INTERNET_STATUS_REQUEST_COMPLETE: { case INTERNET_STATUS_REQUEST_COMPLETE: {
INTERNET_ASYNC_RESULT *iar = info; 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: default:
return wine_dbg_sprintf("%p", info); return wine_dbg_sprintf("%p", info);
...@@ -264,7 +264,7 @@ void INTERNET_SendCallback(object_header_t *hdr, DWORD_PTR context, DWORD status ...@@ -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), hdr->lpfnStatusCB, hdr->hInternet, hdr, context, status, get_callback_name(status),
debugstr_status_info(status, new_info), info_len); debugstr_status_info(status, new_info), info_len);
......
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