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

cryptdlg: Fix compilation on systems that don't support nameless unions.

This commit is contained in:
Francois Gouget 2008-10-10 13:45:42 +02:00 committed by Alexandre Julliard
parent 516ff4c6eb
commit 7e77ecdf30
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/cryptdlg/main.c
View File

@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#define NONAMELESSUNION
#include "config.h" #include "config.h"
#include <stdarg.h> #include <stdarg.h>
@ -240,11 +242,11 @@ static CERT_VERIFY_CERTIFICATE_TRUST *CRYPTDLG_GetVerifyData(
* called directly: * called directly:
*/ */
if (data->pWintrustData->dwUnionChoice == WTD_CHOICE_BLOB && if (data->pWintrustData->dwUnionChoice == WTD_CHOICE_BLOB &&
data->pWintrustData->pBlob && data->pWintrustData->pBlob->cbMemObject == data->pWintrustData->u.pBlob && data->pWintrustData->u.pBlob->cbMemObject ==
sizeof(CERT_VERIFY_CERTIFICATE_TRUST) && sizeof(CERT_VERIFY_CERTIFICATE_TRUST) &&
data->pWintrustData->pBlob->pbMemObject) data->pWintrustData->u.pBlob->pbMemObject)
pCert = (CERT_VERIFY_CERTIFICATE_TRUST *) pCert = (CERT_VERIFY_CERTIFICATE_TRUST *)
data->pWintrustData->pBlob->pbMemObject; data->pWintrustData->u.pBlob->pbMemObject;
return pCert; return pCert;
} }
@ -432,7 +434,7 @@ BOOL WINAPI CertViewPropertiesW(CERT_VIEWPROPERTIES_STRUCT_W *info)
wtd.cbStruct = sizeof(wtd); wtd.cbStruct = sizeof(wtd);
wtd.dwUIChoice = WTD_UI_NONE; wtd.dwUIChoice = WTD_UI_NONE;
wtd.dwUnionChoice = WTD_CHOICE_BLOB; wtd.dwUnionChoice = WTD_CHOICE_BLOB;
wtd.pBlob = &blob; wtd.u.pBlob = &blob;
wtd.dwStateAction = WTD_STATEACTION_VERIFY; wtd.dwStateAction = WTD_STATEACTION_VERIFY;
err = WinVerifyTrust(NULL, &cert_action_verify, &wtd); err = WinVerifyTrust(NULL, &cert_action_verify, &wtd);
if (err == ERROR_SUCCESS) if (err == ERROR_SUCCESS)
@ -449,7 +451,7 @@ BOOL WINAPI CertViewPropertiesW(CERT_VIEWPROPERTIES_STRUCT_W *info)
uiInfo.pCertContext = info->pCertContext; uiInfo.pCertContext = info->pCertContext;
uiInfo.cPurposes = info->cArrayPurposes; uiInfo.cPurposes = info->cArrayPurposes;
uiInfo.rgszPurposes = (LPCSTR *)info->arrayPurposes; uiInfo.rgszPurposes = (LPCSTR *)info->arrayPurposes;
uiInfo.hWVTStateData = wtd.hWVTStateData; uiInfo.u.hWVTStateData = wtd.hWVTStateData;
uiInfo.fpCryptProviderDataTrustedUsage = TRUE; uiInfo.fpCryptProviderDataTrustedUsage = TRUE;
uiInfo.cPropSheetPages = info->cArrayPropSheetPages; uiInfo.cPropSheetPages = info->cArrayPropSheetPages;
uiInfo.rgPropSheetPages = info->arrayPropSheetPages; uiInfo.rgPropSheetPages = info->arrayPropSheetPages;