Module: wine Branch: master Commit: d5936f4200090a4f17d2bd55013980594b0ede48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5936f4200090a4f17d2bd5501...
Author: Francois Gouget fgouget@free.fr Date: Tue Feb 17 18:49:52 2009 +0100
wintrust: Make WINTRUST_ReAlloc() static.
---
dlls/wintrust/wintrust_main.c | 31 +++++++++++++++++-------------- dlls/wintrust/wintrust_priv.h | 1 - 2 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index d6800b8..fa4da16 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/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/dlls/wintrust/wintrust_priv.h b/dlls/wintrust/wintrust_priv.h index f55a1b2..148e161 100644 --- a/dlls/wintrust/wintrust_priv.h +++ b/dlls/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,