[reactos] 232/360: [WINESYNC] msi: Fix handling of architecture in MSIREG_{Open, Delete}UninstallKey().
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c3c3655cab4579c9e10685...
commit c3c3655cab4579c9e106850710889e3c4f9a0256 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:19 2022 +0100
[WINESYNC] msi: Fix handling of architecture in MSIREG_{Open, Delete}UninstallKey().
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47009 Signed-off-by: Zebediah Figura z.figura12@gmail.com Signed-off-by: Hans Leidekker hans@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
wine commit id 3d9363446fad694b6e534d84fce63bfc9dbbf4d3 by Zebediah Figura z.figura12@gmail.com --- dll/win32/msi/registry.c | 46 +++++------- modules/rostests/winetests/msi/action.c | 121 +++++++++++++++++++++++++++++++- 2 files changed, 138 insertions(+), 29 deletions(-)
diff --git a/dll/win32/msi/registry.c b/dll/win32/msi/registry.c index efc72725ce7..8b90254914a 100644 --- a/dll/win32/msi/registry.c +++ b/dll/win32/msi/registry.c @@ -164,11 +164,6 @@ static const WCHAR szUninstall[] = { 'W','i','n','d','o','w','s','\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\', 'U','n','i','n','s','t','a','l','l','\',0};
-static const WCHAR szUninstall_32node[] = { - 'S','o','f','t','w','a','r','e','\','W','o','w','6','4','3','2','N','o','d','e','\', - 'M','i','c','r','o','s','o','f','t','\','W','i','n','d','o','w','s','\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\','U','n','i','n','s','t','a','l','l','\',0}; - static const WCHAR szUserComponents[] = { 'S','o','f','t','w','a','r','e','\','M','i','c','r','o','s','o','f','t','\', 'I','n','s','t','a','l','l','e','r','\','C','o','m','p','o','n','e','n','t','s','\',0}; @@ -452,41 +447,38 @@ static WCHAR *get_user_sid(void)
UINT MSIREG_OpenUninstallKey(const WCHAR *product, enum platform platform, HKEY *key, BOOL create) { + REGSAM access = KEY_ALL_ACCESS; WCHAR keypath[0x200];
TRACE("%s\n", debugstr_w(product));
- if (is_64bit && platform == PLATFORM_INTEL) - { - strcpyW(keypath, szUninstall_32node); - strcatW(keypath, product); - } + if (platform == PLATFORM_INTEL) + access |= KEY_WOW64_32KEY; else - { - strcpyW(keypath, szUninstall); - strcatW(keypath, product); - } - if (create) return RegCreateKeyExW(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, KEY_ALL_ACCESS, NULL, key, NULL); - return RegOpenKeyExW(HKEY_LOCAL_MACHINE, keypath, 0, KEY_ALL_ACCESS, key); + access |= KEY_WOW64_64KEY; + strcpyW(keypath, szUninstall); + strcatW(keypath, product); + if (create) return RegCreateKeyExW(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, key, NULL); + return RegOpenKeyExW(HKEY_LOCAL_MACHINE, keypath, 0, access, key); }
UINT MSIREG_DeleteUninstallKey(const WCHAR *product, enum platform platform) { - WCHAR keypath[0x200]; + REGSAM access = KEY_ALL_ACCESS; + HKEY parent; + LONG r;
TRACE("%s\n", debugstr_w(product));
- if (is_64bit && platform == PLATFORM_INTEL) - { - strcpyW(keypath, szUninstall_32node); - strcatW(keypath, product); - } + if (platform == PLATFORM_INTEL) + access |= KEY_WOW64_32KEY; else - { - strcpyW(keypath, szUninstall); - strcatW(keypath, product); - } - return RegDeleteTreeW(HKEY_LOCAL_MACHINE, keypath); + access |= KEY_WOW64_64KEY; + if ((r = RegOpenKeyExW(HKEY_LOCAL_MACHINE, szUninstall, 0, access, &parent))) + return r; + r = RegDeleteTreeW(parent, product); + RegCloseKey(parent); + return r; }
UINT MSIREG_OpenProductKey(LPCWSTR szProduct, LPCWSTR szUserSid, MSIINSTALLCONTEXT context, HKEY *key, BOOL create) diff --git a/modules/rostests/winetests/msi/action.c b/modules/rostests/winetests/msi/action.c index 97b52af52a8..11674e47d35 100644 --- a/modules/rostests/winetests/msi/action.c +++ b/modules/rostests/winetests/msi/action.c @@ -444,8 +444,8 @@ static const char pp_install_exec_seq_dat[] = "ru_immediate\tREGISTER_USER AND ALLUSERS\t6001\n" "ru_deferred\tREGISTER_USER AND ALLUSERS\t6002\n" "RegisterProduct\tREGISTER_PRODUCT=1 Or FULL=1\t6100\n" - "rp_immediate\tREGISTER_PRODUCT AND ALLUSERS\t6101\n" - "rp_deferred\tREGISTER_PRODUCT AND ALLUSERS\t6102\n" + "rp_immediate\tREGISTER_PRODUCT AND ALLUSERS AND NOT RP_TEST64\t6101\n" + "rp_deferred\tREGISTER_PRODUCT AND ALLUSERS AND NOT RP_TEST64\t6102\n" "PublishFeatures\tPUBLISH_FEATURES=1 Or FULL=1\t6300\n" "pf_immediate\tPUBLISH_FEATURES AND ALLUSERS\t6301\n" "pf_deferred\tPUBLISH_FEATURES AND ALLUSERS\t6302\n" @@ -2880,6 +2880,123 @@ todo_wine ok(!res, "got %d\n", res); RegCloseKey(hkey);
+ if (is_wow64 || is_64bit) + { + DeleteFileA(msifile); + create_database_template(msifile, pp_tables, ARRAY_SIZE(pp_tables), 200, "x64;1033"); + + r = MsiInstallProductA(msifile, "REGISTER_PRODUCT=1 ALLUSERS=1 RP_TEST64=1"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(delete_pf("msitest\maximus", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "Directory not created\n"); + + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, userugkey, 0, KEY_READ | KEY_WOW64_64KEY, &hkey); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, uninstall, 0, KEY_READ | KEY_WOW64_32KEY, &hkey); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_SUCCESS, got %d\n", res); + + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, uninstall, 0, KEY_READ | KEY_WOW64_64KEY, &hkey); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + CHECK_DEL_REG_STR(hkey, "DisplayName", "MSITEST"); + CHECK_DEL_REG_STR(hkey, "DisplayVersion", "1.1.1"); + CHECK_DEL_REG_STR(hkey, "InstallDate", date); + CHECK_DEL_REG_STR(hkey, "InstallSource", temp); + CHECK_DEL_REG_ISTR(hkey, "ModifyPath", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); + CHECK_DEL_REG_STR(hkey, "Publisher", "Wine"); + CHECK_DEL_REG_STR(hkey, "UninstallString", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); + CHECK_DEL_REG_STR(hkey, "AuthorizedCDFPrefix", NULL); + CHECK_DEL_REG_STR(hkey, "Comments", NULL); + CHECK_DEL_REG_STR(hkey, "Contact", NULL); + CHECK_DEL_REG_STR(hkey, "HelpLink", NULL); + CHECK_DEL_REG_STR(hkey, "HelpTelephone", NULL); + CHECK_DEL_REG_STR(hkey, "InstallLocation", NULL); + CHECK_DEL_REG_DWORD(hkey, "NoModify", 1); + CHECK_DEL_REG_STR(hkey, "Readme", NULL); + CHECK_DEL_REG_STR(hkey, "Size", NULL); + CHECK_DEL_REG_STR(hkey, "URLInfoAbout", NULL); + CHECK_DEL_REG_STR(hkey, "URLUpdateInfo", NULL); + CHECK_DEL_REG_DWORD(hkey, "Language", 1033); + CHECK_DEL_REG_DWORD(hkey, "Version", 0x1010001); + CHECK_DEL_REG_DWORD(hkey, "VersionMajor", 1); + CHECK_DEL_REG_DWORD(hkey, "VersionMinor", 1); + CHECK_DEL_REG_DWORD(hkey, "WindowsInstaller", 1); + todo_wine + CHECK_DEL_REG_DWORD(hkey, "EstimatedSize", get_estimated_size()); + + res = RegDeleteKeyA(hkey, ""); + ok(!res, "got %d\n", res); + RegCloseKey(hkey); + + sprintf(keypath, userdata, "S-1-5-18"); + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, KEY_READ | KEY_WOW64_64KEY, &hkey); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + res = RegOpenKeyExA(hkey, "InstallProperties", 0, KEY_READ, &props); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + size = sizeof(path); + RegQueryValueExA(props, "LocalPackage", NULL, &type, (LPBYTE)path, &size); + DeleteFileA(path); + RegDeleteValueA(props, "LocalPackage"); /* LocalPackage is nondeterministic */ + + CHECK_DEL_REG_STR(props, "DisplayName", "MSITEST"); + CHECK_DEL_REG_STR(props, "DisplayVersion", "1.1.1"); + CHECK_DEL_REG_STR(props, "InstallDate", date); + CHECK_DEL_REG_STR(props, "InstallSource", temp); + CHECK_DEL_REG_ISTR(props, "ModifyPath", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); + CHECK_DEL_REG_STR(props, "Publisher", "Wine"); + CHECK_DEL_REG_STR(props, "UninstallString", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); + CHECK_DEL_REG_STR(props, "AuthorizedCDFPrefix", NULL); + CHECK_DEL_REG_STR(props, "Comments", NULL); + CHECK_DEL_REG_STR(props, "Contact", NULL); + CHECK_DEL_REG_STR(props, "HelpLink", NULL); + CHECK_DEL_REG_STR(props, "HelpTelephone", NULL); + CHECK_DEL_REG_STR(props, "InstallLocation", NULL); + CHECK_DEL_REG_DWORD(props, "NoModify", 1); + CHECK_DEL_REG_STR(props, "Readme", NULL); + CHECK_DEL_REG_STR(props, "Size", NULL); + CHECK_DEL_REG_STR(props, "URLInfoAbout", NULL); + CHECK_DEL_REG_STR(props, "URLUpdateInfo", NULL); + CHECK_DEL_REG_DWORD(props, "Language", 1033); + CHECK_DEL_REG_DWORD(props, "Version", 0x1010001); + CHECK_DEL_REG_DWORD(props, "VersionMajor", 1); + CHECK_DEL_REG_DWORD(props, "VersionMinor", 1); + CHECK_DEL_REG_DWORD(props, "WindowsInstaller", 1); + todo_wine + CHECK_DEL_REG_DWORD(props, "EstimatedSize", get_estimated_size()); + + res = RegDeleteKeyA(props, ""); + ok(!res, "got %d\n", res); + RegCloseKey(props); + + res = RegOpenKeyExA(hkey, "Usage", 0, KEY_READ, &usage); + todo_wine + { + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + } + + res = RegDeleteKeyA(usage, ""); + todo_wine + ok(!res, "got %d\n", res); + RegCloseKey(usage); + res = RegDeleteKeyA(hkey, ""); + ok(!res, "got %d\n", res); + RegCloseKey(hkey); + + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, ugkey, 0, KEY_READ | KEY_WOW64_64KEY, &hkey); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + CHECK_DEL_REG_STR(hkey, "84A88FD7F6998CE40A22FB59F6B9C2BB", NULL); + + res = RegDeleteKeyA(hkey, ""); + ok(!res, "got %d\n", res); + RegCloseKey(hkey); + } + else + skip("64-bit RegisterProduct tests\n"); + error: DeleteFileA(msifile); DeleteFileA("msitest\maximus");
-
winesync