Juan Lang : wintrust: Return error directly from SOFTPUB_GetFileSubject.
Alexandre Julliard
julliard at winehq.org
Thu Jan 28 11:15:34 CST 2010
Module: wine
Branch: master
Commit: b5fbb87470e42064765467aad1de67937c231c71
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5fbb87470e42064765467aad1de67937c231c71
Author: Juan Lang <juan.lang at gmail.com>
Date: Wed Jan 27 10:29:35 2010 -0800
wintrust: Return error directly from SOFTPUB_GetFileSubject.
---
dlls/wintrust/softpub.c | 22 +++++++++-------------
1 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c
index 1ff0599..356d8fe 100644
--- a/dlls/wintrust/softpub.c
+++ b/dlls/wintrust/softpub.c
@@ -104,26 +104,24 @@ static DWORD SOFTPUB_OpenFile(CRYPT_PROVIDER_DATA *data)
/* Assumes data->pWintrustData->u.pFile exists. Sets data->pPDSip->gSubject to
* the file's subject GUID.
*/
-static BOOL SOFTPUB_GetFileSubject(CRYPT_PROVIDER_DATA *data)
+static DWORD SOFTPUB_GetFileSubject(CRYPT_PROVIDER_DATA *data)
{
- BOOL ret;
+ DWORD err = ERROR_SUCCESS;
if (!WVT_ISINSTRUCT(WINTRUST_FILE_INFO,
data->pWintrustData->u.pFile->cbStruct, pgKnownSubject) ||
!data->pWintrustData->u.pFile->pgKnownSubject)
{
- ret = CryptSIPRetrieveSubjectGuid(
+ if (!CryptSIPRetrieveSubjectGuid(
data->pWintrustData->u.pFile->pcwszFilePath,
data->pWintrustData->u.pFile->hFile,
- &data->u.pPDSip->gSubject);
+ &data->u.pPDSip->gSubject))
+ err = GetLastError();
}
else
- {
data->u.pPDSip->gSubject = *data->pWintrustData->u.pFile->pgKnownSubject;
- ret = TRUE;
- }
- TRACE("returning %d\n", ret);
- return ret;
+ TRACE("returning %d\n", err);
+ return err;
}
/* Assumes data->u.pPDSip exists, and its gSubject member set.
@@ -335,11 +333,9 @@ static DWORD SOFTPUB_LoadFileMessage(CRYPT_PROVIDER_DATA *data)
err = SOFTPUB_OpenFile(data);
if (err)
goto error;
- if (!SOFTPUB_GetFileSubject(data))
- {
- err = GetLastError();
+ err = SOFTPUB_GetFileSubject(data);
+ if (err)
goto error;
- }
if (!SOFTPUB_GetSIP(data))
{
err = GetLastError();
More information about the wine-cvs
mailing list