Module: wine Branch: master Commit: 153066c64ad72de2f274f04721cd791ca5c34735 URL: http://source.winehq.org/git/wine.git/?a=commit;h=153066c64ad72de2f274f04721...
Author: Juan Lang juan.lang@gmail.com Date: Thu Oct 23 13:46:20 2008 -0700
wintrust: Pass file handle and path to SOFTPUB_GetMessageFromFile.
---
dlls/wintrust/softpub.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index d110e2c..57b581a 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -128,7 +128,8 @@ static BOOL SOFTPUB_GetSIP(CRYPT_PROVIDER_DATA *data) /* Assumes data->u.pPDSip has been loaded, and data->u.pPDSip->pSip allocated. * Calls data->u.pPDSip->pSip->pfGet to construct data->hMsg. */ -static BOOL SOFTPUB_GetMessageFromFile(CRYPT_PROVIDER_DATA *data) +static BOOL SOFTPUB_GetMessageFromFile(CRYPT_PROVIDER_DATA *data, HANDLE file, + LPCWSTR filePath) { BOOL ret; LPBYTE buf = NULL; @@ -144,9 +145,8 @@ static BOOL SOFTPUB_GetMessageFromFile(CRYPT_PROVIDER_DATA *data)
data->u.pPDSip->psSipSubjectInfo->cbSize = sizeof(SIP_SUBJECTINFO); data->u.pPDSip->psSipSubjectInfo->pgSubjectType = &data->u.pPDSip->gSubject; - data->u.pPDSip->psSipSubjectInfo->hFile = data->pWintrustData->u.pFile->hFile; - data->u.pPDSip->psSipSubjectInfo->pwsFileName = - data->pWintrustData->u.pFile->pcwszFilePath; + data->u.pPDSip->psSipSubjectInfo->hFile = file; + data->u.pPDSip->psSipSubjectInfo->pwsFileName = filePath; data->u.pPDSip->psSipSubjectInfo->hProv = data->hProv; ret = data->u.pPDSip->pSip->pfGet(data->u.pPDSip->psSipSubjectInfo, &data->dwEncoding, 0, &size, 0); @@ -317,7 +317,8 @@ static BOOL SOFTPUB_LoadFileMessage(CRYPT_PROVIDER_DATA *data) ret = SOFTPUB_GetSIP(data); if (!ret) goto error; - ret = SOFTPUB_GetMessageFromFile(data); + ret = SOFTPUB_GetMessageFromFile(data, data->pWintrustData->u.pFile->hFile, + data->pWintrustData->u.pFile->pcwszFilePath); if (!ret) goto error; ret = SOFTPUB_CreateStoreFromMessage(data);