20 Mar
2022
20 Mar
'22
6:43 p.m.
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cdbd0095f02f56eacca9d…
commit cdbd0095f02f56eacca9d39ffcf7b3fd2b437fd8
Author: winesync <ros-dev(a)reactos.org>
AuthorDate: Sat Mar 12 16:34:03 2022 +0100
Commit: Mark Jansen <mark.jansen(a)reactos.org>
CommitDate: Sun Mar 20 19:27:53 2022 +0100
[WINESYNC] msi/tests: Remove duplicate service tests.
Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id f655bb7ee71a5e271fc7091013a60bb799b315df by Hans Leidekker
<hans(a)codeweavers.com>
---
modules/rostests/winetests/msi/install.c | 86 ++------------------------------
1 file changed, 5 insertions(+), 81 deletions(-)
diff --git a/modules/rostests/winetests/msi/install.c
b/modules/rostests/winetests/msi/install.c
index f0e4857fe19..a4726d631cf 100644
--- a/modules/rostests/winetests/msi/install.c
+++ b/modules/rostests/winetests/msi/install.c
@@ -84,8 +84,7 @@ static const CHAR component_dat[] =
"Component\tComponentId\tDirectory_\tAttribu
"Three\t{010B6ADD-B27D-4EDD-9B3D-34C4F7D61684}\tCHANGEDDIR\t2\t\tthree.txt\n"
"Two\t{BF03D1A6-20DA-4A65-82F3-6CAC995915CE}\tFIRSTDIR\t2\t\ttwo.txt\n"
"dangler\t{6091DF25-EF96-45F1-B8E9-A9B1420C7A3C}\tTARGETDIR\t4\t\tregdata\n"
- "component\t\tMSITESTDIR\t0\t1\tfile\n"
-
"service_comp\t\tMSITESTDIR\t0\t1\tservice_file";
+ "component\t\tMSITESTDIR\t0\t1\tfile\n";
static const CHAR directory_dat[] =
"Directory\tDirectory_Parent\tDefaultDir\n"
"s72\tS72\tl255\n"
@@ -106,8 +105,7 @@ static const CHAR feature_dat[] =
"Feature\tFeature_Parent\tTitle\tDescription\t
"One\t\tOne\tThe One
Feature\t1\t3\tMSITESTDIR\t0\n"
"Three\t\tThree\tThe Three
Feature\t3\t3\tCHANGEDDIR\t0\n"
"Two\t\tTwo\tThe Two
Feature\t2\t3\tFIRSTDIR\t0\n"
- "feature\t\t\t\t2\t1\tTARGETDIR\t0\n"
- "service_feature\t\t\t\t2\t1\tTARGETDIR\t0";
+ "feature\t\t\t\t2\t1\tTARGETDIR\t0\n";
static const CHAR feature_comp_dat[] = "Feature_\tComponent_\n"
"s38\ts72\n"
@@ -117,8 +115,7 @@ static const CHAR feature_comp_dat[] =
"Feature_\tComponent_\n"
"One\tOne\n"
"Three\tThree\n"
"Two\tTwo\n"
- "feature\tcomponent\n"
- "service_feature\tservice_comp\n";
+ "feature\tcomponent\n";
static const CHAR file_dat[] =
"File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n"
"s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n"
@@ -128,8 +125,7 @@ static const CHAR file_dat[] =
"File\tComponent_\tFileName\tFileSize\tVersion\tL
"one.txt\tOne\tone.txt\t1000\t\t\t0\t1\n"
"three.txt\tThree\tthree.txt\t1000\t\t\t0\t3\n"
"two.txt\tTwo\ttwo.txt\t1000\t\t\t0\t2\n"
- "file\tcomponent\tfilename\t100\t\t\t8192\t1\n"
-
"service_file\tservice_comp\tservice.exe\t100\t\t\t8192\t1";
+
"file\tcomponent\tfilename\t100\t\t\t8192\t1\n";
static const CHAR install_exec_seq_dat[] = "Action\tCondition\tSequence\n"
"s72\tS255\tI2\n"
@@ -144,7 +140,6 @@ static const CHAR install_exec_seq_dat[] =
"Action\tCondition\tSequence\n"
"DuplicateFiles\t\t4500\n"
"WriteEnvironmentStrings\t\t4550\n"
"CreateShortcuts\t\t4600\n"
- "InstallServices\t\t5000\n"
"InstallFinalize\t\t6600\n"
"InstallInitialize\t\t1500\n"
"InstallValidate\t\t1400\n"
@@ -177,8 +172,6 @@ static const CHAR property_dat[] = "Property\tValue\n"
"UpgradeCode\t{4C0EAA15-0264-4E5A-8758-609EF142B92D}\n"
"AdminProperties\tPOSTADMIN\n"
"ROOTDRIVE\tC:\\\n"
- "SERVNAME\tTestService\n"
- "SERVDISP\tTestServiceDisp\n"
"MSIFASTINSTALL\t1\n";
static const CHAR aup_property_dat[] = "Property\tValue\n"
@@ -201,8 +194,6 @@ static const CHAR aup_property_dat[] = "Property\tValue\n"
"UpgradeCode\t{4C0EAA15-0264-4E5A-8758-609EF142B92D}\n"
"AdminProperties\tPOSTADMIN\n"
"ROOTDRIVE\tC:\\\n"
- "SERVNAME\tTestService\n"
- "SERVDISP\tTestServiceDisp\n"
"MSIFASTINSTALL\t1\n";
static const CHAR aup2_property_dat[] = "Property\tValue\n"
@@ -225,8 +216,6 @@ static const CHAR aup2_property_dat[] = "Property\tValue\n"
"UpgradeCode\t{4C0EAA15-0264-4E5A-8758-609EF142B92D}\n"
"AdminProperties\tPOSTADMIN\n"
"ROOTDRIVE\tC:\\\n"
- "SERVNAME\tTestService\n"
- "SERVDISP\tTestServiceDisp\n"
"MSIFASTINSTALL\t1\n";
static const CHAR icon_property_dat[] = "Property\tValue\n"
@@ -248,8 +237,6 @@ static const CHAR icon_property_dat[] = "Property\tValue\n"
"UpgradeCode\t{4C0EAA15-0264-4E5A-8758-609EF142B92D}\n"
"AdminProperties\tPOSTADMIN\n"
"ROOTDRIVE\tC:\\\n"
- "SERVNAME\tTestService\n"
- "SERVDISP\tTestServiceDisp\n"
"MSIFASTINSTALL\t1\n";
static const CHAR shortcut_dat[] =
"Shortcut\tDirectory_\tName\tComponent_\tTarget\tArguments\tDescription\tHotkey\tIcon_\tIconIndex\tShowCmd\tWkDir\n"
@@ -281,8 +268,6 @@ static const CHAR up_property_dat[] = "Property\tValue\n"
"UpgradeCode\t{4C0EAA15-0264-4E5A-8758-609EF142B92D}\n"
"AdminProperties\tPOSTADMIN\n"
"ROOTDRIVE\tC:\\\n"
- "SERVNAME\tTestService\n"
- "SERVDISP\tTestServiceDisp\n"
"RemovePreviousVersions\t1\n"
"MSIFASTINSTALL\t1\n";
@@ -305,8 +290,6 @@ static const CHAR up2_property_dat[] = "Property\tValue\n"
"UpgradeCode\t{4C0EAA15-0264-4E5A-8758-609EF142B92D}\n"
"AdminProperties\tPOSTADMIN\n"
"ROOTDRIVE\tC:\\\n"
- "SERVNAME\tTestService\n"
- "SERVDISP\tTestServiceDisp\n"
"MSIFASTINSTALL\t1\n";
static const CHAR up3_property_dat[] = "Property\tValue\n"
@@ -328,8 +311,6 @@ static const CHAR up3_property_dat[] = "Property\tValue\n"
"UpgradeCode\t{4C0EAA15-0264-4E5A-8758-609EF142B92D}\n"
"AdminProperties\tPOSTADMIN\n"
"ROOTDRIVE\tC:\\\n"
- "SERVNAME\tTestService\n"
- "SERVDISP\tTestServiceDisp\n"
"RemovePreviousVersions\t1\n"
"MSIFASTINSTALL\t1\n";
@@ -341,17 +322,6 @@ static const CHAR registry_dat[] =
"Registry\tRoot\tKey\tName\tValue\tComponent_
"regdata\t1\tSOFTWARE\\Wine\\msitest\tblah\tbad\tdangler\n"
"OrderTest\t1\tSOFTWARE\\Wine\\msitest\tOrderTestName\tOrderTestValue\tcomponent";
-static const CHAR service_install_dat[] =
"ServiceInstall\tName\tDisplayName\tServiceType\tStartType\tErrorControl\t"
-
"LoadOrderGroup\tDependencies\tStartName\tPassword\tArguments\tComponent_\tDescription\n"
-
"s72\ts255\tL255\ti4\ti4\ti4\tS255\tS255\tS255\tS255\tS255\ts72\tL255\n"
- "ServiceInstall\tServiceInstall\n"
-
"TestService\t[SERVNAME]\t[SERVDISP]\t2\t3\t0\t\t\tTestService\t\t\tservice_comp\t\t";
-
-static const CHAR service_control_dat[] =
"ServiceControl\tName\tEvent\tArguments\tWait\tComponent_\n"
- "s72\tl255\ti2\tL255\tI2\ts72\n"
- "ServiceControl\tServiceControl\n"
-
"ServiceControl\tTestService\t8\t\t0\tservice_comp";
-
/* tables for test_continuouscabs */
static const CHAR cc_component_dat[] =
"Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n"
"s72\tS38\ts72\ti2\tS255\tS72\n"
@@ -859,8 +829,7 @@ static const CHAR ai_file_dat[] =
"File\tComponent_\tFileName\tFileSize\tVersion
"one.txt\tOne\tone.txt\t1000\t\t\t16384\t1\n"
"three.txt\tThree\tthree.txt\t1000\t\t\t16384\t3\n"
"two.txt\tTwo\ttwo.txt\t1000\t\t\t16384\t2\n"
-
"file\tcomponent\tfilename\t100\t\t\t8192\t1\n"
-
"service_file\tservice_comp\tservice.exe\t100\t\t\t8192\t1";
+
"file\tcomponent\tfilename\t100\t\t\t8192\t1\n";
static const CHAR ip_install_exec_seq_dat[] = "Action\tCondition\tSequence\n"
"s72\tS255\tI2\n"
@@ -1358,8 +1327,6 @@ static const msi_table tables[] =
ADD_TABLE(media),
ADD_TABLE(property),
ADD_TABLE(registry),
- ADD_TABLE(service_install),
- ADD_TABLE(service_control)
};
static const msi_table sc_tables[] =
@@ -1399,8 +1366,6 @@ static const msi_table up_tables[] =
ADD_TABLE(media),
ADD_TABLE(up_property),
ADD_TABLE(registry),
- ADD_TABLE(service_install),
- ADD_TABLE(service_control)
};
static const msi_table up2_tables[] =
@@ -1414,8 +1379,6 @@ static const msi_table up2_tables[] =
ADD_TABLE(media),
ADD_TABLE(up2_property),
ADD_TABLE(registry),
- ADD_TABLE(service_install),
- ADD_TABLE(service_control)
};
static const msi_table up3_tables[] =
@@ -1429,8 +1392,6 @@ static const msi_table up3_tables[] =
ADD_TABLE(media),
ADD_TABLE(up3_property),
ADD_TABLE(registry),
- ADD_TABLE(service_install),
- ADD_TABLE(service_control)
};
static const msi_table up4_tables[] =
@@ -1444,8 +1405,6 @@ static const msi_table up4_tables[] =
ADD_TABLE(media),
ADD_TABLE(property),
ADD_TABLE(registry),
- ADD_TABLE(service_install),
- ADD_TABLE(service_control)
};
static const msi_table up5_tables[] =
@@ -1459,8 +1418,6 @@ static const msi_table up5_tables[] =
ADD_TABLE(media),
ADD_TABLE(up_property),
ADD_TABLE(registry),
- ADD_TABLE(service_install),
- ADD_TABLE(service_control)
};
static const msi_table up6_tables[] =
@@ -1474,8 +1431,6 @@ static const msi_table up6_tables[] =
ADD_TABLE(media),
ADD_TABLE(up2_property),
ADD_TABLE(registry),
- ADD_TABLE(service_install),
- ADD_TABLE(service_control)
};
static const msi_table up7_tables[] =
@@ -1489,8 +1444,6 @@ static const msi_table up7_tables[] =
ADD_TABLE(media),
ADD_TABLE(up3_property),
ADD_TABLE(registry),
- ADD_TABLE(service_install),
- ADD_TABLE(service_control)
};
static const msi_table cc_tables[] =
@@ -2409,7 +2362,6 @@ static void create_test_files(void)
create_cab_file("msitest.cab", MEDIA_SIZE,
"four.txt\0five.txt\0");
create_file("msitest\\filename", 100);
- create_file("msitest\\service.exe", 100);
DeleteFileA("four.txt");
DeleteFileA("five.txt");
@@ -2487,7 +2439,6 @@ static void delete_test_files(void)
DeleteFileA("msitest\\second\\three.txt");
DeleteFileA("msitest\\first\\two.txt");
DeleteFileA("msitest\\one.txt");
- DeleteFileA("msitest\\service.exe");
DeleteFileA("msitest\\filename");
RemoveDirectoryA("msitest\\second");
RemoveDirectoryA("msitest\\first");
@@ -2506,7 +2457,6 @@ static void delete_pf_files(void)
ok(delete_pf("msitest\\first", FALSE), "Directory not
created\n");
ok(delete_pf("msitest\\one.txt", TRUE), "File not installed\n");
ok(delete_pf("msitest\\filename", TRUE), "File not
installed\n");
- ok(delete_pf("msitest\\service.exe", TRUE), "File not
installed\n");
ok(delete_pf("msitest", FALSE), "Directory not created\n");
}
@@ -2656,24 +2606,6 @@ void create_database_wordcount(const CHAR *name, const msi_table
*tables, int nu
HeapFree( GetProcessHeap(), 0, nameW );
}
-static void check_service_is_installed(void)
-{
- SC_HANDLE scm, service;
- BOOL res;
-
- scm = OpenSCManagerA(NULL, NULL, SC_MANAGER_ALL_ACCESS);
- ok(scm != NULL, "Failed to open the SC Manager\n");
-
- service = OpenServiceA(scm, "TestService", SC_MANAGER_ALL_ACCESS);
- ok(service != NULL, "Failed to open TestService\n");
-
- res = DeleteService(service);
- ok(res, "Failed to delete TestService\n");
-
- CloseServiceHandle(service);
- CloseServiceHandle(scm);
-}
-
static BOOL notify_system_change(DWORD event_type, STATEMGRSTATUS *status)
{
RESTOREPOINTINFOA spec;
@@ -2777,8 +2709,6 @@ static void test_MsiInstallProduct(void)
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
ok(!lstrcmpA(path, "OrderTestValue"), "Expected OrderTestValue, got
%s\n", path);
- check_service_is_installed();
-
delete_key(HKEY_CURRENT_USER, "SOFTWARE\\Wine\\msitest", access);
/* not published, reinstall */
@@ -4823,7 +4753,6 @@ static void test_adminimage(void)
create_file("msitest\\cabout\\four.txt", 100);
create_file("msitest\\cabout\\new\\five.txt", 100);
create_file("msitest\\filename", 100);
- create_file("msitest\\service.exe", 100);
create_database_wordcount(msifile, ai_tables,
sizeof(ai_tables) / sizeof(msi_table),
@@ -4849,7 +4778,6 @@ error:
DeleteFileA("msitest\\second\\three.txt");
DeleteFileA("msitest\\first\\two.txt");
DeleteFileA("msitest\\one.txt");
- DeleteFileA("msitest\\service.exe");
DeleteFileA("msitest\\filename");
RemoveDirectoryA("msitest\\cabout\\new");
RemoveDirectoryA("msitest\\cabout");
@@ -5049,7 +4977,6 @@ static void test_preselected(void)
ok(!delete_pf("msitest\\first", FALSE), "Directory created\n");
ok(!delete_pf("msitest\\filename", TRUE), "File installed\n");
ok(delete_pf("msitest\\one.txt", TRUE), "File not installed\n");
- ok(!delete_pf("msitest\\service.exe", TRUE), "File
installed\n");
ok(delete_pf("msitest", FALSE), "Directory not created\n");
r = MsiInstallProductA(msifile, NULL);
@@ -5065,7 +4992,6 @@ static void test_preselected(void)
ok(delete_pf("msitest\\first", FALSE), "Directory not
created\n");
ok(delete_pf("msitest\\filename", TRUE), "File not
installed\n");
ok(!delete_pf("msitest\\one.txt", TRUE), "File installed\n");
- ok(delete_pf("msitest\\service.exe", TRUE), "File not
installed\n");
ok(delete_pf("msitest", FALSE), "Directory not created\n");
error:
@@ -6162,7 +6088,6 @@ static void test_wow64(void)
ok(!delete_pf("msitest\\first", FALSE), "Directory created\n");
ok(!delete_pf("msitest\\one.txt", TRUE), "File installed\n");
ok(!delete_pf("msitest\\filename", TRUE), "File installed\n");
- ok(!delete_pf("msitest\\service.exe", TRUE), "File
installed\n");
ok(!delete_pf("msitest", FALSE), "Directory created\n");
ok(delete_pf_native("msitest\\cabout\\new\\five.txt", TRUE), "File not
installed\n");
@@ -6175,7 +6100,6 @@ static void test_wow64(void)
ok(delete_pf_native("msitest\\first", FALSE), "Directory not
created\n");
ok(delete_pf_native("msitest\\one.txt", TRUE), "File not
installed\n");
ok(delete_pf_native("msitest\\filename", TRUE), "File not
installed\n");
- ok(delete_pf_native("msitest\\service.exe", TRUE), "File not
installed\n");
ok(delete_pf_native("msitest", FALSE), "Directory not
created\n");
pWow64RevertWow64FsRedirection(cookie);