marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
stable
Hans Leidekker 2019-04-19 11:30:14 +02:00 committed by Alexandre Julliard
parent be02ecda3c
commit dec192ce22
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/msi/tests/action.c
View File

@ -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");