Module: wine Branch: master Commit: 75d4faabd38acb25cb13ebf764ad765bb9595255 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75d4faabd38acb25cb13ebf764...
Author: Andrew Talbot andrew.talbot@talbotville.com Date: Sat Oct 18 16:08:41 2008 +0100
mshtml: Sign-compare warnings fix.
---
dlls/mshtml/conpoint.c | 2 +- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/main.c | 2 +- dlls/mshtml/nsembed.c | 2 +- dlls/mshtml/nsio.c | 2 +- dlls/mshtml/protocol.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/mshtml/conpoint.c b/dlls/mshtml/conpoint.c index 0c77e9c..10d8e29 100644 --- a/dlls/mshtml/conpoint.c +++ b/dlls/mshtml/conpoint.c @@ -213,7 +213,7 @@ void ConnectionPoint_Init(ConnectionPoint *cp, ConnectionPointContainer *contain
static void ConnectionPoint_Destroy(ConnectionPoint *This) { - int i; + DWORD i;
for(i=0; i<This->sinks_size; i++) { if(This->sinks[i].unk) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 7fc6f30..01d52a2 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -763,7 +763,7 @@ static HRESULT WINAPI HTMLDocument_write(IHTMLDocument2 *iface, SAFEARRAY *psarr HTMLDocument *This = HTMLDOC_THIS(iface); nsAString nsstr; VARIANT *var; - int i; + ULONG i; nsresult nsres; HRESULT hres;
diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 1315e8a..8b441f0 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -318,7 +318,7 @@ static HRESULT register_server(BOOL do_register) STRTABLEA strtable; STRENTRYA pse[35]; static CLSID const *clsids[35]; - int i = 0; + unsigned int i = 0;
static const WCHAR wszAdvpack[] = {'a','d','v','p','a','c','k','.','d','l','l',0};
diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 45386be..1734541 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -497,7 +497,7 @@ BOOL load_gecko(BOOL silent) PRUnichar gre_path[MAX_PATH]; BOOL ret = FALSE;
- static LONG loading_thread; + static DWORD loading_thread;
TRACE("()\n");
diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 82f7c0d..1843542 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1583,7 +1583,7 @@ static nsresult NSAPI nsURI_SchemeIs(nsIWineURI *iface, const char *scheme, PRBo WCHAR buf[INTERNET_MAX_SCHEME_LENGTH]; int len = MultiByteToWideChar(CP_ACP, 0, scheme, -1, buf, sizeof(buf)/sizeof(WCHAR))-1;
- *_retval = strlenW(This->wine_url) > len + *_retval = lstrlenW(This->wine_url) > len && This->wine_url[len] == ':' && !memcmp(buf, This->wine_url, len*sizeof(WCHAR)); return NS_OK; diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index ff319ac..4cdac9f 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -424,7 +424,7 @@ static HRESULT WINAPI AboutProtocolInfo_ParseUrl(IInternetProtocolInfo *iface, L dwParseFlags, pwzResult, cchResult, pcchResult, dwReserved);
if(ParseAction == PARSE_SECURITY_URL) { - int len = lstrlenW(pwzUrl); + unsigned int len = strlenW(pwzUrl);
if(len >= cchResult) return S_FALSE;