[WINTRUST]
authorAmine Khaldi <amine.khaldi@reactos.org>
Wed, 8 Oct 2014 19:51:13 +0000 (19:51 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Wed, 8 Oct 2014 19:51:13 +0000 (19:51 +0000)
* Sync with Wine 1.7.27.
CORE-8540

svn path=/trunk/; revision=64622

reactos/dll/win32/wintrust/register.c
reactos/dll/win32/wintrust/wintrust_main.c
reactos/media/doc/README.WINE

index d914b8e..cda089a 100644 (file)
@@ -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);
 
index 4ccbc44..6977fa0 100644 (file)
@@ -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.@)
  */
index 5ff9196..fef528b 100644 (file)
@@ -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