wine-commits March 2017

wine-commits@winehq.org

2 participants
717 discussions

Jacek Caban : xmllite/tests: Added read_value_char helper.
by Alexandre Julliard 30 Mar '17

30 Mar '17

Module: wine Branch: master Commit: 82f95833495a23f9ac331e86a8502ad1b7fd9f73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82f95833495a23f9ac331e86a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 29 19:46:48 2017 +0200 xmllite/tests: Added read_value_char helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/reader.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 497b31d..0e8a0f5 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -347,6 +347,19 @@ static const WCHAR *_reader_qname(IXmlReader *reader, const char *expect, unsign return str; } +#define read_value_char(a,b) _read_value_char(a,b,__LINE__) +static void _read_value_char(IXmlReader *reader, WCHAR expected_char, unsigned line) +{ + WCHAR c = 0xffff; + UINT count = 0; + HRESULT hr; + + hr = IXmlReader_ReadValueChunk(reader, &c, 1, &count); + ok_(__FILE__,line)(hr == S_OK, "got %08x\n", hr); + ok_(__FILE__,line)(count == 1, "got %u\n", c); + ok_(__FILE__,line)(c == expected_char, "got %x\n", c); +} + typedef struct _testinput { IUnknown IUnknown_iface; @@ -1611,19 +1624,8 @@ static void test_readvaluechunk(void) ok(hr == S_OK, "got %08x\n", hr); ok(type == XmlNodeType_Comment, "type = %u\n", type); - c = 0; - b = 0; - hr = IXmlReader_ReadValueChunk(reader, &b, 1, &c); - ok(hr == S_OK, "got %08x\n", hr); - ok(c == 1, "got %u\n", c); - ok(b == ' ', "got %x\n", b); - - c = 0; - b = 0xffff; - hr = IXmlReader_ReadValueChunk(reader, &b, 1, &c); - ok(hr == S_OK, "got %08x\n", hr); - ok(c == 1, "got %u\n", c); - ok(b == 'c', "got %x\n", b); + read_value_char(reader, ' '); + read_value_char(reader, 'c'); /* portion read as chunk is skipped from resulting node value */ reader_value(reader, "omment1 "); @@ -1644,9 +1646,7 @@ static void test_readvaluechunk(void) reader_value(reader, "omment1 "); /* read comment2 */ - hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK, "got %08x\n", hr); - ok(type == XmlNodeType_Comment, "type = %u\n", type); + read_node(reader, XmlNodeType_Comment); c = 0xdeadbeef; hr = IXmlReader_ReadValueChunk(reader, buf, 0, &c);

1 0

Jacek Caban : xmllite/tests: Added reader_qname helper.
by Alexandre Julliard 30 Mar '17

30 Mar '17

Module: wine Branch: master Commit: e9913db3885045785a78418198a4801999d333c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9913db3885045785a7841819… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 29 19:46:38 2017 +0200 xmllite/tests: Added reader_qname helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/reader.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 2da5d00..497b31d 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -333,6 +333,20 @@ static const WCHAR *_reader_namespace(unsigned line, IXmlReader *reader, const c return str; } +#define reader_qname(a,b) _reader_qname(a,b,__LINE__) +static const WCHAR *_reader_qname(IXmlReader *reader, const char *expect, unsigned line) +{ + const WCHAR *str = (void*)0xdeadbeef; + ULONG len = 0xdeadbeef; + HRESULT hr; + + hr = IXmlReader_GetQualifiedName(reader, &str, &len); + ok_(__FILE__,line)(hr == S_OK, "GetQualifiedName returned %08x\n", hr); + ok_(__FILE__,line)(len == lstrlenW(str), "len = %u\n", len); + ok_(__FILE__,line)(!strcmp_wa(str, expect), "name = %s\n", wine_dbgstr_w(str)); + return str; +} + typedef struct _testinput { IUnknown IUnknown_iface; @@ -810,7 +824,6 @@ static void test_reader_depth(IXmlReader *reader, UINT depth, UINT brk, int line static void test_read_xmldeclaration(void) { - static const WCHAR xmlW[] = {'x','m','l',0}; static const struct { WCHAR name[12]; @@ -956,10 +969,7 @@ todo_wine { reader_value(reader, ""); reader_name(reader, "xml"); - val = NULL; - hr = IXmlReader_GetQualifiedName(reader, &val, NULL); - ok(hr == S_OK, "expected S_OK, got %08x\n", hr); - ok(!lstrcmpW(val, xmlW), "got %s\n", wine_dbgstr_w(val)); + reader_qname(reader, "xml"); /* check attributes */ next_attribute(reader); @@ -1067,7 +1077,6 @@ static void test_read_comment(void) if (hr == S_OK) { const WCHAR *str; - UINT len; ok(type == XmlNodeType_Comment, "got %d for %s\n", type, test->xml); @@ -1078,12 +1087,7 @@ static void test_read_comment(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); - len = 1; - str = NULL; - hr = IXmlReader_GetQualifiedName(reader, &str, &len); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(len == 0, "got %u\n", len); - ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); + reader_qname(reader, ""); str = NULL; hr = IXmlReader_GetQualifiedName(reader, &str, NULL);

1 0

Jacek Caban : xmllite/tests: Added reader_namespace helper.
by Alexandre Julliard 30 Mar '17

30 Mar '17

Module: wine Branch: master Commit: a69aa5fc38a4a0d6788d337137aaacaec2346ce7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a69aa5fc38a4a0d6788d33713… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 29 19:46:28 2017 +0200 xmllite/tests: Added reader_namespace helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/reader.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 9e27e9c..2da5d00 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -319,6 +319,20 @@ static const WCHAR *_reader_prefix(unsigned line, IXmlReader *reader, const char return str; } +#define reader_namespace(a,b) _reader_namespace(__LINE__,a,b) +static const WCHAR *_reader_namespace(unsigned line, IXmlReader *reader, const char *expect) +{ + const WCHAR *str = (void*)0xdeadbeef; + ULONG len = 0xdeadbeef; + HRESULT hr; + + hr = IXmlReader_GetNamespaceUri(reader, &str, &len); + ok_(__FILE__,line)(hr == S_OK, "GetNamespaceUri returned %08x\n", hr); + ok_(__FILE__,line)(len == lstrlenW(str), "len = %u\n", len); + ok_(__FILE__,line)(!strcmp_wa(str, expect), "namespace = %s\n", wine_dbgstr_w(str)); + return str; +} + typedef struct _testinput { IUnknown IUnknown_iface; @@ -2086,9 +2100,8 @@ static void test_namespaceuri(void) type = ~0u; while (IXmlReader_Read(reader, &type) == S_OK) { - const WCHAR *uri, *local, *qname; + const WCHAR *local, *qname; UINT length, length2; - WCHAR *uriW; ok(type == XmlNodeType_Element || type == XmlNodeType_Text || @@ -2123,14 +2136,7 @@ static void test_namespaceuri(void) ok(length2 > 0, "Unexpected qualified name length\n"); } - uri = NULL; - hr = IXmlReader_GetNamespaceUri(reader, &uri, NULL); - ok(hr == S_OK, "S_OK, got %08x\n", hr); - ok(uri != NULL, "Unexpected NULL uri pointer\n"); - - uriW = a2w(uri_tests[i].uri[j]); - ok(!lstrcmpW(uriW, uri), "%s: uri %s\n", wine_dbgstr_w(local), wine_dbgstr_w(uri)); - free_str(uriW); + reader_namespace(reader, uri_tests[i].uri[j]); j++; }

1 0

Jacek Caban : xmllite/tests: Added reader_prefix helper.
by Alexandre Julliard 30 Mar '17

30 Mar '17

Module: wine Branch: master Commit: b581c8f68b9f9bb3cd6f0f66e4c0e502bb2b60a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b581c8f68b9f9bb3cd6f0f66e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 29 19:46:19 2017 +0200 xmllite/tests: Added reader_prefix helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/reader.c | 44 ++++++++++++++++++-------------------------- 1 file changed, 18 insertions(+), 26 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 46e839e..9e27e9c 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -305,6 +305,20 @@ static const WCHAR *_reader_name(unsigned line, IXmlReader *reader, const char * return str; } +#define reader_prefix(a,b) _reader_prefix(__LINE__,a,b) +static const WCHAR *_reader_prefix(unsigned line, IXmlReader *reader, const char *expect) +{ + const WCHAR *str = (void*)0xdeadbeef; + ULONG len = 0xdeadbeef; + HRESULT hr; + + hr = IXmlReader_GetPrefix(reader, &str, &len); + ok_(__FILE__,line)(hr == S_OK, "GetPrefix returned %08x\n", hr); + ok_(__FILE__,line)(len == lstrlenW(str), "len = %u\n", len); + ok_(__FILE__,line)(!strcmp_wa(str, expect), "prefix = %s\n", wine_dbgstr_w(str)); + return str; +} + typedef struct _testinput { IUnknown IUnknown_iface; @@ -1982,9 +1996,7 @@ static void test_prefix(void) ok(hr == S_OK, "S_OK, got %08x\n", hr); for (i = 0; i < sizeof(prefix_tests)/sizeof(prefix_tests[0]); i++) { - const WCHAR *prefix; XmlNodeType type; - WCHAR *expected; IStream *stream; stream = create_stream_on_data(prefix_tests[i].xml, strlen(prefix_tests[i].xml) + 1); @@ -1995,12 +2007,7 @@ static void test_prefix(void) ok(hr == S_OK, "Read() failed, %#x\n", hr); ok(type == XmlNodeType_Element, "Unexpected node type %d.\n", type); - expected = a2w(prefix_tests[i].prefix1); - hr = IXmlReader_GetPrefix(reader, &prefix, NULL); - ok(hr == S_OK, "GetPrefix() failed, %#x.\n", hr); - ok(!lstrcmpW(prefix, expected), "Unexpected prefix %s, expected %s.\n", wine_dbgstr_w(prefix), - wine_dbgstr_w(expected)); - free_str(expected); + reader_prefix(reader, prefix_tests[i].prefix1); hr = IXmlReader_MoveToFirstAttribute(reader); ok(hr == S_OK, "MoveToFirstAttribute() failed, %#x.\n", hr); @@ -2009,12 +2016,7 @@ static void test_prefix(void) ok(hr == S_OK, "GetNodeType() failed, %#x.\n", hr); ok(type == XmlNodeType_Attribute, "Unexpected node type %d.\n", type); - expected = a2w(prefix_tests[i].prefix2); - hr = IXmlReader_GetPrefix(reader, &prefix, NULL); - ok(hr == S_OK, "GetPrefix() failed, %#x.\n", hr); - ok(!lstrcmpW(prefix, expected), "Unexpected prefix %s, expected %s.\n", wine_dbgstr_w(prefix), - wine_dbgstr_w(expected)); - free_str(expected); + reader_prefix(reader, prefix_tests[i].prefix2); next_attribute(reader); @@ -2022,23 +2024,13 @@ static void test_prefix(void) ok(hr == S_OK, "GetNodeType() failed, %#x.\n", hr); ok(type == XmlNodeType_Attribute, "Unexpected node type %d.\n", type); - expected = a2w(prefix_tests[i].prefix3); - hr = IXmlReader_GetPrefix(reader, &prefix, NULL); - ok(hr == S_OK, "GetPrefix() failed, %#x.\n", hr); - ok(!lstrcmpW(prefix, expected), "Unexpected prefix %s, expected %s.\n", wine_dbgstr_w(prefix), - wine_dbgstr_w(expected)); - free_str(expected); + reader_prefix(reader, prefix_tests[i].prefix3); /* back to the element, check prefix */ hr = IXmlReader_MoveToElement(reader); ok(hr == S_OK, "MoveToElement() failed, %#x.\n", hr); - expected = a2w(prefix_tests[i].prefix1); - hr = IXmlReader_GetPrefix(reader, &prefix, NULL); - ok(hr == S_OK, "GetPrefix() failed, %#x.\n", hr); - ok(!lstrcmpW(prefix, expected), "Unexpected prefix %s, expected %s.\n", wine_dbgstr_w(prefix), - wine_dbgstr_w(expected)); - free_str(expected); + reader_prefix(reader, prefix_tests[i].prefix1); IStream_Release(stream); }

1 0

Jacek Caban : xmllite/tests: Added reader_name helper.
by Alexandre Julliard 30 Mar '17

30 Mar '17

Module: wine Branch: master Commit: c84f494c5f2ffcf43126c5c032312e2f16b4cbf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c84f494c5f2ffcf43126c5c03… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 29 19:46:02 2017 +0200 xmllite/tests: Added reader_name helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/reader.c | 92 ++++++++++++--------------------------------- 1 file changed, 24 insertions(+), 68 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index d2752df..46e839e 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -291,6 +291,20 @@ static const WCHAR *_reader_value(unsigned line, IXmlReader *reader, const char return str; } +#define reader_name(a,b) _reader_name(__LINE__,a,b) +static const WCHAR *_reader_name(unsigned line, IXmlReader *reader, const char *expect) +{ + const WCHAR *str = (void*)0xdeadbeef; + ULONG len = 0xdeadbeef; + HRESULT hr; + + hr = IXmlReader_GetLocalName(reader, &str, &len); + ok_(__FILE__,line)(hr == S_OK, "GetLocalName returned %08x\n", hr); + ok_(__FILE__,line)(len == lstrlenW(str), "len = %u\n", len); + ok_(__FILE__,line)(!strcmp_wa(str, expect), "name = %s\n", wine_dbgstr_w(str)); + return str; +} + typedef struct _testinput { IUnknown IUnknown_iface; @@ -769,7 +783,6 @@ static void test_reader_depth(IXmlReader *reader, UINT depth, UINT brk, int line static void test_read_xmldeclaration(void) { static const WCHAR xmlW[] = {'x','m','l',0}; - static const WCHAR RegistrationInfoW[] = {'R','e','g','i','s','t','r','a','t','i','o','n','I','n','f','o',0}; static const struct { WCHAR name[12]; @@ -913,11 +926,7 @@ todo_wine { ok(!ret, "element should not be empty\n"); reader_value(reader, ""); - - val = NULL; - hr = IXmlReader_GetLocalName(reader, &val, NULL); - ok(hr == S_OK, "expected S_OK, got %08x\n", hr); - ok(!lstrcmpW(val, xmlW), "got %s\n", wine_dbgstr_w(val)); + reader_name(reader, "xml"); val = NULL; hr = IXmlReader_GetQualifiedName(reader, &val, NULL); @@ -949,10 +958,7 @@ todo_wine { ok(ret, "element should be empty\n"); reader_value(reader, ""); - - hr = IXmlReader_GetLocalName(reader, &val, NULL); - ok(hr == S_OK, "expected S_OK, got %08x\n", hr); - ok(!lstrcmpW(val, RegistrationInfoW), "got %s\n", wine_dbgstr_w(val)); + reader_name(reader, "RegistrationInfo"); type = -1; hr = IXmlReader_Read(reader, &type); @@ -1037,12 +1043,7 @@ static void test_read_comment(void) ok(type == XmlNodeType_Comment, "got %d for %s\n", type, test->xml); - len = 1; - str = NULL; - hr = IXmlReader_GetLocalName(reader, &str, &len); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(len == 0, "got %u\n", len); - ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); + reader_name(reader, ""); str = NULL; hr = IXmlReader_GetLocalName(reader, &str, NULL); @@ -1114,14 +1115,7 @@ static void test_read_pi(void) ok(type == XmlNodeType_ProcessingInstruction, "got %d for %s\n", type, test->xml); - len = 0; - str = NULL; - hr = IXmlReader_GetLocalName(reader, &str, &len); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(len == strlen(test->name), "got %u\n", len); - str_exp = a2w(test->name); - ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); - free_str(str_exp); + reader_name(reader, test->name); len = 0; str = NULL; @@ -1218,8 +1212,6 @@ static const char test_public_dtd[] = static void test_read_public_dtd(void) { static const WCHAR dtdnameW[] = {'t','e','s','t','d','t','d',0}; - static const WCHAR sysW[] = {'S','Y','S','T','E','M',0}; - static const WCHAR pubW[] = {'P','U','B','L','I','C',0}; IXmlReader *reader; const WCHAR *str; XmlNodeType type; @@ -1252,13 +1244,7 @@ static void test_read_public_dtd(void) ok(hr == S_OK, "got %08x\n", hr); ok(type == XmlNodeType_Attribute, "got %d\n", type); - len = 0; - str = NULL; - hr = IXmlReader_GetLocalName(reader, &str, &len); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(len == lstrlenW(pubW), "got %u\n", len); - ok(!lstrcmpW(str, pubW), "got %s\n", wine_dbgstr_w(str)); - + reader_name(reader, "PUBLIC"); reader_value(reader, "pubid"); next_attribute(reader); @@ -1268,13 +1254,7 @@ static void test_read_public_dtd(void) ok(hr == S_OK, "got %08x\n", hr); ok(type == XmlNodeType_Attribute, "got %d\n", type); - len = 0; - str = NULL; - hr = IXmlReader_GetLocalName(reader, &str, &len); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(len == lstrlenW(sysW), "got %u\n", len); - ok(!lstrcmpW(str, sysW), "got %s\n", wine_dbgstr_w(str)); - + reader_name(reader, "SYSTEM"); reader_value(reader, "externalid uri"); hr = IXmlReader_MoveToElement(reader); @@ -1307,7 +1287,6 @@ static const char test_system_dtd[] = static void test_read_system_dtd(void) { static const WCHAR dtdnameW[] = {'t','e','s','t','d','t','d',0}; - static const WCHAR sysW[] = {'S','Y','S','T','E','M',0}; IXmlReader *reader; const WCHAR *str; XmlNodeType type; @@ -1340,13 +1319,7 @@ static void test_read_system_dtd(void) ok(hr == S_OK, "got %08x\n", hr); ok(type == XmlNodeType_Attribute, "got %d\n", type); - len = 0; - str = NULL; - hr = IXmlReader_GetLocalName(reader, &str, &len); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(len == lstrlenW(sysW), "got %u\n", len); - ok(!lstrcmpW(str, sysW), "got %s\n", wine_dbgstr_w(str)); - + reader_name(reader, "SYSTEM"); reader_value(reader, "externalid uri"); hr = IXmlReader_MoveToElement(reader); @@ -1727,12 +1700,7 @@ static void test_read_cdata(void) ok(type == XmlNodeType_CDATA, "got %d for %s\n", type, test->xml); - len = 1; - str = NULL; - hr = IXmlReader_GetLocalName(reader, &str, &len); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(len == 0, "got %u\n", len); - ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); + reader_name(reader, ""); str = NULL; hr = IXmlReader_GetLocalName(reader, &str, NULL); @@ -1805,12 +1773,7 @@ static void test_read_text(void) ok(type == XmlNodeType_Text, "got %d for %s\n", type, test->xml); - len = 1; - str = NULL; - hr = IXmlReader_GetLocalName(reader, &str, &len); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(len == 0, "got %u\n", len); - ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); + reader_name(reader, ""); str = NULL; hr = IXmlReader_GetLocalName(reader, &str, NULL); @@ -1948,14 +1911,7 @@ static void test_read_attribute(void) hr = IXmlReader_MoveToFirstAttribute(reader); ok(hr == S_OK, "got 0x%08x\n", hr); - len = 1; - str = NULL; - hr = IXmlReader_GetLocalName(reader, &str, &len); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(len == strlen(test->name), "got %u\n", len); - str_exp = a2w(test->name); - ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); - free_str(str_exp); + reader_name(reader, test->name); len = 1; str = NULL;

1 0

Jacek Caban : xmllite/tests: Added reader_value helper.
by Alexandre Julliard 30 Mar '17

30 Mar '17

Module: wine Branch: master Commit: 0c91228bb005b486cd49aac99606a21908e82fe0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c91228bb005b486cd49aac99… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 29 19:45:50 2017 +0200 xmllite/tests: Added reader_value helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/reader.c | 152 ++++++++++---------------------------------- 1 file changed, 33 insertions(+), 119 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0c91228bb005b486cd49a…

1 0

Jacek Caban : xmllite/tests: Added next_attribute helper.
by Alexandre Julliard 30 Mar '17

30 Mar '17

Module: wine Branch: master Commit: 99d2d5e44c79ce5fe1a51d769b7ddc992ead5855 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99d2d5e44c79ce5fe1a51d769… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 29 19:45:32 2017 +0200 xmllite/tests: Added next_attribute helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/reader.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 53b975b..263a6a5 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -248,6 +248,14 @@ static void _read_node(unsigned line, IXmlReader *reader, XmlNodeType expected_t ok_(__FILE__,line)(type == expected_type, "read type %d, expected %d\n", type, expected_type); } +#define next_attribute(a) _next_attribute(__LINE__,a) +static void _next_attribute(unsigned line, IXmlReader *reader) +{ + HRESULT hr; + hr = IXmlReader_MoveToNextAttribute(reader); + ok_(__FILE__,line)(hr == S_OK, "MoveToNextAttribute returned %08x\n", hr); +} + static void test_read_state(IXmlReader *reader, XmlReadState expected, XmlReadState exp_broken, int line) { @@ -803,8 +811,7 @@ static void test_read_xmldeclaration(void) ok(*val == 0, "got %s\n", wine_dbgstr_w(val)); /* check attributes */ - hr = IXmlReader_MoveToNextAttribute(reader); - ok(hr == S_OK, "got %08x\n", hr); + next_attribute(reader); TEST_DEPTH(reader, 1); @@ -816,10 +823,8 @@ static void test_read_xmldeclaration(void) TEST_READER_POSITION2(reader, 1, 7, ~0u, 55); /* try to move from last attribute */ - hr = IXmlReader_MoveToNextAttribute(reader); - ok(hr == S_OK, "got %08x\n", hr); - hr = IXmlReader_MoveToNextAttribute(reader); - ok(hr == S_OK, "got %08x\n", hr); + next_attribute(reader); + next_attribute(reader); hr = IXmlReader_MoveToNextAttribute(reader); ok(hr == S_FALSE, "got %08x\n", hr); @@ -910,8 +915,7 @@ todo_wine { ok(!lstrcmpW(val, xmlW), "got %s\n", wine_dbgstr_w(val)); /* check attributes */ - hr = IXmlReader_MoveToNextAttribute(reader); - ok(hr == S_OK, "expected S_OK, got %08x\n", hr); + next_attribute(reader); type = -1; hr = IXmlReader_GetNodeType(reader, &type); @@ -1281,8 +1285,7 @@ static void test_read_public_dtd(void) ok(len == lstrlenW(pubvalW), "got %u\n", len); ok(!lstrcmpW(str, pubvalW), "got %s\n", wine_dbgstr_w(str)); - hr = IXmlReader_MoveToNextAttribute(reader); - ok(hr == S_OK, "got %08x\n", hr); + next_attribute(reader); type = XmlNodeType_None; hr = IXmlReader_GetNodeType(reader, &type); @@ -2143,8 +2146,7 @@ static void test_prefix(void) wine_dbgstr_w(expected)); free_str(expected); - hr = IXmlReader_MoveToNextAttribute(reader); - ok(hr == S_OK, "MoveToNextAttribute() failed, %#x.\n", hr); + next_attribute(reader); hr = IXmlReader_GetNodeType(reader, &type); ok(hr == S_OK, "GetNodeType() failed, %#x.\n", hr); @@ -2593,12 +2595,10 @@ static void test_reader_position(void) ok(type == XmlNodeType_Element, "got type %d\n", type); TEST_READER_POSITION2(reader, 1, 2, ~0u, 34); - hr = IXmlReader_MoveToNextAttribute(reader); - ok(hr == S_OK, "got %08x\n", hr); + next_attribute(reader); TEST_READER_POSITION2(reader, 1, 6, ~0u, 34); - hr = IXmlReader_MoveToNextAttribute(reader); - ok(hr == S_OK, "got %08x\n", hr); + next_attribute(reader); TEST_READER_POSITION2(reader, 1, 24, ~0u, 34); hr = IXmlReader_MoveToElement(reader);

1 0

Jacek Caban : xmllite/tests: Added read_node helper.
by Alexandre Julliard 30 Mar '17

30 Mar '17

Module: wine Branch: master Commit: 8e344469bce5d7928e83968eea1055bb9984e1d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e344469bce5d7928e83968ee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 29 19:45:25 2017 +0200 xmllite/tests: Added read_node helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/reader.c | 62 ++++++++++++++++++--------------------------- 1 file changed, 24 insertions(+), 38 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 40873a4..53b975b 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -234,6 +234,20 @@ static void _set_input_string(unsigned line, IXmlReader *reader, const char *xml IStream_Release(stream); } +#define read_node(a,b) _read_node(__LINE__,a,b) +static void _read_node(unsigned line, IXmlReader *reader, XmlNodeType expected_type) +{ + XmlNodeType type; + HRESULT hr; + + hr = IXmlReader_Read(reader, &type); + if (expected_type == XmlNodeType_None) + ok_(__FILE__,line)(hr == S_FALSE, "Read returned %08x, expected S_FALSE\n", hr); + else + ok_(__FILE__,line)(hr == S_OK, "Read returned %08x\n", hr); + ok_(__FILE__,line)(type == expected_type, "read type %d, expected %d\n", type, expected_type); +} + static void test_read_state(IXmlReader *reader, XmlReadState expected, XmlReadState exp_broken, int line) { @@ -776,11 +790,8 @@ static void test_read_xmldeclaration(void) TEST_READER_POSITION(reader, 0, 0); - type = -1; - hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(type == XmlNodeType_XmlDeclaration, - "Expected XmlNodeType_XmlDeclaration, got %s\n", type_to_str(type)); + read_node(reader, XmlNodeType_XmlDeclaration); + /* new version 1.2.x and 1.3.x properly update position for <?xml ?> */ TEST_READER_POSITION2(reader, 1, 3, ~0u, 55); @@ -873,10 +884,7 @@ todo_wine { hr = IXmlReader_SetInput(reader, (IUnknown *)stream); ok(hr == S_OK, "expected S_OK, got %08x\n", hr); - type = -1; - hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK, "expected S_OK, got %08x\n", hr); - ok(type == XmlNodeType_XmlDeclaration, "expected XmlDeclaration, got %s\n", type_to_str(type)); + read_node(reader, XmlNodeType_XmlDeclaration); TEST_READER_POSITION2(reader, 1, 3, ~0u, 21); TEST_READER_STATE(reader, XmlReadState_Interactive); @@ -915,10 +923,7 @@ todo_wine { hr = IXmlReader_MoveToNextAttribute(reader); ok(hr == S_FALSE, "expected S_FALSE, got %08x\n", hr); - type = -1; - hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK, "expected S_OK, got %08x\n", hr); - ok(type == XmlNodeType_Element, "expected Element, got %s\n", type_to_str(type)); + read_node(reader, XmlNodeType_Element); TEST_READER_POSITION2(reader, 1, 23, ~0u, 40); TEST_READER_STATE(reader, XmlReadState_Interactive); @@ -1193,7 +1198,6 @@ static void test_read_full(void) struct nodes_test *test = &misc_test; IXmlReader *reader; const WCHAR *value; - XmlNodeType type; ULONG len; HRESULT hr; int i; @@ -1204,16 +1208,9 @@ static void test_read_full(void) set_input_string(reader, test->xml); i = 0; - type = ~0u; do { - hr = IXmlReader_Read(reader, &type); - if (test->nodes[i].type != XmlNodeType_None) - ok(hr == S_OK, "Read returned %08x\n", hr); - else - ok(hr == S_FALSE, "Read returned %08x\n", hr); - - ok(type == test->nodes[i].type, "%d: got wrong type %d, expected %d\n", i, type, test->nodes[i].type); + read_node(reader, test->nodes[i].type); len = 0xdeadbeef; hr = IXmlReader_GetValue(reader, &value, &len); @@ -1255,10 +1252,7 @@ static void test_read_public_dtd(void) hr = IXmlReader_SetInput(reader, (IUnknown*)stream); ok(hr == S_OK, "got %08x\n", hr); - type = XmlNodeType_None; - hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK, "got 0x%8x\n", hr); - ok(type == XmlNodeType_DocumentType, "got type %d\n", type); + read_node(reader, XmlNodeType_DocumentType); count = 0; hr = IXmlReader_GetAttributeCount(reader, &count); @@ -1358,10 +1352,7 @@ static void test_read_system_dtd(void) hr = IXmlReader_SetInput(reader, (IUnknown*)stream); ok(hr == S_OK, "got %08x\n", hr); - type = XmlNodeType_None; - hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK, "got 0x%8x\n", hr); - ok(type == XmlNodeType_DocumentType, "got type %d\n", type); + read_node(reader, XmlNodeType_DocumentType); count = 0; hr = IXmlReader_GetAttributeCount(reader, &count); @@ -1409,10 +1400,8 @@ todo_wine { ok(len == lstrlenW(dtdnameW), "got %u\n", len); ok(!lstrcmpW(str, dtdnameW), "got %s\n", wine_dbgstr_w(str)); } - type = XmlNodeType_None; - hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK, "got 0x%8x\n", hr); - ok(type == XmlNodeType_Comment, "got type %d\n", type); + + read_node(reader, XmlNodeType_Comment); IStream_Release(stream); IXmlReader_Release(reader); @@ -1589,10 +1578,7 @@ static void test_read_element(void) /* start/end tag mismatch */ set_input_string(reader, "<a></b>"); - type = XmlNodeType_None; - hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK, "got %08x\n", hr); - ok(type == XmlNodeType_Element, "got %d\n", type); + read_node(reader, XmlNodeType_Element); type = XmlNodeType_Element; hr = IXmlReader_Read(reader, &type);

1 0

Henri Verbeet : wined3d: Pass a wined3d_rendertarget_view to surface_cpu_blt_colour_fill().
by Alexandre Julliard 30 Mar '17

30 Mar '17

Module: wine Branch: master Commit: 493502b54bfcca8f9210bfe72f0c548612848018 URL: http://source.winehq.org/git/wine.git/?a=commit;h=493502b54bfcca8f9210bfe72… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 29 23:17:31 2017 +0200 wined3d: Pass a wined3d_rendertarget_view to surface_cpu_blt_colour_fill(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6c6f26f..e6a635f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3258,28 +3258,28 @@ release: return hr; } -static HRESULT surface_cpu_blt_colour_fill(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_box *box, DWORD c) +static HRESULT surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view, + const struct wined3d_box *box, const struct wined3d_color *colour) { - struct wined3d_resource *resource = &texture->resource; unsigned int x, y, w, h, bpp; struct wined3d_map_desc map; BYTE *row; + DWORD c; - TRACE("texture %p, sub_resource_idx %u, box %s, colour 0x%08x.\n", - texture, sub_resource_idx, debug_box(box), c); + TRACE("view %p, box %s, colour %s.\n", view, debug_box(box), debug_color(colour)); - if (resource->format_flags & WINED3DFMT_FLAG_BLOCKS) + if (view->format_flags & WINED3DFMT_FLAG_BLOCKS) { - FIXME("Not implemented for format %s.\n", debug_d3dformat(resource->format->id)); + FIXME("Not implemented for format %s.\n", debug_d3dformat(view->format->id)); return E_NOTIMPL; } - bpp = resource->format->byte_count; + c = wined3d_format_convert_from_float(view->format, colour); + bpp = view->format->byte_count; w = box->right - box->left; h = box->bottom - box->top; - wined3d_resource_map(resource, sub_resource_idx, &map, box, 0); + wined3d_resource_map(view->resource, view->sub_resource_idx, &map, box, 0); switch (bpp) { @@ -3317,7 +3317,7 @@ static HRESULT surface_cpu_blt_colour_fill(struct wined3d_texture *texture, unsi default: FIXME("Not implemented for bpp %u.\n", bpp); - wined3d_resource_unmap(resource, sub_resource_idx); + wined3d_resource_unmap(view->resource, view->sub_resource_idx); return WINED3DERR_NOTAVAILABLE; } @@ -3327,7 +3327,7 @@ static HRESULT surface_cpu_blt_colour_fill(struct wined3d_texture *texture, unsi row += map.row_pitch; memcpy(row, map.data, w * bpp); } - wined3d_resource_unmap(resource, sub_resource_idx); + wined3d_resource_unmap(view->resource, view->sub_resource_idx); return WINED3D_OK; } @@ -3336,11 +3336,8 @@ static HRESULT cpu_blit_color_fill(struct wined3d_device *device, struct wined3d const RECT *rect, const struct wined3d_color *color) { const struct wined3d_box box = {rect->left, rect->top, rect->right, rect->bottom, 0, 1}; - DWORD c; - c = wined3d_format_convert_from_float(view->format, color); - return surface_cpu_blt_colour_fill(texture_from_resource(view->resource), - view->sub_resource_idx, &box, c); + return surface_cpu_blt_colour_fill(view, &box, color); } static HRESULT cpu_blit_depth_fill(struct wined3d_device *device, @@ -3349,7 +3346,6 @@ static HRESULT cpu_blit_depth_fill(struct wined3d_device *device, { const struct wined3d_box box = {rect->left, rect->top, rect->right, rect->bottom, 0, 1}; struct wined3d_color color = {depth, 0.0f, 0.0f, 0.0f}; - DWORD c; if (clear_flags != WINED3DCLEAR_ZBUFFER) { @@ -3357,9 +3353,7 @@ static HRESULT cpu_blit_depth_fill(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } - c = wined3d_format_convert_from_float(view->format, &color); - return surface_cpu_blt_colour_fill(texture_from_resource(view->resource), - view->sub_resource_idx, &box, c); + return surface_cpu_blt_colour_fill(view, &box, &color); } static void cpu_blit_blit_surface(struct wined3d_device *device, enum wined3d_blit_op op,

1 0

Henri Verbeet : wined3d: Remove WINED3D_BLT_DEPTH_FILL support from wined3d_texture_blit().
by Alexandre Julliard 30 Mar '17

30 Mar '17

Module: wine Branch: master Commit: e19e15d317c4a69449767fdf9676e74d28b74bca URL: http://source.winehq.org/git/wine.git/?a=commit;h=e19e15d317c4a69449767fdf9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 29 23:17:30 2017 +0200 wined3d: Remove WINED3D_BLT_DEPTH_FILL support from wined3d_texture_blit(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 85 +++++------------------------------------- dlls/wined3d/texture.c | 26 ++++++------- dlls/wined3d/utils.c | 59 ----------------------------- dlls/wined3d/wined3d_private.h | 2 - include/wine/wined3d.h | 4 +- 5 files changed, 21 insertions(+), 155 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e19e15d317c4a69449767…

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2017