cryptnet: Fix compilation on systems that don't support nameless unions.
Francois Gouget
fgouget at free.fr
Tue Oct 23 08:31:15 CDT 2007
---
NONAMELESSUNION must be defined before including winnt.h to have an
effect.
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 206ba24..735c5ea 100644
--- a/dlls/cryptnet/cryptnet_main.c
+++ b/dlls/cryptnet/cryptnet_main.c
@@ -20,11 +20,13 @@
#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"
-#define NONAMELESSUNION
#include "wincrypt.h"
WINE_DEFAULT_DEBUG_CHANNEL(cryptnet);
@@ -156,17 +158,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);
}
}
@@ -197,20 +199,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);
}
}
--
1.5.3.4
More information about the wine-patches
mailing list