https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0d7b11abecc7771bebb16b...
commit 0d7b11abecc7771bebb16bb95792dbc3dc3521cf Author: winesync ros-dev@reactos.org AuthorDate: Sun Mar 13 01:24:00 2022 +0100 Commit: Mark Jansen mark.jansen@reactos.org CommitDate: Sun Mar 20 19:28:20 2022 +0100
[WINESYNC] 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
wine commit id dec192ce22283c4c0cb80337e0ce0904d9d9be89 by Hans Leidekker hans@codeweavers.com --- modules/rostests/winetests/msi/action.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/modules/rostests/winetests/msi/action.c b/modules/rostests/winetests/msi/action.c index 11674e47d35..7be45166471 100644 --- a/modules/rostests/winetests/msi/action.c +++ b/modules/rostests/winetests/msi/action.c @@ -2509,9 +2509,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); } }
@@ -3411,7 +3411,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"); @@ -3423,7 +3423,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");