Ros-diffs March 2022

ros-diffs@reactos.org

20 participants
436 discussions

[reactos] 91/360: [WINESYNC] msi/tests: Test deferral of RegisterUser.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b493df633a91bcd819965… commit b493df633a91bcd81996599e9c57d12d5abad900 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sat Mar 12 15:14:53 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:27:51 2022 +0100 [WINESYNC] msi/tests: Test deferral of RegisterUser. 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 d0ab6deb773912b427251f041e7413669fdef702 by Zebediah Figura <z.figura12(a)gmail.com> --- modules/rostests/winetests/msi/action.c | 4 ++++ modules/rostests/winetests/msi/custom.c | 28 ++++++++++++++++++++++++++++ modules/rostests/winetests/msi/custom.spec | 2 ++ 3 files changed, 34 insertions(+) diff --git a/modules/rostests/winetests/msi/action.c b/modules/rostests/winetests/msi/action.c index 22ece567836..ea8c0e86c75 100644 --- a/modules/rostests/winetests/msi/action.c +++ b/modules/rostests/winetests/msi/action.c @@ -404,6 +404,8 @@ static const char pp_install_exec_seq_dat[] = "RemoveFiles\t\t3500\n" "InstallFiles\t\t4000\n" "RegisterUser\tREGISTER_USER=1 Or FULL=1\t6000\n" + "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" @@ -427,6 +429,8 @@ static const char pp_custom_action_dat[] = "pp_deferred\t1025\tcustom.dll\tpp_present\n" "rp_immediate\t1\tcustom.dll\trp_absent\n" "rp_deferred\t1025\tcustom.dll\trp_present\n" + "ru_immediate\t1\tcustom.dll\tru_absent\n" + "ru_deferred\t1025\tcustom.dll\tru_present\n" "ppc_immediate\t1\tcustom.dll\tppc_absent\n" "ppc_deferred\t1025\tcustom.dll\tppc_present\n"; diff --git a/modules/rostests/winetests/msi/custom.c b/modules/rostests/winetests/msi/custom.c index f5aa34446e4..7a3f01ed29a 100644 --- a/modules/rostests/winetests/msi/custom.c +++ b/modules/rostests/winetests/msi/custom.c @@ -1776,3 +1776,31 @@ todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { return ERROR_SUCCESS; } + +static const CHAR ru_key[] = "Software\\Microsoft\\Windows\\CurrentVersion\\Installer" + "\\UserData\\S-1-5-18\\Products\\84A88FD7F6998CE40A22FB59F6B9C2BB\\InstallProperties"; + +UINT WINAPI ru_present(MSIHANDLE hinst) +{ + HKEY key; + LONG res; + + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, ru_key, 0, KEY_READ | KEY_WOW64_64KEY, &key); + ok(hinst, !res, "got %u\n", res); + check_reg_str(hinst, key, "ProductID", "none"); + RegCloseKey(key); + + return ERROR_SUCCESS; +} + +UINT WINAPI ru_absent(MSIHANDLE hinst) +{ + HKEY key; + LONG res; + + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, ru_key, 0, KEY_READ | KEY_WOW64_64KEY, &key); +todo_wine + ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + + return ERROR_SUCCESS; +} diff --git a/modules/rostests/winetests/msi/custom.spec b/modules/rostests/winetests/msi/custom.spec index 2b3b76a3499..eec6a43c0a1 100644 --- a/modules/rostests/winetests/msi/custom.spec +++ b/modules/rostests/winetests/msi/custom.spec @@ -37,6 +37,8 @@ @ stdcall rp_absent(long) @ stdcall rpi_present(long) @ stdcall rpi_absent(long) +@ stdcall ru_present(long) +@ stdcall ru_absent(long) @ stdcall sds_present(long) @ stdcall sds_absent(long) @ stdcall sis_present(long)

2 years, 9 months

[reactos] 90/360: [WINESYNC] msi/tests: Test deferral of RegisterProgIdInfo and UnregisterProgIdInfo.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d6a9b26126160d7996540… commit d6a9b26126160d799654051b415c1c2a37e889be Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sat Mar 12 15:14:53 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:27:51 2022 +0100 [WINESYNC] msi/tests: Test deferral of RegisterProgIdInfo and UnregisterProgIdInfo. 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 2fe0388d0cf205926cc9b8686b8f7ebd692261ef by Zebediah Figura <z.figura12(a)gmail.com> --- modules/rostests/winetests/msi/action.c | 14 +++++++++ modules/rostests/winetests/msi/custom.c | 50 ++++++++++++++++++++++++++++++ modules/rostests/winetests/msi/custom.spec | 2 ++ 3 files changed, 66 insertions(+) diff --git a/modules/rostests/winetests/msi/action.c b/modules/rostests/winetests/msi/action.c index 9409ad19272..22ece567836 100644 --- a/modules/rostests/winetests/msi/action.c +++ b/modules/rostests/winetests/msi/action.c @@ -1654,15 +1654,28 @@ static const char rpi_install_exec_seq_dat[] = "UnregisterClassInfo\t\t3000\n" "UnregisterExtensionInfo\t\t3200\n" "UnregisterProgIdInfo\t\t3400\n" + "upi_immediate\tREMOVE\t3401\n" + "upi_deferred\tREMOVE\t3402\n" "InstallFiles\t\t3600\n" "RegisterClassInfo\t\t4000\n" "RegisterExtensionInfo\t\t4200\n" "RegisterProgIdInfo\t\t4400\n" + "rpi_immediate\tNOT REMOVE\t4401\n" + "rpi_deferred\tNOT REMOVE\t4402\n" "RegisterProduct\t\t5000\n" "PublishFeatures\t\t5100\n" "PublishProduct\t\t5200\n" "InstallFinalize\t\t6000\n"; +static const char rpi_custom_action_dat[] = + "Action\tType\tSource\tTarget\n" + "s72\ti2\tS64\tS0\n" + "CustomAction\tAction\n" + "rpi_immediate\t1\tcustom.dll\trpi_absent\n" + "rpi_deferred\t1025\tcustom.dll\trpi_present\n" + "upi_immediate\t1\tcustom.dll\trpi_present\n" + "upi_deferred\t1025\tcustom.dll\trpi_absent\n"; + static const char rmi_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" @@ -2272,6 +2285,7 @@ static const msi_table rpi_tables[] = ADD_TABLE(rpi_verb), ADD_TABLE(rpi_progid), ADD_TABLE(rpi_install_exec_seq), + ADD_TABLE(rpi_custom_action), ADD_TABLE(media), ADD_TABLE(property) }; diff --git a/modules/rostests/winetests/msi/custom.c b/modules/rostests/winetests/msi/custom.c index 5e9173761fc..f5aa34446e4 100644 --- a/modules/rostests/winetests/msi/custom.c +++ b/modules/rostests/winetests/msi/custom.c @@ -1726,3 +1726,53 @@ todo_wine return ERROR_SUCCESS; } + +UINT WINAPI rpi_present(MSIHANDLE hinst) +{ + HKEY key; + LONG res; + +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { + res = RegOpenKeyExA(HKEY_CLASSES_ROOT, "CLSID\\{110913E7-86D1-4BF3-9922-BA103FCDDDFA}", + 0, KEY_READ | KEY_WOW64_32KEY, &key); + ok(hinst, !res, "got %u\n", res); + RegCloseKey(key); + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "Winetest.Class.1", &key); + ok(hinst, !res, "got %u\n", res); + RegCloseKey(key); + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "Winetest.Class", &key); + ok(hinst, !res, "got %u\n", res); + RegCloseKey(key); + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "Winetest.Class.2", &key); + ok(hinst, !res, "got %u\n", res); + RegCloseKey(key); +} + + return ERROR_SUCCESS; +} + +UINT WINAPI rpi_absent(MSIHANDLE hinst) +{ + HKEY key; + LONG res; + +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { + res = RegOpenKeyExA(HKEY_CLASSES_ROOT, "CLSID\\{110913E7-86D1-4BF3-9922-BA103FCDDDFA}", + 0, KEY_READ | KEY_WOW64_32KEY, &key); + ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "Winetest.Class.1", &key); + ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "Winetest.Class", &key); + ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "Winetest.Class.2", &key); + ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); +} + + return ERROR_SUCCESS; +} diff --git a/modules/rostests/winetests/msi/custom.spec b/modules/rostests/winetests/msi/custom.spec index 9dadfbdf753..2b3b76a3499 100644 --- a/modules/rostests/winetests/msi/custom.spec +++ b/modules/rostests/winetests/msi/custom.spec @@ -35,6 +35,8 @@ @ stdcall rd_absent(long) @ stdcall rp_present(long) @ stdcall rp_absent(long) +@ stdcall rpi_present(long) +@ stdcall rpi_absent(long) @ stdcall sds_present(long) @ stdcall sds_absent(long) @ stdcall sis_present(long)

2 years, 9 months

[reactos] 89/360: [WINESYNC] msi/tests: Test deferral of RegisterProduct.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e0bf3932105ddf29aa9e5… commit e0bf3932105ddf29aa9e5e43c552abafc2376d21 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sat Mar 12 15:14:52 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:27:50 2022 +0100 [WINESYNC] msi/tests: Test deferral of RegisterProduct. 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 71f3f2a6edf8db909a756d25d2acf96ef9258dbc by Zebediah Figura <z.figura12(a)gmail.com> --- modules/rostests/winetests/msi/action.c | 4 ++++ modules/rostests/winetests/msi/custom.c | 28 ++++++++++++++++++++++++++++ modules/rostests/winetests/msi/custom.spec | 2 ++ 3 files changed, 34 insertions(+) diff --git a/modules/rostests/winetests/msi/action.c b/modules/rostests/winetests/msi/action.c index cefa1d7d6f6..9409ad19272 100644 --- a/modules/rostests/winetests/msi/action.c +++ b/modules/rostests/winetests/msi/action.c @@ -405,6 +405,8 @@ static const char pp_install_exec_seq_dat[] = "InstallFiles\t\t4000\n" "RegisterUser\tREGISTER_USER=1 Or FULL=1\t6000\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" "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" @@ -423,6 +425,8 @@ static const char pp_custom_action_dat[] = "uf_deferred\t1025\tcustom.dll\tpf_absent\n" "pp_immediate\t1\tcustom.dll\tpp_absent\n" "pp_deferred\t1025\tcustom.dll\tpp_present\n" + "rp_immediate\t1\tcustom.dll\trp_absent\n" + "rp_deferred\t1025\tcustom.dll\trp_present\n" "ppc_immediate\t1\tcustom.dll\tppc_absent\n" "ppc_deferred\t1025\tcustom.dll\tppc_present\n"; diff --git a/modules/rostests/winetests/msi/custom.c b/modules/rostests/winetests/msi/custom.c index b59b97a1dc7..5e9173761fc 100644 --- a/modules/rostests/winetests/msi/custom.c +++ b/modules/rostests/winetests/msi/custom.c @@ -1698,3 +1698,31 @@ todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) return ERROR_SUCCESS; } + +static const char rp_key[] = "Software\\Microsoft\\Windows\\CurrentVersion\\" + "Uninstall\\{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"; + +UINT WINAPI rp_present(MSIHANDLE hinst) +{ + HKEY key; + LONG res; + + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, rp_key, 0, KEY_READ | KEY_WOW64_32KEY, &key); + ok(hinst, !res, "got %u\n", res); + check_reg_str(hinst, key, "DisplayName", "MSITEST"); + RegCloseKey(key); + + return ERROR_SUCCESS; +} + +UINT WINAPI rp_absent(MSIHANDLE hinst) +{ + HKEY key; + LONG res; + + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, rp_key, 0, KEY_READ | KEY_WOW64_32KEY, &key); +todo_wine + ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + + return ERROR_SUCCESS; +} diff --git a/modules/rostests/winetests/msi/custom.spec b/modules/rostests/winetests/msi/custom.spec index 7f05f018073..9dadfbdf753 100644 --- a/modules/rostests/winetests/msi/custom.spec +++ b/modules/rostests/winetests/msi/custom.spec @@ -33,6 +33,8 @@ @ stdcall rmi_absent(long) @ stdcall rd_present(long) @ stdcall rd_absent(long) +@ stdcall rp_present(long) +@ stdcall rp_absent(long) @ stdcall sds_present(long) @ stdcall sds_absent(long) @ stdcall sis_present(long)

2 years, 9 months

[reactos] 88/360: [WINESYNC] msi/tests: Simplify key access flags in test_register_product().

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=742877db6db44c2e5cbf6… commit 742877db6db44c2e5cbf6baa69c84adc58bcad15 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sat Mar 12 15:14:51 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:27:50 2022 +0100 [WINESYNC] msi/tests: Simplify key access flags in test_register_product(). 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 8d72829a874810c788bddbd46cee98366165fdb0 by Zebediah Figura <z.figura12(a)gmail.com> --- modules/rostests/winetests/msi/action.c | 80 +++++++++++++++------------------ 1 file changed, 35 insertions(+), 45 deletions(-) diff --git a/modules/rostests/winetests/msi/action.c b/modules/rostests/winetests/msi/action.c index 980ed508901..cefa1d7d6f6 100644 --- a/modules/rostests/winetests/msi/action.c +++ b/modules/rostests/winetests/msi/action.c @@ -2633,12 +2633,9 @@ static void test_register_product(void) LPSTR usersid; char date[MAX_PATH], temp[MAX_PATH], keypath[MAX_PATH], path[MAX_PATH]; DWORD size, type; - REGSAM access = KEY_ALL_ACCESS; static const CHAR uninstall[] = "Software\\Microsoft\\Windows\\CurrentVersion" "\\Uninstall\\{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"; - static const CHAR uninstall_32node[] = "Software\\Wow6432Node\\Microsoft\\Windows\\CurrentVersion" - "\\Uninstall\\{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"; static const CHAR userdata[] = "Software\\Microsoft\\Windows\\CurrentVersion\\Installer" "\\UserData\\%s\\Products\\84A88FD7F6998CE40A22FB59F6B9C2BB"; static const CHAR ugkey[] = "Software\\Microsoft\\Windows\\CurrentVersion\\Installer" @@ -2663,9 +2660,6 @@ static void test_register_product(void) create_database(msifile, pp_tables, sizeof(pp_tables) / sizeof(msi_table)); - if (is_wow64) - access |= KEY_WOW64_64KEY; - MsiSetInternalUI(INSTALLUILEVEL_FULL, NULL); /* RegisterProduct */ @@ -2682,16 +2676,8 @@ static void test_register_product(void) res = RegOpenKeyA(HKEY_CURRENT_USER, userugkey, &hkey); ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); - if (is_64bit) - { - res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, uninstall_32node, 0, KEY_ALL_ACCESS, &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - } - else - { - res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, uninstall, 0, KEY_ALL_ACCESS, &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - } + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, uninstall, 0, KEY_READ | KEY_WOW64_32KEY, &hkey); + ok(!res, "got %d\n", res); CHECK_DEL_REG_STR(hkey, "DisplayName", "MSITEST"); CHECK_DEL_REG_STR(hkey, "DisplayVersion", "1.1.1"); @@ -2718,14 +2704,15 @@ static void test_register_product(void) todo_wine CHECK_DEL_REG_DWORD(hkey, "EstimatedSize", get_estimated_size()); - delete_key(hkey, "", access); + res = RegDeleteKeyA(hkey, ""); + ok(!res, "got %d\n", res); RegCloseKey(hkey); sprintf(keypath, userdata, usersid); - res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, access, &hkey); + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, KEY_ALL_ACCESS | KEY_WOW64_64KEY, &hkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - res = RegOpenKeyExA(hkey, "InstallProperties", 0, access, &props); + res = RegOpenKeyExA(hkey, "InstallProperties", 0, KEY_READ, &props); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); size = sizeof(path); @@ -2758,26 +2745,31 @@ static void test_register_product(void) todo_wine CHECK_DEL_REG_DWORD(props, "EstimatedSize", get_estimated_size()); - delete_key(props, "", access); + res = RegDeleteKeyA(props, ""); + ok(!res, "got %d\n", res); RegCloseKey(props); - res = RegOpenKeyExA(hkey, "Usage", 0, access, &usage); + res = RegOpenKeyExA(hkey, "Usage", 0, KEY_READ, &usage); todo_wine { ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); } - delete_key(usage, "", access); + res = RegDeleteKeyA(usage, ""); +todo_wine + ok(!res, "got %d\n", res); RegCloseKey(usage); - delete_key(hkey, "", access); + res = RegDeleteKeyA(hkey, ""); + ok(!res, "got %d\n", res); RegCloseKey(hkey); - res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, ugkey, 0, access, &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); - delete_key(hkey, "", access); + res = RegDeleteKeyA(hkey, ""); + ok(!res, "got %d\n", res); RegCloseKey(hkey); /* RegisterProduct, machine */ @@ -2786,19 +2778,11 @@ static void test_register_product(void) 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, access, &hkey); + 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); - if (is_64bit) - { - res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, uninstall_32node, 0, KEY_ALL_ACCESS, &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - } - else - { - res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, uninstall, 0, KEY_ALL_ACCESS, &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - } + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, uninstall, 0, KEY_READ | KEY_WOW64_32KEY, &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"); @@ -2825,14 +2809,15 @@ static void test_register_product(void) todo_wine CHECK_DEL_REG_DWORD(hkey, "EstimatedSize", get_estimated_size()); - delete_key(hkey, "", access); + 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, access, &hkey); + 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, access, &props); + res = RegOpenKeyExA(hkey, "InstallProperties", 0, KEY_READ, &props); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); size = sizeof(path); @@ -2865,26 +2850,31 @@ static void test_register_product(void) todo_wine CHECK_DEL_REG_DWORD(props, "EstimatedSize", get_estimated_size()); - delete_key(props, "", access); + res = RegDeleteKeyA(props, ""); + ok(!res, "got %d\n", res); RegCloseKey(props); - res = RegOpenKeyExA(hkey, "Usage", 0, access, &usage); + res = RegOpenKeyExA(hkey, "Usage", 0, KEY_READ, &usage); todo_wine { ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); } - delete_key(usage, "", access); + res = RegDeleteKeyA(usage, ""); +todo_wine + ok(!res, "got %d\n", res); RegCloseKey(usage); - delete_key(hkey, "", access); + res = RegDeleteKeyA(hkey, ""); + ok(!res, "got %d\n", res); RegCloseKey(hkey); - res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, ugkey, 0, access, &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); - delete_key(hkey, "", access); + res = RegDeleteKeyA(hkey, ""); + ok(!res, "got %d\n", res); RegCloseKey(hkey); error:

2 years, 9 months

[reactos] 87/360: [WINESYNC] msi/tests: Test deferral of RegisterMimeInfo and UnregisterMimeInfo.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c6f0b6c95ed773cfd96b1… commit c6f0b6c95ed773cfd96b1edb6c3b14140f68631e Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sat Mar 12 15:14:51 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:27:50 2022 +0100 [WINESYNC] msi/tests: Test deferral of RegisterMimeInfo and UnregisterMimeInfo. 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 f181e71400eb25a9aa4e1bf6355116269d04c0b7 by Zebediah Figura <z.figura12(a)gmail.com> --- modules/rostests/winetests/msi/action.c | 14 ++++++++++++++ modules/rostests/winetests/msi/custom.c | 24 ++++++++++++++++++++++++ modules/rostests/winetests/msi/custom.spec | 2 ++ 3 files changed, 40 insertions(+) diff --git a/modules/rostests/winetests/msi/action.c b/modules/rostests/winetests/msi/action.c index 91cf3e121c4..980ed508901 100644 --- a/modules/rostests/winetests/msi/action.c +++ b/modules/rostests/winetests/msi/action.c @@ -1716,13 +1716,26 @@ static const char rmi_install_exec_seq_dat[] = "InstallFiles\t\t2000\n" "UnregisterExtensionInfo\t\t3000\n" "UnregisterMIMEInfo\t\t3500\n" + "umi_immediate\tREMOVE\t3501\n" + "umi_deferred\tREMOVE\t3502\n" "RegisterExtensionInfo\t\t4000\n" "RegisterMIMEInfo\t\t4500\n" + "rmi_immediate\tNOT REMOVE\t4501\n" + "rmi_deferred\tNOT REMOVE\t4502\n" "RegisterProduct\t\t5000\n" "PublishFeatures\t\t5100\n" "PublishProduct\t\t5200\n" "InstallFinalize\t\t6000\n"; +static const char rmi_custom_action_dat[] = + "Action\tType\tSource\tTarget\n" + "s72\ti2\tS64\tS0\n" + "CustomAction\tAction\n" + "rmi_immediate\t1\tcustom.dll\trmi_absent\n" + "rmi_deferred\t1025\tcustom.dll\trmi_present\n" + "umi_immediate\t1\tcustom.dll\trmi_present\n" + "umi_deferred\t1025\tcustom.dll\trmi_absent\n"; + static const char pa_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" @@ -2270,6 +2283,7 @@ static const msi_table rmi_tables[] = ADD_TABLE(rmi_verb), ADD_TABLE(rmi_mime), ADD_TABLE(rmi_install_exec_seq), + ADD_TABLE(rmi_custom_action), ADD_TABLE(media), ADD_TABLE(property) }; diff --git a/modules/rostests/winetests/msi/custom.c b/modules/rostests/winetests/msi/custom.c index 306a8f3840f..b59b97a1dc7 100644 --- a/modules/rostests/winetests/msi/custom.c +++ b/modules/rostests/winetests/msi/custom.c @@ -1674,3 +1674,27 @@ todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { return ERROR_SUCCESS; } + +UINT WINAPI rmi_present(MSIHANDLE hinst) +{ + HKEY key; + LONG res; + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "MIME\\Database\\Content Type\\mime/type", &key); +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) + ok(hinst, !res, "got %u\n", res); + + return ERROR_SUCCESS; +} + +UINT WINAPI rmi_absent(MSIHANDLE hinst) +{ + HKEY key; + LONG res; + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "MIME\\Database\\Content Type\\mime/type", &key); +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) + ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + + return ERROR_SUCCESS; +} diff --git a/modules/rostests/winetests/msi/custom.spec b/modules/rostests/winetests/msi/custom.spec index b28b3931ff4..7f05f018073 100644 --- a/modules/rostests/winetests/msi/custom.spec +++ b/modules/rostests/winetests/msi/custom.spec @@ -29,6 +29,8 @@ @ stdcall rci_absent(long) @ stdcall rei_present(long) @ stdcall rei_absent(long) +@ stdcall rmi_present(long) +@ stdcall rmi_absent(long) @ stdcall rd_present(long) @ stdcall rd_absent(long) @ stdcall sds_present(long)

2 years, 9 months

[reactos] 86/360: [WINESYNC] msi/tests: Test deferral of RegisterFonts and UnregisterFonts.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=13c16770a5cc9a0095777… commit 13c16770a5cc9a0095777b4ec8cc5db0991f5642 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sat Mar 12 15:14:50 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:27:50 2022 +0100 [WINESYNC] msi/tests: Test deferral of RegisterFonts and UnregisterFonts. 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 a364e1a9c8aeba972f13f1af13cd0643b9a05a8e by Zebediah Figura <z.figura12(a)gmail.com> --- modules/rostests/winetests/msi/action.c | 14 +++++++++++++ modules/rostests/winetests/msi/custom.c | 32 ++++++++++++++++++++++++++++++ modules/rostests/winetests/msi/custom.spec | 2 ++ 3 files changed, 48 insertions(+) diff --git a/modules/rostests/winetests/msi/action.c b/modules/rostests/winetests/msi/action.c index 43d76a37d0c..91cf3e121c4 100644 --- a/modules/rostests/winetests/msi/action.c +++ b/modules/rostests/winetests/msi/action.c @@ -799,13 +799,26 @@ static const char font_install_exec_seq_dat[] = "RemoveFiles\t\t3500\n" "InstallFiles\t\t4000\n" "RegisterFonts\t\t4100\n" + "rf_immediate\tNOT REMOVE\t4101\n" + "rf_deferred\tNOT REMOVE\t4102\n" "UnregisterFonts\t\t4200\n" + "uf_immediate\tREMOVE\t4201\n" + "uf_deferred\tREMOVE\t4202\n" "RegisterUser\t\t6000\n" "RegisterProduct\t\t6100\n" "PublishFeatures\t\t6300\n" "PublishProduct\t\t6400\n" "InstallFinalize\t\t6600"; +static const char font_custom_action_dat[] = + "Action\tType\tSource\tTarget\n" + "s72\ti2\tS64\tS0\n" + "CustomAction\tAction\n" + "rf_immediate\t1\tcustom.dll\tfont_absent\n" + "rf_deferred\t1025\tcustom.dll\tfont_present\n" + "uf_immediate\t1\tcustom.dll\tfont_present\n" + "uf_deferred\t1025\tcustom.dll\tfont_absent\n"; + static const char vp_property_dat[] = "Property\tValue\n" "s72\tl0\n" @@ -2054,6 +2067,7 @@ static const msi_table font_tables[] = ADD_TABLE(font_file), ADD_TABLE(font), ADD_TABLE(font_install_exec_seq), + ADD_TABLE(font_custom_action), ADD_TABLE(font_media), ADD_TABLE(property) }; diff --git a/modules/rostests/winetests/msi/custom.c b/modules/rostests/winetests/msi/custom.c index 566ab1a4c66..306a8f3840f 100644 --- a/modules/rostests/winetests/msi/custom.c +++ b/modules/rostests/winetests/msi/custom.c @@ -1642,3 +1642,35 @@ todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { return ERROR_SUCCESS; } + +static const char font_key[] = "Software\\Microsoft\\Windows NT\\CurrentVersion\\Fonts"; + +UINT WINAPI font_present(MSIHANDLE hinst) +{ + HKEY key; + LONG res; + + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, font_key, 0, KEY_QUERY_VALUE | KEY_WOW64_64KEY, &key); + ok(hinst, !res, "got %u\n", res); + res = RegQueryValueExA(key, "msi test font", NULL, NULL, NULL, NULL); +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) + ok(hinst, !res, "got %u\n", res); + RegCloseKey(key); + + return ERROR_SUCCESS; +} + +UINT WINAPI font_absent(MSIHANDLE hinst) +{ + HKEY key; + LONG res; + + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, font_key, 0, KEY_QUERY_VALUE | KEY_WOW64_64KEY, &key); + ok(hinst, !res, "got %u\n", res); +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { + check_reg_str(hinst, key, "msi test font", NULL); +} + RegCloseKey(key); + + return ERROR_SUCCESS; +} diff --git a/modules/rostests/winetests/msi/custom.spec b/modules/rostests/winetests/msi/custom.spec index d302d059579..b28b3931ff4 100644 --- a/modules/rostests/winetests/msi/custom.spec +++ b/modules/rostests/winetests/msi/custom.spec @@ -9,6 +9,8 @@ @ stdcall crs_absent(long) @ stdcall file_present(long) @ stdcall file_absent(long) +@ stdcall font_present(long) +@ stdcall font_absent(long) @ stdcall mov_present(long) @ stdcall mov_absent(long) @ stdcall odbc_present(long)

2 years, 9 months

[reactos] 85/360: [WINESYNC] msi/tests: Test deferral of RegisterExtensionInfo and UnregisterExtensionInfo.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=22740df97c13cc8184328… commit 22740df97c13cc8184328eac4c92f293eb18d670 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sat Mar 12 15:14:50 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:27:50 2022 +0100 [WINESYNC] msi/tests: Test deferral of RegisterExtensionInfo and UnregisterExtensionInfo. 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 884d146b3243f01f00efb527bf3f3f578344da94 by Zebediah Figura <z.figura12(a)gmail.com> --- modules/rostests/winetests/msi/action.c | 14 ++++++++++++ modules/rostests/winetests/msi/custom.c | 34 ++++++++++++++++++++++++++++++ modules/rostests/winetests/msi/custom.spec | 2 ++ 3 files changed, 50 insertions(+) diff --git a/modules/rostests/winetests/msi/action.c b/modules/rostests/winetests/msi/action.c index 9c8f0165489..43d76a37d0c 100644 --- a/modules/rostests/winetests/msi/action.c +++ b/modules/rostests/winetests/msi/action.c @@ -1538,12 +1538,25 @@ static const char rei_install_exec_seq_dat[] = "RemoveFiles\t\t1700\n" "InstallFiles\t\t2000\n" "UnregisterExtensionInfo\t\t3000\n" + "uei_immediate\tREMOVE\t3001\n" + "uei_deferred\tREMOVE\t3002\n" "RegisterExtensionInfo\t\t4000\n" + "rei_immediate\tNOT REMOVE\t4001\n" + "rei_deferred\tNOT REMOVE\t4002\n" "RegisterProduct\t\t5000\n" "PublishFeatures\t\t5100\n" "PublishProduct\t\t5200\n" "InstallFinalize\t\t6000\n"; +static const char rei_custom_action_dat[] = + "Action\tType\tSource\tTarget\n" + "s72\ti2\tS64\tS0\n" + "CustomAction\tAction\n" + "rei_immediate\t1\tcustom.dll\trei_absent\n" + "rei_deferred\t1025\tcustom.dll\trei_present\n" + "uei_immediate\t1\tcustom.dll\trei_present\n" + "uei_deferred\t1025\tcustom.dll\trei_absent\n"; + static const char rpi_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" @@ -2210,6 +2223,7 @@ static const msi_table rei_tables[] = ADD_TABLE(rei_verb), ADD_TABLE(rei_progid), ADD_TABLE(rei_install_exec_seq), + ADD_TABLE(rei_custom_action), ADD_TABLE(media), ADD_TABLE(property) }; diff --git a/modules/rostests/winetests/msi/custom.c b/modules/rostests/winetests/msi/custom.c index a3dd90417c1..566ab1a4c66 100644 --- a/modules/rostests/winetests/msi/custom.c +++ b/modules/rostests/winetests/msi/custom.c @@ -1608,3 +1608,37 @@ todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { return ERROR_SUCCESS; } + +UINT WINAPI rei_present(MSIHANDLE hinst) +{ + HKEY key; + LONG res; + +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { + res = RegOpenKeyA(HKEY_CLASSES_ROOT, ".extension", &key); + ok(hinst, !res, "got %u\n", res); + RegCloseKey(key); + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "Prog.Id.1\\shell\\Open\\command", &key); + ok(hinst, !res, "got %u\n", res); + RegCloseKey(key); +} + + return ERROR_SUCCESS; +} + +UINT WINAPI rei_absent(MSIHANDLE hinst) +{ + HKEY key; + LONG res; + +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { + res = RegOpenKeyA(HKEY_CLASSES_ROOT, ".extension", &key); + ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "Prog.Id.1\\shell\\Open\\command", &key); + ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); +} + + return ERROR_SUCCESS; +} diff --git a/modules/rostests/winetests/msi/custom.spec b/modules/rostests/winetests/msi/custom.spec index 75f665ea3f7..d302d059579 100644 --- a/modules/rostests/winetests/msi/custom.spec +++ b/modules/rostests/winetests/msi/custom.spec @@ -25,6 +25,8 @@ @ stdcall pub_absent(long) @ stdcall rci_present(long) @ stdcall rci_absent(long) +@ stdcall rei_present(long) +@ stdcall rei_absent(long) @ stdcall rd_present(long) @ stdcall rd_absent(long) @ stdcall sds_present(long)

2 years, 9 months

[reactos] 84/360: [WINESYNC] msi/tests: Test deferral of RegisterClassInfo and UnregisterClassInfo.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a4c6f8f2c989b30bea3e5… commit a4c6f8f2c989b30bea3e53a546a3ca5f7722a20b Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sat Mar 12 15:14:49 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:27:50 2022 +0100 [WINESYNC] msi/tests: Test deferral of RegisterClassInfo and UnregisterClassInfo. 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 fc6bd87375a945aa456505c9b83d2e7e08c2f891 by Zebediah Figura <z.figura12(a)gmail.com> --- modules/rostests/winetests/msi/action.c | 14 ++++++++++ modules/rostests/winetests/msi/custom.c | 43 ++++++++++++++++++++++++++++++ modules/rostests/winetests/msi/custom.spec | 2 ++ 3 files changed, 59 insertions(+) diff --git a/modules/rostests/winetests/msi/action.c b/modules/rostests/winetests/msi/action.c index 3d747043dc5..9c8f0165489 100644 --- a/modules/rostests/winetests/msi/action.c +++ b/modules/rostests/winetests/msi/action.c @@ -1463,12 +1463,25 @@ static const char rci_install_exec_seq_dat[] = "RemoveFiles\t\t1700\n" "InstallFiles\t\t2000\n" "UnregisterClassInfo\t\t3000\n" + "uci_immediate\tREMOVE\t3001\n" + "uci_deferred\tREMOVE\t3002\n" "RegisterClassInfo\t\t4000\n" + "rci_immediate\tNOT REMOVE\t4001\n" + "rci_deferred\tNOT REMOVE\t4002\n" "RegisterProduct\t\t5000\n" "PublishFeatures\t\t5100\n" "PublishProduct\t\t5200\n" "InstallFinalize\t\t6000\n"; +static const char rci_custom_action_dat[] = + "Action\tType\tSource\tTarget\n" + "s72\ti2\tS64\tS0\n" + "CustomAction\tAction\n" + "rci_immediate\t1\tcustom.dll\trci_absent\n" + "rci_deferred\t1025\tcustom.dll\trci_present\n" + "uci_immediate\t1\tcustom.dll\trci_present\n" + "uci_deferred\t1025\tcustom.dll\trci_absent\n"; + static const char rei_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" @@ -2181,6 +2194,7 @@ static const msi_table rci_tables[] = ADD_TABLE(rci_appid), ADD_TABLE(rci_class), ADD_TABLE(rci_install_exec_seq), + ADD_TABLE(rci_custom_action), ADD_TABLE(media), ADD_TABLE(property) }; diff --git a/modules/rostests/winetests/msi/custom.c b/modules/rostests/winetests/msi/custom.c index cfb368f9c28..a3dd90417c1 100644 --- a/modules/rostests/winetests/msi/custom.c +++ b/modules/rostests/winetests/msi/custom.c @@ -1565,3 +1565,46 @@ todo_wine return ERROR_SUCCESS; } + +UINT WINAPI rci_present(MSIHANDLE hinst) +{ + HKEY key; + LONG res; + +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { + res = RegOpenKeyExA(HKEY_CLASSES_ROOT, "CLSID\\{110913E7-86D1-4BF3-9922-BA103FCDDDFA}", + 0, KEY_READ | KEY_WOW64_32KEY, &key); + ok(hinst, !res, "got %u\n", res); + RegCloseKey(key); + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "FileType\\{110913E7-86D1-4BF3-9922-BA103FCDDDFA}", &key); + ok(hinst, !res, "got %u\n", res); + RegCloseKey(key); + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "AppID\\{CFCC3B38-E683-497D-9AB4-CB40AAFE307F}", &key); + ok(hinst, !res, "got %u\n", res); + RegCloseKey(key); +} + + return ERROR_SUCCESS; +} + +UINT WINAPI rci_absent(MSIHANDLE hinst) +{ + HKEY key; + LONG res; + +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { + res = RegOpenKeyExA(HKEY_CLASSES_ROOT, "CLSID\\{110913E7-86D1-4BF3-9922-BA103FCDDDFA}", + 0, KEY_READ | KEY_WOW64_32KEY, &key); + ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "FileType\\{110913E7-86D1-4BF3-9922-BA103FCDDDFA}", &key); + ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "AppID\\{CFCC3B38-E683-497D-9AB4-CB40AAFE307F}", &key); + ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); +} + + return ERROR_SUCCESS; +} diff --git a/modules/rostests/winetests/msi/custom.spec b/modules/rostests/winetests/msi/custom.spec index d8b5f0826fb..75f665ea3f7 100644 --- a/modules/rostests/winetests/msi/custom.spec +++ b/modules/rostests/winetests/msi/custom.spec @@ -23,6 +23,8 @@ @ stdcall ppc_absent(long) @ stdcall pub_present(long) @ stdcall pub_absent(long) +@ stdcall rci_present(long) +@ stdcall rci_absent(long) @ stdcall rd_present(long) @ stdcall rd_absent(long) @ stdcall sds_present(long)

2 years, 9 months

[reactos] 83/360: [WINESYNC] msi/tests: Test deferral of PublishProduct.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6a9321b8970bd3ec0628a… commit 6a9321b8970bd3ec0628a490279b6c09224e22f5 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sat Mar 12 15:14:49 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:27:49 2022 +0100 [WINESYNC] msi/tests: Test deferral of PublishProduct. 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 4f2bb46fd1b7e190946b288312b2be30a68c02c1 by Zebediah Figura <z.figura12(a)gmail.com> --- modules/rostests/winetests/msi/action.c | 4 ++++ modules/rostests/winetests/msi/custom.c | 29 +++++++++++++++++++++++++++++ modules/rostests/winetests/msi/custom.spec | 2 ++ 3 files changed, 35 insertions(+) diff --git a/modules/rostests/winetests/msi/action.c b/modules/rostests/winetests/msi/action.c index 82ec376ea17..3d747043dc5 100644 --- a/modules/rostests/winetests/msi/action.c +++ b/modules/rostests/winetests/msi/action.c @@ -409,6 +409,8 @@ static const char pp_install_exec_seq_dat[] = "pf_immediate\tPUBLISH_FEATURES AND ALLUSERS\t6301\n" "pf_deferred\tPUBLISH_FEATURES AND ALLUSERS\t6302\n" "PublishProduct\tPUBLISH_PRODUCT=1 Or FULL=1\t6400\n" + "pp_immediate\tPUBLISH_PRODUCT AND ALLUSERS\t6401\n" + "pp_deferred\tPUBLISH_PRODUCT AND ALLUSERS\t6402\n" "InstallFinalize\t\t6600"; static const char pp_custom_action_dat[] = @@ -419,6 +421,8 @@ static const char pp_custom_action_dat[] = "pf_deferred\t1025\tcustom.dll\tpf_present\n" "uf_immediate\t1\tcustom.dll\tpf_present\n" "uf_deferred\t1025\tcustom.dll\tpf_absent\n" + "pp_immediate\t1\tcustom.dll\tpp_absent\n" + "pp_deferred\t1025\tcustom.dll\tpp_present\n" "ppc_immediate\t1\tcustom.dll\tppc_absent\n" "ppc_deferred\t1025\tcustom.dll\tppc_present\n"; diff --git a/modules/rostests/winetests/msi/custom.c b/modules/rostests/winetests/msi/custom.c index bac2653a5fa..cfb368f9c28 100644 --- a/modules/rostests/winetests/msi/custom.c +++ b/modules/rostests/winetests/msi/custom.c @@ -1536,3 +1536,32 @@ todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) return ERROR_SUCCESS; } + +static const char pp_prodkey[] = "Installer\\Products\\84A88FD7F6998CE40A22FB59F6B9C2BB"; + +UINT WINAPI pp_present(MSIHANDLE hinst) +{ + HKEY key; + LONG res; + + res = RegOpenKeyExA(HKEY_CLASSES_ROOT, pp_prodkey, 0, KEY_READ | KEY_WOW64_64KEY, &key); + ok(hinst, !res, "got %u\n", res); + check_reg_str(hinst, key, "ProductName", "MSITEST"); + check_reg_str(hinst, key, "PackageCode", "AC75740029052C94DA02821EECD05F2F"); + check_reg_str(hinst, key, "Clients", ":"); + + RegCloseKey(key); + return ERROR_SUCCESS; +} + +UINT WINAPI pp_absent(MSIHANDLE hinst) +{ + HKEY key; + LONG res; + + res = RegOpenKeyExA(HKEY_CLASSES_ROOT, pp_prodkey, 0, KEY_READ | KEY_WOW64_64KEY, &key); +todo_wine + ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + + return ERROR_SUCCESS; +} diff --git a/modules/rostests/winetests/msi/custom.spec b/modules/rostests/winetests/msi/custom.spec index 209257025f7..d8b5f0826fb 100644 --- a/modules/rostests/winetests/msi/custom.spec +++ b/modules/rostests/winetests/msi/custom.spec @@ -17,6 +17,8 @@ @ stdcall pa_absent(long) @ stdcall pf_present(long) @ stdcall pf_absent(long) +@ stdcall pp_present(long) +@ stdcall pp_absent(long) @ stdcall ppc_present(long) @ stdcall ppc_absent(long) @ stdcall pub_present(long)

2 years, 9 months

[reactos] 82/360: [WINESYNC] msi/tests: Test deferral of PublishFeatures and UnpublishFeatures.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=074bd3b4681ddeb13502d… commit 074bd3b4681ddeb13502d228ae920562541b14ce Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sat Mar 12 15:14:48 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:27:49 2022 +0100 [WINESYNC] msi/tests: Test deferral of PublishFeatures and UnpublishFeatures. test_publish_assemblies() was leaving behind feature data that caused this test to fail when run multiple times. 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 920dde0b1e1d137720a277ee05b65c6bf2387ad6 by Zebediah Figura <z.figura12(a)gmail.com> --- modules/rostests/winetests/msi/action.c | 10 +++++++ modules/rostests/winetests/msi/custom.c | 42 ++++++++++++++++++++++++++++++ modules/rostests/winetests/msi/custom.spec | 2 ++ 3 files changed, 54 insertions(+) diff --git a/modules/rostests/winetests/msi/action.c b/modules/rostests/winetests/msi/action.c index 48a1c88bf61..82ec376ea17 100644 --- a/modules/rostests/winetests/msi/action.c +++ b/modules/rostests/winetests/msi/action.c @@ -399,11 +399,15 @@ static const char pp_install_exec_seq_dat[] = "ppc_immediate\tPROCESS_COMPONENTS AND ALLUSERS\t1601\n" "ppc_deferred\tPROCESS_COMPONENTS AND ALLUSERS\t1602\n" "UnpublishFeatures\tUNPUBLISH_FEATURES=1 Or FULL=1\t1800\n" + "uf_immediate\tUNPUBLISH_FEATURES AND ALLUSERS\t1801\n" + "uf_deferred\tUNPUBLISH_FEATURES AND ALLUSERS\t1802\n" "RemoveFiles\t\t3500\n" "InstallFiles\t\t4000\n" "RegisterUser\tREGISTER_USER=1 Or FULL=1\t6000\n" "RegisterProduct\tREGISTER_PRODUCT=1 Or FULL=1\t6100\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" "PublishProduct\tPUBLISH_PRODUCT=1 Or FULL=1\t6400\n" "InstallFinalize\t\t6600"; @@ -411,6 +415,10 @@ static const char pp_custom_action_dat[] = "Action\tType\tSource\tTarget\n" "s72\ti2\tS64\tS0\n" "CustomAction\tAction\n" + "pf_immediate\t1\tcustom.dll\tpf_absent\n" + "pf_deferred\t1025\tcustom.dll\tpf_present\n" + "uf_immediate\t1\tcustom.dll\tpf_present\n" + "uf_deferred\t1025\tcustom.dll\tpf_absent\n" "ppc_immediate\t1\tcustom.dll\tppc_absent\n" "ppc_deferred\t1025\tcustom.dll\tppc_present\n"; @@ -1763,6 +1771,7 @@ static const char pa_install_exec_seq_dat[] = "RegisterProduct\t\t5000\n" "PublishFeatures\t\t5100\n" "PublishProduct\t\t5200\n" + "UnpublishFeatures\t\t5300\n" "InstallFinalize\t\t6000\n"; static const char pa_custom_action_dat[] = @@ -1865,6 +1874,7 @@ static const msi_table pp_tables[] = ADD_TABLE(rof_feature_comp), ADD_TABLE(rof_file), ADD_TABLE(pp_install_exec_seq), + ADD_TABLE(pp_custom_action), ADD_TABLE(rof_media), ADD_TABLE(property), }; diff --git a/modules/rostests/winetests/msi/custom.c b/modules/rostests/winetests/msi/custom.c index 4d5cec77dee..bac2653a5fa 100644 --- a/modules/rostests/winetests/msi/custom.c +++ b/modules/rostests/winetests/msi/custom.c @@ -1494,3 +1494,45 @@ todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); return ERROR_SUCCESS; } + +static const char pf_classkey[] = "Installer\\Features\\84A88FD7F6998CE40A22FB59F6B9C2BB"; +static const char pf_userkey[] = "Software\\Microsoft\\Windows\\CurrentVersion\\" + "Installer\\UserData\\S-1-5-18\\Products\\84A88FD7F6998CE40A22FB59F6B9C2BB\\Features"; + +UINT WINAPI pf_present(MSIHANDLE hinst) +{ + HKEY key; + LONG res; + +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { + res = RegOpenKeyExA(HKEY_CLASSES_ROOT, pf_classkey, 0, KEY_READ | KEY_WOW64_64KEY, &key); + ok(hinst, !res, "got %u\n", res); + check_reg_str(hinst, key, "feature", ""); + check_reg_str(hinst, key, "montecristo", ""); + RegCloseKey(key); + + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, pf_userkey, 0, KEY_READ | KEY_WOW64_64KEY, &key); + ok(hinst, !res, "got %u\n", res); + check_reg_str(hinst, key, "feature", "VGtfp^p+,?82@JU1j_KE"); + check_reg_str(hinst, key, "montecristo", "VGtfp^p+,?82@JU1j_KE"); + RegCloseKey(key); +} + + return ERROR_SUCCESS; +} + +UINT WINAPI pf_absent(MSIHANDLE hinst) +{ + HKEY key; + LONG res; + + res = RegOpenKeyExA(HKEY_CLASSES_ROOT, pf_classkey, 0, KEY_READ | KEY_WOW64_64KEY, &key); +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) + ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, pf_userkey, 0, KEY_READ | KEY_WOW64_64KEY, &key); +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) + ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + + return ERROR_SUCCESS; +} diff --git a/modules/rostests/winetests/msi/custom.spec b/modules/rostests/winetests/msi/custom.spec index 2dc09e0a099..209257025f7 100644 --- a/modules/rostests/winetests/msi/custom.spec +++ b/modules/rostests/winetests/msi/custom.spec @@ -15,6 +15,8 @@ @ stdcall odbc_absent(long) @ stdcall pa_present(long) @ stdcall pa_absent(long) +@ stdcall pf_present(long) +@ stdcall pf_absent(long) @ stdcall ppc_present(long) @ stdcall ppc_absent(long) @ stdcall pub_present(long)

2 years, 9 months

← Newer
1
...
29
30
31
32
33
34
35
...
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