Skip to content

Commit 8667645

Browse files
winesynclearn-more
winesync
authored and
learn-more
committed
[WINESYNC] msi/tests: Use the available ARRAY_SIZE() macro.
Signed-off-by: Michael Stefaniuc <[email protected]> Signed-off-by: Hans Leidekker <[email protected]> Signed-off-by: Alexandre Julliard <[email protected]> wine commit id b716661c4a5c492fff79bed14190f33b47afebc8 by Michael Stefaniuc <[email protected]>
1 parent 42961bd commit 8667645

File tree

8 files changed

+178
-181
lines changed

8 files changed

+178
-181
lines changed

‎modules/rostests/winetests/msi/action.c‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2653,7 +2653,7 @@ static void test_register_product(void)
26532653
CreateDirectoryA("msitest", NULL);
26542654
create_file("msitest\\maximus", 500);
26552655

2656-
create_database(msifile, pp_tables, sizeof(pp_tables) / sizeof(msi_table));
2656+
create_database(msifile, pp_tables, ARRAY_SIZE(pp_tables));
26572657

26582658
MsiSetInternalUI(INSTALLUILEVEL_FULL, NULL);
26592659

@@ -2920,7 +2920,7 @@ static void test_publish_product(void)
29202920
CreateDirectoryA("msitest", NULL);
29212921
create_file("msitest\\maximus", 500);
29222922

2923-
create_database(msifile, pp_tables, sizeof(pp_tables) / sizeof(msi_table));
2923+
create_database(msifile, pp_tables, ARRAY_SIZE(pp_tables));
29242924

29252925
if (is_wow64)
29262926
access |= KEY_WOW64_64KEY;
@@ -3153,7 +3153,7 @@ static void test_publish_features(void)
31533153
CreateDirectoryA("msitest", NULL);
31543154
create_file("msitest\\maximus", 500);
31553155

3156-
create_database(msifile, pp_tables, sizeof(pp_tables) / sizeof(msi_table));
3156+
create_database(msifile, pp_tables, ARRAY_SIZE(pp_tables));
31573157

31583158
if (is_wow64)
31593159
access |= KEY_WOW64_64KEY;
@@ -3339,7 +3339,7 @@ static void test_register_user(void)
33393339
CreateDirectoryA("msitest", NULL);
33403340
create_file("msitest\\maximus", 500);
33413341

3342-
create_database(msifile, pp_tables, sizeof(pp_tables) / sizeof(msi_table));
3342+
create_database(msifile, pp_tables, ARRAY_SIZE(pp_tables));
33433343

33443344
if (is_wow64)
33453345
access |= KEY_WOW64_64KEY;
@@ -3433,7 +3433,7 @@ static void test_process_components(void)
34333433
CreateDirectoryA("msitest", NULL);
34343434
create_file("msitest\\maximus", 500);
34353435

3436-
create_database(msifile, ppc_tables, sizeof(ppc_tables) / sizeof(msi_table));
3436+
create_database(msifile, ppc_tables, ARRAY_SIZE(ppc_tables));
34373437

34383438
if (is_wow64)
34393439
access |= KEY_WOW64_64KEY;
@@ -3581,7 +3581,7 @@ static void test_publish(void)
35813581
CreateDirectoryA("msitest", NULL);
35823582
create_file("msitest\\maximus", 500);
35833583

3584-
create_database(msifile, pp_tables, sizeof(pp_tables) / sizeof(msi_table));
3584+
create_database(msifile, pp_tables, ARRAY_SIZE(pp_tables));
35853585

35863586
MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL);
35873587

@@ -4155,7 +4155,7 @@ static void test_publish_sourcelist(void)
41554155
CreateDirectoryA("msitest", NULL);
41564156
create_file("msitest\\maximus", 500);
41574157

4158-
create_database(msifile, pp_tables, sizeof(pp_tables) / sizeof(msi_table));
4158+
create_database(msifile, pp_tables, ARRAY_SIZE(pp_tables));
41594159

41604160
MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL);
41614161

@@ -4355,7 +4355,7 @@ static void test_remove_files(void)
43554355
create_file("msitest\\helium", 500);
43564356
create_file("msitest\\lithium", 500);
43574357

4358-
create_database(msifile, rem_tables, sizeof(rem_tables) / sizeof(msi_table));
4358+
create_database(msifile, rem_tables, ARRAY_SIZE(rem_tables));
43594359

43604360
MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL);
43614361

@@ -4512,7 +4512,7 @@ static void test_move_files(void)
45124512
create_file("bur", 100);
45134513
create_file("bird", 100);
45144514

4515-
create_database(msifile, mov_tables, sizeof(mov_tables) / sizeof(msi_table));
4515+
create_database(msifile, mov_tables, ARRAY_SIZE(mov_tables));
45164516

45174517
MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL);
45184518

@@ -4633,7 +4633,7 @@ static void test_duplicate_files(void)
46334633

46344634
CreateDirectoryA("msitest", NULL);
46354635
create_file("msitest\\maximus", 500);
4636-
create_database(msifile, df_tables, sizeof(df_tables) / sizeof(msi_table));
4636+
create_database(msifile, df_tables, ARRAY_SIZE(df_tables));
46374637

46384638
MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL);
46394639

@@ -4676,7 +4676,7 @@ static void test_write_registry_values(void)
46764676

46774677
CreateDirectoryA("msitest", NULL);
46784678

4679-
create_database(msifile, wrv_tables, sizeof(wrv_tables) / sizeof(msi_table));
4679+
create_database(msifile, wrv_tables, ARRAY_SIZE(wrv_tables));
46804680

46814681
MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL);
46824682

@@ -4842,7 +4842,7 @@ static void test_envvar(void)
48424842
return;
48434843
}
48444844

4845-
create_database(msifile, env_tables, sizeof(env_tables) / sizeof(msi_table));
4845+
create_database(msifile, env_tables, ARRAY_SIZE(env_tables));
48464846

48474847
res = RegCreateKeyExA(HKEY_CURRENT_USER, "Environment", 0, NULL, 0, KEY_ALL_ACCESS, NULL, &env, NULL);
48484848
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
@@ -4951,7 +4951,7 @@ static void test_create_remove_folder(void)
49514951
CreateDirectoryA("msitest\\second", NULL);
49524952
create_file("msitest\\first\\one.txt", 1000);
49534953
create_file("msitest\\second\\two.txt", 1000);
4954-
create_database(msifile, cf_tables, sizeof(cf_tables) / sizeof(msi_table));
4954+
create_database(msifile, cf_tables, ARRAY_SIZE(cf_tables));
49554955

49564956
MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL);
49574957

@@ -5031,7 +5031,7 @@ static void test_start_stop_services(void)
50315031
CloseServiceHandle(scm);
50325032

50335033
create_test_files();
5034-
create_database(msifile, sss_tables, sizeof(sss_tables) / sizeof(msi_table));
5034+
create_database(msifile, sss_tables, ARRAY_SIZE(sss_tables));
50355035

50365036
MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL);
50375037

@@ -5131,7 +5131,7 @@ static void test_delete_services(void)
51315131
if (!service) return;
51325132

51335133
create_test_files();
5134-
create_database(msifile, sds_tables, sizeof(sds_tables) / sizeof(msi_table));
5134+
create_database(msifile, sds_tables, ARRAY_SIZE(sds_tables));
51355135

51365136
MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL);
51375137

@@ -5193,7 +5193,7 @@ static void test_install_services(void)
51935193
}
51945194

51955195
create_test_files();
5196-
create_database(msifile, sis_tables, sizeof(sis_tables) / sizeof(msi_table));
5196+
create_database(msifile, sis_tables, ARRAY_SIZE(sis_tables));
51975197

51985198
MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL);
51995199

@@ -5270,7 +5270,7 @@ static void test_self_registration(void)
52705270

52715271
create_test_files();
52725272
extract_resource("selfreg.dll", "TESTDLL", "msitest\\selfreg.dll");
5273-
create_database(msifile, sr_tables, sizeof(sr_tables) / sizeof(msi_table));
5273+
create_database(msifile, sr_tables, ARRAY_SIZE(sr_tables));
52745274

52755275
MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL);
52765276

@@ -5318,7 +5318,7 @@ static void test_register_font(void)
53185318

53195319
create_test_files();
53205320
create_file("msitest\\font.ttf", 1000);
5321-
create_database(msifile, font_tables, sizeof(font_tables) / sizeof(msi_table));
5321+
create_database(msifile, font_tables, ARRAY_SIZE(font_tables));
53225322

53235323
if (is_wow64)
53245324
access |= KEY_WOW64_64KEY;
@@ -5368,7 +5368,7 @@ static void test_validate_product_id(void)
53685368
}
53695369

53705370
create_test_files();
5371-
create_database(msifile, vp_tables, sizeof(vp_tables) / sizeof(msi_table));
5371+
create_database(msifile, vp_tables, ARRAY_SIZE(vp_tables));
53725372

53735373
MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL);
53745374

@@ -5427,7 +5427,7 @@ static void test_install_remove_odbc(void)
54275427
create_file("msitest\\ODBCtranslator.dll", 1000);
54285428
create_file("msitest\\ODBCtranslator2.dll", 1000);
54295429
create_file("msitest\\ODBCsetup.dll", 1000);
5430-
create_database(msifile, odbc_tables, sizeof(odbc_tables) / sizeof(msi_table));
5430+
create_database(msifile, odbc_tables, ARRAY_SIZE(odbc_tables));
54315431

54325432
MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL);
54335433

@@ -5513,7 +5513,7 @@ static void test_register_typelib(void)
55135513

55145514
create_test_files();
55155515
extract_resource("typelib.tlb", "TYPELIB", "msitest\\typelib.dll");
5516-
create_database(msifile, tl_tables, sizeof(tl_tables) / sizeof(msi_table));
5516+
create_database(msifile, tl_tables, ARRAY_SIZE(tl_tables));
55175517

55185518
MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL);
55195519

@@ -5556,7 +5556,7 @@ static void test_create_remove_shortcut(void)
55565556

55575557
create_test_files();
55585558
create_file("msitest\\target.txt", 1000);
5559-
create_database(msifile, crs_tables, sizeof(crs_tables) / sizeof(msi_table));
5559+
create_database(msifile, crs_tables, ARRAY_SIZE(crs_tables));
55605560

55615561
MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL);
55625562

@@ -5605,7 +5605,7 @@ static void test_publish_components(void)
56055605

56065606
create_test_files();
56075607
create_file("msitest\\english.txt", 1000);
5608-
create_database(msifile, pub_tables, sizeof(pub_tables) / sizeof(msi_table));
5608+
create_database(msifile, pub_tables, ARRAY_SIZE(pub_tables));
56095609

56105610
MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL);
56115611

@@ -5691,7 +5691,7 @@ static void test_remove_duplicate_files(void)
56915691
create_file("msitest\\original.txt", 1000);
56925692
create_file("msitest\\original2.txt", 1000);
56935693
create_file("msitest\\original3.txt", 1000);
5694-
create_database(msifile, rd_tables, sizeof(rd_tables) / sizeof(msi_table));
5694+
create_database(msifile, rd_tables, ARRAY_SIZE(rd_tables));
56955695

56965696
MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL);
56975697

@@ -5739,7 +5739,7 @@ static void test_find_related_products(void)
57395739

57405740
create_test_files();
57415741
create_file("msitest\\product.txt", 1000);
5742-
create_database(msifile, frp_tables, sizeof(frp_tables) / sizeof(msi_table));
5742+
create_database(msifile, frp_tables, ARRAY_SIZE(frp_tables));
57435743

57445744
MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL);
57455745

@@ -5783,7 +5783,7 @@ static void test_ini_values(void)
57835783

57845784
create_test_files();
57855785
create_file("msitest\\inifile.txt", 1000);
5786-
create_database(msifile, ini_tables, sizeof(ini_tables) / sizeof(msi_table));
5786+
create_database(msifile, ini_tables, ARRAY_SIZE(ini_tables));
57875787

57885788
lstrcpyA(inifile, PROG_FILES_DIR);
57895789
lstrcatA(inifile, "\\msitest");
@@ -5844,7 +5844,7 @@ static void test_register_class_info(void)
58445844

58455845
create_test_files();
58465846
create_file("msitest\\class.txt", 1000);
5847-
create_database(msifile, rci_tables, sizeof(rci_tables) / sizeof(msi_table));
5847+
create_database(msifile, rci_tables, ARRAY_SIZE(rci_tables));
58485848

58495849
MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL);
58505850

@@ -5909,7 +5909,7 @@ static void test_register_extension_info(void)
59095909

59105910
create_test_files();
59115911
create_file("msitest\\extension.txt", 1000);
5912-
create_database(msifile, rei_tables, sizeof(rei_tables) / sizeof(msi_table));
5912+
create_database(msifile, rei_tables, ARRAY_SIZE(rei_tables));
59135913

59145914
MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL);
59155915

@@ -5961,7 +5961,7 @@ static void test_register_progid_info(void)
59615961

59625962
create_test_files();
59635963
create_file("msitest\\progid.txt", 1000);
5964-
create_database(msifile, rpi_tables, sizeof(rpi_tables) / sizeof(msi_table));
5964+
create_database(msifile, rpi_tables, ARRAY_SIZE(rpi_tables));
59655965

59665966
res = RegCreateKeyExA(HKEY_CLASSES_ROOT, "Winetest.Orphaned", 0, NULL, 0,
59675967
KEY_ALL_ACCESS, NULL, &hkey, NULL);
@@ -6087,7 +6087,7 @@ static void test_register_mime_info(void)
60876087

60886088
create_test_files();
60896089
create_file("msitest\\mime.txt", 1000);
6090-
create_database(msifile, rmi_tables, sizeof(rmi_tables) / sizeof(msi_table));
6090+
create_database(msifile, rmi_tables, ARRAY_SIZE(rmi_tables));
60916091

60926092
MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL);
60936093

@@ -6185,7 +6185,7 @@ static void test_publish_assemblies(void)
61856185
create_file_data("msitest\\manifest_local.txt", manifest_local, 0);
61866186
create_file("msitest\\application_win32.txt", 1000);
61876187
create_file("msitest\\application_dotnet.txt", 1000);
6188-
create_database(msifile, pa_tables, sizeof(pa_tables) / sizeof(msi_table));
6188+
create_database(msifile, pa_tables, ARRAY_SIZE(pa_tables));
61896189

61906190
MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL);
61916191

@@ -6343,7 +6343,7 @@ static void test_remove_existing_products(void)
63436343

63446344
create_test_files();
63456345
create_file("msitest\\rep.txt", 1000);
6346-
create_database(msifile, rep_tables, sizeof(rep_tables) / sizeof(msi_table));
6346+
create_database(msifile, rep_tables, ARRAY_SIZE(rep_tables));
63476347

63486348
MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL);
63496349

0 commit comments

Comments
 (0)