Andrew Talbot : crypt32: Sign-compare warnings fix.

[Alexandre Julliard]

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

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

crypt32: Sign-compare warnings fix.

---

dlls/crypt32/str.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c
index 7a739a8..b1ccc91 100644
--- a/dlls/crypt32/str.c
+++ b/dlls/crypt32/str.c
@@ -167,7 +167,7 @@ static DWORD CRYPT_AddPrefixA(LPCSTR prefix, LPSTR psz, DWORD csz)

if (psz)
     {
-        chars = min(lstrlenA(prefix), csz);
+        chars = min(strlen(prefix), csz);
         memcpy(psz, prefix, chars);
         *(psz + chars) = '=';
         chars++;
@@ -304,7 +304,7 @@ static DWORD CRYPT_AddPrefixAToW(LPCSTR prefix, LPWSTR psz, DWORD csz)
     {
         DWORD i;

-        chars = min(lstrlenA(prefix), csz);
+        chars = min(strlen(prefix), csz);
         for (i = 0; i < chars; i++)
             *(psz + i) = prefix[i];
         *(psz + chars) = '=';
@@ -328,7 +328,7 @@ static DWORD CRYPT_AddPrefixW(LPCWSTR prefix, LPWSTR psz, DWORD csz)

if (psz)
     {
-        chars = min(lstrlenW(prefix), csz);
+        chars = min(strlenW(prefix), csz);
         memcpy(psz, prefix, chars * sizeof(WCHAR));
         *(psz + chars) = '=';
         chars++;
@@ -478,7 +478,7 @@ BOOL WINAPI CertStrToNameA(DWORD dwCertEncodingType, LPCSTR pszX500,
             {
                 if (!ret)
                 {
-                    DWORD i;
+                    LONG i;

*ppszError = pszX500;
                     for (i = 0; i < errorStr - x500; i++)
@@ -665,7 +665,7 @@ static BOOL CRYPT_EncodeValueWithType(DWORD dwCertEncodingType,
     {
         if (value->end > value->start)
         {
-            DWORD i;
+            LONG i;
             LPWSTR ptr = (LPWSTR)nameValue.Value.pbData;

for (i = 0; i < value->end - value->start; i++)