Andrew Talbot : wintrust: Sign-compare warnings fix.
Alexandre Julliard
julliard at winehq.org
Thu Dec 11 07:51:02 CST 2008
Module: wine
Branch: master
Commit: 79ab433946494965942d99aecf2d008c9b681848
URL: http://source.winehq.org/git/wine.git/?a=commit;h=79ab433946494965942d99aecf2d008c9b681848
Author: Andrew Talbot <andrew.talbot at talbotville.com>
Date: Wed Dec 10 21:55:31 2008 +0000
wintrust: Sign-compare warnings fix.
---
dlls/wintrust/asn.c | 3 ++-
dlls/wintrust/crypt.c | 6 +++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/dlls/wintrust/asn.c b/dlls/wintrust/asn.c
index 3a51c91..4799a68 100644
--- a/dlls/wintrust/asn.c
+++ b/dlls/wintrust/asn.c
@@ -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-cvs
mailing list