Maarten Lankhorst : includes: Fix CryptCATAdminAddCatalog definition.
Alexandre Julliard
julliard at winehq.org
Thu Oct 16 06:07:05 CDT 2008
Module: wine
Branch: master
Commit: 4b9fd9a2891fa942481f09e7a64791f7b6cf15c8
URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b9fd9a2891fa942481f09e7a64791f7b6cf15c8
Author: Maarten Lankhorst <maarten at codeweavers.com>
Date: Tue Oct 14 19:56:17 2008 +0200
includes: Fix CryptCATAdminAddCatalog definition.
---
dlls/wintrust/crypt.c | 6 +++---
include/mscat.h | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c
index 544d1aa..136f795 100644
--- a/dlls/wintrust/crypt.c
+++ b/dlls/wintrust/crypt.c
@@ -69,12 +69,12 @@ BOOL WINAPI CryptCATAdminAcquireContext(HCATADMIN* catAdmin,
/***********************************************************************
* CryptCATAdminAddCatalog (WINTRUST.@)
*/
-BOOL WINAPI CryptCATAdminAddCatalog(HCATADMIN catAdmin, PWSTR catalogFile,
- PWSTR selectBaseName, DWORD flags)
+HCATINFO WINAPI CryptCATAdminAddCatalog(HCATADMIN catAdmin, PWSTR catalogFile,
+ PWSTR selectBaseName, DWORD flags)
{
FIXME("%p %s %s %d\n", catAdmin, debugstr_w(catalogFile),
debugstr_w(selectBaseName), flags);
- return TRUE;
+ return (HCATINFO) 0xdeeeaaadL;
}
/***********************************************************************
diff --git a/include/mscat.h b/include/mscat.h
index f5e9f0f..e481207 100644
--- a/include/mscat.h
+++ b/include/mscat.h
@@ -49,7 +49,7 @@ typedef struct CRYPTCATMEMBER_ {
BOOL WINAPI CryptCATAdminAcquireContext(HCATADMIN*,const GUID*,DWORD);
-BOOL WINAPI CryptCATAdminAddCatalog(HCATADMIN,PWSTR,PWSTR,DWORD);
+HCATINFO 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);
More information about the wine-cvs
mailing list