July 2013 - Wine-Commits - list.winehq.org

Rico Schüller : d3dx9: Improve shader constant table parsing.
by Alexandre Julliard July 22, 2013

July 22, 2013

Module: wine Branch: master Commit: e6e09eb465e2752cd2d4daed132635a157b87c82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6e09eb465e2752cd2d4daed1… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jul 22 14:35:23 2013 +0200 d3dx9: Improve shader constant table parsing. --- dlls/d3dx9_36/shader.c | 89 ++++++++++++++++++++++++++++------------------- 1 files changed, 53 insertions(+), 36 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 1d6a677..8b089d2 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -1554,58 +1554,63 @@ static HRESULT parse_ctab_constant_type(const char *ctab, DWORD typeoffset, stru } else { - WORD offsetdiff = 0; + WORD offsetdiff = type->Columns * type->Rows; + BOOL fail = FALSE; - switch (type->Class) + size = type->Columns * type->Rows; + + switch (regset) { - case D3DXPC_SCALAR: - case D3DXPC_VECTOR: - offsetdiff = 1; - size = 1; + case D3DXRS_BOOL: + fail = type->Class != D3DXPC_SCALAR && type->Class != D3DXPC_VECTOR + && type->Class != D3DXPC_MATRIX_ROWS && type->Class != D3DXPC_MATRIX_COLUMNS; break; - case D3DXPC_MATRIX_ROWS: - size = is_element ? type->Rows : max(type->Rows, type->Columns); - offsetdiff = type->Rows; - break; + case D3DXRS_FLOAT4: + case D3DXRS_INT4: + switch (type->Class) + { + case D3DXPC_VECTOR: + size = 1; + /* fall through */ + case D3DXPC_SCALAR: + offsetdiff = type->Rows * 4; + break; + + case D3DXPC_MATRIX_ROWS: + offsetdiff = type->Rows * 4; + size = is_element ? type->Rows : max(type->Rows, type->Columns); + break; - case D3DXPC_MATRIX_COLUMNS: - size = type->Columns; - offsetdiff = type->Columns; + case D3DXPC_MATRIX_COLUMNS: + offsetdiff = type->Columns * 4; + size = type->Columns; + break; + + default: + fail = TRUE; + break; + } break; - case D3DXPC_OBJECT: + case D3DXRS_SAMPLER: size = 1; + fail = type->Class != D3DXPC_OBJECT; break; default: - FIXME("Unhandled type class %s\n", debug_d3dxparameter_class(type->Class)); + fail = TRUE; break; } - /* offset in bytes => offsetdiff * components(4) * sizeof(DWORD) */ - if (offset) *offset += offsetdiff * 4 * 4; - - /* int and bool registerset have different sizes */ - if (regset == D3DXRS_INT4 || regset == D3DXRS_BOOL) + if (fail) { - switch (type->Class) - { - case D3DXPC_SCALAR: - case D3DXPC_VECTOR: - size = type->Columns; - break; - - case D3DXPC_MATRIX_ROWS: - case D3DXPC_MATRIX_COLUMNS: - size = 4 * type->Columns; - break; - - default: - FIXME("Unhandled type class %s\n", debug_d3dxparameter_class(type->Class)); - break; - } + FIXME("Unhandled register set %s, type class %s\n", debug_d3dxparameter_registerset(regset), + debug_d3dxparameter_class(type->Class)); } + + /* offset in bytes => offsetdiff * sizeof(DWORD) */ + if (offset) *offset += offsetdiff * 4; } constant->desc.RegisterCount = max(0, min(max - index, size)); @@ -1719,6 +1724,18 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(const DWORD *byte_code, DWORD flags, offset ? &offset : NULL, constant_info[i].Name, constant_info[i].RegisterSet); if (hr != D3D_OK) goto error; + + /* + * Set the register count, it may differ for D3DXRS_INT4, because somehow + * it makes the assumption that the register size is 1 instead of 4, so the + * count is 4 times bigger. This holds true only for toplevel shader + * constants. The count of elements and members is always based on a + * register size of 4. + */ + if (object->constants[i].desc.RegisterSet == D3DXRS_INT4) + { + object->constants[i].desc.RegisterCount = constant_info[i].RegisterCount; + } } *constant_table = &object->ID3DXConstantTable_iface;

1 0

Rico Schüller : d3dx9: Improve ID3DXConstantTable:: Set*().
by Alexandre Julliard July 22, 2013

July 22, 2013

Module: wine Branch: master Commit: 8231c8ef50ca26f9e9208ffe3db4563f9a77dc6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8231c8ef50ca26f9e9208ffe3… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jul 22 14:35:41 2013 +0200 d3dx9: Improve ID3DXConstantTable::Set*(). --- dlls/d3dx9_36/shader.c | 665 ++++++++++++++++++++++++------------------ dlls/d3dx9_36/tests/shader.c | 2 +- 2 files changed, 383 insertions(+), 284 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8231c8ef50ca26f9e9208…

1 0

Rico Schüller : d3dx9/tests: Add ID3DXConstantTable scalar test.
by Alexandre Julliard July 22, 2013

July 22, 2013

Module: wine Branch: master Commit: 0a2085f50227d3793df50e293982dbc89b2655ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a2085f50227d3793df50e293… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jul 22 14:35:47 2013 +0200 d3dx9/tests: Add ID3DXConstantTable scalar test. --- dlls/d3dx9_36/tests/shader.c | 606 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 606 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0a2085f50227d3793df50…

1 0

Alexandre Julliard : libwine: Compress code page tables by merging identical sequences.
by Alexandre Julliard July 22, 2013

July 22, 2013

1 0

Frédéric Delanoy : loader: Fix invalid groff in Polish wine manpage.
by Alexandre Julliard July 22, 2013

July 22, 2013

Module: wine Branch: master Commit: 67bc772bb931b148a0a7fb187f903dc4347a8582 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67bc772bb931b148a0a7fb187… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jul 20 15:01:16 2013 +0200 loader: Fix invalid groff in Polish wine manpage. --- loader/wine.pl.man.in | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/loader/wine.pl.man.in b/loader/wine.pl.man.in index c8636d2..4aebf68 100644 --- a/loader/wine.pl.man.in +++ b/loader/wine.pl.man.in @@ -79,13 +79,12 @@ Poprzez ustawianie na inne wartości dla różnych procesów .B wine jest możliwe uruchamianie kilka prawdziwie niezależnych procesów -.B wine -. +.BR wine . .TP .I WINESERVER Określa ścieżkę i nazwę programu binarnego .B wineserver -. Jeżeli nie ustawione, Wine będzie próbował załadować +Jeżeli nie ustawione, Wine będzie próbował załadować .BR @bindir@/wineserver i jeśli zakończy się to niepowodzeniem to będzie szukał pliku o nazwie "wineserver" w podanej ścieżce i kilku innych miejscach prawdopodobnego występowania.

1 0

Rico Schüller : d3dx9: Merge get/is_valid_constant().
by Alexandre Julliard July 22, 2013

July 22, 2013

Module: wine Branch: master Commit: 918abfef6a7a7e0d14fec9000205146af804b9e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=918abfef6a7a7e0d14fec9000… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jul 22 14:35:34 2013 +0200 d3dx9: Merge get/is_valid_constant(). --- dlls/d3dx9_36/shader.c | 47 ++++++++++++++++------------------------------- 1 files changed, 16 insertions(+), 31 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 8b089d2..6ad5f92 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -610,11 +610,6 @@ static inline BOOL is_vertex_shader(DWORD version) return (version & 0xffff0000) == 0xfffe0000; } -static inline struct ctab_constant *constant_from_handle(D3DXHANDLE handle) -{ - return (struct ctab_constant *)handle; -} - static inline D3DXHANDLE handle_from_constant(struct ctab_constant *constant) { return (D3DXHANDLE)constant; @@ -708,54 +703,44 @@ static struct ctab_constant *get_constant_by_name(struct ID3DXConstantTableImpl return NULL; } -static struct ctab_constant *is_valid_sub_constant(struct ctab_constant *parent, struct ctab_constant *constant) +static struct ctab_constant *is_valid_sub_constant(struct ctab_constant *parent, D3DXHANDLE handle) { + struct ctab_constant *c; UINT i, count; - /* all variable have at least elements = 1, but no elements */ + /* all variable have at least elements = 1, but not always elements */ if (!parent->constants) return NULL; - if (parent->desc.Elements > 1) count = parent->desc.Elements; - else count = parent->desc.StructMembers; - + count = parent->desc.Elements > 1 ? parent->desc.Elements : parent->desc.StructMembers; for (i = 0; i < count; ++i) { - if (&parent->constants[i] == constant) - return constant; + if (handle_from_constant(&parent->constants[i]) == handle) + return &parent->constants[i]; - if (is_valid_sub_constant(&parent->constants[i], constant)) - return constant; + c = is_valid_sub_constant(&parent->constants[i], handle); + if (c) return c; } return NULL; } -static inline struct ctab_constant *is_valid_constant(struct ID3DXConstantTableImpl *table, D3DXHANDLE handle) +static inline struct ctab_constant *get_valid_constant(struct ID3DXConstantTableImpl *table, D3DXHANDLE handle) { - struct ctab_constant *c = constant_from_handle(handle); + struct ctab_constant *c; UINT i; - if (!c) return NULL; + if (!handle) return NULL; for (i = 0; i < table->desc.Constants; ++i) { - if (&table->constants[i] == c) - return c; + if (handle_from_constant(&table->constants[i]) == handle) + return &table->constants[i]; - if (is_valid_sub_constant(&table->constants[i], c)) - return c; + c = is_valid_sub_constant(&table->constants[i], handle); + if (c) return c; } - return NULL; -} - -static inline struct ctab_constant *get_valid_constant(struct ID3DXConstantTableImpl *table, D3DXHANDLE handle) -{ - struct ctab_constant *constant = is_valid_constant(table, handle); - - if (!constant) constant = get_constant_by_name(table, NULL, handle); - - return constant; + return get_constant_by_name(table, NULL, handle); } static inline void set_float_shader_constant(struct ID3DXConstantTableImpl *table, IDirect3DDevice9 *device,

1 0

Qian Hong : kernel32/nls: Updated LOCALE_SENGLANGUAGE for multiple Chinese variants to match Win7' s behavior.
by Alexandre Julliard July 22, 2013

July 22, 2013

Module: wine Branch: master Commit: b2472c09bafe95728345d41c6e3cd39a7517c823 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2472c09bafe95728345d41c6… Author: Qian Hong <qhong(a)codeweavers.com> Date: Mon Jul 22 16:57:22 2013 +0800 kernel32/nls: Updated LOCALE_SENGLANGUAGE for multiple Chinese variants to match Win7's behavior. --- dlls/kernel32/nls/zhh.nls | 2 +- dlls/kernel32/nls/zhi.nls | 2 +- dlls/kernel32/nls/zhm.nls | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/nls/zhh.nls b/dlls/kernel32/nls/zhh.nls index 009a6cf..4227a58 100644 --- a/dlls/kernel32/nls/zhh.nls +++ b/dlls/kernel32/nls/zhh.nls @@ -99,7 +99,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_HONGKONG LOCALE_SDECIMAL "." LOCALE_SENGCOUNTRY "Hong Kong S.A.R." LOCALE_SENGCURRNAME "Hong Kong Dollar" - LOCALE_SENGLANGUAGE "Chinese" + LOCALE_SENGLANGUAGE "Chinese (Traditional)" LOCALE_SGROUPING "3;0" LOCALE_SINTLSYMBOL "HKD" LOCALE_SISO3166CTRYNAME "HK" diff --git a/dlls/kernel32/nls/zhi.nls b/dlls/kernel32/nls/zhi.nls index 7b299dd..4e41054 100644 --- a/dlls/kernel32/nls/zhi.nls +++ b/dlls/kernel32/nls/zhi.nls @@ -99,7 +99,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SINGAPORE LOCALE_SDECIMAL "." LOCALE_SENGCOUNTRY "Singapore" LOCALE_SENGCURRNAME "Singapore Dollar" - LOCALE_SENGLANGUAGE "Chinese" + LOCALE_SENGLANGUAGE "Chinese (Simplified)" LOCALE_SGROUPING "3;0" LOCALE_SINTLSYMBOL "SGD" LOCALE_SISO3166CTRYNAME "SG" diff --git a/dlls/kernel32/nls/zhm.nls b/dlls/kernel32/nls/zhm.nls index 9d10fc5..19ef0b7 100644 --- a/dlls/kernel32/nls/zhm.nls +++ b/dlls/kernel32/nls/zhm.nls @@ -99,7 +99,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_MACAU LOCALE_SDECIMAL "." LOCALE_SENGCOUNTRY "Macau S.A.R." LOCALE_SENGCURRNAME "Macau Pataca" - LOCALE_SENGLANGUAGE "Chinese" + LOCALE_SENGLANGUAGE "Chinese (Traditional)" LOCALE_SGROUPING "3;0" LOCALE_SINTLSYMBOL "MOP" LOCALE_SISO3166CTRYNAME "MO"

1 0

Bruno Jesus : ws2_32/tests: Add listen() tests for TCP sockets.
by Alexandre Julliard July 22, 2013

July 22, 2013

Module: wine Branch: master Commit: 9ea1835b82ef26db3a1a273b8028060dc474d893 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ea1835b82ef26db3a1a273b8… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jul 20 13:27:30 2013 -0300 ws2_32/tests: Add listen() tests for TCP sockets. --- dlls/ws2_32/tests/sock.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 80 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 3e3167a..bcf7abc 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2357,6 +2357,85 @@ static void test_errors(void) ok ( (ret == 0), "closesocket failed unexpectedly: %d\n", WSAGetLastError()); } +static void test_listen(void) +{ + SOCKET fdA, fdB; + int ret; + struct sockaddr_in address; + + memset(&address, 0, sizeof(address)); + address.sin_addr.s_addr = inet_addr("127.0.0.1"); + address.sin_family = AF_INET; + address.sin_port = htons(SERVERPORT); + + /* invalid socket tests */ + SetLastError(0xdeadbeef); + ok ((listen(0, 0) == SOCKET_ERROR), "listen did not fail\n"); + ret = WSAGetLastError(); +todo_wine + ok (ret == WSAENOTSOCK, "expected 10038, received %d\n", ret); + + SetLastError(0xdeadbeef); + ok ((listen(0xdeadbeef, 0) == SOCKET_ERROR), "listen did not fail\n"); + ret = WSAGetLastError(); +todo_wine + ok (ret == WSAENOTSOCK, "expected 10038, received %d\n", ret); + + /* tcp tests */ + fdA = socket(AF_INET, SOCK_STREAM, 0); + ok ((fdA != INVALID_SOCKET), "socket failed unexpectedly: %d\n", WSAGetLastError() ); + + fdB = socket(AF_INET, SOCK_STREAM, 0); + ok ((fdB != INVALID_SOCKET), "socket failed unexpectedly: %d\n", WSAGetLastError() ); + +todo_wine { + SetLastError(0xdeadbeef); + ok ((listen(fdA, -2) == SOCKET_ERROR), "listen did not fail\n"); + ret = WSAGetLastError(); + ok (ret == WSAEINVAL, "expected 10022, received %d\n", ret); + + SetLastError(0xdeadbeef); + ok ((listen(fdA, 1) == SOCKET_ERROR), "listen did not fail\n"); + ret = WSAGetLastError(); + ok (ret == WSAEINVAL, "expected 10022, received %d\n", ret); + + SetLastError(0xdeadbeef); + ok ((listen(fdA, SOMAXCONN) == SOCKET_ERROR), "listen did not fail\n"); + ret = WSAGetLastError(); + ok (ret == WSAEINVAL, "expected 10022, received %d\n", ret); + + ok (!bind(fdA, (struct sockaddr*) &address, sizeof(address)), "bind failed\n"); + + SetLastError(0xdeadbeef); + ok (bind(fdB, (struct sockaddr*) &address, sizeof(address)), "bind should have failed\n"); + ok (ret == WSAEINVAL, "expected 10022, received %d\n", ret); +} + ok (!listen(fdA, 0), "listen failed\n"); + ok (!listen(fdA, SOMAXCONN), "double listen failed\n"); +todo_wine { + SetLastError(0xdeadbeef); + ok ((listen(fdB, SOMAXCONN) == SOCKET_ERROR), "listen did not fail\n"); + ret = WSAGetLastError(); + ok (ret == WSAEINVAL, "expected 10022, received %d\n", ret); +} + ret = closesocket(fdB); + ok (ret == 0, "closesocket failed unexpectedly: %d\n", ret); + + fdB = socket(AF_INET, SOCK_STREAM, 0); + ok ((fdB != INVALID_SOCKET), "socket failed unexpectedly: %d\n", WSAGetLastError() ); + +todo_wine { + SetLastError(0xdeadbeef); + ok (bind(fdB, (struct sockaddr*) &address, sizeof(address)), "bind should have failed\n"); + ret = WSAGetLastError(); + ok (ret == WSAEADDRINUSE, "expected 10048, received %d\n", ret); +} + ret = closesocket(fdA); + ok (ret == 0, "closesocket failed unexpectedly: %d\n", ret); + ret = closesocket(fdB); + ok (ret == 0, "closesocket failed unexpectedly: %d\n", ret); +} + static void test_select(void) { SOCKET fdRead, fdWrite; @@ -6098,6 +6177,7 @@ START_TEST( sock ) test_WSAStringToAddressW(); test_errors(); + test_listen(); test_select(); test_accept(); test_getpeername();

1 0

Nikolay Sivov : xmllite: Initial support for CharData (or Text) nodes.
by Alexandre Julliard July 22, 2013

July 22, 2013

Module: wine Branch: master Commit: f02b2225ee7abd740b16b131d61f4379bba7d193 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f02b2225ee7abd740b16b131d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 15 20:45:21 2013 +0400 xmllite: Initial support for CharData (or Text) nodes. --- dlls/xmllite/reader.c | 67 ++++++++++++++++++++++++++-- dlls/xmllite/tests/reader.c | 101 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 163 insertions(+), 5 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 9193d2f..ec2a071 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -53,7 +53,8 @@ typedef enum XmlReadInState_DTD_Misc, XmlReadInState_Element, XmlReadInState_Content, - XmlReadInState_MiscEnd + XmlReadInState_MiscEnd, /* optional Misc at the end of a document */ + XmlReadInState_Eof } XmlReaderInternalState; /* This state denotes where parsing was interrupted by input problem. @@ -65,7 +66,8 @@ typedef enum XmlReadResumeState_PIBody, XmlReadResumeState_CDATA, XmlReadResumeState_Comment, - XmlReadResumeState_STag + XmlReadResumeState_STag, + XmlReadResumeState_CharData } XmlReaderResumeState; /* saved pointer index to resume from particular input position */ @@ -73,7 +75,7 @@ typedef enum { XmlReadResume_Name, /* PITarget, name for NCName, prefix for QName */ XmlReadResume_Local, /* local for QName */ - XmlReadResume_Body, /* PI body, comment text, CDATA text */ + XmlReadResume_Body, /* PI body, comment text, CDATA text, CharData text */ XmlReadResume_Last } XmlReaderResume; @@ -1788,6 +1790,10 @@ static HRESULT reader_parse_endtag(xmlreader *reader) reader_pop_element(reader); + /* It was a root element, the rest is expected as Misc */ + if (list_empty(&reader->elements)) + reader->instate = XmlReadInState_MiscEnd; + reader->nodetype = XmlNodeType_EndElement; reader_set_strvalue(reader, StringValue_LocalName, &local); reader_set_strvalue(reader, StringValue_QualifiedName, &qname); @@ -1867,8 +1873,48 @@ static HRESULT reader_parse_reference(xmlreader *reader) /* [14] CharData ::= [^<&]* - ([^<&]* ']]>' [^<&]*) */ static HRESULT reader_parse_chardata(xmlreader *reader) { - FIXME("CharData not supported\n"); - return E_NOTIMPL; + WCHAR *start, *ptr; + + if (reader->resume[XmlReadResume_Body]) + { + start = reader->resume[XmlReadResume_Body]; + ptr = reader_get_cur(reader); + } + else + { + reader_shrink(reader); + ptr = start = reader_get_cur(reader); + /* There's no text */ + if (!*ptr || *ptr == '<') return S_OK; + reader->nodetype = XmlNodeType_Text; + reader->resume[XmlReadResume_Body] = start; + reader->resumestate = XmlReadResumeState_CharData; + reader_set_strvalue(reader, StringValue_LocalName, &strval_empty); + reader_set_strvalue(reader, StringValue_QualifiedName, &strval_empty); + reader_set_strvalue(reader, StringValue_Value, NULL); + } + + while (*ptr) + { + /* CDATA closing sequence ']]>' is not allowed */ + if (ptr[0] == ']' && ptr[1] == ']' && ptr[2] == '>') + return WC_E_CDSECTEND; + + /* Found next markup part */ + if (ptr[0] == '<') + { + strval value; + + reader_init_strvalue(start, ptr-start, &value); + reader_set_strvalue(reader, StringValue_Value, &value); + return S_OK; + } + + reader_skipn(reader, 1); + ptr++; + } + + return S_OK; } /* [43] content ::= CharData? ((element | Reference | CDSect | PI | Comment) CharData?)* */ @@ -1889,6 +1935,8 @@ static HRESULT reader_parse_content(xmlreader *reader) case XmlReadResumeState_PIBody: case XmlReadResumeState_PITarget: return reader_parse_pi(reader); + case XmlReadResumeState_CharData: + return reader_parse_chardata(reader); default: ERR("unknown resume state %d\n", reader->resumestate); } @@ -1986,6 +2034,15 @@ static HRESULT reader_parse_nextnode(xmlreader *reader) return reader_parse_element(reader); case XmlReadInState_Content: return reader_parse_content(reader); + case XmlReadInState_MiscEnd: + hr = reader_parse_misc(reader); + if (FAILED(hr)) return hr; + + if (hr == S_FALSE) + reader->instate = XmlReadInState_Eof; + return hr; + case XmlReadInState_Eof: + return S_FALSE; default: FIXME("internal state %d not handled\n", reader->instate); return E_NOTIMPL; diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 46c6edd..c666712 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1418,6 +1418,106 @@ static void test_read_cdata(void) IXmlReader_Release(reader); } +static struct test_entry text_tests[] = { + { "<a>simple text</a>", "", "simple text", S_OK }, + { "<a>text ]]> text</a>", "", "", WC_E_CDSECTEND }, + { NULL } +}; + +static void test_read_text(void) +{ + struct test_entry *test = text_tests; + IXmlReader *reader; + HRESULT hr; + + hr = pCreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); + ok(hr == S_OK, "S_OK, got %08x\n", hr); + + while (test->xml) + { + XmlNodeType type; + IStream *stream; + + stream = create_stream_on_data(test->xml, strlen(test->xml)+1); + hr = IXmlReader_SetInput(reader, (IUnknown*)stream); + ok(hr == S_OK, "got %08x\n", hr); + + type = XmlNodeType_None; + hr = IXmlReader_Read(reader, &type); + + /* read one more to get to CDATA */ + if (type == XmlNodeType_Element) + { + type = XmlNodeType_None; + hr = IXmlReader_Read(reader, &type); + } + + if (test->hr_broken) + ok(hr == test->hr || broken(hr == test->hr_broken), "got %08x for %s\n", hr, test->xml); + else + ok(hr == test->hr, "got %08x for %s\n", hr, test->xml); + if (hr == S_OK) + { + const WCHAR *str; + WCHAR *str_exp; + UINT len; + + ok(type == XmlNodeType_Text, "got %d for %s\n", type, test->xml); + + str_exp = a2w(test->name); + + 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); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + + str = NULL; + hr = IXmlReader_GetLocalName(reader, &str, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + + free_str(str_exp); + + len = 1; + str = NULL; + hr = IXmlReader_GetQualifiedName(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); + + /* value */ + len = 1; + str = NULL; + hr = IXmlReader_GetValue(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + + str_exp = a2w(test->value); + if (test->todo) + { + todo_wine { + ok(len == strlen(test->value), "got %u\n", len); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + } + } + else + { + ok(len == strlen(test->value), "got %u\n", len); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + } + free_str(str_exp); + } + + IStream_Release(stream); + test++; + } + + IXmlReader_Release(reader); +} + START_TEST(reader) { HRESULT r; @@ -1439,6 +1539,7 @@ START_TEST(reader) test_read_pi(); test_read_dtd(); test_read_element(); + test_read_text(); test_read_full(); test_read_pending(); test_readvaluechunk();

1 0

Nikolay Sivov : xmllite: Implement IsEmptyElement().
by Alexandre Julliard July 22, 2013

July 22, 2013

Module: wine Branch: master Commit: d315e438a2df28fc74203e4ac185f6fdff844a85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d315e438a2df28fc74203e4ac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 15 21:53:33 2013 +0400 xmllite: Implement IsEmptyElement(). --- dlls/xmllite/reader.c | 25 +++++++++++++++++----- dlls/xmllite/tests/reader.c | 46 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 6 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index ec2a071..0a89edb 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -189,6 +189,7 @@ typedef struct struct list elements; strval strvalues[StringValue_Last]; UINT depth; + BOOL empty_element; WCHAR *resume[XmlReadResume_Last]; /* pointers used to resume reader */ } xmlreader; @@ -364,6 +365,7 @@ static void reader_clear_elements(xmlreader *reader) reader_free(reader, elem); } list_init(&reader->elements); + reader->empty_element = FALSE; } static HRESULT reader_inc_depth(xmlreader *reader) @@ -397,6 +399,7 @@ static HRESULT reader_push_element(xmlreader *reader, strval *qname) } list_add_head(&reader->elements, &elem->entry); + reader->empty_element = FALSE; return hr; } @@ -1221,6 +1224,14 @@ static inline int is_namechar(WCHAR ch) return (ch == ':') || is_ncnamechar(ch); } +static XmlNodeType reader_get_nodetype(const xmlreader *reader) +{ + /* When we're on attribute always return attribute type, container node type is kept. + Note that container is not necessarily an element, and attribute doesn't mean it's + an attribute in XML spec terms. */ + return reader->attr ? XmlNodeType_Attribute : reader->nodetype; +} + /* [4] NameStartChar ::= ":" | [A-Z] | "_" | [a-z] | [#xC0-#xD6] | [#xD8-#xF6] | [#xF8-#x2FF] | [#x370-#x37D] | [#x37F-#x1FFF] | [#x200C-#x200D] | [#x2070-#x218F] | [#x2C00-#x2FEF] | [#x3001-#xD7FF] | [#xF900-#xFDCF] | [#xFDF0-#xFFFD] | [#x10000-#xEFFFF] @@ -1699,6 +1710,7 @@ static HRESULT reader_parse_stag(xmlreader *reader, strval *prefix, strval *loca { /* skip '/>' */ reader_skipn(reader, 2); + reader->empty_element = TRUE; return S_OK; } @@ -2235,10 +2247,7 @@ static HRESULT WINAPI xmlreader_GetNodeType(IXmlReader* iface, XmlNodeType *node xmlreader *This = impl_from_IXmlReader(iface); TRACE("(%p)->(%p)\n", This, node_type); - /* When we're on attribute always return attribute type, container node type is kept. - Note that container is not necessarily an element, and attribute doesn't mean it's - an attribute in XML spec terms. */ - *node_type = This->attr ? XmlNodeType_Attribute : This->nodetype; + *node_type = reader_get_nodetype(This); return This->state == XmlReadState_Closed ? S_FALSE : S_OK; } @@ -2402,8 +2411,11 @@ static BOOL WINAPI xmlreader_IsDefault(IXmlReader* iface) static BOOL WINAPI xmlreader_IsEmptyElement(IXmlReader* iface) { - FIXME("(%p): stub\n", iface); - return E_NOTIMPL; + xmlreader *This = impl_from_IXmlReader(iface); + TRACE("(%p)\n", This); + /* Empty elements are not placed in stack, it's stored as a global reader flag that makes sense + when current node is start tag of an element */ + return (reader_get_nodetype(This) == XmlNodeType_Element) ? This->empty_element : FALSE; } static HRESULT WINAPI xmlreader_GetLineNumber(IXmlReader* iface, UINT *lineNumber) @@ -2583,6 +2595,7 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) reader->attr = NULL; list_init(&reader->elements); reader->depth = 0; + reader->empty_element = FALSE; memset(reader->resume, 0, sizeof(reader->resume)); for (i = 0; i < StringValue_Last; i++) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index c666712..9be5125 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1518,6 +1518,51 @@ static void test_read_text(void) IXmlReader_Release(reader); } +struct test_entry_empty { + const char *xml; + BOOL empty; +}; + +static struct test_entry_empty empty_element_tests[] = { + { "<a></a>", FALSE }, + { "<a/>", TRUE }, + { NULL } +}; + +static void test_isemptyelement(void) +{ + struct test_entry_empty *test = empty_element_tests; + IXmlReader *reader; + HRESULT hr; + + hr = pCreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); + ok(hr == S_OK, "S_OK, got %08x\n", hr); + + while (test->xml) + { + XmlNodeType type; + IStream *stream; + BOOL ret; + + stream = create_stream_on_data(test->xml, strlen(test->xml)+1); + 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%08x\n", hr); + ok(type == XmlNodeType_Element, "got %d\n", type); + + ret = IXmlReader_IsEmptyElement(reader); + ok(ret == test->empty, "got %d, expected %d. xml=%s\n", ret, test->empty, test->xml); + + IStream_Release(stream); + test++; + } + + IXmlReader_Release(reader); +} + START_TEST(reader) { HRESULT r; @@ -1539,6 +1584,7 @@ START_TEST(reader) test_read_pi(); test_read_dtd(); test_read_element(); + test_isemptyelement(); test_read_text(); test_read_full(); test_read_pending();

1 0