From 4dd1c81706fedd5349f784b7f9a68df78887eb0c Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Wed, 8 Oct 2014 19:51:13 +0000 Subject: [PATCH] [WINTRUST] * Sync with Wine 1.7.27. CORE-8540 svn path=/trunk/; revision=64622 --- reactos/dll/win32/wintrust/register.c | 1 + reactos/dll/win32/wintrust/wintrust_main.c | 14 -------------- reactos/media/doc/README.WINE | 2 +- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/reactos/dll/win32/wintrust/register.c b/reactos/dll/win32/wintrust/register.c index d914b8e0815..cda089afaf5 100644 --- a/reactos/dll/win32/wintrust/register.c +++ b/reactos/dll/win32/wintrust/register.c @@ -896,6 +896,7 @@ static BOOL WINTRUST_SIPPAddProvider(GUID* Subject, WCHAR* MagicNumber) NewProv.pwszVerifyFuncName = CryptSIPVerifyIndirectData; NewProv.pwszRemoveFuncName = CryptSIPRemoveSignedDataMsg; NewProv.pwszIsFunctionNameFmt2 = NULL; + NewProv.pwszGetCapFuncName = NULL; Ret = CryptSIPAddProvider(&NewProv); diff --git a/reactos/dll/win32/wintrust/wintrust_main.c b/reactos/dll/win32/wintrust/wintrust_main.c index 4ccbc44638f..6977fa0ee28 100644 --- a/reactos/dll/win32/wintrust/wintrust_main.c +++ b/reactos/dll/win32/wintrust/wintrust_main.c @@ -42,20 +42,6 @@ void WINAPI WINTRUST_Free(void *p) HeapFree(GetProcessHeap(), 0, p); } -/*********************************************************************** - * DllMain (WINTRUST.@) - */ -BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) -{ - switch(reason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( inst ); - break; - } - return TRUE; -} - /*********************************************************************** * TrustIsCertificateSelfSigned (WINTRUST.@) */ diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index 5ff9196c506..fef528b6dc6 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -218,7 +218,7 @@ reactos/dll/win32/winmm # Forked at Wine-20050628 reactos/dll/win32/winmm/midimap # Forked at Wine-20050628 reactos/dll/win32/winmm/wavemap # Forked at Wine-20050628 reactos/dll/win32/winscard # Synced to Wine-1.7.17 -reactos/dll/win32/wintrust # Synced to Wine-1.7.17 +reactos/dll/win32/wintrust # Synced to Wine-1.7.27 reactos/dll/win32/wldap32 # Synced to Wine-1.7.17 reactos/dll/win32/wmi # Synced to Wine-1.7.17 reactos/dll/win32/wtsapi32 # Synced to Wine-1.7.17 -- 2.17.1