ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wintrust: Return error directly from SOFTPUB_GetFileSubject.

This commit is contained in:
Juan Lang 2010-01-27 10:29:35 -08:00 committed by Alexandre Julliard
parent fc1fbf6107
commit b5fbb87470
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dlls/wintrust/softpub.c
View File

@ -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();