April 2012 - Wine-commits - list.winehq.org

Nikolay Sivov : msxml3: Fix end prefix iteration for SAXXMLReader40.
by Alexandre Julliard 17 Apr '12

17 Apr '12

Module: wine Branch: master Commit: f9c3a51fd8f6d74b66d00dd0bffc3b2e1f287510 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9c3a51fd8f6d74b66d00dd0b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 16 02:29:18 2012 +0400 msxml3: Fix end prefix iteration for SAXXMLReader40. --- dlls/msxml3/saxreader.c | 2 +- dlls/msxml3/tests/saxreader.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index bcc038b..e15f3e6 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -377,7 +377,7 @@ static inline BOOL sax_callback_failed(saxlocator *This, HRESULT hr) /* index value -1 means it tries to loop for a first time */ static inline BOOL iterate_endprefix_index(saxlocator *This, const element_entry *element, int *i) { - if (This->saxreader->version >= MSXML6) + if (This->saxreader->version >= MSXML4) { if (*i == -1) *i = 0; else ++*i; return *i < element->ns_count; diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index bf2cd61..4e2bd11 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -1844,9 +1844,8 @@ static void test_saxreader(void) hr = ISAXXMLReader_parse(reader, var); EXPECT_HR(hr, S_OK); - if (IsEqualGUID(table->clsid, &CLSID_SAXXMLReader40)) - ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, "content test attributes", TRUE); - else if (IsEqualGUID(table->clsid, &CLSID_SAXXMLReader60)) + if (IsEqualGUID(table->clsid, &CLSID_SAXXMLReader40) || + IsEqualGUID(table->clsid, &CLSID_SAXXMLReader60)) ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, "content test attributes", FALSE); else ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, "content test attributes", TRUE);

1 0

Nikolay Sivov : msxml3: Added IMXAttributes::clear().
by Alexandre Julliard 17 Apr '12

17 Apr '12

Module: wine Branch: master Commit: 6f95c6990af0e009ad43d2cb06e4c3e0629190c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f95c6990af0e009ad43d2cb0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 16 09:32:03 2012 +0400 msxml3: Added IMXAttributes::clear(). --- dlls/msxml3/mxwriter.c | 19 +++++++++++++++++-- dlls/msxml3/tests/saxreader.c | 8 ++++---- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 41979e6..a5b9684 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -1665,8 +1665,23 @@ static HRESULT WINAPI MXAttributes_addAttributeFromIndex(IMXAttributes *iface, static HRESULT WINAPI MXAttributes_clear(IMXAttributes *iface) { mxattributes *This = impl_from_IMXAttributes( iface ); - FIXME("(%p): stub\n", This); - return E_NOTIMPL; + int i; + + TRACE("(%p)\n", This); + + for (i = 0; i < This->length; i++) + { + SysFreeString(This->attr[i].qname); + SysFreeString(This->attr[i].local); + SysFreeString(This->attr[i].uri); + SysFreeString(This->attr[i].type); + SysFreeString(This->attr[i].value); + memset(&This->attr[i], 0, sizeof(mxattribute)); + } + + This->length = 0; + + return S_OK; } static HRESULT WINAPI MXAttributes_removeAttribute(IMXAttributes *iface, int index) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 4e2bd11..afe887c 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -4068,6 +4068,9 @@ static void test_mxattr_clear(void) hr = ISAXAttributes_getQName(saxattr, 0, &ptr, &len); EXPECT_HR(hr, E_INVALIDARG); + hr = IMXAttributes_clear(mxattr); + EXPECT_HR(hr, S_OK); + hr = IMXAttributes_addAttribute(mxattr, _bstr_("uri"), _bstr_("local"), _bstr_("qname"), _bstr_("type"), _bstr_("value")); EXPECT_HR(hr, S_OK); @@ -4094,23 +4097,20 @@ static void test_mxattr_clear(void) ok(!lstrcmpW(ptr, _bstr_("qname")), "got %s\n", wine_dbgstr_w(ptr)); hr = IMXAttributes_clear(mxattr); -todo_wine EXPECT_HR(hr, S_OK); len = -1; hr = ISAXAttributes_getLength(saxattr, &len); EXPECT_HR(hr, S_OK); -todo_wine ok(len == 0, "got %d\n", len); len = -1; ptr = (void*)0xdeadbeef; hr = ISAXAttributes_getQName(saxattr, 0, &ptr, &len); -todo_wine { EXPECT_HR(hr, E_INVALIDARG); ok(len == -1, "got %d\n", len); ok(ptr == (void*)0xdeadbeef, "got %p\n", ptr); -} + IMXAttributes_Release(mxattr); ISAXAttributes_Release(saxattr); free_bstrs();

1 0

Nikolay Sivov : msxml3: Added getIndexFromName() implementation for SAXAttributes.
by Alexandre Julliard 17 Apr '12

17 Apr '12

Module: wine Branch: master Commit: 8dcd01bbeb0b82b8dc28338500ea19f680c080eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dcd01bbeb0b82b8dc2833850… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 16 10:29:34 2012 +0400 msxml3: Added getIndexFromName() implementation for SAXAttributes. --- dlls/msxml3/mxwriter.c | 30 +++++++++++-- dlls/msxml3/tests/saxreader.c | 96 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 121 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index a5b9684..603517e 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -1827,13 +1827,33 @@ static HRESULT WINAPI SAXAttributes_getName(ISAXAttributes *iface, int nIndex, c return E_NOTIMPL; } -static HRESULT WINAPI SAXAttributes_getIndexFromName(ISAXAttributes *iface, const WCHAR * pUri, int cUriLength, - const WCHAR * pLocalName, int cocalNameLength, int * index) +static HRESULT WINAPI SAXAttributes_getIndexFromName(ISAXAttributes *iface, const WCHAR *uri, int uri_len, + const WCHAR *name, int len, int *index) { mxattributes *This = impl_from_ISAXAttributes( iface ); - FIXME("(%p)->(%s:%d %s:%d %p): stub\n", This, debugstr_wn(pUri, cUriLength), cUriLength, - debugstr_wn(pLocalName, cocalNameLength), cocalNameLength, index); - return E_NOTIMPL; + int i; + + TRACE("(%p)->(%s:%d %s:%d %p)\n", This, debugstr_wn(uri, uri_len), uri_len, + debugstr_wn(name, len), len, index); + + if (!index && (This->class_version == MSXML_DEFAULT || This->class_version == MSXML3)) + return E_POINTER; + + if (!uri || !name || !index) return E_INVALIDARG; + + for (i = 0; i < This->length; i++) + { + if (uri_len != SysStringLen(This->attr[i].uri)) continue; + if (strncmpW(uri, This->attr[i].uri, uri_len)) continue; + + if (len != SysStringLen(This->attr[i].local)) continue; + if (strncmpW(name, This->attr[i].local, len)) continue; + + *index = i; + return S_OK; + } + + return E_INVALIDARG; } static HRESULT WINAPI SAXAttributes_getIndexFromQName(ISAXAttributes *iface, const WCHAR *qname, diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index afe887c..41e3775 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -4175,6 +4175,101 @@ static void test_mxattr_qi(void) IVBSAXAttributes_Release(vbsaxattr2); } +static struct msxmlsupported_data_t saxattr_support_data[] = +{ + { &CLSID_SAXAttributes, "SAXAttributes" }, + { &CLSID_SAXAttributes30, "SAXAttributes30" }, + { &CLSID_SAXAttributes40, "SAXAttributes40" }, + { &CLSID_SAXAttributes60, "SAXAttributes60" }, + { NULL } +}; + +static void test_mxattr_localname(void) +{ + static const WCHAR localname1W[] = {'l','o','c','a','l','n','a','m','e','1',0}; + static const WCHAR localnameW[] = {'l','o','c','a','l','n','a','m','e',0}; + static const WCHAR uri1W[] = {'u','r','i','1',0}; + static const WCHAR uriW[] = {'u','r','i',0}; + + const struct msxmlsupported_data_t *table = saxattr_support_data; + + while (table->clsid) + { + ISAXAttributes *saxattr; + IMXAttributes *mxattr; + HRESULT hr; + int index; + + if (!is_clsid_supported(table->clsid, mxattributes_support_data)) + { + table++; + continue; + } + + hr = CoCreateInstance(table->clsid, NULL, CLSCTX_INPROC_SERVER, + &IID_IMXAttributes, (void**)&mxattr); + EXPECT_HR(hr, S_OK); + + hr = IMXAttributes_QueryInterface(mxattr, &IID_ISAXAttributes, (void**)&saxattr); + EXPECT_HR(hr, S_OK); + + hr = ISAXAttributes_getIndexFromName(saxattr, NULL, 0, NULL, 0, &index); + EXPECT_HR(hr, E_INVALIDARG); + + /* add some ambiguos attribute names */ + hr = IMXAttributes_addAttribute(mxattr, _bstr_("uri"), _bstr_("localname"), + _bstr_("a:localname"), _bstr_(""), _bstr_("value")); + EXPECT_HR(hr, S_OK); + hr = IMXAttributes_addAttribute(mxattr, _bstr_("uri"), _bstr_("localname"), + _bstr_("b:localname"), _bstr_(""), _bstr_("value")); + EXPECT_HR(hr, S_OK); + + index = -1; + hr = ISAXAttributes_getIndexFromName(saxattr, uriW, lstrlenW(uriW), localnameW, lstrlenW(localnameW), &index); + EXPECT_HR(hr, S_OK); + ok(index == 0, "%s: got index %d\n", table->name, index); + + index = -1; + hr = ISAXAttributes_getIndexFromName(saxattr, uri1W, lstrlenW(uri1W), localnameW, lstrlenW(localnameW), &index); + EXPECT_HR(hr, E_INVALIDARG); + ok(index == -1, "%s: got index %d\n", table->name, index); + + index = -1; + hr = ISAXAttributes_getIndexFromName(saxattr, uriW, lstrlenW(uriW), localname1W, lstrlenW(localname1W), &index); + EXPECT_HR(hr, E_INVALIDARG); + ok(index == -1, "%s: got index %d\n", table->name, index); + + if (IsEqualGUID(table->clsid, &CLSID_SAXAttributes) || + IsEqualGUID(table->clsid, &CLSID_SAXAttributes30)) + { + hr = ISAXAttributes_getIndexFromName(saxattr, NULL, 0, NULL, 0, NULL); + EXPECT_HR(hr, E_POINTER); + + hr = ISAXAttributes_getIndexFromName(saxattr, uriW, lstrlenW(uriW), localname1W, lstrlenW(localname1W), NULL); + EXPECT_HR(hr, E_POINTER); + } + else + { + hr = ISAXAttributes_getIndexFromName(saxattr, NULL, 0, NULL, 0, NULL); + EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXAttributes_getIndexFromName(saxattr, uriW, lstrlenW(uriW), localname1W, lstrlenW(localname1W), NULL); + EXPECT_HR(hr, E_INVALIDARG); + } + + hr = ISAXAttributes_getIndexFromName(saxattr, uriW, lstrlenW(uriW), NULL, 0, &index); + EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXAttributes_getIndexFromName(saxattr, NULL, 0, localname1W, lstrlenW(localname1W), &index); + EXPECT_HR(hr, E_INVALIDARG); + + table++; + + ISAXAttributes_Release(saxattr); + IMXAttributes_Release(mxattr); + } +} + START_TEST(saxreader) { ISAXXMLReader *reader; @@ -4233,6 +4328,7 @@ START_TEST(saxreader) test_mxattr_qi(); test_mxattr_addAttribute(); test_mxattr_clear(); + test_mxattr_localname(); test_mxattr_dispex(); } else

1 0

André Hentschel : winedbg: Solve ARM disassembling fixmes.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: abc304f3091bc467889fe99f1af05b6aee9fb6fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=abc304f3091bc467889fe99f1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Apr 15 13:12:07 2012 +0200 winedbg: Solve ARM disassembling fixmes. --- programs/winedbg/be_arm.c | 50 +++++++++++++++++++++++++++++++++----------- 1 files changed, 37 insertions(+), 13 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 3e4d8c5..52126ff 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -139,7 +139,7 @@ static UINT arm_disasm_singletrans(UINT inst) short writeback = (inst >> 21) & 0x01; short byte = (inst >> 22) & 0x01; short direction = (inst >> 23) & 0x01; - /* FIXME: what to do with bit 24 (indexing) */ + short indexing = (inst >> 24) & 0x01; short immediate = !((inst >> 25) & 0x01); short offset = inst & 0x0fff; @@ -147,11 +147,21 @@ static UINT arm_disasm_singletrans(UINT inst) dbg_printf("\n\t%s%s%s%s", load ? "ldr" : "str", byte ? "b" : "", writeback ? "t" : "", get_cond(inst)); - if (immediate) - dbg_printf("\tr%u, [r%u, #%d]", get_nibble(inst, 3), get_nibble(inst, 4), offset); + dbg_printf("\tr%u, ", get_nibble(inst, 3)); + if (indexing) + { + if (immediate) + dbg_printf("[r%u, #%d]", get_nibble(inst, 4), offset); + else + dbg_printf("[r%u, r%u]", get_nibble(inst, 4), get_nibble(inst, 0)); + } else - dbg_printf("\tr%u, r%u, r%u", get_nibble(inst, 3), get_nibble(inst, 4), - get_nibble(inst, 0)); + { + if (immediate) + dbg_printf("[r%u], #%d", get_nibble(inst, 4), offset); + else + dbg_printf("[r%u], r%u", get_nibble(inst, 4), get_nibble(inst, 0)); + } return 0; } @@ -163,17 +173,28 @@ static UINT arm_disasm_halfwordtrans(UINT inst) short writeback = (inst >> 21) & 0x01; short immediate = (inst >> 22) & 0x01; short direction = (inst >> 23) & 0x01; - /* FIXME: what to do with bit 24 (indexing) */ + short indexing = (inst >> 24) & 0x01; short offset = ((inst >> 4) & 0xf0) + (inst & 0x0f); if (!direction) offset *= -1; dbg_printf("\n\t%s%s%s%s%s", load ? "ldr" : "str", sign ? "s" : "", halfword ? "h" : (sign ? "b" : ""), writeback ? "t" : "", get_cond(inst)); - if (immediate) - dbg_printf("\tr%u, r%u, #%d", get_nibble(inst, 3), get_nibble(inst, 4), offset); + dbg_printf("\tr%u, ", get_nibble(inst, 3)); + if (indexing) + { + if (immediate) + dbg_printf("[r%u, #%d]", get_nibble(inst, 4), offset); + else + dbg_printf("[r%u, r%u]", get_nibble(inst, 4), get_nibble(inst, 0)); + } else - dbg_printf("\tr%u, r%u, r%u", get_nibble(inst, 3), get_nibble(inst, 4), get_nibble(inst, 0)); + { + if (immediate) + dbg_printf("[r%u], #%d", get_nibble(inst, 4), offset); + else + dbg_printf("[r%u], r%u", get_nibble(inst, 4), get_nibble(inst, 0)); + } return 0; } @@ -207,7 +228,7 @@ static UINT arm_disasm_blocktrans(UINT inst) static UINT arm_disasm_swi(UINT inst) { UINT comment = inst & 0x00ffffff; - dbg_printf("\n\tswi%s\t#%d/0x%08x", get_cond(inst), comment, comment); + dbg_printf("\n\tswi%s\t#%d", get_cond(inst), comment); return 0; } @@ -244,16 +265,19 @@ static UINT arm_disasm_coprocdatatrans(UINT inst) WORD CPnum = (inst >> 8) & 0x0f; WORD CRd = (inst >> 12) & 0x0f; WORD load = (inst >> 20) & 0x01; - /* FIXME: what to do with bit 21 (writeback) */ + WORD writeback = (inst >> 21) & 0x01; WORD translen = (inst >> 22) & 0x01; WORD direction = (inst >> 23) & 0x01; - /* FIXME: what to do with bit 24 (indexing) */ + WORD indexing = (inst >> 24) & 0x01; short offset = (inst & 0xff) << 2; if (!direction) offset *= -1; dbg_printf("\n\t%s%s%s", load ? "ldc" : "stc", translen ? "l" : "", get_cond(inst)); - dbg_printf("\t%u, cr%u, [r%u, #%d]", CPnum, CRd, get_nibble(inst, 4), offset); + if (indexing) + dbg_printf("\t%u, cr%u, [r%u, #%d]%s", CPnum, CRd, get_nibble(inst, 4), offset, writeback?"!":""); + else + dbg_printf("\t%u, cr%u, [r%u], #%d", CPnum, CRd, get_nibble(inst, 4), offset); return 0; }

1 0

André Hentschel : winedbg: Use better register names for ARM disassembling.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: 51df30b25c56d8403978eebc7226184154ad5d89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51df30b25c56d8403978eebc7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Apr 15 13:14:47 2012 +0200 winedbg: Use better register names for ARM disassembling. --- programs/winedbg/be_arm.c | 72 +++++++++++++++++++++++--------------------- 1 files changed, 38 insertions(+), 34 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 52126ff..fbf6954 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -44,6 +44,11 @@ static BOOL db_display = FALSE; #define get_cond(ins) tbl_cond[(ins >> 28) & 0x0f] #define get_nibble(ins, num) ((ins >> (num * 4)) & 0x0f) +static char const tbl_regs[][4] = { + "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7", "r8", "r9", "r10", + "fp", "ip", "sp", "lr", "pc", "cpsr" +}; + static char const tbl_addrmode[][3] = { "da", "ia", "db", "ib" }; @@ -93,7 +98,7 @@ static UINT arm_disasm_branch(UINT inst) if (offset & 0x02000000) offset |= 0xfc000000; offset += 8; - dbg_printf("\n\tb%s%s\t#%d/0x%08x", link ? "l" : "", get_cond(inst), offset, offset); + dbg_printf("\n\tb%s%s\t#%d", link ? "l" : "", get_cond(inst), offset); return 0; } @@ -113,22 +118,21 @@ static UINT arm_disasm_dataprocessing(UINT inst) } dbg_printf("\n\t%s%s%s", tbl_dataops[opcode], condcodes ? "s" : "", get_cond(inst)); + dbg_printf("\t%s, ", tbl_regs[get_nibble(inst, 3)]); if (no_op1) { if (immediate) - dbg_printf("\tr%u, #%u", get_nibble(inst, 3), - ROR32(inst & 0xff, 2 * get_nibble(inst, 2))); + dbg_printf("#%u", ROR32(inst & 0xff, 2 * get_nibble(inst, 2))); else - dbg_printf("\tr%u, r%u", get_nibble(inst, 3), get_nibble(inst, 0)); + dbg_printf("%s", tbl_regs[get_nibble(inst, 0)]); } else { if (immediate) - dbg_printf("\tr%u, r%u, #%u", get_nibble(inst, 3), get_nibble(inst, 4), + dbg_printf("%s, #%u", tbl_regs[get_nibble(inst, 4)], ROR32(inst & 0xff, 2 * get_nibble(inst, 2))); else - dbg_printf("\tr%u, r%u, r%u", get_nibble(inst, 3), get_nibble(inst, 4), - get_nibble(inst, 0)); + dbg_printf("%s, %s", tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)]); } return 0; } @@ -147,20 +151,20 @@ static UINT arm_disasm_singletrans(UINT inst) dbg_printf("\n\t%s%s%s%s", load ? "ldr" : "str", byte ? "b" : "", writeback ? "t" : "", get_cond(inst)); - dbg_printf("\tr%u, ", get_nibble(inst, 3)); + dbg_printf("\t%s, ", tbl_regs[get_nibble(inst, 3)]); if (indexing) { if (immediate) - dbg_printf("[r%u, #%d]", get_nibble(inst, 4), offset); + dbg_printf("[%s, #%d]", tbl_regs[get_nibble(inst, 4)], offset); else - dbg_printf("[r%u, r%u]", get_nibble(inst, 4), get_nibble(inst, 0)); + dbg_printf("[%s, %s]", tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)]); } else { if (immediate) - dbg_printf("[r%u], #%d", get_nibble(inst, 4), offset); + dbg_printf("[%s], #%d", tbl_regs[get_nibble(inst, 4)], offset); else - dbg_printf("[r%u], r%u", get_nibble(inst, 4), get_nibble(inst, 0)); + dbg_printf("[%s], %s", tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)]); } return 0; } @@ -180,20 +184,20 @@ static UINT arm_disasm_halfwordtrans(UINT inst) dbg_printf("\n\t%s%s%s%s%s", load ? "ldr" : "str", sign ? "s" : "", halfword ? "h" : (sign ? "b" : ""), writeback ? "t" : "", get_cond(inst)); - dbg_printf("\tr%u, ", get_nibble(inst, 3)); + dbg_printf("\t%s, ", tbl_regs[get_nibble(inst, 3)]); if (indexing) { if (immediate) - dbg_printf("[r%u, #%d]", get_nibble(inst, 4), offset); + dbg_printf("[%s, #%d]", tbl_regs[get_nibble(inst, 4)], offset); else - dbg_printf("[r%u, r%u]", get_nibble(inst, 4), get_nibble(inst, 0)); + dbg_printf("[%s, %s]", tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)]); } else { if (immediate) - dbg_printf("[r%u], #%d", get_nibble(inst, 4), offset); + dbg_printf("[%s], #%d", tbl_regs[get_nibble(inst, 4)], offset); else - dbg_printf("[r%u], r%u", get_nibble(inst, 4), get_nibble(inst, 0)); + dbg_printf("[%s], %s", tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)]); } return 0; } @@ -213,13 +217,13 @@ static UINT arm_disasm_blocktrans(UINT inst) break; } - dbg_printf("\n\t%s%s%s\tr%u%s, {", load ? "ldm" : "stm", tbl_addrmode[addrmode], get_cond(inst), - get_nibble(inst, 4), writeback ? "!" : ""); + dbg_printf("\n\t%s%s%s\t%s%s, {", load ? "ldm" : "stm", tbl_addrmode[addrmode], get_cond(inst), + tbl_regs[get_nibble(inst, 4)], writeback ? "!" : ""); for (i=0;i<=15;i++) if ((inst>>i) & 1) { - if (i == last) dbg_printf("r%u", i); - else dbg_printf("r%u, ", i); + if (i == last) dbg_printf("%s", tbl_regs[i]); + else dbg_printf("%s, ", tbl_regs[i]); } dbg_printf("}%s", psr ? "^" : ""); return 0; @@ -241,8 +245,8 @@ static UINT arm_disasm_coproctrans(UINT inst) WORD load = (inst >> 20) & 0x01; WORD CP_Opc = (inst >> 21) & 0x07; - dbg_printf("\n\t%s%s\t%u, %u, r%u, cr%u, cr%u, {%u}", load ? "mrc" : "mcr", get_cond(inst), CPnum, - CP, get_nibble(inst, 3), CRn, CRm, CP_Opc); + dbg_printf("\n\t%s%s\t%u, %u, %s, cr%u, cr%u, {%u}", load ? "mrc" : "mcr", get_cond(inst), CPnum, + CP, tbl_regs[get_nibble(inst, 3)], CRn, CRm, CP_Opc); return 0; } @@ -275,9 +279,9 @@ static UINT arm_disasm_coprocdatatrans(UINT inst) dbg_printf("\n\t%s%s%s", load ? "ldc" : "stc", translen ? "l" : "", get_cond(inst)); if (indexing) - dbg_printf("\t%u, cr%u, [r%u, #%d]%s", CPnum, CRd, get_nibble(inst, 4), offset, writeback?"!":""); + dbg_printf("\t%u, cr%u, [%s, #%d]%s", CPnum, CRd, tbl_regs[get_nibble(inst, 4)], offset, writeback?"!":""); else - dbg_printf("\t%u, cr%u, [r%u], #%d", CPnum, CRd, get_nibble(inst, 4), offset); + dbg_printf("\t%u, cr%u, [%s], #%d", CPnum, CRd, tbl_regs[get_nibble(inst, 4)], offset); return 0; } @@ -293,9 +297,9 @@ static WORD thumb_disasm_hireg(WORD inst, ADDRESS64 *addr) if (h2) src += 8; if (op == 3) - dbg_printf("\n\tb%sx\tr%u", h1?"l":"", src); + dbg_printf("\n\tb%sx\t%s", h1?"l":"", tbl_regs[src]); else - dbg_printf("\n\t%s\tr%u, r%u", tbl_hiops_t[op], dst, src); + dbg_printf("\n\t%s\t%s, %s", tbl_hiops_t[op], tbl_regs[dst], tbl_regs[src]); return 0; } @@ -316,8 +320,8 @@ static WORD thumb_disasm_blocktrans(WORD inst, ADDRESS64 *addr) for (i=0;i<=7;i++) if ((inst>>i) & 1) { - if (i == last) dbg_printf("r%u", i); - else dbg_printf("r%u, ", i); + if (i == last) dbg_printf("%s", tbl_regs[i]); + else dbg_printf("%s, ", tbl_regs[i]); } if (lrpc) dbg_printf(", %s", load ? "pc" : "lr"); @@ -356,29 +360,29 @@ static WORD thumb_disasm_nop(WORD inst, ADDRESS64 *addr) static WORD thumb_disasm_ldrpcrel(WORD inst, ADDRESS64 *addr) { WORD offset = (inst & 0xff) << 2; - dbg_printf("\n\tldr\tr%u, [pc, #%u]", (inst >> 8) & 0x07, offset); + dbg_printf("\n\tldr\t%s, [pc, #%u]", tbl_regs[(inst >> 8) & 0x07], offset); return 0; } static WORD thumb_disasm_ldrsprel(WORD inst, ADDRESS64 *addr) { WORD offset = (inst & 0xff) << 2; - dbg_printf("\n\t%s\tr%u, [sp, #%u]", (inst & 0x0800)?"ldr":"str", (inst >> 8) & 0x07, offset); + dbg_printf("\n\t%s\t%s, [sp, #%u]", (inst & 0x0800)?"ldr":"str", tbl_regs[(inst >> 8) & 0x07], offset); return 0; } static WORD thumb_disasm_ldrimm(WORD inst, ADDRESS64 *addr) { WORD offset = (inst & 0x07c0) >> 6; - dbg_printf("\n\t%s%s\tr%u, [r%u, #%u]", (inst & 0x0800)?"ldr":"str", (inst & 0x1000)?"b":"", - inst & 0x07, (inst >> 3) & 0x07, (inst & 0x1000)?offset:(offset << 2)); + dbg_printf("\n\t%s%s\t%s, [%s, #%u]", (inst & 0x0800)?"ldr":"str", (inst & 0x1000)?"b":"", + tbl_regs[inst & 0x07], tbl_regs[(inst >> 3) & 0x07], (inst & 0x1000)?offset:(offset << 2)); return 0; } static WORD thumb_disasm_immop(WORD inst, ADDRESS64 *addr) { WORD op = (inst >> 11) & 0x03; - dbg_printf("\n\t%s\tr%u, #%u", tbl_immops_t[op], (inst >> 8) & 0x07, inst & 0xff); + dbg_printf("\n\t%s\t%s, #%u", tbl_immops_t[op], tbl_regs[(inst >> 8) & 0x07], inst & 0xff); return 0; }

1 0

Hans Leidekker : server: Include the Unix pid in the snapshot_next_process reply.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: d1b6cf93795adf96519d48343b6ff5d3fbe86324 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1b6cf93795adf96519d48343… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 16 12:35:17 2012 +0200 server: Include the Unix pid in the snapshot_next_process reply. --- include/wine/server_protocol.h | 4 +++- server/process.c | 1 + server/process.h | 1 + server/protocol.def | 1 + server/request.h | 3 ++- server/snapshot.c | 1 + server/trace.c | 1 + 7 files changed, 10 insertions(+), 2 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 0e989da..41e8e28 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2052,7 +2052,9 @@ struct next_process_reply int threads; int priority; int handles; + int unix_pid; /* VARARG(filename,unicode_str); */ + char __pad_36[4]; }; @@ -5646,6 +5648,6 @@ union generic_reply struct set_suspend_context_reply set_suspend_context_reply; }; -#define SERVER_PROTOCOL_VERSION 431 +#define SERVER_PROTOCOL_VERSION 432 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/process.c b/server/process.c index de3b594..6a5f4b1 100644 --- a/server/process.c +++ b/server/process.c @@ -847,6 +847,7 @@ struct process_snapshot *process_snap( int *count ) ptr->count = process->obj.refcount; ptr->priority = process->priority; ptr->handles = get_handle_table_count(process); + ptr->unix_pid = process->unix_pid; grab_object( process ); ptr++; } diff --git a/server/process.h b/server/process.h index 93ec6c7..976dd38 100644 --- a/server/process.h +++ b/server/process.h @@ -90,6 +90,7 @@ struct process_snapshot int threads; /* number of threads */ int priority; /* priority class */ int handles; /* number of handles */ + int unix_pid; /* Unix pid */ }; #define CPU_FLAG(cpu) (1 << (cpu)) diff --git a/server/protocol.def b/server/protocol.def index 80c0cd3..31a3b0d 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1577,6 +1577,7 @@ enum char_info_mode int threads; /* number of threads */ int priority; /* process priority */ int handles; /* number of handles */ + int unix_pid; /* Unix pid */ VARARG(filename,unicode_str); /* file name of main exe */ @END diff --git a/server/request.h b/server/request.h index 5b45cf9..8f93085 100644 --- a/server/request.h +++ b/server/request.h @@ -1161,7 +1161,8 @@ C_ASSERT( FIELD_OFFSET(struct next_process_reply, ppid) == 16 ); C_ASSERT( FIELD_OFFSET(struct next_process_reply, threads) == 20 ); C_ASSERT( FIELD_OFFSET(struct next_process_reply, priority) == 24 ); C_ASSERT( FIELD_OFFSET(struct next_process_reply, handles) == 28 ); -C_ASSERT( sizeof(struct next_process_reply) == 32 ); +C_ASSERT( FIELD_OFFSET(struct next_process_reply, unix_pid) == 32 ); +C_ASSERT( sizeof(struct next_process_reply) == 40 ); C_ASSERT( FIELD_OFFSET(struct next_thread_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct next_thread_request, reset) == 16 ); C_ASSERT( sizeof(struct next_thread_request) == 24 ); diff --git a/server/snapshot.c b/server/snapshot.c index bc48922..dd00bd1 100644 --- a/server/snapshot.c +++ b/server/snapshot.c @@ -117,6 +117,7 @@ static int snapshot_next_process( struct snapshot *snapshot, struct next_process reply->threads = ptr->threads; reply->priority = ptr->priority; reply->handles = ptr->handles; + reply->unix_pid = ptr->process->unix_pid; if ((exe_module = get_process_exe_module( ptr->process )) && exe_module->filename) { data_size_t len = min( exe_module->namelen, get_reply_max_size() ); diff --git a/server/trace.c b/server/trace.c index cfef963..4318a34 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1969,6 +1969,7 @@ static void dump_next_process_reply( const struct next_process_reply *req ) fprintf( stderr, ", threads=%d", req->threads ); fprintf( stderr, ", priority=%d", req->priority ); fprintf( stderr, ", handles=%d", req->handles ); + fprintf( stderr, ", unix_pid=%d", req->unix_pid ); dump_varargs_unicode_str( ", filename=", cur_size ); }

1 0

Hans Leidekker : iphlpapi: Add support for TCP_TABLE_OWNER_PID_ALL in GetExtendedTcpTable.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: e78ac4711cf9166478cccacaa771cdc4158083ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=e78ac4711cf9166478cccacaa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 16 12:35:32 2012 +0200 iphlpapi: Add support for TCP_TABLE_OWNER_PID_ALL in GetExtendedTcpTable. --- dlls/iphlpapi/iphlpapi_main.c | 26 ++++- dlls/iphlpapi/ipstats.c | 242 +++++++++++++++++++++++++++++++++------- dlls/iphlpapi/ipstats.h | 2 + 3 files changed, 224 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e78ac4711cf9166478ccc…

1 0

Hans Leidekker : iphlpapi: Add tests for GetExtendedTcpTable.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: d2dbd9bdac15cf270bffdca9d54e12cf39a563fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2dbd9bdac15cf270bffdca9d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 16 12:35:44 2012 +0200 iphlpapi: Add tests for GetExtendedTcpTable. --- dlls/iphlpapi/tests/iphlpapi.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 0cbfb31..ec388a3 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -66,6 +66,7 @@ typedef DWORD (WINAPI *GetPerAdapterInfoFunc)(ULONG,PIP_PER_ADAPTER_INFO,PULONG) typedef DWORD (WINAPI *GetAdaptersAddressesFunc)(ULONG,ULONG,PVOID,PIP_ADAPTER_ADDRESSES,PULONG); typedef DWORD (WINAPI *NotifyAddrChangeFunc)(PHANDLE,LPOVERLAPPED); typedef BOOL (WINAPI *CancelIPChangeNotifyFunc)(LPOVERLAPPED); +typedef DWORD (WINAPI *GetExtendedTcpTableFunc)(PVOID,PDWORD,BOOL,ULONG,TCP_TABLE_CLASS,ULONG); static GetNumberOfInterfacesFunc gGetNumberOfInterfaces = NULL; static GetIpAddrTableFunc gGetIpAddrTable = NULL; @@ -87,6 +88,7 @@ static GetPerAdapterInfoFunc gGetPerAdapterInfo = NULL; static GetAdaptersAddressesFunc gGetAdaptersAddresses = NULL; static NotifyAddrChangeFunc gNotifyAddrChange = NULL; static CancelIPChangeNotifyFunc gCancelIPChangeNotify = NULL; +static GetExtendedTcpTableFunc gGetExtendedTcpTable = NULL; static void loadIPHlpApi(void) { @@ -130,6 +132,8 @@ static void loadIPHlpApi(void) hLibrary, "NotifyAddrChange"); gCancelIPChangeNotify = (CancelIPChangeNotifyFunc)GetProcAddress( hLibrary, "CancelIPChangeNotify"); + gGetExtendedTcpTable = (GetExtendedTcpTableFunc)GetProcAddress( + hLibrary, "GetExtendedTcpTable"); } } @@ -154,6 +158,7 @@ static void freeIPHlpApi(void) gGetUdpTable = NULL; gNotifyAddrChange = NULL; gCancelIPChangeNotify = NULL; + gGetExtendedTcpTable = NULL; FreeLibrary(hLibrary); hLibrary = NULL; } @@ -970,6 +975,39 @@ static void test_GetAdaptersAddresses(void) HeapFree(GetProcessHeap(), 0, ptr); } +static void test_GetExtendedTcpTable(void) +{ + DWORD ret, size; + MIB_TCPTABLE *table; + MIB_TCPTABLE_OWNER_PID *table_pid; + + if (!gGetExtendedTcpTable) + { + win_skip("GetExtendedTcpTable not available\n"); + return; + } + ret = gGetExtendedTcpTable( NULL, NULL, TRUE, AF_INET, TCP_TABLE_BASIC_ALL, 0 ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + + size = 0; + ret = gGetExtendedTcpTable( NULL, &size, TRUE, AF_INET, TCP_TABLE_BASIC_ALL, 0 ); + ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %u\n", ret ); + + table = HeapAlloc( GetProcessHeap(), 0, size ); + ret = gGetExtendedTcpTable( table, &size, TRUE, AF_INET, TCP_TABLE_BASIC_ALL, 0 ); + ok( ret == ERROR_SUCCESS, "got %u\n", ret ); + HeapFree( GetProcessHeap(), 0, table ); + + size = 0; + ret = gGetExtendedTcpTable( NULL, &size, TRUE, AF_INET, TCP_TABLE_OWNER_PID_ALL, 0 ); + ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %u\n", ret ); + + table_pid = HeapAlloc( GetProcessHeap(), 0, size ); + ret = gGetExtendedTcpTable( table_pid, &size, TRUE, AF_INET, TCP_TABLE_OWNER_PID_ALL, 0 ); + ok( ret == ERROR_SUCCESS, "got %u\n", ret ); + HeapFree( GetProcessHeap(), 0, table_pid ); +} + START_TEST(iphlpapi) { @@ -987,6 +1025,7 @@ START_TEST(iphlpapi) testWin2KFunctions(); test_GetAdaptersAddresses(); + test_GetExtendedTcpTable(); freeIPHlpApi(); } }

1 0

Hans Leidekker : iphlpapi: Reimplement GetTcpTable on top of GetExtendedTcpTable.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: d4ebc5298f17aa749c675b494d0b09b510e45f01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4ebc5298f17aa749c675b494… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 16 12:36:00 2012 +0200 iphlpapi: Reimplement GetTcpTable on top of GetExtendedTcpTable. --- dlls/iphlpapi/iphlpapi_main.c | 22 +--------------------- 1 files changed, 1 insertions(+), 21 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 2654571..961736f 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1853,28 +1853,8 @@ BOOL WINAPI GetRTTAndHopCount(IPAddr DestIpAddress, PULONG HopCount, ULONG MaxHo */ DWORD WINAPI GetTcpTable(PMIB_TCPTABLE pTcpTable, PDWORD pdwSize, BOOL bOrder) { - DWORD ret; - PMIB_TCPTABLE table; - TRACE("pTcpTable %p, pdwSize %p, bOrder %d\n", pTcpTable, pdwSize, bOrder); - - if (!pdwSize) return ERROR_INVALID_PARAMETER; - - ret = AllocateAndGetTcpTableFromStack(&table, bOrder, GetProcessHeap(), 0); - if (!ret) { - DWORD size = FIELD_OFFSET( MIB_TCPTABLE, table[table->dwNumEntries] ); - if (!pTcpTable || *pdwSize < size) { - *pdwSize = size; - ret = ERROR_INSUFFICIENT_BUFFER; - } - else { - *pdwSize = size; - memcpy(pTcpTable, table, size); - } - HeapFree(GetProcessHeap(), 0, table); - } - TRACE("returning %d\n", ret); - return ret; + return GetExtendedTcpTable(pTcpTable, pdwSize, bOrder, AF_INET, TCP_TABLE_BASIC_ALL, 0); } /******************************************************************

1 0

Alexander Morozov : kernel32/tests: Add more tests for early closing mapping handle.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: 5c9ca5cb53d98c39420a7a9f46ff06b1d6e8a220 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c9ca5cb53d98c39420a7a9f4… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Mon Apr 16 15:47:07 2012 +0400 kernel32/tests: Add more tests for early closing mapping handle. --- dlls/kernel32/tests/virtual.c | 47 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 2c3f22d..4ca47e0 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -809,9 +809,56 @@ static void test_MapViewOfFile(void) ok( GetLastError() == ERROR_SUCCESS, "CreateFileMappingA set error %d\n", GetLastError() ); CloseHandle(mapping); + ret = IsBadReadPtr(ptr, MAPPING_SIZE); + ok( !ret, "memory is not accessible\n" ); SetLastError(0xdeadbeef); ret = UnmapViewOfFile(ptr); ok( ret, "UnmapViewOfFile failed with error %d\n", GetLastError() ); + ret = IsBadReadPtr(ptr, MAPPING_SIZE); + ok( ret, "memory is accessible\n" ); + + SetLastError(0xdeadbeef); + file = CreateFileA(testfile, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok( file != INVALID_HANDLE_VALUE, "CreateFile error %u\n", GetLastError() ); + SetFilePointer(file, 4096, NULL, FILE_BEGIN); + SetEndOfFile(file); + + SetLastError(0xdeadbeef); + mapping = CreateFileMappingA(file, NULL, PAGE_READWRITE, 0, MAPPING_SIZE, name); + ok( mapping != 0, "CreateFileMappingA failed with error %d\n", GetLastError() ); + SetLastError(0xdeadbeef); + ptr = MapViewOfFile(mapping, FILE_MAP_WRITE, 0, 0, 0); + ok( ptr != NULL, "MapViewOfFile failed with error %d\n", GetLastError() ); + SetLastError(0xdeadbeef); + map2 = OpenFileMappingA(FILE_MAP_READ, FALSE, name); + ok( map2 != 0, "OpenFileMappingA failed with error %d\n", GetLastError() ); + CloseHandle(map2); + CloseHandle(mapping); + + SetLastError(0xdeadbeef); + map2 = OpenFileMappingA(FILE_MAP_READ, FALSE, name); + todo_wine + ok( map2 == 0, "OpenFileMappingA succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_FILE_NOT_FOUND, "OpenFileMappingA set error %d\n", GetLastError() ); + CloseHandle(map2); + SetLastError(0xdeadbeef); + mapping = CreateFileMappingA(file, NULL, PAGE_READWRITE, 0, MAPPING_SIZE, name); + ok( mapping != 0, "CreateFileMappingA failed\n" ); + todo_wine + ok( GetLastError() == ERROR_SUCCESS, "CreateFileMappingA set error %d\n", GetLastError() ); + CloseHandle(mapping); + + ret = IsBadReadPtr(ptr, MAPPING_SIZE); + ok( !ret, "memory is not accessible\n" ); + SetLastError(0xdeadbeef); + ret = UnmapViewOfFile(ptr); + ok( ret, "UnmapViewOfFile failed with error %d\n", GetLastError() ); + ret = IsBadReadPtr(ptr, MAPPING_SIZE); + ok( ret, "memory is accessible\n" ); + + CloseHandle(file); + DeleteFileA(testfile); } static void test_NtMapViewOfSection(void)

1 0