[akhaldi] 69984: [WINTRUST] Sync with Wine Staging 1.7.55. CORE-10536

Author: akhaldi
Date: Sat Nov 21 09:52:04 2015
New Revision: 69984

URL: http://svn.reactos.org/svn/reactos?rev=69984&view=rev
Log:
[WINTRUST] Sync with Wine Staging 1.7.55. CORE-10536

Modified:
    trunk/reactos/dll/win32/wintrust/register.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/registe…
==============================================================================
--- trunk/reactos/dll/win32/wintrust/register.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wintrust/register.c	[iso-8859-1] Sat Nov 21 09:52:04 2015
@@ -945,6 +945,8 @@
     HRESULT CryptRegisterRes = S_OK;
     HRESULT TrustProviderRes = S_OK;
     HRESULT SIPAddProviderRes = S_OK;
+    HCRYPTPROV crypt_provider;
+    BOOL ret;
 
     TRACE("\n");
 
@@ -1062,6 +1064,11 @@
      * a trust provider without a diagnostic policy).
      */
 
+    /* Create a dummy context to force creation of the MachineGuid registry key. */
+    ret = CryptAcquireContextW(&crypt_provider, NULL, NULL, PROV_RSA_FULL,
CRYPT_VERIFYCONTEXT);
+    if (ret) CryptReleaseContext(crypt_provider, 0);
+    else ERR("Failed to acquire cryptographic context: %u\n", GetLastError());
+
     /* If CryptRegisterRes is not S_OK it will always overrule the return value. */
     if (CryptRegisterRes != S_OK)
         return CryptRegisterRes;

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Sat Nov 21 09:52:04 2015
@@ -210,7 +210,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 WineStaging-1.7.47
-reactos/dll/win32/wintrust            # Synced to WineStaging-1.7.47
+reactos/dll/win32/wintrust            # Synced to WineStaging-1.7.55
 reactos/dll/win32/wldap32             # Synced to WineStaging-1.7.47
 reactos/dll/win32/wmi                 # Synced to WineStaging-1.7.47
 reactos/dll/win32/wmiutils            # Synced to WineStaging-1.7.55