December 2015 - Wine-commits

Piotr Caban : msxml3: Reimplement node_get_text helper so it uses information about ignorred white space nodes.
by Alexandre Julliard 21 Dec '15

21 Dec '15

Module: wine Branch: master Commit: 900fe6afa6903a3ace29a60dc97e010cd8cfaadd URL: http://source.winehq.org/git/wine.git/?a=commit;h=900fe6afa6903a3ace29a60dc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 21 11:41:22 2015 +0100 msxml3: Reimplement node_get_text helper so it uses information about ignorred white space nodes. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/node.c | 47 +++++++++++++++++++++++++++++++++++++++------- dlls/msxml3/tests/domdoc.c | 4 ++-- 2 files changed, 42 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 8914e05..17e3838 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -742,7 +742,7 @@ static inline xmlChar* trim_whitespace(xmlChar* str) return ret; } -static xmlChar* do_get_text(xmlNodePtr node) +static xmlChar* do_get_text(xmlNodePtr node, BOOL trim, BOOL *trail_ig_ws) { xmlNodePtr child; xmlChar* str; @@ -751,20 +751,42 @@ static xmlChar* do_get_text(xmlNodePtr node) if (!node->children) { str = xmlNodeGetContent(node); + *trail_ig_ws = *(DWORD*)&node->_private & NODE_PRIV_CHILD_IGNORABLE_WS; } else { - xmlElementType prev_type = XML_TEXT_NODE; + BOOL ig_ws = FALSE; xmlChar* tmp; str = xmlStrdup(BAD_CAST ""); + + if (node->type != XML_DOCUMENT_NODE) + ig_ws = *(DWORD*)&node->_private & NODE_PRIV_CHILD_IGNORABLE_WS; + *trail_ig_ws = FALSE; + for (child = node->children; child != NULL; child = child->next) { switch (child->type) { case XML_ELEMENT_NODE: - tmp = do_get_text(child); + tmp = do_get_text(child, FALSE, trail_ig_ws); break; case XML_TEXT_NODE: + tmp = xmlNodeGetContent(child); + if (!preserving && tmp[0]) + { + xmlChar *beg; + + for (beg = tmp; *beg; beg++) + if (!isspace(*beg)) break; + + if (!*beg) + { + ig_ws = TRUE; + xmlFree(tmp); + tmp = NULL; + } + break; + } case XML_CDATA_SECTION_NODE: case XML_ENTITY_REF_NODE: case XML_ENTITY_NODE: @@ -779,14 +801,24 @@ static xmlChar* do_get_text(xmlNodePtr node) { if (*tmp) { - if (prev_type == XML_ELEMENT_NODE && child->type == XML_ELEMENT_NODE) + if (ig_ws && str[0]) str = xmlStrcat(str, BAD_CAST " "); str = xmlStrcat(str, tmp); - prev_type = child->type; + ig_ws = FALSE; } xmlFree(tmp); } + + if (!ig_ws) + { + ig_ws = *(DWORD*)&child->_private & NODE_PRIV_TRAILING_IGNORABLE_WS; + } + if (!ig_ws) + ig_ws = *trail_ig_ws; + *trail_ig_ws = FALSE; } + + *trail_ig_ws = ig_ws; } switch (node->type) @@ -797,7 +829,7 @@ static xmlChar* do_get_text(xmlNodePtr node) case XML_ENTITY_NODE: case XML_DOCUMENT_NODE: case XML_DOCUMENT_FRAG_NODE: - if (!preserving) + if (trim && !preserving) str = trim_whitespace(str); break; default: @@ -811,10 +843,11 @@ HRESULT node_get_text(const xmlnode *This, BSTR *text) { BSTR str = NULL; xmlChar *content; + BOOL tmp; if (!text) return E_INVALIDARG; - content = do_get_text(This->node); + content = do_get_text(This->node, TRUE, &tmp); if (content) { str = bstr_from_xmlChar(content); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 00a24b6..4201bac 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -4174,7 +4174,7 @@ static inline void _check_ws_ignored(int line, const char *ver, IXMLDOMDocument2 helper_ole_check_ver(IXMLDOMNode_get_text(node1, &bstr)); if (str) { - todo_wine helper_expect_bstr_and_release(bstr, str); + helper_expect_bstr_and_release(bstr, str); } else { @@ -4217,7 +4217,7 @@ static inline void _check_ws_preserved(int line, const char *ver, IXMLDOMDocumen } else { - todo_wine helper_expect_bstr_and_release(bstr, "\n This is a description. \n "); + helper_expect_bstr_and_release(bstr, "\n This is a description. \n "); } IXMLDOMNode_Release(node1);

1 0

Piotr Caban : msxml3: Add support for CDATA nodes in node_get_text.
by Alexandre Julliard 21 Dec '15

21 Dec '15

Module: wine Branch: master Commit: 028d5e5179807b7be8abfb79a3877eeed58c5f3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=028d5e5179807b7be8abfb79a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 21 11:41:26 2015 +0100 msxml3: Add support for CDATA nodes in node_get_text. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/node.c | 77 +++++++++++++++++++++++++++------------------- dlls/msxml3/tests/domdoc.c | 4 +-- 2 files changed, 48 insertions(+), 33 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 17e3838..72fa92f 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -723,31 +723,15 @@ HRESULT node_clone(xmlnode *This, VARIANT_BOOL deep, IXMLDOMNode **cloneNode) return S_OK; } -static inline xmlChar* trim_whitespace(xmlChar* str) -{ - xmlChar* ret = str; - int len; - - if (!str) - return NULL; - - while (*ret && isspace(*ret)) - ++ret; - len = xmlStrlen(ret); - if (len) - while (isspace(ret[len-1])) --len; - - ret = xmlStrndup(ret, len); - xmlFree(str); - return ret; -} - -static xmlChar* do_get_text(xmlNodePtr node, BOOL trim, BOOL *trail_ig_ws) +static xmlChar* do_get_text(xmlNodePtr node, BOOL trim, DWORD *first, DWORD *last, BOOL *trail_ig_ws) { xmlNodePtr child; xmlChar* str; BOOL preserving = is_preserving_whitespace(node); + *first = -1; + *last = 0; + if (!node->children) { str = xmlNodeGetContent(node); @@ -757,6 +741,7 @@ static xmlChar* do_get_text(xmlNodePtr node, BOOL trim, BOOL *trail_ig_ws) { BOOL ig_ws = FALSE; xmlChar* tmp; + DWORD pos = 0; str = xmlStrdup(BAD_CAST ""); if (node->type != XML_DOCUMENT_NODE) @@ -767,9 +752,17 @@ static xmlChar* do_get_text(xmlNodePtr node, BOOL trim, BOOL *trail_ig_ws) { switch (child->type) { - case XML_ELEMENT_NODE: - tmp = do_get_text(child, FALSE, trail_ig_ws); + case XML_ELEMENT_NODE: { + DWORD node_first, node_last; + + tmp = do_get_text(child, FALSE, &node_first, &node_last, trail_ig_ws); + + if (node_first!=-1 && pos+node_first<*first) + *first = pos+node_first; + if (node_last && pos+node_last>*last) + *last = pos+node_last; break; + } case XML_TEXT_NODE: tmp = xmlNodeGetContent(child); if (!preserving && tmp[0]) @@ -797,17 +790,22 @@ static xmlChar* do_get_text(xmlNodePtr node, BOOL trim, BOOL *trail_ig_ws) break; } - if (tmp) + if ((tmp && *tmp) || child->type==XML_CDATA_SECTION_NODE) { - if (*tmp) + if (ig_ws && str[0]) { - if (ig_ws && str[0]) - str = xmlStrcat(str, BAD_CAST " "); - str = xmlStrcat(str, tmp); - ig_ws = FALSE; + str = xmlStrcat(str, BAD_CAST " "); + pos++; } - xmlFree(tmp); + if (tmp && *tmp) str = xmlStrcat(str, tmp); + if (child->type==XML_CDATA_SECTION_NODE && pos<*first) + *first = pos; + if (tmp && *tmp) pos += xmlStrlen(tmp); + if (child->type==XML_CDATA_SECTION_NODE && pos>*last) + *last = pos; + ig_ws = FALSE; } + if (tmp) xmlFree(tmp); if (!ig_ws) { @@ -830,7 +828,23 @@ static xmlChar* do_get_text(xmlNodePtr node, BOOL trim, BOOL *trail_ig_ws) case XML_DOCUMENT_NODE: case XML_DOCUMENT_FRAG_NODE: if (trim && !preserving) - str = trim_whitespace(str); + { + xmlChar* ret = str; + int len; + + if (!str) + break; + + for (ret = str; *ret && isspace(*ret) && (*first)--; ret++) + if (*last) (*last)--; + for (len = xmlStrlen(ret)-1; len >= 0 && len >= *last; len--) + if(!isspace(ret[len])) break; + + ret = xmlStrndup(ret, len+1); + xmlFree(str); + str = ret; + break; + } break; default: break; @@ -843,11 +857,12 @@ HRESULT node_get_text(const xmlnode *This, BSTR *text) { BSTR str = NULL; xmlChar *content; + DWORD first, last; BOOL tmp; if (!text) return E_INVALIDARG; - content = do_get_text(This->node, TRUE, &tmp); + content = do_get_text(This->node, TRUE, &first, &last, &tmp); if (content) { str = bstr_from_xmlChar(content); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 4201bac..1926f50 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -4178,7 +4178,7 @@ static inline void _check_ws_ignored(int line, const char *ver, IXMLDOMDocument2 } else { - todo_wine helper_expect_bstr_and_release(bstr, " This is a description."); + helper_expect_bstr_and_release(bstr, " This is a description."); } IXMLDOMNode_Release(node1); @@ -4213,7 +4213,7 @@ static inline void _check_ws_preserved(int line, const char *ver, IXMLDOMDocumen helper_ole_check_ver(IXMLDOMNode_get_text(node1, &bstr)); if (str) { - todo_wine helper_expect_bstr_and_release(bstr, str); + helper_expect_bstr_and_release(bstr, str); } else {

1 0

Piotr Caban : msxml3/tests: Use exact comparison in IXMLDOMNode:: get_text tests.
by Alexandre Julliard 21 Dec '15

21 Dec '15

Module: wine Branch: master Commit: e2cf78232d3ed4576f7ca1f9be8e99ed9cf08165 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2cf78232d3ed4576f7ca1f9b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 21 11:41:30 2015 +0100 msxml3/tests: Use exact comparison in IXMLDOMNode::get_text tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 1926f50..81b0256 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -3138,8 +3138,7 @@ static void test_get_text(void) { r = IXMLDOMNode_get_text( nodeRoot, &str ); ok( r == S_OK, "ret %08x\n", r ); - ok( compareIgnoreReturns(str, _bstr_("fn1.txt\n\n fn2.txt \n\nf1\n")), "wrong get_text: %s\n", wine_dbgstr_w(str)); - SysFreeString(str); + expect_bstr_eq_and_free(str, "fn1.txt\n \nfn2.txt\n \nf1"); IXMLDOMNode_Release(nodeRoot); }

1 0

Jactry Zeng : riched32/tests: Test EM_LINELENGTH with multibyte character.
by Alexandre Julliard 21 Dec '15

21 Dec '15

Module: wine Branch: master Commit: d9ead0c899975780347916fe52f825681f8a16e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9ead0c899975780347916fe5… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Dec 21 20:59:58 2015 +0800 riched32/tests: Test EM_LINELENGTH with multibyte character. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched32/tests/editor.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index d3a286e..40daae0 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -35,6 +35,7 @@ #include <wine/test.h> static HMODULE hmoduleRichEdit; +static BOOL is_lang_japanese; static HWND new_window(LPCSTR lpClassName, DWORD dwStyle, HWND parent) { HWND hwnd; @@ -498,6 +499,32 @@ static void test_EM_LINELENGTH(void) offset_test[i][0], result, offset_test[i][1]); } + /* Test with multibyte character */ + if (!is_lang_japanese) + skip("Skip multibyte character tests on non-Japanese platform\n"); + else + { + const char *text1 = + "wine\n" + "richedit\x8e\xf0\n" + "wine"; + static int offset_test1[3][3] = { + {0, 4}, /* Line 1: |wine\n */ + {5, 10, 1}, /* Line 2: |richedit\x8e\xf0\n */ + {16, 4}, /* Line 3: |wine */ + }; + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text1); + for (i = 0; i < sizeof(offset_test1)/sizeof(offset_test1[0]); i++) { + result = SendMessageA(hwndRichEdit, EM_LINELENGTH, offset_test1[i][0], 0); + if (offset_test1[i][2]) + todo_wine ok(result == offset_test1[i][1], "Length of line at offset %d is %ld, expected %d\n", + offset_test1[i][0], result, offset_test1[i][1]); + else + ok(result == offset_test1[i][1], "Length of line at offset %d is %ld, expected %d\n", + offset_test1[i][0], result, offset_test1[i][1]); + } + } + DestroyWindow(hwndRichEdit); } @@ -1211,6 +1238,7 @@ START_TEST( editor ) * RICHED32.DLL, so the linker doesn't actually link to it. */ hmoduleRichEdit = LoadLibraryA("riched32.dll"); ok(hmoduleRichEdit != NULL, "error: %d\n", (int) GetLastError()); + is_lang_japanese = (PRIMARYLANGID(GetUserDefaultLangID()) == LANG_JAPANESE); test_WM_SETTEXT(); test_EM_GETTEXTRANGE();

1 0

Jactry Zeng : riched20/tests: Test EM_LINELENGTH with multibyte character.
by Alexandre Julliard 21 Dec '15

21 Dec '15

Module: wine Branch: master Commit: 99f0f6b91b981407b9f18c8b499f339dcf76f5a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99f0f6b91b981407b9f18c8b4… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Dec 21 21:00:28 2015 +0800 riched20/tests: Test EM_LINELENGTH with multibyte character. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index efa0b29..6c4195c 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -46,6 +46,7 @@ static CHAR string1[MAX_PATH], string2[MAX_PATH], string3[MAX_PATH]; format, string1, string2, string3); static HMODULE hmoduleRichEdit; +static BOOL is_lang_japanese; static HWND new_window(LPCSTR lpClassName, DWORD dwStyle, HWND parent) { HWND hwnd; @@ -486,6 +487,28 @@ static void test_EM_LINELENGTH(void) offset_test[i][0], result, offset_test[i][1]); } + /* Test with multibyte character */ + if (!is_lang_japanese) + skip("Skip multibyte character tests on non-Japanese platform\n"); + else + { + const char *text1 = + "wine\n" + "richedit\x8e\xf0\n" + "wine"; + int offset_test1[3][2] = { + {0, 4}, /* Line 1: |wine\n */ + {5, 9}, /* Line 2: |richedit\x8e\xf0\n */ + {15, 4}, /* Line 3: |wine */ + }; + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text1); + for (i = 0; i < sizeof(offset_test1)/sizeof(offset_test1[0]); i++) { + result = SendMessageA(hwndRichEdit, EM_LINELENGTH, offset_test1[i][0], 0); + ok(result == offset_test1[i][1], "Length of line at offset %d is %ld, expected %d\n", + offset_test1[i][0], result, offset_test1[i][1]); + } + } + DestroyWindow(hwndRichEdit); } @@ -4009,7 +4032,7 @@ static void test_EM_SETTEXTEX(void) ok(result == 0, "EM_SETTEXTEX: Test UTF8 with BOM set wrong text: Result: %s\n", bufACP); /* Test multibyte character */ - if (PRIMARYLANGID(GetUserDefaultLangID()) != LANG_JAPANESE) + if (!is_lang_japanese) skip("Skip multibyte character tests on non-Japanese platform\n"); else { @@ -4882,7 +4905,7 @@ static void test_EM_REPLACESEL(int redraw) ok(r == 7, "EM_GETLINECOUNT returned %d, expected 7\n", r); /* Test with multibyte character */ - if (PRIMARYLANGID(GetUserDefaultLangID()) != LANG_JAPANESE) + if (!is_lang_japanese) skip("Skip multibyte character tests on non-Japanese platform\n"); else { @@ -8160,6 +8183,7 @@ START_TEST( editor ) * RICHED20.DLL, so the linker doesn't actually link to it. */ hmoduleRichEdit = LoadLibraryA("riched20.dll"); ok(hmoduleRichEdit != NULL, "error: %d\n", (int) GetLastError()); + is_lang_japanese = (PRIMARYLANGID(GetUserDefaultLangID()) == LANG_JAPANESE); test_WM_CHAR(); test_EM_FINDTEXT(FALSE);

1 0

Jactry Zeng : riched20/tests: Add multibyte character tests for selection.
by Alexandre Julliard 21 Dec '15

21 Dec '15

Module: wine Branch: master Commit: de0add976dea9b90cae8e2db37e80e46c692b935 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de0add976dea9b90cae8e2db3… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Dec 21 21:00:53 2015 +0800 riched20/tests: Add multibyte character tests for selection. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 6c4195c..1b2a257 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -4577,6 +4577,27 @@ static void test_EM_EXSETSEL(void) check_EM_EXSETSEL(hwndRichEdit, &exsetsel_tests[i], i); } + if (!is_lang_japanese) + skip("Skip multibyte character tests on non-Japanese platform\n"); + else + { + CHARRANGE cr; + char bufA[MAX_BUF_LEN] = {0}; + LRESULT result; + + /* Test with multibyte character */ + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"abcdef\x8e\xf0ghijk"); + /* 012345 6 78901 */ + cr.cpMin = 4, cr.cpMax = 8; + result = SendMessageA(hwndRichEdit, EM_EXSETSEL, 0, (LPARAM)&cr); + ok(result == 8, "EM_EXSETSEL return %ld expected 8\n", result); + result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, sizeof(bufA), (LPARAM)bufA); + ok(!strcmp(bufA, "ef\x8e\xf0g"), "EM_GETSELTEXT return incorrect string\n"); + SendMessageA(hwndRichEdit, EM_EXGETSEL, 0, (LPARAM)&cr); + ok(cr.cpMin == 4, "Selection start incorrectly: %d expected 4\n", cr.cpMin); + ok(cr.cpMax == 8, "Selection end incorrectly: %d expected 8\n", cr.cpMax); + } + DestroyWindow(hwndRichEdit); } @@ -4601,7 +4622,7 @@ static void check_EM_SETSEL(HWND hwnd, const struct exsetsel_s *setsel, int id) static void test_EM_SETSEL(void) { - char buffA[32]; + char buffA[32] = {0}; HWND hwndRichEdit = new_richedit(NULL); int i; const int num_tests = sizeof(exsetsel_tests)/sizeof(struct exsetsel_s); @@ -4620,6 +4641,25 @@ static void test_EM_SETSEL(void) SendMessageA(hwndRichEdit, EM_GETSELTEXT, 0, (LPARAM)buffA); ok(buffA[0] == 0, "selection text %s\n", buffA); + if (!is_lang_japanese) + skip("Skip multibyte character tests on non-Japanese platform\n"); + else + { + int sel_start, sel_end; + LRESULT result; + + /* Test with multibyte character */ + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"abcdef\x8e\xf0ghijk"); + /* 012345 6 78901 */ + result = SendMessageA(hwndRichEdit, EM_SETSEL, 4, 8); + ok(result == 8, "EM_SETSEL return %ld expected 8\n", result); + result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, sizeof(buffA), (LPARAM)buffA); + ok(!strcmp(buffA, "ef\x8e\xf0g"), "EM_GETSELTEXT return incorrect string\n"); + result = SendMessageA(hwndRichEdit, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); + ok(sel_start == 4, "Selection start incorrectly: %d expected 4\n", sel_start); + ok(sel_end == 8, "Selection end incorrectly: %d expected 8\n", sel_end); + } + DestroyWindow(hwndRichEdit); }

1 0

Jactry Zeng : riched32/tests: Add tests for selection.
by Alexandre Julliard 21 Dec '15

21 Dec '15

Module: wine Branch: master Commit: 43bd40bdec95fa15949017998c55e728c09d181f URL: http://source.winehq.org/git/wine.git/?a=commit;h=43bd40bdec95fa15949017998… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Dec 21 21:01:37 2015 +0800 riched32/tests: Add tests for selection. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched32/tests/editor.c | 169 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 169 insertions(+) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index 40daae0..ff37750 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -1228,6 +1228,173 @@ static void test_enter(void) DestroyWindow(hwndRichEdit); } +struct exsetsel_s { + LONG min; + LONG max; + LRESULT expected_retval; + int expected_getsel_start; + int expected_getsel_end; + BOOL result_todo; + BOOL sel_todo; +}; + +static const struct exsetsel_s exsetsel_tests[] = { + /* sanity tests */ + {5, 10, 10, 5, 10, 0, 0 }, + {15, 17, 17, 15, 17, 0, 0 }, + /* test cpMax > strlen() */ + {0, 100, 19, 0, 19, 1, 0 }, + /* test cpMin < 0 && cpMax >= 0 after cpMax > strlen() */ + {-1, 1, 17, 17, 17, 1, 0 }, + /* test cpMin == cpMax */ + {5, 5, 5, 5, 5, 0, 0 }, + /* test cpMin < 0 && cpMax >= 0 (bug 4462) */ + {-1, 0, 5, 5, 5, 0, 0 }, + {-1, 17, 5, 5, 5, 0, 0 }, + {-1, 18, 5, 5, 5, 0, 0 }, + /* test cpMin < 0 && cpMax < 0 */ + {-1, -1, 17, 17, 17, 0, 0 }, + {-4, -5, 17, 17, 17, 0, 0 }, + /* test cpMin >=0 && cpMax < 0 (bug 6814) */ + {0, -1, 19, 0, 19, 1, 0 }, + {17, -5, 19, 17, 19, 1, 0 }, + {18, -3, 19, 17, 19, 1, 1 }, + /* test if cpMin > cpMax */ + {15, 19, 19, 15, 19, 1, 0 }, + {19, 15, 19, 15, 19, 1, 0 }, + /* cpMin == strlen() && cpMax > cpMin */ + {17, 18, 17, 17, 17, 1, 1 }, + {17, 50, 19, 17, 19, 1, 0 }, +}; + +static void check_EM_EXSETSEL(HWND hwnd, const struct exsetsel_s *setsel, int id) { + CHARRANGE cr; + LRESULT result; + int start, end; + + cr.cpMin = setsel->min; + cr.cpMax = setsel->max; + result = SendMessageA(hwnd, EM_EXSETSEL, 0, (LPARAM)&cr); + + if (setsel->result_todo) + todo_wine ok(result == setsel->expected_retval, "EM_EXSETSEL(%d): expected: %ld actual: %ld\n", id, setsel->expected_retval, result); + else + ok(result == setsel->expected_retval, "EM_EXSETSEL(%d): expected: %ld actual: %ld\n", id, setsel->expected_retval, result); + + SendMessageA(hwnd, EM_GETSEL, (WPARAM)&start, (LPARAM)&end); + + if (setsel->sel_todo) { + todo_wine { + ok(start == setsel->expected_getsel_start && end == setsel->expected_getsel_end, "EM_EXSETSEL(%d): expected (%d,%d) actual:(%d,%d)\n", id, setsel->expected_getsel_start, setsel->expected_getsel_end, start, end); + } + } else { + ok(start == setsel->expected_getsel_start && end == setsel->expected_getsel_end, "EM_EXSETSEL(%d): expected (%d,%d) actual:(%d,%d)\n", id, setsel->expected_getsel_start, setsel->expected_getsel_end, start, end); + } +} + +static void test_EM_EXSETSEL(void) +{ + HWND hwndRichEdit = new_richedit(NULL); + int i; + const int num_tests = sizeof(exsetsel_tests)/sizeof(struct exsetsel_s); + + /* sending some text to the window */ + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"testing selection"); + /* 01234567890123456 */ + + for (i = 0; i < num_tests; i++) { + check_EM_EXSETSEL(hwndRichEdit, &exsetsel_tests[i], i); + } + + if (!is_lang_japanese) + skip("Skip multibyte character tests on non-Japanese platform\n"); + else + { + CHARRANGE cr; + LRESULT result; +#define MAX_BUF_LEN 1024 + char bufA[MAX_BUF_LEN] = {0}; + + /* Test with multibyte character */ + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"abcdef\x8e\xf0ghijk"); + /* 012345 6 7 8901 */ + cr.cpMin = 4, cr.cpMax = 8; + result = SendMessageA(hwndRichEdit, EM_EXSETSEL, 0, (LPARAM)&cr); + todo_wine ok(result == 7, "EM_EXSETSEL return %ld expected 7\n", result); + result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, sizeof(bufA), (LPARAM)bufA); + todo_wine ok(!strcmp(bufA, "ef\x8e\xf0"), "EM_GETSELTEXT return incorrect string\n"); + SendMessageA(hwndRichEdit, EM_EXGETSEL, 0, (LPARAM)&cr); + ok(cr.cpMin == 4, "Selection start incorrectly: %d expected 4\n", cr.cpMin); + ok(cr.cpMax == 8, "Selection end incorrectly: %d expected 8\n", cr.cpMax); + } + + DestroyWindow(hwndRichEdit); +} + +static void check_EM_SETSEL(HWND hwnd, const struct exsetsel_s *setsel, int id) { + LRESULT result; + int start, end; + + result = SendMessageA(hwnd, EM_SETSEL, setsel->min, setsel->max); + + if (setsel->result_todo) + todo_wine ok(result == setsel->expected_retval, "EM_SETSEL(%d): expected: %ld actual: %ld\n", id, setsel->expected_retval, result); + else + ok(result == setsel->expected_retval, "EM_SETSEL(%d): expected: %ld actual: %ld\n", id, setsel->expected_retval, result); + + SendMessageA(hwnd, EM_GETSEL, (WPARAM)&start, (LPARAM)&end); + + if (setsel->sel_todo) { + todo_wine { + ok(start == setsel->expected_getsel_start && end == setsel->expected_getsel_end, "EM_SETSEL(%d): expected (%d,%d) actual:(%d,%d)\n", id, setsel->expected_getsel_start, setsel->expected_getsel_end, start, end); + } + } else { + ok(start == setsel->expected_getsel_start && end == setsel->expected_getsel_end, "EM_SETSEL(%d): expected (%d,%d) actual:(%d,%d)\n", id, setsel->expected_getsel_start, setsel->expected_getsel_end, start, end); + } +} + +static void test_EM_SETSEL(void) +{ + char buffA[32] = {0}; + HWND hwndRichEdit = new_richedit(NULL); + int i; + const int num_tests = sizeof(exsetsel_tests)/sizeof(struct exsetsel_s); + + /* sending some text to the window */ + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"testing selection"); + /* 01234567890123456 */ + + for (i = 0; i < num_tests; i++) { + check_EM_SETSEL(hwndRichEdit, &exsetsel_tests[i], i); + } + + SendMessageA(hwndRichEdit, EM_SETSEL, 17, 18); + buffA[0] = 123; + SendMessageA(hwndRichEdit, EM_GETSELTEXT, 0, (LPARAM)buffA); + ok(buffA[0] == 0, "selection text %s\n", buffA); + + if (!is_lang_japanese) + skip("Skip multibyte character tests on non-Japanese platform\n"); + else + { + int sel_start, sel_end; + LRESULT result; + + /* Test with multibyte character */ + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"abcdef\x8e\xf0ghijk"); + /* 012345 6 7 8901 */ + result = SendMessageA(hwndRichEdit, EM_SETSEL, 4, 8); + todo_wine ok(result == 7, "EM_SETSEL return %ld expected 7\n", result); + result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, sizeof(buffA), (LPARAM)buffA); + todo_wine ok(!strcmp(buffA, "ef\x8e\xf0"), "EM_GETSELTEXT return incorrect string\n"); + result = SendMessageA(hwndRichEdit, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); + ok(sel_start == 4, "Selection start incorrectly: %d expected 4\n", sel_start); + ok(sel_end == 8, "Selection end incorrectly: %d expected 8\n", sel_end); + } + + DestroyWindow(hwndRichEdit); +} + START_TEST( editor ) { MSG msg; @@ -1254,6 +1421,8 @@ START_TEST( editor ) test_EM_GETOPTIONS(); test_autoscroll(); test_enter(); + test_EM_EXSETSEL(); + test_EM_SETSEL(); /* Set the environment variable WINETEST_RICHED32 to keep windows * responsive and open for 30 seconds. This is useful for debugging.

1 0

Jacek Caban : mshtml: Added IHTMLWindow:: get_clientInformation implementation.
by Alexandre Julliard 21 Dec '15

21 Dec '15

Module: wine Branch: master Commit: 11a6bfc673cb45d3186c5d09926e0f44aae09dcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=11a6bfc673cb45d3186c5d099… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 21 14:30:50 2015 +0100 mshtml: Added IHTMLWindow::get_clientInformation implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 6 ++++-- dlls/mshtml/tests/dom.c | 9 +++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index fbb558e..d7d133a 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1349,8 +1349,10 @@ static HRESULT WINAPI HTMLWindow2_scroll(IHTMLWindow2 *iface, LONG x, LONG y) static HRESULT WINAPI HTMLWindow2_get_clientInformation(IHTMLWindow2 *iface, IOmNavigator **p) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return IHTMLWindow2_get_navigator(&This->IHTMLWindow2_iface, p); } static HRESULT WINAPI HTMLWindow2_setInterval(IHTMLWindow2 *iface, BSTR expression, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index b892ac0..9d09acd 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5965,11 +5965,16 @@ static void test_navigator(IHTMLDocument2 *doc) hres = IHTMLWindow2_get_navigator(window, &navigator2); ok(hres == S_OK, "get_navigator failed: %08x\n", hres); - ok(navigator != navigator2, "navigator2 != navihgator\n"); + ok(navigator != navigator2, "navigator2 != navigator\n"); + IOmNavigator_Release(navigator2); - IHTMLWindow2_Release(window); + hres = IHTMLWindow2_get_clientInformation(window, &navigator2); + ok(hres == S_OK, "get_clientInformation failed: %08x\n", hres); + todo_wine ok(iface_cmp((IUnknown*)navigator, (IUnknown*)navigator2), "navigator2 != navigator\n"); IOmNavigator_Release(navigator2); + IHTMLWindow2_Release(window); + hres = IOmNavigator_get_appCodeName(navigator, &bstr); ok(hres == S_OK, "get_appCodeName failed: %08x\n", hres); ok(!strcmp_wa(bstr, "Mozilla"), "Unexpected appCodeName %s\n", wine_dbgstr_w(bstr));

1 0

Jacek Caban : mshtml: Added nsIChannel::Cancel implementation.
by Alexandre Julliard 21 Dec '15

21 Dec '15

Module: wine Branch: master Commit: 86c097142bdc66bccab7dc5fd7b44a7bc86e43d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86c097142bdc66bccab7dc5fd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 21 14:31:29 2015 +0100 mshtml: Added nsIChannel::Cancel implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/binding.h | 2 ++ dlls/mshtml/navigate.c | 21 +++++++++++++++------ dlls/mshtml/nsio.c | 8 ++++++-- 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index e173431..3a4e06b 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -55,6 +55,8 @@ typedef struct { REQUEST_METHOD request_method; struct list response_headers; struct list request_headers; + + nsChannelBSC *binding; } nsChannel; typedef struct { diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index ed61ab0..1854a70 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -927,6 +927,8 @@ static HRESULT on_start_nsrequest(nsChannelBSC *This) { nsresult nsres; + This->nschannel->binding = This; + /* FIXME: it's needed for http connections from BindToObject. */ if(!This->nschannel->response_status) This->nschannel->response_status = 200; @@ -972,11 +974,15 @@ static void on_stop_nsrequest(nsChannelBSC *This, HRESULT result) WARN("OnStopRequest failed: %08x\n", nsres); } - if(This->nschannel && This->nschannel->load_group) { - nsres = nsILoadGroup_RemoveRequest(This->nschannel->load_group, - (nsIRequest*)&This->nschannel->nsIHttpChannel_iface, NULL, request_result); - if(NS_FAILED(nsres)) - ERR("RemoveRequest failed: %08x\n", nsres); + if(This->nschannel) { + if(This->nschannel->load_group) { + nsres = nsILoadGroup_RemoveRequest(This->nschannel->load_group, + (nsIRequest*)&This->nschannel->nsIHttpChannel_iface, NULL, request_result); + if(NS_FAILED(nsres)) + ERR("RemoveRequest failed: %08x\n", nsres); + } + if(This->nschannel->binding == This) + This->nschannel->binding = NULL; } } @@ -1217,8 +1223,11 @@ static void nsChannelBSC_destroy(BSCallback *bsc) { nsChannelBSC *This = nsChannelBSC_from_BSCallback(bsc); - if(This->nschannel) + if(This->nschannel) { + if(This->nschannel->binding == This) + This->nschannel->binding = NULL; nsIHttpChannel_Release(&This->nschannel->nsIHttpChannel_iface); + } if(This->nslistener) nsIStreamListener_Release(This->nslistener); if(This->nscontext) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index a2615c4..a5a1ffd 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -617,9 +617,13 @@ static nsresult NSAPI nsChannel_Cancel(nsIHttpChannel *iface, nsresult aStatus) { nsChannel *This = impl_from_nsIHttpChannel(iface); - FIXME("(%p)->(%08x)\n", This, aStatus); + TRACE("(%p)->(%08x)\n", This, aStatus); - return NS_ERROR_NOT_IMPLEMENTED; + if(This->binding && This->binding->bsc.binding) + IBinding_Abort(This->binding->bsc.binding); + else + WARN("No binding to cancel\n"); + return NS_OK; } static nsresult NSAPI nsChannel_Suspend(nsIHttpChannel *iface)

1 0

Michael Stefaniuc : dsound: Fail to create a version 8 3d buffer with DSBCAPS_CTRLPAN.
by Alexandre Julliard 21 Dec '15

21 Dec '15

Module: wine Branch: master Commit: 0e5dcc2c841be0a4311d1915d073d2775fe436b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e5dcc2c841be0a4311d1915d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 21 12:08:09 2015 +0100 dsound: Fail to create a version 8 3d buffer with DSBCAPS_CTRLPAN. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound.c | 5 +++++ dlls/dsound/tests/ds3d8.c | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 7b93455..e50ef58 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -542,6 +542,11 @@ static HRESULT DirectSoundDevice_CreateSoundBuffer( return DSERR_INVALIDPARAM; } + if (from8 && (dsbd->dwFlags & DSBCAPS_CTRL3D) && (dsbd->dwFlags & DSBCAPS_CTRLPAN)) { + WARN("invalid parameter: DSBCAPS_CTRL3D and DSBCAPS_CTRLPAN cannot be used together\n"); + return DSERR_INVALIDPARAM; + } + hres = IDirectSoundBufferImpl_Create(device, &dsb, dsbd); if (dsb) { *ppdsb = (IDirectSoundBuffer*)&dsb->IDirectSoundBuffer8_iface; diff --git a/dlls/dsound/tests/ds3d8.c b/dlls/dsound/tests/ds3d8.c index 330f590..25eb010 100644 --- a/dlls/dsound/tests/ds3d8.c +++ b/dlls/dsound/tests/ds3d8.c @@ -654,7 +654,6 @@ static HRESULT test_secondary8(LPGUID lpGuid, BOOL play, /* Invalid flag combination */ bufdesc.dwFlags|=DSBCAPS_CTRLPAN; rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); - todo_wine ok(rc==DSERR_INVALIDPARAM, "IDirectSound8_CreateSoundBuffer(secondary) should have " "returned DSERR_INVALIDPARAM, returned %08x\n", rc);

1 0