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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 7e77ecdf30202abcc213a6d171e56d03aafa13db
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=7e77ecdf30202abcc213a6d171...

Author: Francois Gouget 
Date:   Fri Oct 10 13:45:42 2008 +0200

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

---

dlls/cryptdlg/main.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/dlls/cryptdlg/main.c b/dlls/cryptdlg/main.c
index d87d480..46fb7ed 100644
--- a/dlls/cryptdlg/main.c
+++ b/dlls/cryptdlg/main.c
@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */

+#define NONAMELESSUNION
+
 #include "config.h"

#include <stdarg.h>
@@ -240,11 +242,11 @@ static CERT_VERIFY_CERTIFICATE_TRUST *CRYPTDLG_GetVerifyData(
      * called directly:
      */
     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) &&
-     data->pWintrustData->pBlob->pbMemObject)
+     data->pWintrustData->u.pBlob->pbMemObject)
          pCert = (CERT_VERIFY_CERTIFICATE_TRUST *)
-          data->pWintrustData->pBlob->pbMemObject;
+          data->pWintrustData->u.pBlob->pbMemObject;
     return pCert;
 }

@@ -432,7 +434,7 @@ BOOL WINAPI CertViewPropertiesW(CERT_VIEWPROPERTIES_STRUCT_W *info)
     wtd.cbStruct = sizeof(wtd);
     wtd.dwUIChoice = WTD_UI_NONE;
     wtd.dwUnionChoice = WTD_CHOICE_BLOB;
-    wtd.pBlob = &blob;
+    wtd.u.pBlob = &blob;
     wtd.dwStateAction = WTD_STATEACTION_VERIFY;
     err = WinVerifyTrust(NULL, &cert_action_verify, &wtd);
     if (err == ERROR_SUCCESS)
@@ -449,7 +451,7 @@ BOOL WINAPI CertViewPropertiesW(CERT_VIEWPROPERTIES_STRUCT_W *info)
         uiInfo.pCertContext = info->pCertContext;
         uiInfo.cPurposes = info->cArrayPurposes;
         uiInfo.rgszPurposes = (LPCSTR *)info->arrayPurposes;
-        uiInfo.hWVTStateData = wtd.hWVTStateData;
+        uiInfo.u.hWVTStateData = wtd.hWVTStateData;
         uiInfo.fpCryptProviderDataTrustedUsage = TRUE;
         uiInfo.cPropSheetPages = info->cArrayPropSheetPages;
         uiInfo.rgPropSheetPages = info->arrayPropSheetPages;