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

[Alexandre Julliard]

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

Author: Francois Gouget 
Date:   Fri Oct 26 15:08:40 2007 +0200

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

---

dlls/cryptnet/cryptnet_main.c |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c
index d280ca4..b83adb8 100644
--- a/dlls/cryptnet/cryptnet_main.c
+++ b/dlls/cryptnet/cryptnet_main.c
@@ -21,13 +21,15 @@
 #include "config.h"
 #include "wine/port.h"
 #include <stdio.h>
+
+#define NONAMELESSUNION
+
 #include "windef.h"
 #include "wine/debug.h"
 #include "winbase.h"
 #include "winnt.h"
 #include "winnls.h"
 #include "wininet.h"
-#define NONAMELESSUNION
 #define CERT_REVOCATION_PARA_HAS_EXTRA_FIELDS
 #include "wincrypt.h"

@@ -158,17 +160,17 @@ static BOOL WINAPI CRYPT_GetUrlFromCertificateCRLDistPoint(LPCSTR pszUrlOid,
                 {
                     DWORD j;
                     CERT_ALT_NAME_INFO *name =
-                     &info->rgDistPoint[i].DistPointName.FullName;
+                     &info->rgDistPoint[i].DistPointName.u.FullName;

for (j = 0; j < name->cAltEntry; j++)
                         if (name->rgAltEntry[j].dwAltNameChoice ==
                          CERT_ALT_NAME_URL)
                         {
-                            if (name->rgAltEntry[j].pwszURL)
+                            if (name->rgAltEntry[j].u.pwszURL)
                             {
                                 cUrl++;
                                 bytesNeeded += sizeof(LPWSTR) +
-                                 (lstrlenW(name->rgAltEntry[j].pwszURL) + 1)
+                                 (lstrlenW(name->rgAltEntry[j].u.pwszURL) + 1)
                                  * sizeof(WCHAR);
                             }
                         }
@@ -202,20 +204,20 @@ static BOOL WINAPI CRYPT_GetUrlFromCertificateCRLDistPoint(LPCSTR pszUrlOid,
                     {
                         DWORD j;
                         CERT_ALT_NAME_INFO *name =
-                         &info->rgDistPoint[i].DistPointName.FullName;
+                         &info->rgDistPoint[i].DistPointName.u.FullName;

for (j = 0; j < name->cAltEntry; j++)
                             if (name->rgAltEntry[j].dwAltNameChoice ==
                              CERT_ALT_NAME_URL)
                             {
-                                if (name->rgAltEntry[j].pwszURL)
+                                if (name->rgAltEntry[j].u.pwszURL)
                                 {
                                     lstrcpyW(nextUrl,
-                                     name->rgAltEntry[j].pwszURL);
+                                     name->rgAltEntry[j].u.pwszURL);
                                     pUrlArray->rgwszUrl[pUrlArray->cUrl++] =
                                      nextUrl;
                                     nextUrl +=
-                                     (lstrlenW(name->rgAltEntry[j].pwszURL) + 1)
+                                     (lstrlenW(name->rgAltEntry[j].u.pwszURL) + 1)
                                      * sizeof(WCHAR);
                                 }
                             }