[WINTRUST] Sync with Wine Staging 1.7.55. CORE-10536
authorAmine Khaldi <amine.khaldi@reactos.org>
Sat, 21 Nov 2015 09:52:04 +0000 (09:52 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Sat, 21 Nov 2015 09:52:04 +0000 (09:52 +0000)
svn path=/trunk/; revision=69984

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

index cda089a..6429a5d 100644 (file)
@@ -945,6 +945,8 @@ HRESULT WINAPI DllRegisterServer(void)
     HRESULT CryptRegisterRes = S_OK;
     HRESULT TrustProviderRes = S_OK;
     HRESULT SIPAddProviderRes = S_OK;
     HRESULT CryptRegisterRes = S_OK;
     HRESULT TrustProviderRes = S_OK;
     HRESULT SIPAddProviderRes = S_OK;
+    HCRYPTPROV crypt_provider;
+    BOOL ret;
 
     TRACE("\n");
 
 
     TRACE("\n");
 
@@ -1062,6 +1064,11 @@ add_trust_providers:
      * a trust provider without a diagnostic policy).
      */
 
      * 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;
     /* If CryptRegisterRes is not S_OK it will always overrule the return value. */
     if (CryptRegisterRes != S_OK)
         return CryptRegisterRes;
index e11ef0c..b70584b 100644 (file)
@@ -210,7 +210,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 WineStaging-1.7.47
 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
 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