Hans Leidekker : msi/tests: Check the NT key first when retrieving registered owner and organization.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: dec192ce22283c4c0cb80337e0ce0904d9d9be89
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=dec192ce22283c4c0cb80337e0ce0904d9d9be89

Author: Hans Leidekker <hans at codeweavers.com>
Date:   Fri Apr 19 11:30:14 2019 +0200

msi/tests: Check the NT key first when retrieving registered owner and organization.

Signed-off-by: Hans Leidekker <hans at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/msi/tests/action.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c
index 60ae92e..7a515df 100644
--- a/dlls/msi/tests/action.c
+++ b/dlls/msi/tests/action.c
@@ -2506,9 +2506,9 @@ static void check_reg_str(HKEY prodkey, LPCSTR name, LPCSTR expected, BOOL bcase
     else
     {
         if (bcase)
-            ok_(__FILE__, line)(!lstrcmpA(val, expected), "Expected %s, got %s\n", expected, val);
+            ok_(__FILE__, line)(!lstrcmpA(val, expected), "Expected \"%s\", got \"%s\"\n", expected, val);
         else
-            ok_(__FILE__, line)(!lstrcmpiA(val, expected), "Expected %s, got %s\n", expected, val);
+            ok_(__FILE__, line)(!lstrcmpiA(val, expected), "Expected \"%s\", got \"%s\"\n", expected, val);
     }
 }
 
@@ -3408,7 +3408,7 @@ static void get_owner_company(LPSTR *owner, LPSTR *company)
     if (!*owner || !*company)
     {
         res = RegOpenKeyExA(HKEY_LOCAL_MACHINE,
-                            "Software\\Microsoft\\Windows\\CurrentVersion", 0, access, &hkey);
+                            "Software\\Microsoft\\Windows NT\\CurrentVersion", 0, access, &hkey);
         if (res == ERROR_SUCCESS)
         {
             *owner = reg_get_val_str(hkey, "RegisteredOwner");
@@ -3420,7 +3420,7 @@ static void get_owner_company(LPSTR *owner, LPSTR *company)
     if (!*owner || !*company)
     {
         res = RegOpenKeyExA(HKEY_LOCAL_MACHINE,
-                            "Software\\Microsoft\\Windows NT\\CurrentVersion", 0, access, &hkey);
+                            "Software\\Microsoft\\Windows\\CurrentVersion", 0, access, &hkey);
         if (res == ERROR_SUCCESS)
         {
             *owner = reg_get_val_str(hkey, "RegisteredOwner");