Commit dec192ce authored by Hans Leidekker's avatar Hans Leidekker Committed by Alexandre Julliard

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

parent be02ecda
...@@ -2506,9 +2506,9 @@ static void check_reg_str(HKEY prodkey, LPCSTR name, LPCSTR expected, BOOL bcase ...@@ -2506,9 +2506,9 @@ static void check_reg_str(HKEY prodkey, LPCSTR name, LPCSTR expected, BOOL bcase
else else
{ {
if (bcase) 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 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) ...@@ -3408,7 +3408,7 @@ static void get_owner_company(LPSTR *owner, LPSTR *company)
if (!*owner || !*company) if (!*owner || !*company)
{ {
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, res = RegOpenKeyExA(HKEY_LOCAL_MACHINE,
"Software\\Microsoft\\Windows\\CurrentVersion", 0, access, &hkey); "Software\\Microsoft\\Windows NT\\CurrentVersion", 0, access, &hkey);
if (res == ERROR_SUCCESS) if (res == ERROR_SUCCESS)
{ {
*owner = reg_get_val_str(hkey, "RegisteredOwner"); *owner = reg_get_val_str(hkey, "RegisteredOwner");
...@@ -3420,7 +3420,7 @@ static void get_owner_company(LPSTR *owner, LPSTR *company) ...@@ -3420,7 +3420,7 @@ static void get_owner_company(LPSTR *owner, LPSTR *company)
if (!*owner || !*company) if (!*owner || !*company)
{ {
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, res = RegOpenKeyExA(HKEY_LOCAL_MACHINE,
"Software\\Microsoft\\Windows NT\\CurrentVersion", 0, access, &hkey); "Software\\Microsoft\\Windows\\CurrentVersion", 0, access, &hkey);
if (res == ERROR_SUCCESS) if (res == ERROR_SUCCESS)
{ {
*owner = reg_get_val_str(hkey, "RegisteredOwner"); *owner = reg_get_val_str(hkey, "RegisteredOwner");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment