wine-commits July 2013

wine-commits@winehq.org

2 participants
447 discussions

Alexandre Julliard : usp10: Update the line breaking algorithm to Unicode 6 .2.0.
by Alexandre Julliard 22 Jul '13

22 Jul '13

Module: wine Branch: master Commit: 2c5c2b5546d79307643b8d8efb0335b611511f94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c5c2b5546d79307643b8d8ef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 22 11:08:18 2013 +0200 usp10: Update the line breaking algorithm to Unicode 6.2.0. --- dlls/usp10/breaking.c | 39 ++++++++++++++++++++++++++++++++------- 1 files changed, 32 insertions(+), 7 deletions(-) diff --git a/dlls/usp10/breaking.c b/dlls/usp10/breaking.c index ff6e740..6e044b2 100644 --- a/dlls/usp10/breaking.c +++ b/dlls/usp10/breaking.c @@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(uniscribe); extern const unsigned short wine_linebreak_table[]; -enum breaking_types { b_BK=1, b_CR, b_LF, b_CM, b_SG, b_GL, b_CB, b_SP, b_ZW, b_NL, b_WJ, b_JL, b_JV, b_JT, b_H2, b_H3, b_XX, b_OP, b_CL, b_CP, b_QU, b_NS, b_EX, b_SY, b_IS, b_PR, b_PO, b_NU, b_AL, b_ID, b_IN, b_HY, b_BB, b_BA, b_SA, b_AI, b_B2}; +enum breaking_types { b_BK=1, b_CR, b_LF, b_CM, b_SG, b_GL, b_CB, b_SP, b_ZW, b_NL, b_WJ, b_JL, b_JV, b_JT, b_H2, b_H3, b_XX, b_OP, b_CL, b_CP, b_QU, b_NS, b_EX, b_SY, b_IS, b_PR, b_PO, b_NU, b_AL, b_ID, b_IN, b_HY, b_BB, b_BA, b_SA, b_AI, b_B2, b_HL, b_CJ, b_RI}; enum breaking_class {b_r=1, b_s, b_x}; @@ -111,6 +111,8 @@ void BREAK_line(const WCHAR *chars, int count, const SCRIPT_ANALYSIS *sa, SCRIPT case b_SG: case b_XX: break_class[i] = b_AL; + case b_CJ: + break_class[i] = b_NS; } } @@ -283,6 +285,16 @@ void BREAK_line(const WCHAR *chars, int count, const SCRIPT_ANALYSIS *sa, SCRIPT if (i < count-1) else_break(&break_before[i+1],b_x); break; + /* LB21a */ + case b_HL: + if (i < count-2) + switch (break_class[i+1]) + { + case b_HY: + case b_BA: + else_break(&break_before[i+2], b_x); + } + break; /* LB22 */ case b_IN: if (i > 0) @@ -290,6 +302,7 @@ void BREAK_line(const WCHAR *chars, int count, const SCRIPT_ANALYSIS *sa, SCRIPT switch (break_class[i-1]) { case b_AL: + case b_HL: case b_ID: case b_IN: case b_NU: @@ -304,12 +317,16 @@ void BREAK_line(const WCHAR *chars, int count, const SCRIPT_ANALYSIS *sa, SCRIPT /* LB23 */ if ((break_class[i] == b_ID && break_class[i+1] == b_PO) || (break_class[i] == b_AL && break_class[i+1] == b_NU) || - (break_class[i] == b_NU && break_class[i+1] == b_AL)) + (break_class[i] == b_HL && break_class[i+1] == b_NU) || + (break_class[i] == b_NU && break_class[i+1] == b_AL) || + (break_class[i] == b_NU && break_class[i+1] == b_HL)) else_break(&break_before[i+1],b_x); /* LB24 */ if ((break_class[i] == b_PR && break_class[i+1] == b_ID) || (break_class[i] == b_PR && break_class[i+1] == b_AL) || - (break_class[i] == b_PO && break_class[i+1] == b_AL)) + (break_class[i] == b_PR && break_class[i+1] == b_HL) || + (break_class[i] == b_PO && break_class[i+1] == b_AL) || + (break_class[i] == b_PO && break_class[i+1] == b_HL)) else_break(&break_before[i+1],b_x); /* LB25 */ @@ -373,19 +390,27 @@ void BREAK_line(const WCHAR *chars, int count, const SCRIPT_ANALYSIS *sa, SCRIPT } /* LB28 */ - if (break_class[i] == b_AL && break_class[i+1] == b_AL) + if ((break_class[i] == b_AL && break_class[i+1] == b_AL) || + (break_class[i] == b_AL && break_class[i+1] == b_HL) || + (break_class[i] == b_HL && break_class[i+1] == b_AL) || + (break_class[i] == b_HL && break_class[i+1] == b_HL)) else_break(&break_before[i+1],b_x); /* LB29 */ - if (break_class[i] == b_IS && break_class[i+1] == b_AL) + if ((break_class[i] == b_IS && break_class[i+1] == b_AL) || + (break_class[i] == b_IS && break_class[i+1] == b_HL)) else_break(&break_before[i+1],b_x); /* LB30 */ - if ((break_class[i] == b_AL || break_class[i] == b_NU) && + if ((break_class[i] == b_AL || break_class[i] == b_HL || break_class[i] == b_NU) && break_class[i+1] == b_OP) else_break(&break_before[i+1],b_x); if (break_class[i] == b_CP && - (break_class[i+1] == b_AL || break_class[i] == b_NU)) + (break_class[i+1] == b_AL || break_class[i] == b_HL || break_class[i] == b_NU)) + else_break(&break_before[i+1],b_x); + + /* LB30a */ + if (break_class[i] == b_RI && break_class[i+1] == b_RI) else_break(&break_before[i+1],b_x); } }

1 0

Alexandre Julliard : libwine: Fix the default Unicode character for codepage 20932.
by Alexandre Julliard 22 Jul '13

22 Jul '13

Module: wine Branch: master Commit: 5fbb68769a3f5175dbeffa90bd62a765b19b63a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fbb68769a3f5175dbeffa90b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 22 09:59:46 2013 +0200 libwine: Fix the default Unicode character for codepage 20932. --- libs/wine/c_20932.c | 3674 +++++++++++++++++++++++++------------------------- tools/make_unicode | 2 +- 2 files changed, 1838 insertions(+), 1838 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5fbb68769a3f5175dbeff…

1 0

Alexandre Julliard : libwine: Fix the default character for EBCDIC codepages.
by Alexandre Julliard 22 Jul '13

22 Jul '13

Module: wine Branch: master Commit: 89a54082be83b9f00be8bf546cce43f2f2fa6032 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89a54082be83b9f00be8bf546… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 22 09:59:17 2013 +0200 libwine: Fix the default character for EBCDIC codepages. --- libs/wine/c_037.c | 976 ++++++++++++++++++++++++++-------------------------- libs/wine/c_1026.c | 980 ++++++++++++++++++++++++++-------------------------- libs/wine/c_500.c | 976 ++++++++++++++++++++++++++-------------------------- libs/wine/c_875.c | 950 +++++++++++++++++++++++++------------------------- tools/make_unicode | 8 +- 5 files changed, 1945 insertions(+), 1945 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=89a54082be83b9f00be8b…

1 0

Nikolay Sivov : xmllite: Report attribute as non-default for now.
by Alexandre Julliard 22 Jul '13

22 Jul '13

Module: wine Branch: master Commit: be8d73d45638d9dd474bf1765f19256a4bb39dfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=be8d73d45638d9dd474bf1765… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 15 22:04:24 2013 +0400 xmllite: Report attribute as non-default for now. --- dlls/xmllite/reader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 0a89edb..0b587ff 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2406,7 +2406,7 @@ static HRESULT WINAPI xmlreader_GetBaseUri(IXmlReader* iface, static BOOL WINAPI xmlreader_IsDefault(IXmlReader* iface) { FIXME("(%p): stub\n", iface); - return E_NOTIMPL; + return FALSE; } static BOOL WINAPI xmlreader_IsEmptyElement(IXmlReader* iface)

1 0

Nikolay Sivov : xmllite: Implement IsEmptyElement().
by Alexandre Julliard 22 Jul '13

22 Jul '13

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

Nikolay Sivov : xmllite: Initial support for CharData (or Text) nodes.
by Alexandre Julliard 22 Jul '13

22 Jul '13

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: Store prefix for start tag and return it.
by Alexandre Julliard 22 Jul '13

22 Jul '13

Module: wine Branch: master Commit: 5a1a7455707ae73fc128d741ea52bde35e74117a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a1a7455707ae73fc128d741e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 15 00:54:44 2013 +0400 xmllite: Store prefix for start tag and return it. --- dlls/xmllite/reader.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 5256c35..9193d2f 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -80,6 +80,7 @@ typedef enum typedef enum { StringValue_LocalName, + StringValue_Prefix, StringValue_QualifiedName, StringValue_Value, StringValue_Last @@ -1749,6 +1750,7 @@ static HRESULT reader_parse_element(xmlreader *reader) reader->nodetype = XmlNodeType_Element; reader->resumestate = XmlReadResumeState_Initial; reader_set_strvalue(reader, StringValue_LocalName, &local); + reader_set_strvalue(reader, StringValue_Prefix, &prefix); reader_set_strvalue(reader, StringValue_QualifiedName, &qname); break; } @@ -2260,12 +2262,14 @@ static HRESULT WINAPI xmlreader_GetLocalName(IXmlReader* iface, LPCWSTR *name, U return S_OK; } -static HRESULT WINAPI xmlreader_GetPrefix(IXmlReader* iface, - LPCWSTR *prefix, - UINT *prefix_length) +static HRESULT WINAPI xmlreader_GetPrefix(IXmlReader* iface, LPCWSTR *prefix, UINT *len) { - FIXME("(%p %p %p): stub\n", iface, prefix, prefix_length); - return E_NOTIMPL; + xmlreader *This = impl_from_IXmlReader(iface); + + TRACE("(%p)->(%p %p)\n", This, prefix, len); + *prefix = This->strvalues[StringValue_Prefix].str; + if (len) *len = This->strvalues[StringValue_Prefix].len; + return S_OK; } static HRESULT WINAPI xmlreader_GetValue(IXmlReader* iface, const WCHAR **value, UINT *len)

1 0

Nikolay Sivov : comctl32: Properly handle repainting for HDF_OWNERDRAW items.
by Alexandre Julliard 22 Jul '13

22 Jul '13

Module: wine Branch: master Commit: b130ca1c5fb48c06a1e9f59ba52b00a2dbe90082 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b130ca1c5fb48c06a1e9f59ba… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 13 13:43:35 2013 +0400 comctl32: Properly handle repainting for HDF_OWNERDRAW items. --- dlls/comctl32/header.c | 102 ++++++++++++++++++++++++++++++------------------ 1 files changed, 64 insertions(+), 38 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index d1386e3..ec7d844 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -289,6 +289,41 @@ static void HEADER_GetHotDividerRect(const HEADER_INFO *infoPtr, RECT *r) } } +static void +HEADER_FillItemFrame(HEADER_INFO *infoPtr, HDC hdc, RECT *r, const HEADER_ITEM *item, BOOL hottrack) +{ + HTHEME theme = GetWindowTheme (infoPtr->hwndSelf); + + if (theme) { + int state = (item->bDown) ? HIS_PRESSED : (hottrack ? HIS_HOT : HIS_NORMAL); + DrawThemeBackground (theme, hdc, HP_HEADERITEM, state, r, NULL); + GetThemeBackgroundContentRect (theme, hdc, HP_HEADERITEM, state, r, r); + } + else + { + HBRUSH hbr = CreateSolidBrush(GetBkColor(hdc)); + FillRect(hdc, r, hbr); + DeleteObject(hbr); + } +} + +static void +HEADER_DrawItemFrame(HEADER_INFO *infoPtr, HDC hdc, RECT *r, const HEADER_ITEM *item) +{ + if (GetWindowTheme(infoPtr->hwndSelf)) return; + + if (!(infoPtr->dwStyle & HDS_FLAT)) + { + if (infoPtr->dwStyle & HDS_BUTTONS) { + if (item->bDown) + DrawEdge (hdc, r, BDR_RAISEDOUTER, BF_RECT | BF_FLAT | BF_ADJUST); + else + DrawEdge (hdc, r, EDGE_RAISED, BF_RECT | BF_SOFT | BF_ADJUST); + } + else + DrawEdge (hdc, r, EDGE_ETCHED, BF_BOTTOM | BF_RIGHT | BF_ADJUST); + } +} static INT HEADER_DrawItem (HEADER_INFO *infoPtr, HDC hdc, INT iItem, BOOL bHotTrack, LRESULT lCDFlags) @@ -325,43 +360,13 @@ HEADER_DrawItem (HEADER_INFO *infoPtr, HDC hdc, INT iItem, BOOL bHotTrack, LRESU return phdi->rect.right; } - if (theme != NULL) { - int state = (phdi->bDown) ? HIS_PRESSED : - (bHotTrack ? HIS_HOT : HIS_NORMAL); - DrawThemeBackground (theme, hdc, HP_HEADERITEM, state, - &r, NULL); - GetThemeBackgroundContentRect (theme, hdc, HP_HEADERITEM, state, - &r, &r); - } - else { - HBRUSH hbr; + /* Fill background, owner could draw over it. */ + HEADER_FillItemFrame(infoPtr, hdc, &r, phdi, bHotTrack); - if (!(infoPtr->dwStyle & HDS_FLAT)) - { - if (infoPtr->dwStyle & HDS_BUTTONS) { - if (phdi->bDown) { - DrawEdge (hdc, &r, BDR_RAISEDOUTER, - BF_RECT | BF_FLAT | BF_MIDDLE | BF_ADJUST); - } - else - DrawEdge (hdc, &r, EDGE_RAISED, - BF_RECT | BF_SOFT | BF_MIDDLE | BF_ADJUST); - } - else - DrawEdge (hdc, &r, EDGE_ETCHED, BF_BOTTOM | BF_RIGHT | BF_ADJUST); - } - - hbr = CreateSolidBrush(GetBkColor(hdc)); - FillRect(hdc, &r, hbr); - DeleteObject(hbr); - } - if (phdi->bDown) { - r.left += 2; - r.top += 2; - } - - if (phdi->fmt & HDF_OWNERDRAW) { + if (phdi->fmt & HDF_OWNERDRAW) + { DRAWITEMSTRUCT dis; + BOOL ret; dis.CtlType = ODT_HEADER; dis.CtlID = GetWindowLongPtrW (infoPtr->hwndSelf, GWLP_ID); @@ -373,11 +378,32 @@ HEADER_DrawItem (HEADER_INFO *infoPtr, HDC hdc, INT iItem, BOOL bHotTrack, LRESU dis.rcItem = phdi->rect; dis.itemData = phdi->lParam; oldBkMode = SetBkMode(hdc, TRANSPARENT); - SendMessageW (infoPtr->hwndNotify, WM_DRAWITEM, dis.CtlID, (LPARAM)&dis); + ret = SendMessageW (infoPtr->hwndNotify, WM_DRAWITEM, dis.CtlID, (LPARAM)&dis); if (oldBkMode != TRANSPARENT) SetBkMode(hdc, oldBkMode); + + if (!ret) + HEADER_FillItemFrame(infoPtr, hdc, &r, phdi, bHotTrack); + + /* Edges are always drawn if we don't have attached theme. */ + HEADER_DrawItemFrame(infoPtr, hdc, &r, phdi); + /* If application processed WM_DRAWITEM we should skip label painting, + edges are drawn no matter what. */ + if (ret) return phdi->rect.right; } - else { + else + { + HEADER_FillItemFrame(infoPtr, hdc, &r, phdi, bHotTrack); + HEADER_DrawItemFrame(infoPtr, hdc, &r, phdi); + } + + if (phdi->bDown) { + r.left += 2; + r.top += 2; + } + + /* Now text and image */ + { UINT rw, rh, /* width and height of r */ *x = NULL, *w = NULL; /* x and width of the pic (bmp or img) which is part of cnt */ /* cnt,txt,img,bmp */ @@ -495,7 +521,7 @@ HEADER_DrawItem (HEADER_INFO *infoPtr, HDC hdc, INT iItem, BOOL bHotTrack, LRESU SetBkMode(hdc, oldBkMode); } HEADER_FreeCallbackItems(phdi); - }/*Ownerdrawn*/ + } return phdi->rect.right; }

1 0

Bruno Jesus : ws2_32/tests: Add listen() tests for TCP sockets.
by Alexandre Julliard 22 Jul '13

22 Jul '13

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

Jacek Caban : mshtml/tests: Added more res protocol tests.
by Alexandre Julliard 22 Jul '13

22 Jul '13

Module: wine Branch: master Commit: 2046d69b4e701bfa16c189452b1b019788272bc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2046d69b4e701bfa16c189452… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 19 17:59:40 2013 +0200 mshtml/tests: Added more res protocol tests. --- dlls/mshtml/tests/protocol.c | 39 ++++++++++++++++++++++++++++++++++++++- dlls/mshtml/tests/rsrc.rc | 8 ++++++++ 2 files changed, 46 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index 7e66347..04c4714 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -27,6 +27,7 @@ #include "ole2.h" #include "urlmon.h" #include "shlwapi.h" +#include "wininet.h" #include "initguid.h" @@ -73,6 +74,9 @@ static const WCHAR about_test_url[] = {'a','b','o','u','t',':','t','e','s','t',0 static const WCHAR about_res_url[] = {'r','e','s',':','b','l','a','n','k',0}; static const WCHAR javascript_test_url[] = {'j','a','v','a','s','c','r','i','p','t',':','t','e','s','t','(',')',0}; +static WCHAR res_url_base[INTERNET_MAX_URL_LENGTH] = {'r','e','s',':','/','/'}; +static unsigned res_url_base_len; + static const char *debugstr_guid(REFIID riid) { static char buf[50]; @@ -248,7 +252,7 @@ static void test_protocol_fail(IInternetProtocol *protocol, LPCWSTR url, HRESULT CHECK_CALLED(ReportResult); } -static void protocol_start(IInternetProtocol *protocol, LPCWSTR url) +static void protocol_start(IInternetProtocol *protocol, const WCHAR *url) { HRESULT hres; @@ -268,6 +272,33 @@ static void protocol_start(IInternetProtocol *protocol, LPCWSTR url) CHECK_CALLED(ReportResult); } +static void test_res_url(const char *url_suffix) +{ + WCHAR url[INTERNET_MAX_URL_LENGTH]; + IInternetProtocol *protocol; + ULONG size, ref; + BYTE buf[100]; + HRESULT hres; + + memcpy(url, res_url_base, res_url_base_len*sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, url_suffix, -1, url+res_url_base_len, sizeof(url)-res_url_base_len); + + hres = CoCreateInstance(&CLSID_ResProtocol, NULL, CLSCTX_INPROC_SERVER, &IID_IInternetProtocol, (void**)&protocol); + ok(hres == S_OK, "Could not create ResProtocol instance: %08x\n", hres); + + protocol_start(protocol, url); + + hres = IInternetProtocol_Read(protocol, buf, sizeof(buf), &size); + ok(hres == S_OK, "Read failed: %08x\n", hres); + + hres = IInternetProtocol_Terminate(protocol, 0); + ok(hres == S_OK, "Terminate failed: %08x\n", hres); + + + ref = IInternetProtocol_Release(protocol); + ok(!ref, "ref=%u\n", ref); +} + static void res_sec_url_cmp(LPCWSTR url, DWORD size, LPCWSTR file) { WCHAR buf[MAX_PATH]; @@ -578,6 +609,10 @@ static void test_res_protocol(void) } IUnknown_Release(unk); + + test_res_url("/jstest.html"); + test_res_url("/Test/res.html"); + test_res_url("/test/dir/dir2/res.html"); } static void do_test_about_protocol(IClassFactory *factory, DWORD bf) @@ -908,6 +943,8 @@ static void test_javascript_protocol(void) START_TEST(protocol) { + res_url_base_len = 6 + GetModuleFileNameW(NULL, res_url_base + 6 /* strlen("res://") */, sizeof(res_url_base)-6); + OleInitialize(NULL); test_res_protocol(); diff --git a/dlls/mshtml/tests/rsrc.rc b/dlls/mshtml/tests/rsrc.rc index 49aecdf..07d816d 100644 --- a/dlls/mshtml/tests/rsrc.rc +++ b/dlls/mshtml/tests/rsrc.rc @@ -33,3 +33,11 @@ externscr.js HTML "externscr.js" /* @makedep: test_tlb.tlb */ 1 TYPELIB test_tlb.tlb + +/* For res: protocol test: */ + +/* @makedep: jstest.html */ +res.html test "jstest.html" + +/* @makedep: jstest.html */ +dir/dir2/res.html test "jstest.html"

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
45
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 July 2013