From d8dac3259eedf78aa214dfdb6c8088645bc1aa84 Mon Sep 17 00:00:00 2001
From: Christoph von Wittich <christoph_vw@reactos.org>
Date: Wed, 20 May 2009 14:35:44 +0000
Subject: [PATCH] sync wintrust with wine 1.1.21

svn path=/trunk/; revision=41021
---
 reactos/dll/win32/wintrust/asn.c           |  2 +-
 reactos/dll/win32/wintrust/wintrust_main.c | 31 ++++++++++++----------
 reactos/dll/win32/wintrust/wintrust_priv.h |  1 -
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/reactos/dll/win32/wintrust/asn.c b/reactos/dll/win32/wintrust/asn.c
index e9d3a7f2d12..e776cba2704 100644
--- a/reactos/dll/win32/wintrust/asn.c
+++ b/reactos/dll/win32/wintrust/asn.c
@@ -969,7 +969,7 @@ static BOOL CRYPT_AsnEncodeInteger(DWORD dwCertEncodingType,
     return ret;
 }
 
-BOOL WINAPI CRYPT_AsnEncodeInt(DWORD dwCertEncodingType,
+static BOOL WINAPI CRYPT_AsnEncodeInt(DWORD dwCertEncodingType,
  LPCSTR lpszStructType, const void *pvStructInfo, BYTE *pbEncoded,
  DWORD *pcbEncoded)
 {
diff --git a/reactos/dll/win32/wintrust/wintrust_main.c b/reactos/dll/win32/wintrust/wintrust_main.c
index d6800b85f34..fa4da16434c 100644
--- a/reactos/dll/win32/wintrust/wintrust_main.c
+++ b/reactos/dll/win32/wintrust/wintrust_main.c
@@ -41,6 +41,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 @@ BOOL WINAPI WintrustSetRegPolicyFlags( DWORD dwPolicyFlags)
 }
 
 /* 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)
 {
diff --git a/reactos/dll/win32/wintrust/wintrust_priv.h b/reactos/dll/win32/wintrust/wintrust_priv.h
index f55a1b2b9e7..148e161aee5 100644
--- a/reactos/dll/win32/wintrust/wintrust_priv.h
+++ b/reactos/dll/win32/wintrust/wintrust_priv.h
@@ -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,