[ros-diffs] [cwittich] 44433: sync rsaenh_winetest with wine 1.1.34

[cwittich at svn.reactos.org]

Author: cwittich
Date: Sun Dec  6 10:40:22 2009
New Revision: 44433

URL: http://svn.reactos.org/svn/reactos?rev=44433&view=rev
Log:
sync rsaenh_winetest with wine 1.1.34

Modified:
    trunk/rostests/winetests/rsaenh/rsaenh.c

Modified: trunk/rostests/winetests/rsaenh/rsaenh.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rsaenh/rsaenh.c?rev=44433&r1=44432&r2=44433&view=diff
==============================================================================
--- trunk/rostests/winetests/rsaenh/rsaenh.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/rsaenh/rsaenh.c [iso-8859-1] Sun Dec  6 10:40:22 2009
@@ -72,9 +72,15 @@
     HKEY hkey;
     char guid[MAX_PATH];
     DWORD size = MAX_PATH;
+    HRESULT ret;
 
     /* Get the MachineGUID */
-    RegOpenKeyA(HKEY_LOCAL_MACHINE, szCryptography, &hkey);
+    ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, szCryptography, 0, KEY_READ | KEY_WOW64_64KEY, &hkey);
+    if (ret == ERROR_ACCESS_DENIED)
+    {
+        /* Windows 2000 can't handle KEY_WOW64_64KEY */
+        RegOpenKeyA(HKEY_LOCAL_MACHINE, szCryptography, &hkey);
+    }
     RegQueryValueExA(hkey, szMachineGuid, NULL, NULL, (LPBYTE)guid, &size);
     RegCloseKey(hkey);
 
@@ -2085,7 +2091,7 @@
     if (result)
     {
         ok(dataLen == sizeof(test_string), "unexpected size %d\n", dataLen);
-        ok(!memcmp(data, test_string, sizeof(test_string)), "unexpected value");
+        ok(!memcmp(data, test_string, sizeof(test_string)), "unexpected value\n");
     }
     CryptReleaseContext(prov, 0);