Skip to content

Commit 7836be0

Browse files
tkreuzertkreuzer
committed
[MSXML3_WINETEST] Partly revert previous hacks
1 parent 02185fb commit 7836be0

3 files changed

Lines changed: 2 additions & 90 deletions

File tree

‎modules/rostests/winetests/msxml3/domdoc.c‎

Lines changed: 2 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -4167,17 +4167,11 @@ static void test_removeNamedItem(void)
41674167
removed_node = NULL;
41684168
hr = IXMLDOMNamedNodeMap_removeNamedItem( map, _bstr_("ns:b"), &removed_node );
41694169
ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
4170-
#ifdef __REACTOS__
4171-
if (removed_node != NULL)
4172-
#endif
41734170
IXMLDOMNode_Release( removed_node );
41744171

41754172
removed_node = NULL;
41764173
hr = IXMLDOMNamedNodeMap_removeNamedItem( map, _bstr_("xml:lang"), &removed_node );
41774174
ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
4178-
#ifdef __REACTOS__
4179-
if (removed_node != NULL)
4180-
#endif
41814175
IXMLDOMNode_Release( removed_node );
41824176

41834177
len = -1;
@@ -7383,9 +7377,6 @@ static void test_TransformWithLoadingLocalFile(void)
73837377

73847378
hr = IXMLDOMDocument_QueryInterface(xsl, &IID_IXMLDOMNode, (void**)&pNode );
73857379
ok(hr == S_OK, "Unexpected hr %#lx.\n", hr );
7386-
#ifdef __REACTOS__ // RTC failure in libxslt!xmlXPathCompOpEval
7387-
if (!is_reactos())
7388-
#endif
73897380
if(hr == S_OK)
73907381
{
73917382
/* This will load the temp file via the XSL */
@@ -8359,9 +8350,6 @@ static void test_get_ownerDocument(void)
83598350
IXMLDOMDocument_Release(doc2);
83608351
IXMLDOMDocument_Release(doc3);
83618352
IXMLDOMDocument2_Release(doc);
8362-
#if defined(__REACTOS__) && defined(_M_AMD64)
8363-
if (!is_reactos())
8364-
#endif
83658353
IXMLDOMDocument2_Release(doc_owner);
83668354
free_bstrs();
83678355
}
@@ -8926,9 +8914,6 @@ static void test_createProcessingInstruction(void)
89268914
ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
89278915
ok(item != NULL, "got NULL\n");
89288916

8929-
#ifdef __REACTOS__
8930-
if (item != NULL) {
8931-
#endif
89328917
hr = IXMLDOMNode_get_nodeName(item, &bstr);
89338918
ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
89348919
ok(!lstrcmpW(bstr, L"encoding"), "got %s\n", wine_dbgstr_w(bstr));
@@ -8940,9 +8925,6 @@ static void test_createProcessingInstruction(void)
89408925
ok(V_VT(&var) == VT_BSTR, "got %u\n", V_VT(&var));
89418926
ok(!lstrcmpW(V_BSTR(&var), L"windows-1252"), "got %s\n", wine_dbgstr_w(V_BSTR(&var)));
89428927
VariantClear(&var);
8943-
#ifdef __REACTOS__
8944-
}
8945-
#endif
89468928

89478929
IXMLDOMNamedNodeMap_Release(node_map);
89488930
IXMLDOMNode_Release(node);
@@ -9587,18 +9569,13 @@ static void test_insertBefore(void)
95879569

95889570
doc = create_document(&IID_IXMLDOMDocument);
95899571
doc3 = create_document(&IID_IXMLDOMDocument);
9590-
#ifdef __REACTOS__
9591-
if (!is_reactos()) {
9592-
#endif
9572+
95939573
/* NULL to document */
95949574
V_VT(&v) = VT_NULL;
95959575
node = (void*)0xdeadbeef;
95969576
hr = IXMLDOMDocument_insertBefore(doc, NULL, v, &node);
95979577
ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
95989578
ok(node == (void*)0xdeadbeef, "got %p\n", node);
9599-
#ifdef __REACTOS__
9600-
}
9601-
#endif
96029579

96039580
/* document to document */
96049581
V_VT(&v) = VT_NULL;
@@ -9769,18 +9746,12 @@ static void test_insertBefore(void)
97699746

97709747
todo_wine EXPECT_REF(elem2, 2);
97719748

9772-
#ifdef __REACTOS__
9773-
if (!is_reactos()) {
9774-
#endif
97759749
/* NULL to element */
97769750
V_VT(&v) = VT_NULL;
97779751
node = (void*)0xdeadbeef;
97789752
hr = IXMLDOMElement_insertBefore(elem1, NULL, v, &node);
97799753
ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
97809754
ok(node == (void*)0xdeadbeef, "got %p\n", node);
9781-
#ifdef __REACTOS__
9782-
}
9783-
#endif
97849755

97859756
/* document to element */
97869757
V_VT(&v) = VT_DISPATCH;
@@ -10787,19 +10758,13 @@ static void test_selection(void)
1078710758
VariantClear(&v[0]);
1078810759

1078910760
/* IEnumVARIANT_Next makes the IXMLDOMSelection cursor advance one step more */
10790-
#ifdef __REACTOS__
10791-
if (!is_reactos()) {
10792-
#endif
1079310761
hr = IXMLDOMSelection_nextNode(selection, &node);
1079410762
ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
1079510763
hr = IXMLDOMNode_get_nodeName(node, &name);
1079610764
ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
1079710765
ok(!lstrcmpW(name, L"d"), "got node name %s\n", wine_dbgstr_w(name));
1079810766
SysFreeString(name);
1079910767
IXMLDOMNode_Release(node);
10800-
#ifdef __REACTOS__
10801-
}
10802-
#endif
1080310768

1080410769
/* The IEnumVARIANT cursor is still at position '2', */
1080510770
/* therefore attempting to fetch 4 elements yields 'c' and 'd' */
@@ -10810,9 +10775,6 @@ static void test_selection(void)
1081010775
ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr);
1081110776
ok(ret == 2, "got %ld, expected 2\n", ret);
1081210777

10813-
#ifdef __REACTOS__
10814-
if (!is_reactos()) {
10815-
#endif
1081610778
ok(V_VT(&v[0]) == VT_DISPATCH, "got var type %d\n", V_VT(&v[0]));
1081710779
hr = IDispatch_QueryInterface(V_DISPATCH(&v[0]), &IID_IXMLDOMNode, (void**)&node);
1081810780
ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
@@ -10821,9 +10783,6 @@ static void test_selection(void)
1082110783
ok(!lstrcmpW(name, L"c"), "got node name %s\n", wine_dbgstr_w(name));
1082210784
SysFreeString(name);
1082310785
IXMLDOMNode_Release(node);
10824-
#ifdef __REACTOS__
10825-
}
10826-
#endif
1082710786

1082810787
ok(V_VT(&v[1]) == VT_DISPATCH, "got var type %d\n", V_VT(&v[1]));
1082910788
hr = IDispatch_QueryInterface(V_DISPATCH(&v[1]), &IID_IXMLDOMNode, (void**)&node);
@@ -10843,9 +10802,6 @@ static void test_selection(void)
1084310802

1084410803
IXMLDOMSelection_Release(selection);
1084510804
IXMLDOMNodeList_Release(list);
10846-
#ifdef __REACTOS__
10847-
if (!is_reactos())
10848-
#endif
1084910805
IXMLDOMDocument_Release(doc);
1085010806

1085110807
free_bstrs();
@@ -10903,9 +10859,6 @@ static void _test_doc_load_from_path(IXMLDOMDocument *doc, const char *path,
1090310859
ok_(__FILE__, line)(hr == S_OK, "Unexpected hr %#lx.\n", hr);
1090410860

1090510861
/* Create another instance for the same document, check url */
10906-
#ifdef __REACTOS__
10907-
if (!is_reactos()) {
10908-
#endif
1090910862
hr = IXMLDOMElement_get_ownerDocument(elem, &doc2);
1091010863
ok_(__FILE__, line)(hr == S_OK, "Failed to get owner document, hr %#lx.\n", hr);
1091110864

@@ -10916,9 +10869,6 @@ static void _test_doc_load_from_path(IXMLDOMDocument *doc, const char *path,
1091610869
IXMLDOMDocument_Release(doc2);
1091710870
IXMLDOMElement_Release(elem);
1091810871
SysFreeString(url2);
10919-
#ifdef __REACTOS__
10920-
}
10921-
#endif
1092210872
SysFreeString(url);
1092310873
}
1092410874

@@ -12715,9 +12665,6 @@ static void test_get_namespaces(void)
1271512665
hr = IEnumVARIANT_Reset(enumv);
1271612666
ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
1271712667

12718-
#ifdef __REACTOS__
12719-
memset(v, 0, sizeof(v));
12720-
#endif
1272112668
V_VT(&v[1]) = VT_EMPTY;
1272212669
V_VT(&v[0]) = VT_EMPTY;
1272312670
hr = IEnumVARIANT_Next(enumv, 2, v, &fetched);
@@ -13343,19 +13290,13 @@ static void test_namedmap_newenum(void)
1334313290
ok(!lstrcmpW(str, L"attr3"), "got node name %s\n", wine_dbgstr_w(str));
1334413291
SysFreeString(str);
1334513292
IXMLDOMNode_Release(node);
13346-
#ifdef __REACTOS__
13347-
if (!is_reactos()) {
13348-
#endif
1334913293
hr = IDispatch_QueryInterface(V_DISPATCH(&v[1]), &IID_IXMLDOMNode, (void**)&node);
1335013294
ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
1335113295
hr = IXMLDOMNode_get_nodeName(node, &str);
1335213296
ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
1335313297
ok(!lstrcmpW(str, L"attr4"), "got node name %s\n", wine_dbgstr_w(str));
1335413298
SysFreeString(str);
1335513299
IXMLDOMNode_Release(node);
13356-
#ifdef __REACTOS__
13357-
}
13358-
#endif
1335913300
VariantClear(&v[1]);
1336013301
VariantClear(&v[0]);
1336113302
IEnumVARIANT_Release(enum2);
@@ -13944,13 +13885,7 @@ static void test_namespaces_as_attributes(void)
1394413885
item = NULL;
1394513886
hr = IXMLDOMNamedNodeMap_get_item(map, i, &item);
1394613887
ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
13947-
#ifdef __REACTOS__
13948-
if (item == NULL)
13949-
{
13950-
ok(0, "item is NULL at index %ld\n", i);
13951-
continue;
13952-
}
13953-
#endif
13888+
1395413889
str = NULL;
1395513890
hr = IXMLDOMNode_get_nodeName(item, &str);
1395613891
ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);

‎modules/rostests/winetests/msxml3/schema.c‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -475,19 +475,13 @@ static void test_schema_refs(void)
475475
hr = IXMLDOMSchemaCollection_get(cache, NULL, &node);
476476
ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
477477
ok(node != NULL, "%p\n", node);
478-
#ifdef __REACTOS__
479-
if (node != NULL)
480-
#endif
481478
IXMLDOMNode_Release(node);
482479

483480
node = NULL;
484481
str = SysAllocString(L"");
485482
hr = IXMLDOMSchemaCollection_get(cache, str, &node);
486483
ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
487484
ok(node != NULL, "%p\n", node);
488-
#ifdef __REACTOS__
489-
if (node != NULL)
490-
#endif
491485
IXMLDOMNode_Release(node);
492486
SysFreeString(str);
493487

@@ -1024,9 +1018,6 @@ static void test_collection_content(void)
10241018
ok(bstr != NULL && *bstr, "expected non-empty string\n");
10251019
content[i] = bstr;
10261020

1027-
#ifdef __REACTOS__
1028-
if (bstr == NULL) continue;
1029-
#endif
10301021
for (j = 0; j < i; ++j)
10311022
ok(wcscmp(content[j], bstr), "got duplicate entry\n");
10321023
}
@@ -1416,18 +1407,10 @@ static void test_XDR_datatypes(void)
14161407
break;
14171408
case VT_R8:
14181409
if (!wcscmp(ptr->typename, L"float"))
1419-
#ifdef __REACTOS__ // crash due to printf bug, will be fixed with import of wine's msvcrt
1420-
ok(V_R8(&v) == 3.14159, "got 0x%llx\n", *(unsigned long long*)&V_R8(&v));
1421-
#else
14221410
ok(V_R8(&v) == 3.14159, "got %f\n", V_R8(&v));
1423-
#endif
14241411
else
14251412
todo_wine
1426-
#ifdef __REACTOS__ // crash due to printf bug, will be fixed with import of wine's msvcrt
1427-
ok(V_R8(&v) == 3.14159265358979323846, "got 0x%llx\n", *(unsigned long long*)&V_R8(&v));
1428-
#else
14291413
ok(V_R8(&v) == 3.14159265358979323846, "got %.20f\n", V_R8(&v));
1430-
#endif
14311414
break;
14321415
case VT_UI1:
14331416
ok(V_UI1(&v) == 0xFF, "got %02x\n", V_UI1(&v));

‎modules/rostests/winetests/msxml3/xmldoc.c‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -796,9 +796,6 @@ static void test_xmlelem_collection(void)
796796
ok(V_VT(&var[3]) == 0xcccc, "Expected invalid, got %x\n", V_VT(&var[3]));
797797
ok(num_vars == 2, "Unexpected count %ld.\n", num_vars);
798798

799-
#ifdef __REACTOS__
800-
if (V_VT(&var[1]) == VT_DISPATCH) {
801-
#endif
802799
hr = IDispatch_QueryInterface(V_DISPATCH(&var[1]), &IID_IXMLElement, (LPVOID *)&child);
803800
ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
804801
ok(child != NULL, "Expected non-NULL child\n");
@@ -815,9 +812,6 @@ static void test_xmlelem_collection(void)
815812
ok(!lstrcmpW(str, L"NAME"), "Expected NAME\n");
816813
SysFreeString(str);
817814
IXMLElement_Release(child);
818-
#ifdef __REACTOS__
819-
}
820-
#endif
821815

822816
/* <Number>1234</Number> */
823817
V_VT(&vIndex) = VT_I4;

0 commit comments

Comments
 (0)