Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-29 05:54:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
svn path=/trunk/; revision=69984
This commit is contained in:
Amine Khaldi 2015-11-21 09:52:04 +00:00
parent 55a1268bfd
commit f1ffa4dc49
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
reactos/dll/win32/wintrust/register.c
View file

@ -945,6 +945,8 @@ HRESULT WINAPI DllRegisterServer(void)
HRESULT CryptRegisterRes = S_OK;
HRESULT TrustProviderRes = S_OK;
HRESULT SIPAddProviderRes = S_OK;
HCRYPTPROV crypt_provider;
BOOL ret;
TRACE("\n");
@ -1062,6 +1064,11 @@ add_trust_providers:
* 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;

2
reactos/media/doc/README.WINE
View 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/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