2007-12-11 Dave Korn <dave.korn@artimi.com>

	* include/wincrypt.h (PCRYPT_DECODE_PARA):  Add missing typedef.
	(CERT_POLICY_MAPPINGS_INFO):  Move before CERT_POLICY_MAPPING.

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 3437f63..965e329 100644 (file)
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-11  Dave Korn  <dave.korn@artimi.com>
+
+       * include/wincrypt.h (PCRYPT_DECODE_PARA):  Add missing typedef.
+       (CERT_POLICY_MAPPINGS_INFO):  Move before CERT_POLICY_MAPPING.
+
 2007-12-03  Chris Sutcliffe  <ir0nh34d@users.sourceforge.net>
 
        * include/wingdi.h: Change WINVER guard to _WIN32_WINNT.

diff --git a/winsup/w32api/include/wincrypt.h b/winsup/w32api/include/wincrypt.h
index a0d33f7..abfcda1 100644 (file)
--- a/winsup/w32api/include/wincrypt.h
+++ b/winsup/w32api/include/wincrypt.h
@@ -658,6 +658,8 @@ typedef struct _CRYPT_ENCODE_PARA {
 } CRYPT_ENCODE_PARA, 
  *PCRYPT_ENCODE_PARA;
 
+/* Definition missing. */
+typedef struct _CRYPT_DECODE_PARA *PCRYPT_DECODE_PARA;
 
 typedef UINT ALG_ID;
 typedef struct _VTableProvStruc {FARPROC FuncVerifyImage;} VTableProvStruc,*PVTableProvStruc;
@@ -982,16 +984,16 @@ typedef struct _CERT_POLICY_CONSTRAINTS_INFO {
  *PCERT_POLICY_CONSTRAINTS_INFO;
 #endif /* (WINVER >= 0x0410) */ /* Windows 98 */
 #if (WINVER >= 0x0501) /* Windows Server 2003, Windows XP */
-typedef struct _CERT_POLICY_MAPPINGS_INFO {
-  DWORD cPolicyMapping;
-  PCERT_POLICY_MAPPING rgPolicyMapping;
-} CERT_POLICY_MAPPINGS_INFO, 
- *PCERT_POLICY_MAPPINGS_INFO;
 typedef struct _CERT_POLICY_MAPPING {
   LPSTR pszIssuerDomainPolicy;
   LPSTR pszSubjectDomainPolicy;
 } CERT_POLICY_MAPPING, 
  *PCERT_POLICY_MAPPING;
+typedef struct _CERT_POLICY_MAPPINGS_INFO {
+  DWORD cPolicyMapping;
+  PCERT_POLICY_MAPPING rgPolicyMapping;
+} CERT_POLICY_MAPPINGS_INFO, 
+ *PCERT_POLICY_MAPPINGS_INFO;
 #endif /* (WINVER >= 0x0501) */ /* Windows Server 2003, Windows XP */
 
 BOOL WINAPI CertCloseStore(HCERTSTORE,DWORD);