From a5ab9465fd4bbb2a3b1ed817558cbd230124381f Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Wed, 12 Jul 2023 15:46:10 +0200 Subject: [PATCH] cryptdlg: Use nameless unions/structs. --- dlls/cryptdlg/main.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/cryptdlg/main.c b/dlls/cryptdlg/main.c index 1597dc2704c..e34942d07cb 100644 --- a/dlls/cryptdlg/main.c +++ b/dlls/cryptdlg/main.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION - #include #include "windef.h" @@ -231,11 +229,11 @@ static CERT_VERIFY_CERTIFICATE_TRUST *CRYPTDLG_GetVerifyData( * called directly: */ if (data->pWintrustData->dwUnionChoice == WTD_CHOICE_BLOB && - data->pWintrustData->u.pBlob && data->pWintrustData->u.pBlob->cbMemObject == + data->pWintrustData->pBlob && data->pWintrustData->pBlob->cbMemObject == sizeof(CERT_VERIFY_CERTIFICATE_TRUST) && - data->pWintrustData->u.pBlob->pbMemObject) + data->pWintrustData->pBlob->pbMemObject) pCert = (CERT_VERIFY_CERTIFICATE_TRUST *) - data->pWintrustData->u.pBlob->pbMemObject; + data->pWintrustData->pBlob->pbMemObject; return pCert; } @@ -423,7 +421,7 @@ BOOL WINAPI CertViewPropertiesW(CERT_VIEWPROPERTIES_STRUCT_W *info) wtd.cbStruct = sizeof(wtd); wtd.dwUIChoice = WTD_UI_NONE; wtd.dwUnionChoice = WTD_CHOICE_BLOB; - wtd.u.pBlob = &blob; + wtd.pBlob = &blob; wtd.dwStateAction = WTD_STATEACTION_VERIFY; err = WinVerifyTrust(NULL, &cert_action_verify, &wtd); if (err == ERROR_SUCCESS) @@ -440,7 +438,7 @@ BOOL WINAPI CertViewPropertiesW(CERT_VIEWPROPERTIES_STRUCT_W *info) uiInfo.pCertContext = info->pCertContext; uiInfo.cPurposes = info->cArrayPurposes; uiInfo.rgszPurposes = (LPCSTR *)info->arrayPurposes; - uiInfo.u.hWVTStateData = wtd.hWVTStateData; + uiInfo.hWVTStateData = wtd.hWVTStateData; uiInfo.fpCryptProviderDataTrustedUsage = TRUE; uiInfo.cPropSheetPages = info->cArrayPropSheetPages; uiInfo.rgPropSheetPages = info->arrayPropSheetPages;