January 2013 - Wine-commits

André Hentschel : winedbg: Add shifted register dataprocessing operators to Thumb2 disassembler.
by Alexandre Julliard 07 Jan '13

07 Jan '13

Module: wine Branch: master Commit: 2b9555fba8caf5585836283fff017b4fe7a60cc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b9555fba8caf5585836283ff… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 6 18:05:56 2013 +0100 winedbg: Add shifted register dataprocessing operators to Thumb2 disassembler. --- programs/winedbg/be_arm.c | 95 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 95 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 9f6c824..d313ce0 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -1206,6 +1206,100 @@ static UINT thumb2_disasm_dataprocessingmod(UINT inst, ADDRESS64 *addr) } } +static UINT thumb2_disasm_dataprocessingshift(UINT inst, ADDRESS64 *addr) +{ + WORD op = (inst >> 21) & 0x0f; + WORD sf = (inst >> 20) & 0x01; + WORD imm5 = ((inst >> 10) & 0x1c) + ((inst >> 6) & 0x03); + WORD type = (inst >> 4) & 0x03; + + if (!imm5 && (type == 1 || type == 2)) imm5 = 32; + else if (!imm5 && type == 3) type = 4; + + switch (op) + { + case 0: + if (get_nibble(inst, 2) == 15) + dbg_printf("\n\ttst\t%s, %s", tbl_regs[get_nibble(inst, 4)], + tbl_regs[get_nibble(inst, 0)]); + else + dbg_printf("\n\tand%s\t%s, %s, %s", sf ? "s" : "", tbl_regs[get_nibble(inst, 2)], + tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)]); + break; + case 1: + dbg_printf("\n\tbic%s\t%s, %s, %s", sf ? "s" : "", tbl_regs[get_nibble(inst, 2)], + tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)]); + break; + case 2: + if (get_nibble(inst, 4) == 15) + { + if (type == 4) + dbg_printf("\n\trrx%s\t%s, %s", sf ? "s" : "", tbl_regs[get_nibble(inst, 2)], tbl_regs[get_nibble(inst, 0)]); + else if (!type && !imm5) + dbg_printf("\n\tmov%s\t%s, %s", sf ? "s" : "", tbl_regs[get_nibble(inst, 2)], tbl_regs[get_nibble(inst, 0)]); + else + dbg_printf("\n\t%s%s\t%s, %s, #%u", tbl_shifts[type], sf ? "s" : "", tbl_regs[get_nibble(inst, 2)], tbl_regs[get_nibble(inst, 0)], imm5); + return 0; + } + else + dbg_printf("\n\torr%s\t%s, %s, %s", sf ? "s" : "", tbl_regs[get_nibble(inst, 2)], + tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)]); + break; + case 3: + if (get_nibble(inst, 4) == 15) + dbg_printf("\n\tmvn%s\t%s, %s, %s", sf ? "s" : "", tbl_regs[get_nibble(inst, 2)], + tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)]); + else + dbg_printf("\n\torn%s\t%s, %s, %s", sf ? "s" : "", tbl_regs[get_nibble(inst, 2)], + tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)]); + break; + case 4: + if (get_nibble(inst, 2) == 15) + dbg_printf("\n\tteq\t%s, %s", tbl_regs[get_nibble(inst, 4)], + tbl_regs[get_nibble(inst, 0)]); + else + dbg_printf("\n\teor%s\t%s, %s, %s", sf ? "s" : "", tbl_regs[get_nibble(inst, 2)], + tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)]); + break; + case 8: + if (get_nibble(inst, 2) == 15) + dbg_printf("\n\tcmn\t%s, %s", tbl_regs[get_nibble(inst, 4)], + tbl_regs[get_nibble(inst, 0)]); + else + dbg_printf("\n\tadd%s\t%s, %s, %s", sf ? "s" : "", tbl_regs[get_nibble(inst, 2)], + tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)]); + break; + case 10: + dbg_printf("\n\tadc%s\t%s, %s, %s", sf ? "s" : "", tbl_regs[get_nibble(inst, 2)], + tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)]); + break; + case 11: + dbg_printf("\n\tsbc%s\t%s, %s, %s", sf ? "s" : "", tbl_regs[get_nibble(inst, 2)], + tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)]); + break; + case 13: + if (get_nibble(inst, 2) == 15) + dbg_printf("\n\tcmp\t%s, %s", tbl_regs[get_nibble(inst, 4)], + tbl_regs[get_nibble(inst, 0)]); + else + dbg_printf("\n\tsub%s\t%s, %s, %s", sf ? "s" : "", tbl_regs[get_nibble(inst, 2)], + tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)]); + break; + case 14: + dbg_printf("\n\trsb%s\t%s, %s, %s", sf ? "s" : "", tbl_regs[get_nibble(inst, 2)], + tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)]); + break; + default: + return inst; + } + + if (type == 4) + dbg_printf(", rrx"); + else if (type || imm5) + dbg_printf(", %s #%u", tbl_shifts[type], imm5); + return 0; +} + static UINT thumb2_disasm_coprocdat(UINT inst, ADDRESS64 *addr) { WORD opc2 = (inst >> 5) & 0x07; @@ -1444,6 +1538,7 @@ static const struct inst_arm tbl_thumb32[] = { { 0xfe500000, 0xf8100000, thumb2_disasm_ldrnonword }, { 0xfa008000, 0xf2000000, thumb2_disasm_dataprocessing }, { 0xfa008000, 0xf0000000, thumb2_disasm_dataprocessingmod }, + { 0xfe008000, 0xea000000, thumb2_disasm_dataprocessingshift }, { 0xef000010, 0xee000000, thumb2_disasm_coprocdat }, { 0xef000010, 0xee000010, thumb2_disasm_coprocmov1 }, { 0xefe00000, 0xec400000, thumb2_disasm_coprocmov2 },

1 0

André Hentschel : winedbg: Use a switch-case style implementation in thumb2_disasm_dataprocessing.
by Alexandre Julliard 07 Jan '13

07 Jan '13

Module: wine Branch: master Commit: 3a29e876730d6b2b2411e602bef4d9e333931789 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a29e876730d6b2b2411e602b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 6 18:06:31 2013 +0100 winedbg: Use a switch-case style implementation in thumb2_disasm_dataprocessing. --- programs/winedbg/be_arm.c | 31 +++++++++++++++++-------------- 1 files changed, 17 insertions(+), 14 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index d313ce0..520cb06 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -1057,7 +1057,9 @@ static UINT thumb2_disasm_dataprocessing(UINT inst, ADDRESS64 *addr) WORD op = (inst >> 20) & 0x1f; WORD imm5 = ((inst >> 10) & 0x1c) + ((inst >> 6) & 0x03); - if (op == 0) + switch (op) + { + case 0: { WORD offset = ((inst >> 15) & 0x0800) + ((inst >> 4) & 0x0700) + (inst & 0xff); if (get_nibble(inst, 4) == 15) @@ -1070,8 +1072,8 @@ static UINT thumb2_disasm_dataprocessing(UINT inst, ADDRESS64 *addr) tbl_regs[get_nibble(inst, 4)], offset); return 0; } - - if (op == 4 || op == 12) + case 4: + case 12: { WORD offset = ((inst >> 15) & 0x0800) + ((inst >> 4) & 0xf000) + ((inst >> 4) & 0x0700) + (inst & 0xff); @@ -1079,8 +1081,7 @@ static UINT thumb2_disasm_dataprocessing(UINT inst, ADDRESS64 *addr) offset); return 0; } - - if (op == 10) + case 10: { int offset = ((inst >> 15) & 0x0800) + ((inst >> 4) & 0x0700) + (inst & 0xff); if (get_nibble(inst, 4) == 15) @@ -1094,8 +1095,10 @@ static UINT thumb2_disasm_dataprocessing(UINT inst, ADDRESS64 *addr) tbl_regs[get_nibble(inst, 4)], offset); return 0; } - - if (op == 16 || op == 18 || op == 24 || op == 26) + case 16: + case 18: + case 24: + case 26: { BOOL sign = op < 24; WORD sh = (inst >> 21) & 0x01; @@ -1110,16 +1113,15 @@ static UINT thumb2_disasm_dataprocessing(UINT inst, ADDRESS64 *addr) sat, tbl_regs[get_nibble(inst, 4)]); return 0; } - - if (op == 20 || op == 28) + case 20: + case 28: { WORD width = (inst & 0x1f) + 1; dbg_printf("\n\t%s\t%s, %s, #%u, #%u", op == 28 ? "ubfx" : "sbfx", tbl_regs[get_nibble(inst, 2)], tbl_regs[get_nibble(inst, 4)], imm5, width); return 0; } - - if (op == 22) + case 22: { WORD msb = (inst & 0x1f) + 1 - imm5; if (get_nibble(inst, 4) == 15) @@ -1129,15 +1131,16 @@ static UINT thumb2_disasm_dataprocessing(UINT inst, ADDRESS64 *addr) tbl_regs[get_nibble(inst, 4)], imm5, msb); return 0; } - - return inst; + default: + return inst; + } } static UINT thumb2_disasm_dataprocessingmod(UINT inst, ADDRESS64 *addr) { WORD op = (inst >> 21) & 0x0f; WORD sf = (inst >> 20) & 0x01; - WORD offset = ((inst >> 15) & 0x0800) + ((inst >> 4) & 0x0700) + (inst & 0xff); + WORD offset = ((inst >> 15) & 0x0800) + ((inst >> 4) & 0x0700) + (inst & 0xff); /* FIXME: use ThumbExpandImm_C */

1 0

Marcus Meissner : oledb32: Avoid leaking propsets on error paths (Coverity) .
by Alexandre Julliard 07 Jan '13

07 Jan '13

Module: wine Branch: master Commit: 18c51a9c001483daa2033ce0938ef3712622dad7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18c51a9c001483daa2033ce09… Author: Marcus Meissner <meissner(a)suse.de> Date: Sat Jan 5 13:14:08 2013 +0100 oledb32: Avoid leaking propsets on error paths (Coverity). --- dlls/oledb32/datainit.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index c710367..a870bbc 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -293,11 +293,10 @@ static HRESULT set_dbpropset(BSTR name, BSTR value, DBPROPSET **propset) { static const WCHAR datasourceW[] = {'D','a','t','a',' ','S','o','u','r','c','e',0}; - *propset = CoTaskMemAlloc(sizeof(DBPROPSET)); - (*propset)->rgProperties = CoTaskMemAlloc(sizeof(DBPROP)); - if (!strcmpW(datasourceW, name)) { + *propset = CoTaskMemAlloc(sizeof(DBPROPSET)); + (*propset)->rgProperties = CoTaskMemAlloc(sizeof(DBPROP)); (*propset)->cProperties = 1; (*propset)->guidPropertySet = DBPROPSET_DBINIT; (*propset)->rgProperties[0].dwPropertyID = DBPROP_INIT_DATASOURCE; @@ -310,6 +309,7 @@ static HRESULT set_dbpropset(BSTR name, BSTR value, DBPROPSET **propset) } else { + *propset = NULL; FIXME("unsupported property %s\n", debugstr_w(name)); return E_FAIL; }

1 0

Marcus Meissner : advapi32: Close hTemp on error (Coverity).
by Alexandre Julliard 07 Jan '13

07 Jan '13

Module: wine Branch: master Commit: 2bc8e076e06c1c8f1fff458541a02894b9f0c92e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bc8e076e06c1c8f1fff45854… Author: Marcus Meissner <meissner(a)suse.de> Date: Sat Jan 5 23:32:54 2013 +0100 advapi32: Close hTemp on error (Coverity). --- dlls/advapi32/tests/security.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index fbbbd17..1a19d02 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3144,6 +3144,7 @@ static void test_GetNamedSecurityInfoA(void) if (error != ERROR_SUCCESS && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) { win_skip("GetNamedSecurityInfoA is not implemented\n"); + CloseHandle(hTemp); return; } ok(!error, "GetNamedSecurityInfo failed with error %d\n", error);

1 0

Marcus Meissner : winedbg: Free snapshot handle in error path (Coverity).
by Alexandre Julliard 07 Jan '13

07 Jan '13

Module: wine Branch: master Commit: 45eeeb00f36c6e05762847426293ecaa6568115a URL: http://source.winehq.org/git/wine.git/?a=commit;h=45eeeb00f36c6e05762847426… Author: Marcus Meissner <meissner(a)suse.de> Date: Sat Jan 5 23:32:53 2013 +0100 winedbg: Free snapshot handle in error path (Coverity). --- programs/winedbg/info.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index fb60afe..c0b86ba 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -509,7 +509,11 @@ void info_win32_processes(void) dp.count = 0; dp.alloc = 16; dp.entries = HeapAlloc(GetProcessHeap(), 0, sizeof(*dp.entries) * dp.alloc); - if (!dp.entries) return; + if (!dp.entries) + { + CloseHandle(snap); + return; + } dp.entries[dp.count].proc.dwSize = sizeof(dp.entries[dp.count].proc); ok = Process32First(snap, &dp.entries[dp.count].proc);

1 0

Jason Edmeades : cmd: Avoid division by zero in set /a with %.
by Alexandre Julliard 07 Jan '13

07 Jan '13

Module: wine Branch: master Commit: 3735bf6af56ea9e15997dd7e07887666b066472a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3735bf6af56ea9e15997dd7e0… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Sun Jan 6 20:23:53 2013 +0000 cmd: Avoid division by zero in set /a with %. --- programs/cmd/builtins.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 4590769..0937dcd 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -3661,6 +3661,7 @@ static int WCMD_reduce(OPSTACK **opstack, VARSTACK **varstack) { WCMD_pushnumber(NULL, var2&var1, varstack); break; case '%': var2 = WCMD_popnumber(varstack); + if (var1 == 0) return WCMD_DIVIDEBYZERO; WCMD_pushnumber(NULL, var2%var1, varstack); break; case '^': var2 = WCMD_popnumber(varstack);

1 0

Jason Edmeades : cmd: Add beginnings of support for delayed expansion.
by Alexandre Julliard 07 Jan '13

07 Jan '13

Module: wine Branch: master Commit: 0b00b717b9ef2982281fb298c0573515d35c2ea9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b00b717b9ef2982281fb298c… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Sun Jan 6 23:06:28 2013 +0000 cmd: Add beginnings of support for delayed expansion. --- programs/cmd/batch.c | 4 +- programs/cmd/builtins.c | 22 ++++++++ programs/cmd/tests/test_builtins.cmd.exp | 6 +- programs/cmd/tests/test_cmdline.cmd.exp | 2 +- programs/cmd/wcmd.h | 4 +- programs/cmd/wcmdmain.c | 79 +++++++++++++++++++++-------- 6 files changed, 88 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0b00b717b9ef2982281fb…

1 0

Nikolay Sivov : xmllite: Implement PI parsing.
by Alexandre Julliard 07 Jan '13

07 Jan '13

Module: wine Branch: master Commit: 65bcdb2c8063c75f5009c2e4edeb1234a45e322c URL: http://source.winehq.org/git/wine.git/?a=commit;h=65bcdb2c8063c75f5009c2e4e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 6 02:08:27 2013 +0400 xmllite: Implement PI parsing. --- dlls/xmllite/reader.c | 160 ++++++++++++++++++++++++++++++++++++++++-- dlls/xmllite/tests/reader.c | 55 ++++++++++++++- 2 files changed, 205 insertions(+), 10 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index a1ce662..8940a0e 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1,7 +1,7 @@ /* * IXmlReader implementation * - * Copyright 2010, 2012 Nikolay Sivov + * Copyright 2010, 2012-2013 Nikolay Sivov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -80,7 +80,7 @@ typedef struct typedef struct input_buffer input_buffer; -typedef struct _xmlreaderinput +typedef struct { IXmlReaderInput IXmlReaderInput_iface; LONG ref; @@ -110,7 +110,7 @@ struct attribute strval value; }; -typedef struct _xmlreader +typedef struct { IXmlReader IXmlReader_iface; LONG ref; @@ -402,7 +402,7 @@ static void readerinput_grow(xmlreaderinput *readerinput, int length) static HRESULT readerinput_detectencoding(xmlreaderinput *readerinput, xml_encoding *enc) { encoded_buffer *buffer = &readerinput->buffer->encoded; - static char startA[] = {'<','?','x','m'}; + static char startA[] = {'<','?'}; static WCHAR startW[] = {'<','?'}; static char utf8bom[] = {0xef,0xbb,0xbf}; static char utf16lebom[] = {0xff,0xfe}; @@ -807,11 +807,11 @@ static HRESULT reader_parse_sddecl(xmlreader *reader) /* [23] XMLDecl ::= '<?xml' VersionInfo EncodingDecl? SDDecl? S? '?>' */ static HRESULT reader_parse_xmldecl(xmlreader *reader) { - static const WCHAR xmldeclW[] = {'<','?','x','m','l',0}; + static const WCHAR xmldeclW[] = {'<','?','x','m','l',' ',0}; static const WCHAR declcloseW[] = {'?','>',0}; HRESULT hr; - /* check if we have "<?xml" */ + /* check if we have "<?xml " */ if (reader_cmp(reader, xmldeclW)) return S_FALSE; reader_skipn(reader, 5); @@ -879,11 +879,155 @@ static HRESULT reader_parse_comment(xmlreader *reader) return MX_E_INPUTEND; } +static inline int is_namestartchar(WCHAR ch) +{ + return (ch == ':') || (ch >= 'A' && ch <= 'Z') || + (ch == '_') || (ch >= 'a' && ch <= 'z') || + (ch >= 0xc0 && ch <= 0xd6) || + (ch >= 0xd8 && ch <= 0xf6) || + (ch >= 0xf8 && ch <= 0x2ff) || + (ch >= 0x370 && ch <= 0x37d) || + (ch >= 0x37f && ch <= 0x1fff) || + (ch >= 0x200c && ch <= 0x200d) || + (ch >= 0x2070 && ch <= 0x218f) || + (ch >= 0x2c00 && ch <= 0x2fef) || + (ch >= 0x3001 && ch <= 0xd7ff) || + (ch >= 0xd800 && ch <= 0xdbff) || /* high surrogate */ + (ch >= 0xdc00 && ch <= 0xdfff) || /* low surrogate */ + (ch >= 0xf900 && ch <= 0xfdcf) || + (ch >= 0xfdf0 && ch <= 0xfffd); +} + +static inline int is_namechar(WCHAR ch) +{ + return (ch == ':') || (ch >= 'A' && ch <= 'Z') || + (ch == '_') || (ch >= 'a' && ch <= 'z') || + (ch == '-') || (ch == '.') || + (ch >= '0' && ch <= '9') || + (ch == 0xb7) || + (ch >= 0xc0 && ch <= 0xd6) || + (ch >= 0xd8 && ch <= 0xf6) || + (ch >= 0xf8 && ch <= 0x2ff) || + (ch >= 0x300 && ch <= 0x36f) || + (ch >= 0x370 && ch <= 0x37d) || + (ch >= 0x37f && ch <= 0x1fff) || + (ch >= 0x200c && ch <= 0x200d) || + (ch >= 0x203f && ch <= 0x2040) || + (ch >= 0x2070 && ch <= 0x218f) || + (ch >= 0x2c00 && ch <= 0x2fef) || + (ch >= 0x3001 && ch <= 0xd7ff) || + (ch >= 0xd800 && ch <= 0xdbff) || /* high surrogate */ + (ch >= 0xdc00 && ch <= 0xdfff) || /* low surrogate */ + (ch >= 0xf900 && ch <= 0xfdcf) || + (ch >= 0xfdf0 && ch <= 0xfffd); +} + +/* [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] + [4a] NameChar ::= NameStartChar | "-" | "." | [0-9] | #xB7 | [#x0300-#x036F] | [#x203F-#x2040] + [5] Name ::= NameStartChar (NameChar)* */ +static HRESULT reader_parse_name(xmlreader *reader, strval *name) +{ + const WCHAR *ptr, *start = reader_get_cur(reader); + + ptr = start; + if (!is_namestartchar(*ptr)) return WC_E_NAMECHARACTER; + + while (is_namechar(*ptr)) + { + reader_skipn(reader, 1); + ptr = reader_get_cur(reader); + } + + TRACE("name %s:%d\n", debugstr_wn(start, ptr-start), (int)(ptr-start)); + name->str = start; + name->len = ptr-start; + + return S_OK; +} + +/* [17] PITarget ::= Name - (('X' | 'x') ('M' | 'm') ('L' | 'l')) */ +static HRESULT reader_parse_pitarget(xmlreader *reader, strval *target) +{ + static const WCHAR xmlW[] = {'x','m','l'}; + strval name; + HRESULT hr; + int i; + + hr = reader_parse_name(reader, &name); + if (FAILED(hr)) return WC_E_PI; + + /* now that we got name check for illegal content */ + if (name.len == 3 && !strncmpiW(name.str, xmlW, 3)) + return WC_E_LEADINGXML; + + /* PITarget can't be a qualified name */ + for (i = 0; i < name.len; i++) + if (name.str[i] == ':') + return i ? NC_E_NAMECOLON : WC_E_PI; + + TRACE("pitarget %s:%d\n", debugstr_wn(name.str, name.len), name.len); + *target = name; + return S_OK; +} + /* [16] PI ::= '<?' PITarget (S (Char* - (Char* '?>' Char*)))? '?>' */ static HRESULT reader_parse_pi(xmlreader *reader) { - FIXME("PI not supported\n"); - return E_NOTIMPL; + const WCHAR *ptr, *start; + strval target; + HRESULT hr; + + /* skip '<?' */ + reader_skipn(reader, 2); + reader_shrink(reader); + + hr = reader_parse_pitarget(reader, &target); + if (FAILED(hr)) return hr; + + ptr = reader_get_cur(reader); + /* exit earlier if there's no content */ + if (ptr[0] == '?' && ptr[1] == '>') + { + /* skip '?>' */ + reader_skipn(reader, 2); + reader->nodetype = XmlNodeType_ProcessingInstruction; + 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); + + while (*ptr) + { + if (ptr[0] == '?') + { + if (ptr[1] == '>') + { + TRACE("%s\n", debugstr_wn(start, ptr-start)); + /* skip '?>' */ + reader_skipn(reader, 2); + reader->nodetype = XmlNodeType_ProcessingInstruction; + return S_OK; + } + else + { + ptr++; + reader_more(reader); + } + } + else + { + reader_skipn(reader, 1); + ptr = reader_get_cur(reader); + } + } + + return S_OK; } /* [27] Misc ::= Comment | PI | S */ diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 41fc94e..7709e25 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1,7 +1,7 @@ /* - * XMLLite IXmlReader tests + * IXmlReader tests * - * Copyright 2010 (C) Nikolay Sivov + * Copyright 2010, 2012-2013 Nikolay Sivov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -750,6 +750,56 @@ static void test_read_comment(void) IXmlReader_Release(reader); } +struct test_entry { + const char *xml; + HRESULT hr; + HRESULT hr_broken; /* this is set to older version results */ +}; + +static struct test_entry pi_tests[] = { + { "<?pi?>", S_OK }, + { "<?pi ?>", S_OK }, + { "<?pi:pi?>", NC_E_NAMECOLON, WC_E_NAMECHARACTER }, + { "<?:pi ?>", WC_E_PI, WC_E_NAMECHARACTER }, + { "<?-pi ?>", WC_E_PI, WC_E_NAMECHARACTER }, + { "<?xml-stylesheet ?>", S_OK }, + { NULL } +}; + +static void test_read_pi(void) +{ + struct test_entry *test = pi_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); + 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) + ok(type == XmlNodeType_ProcessingInstruction, "got %d for %s\n", type, test->xml); + + IStream_Release(stream); + test++; + } + + IXmlReader_Release(reader); +} + START_TEST(reader) { HRESULT r; @@ -767,6 +817,7 @@ START_TEST(reader) test_readerinput(); test_reader_state(); test_read_comment(); + test_read_pi(); test_read_xmldeclaration(); CoUninitialize();

1 0

Nikolay Sivov : xmllite: Support streams starting with comments, simplify tests.
by Alexandre Julliard 07 Jan '13

07 Jan '13

Module: wine Branch: master Commit: 4c0f142e9283add7bd841bc86bc9574b2e4a2cc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c0f142e9283add7bd841bc86… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 6 02:42:02 2013 +0400 xmllite: Support streams starting with comments, simplify tests. --- dlls/xmllite/reader.c | 8 +++- dlls/xmllite/tests/reader.c | 76 +++++++++++++++++++----------------------- 2 files changed, 40 insertions(+), 44 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 8940a0e..5ca0350 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -403,7 +403,9 @@ static HRESULT readerinput_detectencoding(xmlreaderinput *readerinput, xml_encod { encoded_buffer *buffer = &readerinput->buffer->encoded; static char startA[] = {'<','?'}; + static char commentA[] = {'<','!'}; static WCHAR startW[] = {'<','?'}; + static WCHAR commentW[] = {'<','!'}; static char utf8bom[] = {0xef,0xbb,0xbf}; static char utf16lebom[] = {0xff,0xfe}; @@ -413,9 +415,11 @@ static HRESULT readerinput_detectencoding(xmlreaderinput *readerinput, xml_encod /* try start symbols if we have enough data to do that, input buffer should contain first chunk already */ - if (!memcmp(buffer->data, startA, sizeof(startA))) + if (!memcmp(buffer->data, startA, sizeof(startA)) || + !memcmp(buffer->data, commentA, sizeof(commentA))) *enc = XmlEncoding_UTF8; - else if (!memcmp(buffer->data, startW, sizeof(startW))) + else if (!memcmp(buffer->data, startW, sizeof(startW)) || + !memcmp(buffer->data, commentW, sizeof(commentW))) *enc = XmlEncoding_UTF16; /* try with BOM now */ else if (!memcmp(buffer->data, utf8bom, sizeof(utf8bom))) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 7709e25..9f44ba6 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -701,61 +701,53 @@ todo_wine { IXmlReader_Release(reader); } -static const char xml_comment[] = "\xef\xbb\xbf"; -static const char xml_comment1[] = "\xef\xbb\xbf"; -static const char xml_comment2[] = "\xef\xbb\xbf"; +struct test_entry { + const char *xml; + HRESULT hr; + HRESULT hr_broken; /* this is set to older version results */ +}; + +static struct test_entry comment_tests[] = { + { "", S_OK }, + { "", S_OK }, + { "", WC_E_COMMENT, WC_E_GREATERTHAN }, + { NULL } +}; static void test_read_comment(void) { - HRESULT hr; - IStream *stream; + struct test_entry *test = comment_tests; IXmlReader *reader; - XmlNodeType type; + HRESULT hr; hr = pCreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); ok(hr == S_OK, "S_OK, got %08x\n", hr); - stream = create_stream_on_data(xml_comment, sizeof(xml_comment)); - 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 %08x\n", hr); - ok(type == XmlNodeType_Comment, "got %d\n", type); - - IStream_Release(stream); - - stream = create_stream_on_data(xml_comment1, sizeof(xml_comment1)); - 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 %08x\n", hr); - ok(type == XmlNodeType_Comment, "got %d\n", type); + while (test->xml) + { + XmlNodeType type; + IStream *stream; - IStream_Release(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); - stream = create_stream_on_data(xml_comment2, sizeof(xml_comment2)); - hr = IXmlReader_SetInput(reader, (IUnknown*)stream); - ok(hr == S_OK, "got %08x\n", hr); + 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) + ok(type == XmlNodeType_Comment, "got %d for %s\n", type, test->xml); - type = XmlNodeType_None; - hr = IXmlReader_Read(reader, &type); - ok(hr == WC_E_COMMENT || broken(hr == WC_E_GREATERTHAN), "got %08x\n", hr); - ok(type == XmlNodeType_None, "got %d\n", type); - IStream_Release(stream); + IStream_Release(stream); + test++; + } IXmlReader_Release(reader); } -struct test_entry { - const char *xml; - HRESULT hr; - HRESULT hr_broken; /* this is set to older version results */ -}; - static struct test_entry pi_tests[] = { { "<?pi?>", S_OK }, { "<?pi ?>", S_OK },

1 0

Nikolay Sivov : xmllite: Support name reporting for comments and PIs.
by Alexandre Julliard 07 Jan '13

07 Jan '13

Module: wine Branch: master Commit: 0d715c20248663d536601a3f1a55b5ee378e7813 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d715c20248663d536601a3f1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 7 00:55:36 2013 +0400 xmllite: Support name reporting for comments and PIs. --- dlls/xmllite/reader.c | 91 +++++++++++++++++++++++++++++++++++-------- dlls/xmllite/tests/reader.c | 80 +++++++++++++++++++++++++++++++++---- 2 files changed, 146 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0d715c20248663d536601…

1 0