wine-commits March 2013

wine-commits@winehq.org

2 participants
531 discussions

André Hentschel : winedbg: Remove SPARC support.
by Alexandre Julliard 11 Mar '13

11 Mar '13

Module: wine Branch: master Commit: 40e7f7b78799f999378f5ae23aaf470b2f5cd626 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40e7f7b78799f999378f5ae23… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Mar 8 21:33:10 2013 +0100 winedbg: Remove SPARC support. --- programs/winedbg/Makefile.in | 1 - programs/winedbg/be_sparc.c | 185 ----------------------------------------- programs/winedbg/gdbproxy.c | 36 -------- programs/winedbg/tgt_active.c | 2 - programs/winedbg/winedbg.c | 4 - 5 files changed, 0 insertions(+), 228 deletions(-) diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in index d38d5f0..6e77e2e 100644 --- a/programs/winedbg/Makefile.in +++ b/programs/winedbg/Makefile.in @@ -9,7 +9,6 @@ C_SRCS = \ be_arm64.c \ be_i386.c \ be_ppc.c \ - be_sparc.c \ be_x86_64.c \ break.c \ crashdlg.c \ diff --git a/programs/winedbg/be_sparc.c b/programs/winedbg/be_sparc.c deleted file mode 100644 index 3d5ce36..0000000 --- a/programs/winedbg/be_sparc.c +++ /dev/null @@ -1,185 +0,0 @@ -/* - * Debugger Sparc specific functions - * - * Copyright 2010 Austin English - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "debugger.h" - -#if defined(__sparc__) - -static unsigned be_sparc_get_addr(HANDLE hThread, const CONTEXT* ctx, - enum be_cpu_addr bca, ADDRESS64* addr) -{ - switch (bca) - { - case be_cpu_addr_pc: - return be_cpu_build_addr(hThread, ctx, addr, 0, ctx->pc); - case be_cpu_addr_stack: - return be_cpu_build_addr(hThread, ctx, addr, 0, ctx->o6); - case be_cpu_addr_frame: - return be_cpu_build_addr(hThread, ctx, addr, 0, ctx->i6); - } - return FALSE; -} - -static unsigned be_sparc_get_register_info(int regno, enum be_cpu_addr* kind) -{ - dbg_printf("not done for Sparc\n"); - return FALSE; -} - -static void be_sparc_single_step(CONTEXT* ctx, unsigned enable) -{ - dbg_printf("not done for Sparc\n"); -} - -static void be_sparc_print_context(HANDLE hThread, const CONTEXT* ctx, int all_regs) -{ - dbg_printf("not done for Sparc\n"); -} - -static void be_sparc_print_segment_info(HANDLE hThread, const CONTEXT* ctx) -{ - dbg_printf("not done for Sparc\n"); -} - -static struct dbg_internal_var be_sparc_ctx[] = -{ - {0, NULL, 0, dbg_itype_none} -}; - -static unsigned be_sparc_is_step_over_insn(const void* insn) -{ - dbg_printf("not done for Sparc\n"); - return FALSE; -} - -static unsigned be_sparc_is_function_return(const void* insn) -{ - dbg_printf("not done for Sparc\n"); - return FALSE; -} - -static unsigned be_sparc_is_break_insn(const void* insn) -{ - dbg_printf("not done for Sparc\n"); - return FALSE; -} - -static unsigned be_sparc_is_func_call(const void* insn, ADDRESS64* callee) -{ - return FALSE; -} - -static unsigned be_sparc_is_jump(const void* insn, ADDRESS64* jumpee) -{ - return FALSE; -} - -static void be_sparc_disasm_one_insn(ADDRESS64* addr, int display) -{ - dbg_printf("not done for Sparc\n"); -} - -static unsigned be_sparc_insert_Xpoint(HANDLE hProcess, const struct be_process_io* pio, - CONTEXT* ctx, enum be_xpoint_type type, - void* addr, unsigned long* val, unsigned size) -{ - dbg_printf("not done for Sparc\n"); - return 0; -} - -static unsigned be_sparc_remove_Xpoint(HANDLE hProcess, const struct be_process_io* pio, - CONTEXT* ctx, enum be_xpoint_type type, - void* addr, unsigned long val, unsigned size) -{ - dbg_printf("not done for Sparc\n"); - return FALSE; -} - -static unsigned be_sparc_is_watchpoint_set(const CONTEXT* ctx, unsigned idx) -{ - dbg_printf("not done for Sparc\n"); - return FALSE; -} - -static void be_sparc_clear_watchpoint(CONTEXT* ctx, unsigned idx) -{ - dbg_printf("not done for Sparc\n"); -} - -static int be_sparc_adjust_pc_for_break(CONTEXT* ctx, BOOL way) -{ - if (way) - { - ctx->pc--; - return -1; - } - ctx->pc++; - return 1; -} - -static int be_sparc_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size, - unsigned ext_sign, LONGLONG* ret) -{ - dbg_printf("not done for Sparc\n"); - return FALSE; -} - -static int be_sparc_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, - long double* ret) -{ - dbg_printf("not done for Sparc\n"); - return FALSE; -} - -static int be_sparc_store_integer(const struct dbg_lvalue* lvalue, unsigned size, - unsigned is_signed, LONGLONG val) -{ - dbg_printf("be_sparc_store_integer: not done\n"); - return FALSE; -} - -struct backend_cpu be_sparc = -{ - IMAGE_FILE_MACHINE_SPARC, - 4, - be_cpu_linearize, - be_cpu_build_addr, - be_sparc_get_addr, - be_sparc_get_register_info, - be_sparc_single_step, - be_sparc_print_context, - be_sparc_print_segment_info, - be_sparc_ctx, - be_sparc_is_step_over_insn, - be_sparc_is_function_return, - be_sparc_is_break_insn, - be_sparc_is_func_call, - be_sparc_is_jump, - be_sparc_disasm_one_insn, - be_sparc_insert_Xpoint, - be_sparc_remove_Xpoint, - be_sparc_is_watchpoint_set, - be_sparc_clear_watchpoint, - be_sparc_adjust_pc_for_break, - be_sparc_fetch_integer, - be_sparc_fetch_float, - be_sparc_store_integer, -}; -#endif diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 66ff6a8..06ace0c 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -337,42 +337,6 @@ static struct cpu_register cpu_register_map[] = { REG(SegFs, 4), REG(SegGs, 4), }; -#elif defined(__sparc__) -static const char target_xml[] = ""; -static struct cpu_register cpu_register_map[] = { - REG(g0, 4), - REG(g1, 4), - REG(g2, 4), - REG(g3, 4), - REG(g4, 4), - REG(g5, 4), - REG(g6, 4), - REG(g7, 4), - REG(o0, 4), - REG(o1, 4), - REG(o2, 4), - REG(o3, 4), - REG(o4, 4), - REG(o5, 4), - REG(o6, 4), - REG(o7, 4), - REG(l0, 4), - REG(l1, 4), - REG(l2, 4), - REG(l3, 4), - REG(l4, 4), - REG(l5, 4), - REG(l6, 4), - REG(l7, 4), - REG(i0, 4), - REG(i1, 4), - REG(i2, 4), - REG(i3, 4), - REG(i4, 4), - REG(i5, 4), - REG(i6, 4), - REG(i7, 4), -}; #elif defined(__arm__) static const char target_xml[] = "l <target><architecture>arm</architecture>\n" diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index ec97d07..a264a67 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -684,8 +684,6 @@ static void output_system_info(void) static const char platform[] = "i386"; #elif defined(__x86_64__) static const char platform[] = "x86_64"; -#elif defined(__sparc__) - static const char platform[] = "sparc"; #elif defined(__powerpc__) static const char platform[] = "powerpc"; #elif defined(__arm__) diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index fa89afb..ba72916 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -616,8 +616,6 @@ extern struct backend_cpu be_i386; extern struct backend_cpu be_ppc; #elif defined(__x86_64__) extern struct backend_cpu be_x86_64; -#elif defined(__sparc__) -extern struct backend_cpu be_sparc; #elif defined(__arm__) && !defined(__ARMEB__) extern struct backend_cpu be_arm; #elif defined(__aarch64__) && !defined(__AARCH64EB__) @@ -638,8 +636,6 @@ int main(int argc, char** argv) be_cpu = &be_ppc; #elif defined(__x86_64__) be_cpu = &be_x86_64; -#elif defined(__sparc__) - be_cpu = &be_sparc; #elif defined(__arm__) && !defined(__ARMEB__) be_cpu = &be_arm; #elif defined(__aarch64__) && !defined(__AARCH64EB__)

1 0

Dmitry Timoshkov : gdiplus: Protect from mixing BrushTypeLinearGradient and BrushTypePathGradient.
by Alexandre Julliard 11 Mar '13

11 Mar '13

Module: wine Branch: master Commit: 2cca510a5b098a77fa4f646837bab886c3e494d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cca510a5b098a77fa4f64683… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 11 17:33:24 2013 +0900 gdiplus: Protect from mixing BrushTypeLinearGradient and BrushTypePathGradient. --- dlls/gdiplus/brush.c | 89 +++++++++++++++++++++++++------------------------ 1 files changed, 45 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2cca510a5b098a77fa4f6…

1 0

Dmitry Timoshkov : gdiplus: Print a passed in rectangle in GdipCombineRegionRect.
by Alexandre Julliard 11 Mar '13

11 Mar '13

Module: wine Branch: master Commit: 65bd8f2b262075938324ec2689e667aca96350cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=65bd8f2b262075938324ec268… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 11 17:31:52 2013 +0900 gdiplus: Print a passed in rectangle in GdipCombineRegionRect. --- dlls/gdiplus/region.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 5583514..99c5d35 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -282,7 +282,7 @@ GpStatus WINGDIPAPI GdipCombineRegionRect(GpRegion *region, region_element *left, *right = NULL; GpStatus stat; - TRACE("%p %p %d\n", region, rect, mode); + TRACE("%p %s %d\n", region, debugstr_rectf(rect), mode); if (!(region && rect)) return InvalidParameter;

1 0

Nikolay Sivov : xmllite: Fix a test failure on Windows 8.
by Alexandre Julliard 11 Mar '13

11 Mar '13

Module: wine Branch: master Commit: e5a48b2d75bd9669ae6c78f4090fc385e36937b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5a48b2d75bd9669ae6c78f40… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 11 08:49:28 2013 +0400 xmllite: Fix a test failure on Windows 8. --- dlls/xmllite/reader.c | 2 ++ dlls/xmllite/tests/reader.c | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 16734d4..92ab215 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2246,6 +2246,8 @@ static HRESULT WINAPI xmlreader_GetValue(IXmlReader* iface, LPCWSTR *value, UINT TRACE("(%p)->(%p %p)\n", This, value, len); + *value = NULL; + if ((This->nodetype == XmlNodeType_Comment && !This->strvalues[StringValue_Value].str) || is_reader_pending(This)) { diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 7373a69..b0a14d3 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1238,16 +1238,16 @@ static void test_read_pending(void) int c; hr = pCreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); - ok(hr == S_OK, "S_OK, got %08x\n", hr); + ok(hr == S_OK, "S_OK, got 0x%08x\n", hr); hr = IXmlReader_SetInput(reader, (IUnknown*)&teststream); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "got 0x%08x\n", hr); /* first read call returns incomplete node, second attempt fails with E_PENDING */ stream_readcall = 0; type = XmlNodeType_Element; hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK || broken(hr == E_PENDING), "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK || broken(hr == E_PENDING), "got 0x%08x\n", hr); /* newer versions are happy when it's enough data to detect node type, older versions keep reading until it fails to read more */ ok(stream_readcall == 1 || broken(stream_readcall > 1), "got %d\n", stream_readcall); @@ -1257,8 +1257,8 @@ static void test_read_pending(void) c = stream_readcall; value = (void*)0xdeadbeef; hr = IXmlReader_GetValue(reader, &value, NULL); - ok(hr == E_PENDING, "Expected E_PENDING, got %08x\n", hr); - ok(value == (void*)0xdeadbeef, "got %p\n", value); + ok(hr == E_PENDING, "got 0x%08x\n", hr); + ok(value == NULL || broken(value == (void*)0xdeadbeef) /* Win8 sets it to NULL */, "got %p\n", value); ok(c < stream_readcall || broken(c == stream_readcall), "got %d, expected %d\n", stream_readcall, c+1); IXmlReader_Release(reader);

1 0

Nikolay Sivov : xmllite: Make another read attempt if we don' t have enough data initially.
by Alexandre Julliard 11 Mar '13

11 Mar '13

Module: wine Branch: master Commit: 88d7b66be2716e8c8374d7a45bd823f7e6430026 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88d7b66be2716e8c8374d7a45… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 11 08:45:53 2013 +0400 xmllite: Make another read attempt if we don't have enough data initially. --- dlls/xmllite/reader.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 688497c..16734d4 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -610,7 +610,12 @@ static HRESULT readerinput_detectencoding(xmlreaderinput *readerinput, xml_encod *enc = XmlEncoding_Unknown; - if (buffer->written <= 3) return MX_E_INPUTEND; + if (buffer->written <= 3) + { + HRESULT hr = readerinput_growraw(readerinput); + if (FAILED(hr)) return hr; + if (buffer->written <= 3) return MX_E_INPUTEND; + } /* try start symbols if we have enough data to do that, input buffer should contain first chunk already */

1 0

Nikolay Sivov : xmllite: Support resuming to comments and PIs while on Content part.
by Alexandre Julliard 11 Mar '13

11 Mar '13

Module: wine Branch: master Commit: 9377514583bd3959eee32e0074c5b27293e35d9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9377514583bd3959eee32e007… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 10 18:32:00 2013 +0400 xmllite: Support resuming to comments and PIs while on Content part. --- dlls/xmllite/reader.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 6fd0f69..688497c 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1849,6 +1849,11 @@ static HRESULT reader_parse_content(xmlreader *reader) { case XmlReadResumeState_CDATA: return reader_parse_cdata(reader); + case XmlReadResumeState_Comment: + return reader_parse_comment(reader); + case XmlReadResumeState_PIBody: + case XmlReadResumeState_PITarget: + return reader_parse_pi(reader); default: ERR("unknown resume state %d\n", reader->resumestate); }

1 0

Nikolay Sivov : xmllite: Support CDATA nodes.
by Alexandre Julliard 11 Mar '13

11 Mar '13

Module: wine Branch: master Commit: 4d1a65c1ba209ae0d54e3f442c1cfb3fdc43a85a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d1a65c1ba209ae0d54e3f442… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 10 18:29:43 2013 +0400 xmllite: Support CDATA nodes. --- dlls/xmllite/reader.c | 61 ++++++++++++++++++++++++++++++-- dlls/xmllite/tests/reader.c | 83 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 141 insertions(+), 3 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 9216127..6fd0f69 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -63,6 +63,7 @@ typedef enum XmlReadResumeState_Initial, XmlReadResumeState_PITarget, XmlReadResumeState_PIBody, + XmlReadResumeState_CDATA, XmlReadResumeState_Comment, XmlReadResumeState_STag } XmlReaderResumeState; @@ -72,7 +73,7 @@ typedef enum { XmlReadResume_Name, /* PITarget, name for NCName, prefix for QName */ XmlReadResume_Local, /* local for QName */ - XmlReadResume_Body, /* PI body, comment text */ + XmlReadResume_Body, /* PI body, comment text, CDATA text */ XmlReadResume_Last } XmlReaderResume; @@ -1772,8 +1773,51 @@ static HRESULT reader_parse_endtag(xmlreader *reader) [21] CDEnd ::= ']]>' */ static HRESULT reader_parse_cdata(xmlreader *reader) { - FIXME("CDATA sections are 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 + { + /* skip markup '<![CDATA[' */ + reader_skipn(reader, 9); + reader_shrink(reader); + ptr = start = reader_get_cur(reader); + reader->nodetype = XmlNodeType_CDATA; + reader->resume[XmlReadResume_Body] = start; + reader->resumestate = XmlReadResumeState_CDATA; + reader_set_strvalue(reader, StringValue_LocalName, NULL); + reader_set_strvalue(reader, StringValue_QualifiedName, NULL); + reader_set_strvalue(reader, StringValue_Value, NULL); + } + + while (*ptr) + { + if (*ptr == ']' && *(ptr+1) == ']' && *(ptr+2) == '>') + { + strval value = { start, ptr-start }; + + TRACE("%s\n", debugstr_wn(start, ptr-start)); + /* skip ']]>' */ + reader_skipn(reader, 3); + reader_set_strvalue(reader, StringValue_LocalName, &strval_empty); + reader_set_strvalue(reader, StringValue_QualifiedName, &strval_empty); + reader_set_strvalue(reader, StringValue_Value, &value); + reader->resume[XmlReadResume_Body] = NULL; + reader->resumestate = XmlReadResumeState_Initial; + return S_OK; + } + else + { + reader_skipn(reader, 1); + ptr++; + } + } + + return S_OK; } /* [66] CharRef ::= '&#' [0-9]+ ';' | '&#x' [0-9a-fA-F]+ ';' @@ -1799,6 +1843,17 @@ static HRESULT reader_parse_content(xmlreader *reader) static const WCHAR etagW[] = {'<','/',0}; static const WCHAR ampW[] = {'&',0}; + if (reader->resumestate != XmlReadResumeState_Initial) + { + switch (reader->resumestate) + { + case XmlReadResumeState_CDATA: + return reader_parse_cdata(reader); + default: + ERR("unknown resume state %d\n", reader->resumestate); + } + } + reader_shrink(reader); /* handle end tag here, it indicates end of content as well */ diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 9829452..7373a69 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1318,6 +1318,88 @@ todo_wine IXmlReader_Release(reader); } +static struct test_entry cdata_tests[] = { + { "<a><![CDATA[ ]]data ]]></a>", "", " ]]data ", S_OK }, + { "<a><![CDATA[<![CDATA[ data ]]]]></a>", "", "<![CDATA[ data ]]", S_OK }, + { NULL } +}; + +static void test_read_cdata(void) +{ + struct test_entry *test = cdata_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_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 == 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); + + 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); + ok(len == strlen(test->value), "got %u\n", len); + str_exp = a2w(test->value); + 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; @@ -1334,6 +1416,7 @@ START_TEST(reader) test_reader_create(); test_readerinput(); test_reader_state(); + test_read_cdata(); test_read_comment(); test_read_pi(); test_read_dtd();

1 0

Nikolay Sivov : xmllite: Actually resume comment and PI parsing while on Misc part.
by Alexandre Julliard 11 Mar '13

11 Mar '13

Module: wine Branch: master Commit: c38c471b644d571c038fbee6fcdd1ed1772edb81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c38c471b644d571c038fbee6f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 10 15:45:38 2013 +0400 xmllite: Actually resume comment and PI parsing while on Misc part. --- dlls/xmllite/reader.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 489d346..9216127 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -63,6 +63,7 @@ typedef enum XmlReadResumeState_Initial, XmlReadResumeState_PITarget, XmlReadResumeState_PIBody, + XmlReadResumeState_Comment, XmlReadResumeState_STag } XmlReaderResumeState; @@ -1064,6 +1065,7 @@ static HRESULT reader_parse_comment(xmlreader *reader) ptr = start = reader_get_cur(reader); reader->nodetype = XmlNodeType_Comment; reader->resume[XmlReadResume_Body] = start; + reader->resumestate = XmlReadResumeState_Comment; reader_set_strvalue(reader, StringValue_LocalName, NULL); reader_set_strvalue(reader, StringValue_QualifiedName, NULL); reader_set_strvalue(reader, StringValue_Value, NULL); @@ -1088,6 +1090,7 @@ static HRESULT reader_parse_comment(xmlreader *reader) reader_set_strvalue(reader, StringValue_QualifiedName, &strval_empty); reader_set_strvalue(reader, StringValue_Value, &value); reader->resume[XmlReadResume_Body] = NULL; + reader->resumestate = XmlReadResumeState_Initial; return S_OK; } else @@ -1354,14 +1357,22 @@ static HRESULT reader_parse_misc(xmlreader *reader) { HRESULT hr = S_FALSE; - if (is_reader_pending(reader)) + if (reader->resumestate != XmlReadResumeState_Initial) { hr = reader_more(reader); if (FAILED(hr)) return hr; /* finish current node */ - if (reader->nodetype == XmlNodeType_Comment) + switch (reader->resumestate) + { + case XmlReadResumeState_PITarget: + case XmlReadResumeState_PIBody: + return reader_parse_pi(reader); + case XmlReadResumeState_Comment: return reader_parse_comment(reader); + default: + ERR("unknown resume state %d\n", reader->resumestate); + } } while (1)

1 0

Nikolay Sivov : xmllite: Support resuming for start tag.
by Alexandre Julliard 11 Mar '13

11 Mar '13

Module: wine Branch: master Commit: c87a85cce37a239161924854042bf2c4d33923e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c87a85cce37a2391619248540… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 10 13:28:38 2013 +0400 xmllite: Support resuming for start tag. --- dlls/xmllite/reader.c | 166 +++++++++++++++++++++++++++++++------------ dlls/xmllite/tests/reader.c | 2 +- 2 files changed, 121 insertions(+), 47 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index b4a7f33..489d346 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -62,14 +62,16 @@ typedef enum { XmlReadResumeState_Initial, XmlReadResumeState_PITarget, - XmlReadResumeState_PIBody + XmlReadResumeState_PIBody, + XmlReadResumeState_STag } XmlReaderResumeState; /* saved pointer index to resume from particular input position */ typedef enum { - XmlReadResume_Name, /* PITarget */ - XmlReadResume_Body, /* PI body, comment text */ + XmlReadResume_Name, /* PITarget, name for NCName, prefix for QName */ + XmlReadResume_Local, /* local for QName */ + XmlReadResume_Body, /* PI body, comment text */ XmlReadResume_Last } XmlReaderResume; @@ -1525,17 +1527,20 @@ static HRESULT reader_parse_dtd(xmlreader *reader) return S_OK; } -/* [7 NS] QName ::= PrefixedName | UnprefixedName - [8 NS] PrefixedName ::= Prefix ':' LocalPart - [9 NS] UnprefixedName ::= LocalPart - [10 NS] Prefix ::= NCName - [11 NS] LocalPart ::= NCName */ -static HRESULT reader_parse_qname(xmlreader *reader, strval *prefix, strval *local, strval *qname) +/* [11 NS] LocalPart ::= NCName */ +static HRESULT reader_parse_local(xmlreader *reader, strval *local) { - WCHAR *ptr, *start = reader_get_cur(reader); + WCHAR *ptr, *start; - ptr = start; - if (!is_ncnamechar(*ptr)) return NC_E_QNAMECHARACTER; + if (reader->resume[XmlReadResume_Local]) + { + start = reader->resume[XmlReadResume_Local]; + ptr = reader_get_cur(reader); + } + else + { + ptr = start = reader_get_cur(reader); + } while (is_ncnamechar(*ptr)) { @@ -1543,25 +1548,79 @@ static HRESULT reader_parse_qname(xmlreader *reader, strval *prefix, strval *loc ptr = reader_get_cur(reader); } - /* got a qualified name */ - if (*ptr == ':') + if (is_reader_pending(reader)) { - prefix->str = start; - prefix->len = ptr-start; + reader->resume[XmlReadResume_Local] = start; + return E_PENDING; + } + else + reader->resume[XmlReadResume_Local] = NULL; - reader_skipn(reader, 1); - start = ptr = reader_get_cur(reader); + local->str = start; + local->len = ptr-start; + + return S_OK; +} +/* [7 NS] QName ::= PrefixedName | UnprefixedName + [8 NS] PrefixedName ::= Prefix ':' LocalPart + [9 NS] UnprefixedName ::= LocalPart + [10 NS] Prefix ::= NCName */ +static HRESULT reader_parse_qname(xmlreader *reader, strval *prefix, strval *local, strval *qname) +{ + WCHAR *ptr, *start; + HRESULT hr; + + if (reader->resume[XmlReadResume_Name]) + { + start = reader->resume[XmlReadResume_Name]; + ptr = reader_get_cur(reader); + } + else + { + ptr = start = reader_get_cur(reader); + reader->resume[XmlReadResume_Name] = start; + if (!is_ncnamechar(*ptr)) return NC_E_QNAMECHARACTER; + } + + if (reader->resume[XmlReadResume_Local]) + { + hr = reader_parse_local(reader, local); + if (FAILED(hr)) return hr; + + prefix->str = reader->resume[XmlReadResume_Name]; + prefix->len = local->str - prefix->str - 1; + } + else + { + /* skip prefix part */ while (is_ncnamechar(*ptr)) { reader_skipn(reader, 1); ptr = reader_get_cur(reader); } - } - else - { - prefix->str = NULL; - prefix->len = 0; + + if (is_reader_pending(reader)) return E_PENDING; + + /* got a qualified name */ + if (*ptr == ':') + { + prefix->str = start; + prefix->len = ptr-start; + + /* skip ':' */ + reader_skipn(reader, 1); + hr = reader_parse_local(reader, local); + if (FAILED(hr)) return hr; + } + else + { + local->str = reader->resume[XmlReadResume_Name]; + local->len = ptr-local->str; + + prefix->str = NULL; + prefix->len = 0; + } } local->str = start; @@ -1576,6 +1635,9 @@ static HRESULT reader_parse_qname(xmlreader *reader, strval *prefix, strval *loc /* count ':' too */ qname->len = (prefix->len ? prefix->len + 1 : 0) + local->len; + reader->resume[XmlReadResume_Name] = NULL; + reader->resume[XmlReadResume_Local] = NULL; + return S_OK; } @@ -1586,9 +1648,6 @@ static HRESULT reader_parse_stag(xmlreader *reader, strval *prefix, strval *loca static const WCHAR endW[] = {'/','>',0}; HRESULT hr; - /* skip '<' */ - reader_skipn(reader, 1); - hr = reader_parse_qname(reader, prefix, local, qname); if (FAILED(hr)) return hr; @@ -1617,32 +1676,47 @@ static HRESULT reader_parse_stag(xmlreader *reader, strval *prefix, strval *loca /* [39] element ::= EmptyElemTag | STag content ETag */ static HRESULT reader_parse_element(xmlreader *reader) { - strval qname, prefix, local; HRESULT hr; - int empty; - /* check if we are really on element */ - if (reader_cmp(reader, ltW)) return S_FALSE; - reader_shrink(reader); + switch (reader->resumestate) + { + case XmlReadResumeState_Initial: + /* check if we are really on element */ + if (reader_cmp(reader, ltW)) return S_FALSE; - /* this handles empty elements too */ - empty = 0; - hr = reader_parse_stag(reader, &prefix, &local, &qname, &empty); - if (FAILED(hr)) return hr; + /* skip '<' */ + reader_skipn(reader, 1); - /* FIXME: need to check for defined namespace to reject invalid prefix, - currently reject all prefixes */ - if (prefix.len) return NC_E_UNDECLAREDPREFIX; + reader_shrink(reader); + reader->resumestate = XmlReadResumeState_STag; + case XmlReadResumeState_STag: + { + strval qname, prefix, local; + int empty = 0; - /* if we got empty element and stack is empty go straight to Misc */ - if (empty && list_empty(&reader->elements)) - reader->instate = XmlReadInState_MiscEnd; - else - reader->instate = XmlReadInState_Content; + /* this handles empty elements too */ + hr = reader_parse_stag(reader, &prefix, &local, &qname, &empty); + if (FAILED(hr)) return hr; - reader->nodetype = XmlNodeType_Element; - reader_set_strvalue(reader, StringValue_LocalName, &local); - reader_set_strvalue(reader, StringValue_QualifiedName, &qname); + /* FIXME: need to check for defined namespace to reject invalid prefix, + currently reject all prefixes */ + if (prefix.len) return NC_E_UNDECLAREDPREFIX; + + /* if we got empty element and stack is empty go straight to Misc */ + if (empty && list_empty(&reader->elements)) + reader->instate = XmlReadInState_MiscEnd; + else + reader->instate = XmlReadInState_Content; + + reader->nodetype = XmlNodeType_Element; + reader->resumestate = XmlReadResumeState_Initial; + reader_set_strvalue(reader, StringValue_LocalName, &local); + reader_set_strvalue(reader, StringValue_QualifiedName, &qname); + break; + } + default: + hr = E_FAIL; + } return hr; } diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 77e596a..9829452 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -994,7 +994,7 @@ static void test_read_full(void) hr = IXmlReader_Read(reader, &type); i++; } - ok(test->types[i] == XmlNodeType_None, "incomplete sequence\n"); + ok(test->types[i] == XmlNodeType_None, "incomplete sequence, got %d\n", test->types[i]); IStream_Release(stream); IXmlReader_Release(reader);

1 0

Nikolay Sivov : xmllite: Support pending input reads for PI nodes.
by Alexandre Julliard 11 Mar '13

11 Mar '13

Module: wine Branch: master Commit: d1c52fe168c24ac61223b63cc41a10c63491271a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1c52fe168c24ac61223b63cc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 8 14:10:26 2013 +0400 xmllite: Support pending input reads for PI nodes. --- dlls/xmllite/reader.c | 99 +++++++++++++++++++++++++++++++++---------- dlls/xmllite/tests/reader.c | 1 + 2 files changed, 78 insertions(+), 22 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index c6f416d..b4a7f33 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -56,6 +56,23 @@ typedef enum XmlReadInState_MiscEnd } XmlReaderInternalState; +/* This state denotes where parsing was interrupted by input problem. + Reader resumes parsing using this information. */ +typedef enum +{ + XmlReadResumeState_Initial, + XmlReadResumeState_PITarget, + XmlReadResumeState_PIBody +} XmlReaderResumeState; + +/* saved pointer index to resume from particular input position */ +typedef enum +{ + XmlReadResume_Name, /* PITarget */ + XmlReadResume_Body, /* PI body, comment text */ + XmlReadResume_Last +} XmlReaderResume; + typedef enum { StringValue_LocalName, @@ -146,6 +163,7 @@ typedef struct IMalloc *imalloc; XmlReadState state; XmlReaderInternalState instate; + XmlReaderResumeState resumestate; XmlNodeType nodetype; DtdProcessing dtdmode; UINT line, pos; /* reader position in XML stream */ @@ -155,7 +173,7 @@ typedef struct struct list elements; strval strvalues[StringValue_Last]; UINT depth; - WCHAR *save; + WCHAR *resume[XmlReadResume_Last]; /* pointers used to resume reader */ } xmlreader; struct input_buffer @@ -1031,9 +1049,9 @@ static HRESULT reader_parse_comment(xmlreader *reader) { WCHAR *start, *ptr; - if (reader->save) + if (reader->resume[XmlReadResume_Body]) { - start = reader->save; + start = reader->resume[XmlReadResume_Body]; ptr = reader_get_cur(reader); } else @@ -1043,7 +1061,7 @@ static HRESULT reader_parse_comment(xmlreader *reader) reader_shrink(reader); ptr = start = reader_get_cur(reader); reader->nodetype = XmlNodeType_Comment; - reader->save = start; + reader->resume[XmlReadResume_Body] = start; reader_set_strvalue(reader, StringValue_LocalName, NULL); reader_set_strvalue(reader, StringValue_QualifiedName, NULL); reader_set_strvalue(reader, StringValue_Value, NULL); @@ -1067,7 +1085,7 @@ static HRESULT reader_parse_comment(xmlreader *reader) reader_set_strvalue(reader, StringValue_LocalName, &strval_empty); reader_set_strvalue(reader, StringValue_QualifiedName, &strval_empty); reader_set_strvalue(reader, StringValue_Value, &value); - reader->save = NULL; + reader->resume[XmlReadResume_Body] = NULL; return S_OK; } else @@ -1166,10 +1184,18 @@ static inline int is_namechar(WCHAR ch) [5] Name ::= NameStartChar (NameChar)* */ static HRESULT reader_parse_name(xmlreader *reader, strval *name) { - WCHAR *ptr, *start = reader_get_cur(reader); + WCHAR *ptr, *start; - ptr = start; - if (!is_namestartchar(*ptr)) return WC_E_NAMECHARACTER; + if (reader->resume[XmlReadResume_Name]) + { + start = reader->resume[XmlReadResume_Name]; + ptr = reader_get_cur(reader); + } + else + { + ptr = start = reader_get_cur(reader); + if (!is_namestartchar(*ptr)) return WC_E_NAMECHARACTER; + } while (is_namechar(*ptr)) { @@ -1177,6 +1203,14 @@ static HRESULT reader_parse_name(xmlreader *reader, strval *name) ptr = reader_get_cur(reader); } + if (is_reader_pending(reader)) + { + reader->resume[XmlReadResume_Name] = start; + return E_PENDING; + } + else + reader->resume[XmlReadResume_Name] = NULL; + TRACE("name %s:%d\n", debugstr_wn(start, ptr-start), (int)(ptr-start)); name->str = start; name->len = ptr-start; @@ -1193,7 +1227,7 @@ static HRESULT reader_parse_pitarget(xmlreader *reader, strval *target) UINT i; hr = reader_parse_name(reader, &name); - if (FAILED(hr)) return WC_E_PI; + if (FAILED(hr)) return is_reader_pending(reader) ? E_PENDING : WC_E_PI; /* now that we got name check for illegal content */ if (name.len == 3 && !strncmpiW(name.str, xmlW, 3)) @@ -1216,12 +1250,20 @@ static HRESULT reader_parse_pi(xmlreader *reader) strval target; HRESULT hr; - /* skip '<?' */ - reader_skipn(reader, 2); - reader_shrink(reader); - - hr = reader_parse_pitarget(reader, &target); - if (FAILED(hr)) return hr; + switch (reader->resumestate) + { + case XmlReadResumeState_Initial: + /* skip '<?' */ + reader_skipn(reader, 2); + reader_shrink(reader); + reader->resumestate = XmlReadResumeState_PITarget; + case XmlReadResumeState_PITarget: + hr = reader_parse_pitarget(reader, &target); + if (FAILED(hr)) return hr; + reader->resumestate = XmlReadResumeState_PIBody; + default: + ; + } ptr = reader_get_cur(reader); /* exit earlier if there's no content */ @@ -1230,17 +1272,26 @@ static HRESULT reader_parse_pi(xmlreader *reader) /* skip '?>' */ reader_skipn(reader, 2); reader->nodetype = XmlNodeType_ProcessingInstruction; + reader->resumestate = XmlReadResumeState_Initial; reader_set_strvalue(reader, StringValue_LocalName, &target); reader_set_strvalue(reader, StringValue_QualifiedName, &target); reader_set_strvalue(reader, StringValue_Value, &strval_empty); return S_OK; } - /* now at least a single space char should be there */ - if (!is_wchar_space(*ptr)) return WC_E_WHITESPACE; - reader_skipspaces(reader); - - ptr = start = reader_get_cur(reader); + if (!reader->resume[XmlReadResume_Body]) + { + /* now at least a single space char should be there */ + if (!is_wchar_space(*ptr)) return WC_E_WHITESPACE; + reader_skipspaces(reader); + ptr = start = reader_get_cur(reader); + reader->resume[XmlReadResume_Body] = start; + } + else + { + start = reader->resume[XmlReadResume_Body]; + ptr = reader_get_cur(reader); + } while (*ptr) { @@ -1254,6 +1305,8 @@ static HRESULT reader_parse_pi(xmlreader *reader) /* skip '?>' */ reader_skipn(reader, 2); reader->nodetype = XmlNodeType_ProcessingInstruction; + reader->resumestate = XmlReadResumeState_Initial; + reader->resume[XmlReadResume_Body] = NULL; reader_set_strvalue(reader, StringValue_LocalName, &target); reader_set_strvalue(reader, StringValue_QualifiedName, &target); reader_set_strvalue(reader, StringValue_Value, &value); @@ -1832,7 +1885,8 @@ static HRESULT WINAPI xmlreader_SetInput(IXmlReader* iface, IUnknown *input) This->line = This->pos = 0; reader_clear_elements(This); This->depth = 0; - This->save = NULL; + This->resumestate = XmlReadResumeState_Initial; + memset(This->resume, 0, sizeof(This->resume)); /* just reset current input */ if (!input) @@ -2255,6 +2309,7 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) reader->input = NULL; reader->state = XmlReadState_Closed; reader->instate = XmlReadInState_Initial; + reader->resumestate = XmlReadResumeState_Initial; reader->dtdmode = DtdProcessing_Prohibit; reader->line = reader->pos = 0; reader->imalloc = imalloc; @@ -2265,7 +2320,7 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) reader->attr = NULL; list_init(&reader->elements); reader->depth = 0; - reader->save = NULL; + memset(reader->resume, 0, sizeof(reader->resume)); for (i = 0; i < StringValue_Last; i++) reader->strvalues[i] = strval_empty; diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 65c3448..77e596a 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -852,6 +852,7 @@ static void test_read_comment(void) static struct test_entry pi_tests[] = { { "<?pi?>", "pi", "", S_OK }, { "<?pi ?>", "pi", "", S_OK }, + { "<?pi ?>", "pi", "", S_OK }, { "<?pi pi data?>", "pi", "pi data", S_OK }, { "<?pi pi data ?>", "pi", "pi data ", S_OK }, { "<?pi:pi?>", NULL, NULL, NC_E_NAMECOLON, WC_E_NAMECHARACTER },

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
54
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 2013