Andrew Talbot : shlwapi: Sign-compare warnings fix.
Alexandre Julliard
julliard at winehq.org
Thu Nov 13 08:51:25 CST 2008
Module: wine
Branch: master
Commit: ba1e2660e85baf9aeb77654d1cb20af71ef50bb3
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba1e2660e85baf9aeb77654d1cb20af71ef50bb3
Author: Andrew Talbot <andrew.talbot at talbotville.com>
Date: Wed Nov 12 20:22:09 2008 +0000
shlwapi: Sign-compare warnings fix.
---
dlls/shlwapi/assoc.c | 2 +-
dlls/shlwapi/url.c | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/shlwapi/assoc.c b/dlls/shlwapi/assoc.c
index 0ca8678..b619518 100644
--- a/dlls/shlwapi/assoc.c
+++ b/dlls/shlwapi/assoc.c
@@ -803,7 +803,7 @@ static HRESULT WINAPI IQueryAssociations_fnGetString(
goto get_friendly_name_fail;
if (VerQueryValueW(verinfoW, translationW, (LPVOID *)&bufW, &flen))
{
- int i;
+ UINT i;
DWORD *langCodeDesc = (DWORD *)bufW;
for (i = 0; i < flen / sizeof(DWORD); i++)
{
diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c
index e6289a5..4a39726 100644
--- a/dlls/shlwapi/url.c
+++ b/dlls/shlwapi/url.c
@@ -118,7 +118,7 @@ static const unsigned char HashDataLookup[256] = {
static DWORD get_scheme_code(LPCWSTR scheme, DWORD scheme_len)
{
- int i;
+ unsigned int i;
for(i=0; i < sizeof(shlwapi_schemes)/sizeof(shlwapi_schemes[0]); i++) {
if(scheme_len == strlenW(shlwapi_schemes[i].scheme_name)
@@ -314,8 +314,8 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized,
HRESULT hr = S_OK;
DWORD EscapeFlags;
LPWSTR lpszUrlCpy, wk1, wk2, mp, mp2, root;
- INT nByteLen, state;
- DWORD nLen, nWkLen;
+ INT state;
+ DWORD nByteLen, nLen, nWkLen;
WCHAR slash = '/';
static const WCHAR wszFile[] = {'f','i','l','e',':'};
@@ -332,7 +332,7 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized,
return S_OK;
}
- nByteLen = (lstrlenW(pszUrl) + 1) * sizeof(WCHAR); /* length in bytes */
+ nByteLen = (strlenW(pszUrl) + 1) * sizeof(WCHAR); /* length in bytes */
lpszUrlCpy = HeapAlloc(GetProcessHeap(), 0,
INTERNET_MAX_URL_LENGTH * sizeof(WCHAR));
More information about the wine-cvs
mailing list