Skip to content

W
wine-winehq
Commit c9b98267 authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard
Browse files
Options

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.
parent 988be5dd
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 3 deletions
dlls/wintrust/crypt.c
View file @ c9b98267
...@@ -57,8 +57,8 @@ BOOL WINAPI CryptCATAdminAcquireContext(HCATADMIN* catAdmin, ...@@ -57,8 +57,8 @@ BOOL WINAPI CryptCATAdminAcquireContext(HCATADMIN* catAdmin,
/*********************************************************************** /***********************************************************************
* CryptCATAdminAddCatalog (WINTRUST.@) * CryptCATAdminAddCatalog (WINTRUST.@)
*/ */
BOOL WINAPI CryptCATAdminAddCatalog(HCATADMIN catAdmin, WCHAR *catalogFile, BOOL WINAPI CryptCATAdminAddCatalog(HCATADMIN catAdmin, PWSTR catalogFile,
WCHAR *selectBaseName, DWORD flags) PWSTR selectBaseName, DWORD flags)
{ {
FIXME("%p %s %s %d\n", catAdmin, debugstr_w(catalogFile), FIXME("%p %s %s %d\n", catAdmin, debugstr_w(catalogFile),
debugstr_w(selectBaseName), flags); debugstr_w(selectBaseName), flags);
...@@ -106,7 +106,7 @@ HCATINFO WINAPI CryptCATAdminEnumCatalogFromHash(HCATADMIN hCatAdmin, ...@@ -106,7 +106,7 @@ HCATINFO WINAPI CryptCATAdminEnumCatalogFromHash(HCATADMIN hCatAdmin,
* *
*/ */
BOOL WINAPI CryptCATAdminReleaseCatalogContext(HCATADMIN hCatAdmin, BOOL WINAPI CryptCATAdminReleaseCatalogContext(HCATADMIN hCatAdmin,
HCATADMIN hCatInfo, HCATINFO hCatInfo,
DWORD dwFlags) DWORD dwFlags)
{ {
FIXME("%p %p %x\n", hCatAdmin, hCatInfo, dwFlags); FIXME("%p %p %x\n", hCatAdmin, hCatInfo, dwFlags);
......
include/mscat.h
View file @ c9b98267
...@@ -49,9 +49,12 @@ typedef struct CRYPTCATMEMBER_ { ...@@ -49,9 +49,12 @@ typedef struct CRYPTCATMEMBER_ {
BOOL WINAPI CryptCATAdminAcquireContext(HCATADMIN*,const GUID*,DWORD); BOOL WINAPI CryptCATAdminAcquireContext(HCATADMIN*,const GUID*,DWORD);
BOOL WINAPI CryptCATAdminAddCatalog(HCATADMIN,PWSTR,PWSTR,DWORD);
BOOL WINAPI CryptCATAdminCalcHashFromFileHandle(HANDLE,DWORD*,BYTE*,DWORD); BOOL WINAPI CryptCATAdminCalcHashFromFileHandle(HANDLE,DWORD*,BYTE*,DWORD);
HCATINFO WINAPI CryptCATAdminEnumCatalogFromHash(HCATADMIN,BYTE*,DWORD,DWORD,HCATINFO*); HCATINFO WINAPI CryptCATAdminEnumCatalogFromHash(HCATADMIN,BYTE*,DWORD,DWORD,HCATINFO*);
BOOL WINAPI CryptCATAdminReleaseCatalogContext(HCATADMIN,HCATINFO,DWORD);
BOOL WINAPI CryptCATAdminReleaseContext(HCATADMIN,DWORD); BOOL WINAPI CryptCATAdminReleaseContext(HCATADMIN,DWORD);
BOOL WINAPI CryptCATAdminRemoveCatalog(HCATADMIN,LPCWSTR,DWORD);
BOOL WINAPI CryptCATClose(HANDLE); BOOL WINAPI CryptCATClose(HANDLE);
CRYPTCATMEMBER* WINAPI CryptCATEnumerateMember(HANDLE,CRYPTCATMEMBER*); CRYPTCATMEMBER* WINAPI CryptCATEnumerateMember(HANDLE,CRYPTCATMEMBER*);
HANDLE WINAPI CryptCATOpen(LPWSTR,DWORD,HCRYPTPROV,DWORD,DWORD); HANDLE WINAPI CryptCATOpen(LPWSTR,DWORD,HCRYPTPROV,DWORD,DWORD);
......
tools/winapi/win32.api
View file @ c9b98267
...@@ -5849,7 +5849,9 @@ LPSTR ...@@ -5849,7 +5849,9 @@ LPSTR
%wstr %wstr
LPCWSTR
LPWSTR LPWSTR
PWSTR
%void %void
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment