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

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

This commit is contained in:
Francois Gouget 2007-10-26 15:08:40 +02:00 committed by Alexandre Julliard
parent 20f1f50b2a
commit ce9cc0ba50
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/cryptnet/cryptnet_main.c
View File

@ -21,13 +21,15 @@
#include "config.h" #include "config.h"
#include "wine/port.h" #include "wine/port.h"
#include <stdio.h> #include <stdio.h>
#define NONAMELESSUNION
#include "windef.h" #include "windef.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "winbase.h" #include "winbase.h"
#include "winnt.h" #include "winnt.h"
#include "winnls.h" #include "winnls.h"
#include "wininet.h" #include "wininet.h"
#define NONAMELESSUNION
#define CERT_REVOCATION_PARA_HAS_EXTRA_FIELDS #define CERT_REVOCATION_PARA_HAS_EXTRA_FIELDS
#include "wincrypt.h" #include "wincrypt.h"
@ -158,17 +160,17 @@ static BOOL WINAPI CRYPT_GetUrlFromCertificateCRLDistPoint(LPCSTR pszUrlOid,
{ {
DWORD j; DWORD j;
CERT_ALT_NAME_INFO *name = CERT_ALT_NAME_INFO *name =
&info->rgDistPoint[i].DistPointName.FullName; &info->rgDistPoint[i].DistPointName.u.FullName;
for (j = 0; j < name->cAltEntry; j++) for (j = 0; j < name->cAltEntry; j++)
if (name->rgAltEntry[j].dwAltNameChoice == if (name->rgAltEntry[j].dwAltNameChoice ==
CERT_ALT_NAME_URL) CERT_ALT_NAME_URL)
{ {
if (name->rgAltEntry[j].pwszURL) if (name->rgAltEntry[j].u.pwszURL)
{ {
cUrl++; cUrl++;
bytesNeeded += sizeof(LPWSTR) + bytesNeeded += sizeof(LPWSTR) +
(lstrlenW(name->rgAltEntry[j].pwszURL) + 1) (lstrlenW(name->rgAltEntry[j].u.pwszURL) + 1)
* sizeof(WCHAR); * sizeof(WCHAR);
} }
} }
@ -202,20 +204,20 @@ static BOOL WINAPI CRYPT_GetUrlFromCertificateCRLDistPoint(LPCSTR pszUrlOid,
{ {
DWORD j; DWORD j;
CERT_ALT_NAME_INFO *name = CERT_ALT_NAME_INFO *name =
&info->rgDistPoint[i].DistPointName.FullName; &info->rgDistPoint[i].DistPointName.u.FullName;
for (j = 0; j < name->cAltEntry; j++) for (j = 0; j < name->cAltEntry; j++)
if (name->rgAltEntry[j].dwAltNameChoice == if (name->rgAltEntry[j].dwAltNameChoice ==
CERT_ALT_NAME_URL) CERT_ALT_NAME_URL)
{ {
if (name->rgAltEntry[j].pwszURL) if (name->rgAltEntry[j].u.pwszURL)
{ {
lstrcpyW(nextUrl, lstrcpyW(nextUrl,
name->rgAltEntry[j].pwszURL); name->rgAltEntry[j].u.pwszURL);
pUrlArray->rgwszUrl[pUrlArray->cUrl++] = pUrlArray->rgwszUrl[pUrlArray->cUrl++] =
nextUrl; nextUrl;
nextUrl += nextUrl +=
(lstrlenW(name->rgAltEntry[j].pwszURL) + 1) (lstrlenW(name->rgAltEntry[j].u.pwszURL) + 1)
* sizeof(WCHAR); * sizeof(WCHAR);
} }
} }