Francois Gouget : wintrust: Better match the PSDK types and fix the winapi_check warnings.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 923c95a6da14d5344de44f05997000e966a38c4e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=923c95a6da14d5344de44f0599...

Author: Francois Gouget 
Date:   Fri Jan 26 13:18:40 2007 +0100

wintrust: Better match the PSDK types and fix the winapi_check warnings.

---

dlls/wintrust/register.c |    2 +-
 include/wintrust.h       |    2 +-
 tools/winapi/win32.api   |   15 +++++++++++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/dlls/wintrust/register.c b/dlls/wintrust/register.c
index 310c184..6f0f575 100644
--- a/dlls/wintrust/register.c
+++ b/dlls/wintrust/register.c
@@ -707,7 +707,7 @@ static BOOL WINTRUST_RegisterGenChainVer
  *   WintrustAddDefaultForUsage will only return TRUE or FALSE, no last 
  *   error is set, not even when the registry cannot be written to.
  */
-BOOL WINAPI WintrustAddDefaultForUsage(const CHAR *pszUsageOID,
+BOOL WINAPI WintrustAddDefaultForUsage(const char *pszUsageOID,
                                        CRYPT_PROVIDER_REGDEFUSAGE *psDefUsage)
 {
     static const WCHAR CBAlloc[]    = {'C','a','l','l','b','a','c','k','A','l','l','o','c','F','u','n','c','t','i','o','n', 0};
diff --git a/include/wintrust.h b/include/wintrust.h
index af2049e..0f52346 100644
--- a/include/wintrust.h
+++ b/include/wintrust.h
@@ -362,7 +362,7 @@ static const WCHAR WT_PROVIDER_CERTTRUST
 BOOL      WINAPI WintrustAddActionID(GUID*,DWORD,CRYPT_REGISTER_ACTIONID*);
 BOOL      WINAPI WintrustRemoveActionID(GUID*);
 BOOL      WINAPI WintrustLoadFunctionPointers(GUID*,CRYPT_PROVIDER_FUNCTIONS*);
-BOOL      WINAPI WintrustAddDefaultForUsage(const CHAR*,CRYPT_PROVIDER_REGDEFUSAGE*);
+BOOL      WINAPI WintrustAddDefaultForUsage(const char*,CRYPT_PROVIDER_REGDEFUSAGE*);
 void      WINAPI WintrustGetRegPolicyFlags(DWORD*);
 LONG      WINAPI WinVerifyTrust(HWND,GUID*,LPVOID);
 HRESULT   WINAPI WinVerifyTrustEx(HWND,GUID*,WINTRUST_DATA*);
diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api
index 20053b1..9035fac 100644
--- a/tools/winapi/win32.api
+++ b/tools/winapi/win32.api
@@ -5330,6 +5330,8 @@ BOOL
 DWORD
 HANDLE
 HCATADMIN
+HCATINFO
+HCRYPTPROV
 HRESULT
 HWND
 LONG
@@ -5338,14 +5340,27 @@ LONG

BYTE *
 CRYPT_PROVIDER_DATA *
+CRYPT_PROVIDER_FUNCTIONS *
+CRYPT_PROVIDER_REGDEFUSAGE *
 CRYPT_PROVIDER_SGNR *
 CRYPT_REGISTER_ACTIONID *
+CRYPTCATMEMBER *
 DWORD *
 GUID *
 HCATADMIN *
+HCATINFO *
 LPVOID
+PCCERT_CONTEXT
 WINTRUST_DATA *

+%str
+
+char *
+
+%wstr
+
+LPWSTR
+
 %void

void