March 2011 - Wine-commits - list.winehq.org

Maarten Lankhorst : wined3d: Fix a clipping issue with D3DSPSM_SIGNNEG.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: d19f840361d901c8ca9f61a95651fbf125ca6448 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d19f840361d901c8ca9f61a95… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Mar 23 15:13:18 2011 +0100 wined3d: Fix a clipping issue with D3DSPSM_SIGNNEG. --- dlls/wined3d/arb_program_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e495643..c6b6619 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1473,7 +1473,7 @@ static void shader_arb_get_src_param(const struct wined3d_shader_instruction *in shader_addline(buffer, "MAD T%c, %s, %s, -%s;\n", 'A' + tmpreg, regstr, two, one); break; case WINED3DSPSM_SIGNNEG: - shader_addline(buffer, "MAD T%c, %s, %s, %s;\n", 'A' + tmpreg, regstr, two, one); + shader_addline(buffer, "MAD T%c, %s, -%s, %s;\n", 'A' + tmpreg, regstr, two, one); break; case WINED3DSPSM_COMP: shader_addline(buffer, "SUB T%c, %s, %s;\n", 'A' + tmpreg, one, regstr);

1 0

Aric Stewart : wineqtdecoder: fourCC value needs to be reversed as an OSType.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: 7ee63f000b6b7af28953b69a2dc84dd616cfe145 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ee63f000b6b7af28953b69a2… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Mar 28 11:22:46 2011 -0500 wineqtdecoder: fourCC value needs to be reversed as an OSType. --- dlls/wineqtdecoder/qtvdecoder.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wineqtdecoder/qtvdecoder.c b/dlls/wineqtdecoder/qtvdecoder.c index b0cf128..83d5156 100644 --- a/dlls/wineqtdecoder/qtvdecoder.c +++ b/dlls/wineqtdecoder/qtvdecoder.c @@ -413,10 +413,10 @@ static HRESULT WINAPI QTVDecoder_SetMediaType(TransformFilter *tf, PIN_DIRECTION goto failed; TRACE("Fourcc: %s\n", debugstr_an((const char *)&pmt->subtype.Data1, 4)); - fourCC = ((const char *)&pmt->subtype.Data1)[0] | - (((const char *)&pmt->subtype.Data1)[1]<<8) | - (((const char *)&pmt->subtype.Data1)[2]<<16) | - (((const char *)&pmt->subtype.Data1)[3]<<24); + fourCC = ((const char *)&pmt->subtype.Data1)[3] | + (((const char *)&pmt->subtype.Data1)[2]<<8) | + (((const char *)&pmt->subtype.Data1)[1]<<16) | + (((const char *)&pmt->subtype.Data1)[0]<<24); err = FindCodec(fourCC,NULL,NULL,&dc); if (err != noErr || dc == 0x0)

1 0

Nikolay Sivov : comctl32/monthcal: Selection and abbreviations should use title colour.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: 802ab38f0ce2f346e9b79e3c970495ebaeddbb05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=802ab38f0ce2f346e9b79e3c9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 26 16:49:21 2011 +0300 comctl32/monthcal: Selection and abbreviations should use title colour. --- dlls/comctl32/monthcal.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index b750a18..0e1a65c 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -668,7 +668,6 @@ static void MONTHCAL_DrawDay(const MONTHCAL_INFO *infoPtr, HDC hdc, const SYSTEM RECT r, r_temp; static BOOL bold_selected; BOOL selected_day = FALSE; - HBRUSH hbr; COLORREF oldCol = 0; COLORREF oldBk = 0; @@ -686,8 +685,7 @@ static void MONTHCAL_DrawDay(const MONTHCAL_INFO *infoPtr, HDC hdc, const SYSTEM TRACE("%s\n", wine_dbgstr_rect(&r)); oldCol = SetTextColor(hdc, infoPtr->colors[MCSC_MONTHBK]); oldBk = SetBkColor(hdc, infoPtr->colors[MCSC_TRAILINGTEXT]); - hbr = GetSysColorBrush(COLOR_HIGHLIGHT); - FillRect(hdc, &r, hbr); + FillRect(hdc, &r, infoPtr->brushes[MCSC_TITLEBK]); selected_day = TRUE; } @@ -1013,7 +1011,7 @@ static void MONTHCAL_PaintCalendar(const MONTHCAL_INFO *infoPtr, HDC hdc, const /* draw day abbreviations */ SelectObject(hdc, infoPtr->hFont); SetBkColor(hdc, infoPtr->colors[MCSC_MONTHBK]); - SetTextColor(hdc, infoPtr->colors[MCSC_TRAILINGTEXT]); + SetTextColor(hdc, infoPtr->colors[MCSC_TITLEBK]); /* rectangle to draw a single day abbreviation within */ r = infoPtr->calendars[calIdx].wdays; r.right = r.left + infoPtr->width_increment;

1 0

Nikolay Sivov : comctl32/monthcal: Clean day painting function.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: 3796f127102093c1af1e9e10973fc9d0ea284855 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3796f127102093c1af1e9e109… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 26 22:11:54 2011 +0300 comctl32/monthcal: Clean day painting function. --- dlls/comctl32/monthcal.c | 31 +++++++++++++------------------ 1 files changed, 13 insertions(+), 18 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 0e1a65c..58afc97 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -666,20 +666,18 @@ static void MONTHCAL_DrawDay(const MONTHCAL_INFO *infoPtr, HDC hdc, const SYSTEM static const WCHAR fmtW[] = { '%','d',0 }; WCHAR buf[10]; RECT r, r_temp; - static BOOL bold_selected; - BOOL selected_day = FALSE; COLORREF oldCol = 0; COLORREF oldBk = 0; + INT old_bkmode, selection; -/* No need to check styles: when selection is not valid, it is set to zero. - * 1<day<31, so everything is OK. - */ - + /* no need to check styles: when selection is not valid, it is set to zero. + 1 < day < 31, so everything is OK */ MONTHCAL_CalcPosFromDay(infoPtr, st, &r); if(!IntersectRect(&r_temp, &(ps->rcPaint), &r)) return; if ((MONTHCAL_CompareDate(st, &infoPtr->minSel) >= 0) && - (MONTHCAL_CompareDate(st, &infoPtr->maxSel) <= 0)) { + (MONTHCAL_CompareDate(st, &infoPtr->maxSel) <= 0)) + { TRACE("%d %d %d\n", st->wDay, infoPtr->minSel.wDay, infoPtr->maxSel.wDay); TRACE("%s\n", wine_dbgstr_rect(&r)); @@ -687,23 +685,20 @@ static void MONTHCAL_DrawDay(const MONTHCAL_INFO *infoPtr, HDC hdc, const SYSTEM oldBk = SetBkColor(hdc, infoPtr->colors[MCSC_TRAILINGTEXT]); FillRect(hdc, &r, infoPtr->brushes[MCSC_TITLEBK]); - selected_day = TRUE; + selection = 1; } + else + selection = 0; - if(bold && !bold_selected) { - SelectObject(hdc, infoPtr->hBoldFont); - bold_selected = TRUE; - } - if(!bold && bold_selected) { - SelectObject(hdc, infoPtr->hFont); - bold_selected = FALSE; - } + SelectObject(hdc, bold ? infoPtr->hBoldFont : infoPtr->hFont); - SetBkMode(hdc,TRANSPARENT); + old_bkmode = SetBkMode(hdc, TRANSPARENT); wsprintfW(buf, fmtW, st->wDay); DrawTextW(hdc, buf, -1, &r, DT_CENTER | DT_VCENTER | DT_SINGLELINE ); + SetBkMode(hdc, old_bkmode); - if(selected_day) { + if (selection) + { SetTextColor(hdc, oldCol); SetBkColor(hdc, oldBk); }

1 0

Nikolay Sivov : comctl32/listview: Adjust dispinfo text buffer length.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: 124eaa046f5dfd98747448de2915a95c7713cbc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=124eaa046f5dfd98747448de2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 27 00:28:21 2011 +0300 comctl32/listview: Adjust dispinfo text buffer length. --- dlls/comctl32/listview.c | 2 +- dlls/comctl32/tests/listview.c | 40 +++++++++++++++++++++++----------------- 2 files changed, 24 insertions(+), 18 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 60178b3..754d817 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -360,7 +360,7 @@ typedef struct tagLISTVIEW_INFO #define SB_INTERNAL -1 /* maximum size of a label */ -#define DISP_TEXT_SIZE 512 +#define DISP_TEXT_SIZE 260 /* padding for items in list and small icon display modes */ #define WIDTH_PADDING 12 diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index a4ffa2e..a7de6e7 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -340,12 +340,22 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP switch (((NMHDR*)lParam)->code) { case LVN_BEGINLABELEDIT: + { + HWND edit = NULL; + /* subclass edit box */ if (!blockEdit) - subclass_editbox(((NMHDR*)lParam)->hwndFrom); + edit = subclass_editbox(((NMHDR*)lParam)->hwndFrom); - return blockEdit; + if (edit) + { + INT len = SendMessageA(edit, EM_GETLIMITTEXT, 0, 0); + todo_wine ok(len == 259 || broken(len == 260) /* includes NULL in NT4 */, + "text limit %d, expected 259\n", len); + } + return blockEdit; + } case LVN_ENDLABELEDIT: { /* always accept new item text */ @@ -381,6 +391,13 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP dispinfo->hdr.code = LVN_GETDISPINFOW; memcpy(dispinfo->item.pszText, testW, sizeof(testW)); } + + /* test control buffer size for text, 10 used to mask cases when control + is using caller buffer to process LVM_GETITEM for example */ + if (dispinfo->item.mask & LVIF_TEXT && dispinfo->item.cchTextMax > 10) + ok(dispinfo->item.cchTextMax == 260 || + broken(dispinfo->item.cchTextMax == 264) /* NT4 reports aligned size */, + "buffer size %d\n", dispinfo->item.cchTextMax); } break; case NM_HOVER: @@ -634,7 +651,6 @@ static void test_lvm_hittest_(HWND hwnd, INT x, INT y, INT item, UINT flags, UIN lpht.pt.y = y; lpht.iSubItem = 10; - trace("hittesting pt=(%d,%d)\n", lpht.pt.x, lpht.pt.y); ret = SendMessage(hwnd, LVM_HITTEST, 0, (LPARAM)&lpht); if (todo_item) @@ -677,7 +693,6 @@ static void test_lvm_subitemhittest_(HWND hwnd, INT x, INT y, INT item, INT subi lpht.pt.x = x; lpht.pt.y = y; - trace("subhittesting pt=(%d,%d)\n", lpht.pt.x, lpht.pt.y); ret = SendMessage(hwnd, LVM_SUBITEMHITTEST, 0, (LPARAM)&lpht); if (todo_item) @@ -1503,7 +1518,6 @@ static void test_redraw(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); - trace("invalidate & update\n"); InvalidateRect(hwnd, NULL, TRUE); UpdateWindow(hwnd); ok_sequence(sequences, LISTVIEW_SEQ_INDEX, redraw_listview_seq, "redraw listview", FALSE); @@ -1637,8 +1651,6 @@ static void test_icon_spacing(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); - trace("test icon spacing\n"); - r = SendMessage(hwnd, LVM_SETICONSPACING, 0, MAKELPARAM(20, 30)); ok(r == MAKELONG(w, h) || broken(r == MAKELONG(w, w)), /* win98 */ @@ -1679,7 +1691,6 @@ static void test_color(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); - trace("test color seq\n"); for (i = 0; i < 4; i++) { color = colors[i]; @@ -1743,8 +1754,6 @@ static void test_item_count(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); - trace("test item count\n"); - r = SendMessage(hwnd, LVM_GETITEMCOUNT, 0, 0); expect(0, r); @@ -1833,8 +1842,6 @@ static void test_item_position(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); - trace("test item position\n"); - /* [item0] */ item0.mask = LVIF_TEXT; item0.iItem = 0; @@ -1896,7 +1903,7 @@ static void test_getorigin(void) hwnd = create_listview_control(LVS_ICON); ok(hwnd != NULL, "failed to create a listview window\n"); flush_sequences(sequences, NUM_MSG_SEQUENCES); - trace("test get origin results\n"); + r = SendMessage(hwnd, LVM_GETORIGIN, 0, (LPARAM)&position); expect(TRUE, r); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -1905,7 +1912,7 @@ static void test_getorigin(void) hwnd = create_listview_control(LVS_SMALLICON); ok(hwnd != NULL, "failed to create a listview window\n"); flush_sequences(sequences, NUM_MSG_SEQUENCES); - trace("test get origin results\n"); + r = SendMessage(hwnd, LVM_GETORIGIN, 0, (LPARAM)&position); expect(TRUE, r); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -1914,7 +1921,7 @@ static void test_getorigin(void) hwnd = create_listview_control(LVS_LIST); ok(hwnd != NULL, "failed to create a listview window\n"); flush_sequences(sequences, NUM_MSG_SEQUENCES); - trace("test get origin results\n"); + r = SendMessage(hwnd, LVM_GETORIGIN, 0, (LPARAM)&position); expect(FALSE, r); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -1923,12 +1930,11 @@ static void test_getorigin(void) hwnd = create_listview_control(LVS_REPORT); ok(hwnd != NULL, "failed to create a listview window\n"); flush_sequences(sequences, NUM_MSG_SEQUENCES); - trace("test get origin results\n"); + r = SendMessage(hwnd, LVM_GETORIGIN, 0, (LPARAM)&position); expect(FALSE, r); flush_sequences(sequences, NUM_MSG_SEQUENCES); DestroyWindow(hwnd); - } static void test_multiselect(void)

1 0

Nikolay Sivov : comctl32/listview: Fix edit box text limit.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: 7bdcbfb9a0e5662018b9c2f091841b80d5b3825c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bdcbfb9a0e5662018b9c2f09… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 27 00:32:27 2011 +0300 comctl32/listview: Fix edit box text limit. --- dlls/comctl32/listview.c | 1 + dlls/comctl32/tests/listview.c | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 754d817..1f64cbe 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -5879,6 +5879,7 @@ static HWND CreateEditLabelT(LISTVIEW_INFO *infoPtr, LPCWSTR text, BOOL isW) SetWindowLongPtrA(hedit, GWLP_WNDPROC, (DWORD_PTR)EditLblWndProcA) ); SendMessageW(hedit, WM_SETFONT, (WPARAM)infoPtr->hFont, FALSE); + SendMessageW(hedit, EM_SETLIMITTEXT, DISP_TEXT_SIZE-1, 0); return hedit; } diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index a7de6e7..c2bf70b 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -350,7 +350,7 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP if (edit) { INT len = SendMessageA(edit, EM_GETLIMITTEXT, 0, 0); - todo_wine ok(len == 259 || broken(len == 260) /* includes NULL in NT4 */, + ok(len == 259 || broken(len == 260) /* includes NULL in NT4 */, "text limit %d, expected 259\n", len); }

1 0

Nikolay Sivov : msxml3: Initial tests for IObjectWithSite support for httprequest.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: 61f693846ac5da3cfa76b9c6c0ff444ac64e8111 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61f693846ac5da3cfa76b9c6c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 27 00:13:14 2011 +0300 msxml3: Initial tests for IObjectWithSite support for httprequest. --- dlls/msxml3/tests/domdoc.c | 1523 +++++++++++++++++++++++++++++++++++++++----- 1 files changed, 1360 insertions(+), 163 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=61f693846ac5da3cfa76b…

1 0

Nikolay Sivov : msxml3: More tests for <?xml ?> attributes.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: e5e0b84200a8bfe9d25f168da77377e420686047 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5e0b84200a8bfe9d25f168da… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 27 00:16:17 2011 +0300 msxml3: More tests for <?xml ?> attributes. --- dlls/msxml3/tests/domdoc.c | 155 +++++++++++++++++++++++++++++++++++++------- 1 files changed, 131 insertions(+), 24 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 1f297ab..cdba14b 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -3901,52 +3901,77 @@ static void test_get_text(void) static void test_get_childNodes(void) { - HRESULT r; BSTR str; VARIANT_BOOL b; IXMLDOMDocument *doc; IXMLDOMElement *element; IXMLDOMNode *node, *node2; IXMLDOMNodeList *node_list, *node_list2; + HRESULT hr; LONG len; doc = create_document(&IID_IXMLDOMDocument); if (!doc) return; str = SysAllocString( szComplete4 ); - r = IXMLDOMDocument_loadXML( doc, str, &b ); - ok( r == S_OK, "loadXML failed\n"); + hr = IXMLDOMDocument_loadXML( doc, str, &b ); + EXPECT_HR(hr, S_OK); ok( b == VARIANT_TRUE, "failed to load XML string\n"); SysFreeString( str ); - r = IXMLDOMDocument_get_documentElement( doc, &element ); - ok( r == S_OK, "ret %08x\n", r); + hr = IXMLDOMDocument_get_documentElement( doc, &element ); + EXPECT_HR(hr, S_OK); - r = IXMLDOMElement_get_childNodes( element, &node_list ); - ok( r == S_OK, "ret %08x\n", r); + hr = IXMLDOMElement_get_childNodes( element, &node_list ); + EXPECT_HR(hr, S_OK); - r = IXMLDOMNodeList_get_length( node_list, &len ); - ok( r == S_OK, "ret %08x\n", r); + hr = IXMLDOMNodeList_get_length( node_list, &len ); + EXPECT_HR(hr, S_OK); ok( len == 4, "len %d\n", len); - r = IXMLDOMNodeList_get_item( node_list, 2, &node ); - ok( r == S_OK, "ret %08x\n", r); + hr = IXMLDOMNodeList_get_item( node_list, 2, &node ); + EXPECT_HR(hr, S_OK); - r = IXMLDOMNode_get_childNodes( node, &node_list2 ); - ok( r == S_OK, "ret %08x\n", r); + hr = IXMLDOMNode_get_childNodes( node, &node_list2 ); + EXPECT_HR(hr, S_OK); - r = IXMLDOMNodeList_get_length( node_list2, &len ); - ok( r == S_OK, "ret %08x\n", r); + hr = IXMLDOMNodeList_get_length( node_list2, &len ); + EXPECT_HR(hr, S_OK); ok( len == 0, "len %d\n", len); - r = IXMLDOMNodeList_get_item( node_list2, 0, &node2); - ok( r == S_FALSE, "ret %08x\n", r); + hr = IXMLDOMNodeList_get_item( node_list2, 0, &node2); + EXPECT_HR(hr, S_FALSE); IXMLDOMNodeList_Release( node_list2 ); IXMLDOMNode_Release( node ); IXMLDOMNodeList_Release( node_list ); IXMLDOMElement_Release( element ); + + /* test for children of <?xml ..?> node */ + hr = IXMLDOMDocument_get_firstChild(doc, &node); + EXPECT_HR(hr, S_OK); + + str = NULL; + hr = IXMLDOMNode_get_nodeName(node, &str); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(str, _bstr_("xml")), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + /* it returns empty but valid node list */ + node_list = (void*)0xdeadbeef; + hr = IXMLDOMNode_get_childNodes(node, &node_list); + EXPECT_HR(hr, S_OK); + + len = -1; + hr = IXMLDOMNodeList_get_length(node_list, &len); + EXPECT_HR(hr, S_OK); + ok(len == 0, "got %d\n", len); + + IXMLDOMNodeList_Release( node_list ); + IXMLDOMNode_Release(node); + IXMLDOMDocument_Release( doc ); + free_bstrs(); } static void test_get_firstChild(void) @@ -3973,7 +3998,7 @@ static void test_get_firstChild(void) r = IXMLDOMNode_get_nodeName( node, &str ); ok( r == S_OK, "ret %08x\n", r); - ok(memcmp(str, xmlW, sizeof(xmlW)) == 0, "expected \"xml\" node name\n"); + ok(!lstrcmpW(str, xmlW), "expected \"xml\" node name, got %s\n", wine_dbgstr_w(str)); SysFreeString(str); IXMLDOMNode_Release( node ); @@ -9693,19 +9718,101 @@ static void test_get_attributes(void) if (hr == S_OK) { - IXMLDOMNode_Release(node); + IXMLDOMAttribute *attr; + DOMNodeType type; + VARIANT v; - node = NULL; - hr = IXMLDOMNamedNodeMap_get_item(map, 0, &node); + node2 = NULL; + hr = IXMLDOMNamedNodeMap_get_item(map, 0, &node2); + EXPECT_HR(hr, S_OK); + ok(node != NULL, "got %p\n", node2); + + hr = IXMLDOMNode_get_nodeName(node2, &str); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(str, _bstr_("version")), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + length = -1; + hr = IXMLDOMNamedNodeMap_get_length(map, &length); + EXPECT_HR(hr, S_OK); + ok(length == 1, "got %d\n", length); + + type = -1; + hr = IXMLDOMNode_get_nodeType(node2, &type); + EXPECT_HR(hr, S_OK); + ok(type == NODE_ATTRIBUTE, "got %d\n", type); + + hr = IXMLDOMNode_get_xml(node, &str); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(str, _bstr_("<?xml version=\"1.0\"?>")), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + hr = IXMLDOMNode_get_text(node, &str); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(str, _bstr_("version=\"1.0\"")), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + hr = IXMLDOMNamedNodeMap_removeNamedItem(map, _bstr_("version"), NULL); + EXPECT_HR(hr, S_OK); + + length = -1; + hr = IXMLDOMNamedNodeMap_get_length(map, &length); + EXPECT_HR(hr, S_OK); + ok(length == 0, "got %d\n", length); + + hr = IXMLDOMNode_get_xml(node, &str); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(str, _bstr_("<?xml version=\"1.0\"?>")), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + hr = IXMLDOMNode_get_text(node, &str); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(str, _bstr_("")), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + IXMLDOMNamedNodeMap_Release(map); + + hr = IXMLDOMNode_get_attributes(node, &map); ok(hr == S_OK, "got %08x\n", hr); - ok(node != NULL, "got %p\n", node); - hr = IXMLDOMNode_get_nodeName(node, &str); + length = -1; + hr = IXMLDOMNamedNodeMap_get_length(map, &length); + EXPECT_HR(hr, S_OK); + ok(length == 0, "got %d\n", length); + + hr = IXMLDOMDocument_createAttribute(doc, _bstr_("encoding"), &attr); + EXPECT_HR(hr, S_OK); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = _bstr_("UTF-8"); + hr = IXMLDOMAttribute_put_nodeValue(attr, v); + EXPECT_HR(hr, S_OK); + + EXPECT_REF(attr, 2); + hr = IXMLDOMNamedNodeMap_setNamedItem(map, (IXMLDOMNode*)attr, NULL); + EXPECT_HR(hr, S_OK); + EXPECT_REF(attr, 2); + + hr = IXMLDOMNode_get_attributes(node, &map); ok(hr == S_OK, "got %08x\n", hr); - ok(!lstrcmpW(str, _bstr_("version")), "got %s\n", wine_dbgstr_w(str)); + + length = -1; + hr = IXMLDOMNamedNodeMap_get_length(map, &length); + EXPECT_HR(hr, S_OK); + ok(length == 1, "got %d\n", length); + + hr = IXMLDOMNode_get_xml(node, &str); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(str, _bstr_("<?xml version=\"1.0\"?>")), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + hr = IXMLDOMNode_get_text(node, &str); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(str, _bstr_("encoding=\"UTF-8\"")), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); IXMLDOMNamedNodeMap_Release(map); + IXMLDOMNode_Release(node2); } IXMLDOMNode_Release(node);

1 0

Nikolay Sivov : msxml3: Allow to create dummy node map for <?xml ?>.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: 64e5a6a2576ea784a9df204c78f0593fbda2b267 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64e5a6a2576ea784a9df204c7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 27 00:17:01 2011 +0300 msxml3: Allow to create dummy node map for <?xml ?>. --- dlls/msxml3/pi.c | 5 +++-- dlls/msxml3/tests/domdoc.c | 9 +++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 89b2b5a..302aea2 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -333,9 +333,10 @@ static HRESULT WINAPI dom_pi_get_attributes( if (!strcmpW(name, xmlW)) { - FIXME("not implemented for <?xml..?> declaration\n"); + FIXME("created dummy map for <?xml ?>\n"); + *map = create_nodemap(This->node.node); SysFreeString(name); - return E_NOTIMPL; + return S_OK; } SysFreeString(name); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index cdba14b..75fec54 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -9714,9 +9714,14 @@ static void test_get_attributes(void) ok(hr == S_OK, "got %08x\n", hr); hr = IXMLDOMNode_get_attributes(node, &map); - todo_wine ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "got %08x\n", hr); + + length = -1; + hr = IXMLDOMNamedNodeMap_get_length(map, &length); + EXPECT_HR(hr, S_OK); + todo_wine ok(length == 1, "got %d\n", length); - if (hr == S_OK) + if (hr == S_OK && length == 1) { IXMLDOMAttribute *attr; DOMNodeType type;

1 0

André Hentschel : urlmon/tests: Add another case to IUri tests.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: 47a44f61e2d980274e433d2debe81267f2bd845f URL: http://source.winehq.org/git/wine.git/?a=commit;h=47a44f61e2d980274e433d2de… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Mar 24 18:55:33 2011 +0100 urlmon/tests: Add another case to IUri tests. --- dlls/urlmon/tests/uri.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 68345f1..5ebdd6e 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -788,6 +788,32 @@ static const uri_properties uri_tests[] = { {URLZONE_INVALID,E_NOTIMPL,FALSE} } }, + /* Make sure already percent encoded characters don't get unencoded. */ + { "ftp://\"%20\"weird(a)ftp.google.com/\"%20\"weird", Uri_CREATE_NO_ENCODE_FORBIDDEN_CHARACTERS, S_OK, FALSE, + { + {"ftp://\"%20\"weird(a)ftp.google.com/\"%20\"weird",S_OK,FALSE}, + {"\"%20\"weird(a)ftp.google.com",S_OK,FALSE}, + {"ftp://ftp.google.com/\"%20\"weird",S_OK,FALSE}, + {"google.com",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"ftp.google.com",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"/\"%20\"weird",S_OK,FALSE}, + {"/\"%20\"weird",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"ftp://\"%20\"weird(a)ftp.google.com/\"%20\"weird",S_OK,FALSE}, + {"ftp",S_OK,FALSE}, + {"\"%20\"weird",S_OK,FALSE}, + {"\"%20\"weird",S_OK,FALSE} + }, + { + {Uri_HOST_DNS,S_OK,FALSE}, + {21,S_OK,FALSE}, + {URL_SCHEME_FTP,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + }, /* Allowed to have invalid % encoded because its an unknown scheme type. */ { "zip://%xy:word(a)winehq.org/", 0, S_OK, FALSE, {

1 0