Andrew Talbot : usp10: Sign-compare warnings fix.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: bf92d68330f5f755331a5d7bea70a1e0207f8287
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=bf92d68330f5f755331a5d7bea...

Author: Andrew Talbot 
Date:   Wed Nov 19 21:28:04 2008 +0000

usp10: Sign-compare warnings fix.

---

dlls/usp10/usp10.c |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c
index 2bc0617..4af14ae 100644
--- a/dlls/usp10/usp10.c
+++ b/dlls/usp10/usp10.c
@@ -1030,7 +1030,7 @@ HRESULT WINAPI ScriptXtoCP(int iX,
  */
 HRESULT WINAPI ScriptBreak(const WCHAR *chars, int count, const SCRIPT_ANALYSIS *sa, SCRIPT_LOGATTR *la)
 {
-    unsigned int i;
+    int i;

TRACE("(%s, %d, %p, %p)\n", debugstr_wn(chars, count), count, sa, la);

@@ -1220,7 +1220,8 @@ complex_ranges[] =
  */
 HRESULT WINAPI ScriptIsComplex(const WCHAR *chars, int len, DWORD flag)
 {
-    unsigned int i, j;
+    int i;
+    unsigned int j;

TRACE("(%s,%d,0x%x)\n", debugstr_wn(chars, len), len, flag);

@@ -1336,7 +1337,7 @@ HRESULT WINAPI ScriptPlace(HDC hdc, SCRIPT_CACHE *psc, const WORD *pwGlyphs,
                            SCRIPT_ANALYSIS *psa, int *piAdvance, GOFFSET *pGoffset, ABC *pABC )
 {
     HRESULT hr;
-    unsigned int i;
+    int i;

TRACE("(%p, %p, %p, %s, %d, %p, %p, %p)\n",  hdc, psc, pwGlyphs,
           debugstr_wn(pwGlyphs, cGlyphs), cGlyphs, psva, psa, piAdvance);
@@ -1400,7 +1401,7 @@ HRESULT WINAPI ScriptGetCMap(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcInChars
                              int cChars, DWORD dwFlags, WORD *pwOutGlyphs)
 {
     HRESULT hr;
-    unsigned int i;
+    int i;

TRACE("(%p,%p,%s,%d,0x%x,%p)\n", hdc, psc, debugstr_wn(pwcInChars, cChars),
           cChars, dwFlags, pwOutGlyphs);
@@ -1642,7 +1643,7 @@ HRESULT WINAPI ScriptStringValidate(SCRIPT_STRING_ANALYSIS ssa)
  */
 const SIZE * WINAPI ScriptString_pSize(SCRIPT_STRING_ANALYSIS ssa)
 {
-    unsigned int i, j;
+    int i, j;
     StringAnalysis *analysis = ssa;

TRACE("(%p)\n", ssa);
@@ -1721,7 +1722,8 @@ const int * WINAPI ScriptString_pcOutChars(SCRIPT_STRING_ANALYSIS ssa)
  */
 HRESULT WINAPI ScriptStringGetOrder(SCRIPT_STRING_ANALYSIS ssa, UINT *order)
 {
-    unsigned int i, j, k;
+    int i, j;
+    unsigned int k;
     StringAnalysis *analysis = ssa;

TRACE("(%p)\n", ssa);