Ros-diffs March 2022

ros-diffs@reactos.org

20 participants
436 discussions

[reactos] 241/360: [WINESYNC] include: Move inline assembly definitions to a new wine/asm.h header.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0f3c2a7956740012463ac… commit 0f3c2a7956740012463ac37542f083fe86625fa4 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 01:34:04 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:21 2022 +0100 [WINESYNC] include: Move inline assembly definitions to a new wine/asm.h header. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id d5a372abbba2e174de78855bdd4a004b56cdc006 by Alexandre Julliard <julliard(a)winehq.org>

2 years, 9 months

[reactos] 240/360: [WINESYNC] msi: Use strncmpiW instead of memicmpW for strings without embedded nulls.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=13f70a1e5fafef4c6c51a… commit 13f70a1e5fafef4c6c51a4be34a2d43868c79370 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 01:34:04 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:21 2022 +0100 [WINESYNC] msi: Use strncmpiW instead of memicmpW for strings without embedded nulls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 280d10b27715c86a5784bba8db7db1e52b1602fa by Alexandre Julliard <julliard(a)winehq.org> --- dll/win32/msi/dialog.c | 2 +- dll/win32/msi/tokenize.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/msi/dialog.c b/dll/win32/msi/dialog.c index d11f09c12cf..d0a8c821fd7 100644 --- a/dll/win32/msi/dialog.c +++ b/dll/win32/msi/dialog.c @@ -3471,7 +3471,7 @@ static UINT msi_dialog_hyperlink_handler( msi_dialog *dialog, msi_control *contr while (*p && isspaceW( *p )) p++; len = strlenW( p ); - if (len > len_href && !memicmpW( p, hrefW, len_href )) + if (len > len_href && !strncmpiW( p, hrefW, len_href )) { p += len_href; while (*p && isspaceW( *p )) p++; diff --git a/dll/win32/msi/tokenize.c b/dll/win32/msi/tokenize.c index d1c2da97439..e429495ae17 100644 --- a/dll/win32/msi/tokenize.c +++ b/dll/win32/msi/tokenize.c @@ -128,7 +128,7 @@ static int compKeyword(const void *m1, const void *m2){ const Keyword *k1 = m1, *k2 = m2; int ret, len = min( k1->len, k2->len ); - if ((ret = memicmpW( k1->name, k2->name, len ))) return ret; + if ((ret = strncmpiW( k1->name, k2->name, len ))) return ret; if (k1->len < k2->len) return -1; else if (k1->len > k2->len) return 1; return 0;

2 years, 9 months

[reactos] 239/360: [WINESYNC] msi: Remove registration for no longer used WineMsiRemoteCustomAction coclass.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f0decc760819fafbba232… commit f0decc760819fafbba232f71372dffe462211f53 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 01:34:03 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:21 2022 +0100 [WINESYNC] msi: Remove registration for no longer used WineMsiRemoteCustomAction coclass. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id f73fefd24c175436f3623939973b377d0822e02e by Zebediah Figura <z.figura12(a)gmail.com> --- dll/win32/msi/msiserver.idl | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dll/win32/msi/msiserver.idl b/dll/win32/msi/msiserver.idl index 4eb33fe4d71..1fda4fa5583 100644 --- a/dll/win32/msi/msiserver.idl +++ b/dll/win32/msi/msiserver.idl @@ -117,11 +117,6 @@ coclass MsiPatch { } /* FIXME: unidentified class */ coclass MsiServerX3 { interface IMsiServer; } -[ - uuid(ba26e6fa-4f27-4f56-953a-3f90272018aa) -] -coclass WineMsiRemoteCustomAction { interface WineMsiRemoteCustomAction; } - [ uuid(000C1092-0000-0000-C000-000000000046), version(1.0) ] library WindowsInstaller {

2 years, 9 months

[reactos] 238/360: [WINESYNC] msiexec: Build with msvcrt.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=62230ae3d841729eade78… commit 62230ae3d841729eade78b642b2e9cf6faea322b Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 01:25:47 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:20 2022 +0100 [WINESYNC] msiexec: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 8dff0e34452f4874873c91a7ec3b92a7cf1c3e16 by Alexandre Julliard <julliard(a)winehq.org> --- base/system/msiexec/CMakeLists.txt | 1 + base/system/msiexec/msiexec.c | 11 +++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/base/system/msiexec/CMakeLists.txt b/base/system/msiexec/CMakeLists.txt index 3eacde306b2..626055cb55d 100644 --- a/base/system/msiexec/CMakeLists.txt +++ b/base/system/msiexec/CMakeLists.txt @@ -1,5 +1,6 @@ add_definitions(-D__WINESRC__) +remove_definitions(-D_CRT_NON_CONFORMING_SWPRINTFS) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/wine) list(APPEND SOURCE diff --git a/base/system/msiexec/msiexec.c b/base/system/msiexec/msiexec.c index 3340ade7760..17d4bf87cdd 100644 --- a/base/system/msiexec/msiexec.c +++ b/base/system/msiexec/msiexec.c @@ -29,7 +29,6 @@ #include "wine/debug.h" #include "wine/heap.h" -#include "wine/unicode.h" #include "initguid.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); @@ -92,7 +91,7 @@ static void ShowUsage(int ExitCode) *msi_res = 0; LoadStringW(hmsi, 10, msi_res, len + 1); - sprintfW(msiexec_help, msi_res, msiexec_version); + swprintf(msiexec_help, len + 1 + ARRAY_SIZE(msiexec_version), msi_res, msiexec_version); MsiMessageBoxW(0, msiexec_help, NULL, 0, GetUserDefaultLangID(), 0); } HeapFree(GetProcessHeap(), 0, msi_res); @@ -153,7 +152,7 @@ static LPWSTR build_properties(struct string_list *property_list) p = ret; for(list = property_list; list; list = list->next) { - value = strchrW(list->str,'='); + value = wcschr(list->str,'='); if(!value) continue; len = value - list->str; @@ -164,7 +163,7 @@ static LPWSTR build_properties(struct string_list *property_list) /* check if the value contains spaces and maybe quote it */ value++; - needs_quote = strchrW(value,' ') ? 1 : 0; + needs_quote = wcschr(value,' ') ? 1 : 0; if(needs_quote) *p++ = '"'; len = lstrlenW(value); @@ -420,13 +419,13 @@ static int custom_action_server(const WCHAR *arg) TRACE("%s\n", debugstr_w(arg)); - if (!(client_pid = atoiW(arg))) + if (!(client_pid = wcstol(arg, NULL, 10))) { ERR("Invalid parameter %s\n", debugstr_w(arg)); return 1; } - sprintfW(buffer, pipe_name, client_pid, sizeof(void *) * 8); + swprintf(buffer, ARRAY_SIZE(buffer), pipe_name, client_pid, sizeof(void *) * 8); pipe = CreateFileW(buffer, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); if (pipe == INVALID_HANDLE_VALUE) {

2 years, 9 months

[reactos] 237/360: [WINESYNC] makefiles: Build all tests with msvcrt.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a32b4b85c64dfae87e288… commit a32b4b85c64dfae87e2883575f21a4e3c41b0784 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 01:24:02 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:20 2022 +0100 [WINESYNC] makefiles: Build all tests with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id d4ef782db7928e0deed5f0b43a8a1557cae0358e by Alexandre Julliard <julliard(a)winehq.org> --- modules/rostests/winetests/msi/custom.c | 8 ++++---- modules/rostests/winetests/msi/db.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/rostests/winetests/msi/custom.c b/modules/rostests/winetests/msi/custom.c index 3a189efff68..f994ad4c18a 100644 --- a/modules/rostests/winetests/msi/custom.c +++ b/modules/rostests/winetests/msi/custom.c @@ -34,15 +34,15 @@ static int todo_level, todo_do_loop; -static void ok_(MSIHANDLE hinst, int todo, const char *file, int line, int condition, const char *msg, ...) +static void WINAPIV ok_(MSIHANDLE hinst, int todo, const char *file, int line, int condition, const char *msg, ...) { static char buffer[2000]; MSIHANDLE record; - va_list valist; + __ms_va_list valist; - va_start(valist, msg); + __ms_va_start(valist, msg); vsprintf(buffer, msg, valist); - va_end(valist); + __ms_va_end(valist); record = MsiCreateRecord(5); MsiRecordSetInteger(record, 1, todo); diff --git a/modules/rostests/winetests/msi/db.c b/modules/rostests/winetests/msi/db.c index 181301e1fe9..64edcb98c03 100644 --- a/modules/rostests/winetests/msi/db.c +++ b/modules/rostests/winetests/msi/db.c @@ -36,15 +36,15 @@ static const char *mstfile = "winetst-db.mst"; static const WCHAR msifileW[] = {'w','i','n','e','t','e','s','t','-','d','b','.','m','s','i',0}; static const WCHAR msifile2W[] = {'w','i','n','e','t','s','t','2','-','d','b','.','m','s','i',0}; -static void check_record_(int line, MSIHANDLE rec, UINT count, ...) +static void WINAPIV check_record_(int line, MSIHANDLE rec, UINT count, ...) { - va_list args; + __ms_va_list args; UINT i; ok_(__FILE__, line)(count == MsiRecordGetFieldCount(rec), "expected %u fields, got %u\n", count, MsiRecordGetFieldCount(rec)); - va_start(args, count); + __ms_va_start(args, count); for (i = 1; i <= count; ++i) { @@ -57,7 +57,7 @@ static void check_record_(int line, MSIHANDLE rec, UINT count, ...) "field %u: expected \"%s\", got \"%s\"\n", i, expect, buffer); } - va_end(args); + __ms_va_end(args); } #define check_record(rec, ...) check_record_(__LINE__, rec, __VA_ARGS__)

2 years, 9 months

[reactos] 236/360: [WINESYNC] msi/tests: Avoid using snprintf().

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3b835aa0abfc161f6d11d… commit 3b835aa0abfc161f6d11d591f67a3bbdf8d50519 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 01:24:01 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:20 2022 +0100 [WINESYNC] msi/tests: Avoid using snprintf(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 72f7f57a21d6e4dd63de56d4a9a265048ed930b6 by Alexandre Julliard <julliard(a)winehq.org> --- modules/rostests/winetests/msi/package.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/rostests/winetests/msi/package.c b/modules/rostests/winetests/msi/package.c index 593e254405c..7915798355a 100644 --- a/modules/rostests/winetests/msi/package.c +++ b/modules/rostests/winetests/msi/package.c @@ -5720,14 +5720,14 @@ static void test_installprops(void) size = MAX_PATH; r = MsiGetPropertyA(hpkg, "ScreenX", buf, &size); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS got %d\n", r); - ok(atol(buf) == res, "Expected %d, got %ld\n", res, atol(buf)); + ok(atol(buf) == res, "Expected %d, got %s\n", res, buf); res = GetSystemMetrics(SM_CYSCREEN); buf[0] = 0; size = MAX_PATH; r = MsiGetPropertyA(hpkg, "ScreenY", buf, &size); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS got %d\n", r); - ok(atol(buf) == res, "Expected %d, got %ld\n", res, atol(buf)); + ok(atol(buf) == res, "Expected %d, got %s\n", res, buf); buf[0] = 0; size = MAX_PATH;

2 years, 9 months

[reactos] 235/360: [WINESYNC] msi: Always use the 64-bit registry view to retrieve registered owner and organization.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bef1f25922726d1e19f6e… commit bef1f25922726d1e19f6e1cd69a07dfe73c953f2 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 01:24:01 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:20 2022 +0100 [WINESYNC] msi: Always use the 64-bit registry view to retrieve registered owner and organization. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 0d17f36c13f129d5bfed290a0583b441657a6a9a by Hans Leidekker <hans(a)codeweavers.com> --- dll/win32/msi/package.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dll/win32/msi/package.c b/dll/win32/msi/package.c index a634a101961..7438ad82a1e 100644 --- a/dll/win32/msi/package.c +++ b/dll/win32/msi/package.c @@ -742,7 +742,7 @@ static VOID set_installer_properties(MSIPACKAGE *package) 'W','i','n','d','o','w','s',' ','N','T','\\', 'C','u','r','r','e','n','t','V','e','r','s','i','o','n',0 }; - static const WCHAR szRegisteredUser[] = {'R','e','g','i','s','t','e','r','e','d','O','w','n','e','r',0}; + static const WCHAR szRegisteredOwner[] = {'R','e','g','i','s','t','e','r','e','d','O','w','n','e','r',0}; static const WCHAR szRegisteredOrganization[] = { 'R','e','g','i','s','t','e','r','e','d','O','r','g','a','n','i','z','a','t','i','o','n',0 }; @@ -971,10 +971,11 @@ static VOID set_installer_properties(MSIPACKAGE *package) CloseHandle( hkey ); } if ((!username || !companyname) && - RegOpenKeyW( HKEY_LOCAL_MACHINE, szCurrentVersionNT, &hkey ) == ERROR_SUCCESS) + RegOpenKeyExW( HKEY_LOCAL_MACHINE, szCurrentVersionNT, 0, KEY_QUERY_VALUE|KEY_WOW64_64KEY, + &hkey ) == ERROR_SUCCESS) { if (!username && - (username = msi_reg_get_val_str( hkey, szRegisteredUser ))) + (username = msi_reg_get_val_str( hkey, szRegisteredOwner ))) msi_set_property( package->db, szUSERNAME, username, -1 ); if (!companyname && (companyname = msi_reg_get_val_str( hkey, szRegisteredOrganization )))

2 years, 9 months

[reactos] 234/360: [WINESYNC] msi/tests: Check the NT key first when retrieving registered owner and organization.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0d7b11abecc7771bebb16… commit 0d7b11abecc7771bebb16bb95792dbc3dc3521cf Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 01:24:00 2022 +0100 Commit: Mark Jansen <mark.jansen(a)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(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id dec192ce22283c4c0cb80337e0ce0904d9d9be89 by Hans Leidekker <hans(a)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");

2 years, 9 months

[reactos] 233/360: [WINESYNC] msi: Get rid of redundant KEY_WOW64_64KEY flags.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8db2fe8cb4bf5adccc714… commit 8db2fe8cb4bf5adccc7149d278bf47fff01879a9 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 01:24:00 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:19 2022 +0100 [WINESYNC] msi: Get rid of redundant KEY_WOW64_64KEY flags. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id be02ecda3c27f4fa3ed574b1df4e51337f9304de by Hans Leidekker <hans(a)codeweavers.com> --- dll/win32/msi/msi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/win32/msi/msi.c b/dll/win32/msi/msi.c index 78ac6472ff6..7b6455b4a26 100644 --- a/dll/win32/msi/msi.c +++ b/dll/win32/msi/msi.c @@ -1747,11 +1747,11 @@ UINT WINAPI MsiGetPatchInfoExW(LPCWSTR szPatchCode, LPCWSTR szProductCode, r = ERROR_UNKNOWN_PATCH; - res = RegOpenKeyExW(udprod, szPatches, 0, KEY_WOW64_64KEY|KEY_READ, &patches); + res = RegOpenKeyExW(udprod, szPatches, 0, KEY_READ, &patches); if (res != ERROR_SUCCESS) goto done; - res = RegOpenKeyExW( patches, squashed_patch, 0, KEY_WOW64_64KEY|KEY_READ, &patch ); + res = RegOpenKeyExW( patches, squashed_patch, 0, KEY_READ, &patch ); if (res != ERROR_SUCCESS) goto done; @@ -1761,7 +1761,7 @@ UINT WINAPI MsiGetPatchInfoExW(LPCWSTR szPatchCode, LPCWSTR szProductCode, &prod, FALSE) != ERROR_SUCCESS) goto done; - res = RegOpenKeyExW(prod, szPatches, 0, KEY_WOW64_64KEY|KEY_ALL_ACCESS, &prodpatches); + res = RegOpenKeyExW(prod, szPatches, 0, KEY_ALL_ACCESS, &prodpatches); if (res != ERROR_SUCCESS) goto done;

2 years, 9 months

[reactos] 232/360: [WINESYNC] msi: Fix handling of architecture in MSIREG_{Open, Delete}UninstallKey().

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c3c3655cab4579c9e1068… commit c3c3655cab4579c9e106850710889e3c4f9a0256 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 01:24:00 2022 +0100 Commit: Mark Jansen <mark.jansen(a)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(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 3d9363446fad694b6e534d84fce63bfc9dbbf4d3 by Zebediah Figura <z.figura12(a)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");

2 years, 9 months

← Newer
1
...
14
15
16
17
18
19
20
...
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2022