Commit b7bf91f5 authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard

crypt32: Fix the I_Crypt*Asn1*() prototypes. Add the i_cryptasn1tls.h header and use it.

parent 2eeb4eaf
...@@ -178,7 +178,7 @@ BOOL WINAPI CertCreateCertificateChainEngine(PCERT_CHAIN_ENGINE_CONFIG pConfig, ...@@ -178,7 +178,7 @@ BOOL WINAPI CertCreateCertificateChainEngine(PCERT_CHAIN_ENGINE_CONFIG pConfig,
return ret; return ret;
} }
void WINAPI CertFreeCertificateChainEngine(HCERTCHAINENGINE hChainEngine) VOID WINAPI CertFreeCertificateChainEngine(HCERTCHAINENGINE hChainEngine)
{ {
PCertificateChainEngine engine = (PCertificateChainEngine)hChainEngine; PCertificateChainEngine engine = (PCertificateChainEngine)hChainEngine;
...@@ -1008,7 +1008,7 @@ PCCERT_CHAIN_CONTEXT WINAPI CertDuplicateCertificateChain( ...@@ -1008,7 +1008,7 @@ PCCERT_CHAIN_CONTEXT WINAPI CertDuplicateCertificateChain(
return pChainContext; return pChainContext;
} }
void WINAPI CertFreeCertificateChain(PCCERT_CHAIN_CONTEXT pChainContext) VOID WINAPI CertFreeCertificateChain(PCCERT_CHAIN_CONTEXT pChainContext)
{ {
PCertificateChain chain = (PCertificateChain)pChainContext; PCertificateChain chain = (PCertificateChain)pChainContext;
......
...@@ -199,17 +199,18 @@ ...@@ -199,17 +199,18 @@
@ stdcall I_CryptFreeLruCache(ptr long long) @ stdcall I_CryptFreeLruCache(ptr long long)
@ stdcall I_CryptFreeTls(long long) @ stdcall I_CryptFreeTls(long long)
@ stdcall I_CryptGetAsn1Decoder(long) @ stdcall I_CryptGetAsn1Decoder(long)
@ stdcall I_CryptGetAsn1Encoder(long)
@ stdcall I_CryptGetDefaultCryptProv(long) @ stdcall I_CryptGetDefaultCryptProv(long)
@ stub I_CryptGetDefaultCryptProvForEncrypt @ stub I_CryptGetDefaultCryptProvForEncrypt
@ stdcall I_CryptGetOssGlobal(long) @ stdcall I_CryptGetOssGlobal(long)
@ stdcall I_CryptGetTls(long) @ stdcall I_CryptGetTls(long)
@ stub I_CryptInsertLruEntry @ stub I_CryptInsertLruEntry
@ stdcall I_CryptInstallAsn1Module(long long long) @ stdcall I_CryptInstallAsn1Module(ptr long ptr)
@ stdcall I_CryptInstallOssGlobal(long long long) @ stdcall I_CryptInstallOssGlobal(long long long)
@ stdcall I_CryptReadTrustedPublisherDWORDValueFromRegistry(wstr ptr) @ stdcall I_CryptReadTrustedPublisherDWORDValueFromRegistry(wstr ptr)
@ stub I_CryptReleaseLruEntry @ stub I_CryptReleaseLruEntry
@ stdcall I_CryptSetTls(long ptr) @ stdcall I_CryptSetTls(long ptr)
@ stdcall I_CryptUninstallAsn1Module(ptr) @ stdcall I_CryptUninstallAsn1Module(long)
@ stub I_CryptUninstallOssGlobal @ stub I_CryptUninstallOssGlobal
@ stub PFXExportCertStore @ stub PFXExportCertStore
@ stub PFXImportCertStore @ stub PFXImportCertStore
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include "wincrypt.h" #include "wincrypt.h"
#include "winreg.h" #include "winreg.h"
#include "winuser.h" #include "winuser.h"
#include "i_cryptasn1tls.h"
#include "crypt32_private.h" #include "crypt32_private.h"
#include "wine/debug.h" #include "wine/debug.h"
...@@ -195,21 +196,27 @@ DWORD WINAPI I_CryptInstallOssGlobal(DWORD x, DWORD y, DWORD z) ...@@ -195,21 +196,27 @@ DWORD WINAPI I_CryptInstallOssGlobal(DWORD x, DWORD y, DWORD z)
return ret; return ret;
} }
BOOL WINAPI I_CryptInstallAsn1Module(void *x, DWORD y, DWORD z) BOOL WINAPI I_CryptInstallAsn1Module(ASN1module_t x, DWORD y, void* z)
{ {
FIXME("%p %08x %08x\n", x, y, z); FIXME("(%p %08x %p): stub\n", x, y, z);
return TRUE; return TRUE;
} }
BOOL WINAPI I_CryptUninstallAsn1Module(void *x) BOOL WINAPI I_CryptUninstallAsn1Module(HCRYPTASN1MODULE x)
{ {
FIXME("%p\n", x); FIXME("(%08x): stub\n", x);
return TRUE; return TRUE;
} }
void *WINAPI I_CryptGetAsn1Decoder(long x) ASN1decoding_t WINAPI I_CryptGetAsn1Decoder(HCRYPTASN1MODULE x)
{ {
FIXME("%08lx\n", x); FIXME("(%08x): stub\n", x);
return NULL;
}
ASN1encoding_t WINAPI I_CryptGetAsn1Encoder(HCRYPTASN1MODULE x)
{
FIXME("(%08x): stub\n", x);
return NULL; return NULL;
} }
......
...@@ -183,6 +183,7 @@ SRCDIR_INCLUDES = \ ...@@ -183,6 +183,7 @@ SRCDIR_INCLUDES = \
guiddef.h \ guiddef.h \
hlguids.h \ hlguids.h \
htmlhelp.h \ htmlhelp.h \
i_cryptasn1tls.h \
icm.h \ icm.h \
icmpapi.h \ icmpapi.h \
idispids.h \ idispids.h \
......
/*
* Copyright (C) 2007 Francois Gouget
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef __WINE_I_CRYPTASN1TLS_H
#define __WINE_I_CRYPTASN1TLS_H
typedef void *ASN1decoding_t;
typedef void *ASN1encoding_t;
typedef void *ASN1module_t;
typedef DWORD HCRYPTASN1MODULE;
#ifdef __cplusplus
extern "C" {
#endif
ASN1decoding_t WINAPI I_CryptGetAsn1Decoder(HCRYPTASN1MODULE);
ASN1encoding_t WINAPI I_CryptGetAsn1Encoder(HCRYPTASN1MODULE);
BOOL WINAPI I_CryptInstallAsn1Module(ASN1module_t, DWORD, void*);
BOOL WINAPI I_CryptUninstallAsn1Module(HCRYPTASN1MODULE);
#ifdef __cplusplus
}
#endif
#endif /* __WINE_I_CRYPTASN1TLS_H */
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