@@ -1407,43 +1407,43 @@ static const char frp_install_exec_seq_dat[] =
14071407 "PublishProduct\t\t5200\n"
14081408 "InstallFinalize\t\t6000\n" ;
14091409
1410- static const char riv_file_dat [] =
1410+ static const char ini_file_dat [] =
14111411 "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n"
14121412 "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n"
14131413 "File\tFile\n"
14141414 "inifile.txt\tinifile\tinifile.txt\t1000\t\t\t8192\t1\n" ;
14151415
1416- static const char riv_feature_dat [] =
1416+ static const char ini_feature_dat [] =
14171417 "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n"
14181418 "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n"
14191419 "Feature\tFeature\n"
14201420 "inifile\t\t\tinifile feature\t1\t2\tMSITESTDIR\t0\n" ;
14211421
1422- static const char riv_feature_comp_dat [] =
1422+ static const char ini_feature_comp_dat [] =
14231423 "Feature_\tComponent_\n"
14241424 "s38\ts72\n"
14251425 "FeatureComponents\tFeature_\tComponent_\n"
14261426 "inifile\tinifile\n" ;
14271427
1428- static const char riv_component_dat [] =
1428+ static const char ini_component_dat [] =
14291429 "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n"
14301430 "s72\tS38\ts72\ti2\tS255\tS72\n"
14311431 "Component\tComponent\n"
14321432 "inifile\t{A0F15705-4F57-4437-88C4-6C8B37ACC6DE}\tMSITESTDIR\t0\t\tinifile.txt\n" ;
14331433
1434- static const char riv_ini_file_dat [] =
1434+ static const char ini_ini_file_dat [] =
14351435 "IniFile\tFileName\tDirProperty\tSection\tKey\tValue\tAction\tComponent_\n"
14361436 "s72\tl255\tS72\tl96\tl128\tl255\ti2\ts72\n"
14371437 "IniFile\tIniFile\n"
14381438 "inifile1\ttest.ini\tMSITESTDIR\tsection1\tkey1\tvalue1\t0\tinifile\n" ;
14391439
1440- static const char riv_remove_ini_file_dat [] =
1440+ static const char ini_remove_ini_file_dat [] =
14411441 "RemoveIniFile\tFileName\tDirProperty\tSection\tKey\tValue\tAction\tComponent_\n"
14421442 "s72\tl255\tS72\tl96\tl128\tL255\ti2\ts72\n"
14431443 "RemoveIniFile\tRemoveIniFile\n"
14441444 "inifile1\ttest.ini\tMSITESTDIR\tsectionA\tkeyA\tvalueA\t2\tinifile\n" ;
14451445
1446- static const char riv_install_exec_seq_dat [] =
1446+ static const char ini_install_exec_seq_dat [] =
14471447 "Action\tCondition\tSequence\n"
14481448 "s72\tS255\tI2\n"
14491449 "InstallExecuteSequence\tAction\n"
@@ -1457,6 +1457,7 @@ static const char riv_install_exec_seq_dat[] =
14571457 "RemoveFiles\t\t1700\n"
14581458 "InstallFiles\t\t2000\n"
14591459 "RemoveIniValues\t\t3000\n"
1460+ "WriteIniValues\t\t3100\n"
14601461 "RegisterProduct\t\t5000\n"
14611462 "PublishFeatures\t\t5100\n"
14621463 "PublishProduct\t\t5200\n"
@@ -2249,16 +2250,16 @@ static const msi_table frp_tables[] =
22492250 ADD_TABLE (property )
22502251};
22512252
2252- static const msi_table riv_tables [] =
2253+ static const msi_table ini_tables [] =
22532254{
22542255 ADD_TABLE (directory ),
2255- ADD_TABLE (riv_component ),
2256- ADD_TABLE (riv_feature ),
2257- ADD_TABLE (riv_feature_comp ),
2258- ADD_TABLE (riv_file ),
2259- ADD_TABLE (riv_ini_file ),
2260- ADD_TABLE (riv_remove_ini_file ),
2261- ADD_TABLE (riv_install_exec_seq ),
2256+ ADD_TABLE (ini_component ),
2257+ ADD_TABLE (ini_feature ),
2258+ ADD_TABLE (ini_feature_comp ),
2259+ ADD_TABLE (ini_file ),
2260+ ADD_TABLE (ini_ini_file ),
2261+ ADD_TABLE (ini_remove_ini_file ),
2262+ ADD_TABLE (ini_install_exec_seq ),
22622263 ADD_TABLE (media ),
22632264 ADD_TABLE (property )
22642265};
@@ -5987,7 +5988,7 @@ static void test_find_related_products(void)
59875988 DeleteFileA (msifile );
59885989}
59895990
5990- static void test_remove_ini_values (void )
5991+ static void test_ini_values (void )
59915992{
59925993 UINT r ;
59935994 DWORD len ;
@@ -6003,7 +6004,7 @@ static void test_remove_ini_values(void)
60036004
60046005 create_test_files ();
60056006 create_file ("msitest\\inifile.txt" , 1000 );
6006- create_database (msifile , riv_tables , sizeof (riv_tables ) / sizeof (msi_table ));
6007+ create_database (msifile , ini_tables , sizeof (ini_tables ) / sizeof (msi_table ));
60076008
60086009 lstrcpyA (inifile , PROG_FILES_DIR );
60096010 lstrcatA (inifile , "\\msitest" );
@@ -6017,9 +6018,6 @@ static void test_remove_ini_values(void)
60176018 file = CreateFileA (inifile , GENERIC_WRITE |GENERIC_READ , 0 , NULL , CREATE_ALWAYS , 0 , NULL );
60186019 CloseHandle (file );
60196020
6020- ret = WritePrivateProfileStringA ("section1" , "key1" , "value1" , inifile );
6021- ok (ret , "failed to write profile string %u\n" , GetLastError ());
6022-
60236021 ret = WritePrivateProfileStringA ("sectionA" , "keyA" , "valueA" , inifile );
60246022 ok (ret , "failed to write profile string %u\n" , GetLastError ());
60256023
@@ -6662,7 +6660,7 @@ START_TEST(action)
66626660 test_remove_duplicate_files ();
66636661 test_remove_registry_values ();
66646662 test_find_related_products ();
6665- test_remove_ini_values ();
6663+ test_ini_values ();
66666664 test_register_class_info ();
66676665 test_register_extension_info ();
66686666 test_register_progid_info ();
0 commit comments