[ros-diffs] [cwittich] 41021: sync wintrust with wine 1.1.21
cwittich at svn.reactos.org
cwittich at svn.reactos.org
Wed May 20 16:35:45 CEST 2009
Author: cwittich
Date: Wed May 20 18:35:44 2009
New Revision: 41021
URL: http://svn.reactos.org/svn/reactos?rev=41021&view=rev
Log:
sync wintrust with wine 1.1.21
Modified:
trunk/reactos/dll/win32/wintrust/asn.c
trunk/reactos/dll/win32/wintrust/wintrust_main.c
trunk/reactos/dll/win32/wintrust/wintrust_priv.h
Modified: trunk/reactos/dll/win32/wintrust/asn.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/asn.c?rev=41021&r1=41020&r2=41021&view=diff
==============================================================================
--- trunk/reactos/dll/win32/wintrust/asn.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wintrust/asn.c [iso-8859-1] Wed May 20 18:35:44 2009
@@ -969,7 +969,7 @@
return ret;
}
-BOOL WINAPI CRYPT_AsnEncodeInt(DWORD dwCertEncodingType,
+static BOOL WINAPI CRYPT_AsnEncodeInt(DWORD dwCertEncodingType,
LPCSTR lpszStructType, const void *pvStructInfo, BYTE *pbEncoded,
DWORD *pcbEncoded)
{
Modified: trunk/reactos/dll/win32/wintrust/wintrust_main.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/wintrust_main.c?rev=41021&r1=41020&r2=41021&view=diff
==============================================================================
--- trunk/reactos/dll/win32/wintrust/wintrust_main.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wintrust/wintrust_main.c [iso-8859-1] Wed May 20 18:35:44 2009
@@ -40,6 +40,23 @@
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.@)
@@ -888,20 +905,6 @@
}
/* 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)
{
Modified: trunk/reactos/dll/win32/wintrust/wintrust_priv.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/wintrust_priv.h?rev=41021&r1=41020&r2=41021&view=diff
==============================================================================
--- trunk/reactos/dll/win32/wintrust/wintrust_priv.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wintrust/wintrust_priv.h [iso-8859-1] Wed May 20 18:35:44 2009
@@ -19,7 +19,6 @@
#define __WINTRUST_PRIV_H__
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);
BOOL WINAPI WINTRUST_AddStore(CRYPT_PROVIDER_DATA *data, HCERTSTORE store);
BOOL WINAPI WINTRUST_AddSgnr(CRYPT_PROVIDER_DATA *data,
More information about the Ros-diffs
mailing list