Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 21:36:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] msi/tests: Remove some workarounds in test_publish_assemblies().

Browse source 
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 9a96657910c2ce30f6f8492bdd562932d63ba430 by Zebediah Figura <z.figura12@gmail.com>
This commit is contained in:
winesync 2022-03-12 23:54:38 +01:00 • committed by Mark Jansen
parent 9792c08fe4
commit 3671579f96
No known key found for this signature in database
GPG key ID: B39240EE84BEAE8B
1 changed files with 8 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

29
modules/rostests/winetests/msi/action.c
View file

@ -6195,11 +6195,6 @@ static void test_publish_assemblies(void)
skip("Not enough rights to perform tests\n"); skip("Not enough rights to perform tests\n");
goto done; goto done;
} }
if (r == ERROR_INSTALL_FAILURE)
{
skip("No support for installing side-by-side assemblies\n");
goto done;
}
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
res = RegOpenKeyA(HKEY_CURRENT_USER, path_dotnet, &hkey); res = RegOpenKeyA(HKEY_CURRENT_USER, path_dotnet, &hkey);
@ -6214,23 +6209,20 @@ static void test_publish_assemblies(void)
RegCloseKey(hkey); RegCloseKey(hkey);
res = RegOpenKeyA(HKEY_CURRENT_USER, path_win32, &hkey); res = RegOpenKeyA(HKEY_CURRENT_USER, path_win32, &hkey);
ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND /* win2k without sxs support */, ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
"Expected ERROR_SUCCESS, got %d\n", res); CHECK_REG_STR(hkey, name_win32, "rcHQPHq?CA@Uv-XqMI1e>}NJjwR'%D9v1p!v{WV(%");
if (res == ERROR_SUCCESS) CHECK_REG_STR(hkey, name_win32, "rcHQPHq?CA@Uv-XqMI1e>}NJjwR'%D9v1p!v{WV(%");
RegCloseKey(hkey); RegCloseKey(hkey);
path = (is_wow64 || is_64bit) ? path_win32_local_wow64 : path_win32_local; path = (is_wow64 || is_64bit) ? path_win32_local_wow64 : path_win32_local;
res = RegOpenKeyA(HKEY_CURRENT_USER, path, &hkey); res = RegOpenKeyA(HKEY_CURRENT_USER, path, &hkey);
ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND /* win2k without sxs support */, ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
"Expected ERROR_SUCCESS, got %d\n", res); CHECK_REG_STR(hkey, name_win32_local, "rcHQPHq?CA@Uv-XqMI1e>C)Uvlj*53A)u(QQ9=)X!");
if (res == ERROR_SUCCESS) CHECK_REG_STR(hkey, name_win32_local, "rcHQPHq?CA@Uv-XqMI1e>C)Uvlj*53A)u(QQ9=)X!");
RegCloseKey(hkey); RegCloseKey(hkey);
r = MsiInstallProductA(msifile, "REMOVE=ALL"); r = MsiInstallProductA(msifile, "REMOVE=ALL");
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
res = RegOpenKeyA(HKEY_CURRENT_USER, path_dotnet, &hkey); res = RegOpenKeyA(HKEY_CURRENT_USER, path_dotnet, &hkey);
ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND, "got %d\n", res);
if (res == ERROR_SUCCESS) if (res == ERROR_SUCCESS)
{ {
res = RegDeleteValueA(hkey, name_dotnet); res = RegDeleteValueA(hkey, name_dotnet);
@ -6243,7 +6235,6 @@ static void test_publish_assemblies(void)
ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
res = RegOpenKeyA(HKEY_CURRENT_USER, path_win32, &hkey); res = RegOpenKeyA(HKEY_CURRENT_USER, path_win32, &hkey);
ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND, "got %d\n", res);
if (res == ERROR_SUCCESS) if (res == ERROR_SUCCESS)
{ {
res = RegDeleteValueA(hkey, name_win32); res = RegDeleteValueA(hkey, name_win32);
@ -6277,23 +6268,20 @@ static void test_publish_assemblies(void)
RegCloseKey(hkey); RegCloseKey(hkey);
res = RegOpenKeyExA(HKEY_CLASSES_ROOT, classes_path_win32, 0, access, &hkey); res = RegOpenKeyExA(HKEY_CLASSES_ROOT, classes_path_win32, 0, access, &hkey);
ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND /* win2k without sxs support */, ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
"Expected ERROR_SUCCESS, got %d\n", res); CHECK_REG_STR(hkey, name_win32, "rcHQPHq?CA@Uv-XqMI1e>}NJjwR'%D9v1p!v{WV(%");
if (res == ERROR_SUCCESS) CHECK_REG_STR(hkey, name_win32, "rcHQPHq?CA@Uv-XqMI1e>}NJjwR'%D9v1p!v{WV(%");
RegCloseKey(hkey); RegCloseKey(hkey);
path = (is_wow64 || is_64bit) ? classes_path_win32_local_wow64 : classes_path_win32_local; path = (is_wow64 || is_64bit) ? classes_path_win32_local_wow64 : classes_path_win32_local;
res = RegOpenKeyExA(HKEY_CLASSES_ROOT, path, 0, access, &hkey); res = RegOpenKeyExA(HKEY_CLASSES_ROOT, path, 0, access, &hkey);
ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND /* win2k without sxs support */, ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
"Expected ERROR_SUCCESS, got %d\n", res); CHECK_REG_STR(hkey, name_win32_local, "rcHQPHq?CA@Uv-XqMI1e>C)Uvlj*53A)u(QQ9=)X!");
if (res == ERROR_SUCCESS) CHECK_REG_STR(hkey, name_win32_local, "rcHQPHq?CA@Uv-XqMI1e>C)Uvlj*53A)u(QQ9=)X!");
RegCloseKey(hkey); RegCloseKey(hkey);
r = MsiInstallProductA(msifile, "REMOVE=ALL ALLUSERS=1"); r = MsiInstallProductA(msifile, "REMOVE=ALL ALLUSERS=1");
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
res = RegOpenKeyA(HKEY_CLASSES_ROOT, classes_path_dotnet, &hkey); res = RegOpenKeyA(HKEY_CLASSES_ROOT, classes_path_dotnet, &hkey);
ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND, "got %d\n", res);
if (res == ERROR_SUCCESS) if (res == ERROR_SUCCESS)
{ {
res = RegDeleteValueA(hkey, name_dotnet); res = RegDeleteValueA(hkey, name_dotnet);
@ -6306,7 +6294,6 @@ static void test_publish_assemblies(void)
ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
res = RegOpenKeyA(HKEY_CLASSES_ROOT, classes_path_win32, &hkey); res = RegOpenKeyA(HKEY_CLASSES_ROOT, classes_path_win32, &hkey);
ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND, "got %d\n", res);
if (res == ERROR_SUCCESS) if (res == ERROR_SUCCESS)
{ {
res = RegDeleteValueA(hkey, name_win32); res = RegDeleteValueA(hkey, name_win32);