Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 00:55:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

sync wintrust with wine 1.1.21

Browse source 
svn path=/trunk/; revision=41021
This commit is contained in:
Christoph von Wittich 2009-05-20 14:35:44 +00:00
parent 38600af091
commit d8dac3259e
3 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/dll/win32/wintrust/asn.c
View file

@ -969,7 +969,7 @@ static BOOL CRYPT_AsnEncodeInteger(DWORD dwCertEncodingType,
return ret; return ret;
} }
BOOL WINAPI CRYPT_AsnEncodeInt(DWORD dwCertEncodingType, static BOOL WINAPI CRYPT_AsnEncodeInt(DWORD dwCertEncodingType,
LPCSTR lpszStructType, const void *pvStructInfo, BYTE *pbEncoded, LPCSTR lpszStructType, const void *pvStructInfo, BYTE *pbEncoded,
DWORD *pcbEncoded) DWORD *pcbEncoded)
{ {

31
reactos/dll/win32/wintrust/wintrust_main.c
View file

@ -41,6 +41,23 @@
WINE_DEFAULT_DEBUG_CHANNEL(wintrust); WINE_DEFAULT_DEBUG_CHANNEL(wintrust);
/* Utility functions */
void * WINAPI WINTRUST_Alloc(DWORD cb)
{
return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cb);
}
static void* WINTRUST_ReAlloc(void *ptr, DWORD cb) __WINE_ALLOC_SIZE(2);
static void* WINTRUST_ReAlloc(void *ptr, DWORD cb)
{
return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ptr, cb);
}
void WINAPI WINTRUST_Free(void *p)
{
HeapFree(GetProcessHeap(), 0, p);
}
/*********************************************************************** /***********************************************************************
* DllMain (WINTRUST.@) * DllMain (WINTRUST.@)
*/ */
@ -888,20 +905,6 @@ BOOL WINAPI WintrustSetRegPolicyFlags( DWORD dwPolicyFlags)
} }
/* Utility functions */ /* Utility functions */
void * WINAPI WINTRUST_Alloc(DWORD cb)
{
return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cb);
}
void * WINAPI WINTRUST_ReAlloc(void *ptr, DWORD cb)
{
return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ptr, cb);
}
void WINAPI WINTRUST_Free(void *p)
{
HeapFree(GetProcessHeap(), 0, p);
}
BOOL WINAPI WINTRUST_AddStore(CRYPT_PROVIDER_DATA *data, HCERTSTORE store) BOOL WINAPI WINTRUST_AddStore(CRYPT_PROVIDER_DATA *data, HCERTSTORE store)
{ {

1
reactos/dll/win32/wintrust/wintrust_priv.h
View file

@ -19,7 +19,6 @@
#define __WINTRUST_PRIV_H__ #define __WINTRUST_PRIV_H__
void * WINAPI WINTRUST_Alloc(DWORD cb) __WINE_ALLOC_SIZE(1); void * WINAPI WINTRUST_Alloc(DWORD cb) __WINE_ALLOC_SIZE(1);
void * WINAPI WINTRUST_ReAlloc(void *ptr, DWORD cb) __WINE_ALLOC_SIZE(2);
void WINAPI WINTRUST_Free(void *p); void WINAPI WINTRUST_Free(void *p);
BOOL WINAPI WINTRUST_AddStore(CRYPT_PROVIDER_DATA *data, HCERTSTORE store); BOOL WINAPI WINTRUST_AddStore(CRYPT_PROVIDER_DATA *data, HCERTSTORE store);
BOOL WINAPI WINTRUST_AddSgnr(CRYPT_PROVIDER_DATA *data, BOOL WINAPI WINTRUST_AddSgnr(CRYPT_PROVIDER_DATA *data,