wintrust: Sign-compare warnings fix
Andrew Talbot
andrew.talbot at talbotville.com
Wed Dec 10 15:55:31 CST 2008
Changelog:
wintrust: Sign-compare warnings fix.
diff --git a/dlls/wintrust/asn.c b/dlls/wintrust/asn.c
index 3a51c91..3132405 100644
--- a/dlls/wintrust/asn.c
+++ b/dlls/wintrust/asn.c
@@ -1115,7 +1115,7 @@ static BOOL CRYPT_GetLen(const BYTE *pbEncoded, DWORD cbEncoded, DWORD *len)
}
else if (pbEncoded[1] <= 0x7f)
{
- if (pbEncoded[1] + 1 > cbEncoded)
+ if (pbEncoded[1] + 1U > cbEncoded)
{
SetLastError(CRYPT_E_ASN1_EOD);
ret = FALSE;
@@ -1141,7 +1141,7 @@ static BOOL CRYPT_GetLen(const BYTE *pbEncoded, DWORD cbEncoded, DWORD *len)
SetLastError(CRYPT_E_ASN1_LARGE);
ret = FALSE;
}
- else if (lenLen + 2 > cbEncoded)
+ else if (lenLen + 2U > cbEncoded)
{
SetLastError(CRYPT_E_ASN1_CORRUPT);
ret = FALSE;
@@ -2195,7 +2195,8 @@ static BOOL WINAPI CRYPT_AsnDecodeInt(DWORD dwCertEncodingType,
}
else
{
- int val, i;
+ int val;
+ DWORD i;
*pcbStructInfo = sizeof(int);
if (blob->pbData[blob->cbData - 1] & 0x80)
diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c
index 136f795..33cc6de 100644
--- a/dlls/wintrust/crypt.c
+++ b/dlls/wintrust/crypt.c
@@ -349,7 +349,7 @@ static BOOL WINTRUST_GetSignedMsgFromCabFile(SIP_SUBJECTINFO *pSubjectInfo,
/* get basic offset & size info */
base_offset = SetFilePointer(pSubjectInfo->hFile, 0L, NULL, SEEK_CUR);
- if (SetFilePointer(pSubjectInfo->hFile, 0, NULL, SEEK_END) == -1)
+ if (SetFilePointer(pSubjectInfo->hFile, 0, NULL, SEEK_END) == INVALID_SET_FILE_POINTER)
{
TRACE("seek error\n");
return FALSE;
@@ -357,7 +357,7 @@ static BOOL WINTRUST_GetSignedMsgFromCabFile(SIP_SUBJECTINFO *pSubjectInfo,
cabsize = SetFilePointer(pSubjectInfo->hFile, 0L, NULL, SEEK_CUR);
if ((cabsize == -1) || (base_offset == -1) ||
- (SetFilePointer(pSubjectInfo->hFile, base_offset, NULL, SEEK_SET) == -1))
+ (SetFilePointer(pSubjectInfo->hFile, base_offset, NULL, SEEK_SET) == INVALID_SET_FILE_POINTER))
{
TRACE("seek error\n");
return FALSE;
@@ -453,7 +453,7 @@ static BOOL WINTRUST_GetSignedMsgFromCabFile(SIP_SUBJECTINFO *pSubjectInfo,
SetLastError(ERROR_INSUFFICIENT_BUFFER);
return FALSE;
}
- if (SetFilePointer(pSubjectInfo->hFile, cert_offset, NULL, SEEK_SET) == -1)
+ if (SetFilePointer(pSubjectInfo->hFile, cert_offset, NULL, SEEK_SET) == INVALID_SET_FILE_POINTER)
{
ERR("couldn't seek to cert location\n");
return FALSE;
More information about the wine-patches
mailing list