Andrew Talbot : crypt32: Sign-compare warnings fix.

[Alexandre Julliard]

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

Author: Andrew Talbot 
Date:   Tue Sep 23 22:38:33 2008 +0100

crypt32: Sign-compare warnings fix.

---

dlls/crypt32/encode.c |   14 +++++++-------
 dlls/crypt32/oid.c    |    4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c
index 9e7ed44..e474ff7 100644
--- a/dlls/crypt32/encode.c
+++ b/dlls/crypt32/encode.c
@@ -900,7 +900,7 @@ static BOOL CRYPT_AsnEncodeStringCoerce(const CERT_NAME_VALUE *value,
     LPCSTR str = (LPCSTR)value->Value.pbData;
     DWORD bytesNeeded, lenBytes, encodedLen;

-    encodedLen = value->Value.cbData ? value->Value.cbData : lstrlenA(str);
+    encodedLen = value->Value.cbData ? value->Value.cbData : strlen(str);
     CRYPT_EncodeLen(encodedLen, NULL, &lenBytes);
     bytesNeeded = 1 + lenBytes + encodedLen;
     if (!pbEncoded)
@@ -970,7 +970,7 @@ static BOOL CRYPT_AsnEncodeUTF8String(const CERT_NAME_VALUE *value,
     DWORD bytesNeeded, lenBytes, encodedLen, strLen;

strLen = value->Value.cbData ? value->Value.cbData / sizeof(WCHAR) :
-     lstrlenW(str);
+     strlenW(str);
     encodedLen = WideCharToMultiByte(CP_UTF8, 0, str, strLen, NULL, 0, NULL,
      NULL);
     CRYPT_EncodeLen(encodedLen, NULL, &lenBytes);
@@ -1830,7 +1830,7 @@ static BOOL CRYPT_AsnEncodeUnicodeStringCoerce(const CERT_NAME_VALUE *value,
     DWORD bytesNeeded, lenBytes, encodedLen;

encodedLen = value->Value.cbData ? value->Value.cbData / sizeof(WCHAR) :
-     lstrlenW(str);
+     strlenW(str);
     CRYPT_EncodeLen(encodedLen, NULL, &lenBytes);
     bytesNeeded = 1 + lenBytes + encodedLen;
     if (!pbEncoded)
@@ -1871,7 +1871,7 @@ static BOOL CRYPT_AsnEncodeNumericString(const CERT_NAME_VALUE *value,
     DWORD bytesNeeded, lenBytes, encodedLen;

encodedLen = value->Value.cbData ? value->Value.cbData / sizeof(WCHAR) :
-     lstrlenW(str);
+     strlenW(str);
     CRYPT_EncodeLen(encodedLen, NULL, &lenBytes);
     bytesNeeded = 1 + lenBytes + encodedLen;
     if (!pbEncoded)
@@ -1925,7 +1925,7 @@ static BOOL CRYPT_AsnEncodePrintableString(const CERT_NAME_VALUE *value,
     DWORD bytesNeeded, lenBytes, encodedLen;

encodedLen = value->Value.cbData ? value->Value.cbData / sizeof(WCHAR) :
-     lstrlenW(str);
+     strlenW(str);
     CRYPT_EncodeLen(encodedLen, NULL, &lenBytes);
     bytesNeeded = 1 + lenBytes + encodedLen;
     if (!pbEncoded)
@@ -1972,7 +1972,7 @@ static BOOL CRYPT_AsnEncodeIA5String(const CERT_NAME_VALUE *value,
     DWORD bytesNeeded, lenBytes, encodedLen;

encodedLen = value->Value.cbData ? value->Value.cbData / sizeof(WCHAR) :
-     lstrlenW(str);
+     strlenW(str);
     CRYPT_EncodeLen(encodedLen, NULL, &lenBytes);
     bytesNeeded = 1 + lenBytes + encodedLen;
     if (!pbEncoded)
@@ -2020,7 +2020,7 @@ static BOOL CRYPT_AsnEncodeUniversalString(const CERT_NAME_VALUE *value,

/* FIXME: doesn't handle composite characters */
     strLen = value->Value.cbData ? value->Value.cbData / sizeof(WCHAR) :
-     lstrlenW(str);
+     strlenW(str);
     CRYPT_EncodeLen(strLen * 4, NULL, &lenBytes);
     bytesNeeded = 1 + lenBytes + strLen * 4;
     if (!pbEncoded)
diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c
index 5a71c74..69ea7a5 100644
--- a/dlls/crypt32/oid.c
+++ b/dlls/crypt32/oid.c
@@ -995,7 +995,7 @@ BOOL WINAPI CryptUnregisterDefaultOIDFunction(DWORD dwEncodingType,

static void oid_init_localizednames(HINSTANCE hInstance)
 {
-    int i;
+    unsigned int i;

for(i = 0; i < sizeof(LocalizedKeys)/sizeof(LPCWSTR); i++)
     {
@@ -1008,7 +1008,7 @@ static void oid_init_localizednames(HINSTANCE hInstance)
  */
 LPCWSTR WINAPI CryptFindLocalizedName(LPCWSTR pwszCryptName)
 {
-    int i;
+    unsigned int i;

for(i = 0; i < sizeof(LocalizedKeys)/sizeof(LPCWSTR); i++)
     {