Skip to content

W
wine-cw
Commit 153066c6 authored by Juan Lang's avatar Juan Lang Committed by Alexandre Julliard
Browse files
Options

wintrust: Pass file handle and path to SOFTPUB_GetMessageFromFile.

parent 1bfb6029
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 5 deletions
dlls/wintrust/softpub.c
View file @ 153066c6
...@@ -128,7 +128,8 @@ static BOOL SOFTPUB_GetSIP(CRYPT_PROVIDER_DATA *data) ...@@ -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. /* Assumes data->u.pPDSip has been loaded, and data->u.pPDSip->pSip allocated.
* Calls data->u.pPDSip->pSip->pfGet to construct data->hMsg. * 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; BOOL ret;
LPBYTE buf = NULL; LPBYTE buf = NULL;
...@@ -144,9 +145,8 @@ static BOOL SOFTPUB_GetMessageFromFile(CRYPT_PROVIDER_DATA *data) ...@@ -144,9 +145,8 @@ static BOOL SOFTPUB_GetMessageFromFile(CRYPT_PROVIDER_DATA *data)
data->u.pPDSip->psSipSubjectInfo->cbSize = sizeof(SIP_SUBJECTINFO); data->u.pPDSip->psSipSubjectInfo->cbSize = sizeof(SIP_SUBJECTINFO);
data->u.pPDSip->psSipSubjectInfo->pgSubjectType = &data->u.pPDSip->gSubject; data->u.pPDSip->psSipSubjectInfo->pgSubjectType = &data->u.pPDSip->gSubject;
data->u.pPDSip->psSipSubjectInfo->hFile = data->pWintrustData->u.pFile->hFile; data->u.pPDSip->psSipSubjectInfo->hFile = file;
data->u.pPDSip->psSipSubjectInfo->pwsFileName = data->u.pPDSip->psSipSubjectInfo->pwsFileName = filePath;
data->pWintrustData->u.pFile->pcwszFilePath;
data->u.pPDSip->psSipSubjectInfo->hProv = data->hProv; data->u.pPDSip->psSipSubjectInfo->hProv = data->hProv;
ret = data->u.pPDSip->pSip->pfGet(data->u.pPDSip->psSipSubjectInfo, ret = data->u.pPDSip->pSip->pfGet(data->u.pPDSip->psSipSubjectInfo,
&data->dwEncoding, 0, &size, 0); &data->dwEncoding, 0, &size, 0);
...@@ -317,7 +317,8 @@ static BOOL SOFTPUB_LoadFileMessage(CRYPT_PROVIDER_DATA *data) ...@@ -317,7 +317,8 @@ static BOOL SOFTPUB_LoadFileMessage(CRYPT_PROVIDER_DATA *data)
ret = SOFTPUB_GetSIP(data); ret = SOFTPUB_GetSIP(data);
if (!ret) if (!ret)
goto error; goto error;
ret = SOFTPUB_GetMessageFromFile(data); ret = SOFTPUB_GetMessageFromFile(data, data->pWintrustData->u.pFile->hFile,
data->pWintrustData->u.pFile->pcwszFilePath);
if (!ret) if (!ret)
goto error; goto error;
ret = SOFTPUB_CreateStoreFromMessage(data); ret = SOFTPUB_CreateStoreFromMessage(data);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment