Nikolay Sivov : msxml3/tests: Simplify test error path.
Alexandre Julliard
julliard at winehq.org
Mon Jan 8 16:08:07 CST 2018
Module: wine
Branch: master
Commit: 3e8acbac874a138829422a955b5700e3a0a01a39
URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e8acbac874a138829422a955b5700e3a0a01a39
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Mon Jan 8 17:20:35 2018 +0300
msxml3/tests: Simplify test error path.
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/msxml3/tests/schema.c | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c
index ee84b92..48d1c5b 100644
--- a/dlls/msxml3/tests/schema.c
+++ b/dlls/msxml3/tests/schema.c
@@ -666,26 +666,26 @@ static void test_collection_refs(void)
LONG length;
schema1 = create_document(&IID_IXMLDOMDocument2);
- schema2 = create_document(&IID_IXMLDOMDocument2);
- schema3 = create_document(&IID_IXMLDOMDocument2);
+ ok(schema1 != NULL, "Failed to create a document.\n");
cache1 = create_cache(&IID_IXMLDOMSchemaCollection);
- cache2 = create_cache(&IID_IXMLDOMSchemaCollection);
- cache3 = create_cache(&IID_IXMLDOMSchemaCollection);
+ ok(cache1 != NULL, "Failed to create schema collection.\n");
- if (!schema1 || !schema2 || !schema3 || !cache1 || !cache2 || !cache3)
+ if (!schema1 || !cache1)
{
- if (schema1) IXMLDOMDocument2_Release(schema1);
- if (schema2) IXMLDOMDocument2_Release(schema2);
- if (schema3) IXMLDOMDocument2_Release(schema3);
-
- if (cache1) IXMLDOMSchemaCollection_Release(cache1);
- if (cache2) IXMLDOMSchemaCollection_Release(cache2);
- if (cache3) IXMLDOMSchemaCollection_Release(cache2);
-
+ if (schema1)
+ IXMLDOMDocument2_Release(schema1);
+ if (cache1)
+ IXMLDOMSchemaCollection_Release(cache1);
return;
}
+ schema2 = create_document(&IID_IXMLDOMDocument2);
+ schema3 = create_document(&IID_IXMLDOMDocument2);
+
+ cache2 = create_cache(&IID_IXMLDOMSchemaCollection);
+ cache3 = create_cache(&IID_IXMLDOMSchemaCollection);
+
ole_check(IXMLDOMDocument2_loadXML(schema1, _bstr_(xdr_schema1_xml), &b));
ok(b == VARIANT_TRUE, "failed to load XML\n");
More information about the wine-cvs
mailing list