From 5a25ffe435c7409987acf7d3590eff60f0427d70 Mon Sep 17 00:00:00 2001
From: Hans Leidekker <hans@codeweavers.com>
Date: Mon, 22 Dec 2008 14:19:00 +0100
Subject: [PATCH] include/mscat.h: Add a few declarations.

---
 include/mscat.h | 37 +++++++++++++++++++++++++++++++++++--
 1 file changed, 35 insertions(+), 2 deletions(-)

diff --git a/include/mscat.h b/include/mscat.h
index e48120765f8..d037adce858 100644
--- a/include/mscat.h
+++ b/include/mscat.h
@@ -28,10 +28,30 @@ typedef HANDLE HCATINFO;
 extern "C" {
 #endif
 
+#define CRYPTCAT_OPEN_CREATENEW             0x00000001
+#define CRYPTCAT_OPEN_ALWAYS                0x00000002
+#define CRYPTCAT_OPEN_EXISTING              0x00000004
+#define CRYPTCAT_OPEN_EXCLUDE_PAGE_HASHES   0x00010000
+#define CRYPTCAT_OPEN_INCLUDE_PAGE_HASHES   0x00020000
+#define CRYPTCAT_OPEN_VERIFYSIGHASH         0x10000000
+#define CRYPTCAT_OPEN_NO_CONTENT_HCRYPTMSG  0x20000000
+#define CRYPTCAT_OPEN_SORTED                0x40000000
+#define CRYPTCAT_OPEN_FLAGS_MASK            0xffff0000
 
 #include <pshpack8.h>
 
-typedef struct CRYPTCATMEMBER_ {
+typedef struct CRYPTCATATTRIBUTE_
+{
+    DWORD cbStruct;
+    LPWSTR pwszReferenceTag;
+    DWORD dwAttrTypeAndAction;
+    DWORD cbValue;
+    BYTE *pbValue;
+    DWORD dwReserved;
+} CRYPTCATATTRIBUTE;
+
+typedef struct CRYPTCATMEMBER_
+{
     DWORD cbStruct;
     LPWSTR pwszReferenceTag;
     LPWSTR pwszFileName;
@@ -45,6 +65,12 @@ typedef struct CRYPTCATMEMBER_ {
     CRYPT_ATTR_BLOB sEncodedMemberInfo;
 } CRYPTCATMEMBER;
 
+typedef struct CATALOG_INFO_
+{
+    DWORD cbStruct;
+    WCHAR wszCatalogFile[MAX_PATH];
+} CATALOG_INFO;
+
 #include <poppack.h>
 
 
@@ -55,8 +81,15 @@ HCATINFO  WINAPI CryptCATAdminEnumCatalogFromHash(HCATADMIN,BYTE*,DWORD,DWORD,HC
 BOOL      WINAPI CryptCATAdminReleaseCatalogContext(HCATADMIN,HCATINFO,DWORD);
 BOOL      WINAPI CryptCATAdminReleaseContext(HCATADMIN,DWORD);
 BOOL      WINAPI CryptCATAdminRemoveCatalog(HCATADMIN,LPCWSTR,DWORD);
+BOOL      WINAPI CryptCATAdminResolveCatalogPath(HCATADMIN, WCHAR *, CATALOG_INFO *, DWORD);
+BOOL      WINAPI CryptCATCatalogInfoFromContext(HCATINFO, CATALOG_INFO *, DWORD);
 BOOL      WINAPI CryptCATClose(HANDLE);
-CRYPTCATMEMBER* WINAPI CryptCATEnumerateMember(HANDLE,CRYPTCATMEMBER*);
+CRYPTCATATTRIBUTE * WINAPI CryptCATEnumerateAttr(HANDLE, CRYPTCATMEMBER *, CRYPTCATATTRIBUTE *);
+CRYPTCATATTRIBUTE * WINAPI CryptCATEnumerateCatAttr(HANDLE, CRYPTCATATTRIBUTE *);
+CRYPTCATMEMBER    * WINAPI CryptCATEnumerateMember(HANDLE,CRYPTCATMEMBER *);
+CRYPTCATATTRIBUTE * WINAPI CryptCATGetAttrInfo(HANDLE, CRYPTCATMEMBER *, LPWSTR);
+CRYPTCATATTRIBUTE * WINAPI CryptCATGetCatAttrInfo(HANDLE, LPWSTR);
+CRYPTCATMEMBER    * WINAPI CryptCATGetMemberInfo(HANDLE, LPWSTR);
 HANDLE    WINAPI CryptCATOpen(LPWSTR,DWORD,HCRYPTPROV,DWORD,DWORD);
 
 #ifdef __cplusplus