Skip to content

Commit 694121b

Browse files
winesynclearn-more
winesync
authored and
learn-more
committed
[WINESYNC] msi/tests: Remove workarounds for Windows 2000.
Signed-off-by: Hans Leidekker <[email protected]> Signed-off-by: Alexandre Julliard <[email protected]> wine commit id 71f755820642777261c54d3fe6a04ba202059340 by Hans Leidekker <[email protected]>
1 parent 2b92436 commit 694121b

File tree

1 file changed

+28
-56
lines changed
  • modules/rostests/winetests/msi

1 file changed

+28
-56
lines changed

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

Lines changed: 28 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1318,8 +1318,7 @@ static void test_MsiQueryProductState(void)
13181318
state = MsiQueryProductStateA("{6700E8CF-95AB-4D9C-BC2C-15840DEA7A5D}");
13191319
error = GetLastError();
13201320
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
1321-
ok(error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* win2k */,
1322-
"expected ERROR_SUCCESS, got %u\n", error);
1321+
ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
13231322

13241323
/* same length as guid, but random */
13251324
SetLastError(0xdeadbeef);
@@ -1334,8 +1333,7 @@ static void test_MsiQueryProductState(void)
13341333
state = MsiQueryProductStateA(prodcode);
13351334
error = GetLastError();
13361335
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
1337-
ok(error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* win2k */,
1338-
"expected ERROR_SUCCESS, got %u\n", error);
1336+
ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
13391337

13401338
lstrcpyA(keypath, "Software\\Microsoft\\Installer\\Products\\");
13411339
lstrcatA(keypath, prod_squashed);
@@ -1348,8 +1346,7 @@ static void test_MsiQueryProductState(void)
13481346
state = MsiQueryProductStateA(prodcode);
13491347
error = GetLastError();
13501348
ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
1351-
ok(error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* win2k */,
1352-
"expected ERROR_SUCCESS, got %u\n", error);
1349+
ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
13531350

13541351
lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\");
13551352
lstrcatA(keypath, prodcode);
@@ -1370,8 +1367,7 @@ static void test_MsiQueryProductState(void)
13701367
state = MsiQueryProductStateA(prodcode);
13711368
error = GetLastError();
13721369
ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
1373-
ok(error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* win2k */,
1374-
"expected ERROR_SUCCESS, got %u\n", error);
1370+
ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
13751371

13761372
data = 1;
13771373
res = RegSetValueExA(localkey, "WindowsInstaller", 0, REG_DWORD, (const BYTE *)&data, sizeof(DWORD));
@@ -1382,8 +1378,7 @@ static void test_MsiQueryProductState(void)
13821378
state = MsiQueryProductStateA(prodcode);
13831379
error = GetLastError();
13841380
ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
1385-
ok(error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* win2k */,
1386-
"expected ERROR_SUCCESS, got %u\n", error);
1381+
ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
13871382

13881383
RegDeleteValueA(localkey, "WindowsInstaller");
13891384
delete_key(localkey, "", access & KEY_WOW64_64KEY);
@@ -1409,8 +1404,7 @@ static void test_MsiQueryProductState(void)
14091404
state = MsiQueryProductStateA(prodcode);
14101405
error = GetLastError();
14111406
ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
1412-
ok(error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* win2k */,
1413-
"expected ERROR_SUCCESS, got %u\n", error);
1407+
ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
14141408

14151409
res = RegCreateKeyExA(localkey, "InstallProperties", 0, NULL, 0, access, NULL, &props, NULL);
14161410
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
@@ -1420,8 +1414,7 @@ static void test_MsiQueryProductState(void)
14201414
state = MsiQueryProductStateA(prodcode);
14211415
error = GetLastError();
14221416
ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
1423-
ok(error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* win2k */,
1424-
"expected ERROR_SUCCESS, got %u\n", error);
1417+
ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
14251418

14261419
data = 1;
14271420
res = RegSetValueExA(props, "WindowsInstaller", 0, REG_DWORD, (const BYTE *)&data, sizeof(DWORD));
@@ -1445,8 +1438,7 @@ static void test_MsiQueryProductState(void)
14451438
return;
14461439
}
14471440
ok(state == INSTALLSTATE_DEFAULT, "Expected INSTALLSTATE_DEFAULT, got %d\n", state);
1448-
ok(error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* win2k */,
1449-
"expected ERROR_SUCCESS, got %u\n", error);
1441+
ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
14501442

14511443
data = 2;
14521444
res = RegSetValueExA(props, "WindowsInstaller", 0, REG_DWORD, (const BYTE *)&data, sizeof(DWORD));
@@ -1457,8 +1449,7 @@ static void test_MsiQueryProductState(void)
14571449
state = MsiQueryProductStateA(prodcode);
14581450
error = GetLastError();
14591451
ok(state == INSTALLSTATE_DEFAULT, "Expected INSTALLSTATE_DEFAULT, got %d\n", state);
1460-
ok(error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* win2k */,
1461-
"expected ERROR_SUCCESS, got %u\n", error);
1452+
ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
14621453

14631454
RegDeleteKeyA(userkey, "");
14641455

@@ -1467,8 +1458,7 @@ static void test_MsiQueryProductState(void)
14671458
state = MsiQueryProductStateA(prodcode);
14681459
error = GetLastError();
14691460
ok(state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state);
1470-
ok(error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* win2k */,
1471-
"expected ERROR_SUCCESS, got %u\n", error);
1461+
ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
14721462

14731463
RegDeleteValueA(props, "WindowsInstaller");
14741464
delete_key(props, "", access & KEY_WOW64_64KEY);
@@ -1689,8 +1679,7 @@ static void test_MsiQueryFeatureState(void)
16891679
state = MsiQueryFeatureStateA("{6700E8CF-95AB-4D9C-BC2C-15840DEA7A5D}", "feature");
16901680
error = GetLastError();
16911681
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
1692-
ok(error == ERROR_SUCCESS || broken(error == ERROR_ALREADY_EXISTS) /* win2k */,
1693-
"expected ERROR_SUCCESS, got %u\n", error);
1682+
ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
16941683

16951684
/* same length as guid, but random */
16961685
SetLastError(0xdeadbeef);
@@ -1711,16 +1700,14 @@ static void test_MsiQueryFeatureState(void)
17111700
state = MsiQueryFeatureStateA(prodcode, "");
17121701
error = GetLastError();
17131702
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
1714-
ok(error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* win2k */,
1715-
"expected ERROR_SUCCESS, got %u\n", error);
1703+
ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
17161704

17171705
/* feature key does not exist yet */
17181706
SetLastError(0xdeadbeef);
17191707
state = MsiQueryFeatureStateA(prodcode, "feature");
17201708
error = GetLastError();
17211709
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
1722-
ok(error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* win2k */,
1723-
"expected ERROR_SUCCESS, got %u\n", error);
1710+
ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
17241711

17251712
/* MSIINSTALLCONTEXT_USERUNMANAGED */
17261713

@@ -1735,8 +1722,7 @@ static void test_MsiQueryFeatureState(void)
17351722
state = MsiQueryFeatureStateA(prodcode, "feature");
17361723
error = GetLastError();
17371724
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
1738-
ok(error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* win2k */,
1739-
"expected ERROR_SUCCESS, got %u\n", error);
1725+
ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
17401726

17411727
res = RegSetValueExA(userkey, "feature", 0, REG_SZ, (const BYTE *)"", 2);
17421728
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
@@ -1746,8 +1732,7 @@ static void test_MsiQueryFeatureState(void)
17461732
state = MsiQueryFeatureStateA(prodcode, "feature");
17471733
error = GetLastError();
17481734
ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
1749-
ok(error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* win2k */,
1750-
"expected ERROR_SUCCESS, got %u\n", error);
1735+
ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
17511736

17521737
lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\");
17531738
lstrcatA(keypath, usersid);
@@ -1771,8 +1756,7 @@ static void test_MsiQueryFeatureState(void)
17711756
state = MsiQueryFeatureStateA(prodcode, "feature");
17721757
error = GetLastError();
17731758
ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
1774-
ok(error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* win2k */,
1775-
"expected ERROR_SUCCESS, got %u\n", error);
1759+
ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
17761760

17771761
res = RegSetValueExA(localkey, "feature", 0, REG_SZ, (const BYTE *)"aaaaaaaaaaaaaaaaaaa", 20);
17781762
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
@@ -1781,8 +1765,7 @@ static void test_MsiQueryFeatureState(void)
17811765
state = MsiQueryFeatureStateA(prodcode, "feature");
17821766
error = GetLastError();
17831767
ok(state == INSTALLSTATE_BADCONFIG, "Expected INSTALLSTATE_BADCONFIG, got %d\n", state);
1784-
ok(error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* win2k */,
1785-
"expected ERROR_SUCCESS, got %u\n", error);
1768+
ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
17861769

17871770
res = RegSetValueExA(localkey, "feature", 0, REG_SZ, (const BYTE *)"aaaaaaaaaaaaaaaaaaaa", 21);
17881771
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
@@ -1791,8 +1774,7 @@ static void test_MsiQueryFeatureState(void)
17911774
state = MsiQueryFeatureStateA(prodcode, "feature");
17921775
error = GetLastError();
17931776
ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
1794-
ok(error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* win2k */,
1795-
"expected ERROR_SUCCESS, got %u\n", error);
1777+
ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
17961778

17971779
res = RegSetValueExA(localkey, "feature", 0, REG_SZ, (const BYTE *)"aaaaaaaaaaaaaaaaaaaaa", 22);
17981780
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
@@ -1801,8 +1783,7 @@ static void test_MsiQueryFeatureState(void)
18011783
state = MsiQueryFeatureStateA(prodcode, "feature");
18021784
error = GetLastError();
18031785
ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
1804-
ok(error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* win2k */,
1805-
"expected ERROR_SUCCESS, got %u\n", error);
1786+
ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
18061787

18071788
res = RegSetValueExA(localkey, "feature", 0, REG_SZ, (const BYTE *)comp_base85, 41);
18081789
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
@@ -1811,8 +1792,7 @@ static void test_MsiQueryFeatureState(void)
18111792
state = MsiQueryFeatureStateA(prodcode, "feature");
18121793
error = GetLastError();
18131794
ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
1814-
ok(error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* win2k */,
1815-
"expected ERROR_SUCCESS, got %u\n", error);
1795+
ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
18161796

18171797
lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\");
18181798
lstrcatA(keypath, usersid);
@@ -1834,8 +1814,7 @@ static void test_MsiQueryFeatureState(void)
18341814
state = MsiQueryFeatureStateA(prodcode, "feature");
18351815
error = GetLastError();
18361816
ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
1837-
ok(error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* win2k */,
1838-
"expected ERROR_SUCCESS, got %u\n", error);
1817+
ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
18391818

18401819
res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"", 1);
18411820
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
@@ -1844,8 +1823,7 @@ static void test_MsiQueryFeatureState(void)
18441823
state = MsiQueryFeatureStateA(prodcode, "feature");
18451824
error = GetLastError();
18461825
ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
1847-
ok(error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* win2k */,
1848-
"expected ERROR_SUCCESS, got %u\n", error);
1826+
ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
18491827

18501828
res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"apple", 6);
18511829
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
@@ -1854,8 +1832,7 @@ static void test_MsiQueryFeatureState(void)
18541832
state = MsiQueryFeatureStateA(prodcode, "feature");
18551833
error = GetLastError();
18561834
ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
1857-
ok(error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* win2k */,
1858-
"expected ERROR_SUCCESS, got %u\n", error);
1835+
ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
18591836

18601837
res = RegSetValueExA(compkey2, prod_squashed, 0, REG_SZ, (const BYTE *)"orange", 7);
18611838
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
@@ -1865,8 +1842,7 @@ static void test_MsiQueryFeatureState(void)
18651842
state = MsiQueryFeatureStateA(prodcode, "feature");
18661843
error = GetLastError();
18671844
ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state);
1868-
ok(error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* win2k */,
1869-
"expected ERROR_SUCCESS, got %u\n", error);
1845+
ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
18701846

18711847
res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"01\\", 4);
18721848
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
@@ -1876,8 +1852,7 @@ static void test_MsiQueryFeatureState(void)
18761852
state = MsiQueryFeatureStateA(prodcode, "feature");
18771853
error = GetLastError();
18781854
ok(state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state);
1879-
ok(error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* win2k */,
1880-
"expected ERROR_SUCCESS, got %u\n", error);
1855+
ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
18811856

18821857
res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"01", 3);
18831858
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
@@ -1887,8 +1862,7 @@ static void test_MsiQueryFeatureState(void)
18871862
state = MsiQueryFeatureStateA(prodcode, "feature");
18881863
error = GetLastError();
18891864
ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state);
1890-
ok(error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* win2k */,
1891-
"expected ERROR_SUCCESS, got %u\n", error);
1865+
ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
18921866

18931867
res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"01a", 4);
18941868
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
@@ -1898,8 +1872,7 @@ static void test_MsiQueryFeatureState(void)
18981872
state = MsiQueryFeatureStateA(prodcode, "feature");
18991873
error = GetLastError();
19001874
ok(state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state);
1901-
ok(error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* win2k */,
1902-
"expected ERROR_SUCCESS, got %u\n", error);
1875+
ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
19031876

19041877
res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"01", 3);
19051878
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
@@ -1909,8 +1882,7 @@ static void test_MsiQueryFeatureState(void)
19091882
state = MsiQueryFeatureStateA(prodcode, "feature");
19101883
error = GetLastError();
19111884
ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state);
1912-
ok(error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* win2k */,
1913-
"expected ERROR_SUCCESS, got %u\n", error);
1885+
ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error);
19141886

19151887
RegDeleteValueA(compkey, prod_squashed);
19161888
RegDeleteValueA(compkey2, prod_squashed);

0 commit comments

Comments
 (0)