Francois Gouget : wintrust: Fix the
CryptCATAdminReleaseCatalogContext()
prototype and better match the PSDK types.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Aug 8 08:59:52 CDT 2007
Module: wine
Branch: master
Commit: c9b98267867f168c84d39f55a20f89499155fb8d
URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9b98267867f168c84d39f55a20f89499155fb8d
Author: Francois Gouget <fgouget at free.fr>
Date: Wed Aug 8 10:49:27 2007 +0200
wintrust: Fix the CryptCATAdminReleaseCatalogContext() prototype and better match the PSDK types.
Add some missing prototypes to mscat.h.
Update win32.api to fix the winapi_check warnings.
---
dlls/wintrust/crypt.c | 6 +++---
include/mscat.h | 3 +++
tools/winapi/win32.api | 2 ++
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c
index 9a1ecdb..bb473f1 100644
--- a/dlls/wintrust/crypt.c
+++ b/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);
diff --git a/include/mscat.h b/include/mscat.h
index f7a739a..f5e9f0f 100644
--- a/include/mscat.h
+++ b/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);
diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api
index 76c0be9..e86199c 100644
--- a/tools/winapi/win32.api
+++ b/tools/winapi/win32.api
@@ -5849,7 +5849,9 @@ LPSTR
%wstr
+LPCWSTR
LPWSTR
+PWSTR
%void
More information about the wine-cvs
mailing list