Author: akhaldi
Date: Wed Oct 8 19:51:13 2014
New Revision: 64622
URL: http://svn.reactos.org/svn/reactos?rev=64622&view=rev
Log:
[WINTRUST]
* Sync with Wine 1.7.27.
CORE-8540
Modified:
trunk/reactos/dll/win32/wintrust/register.c
trunk/reactos/dll/win32/wintrust/wintrust_main.c
trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/wintrust/register.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/register.c?rev=64622&r1=64621&r2=64622&view=diff
==============================================================================
--- trunk/reactos/dll/win32/wintrust/register.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wintrust/register.c [iso-8859-1] Wed Oct 8
19:51:13 2014
@@ -896,6 +896,7 @@
NewProv.pwszVerifyFuncName = CryptSIPVerifyIndirectData;
NewProv.pwszRemoveFuncName = CryptSIPRemoveSignedDataMsg;
NewProv.pwszIsFunctionNameFmt2 = NULL;
+ NewProv.pwszGetCapFuncName = NULL;
Ret = CryptSIPAddProvider(&NewProv);
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=64622&r1=64621&r2=64622&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 Oct 8
19:51:13 2014
@@ -40,20 +40,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;
}
/***********************************************************************
Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=64622&r1=64621&r2=64622&view=diff
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Oct 8 19:51:13 2014
@@ -218,7 +218,7 @@
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
