urlmon: Cast-qual warnings fix
Andrew Talbot
Andrew.Talbot at talbotville.com
Sun Oct 1 11:29:18 CDT 2006
I am assuming that the LPBYTE issue surrounding lpHeaderInfo in
CommitUrlCacheEntryA() relates to signedness, not constness. So I
have constified it (and its wide counterpart).
-- Andy.
---
Changelog:
urlmon: Cast-qual warnings fix.
diff -urN a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c
--- a/dlls/urlmon/umon.c 2006-07-31 10:32:51.000000000 +0100
+++ b/dlls/urlmon/umon.c 2006-10-01 16:56:59.000000000 +0100
@@ -1633,7 +1633,7 @@
modified.dwLowDateTime = 0;
if (!CommitUrlCacheEntryW(szURL, cache_path, expire, modified, NORMAL_CACHE_ENTRY,
- (LPWSTR)header, sizeof(header), NULL, NULL))
+ header, sizeof(header), NULL, NULL))
return E_FAIL;
if (lstrlenW(cache_path) > dwBufLength)
diff -urN a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c
--- a/dlls/wininet/urlcache.c 2006-07-29 11:23:47.000000000 +0100
+++ b/dlls/wininet/urlcache.c 2006-10-01 16:53:31.000000000 +0100
@@ -2013,7 +2013,7 @@
* The bug we are compensating for is that some drongo at Microsoft
* used lpHeaderInfo to pass binary data to CommitUrlCacheEntryA.
* As a consequence, CommitUrlCacheEntryA has been effectively
- * redefined as LPBYTE rather than LPCSTR. But CommitUrlCacheEntryW
+ * redefined as const BYTE * rather than LPCSTR. But CommitUrlCacheEntryW
* is still defined as LPCWSTR. The result (other than madness) is
* that we always need to store lpHeaderInfo in CP_ACP rather than
* in UTF16, and we need to avoid converting lpHeaderInfo in
@@ -2027,7 +2027,7 @@
IN FILETIME ExpireTime,
IN FILETIME LastModifiedTime,
IN DWORD CacheEntryType,
- IN LPBYTE lpHeaderInfo,
+ IN const BYTE *lpHeaderInfo,
IN DWORD dwHeaderSize,
IN LPCWSTR lpszFileExtension,
IN LPCWSTR lpszOriginalUrl
@@ -2230,7 +2230,7 @@
IN FILETIME ExpireTime,
IN FILETIME LastModifiedTime,
IN DWORD CacheEntryType,
- IN LPBYTE lpHeaderInfo,
+ IN const BYTE *lpHeaderInfo,
IN DWORD dwHeaderSize,
IN LPCSTR lpszFileExtension,
IN LPCSTR lpszOriginalUrl
@@ -2310,7 +2310,7 @@
IN FILETIME ExpireTime,
IN FILETIME LastModifiedTime,
IN DWORD CacheEntryType,
- IN LPWSTR lpHeaderInfo,
+ IN LPCWSTR lpHeaderInfo,
IN DWORD dwHeaderSize,
IN LPCWSTR lpszFileExtension,
IN LPCWSTR lpszOriginalUrl
@@ -2337,7 +2337,7 @@
if (header_info)
WideCharToMultiByte(CP_ACP, 0, lpHeaderInfo, -1, header_info, len, NULL, NULL);
if (CommitUrlCacheEntryInternal(lpszUrlName, lpszLocalFileName, ExpireTime, LastModifiedTime,
- CacheEntryType, (LPBYTE)header_info, len, lpszFileExtension, lpszOriginalUrl))
+ CacheEntryType, (const BYTE *)header_info, len, lpszFileExtension, lpszOriginalUrl))
{
bSuccess = TRUE;
}
diff -urN a/include/wininet.h b/include/wininet.h
--- a/include/wininet.h 2006-07-06 12:10:58.000000000 +0100
+++ b/include/wininet.h 2006-10-01 16:51:12.000000000 +0100
@@ -1450,8 +1450,8 @@
BOOLAPI CreateUrlCacheEntryW(LPCWSTR ,DWORD ,LPCWSTR ,LPWSTR ,DWORD);
#define CreateUrlCacheEntry WINELIB_NAME_AW(CreateUrlCacheEntry)
-BOOLAPI CommitUrlCacheEntryA(LPCSTR,LPCSTR,FILETIME,FILETIME,DWORD,LPBYTE,DWORD,LPCSTR,LPCSTR);
-BOOLAPI CommitUrlCacheEntryW(LPCWSTR,LPCWSTR,FILETIME,FILETIME,DWORD,LPWSTR,DWORD,LPCWSTR,LPCWSTR);
+BOOLAPI CommitUrlCacheEntryA(LPCSTR,LPCSTR,FILETIME,FILETIME,DWORD,const BYTE *,DWORD,LPCSTR,LPCSTR);
+BOOLAPI CommitUrlCacheEntryW(LPCWSTR,LPCWSTR,FILETIME,FILETIME,DWORD,LPCWSTR,DWORD,LPCWSTR,LPCWSTR);
#define CommitUrlCacheEntry WINELIB_NAME_AW(CommitUrlCacheEntry)
BOOLAPI ResumeSuspendedDownload(HINTERNET, DWORD);
More information about the wine-patches
mailing list