wintrust: Fix the CryptCATAdminReleaseCatalogContext() prototype and better match the PSDK types.

dlls/wintrust/crypt.c

@@ -57,8 +57,8 @@ BOOL WINAPI CryptCATAdminAcquireContext(HCATADMIN* catAdmin,
 /***********************************************************************
  *             CryptCATAdminAddCatalog (WINTRUST.@)
  */
-BOOL WINAPI CryptCATAdminAddCatalog(HCATADMIN catAdmin, WCHAR *catalogFile,
-                                    WCHAR *selectBaseName, DWORD flags)
+BOOL WINAPI CryptCATAdminAddCatalog(HCATADMIN catAdmin, PWSTR catalogFile,
+                                    PWSTR selectBaseName, DWORD flags)
 {
     FIXME("%p %s %s %d\n", catAdmin, debugstr_w(catalogFile),
           debugstr_w(selectBaseName), flags);
@@ -106,7 +106,7 @@ HCATINFO WINAPI CryptCATAdminEnumCatalogFromHash(HCATADMIN hCatAdmin,
  *
  */
 BOOL WINAPI CryptCATAdminReleaseCatalogContext(HCATADMIN hCatAdmin,
-                                               HCATADMIN hCatInfo,
+                                               HCATINFO hCatInfo,
                                                DWORD dwFlags)
 {
     FIXME("%p %p %x\n", hCatAdmin, hCatInfo, dwFlags);

include/mscat.h

@@ -49,9 +49,12 @@ typedef struct CRYPTCATMEMBER_ {
 
 
 BOOL      WINAPI CryptCATAdminAcquireContext(HCATADMIN*,const GUID*,DWORD);
+BOOL      WINAPI CryptCATAdminAddCatalog(HCATADMIN,PWSTR,PWSTR,DWORD);
 BOOL      WINAPI CryptCATAdminCalcHashFromFileHandle(HANDLE,DWORD*,BYTE*,DWORD);
 HCATINFO  WINAPI CryptCATAdminEnumCatalogFromHash(HCATADMIN,BYTE*,DWORD,DWORD,HCATINFO*);
+BOOL      WINAPI CryptCATAdminReleaseCatalogContext(HCATADMIN,HCATINFO,DWORD);
 BOOL      WINAPI CryptCATAdminReleaseContext(HCATADMIN,DWORD);
+BOOL      WINAPI CryptCATAdminRemoveCatalog(HCATADMIN,LPCWSTR,DWORD);
 BOOL      WINAPI CryptCATClose(HANDLE);
 CRYPTCATMEMBER* WINAPI CryptCATEnumerateMember(HANDLE,CRYPTCATMEMBER*);
 HANDLE    WINAPI CryptCATOpen(LPWSTR,DWORD,HCRYPTPROV,DWORD,DWORD);

tools/winapi/win32.api

@@ -5849,7 +5849,9 @@ LPSTR
 
 %wstr
 
+LPCWSTR
 LPWSTR
+PWSTR
 
 %void