December 2015 - Wine-Commits

Jacek Caban : mshtml: Added IHTMLWindow:: get_clientInformation implementation.
by Alexandre Julliard Dec. 21, 2015

Dec. 21, 2015

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

Jactry Zeng : riched32/tests: Add tests for selection.
by Alexandre Julliard Dec. 21, 2015

Dec. 21, 2015

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

Piotr Caban : ntdll: Fix NtQueryDirectoryFile behavior on short file names on case insensitive file systems.
by Alexandre Julliard Dec. 21, 2015

Dec. 21, 2015

Module: wine Branch: master Commit: a8ef26149308f577151f14a2d359868754c7ea20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8ef26149308f577151f14a2d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 21 18:42:04 2015 +0100 ntdll: Fix NtQueryDirectoryFile behavior on short file names on case insensitive file systems. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/directory.c | 14 -------------- dlls/ntdll/tests/directory.c | 41 ++++++++++++++++++++++++++++++++++++++--- 2 files changed, 38 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 4faafe9..23ebf48 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2120,15 +2120,6 @@ static int read_directory_stat( int fd, IO_STATUS_BLOCK *io, void *buffer, ULONG } else io->u.Status = restart_scan ? STATUS_NO_SUCH_FILE : STATUS_NO_MORE_FILES; } - else if (!case_sensitive && ret && (errno == ENOENT || errno == ENOTDIR)) - { - /* If the file does not exist, return that info. - * If the file DOES exist, return failure and fallback to the next - * read_directory_* function (we need to return the case-preserved - * filename stored on the filesystem). */ - ret = 0; - io->u.Status = restart_scan ? STATUS_NO_SUCH_FILE : STATUS_NO_MORE_FILES; - } else { ret = -1; @@ -2214,11 +2205,6 @@ static int read_directory_getattrlist( int fd, IO_STATUS_BLOCK *io, void *buffer } else io->u.Status = restart_scan ? STATUS_NO_SUCH_FILE : STATUS_NO_MORE_FILES; } - else if ((errno == ENOENT || errno == ENOTDIR) && !get_dir_case_sensitivity(".")) - { - io->u.Status = restart_scan ? STATUS_NO_SUCH_FILE : STATUS_NO_MORE_FILES; - ret = 0; - } } else ret = -1; diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c index 730b0f1..7b1002a 100644 --- a/dlls/ntdll/tests/directory.c +++ b/dlls/ntdll/tests/directory.c @@ -60,6 +60,7 @@ static struct testfile_s { int nfound; /* How many were found (expect 1) */ WCHAR nameW[20]; /* unicode version of name (filled in later) */ } testfiles[] = { + { 0, 0, FILE_ATTRIBUTE_NORMAL, "longfilename.tmp", NULL, "normal" }, { 0, 0, FILE_ATTRIBUTE_NORMAL, "n.tmp", NULL, "normal" }, { 1, 0, FILE_ATTRIBUTE_HIDDEN, "h.tmp", NULL, "hidden" }, { 1, 0, FILE_ATTRIBUTE_SYSTEM, "s.tmp", NULL, "system" }, @@ -234,10 +235,17 @@ static void test_flags_NtQueryDirectoryFile(OBJECT_ATTRIBUTES *attr, const char static void test_NtQueryDirectoryFile(void) { OBJECT_ATTRIBUTES attr; - UNICODE_STRING ntdirname; + UNICODE_STRING ntdirname, mask; char testdirA[MAX_PATH]; WCHAR testdirW[MAX_PATH]; int i; + IO_STATUS_BLOCK io; + WCHAR short_name[12]; + UINT data_size; + BYTE data[8192]; + FILE_BOTH_DIRECTORY_INFORMATION *fbdi = (FILE_BOTH_DIRECTORY_INFORMATION*)data; + DWORD status; + HANDLE dirh; /* Clean up from prior aborted run, if any, then set up test files */ ok(GetTempPathA(MAX_PATH, testdirA), "couldn't get temp dir\n"); @@ -260,8 +268,6 @@ static void test_NtQueryDirectoryFile(void) for (i = 0; testfiles[i].name; i++) { - UNICODE_STRING mask; - if (testfiles[i].nameW[0] == '.') continue; /* . and .. as masks are broken on Windows */ mask.Buffer = testfiles[i].nameW; mask.Length = mask.MaximumLength = lstrlenW(testfiles[i].nameW) * sizeof(WCHAR); @@ -271,6 +277,35 @@ static void test_NtQueryDirectoryFile(void) test_flags_NtQueryDirectoryFile(&attr, testdirA, &mask, TRUE, FALSE); } + /* short path passed as mask */ + status = pNtOpenFile(&dirh, SYNCHRONIZE | FILE_LIST_DIRECTORY, &attr, &io, FILE_SHARE_READ, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_OPEN_FOR_BACKUP_INTENT | FILE_DIRECTORY_FILE); + ok(status == STATUS_SUCCESS, "failed to open dir '%s'\n", testdirA); + if (status != STATUS_SUCCESS) { + skip("can't test if we can't open the directory\n"); + return; + } + mask.Buffer = testfiles[0].nameW; + mask.Length = mask.MaximumLength = lstrlenW(testfiles[0].nameW) * sizeof(WCHAR); + data_size = offsetof(FILE_BOTH_DIRECTORY_INFORMATION, FileName[256]); + pNtQueryDirectoryFile(dirh, 0, NULL, NULL, &io, data, data_size, + FileBothDirectoryInformation, TRUE, &mask, FALSE); + ok(U(io).Status == STATUS_SUCCESS, "failed to query directory; status %x\n", U(io).Status); + ok(fbdi->ShortName[0], "ShortName is empty\n"); + + mask.Length = mask.MaximumLength = fbdi->ShortNameLength; + memcpy(short_name, fbdi->ShortName, mask.Length); + mask.Buffer = short_name; + pNtQueryDirectoryFile(dirh, 0, NULL, NULL, &io, data, data_size, + FileBothDirectoryInformation, TRUE, &mask, TRUE); + ok(U(io).Status == STATUS_SUCCESS, "failed to query directory status %x\n", U(io).Status); + ok(fbdi->FileNameLength == strlen(testfiles[0].name)*sizeof(WCHAR) && + !memcmp(fbdi->FileName, testfiles[0].nameW, fbdi->FileNameLength), + "incorrect long file name: %s\n", wine_dbgstr_wn(fbdi->FileName, + fbdi->FileNameLength/sizeof(WCHAR))); + + pNtClose(dirh); + done: tear_down_attribute_test(testdirA); pRtlFreeUnicodeString(&ntdirname);

1 0

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

Dec. 21, 2015

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: Reimplement node_get_text helper so it uses information about ignorred white space nodes.
by Alexandre Julliard Dec. 21, 2015

Dec. 21, 2015

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

Changhui Liu : hidclass.sys: Properly print 80 bytes in first line when tracing ParseDescriptor.
by Alexandre Julliard Dec. 21, 2015

Dec. 21, 2015

Module: wine Branch: master Commit: 0125ef6dd757b2be8295e0f10f4f0e0657a5486a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0125ef6dd757b2be8295e0f10… Author: Changhui Liu <liuchanghui(a)linuxdeepin.com> Date: Fri Dec 18 14:48:56 2015 +0800 hidclass.sys: Properly print 80 bytes in first line when tracing ParseDescriptor. Signed-off-by: Changhui Liu <liuchanghui(a)linuxdeepin.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index eb0b42a..9a26f0f4 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -1030,7 +1030,7 @@ WINE_HIDP_PREPARSED_DATA* ParseDescriptor(BYTE *descriptor, unsigned int length) for (cidx = 0; cidx < length; cidx++) { TRACE("%x ",descriptor[cidx]); - if (cidx % 80 == 0) + if ((cidx+1) % 80 == 0) TRACE("\n"); } TRACE("\n");

1 0

Piotr Caban : ole32: Fix apartment window class name.
by Alexandre Julliard Dec. 21, 2015

Dec. 21, 2015

Module: wine Branch: master Commit: d7e302b52bdc399f144fe711decb2962eb4af2b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7e302b52bdc399f144fe711d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 21 11:27:37 2015 +0100 ole32: Fix apartment window class name. TestStand 2010 makes class name comparison when pumping RPC messages. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 2f55076..90b049a 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -466,8 +466,7 @@ struct apartment_loaded_dll BOOL multi_threaded; }; -static const WCHAR wszAptWinClass[] = {'O','l','e','M','a','i','n','T','h','r','e','a','d','W','n','d','C','l','a','s','s',' ', - '0','x','#','#','#','#','#','#','#','#',' ',0}; +static const WCHAR wszAptWinClass[] = {'O','l','e','M','a','i','n','T','h','r','e','a','d','W','n','d','C','l','a','s','s',0}; /***************************************************************************** * This section contains OpenDllList implementation

1 0

Changhui Liu : hidclass.sys: Initialize ext-> irp_queue immediately after HID_CreateDevice.
by Alexandre Julliard Dec. 21, 2015

Dec. 21, 2015

Module: wine Branch: master Commit: acdd869e5d2b2fa01c60eddab7445b71ac21881a URL: http://source.winehq.org/git/wine.git/?a=commit;h=acdd869e5d2b2fa01c60eddab… Author: Changhui Liu <liuchanghui(a)linuxdeepin.com> Date: Fri Dec 18 14:40:16 2015 +0800 hidclass.sys: Initialize ext->irp_queue immediately after HID_CreateDevice. Signed-off-by: Changhui Liu <liuchanghui(a)linuxdeepin.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/pnp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 1ae3bb0..24dd140 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -132,6 +132,9 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) return status; } + ext = device->DeviceExtension; + InitializeListHead(&ext->irp_queue); + TRACE("Created device %p\n",device); status = minidriver->AddDevice(minidriver->minidriver.DriverObject, device); if (status != STATUS_SUCCESS) @@ -160,7 +163,6 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) return status; } - ext = device->DeviceExtension; ext->information.VendorID = attr.VendorID; ext->information.ProductID = attr.ProductID; ext->information.VersionNumber = attr.VersionNumber; @@ -233,7 +235,6 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) HID_LinkDevice(device, serial, interface); ext->poll_interval = DEFAULT_POLL_INTERVAL; - InitializeListHead(&ext->irp_queue); ext->ring_buffer = RingBuffer_Create(sizeof(HID_XFER_PACKET) + ext->preparseData->caps.InputReportByteLength);

1 0

Joachim Priesner : wbemprox: Iterate over all drives instead of just the first four.
by Alexandre Julliard Dec. 21, 2015

Dec. 21, 2015

Module: wine Branch: master Commit: 29862da337cdfa50da0402a9b6e8593c951867dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=29862da337cdfa50da0402a9b… Author: Joachim Priesner <joachim.priesner(a)web.de> Date: Mon Dec 21 13:00:32 2015 +0100 wbemprox: Iterate over all drives instead of just the first four. Signed-off-by: Joachim Priesner <joachim.priesner(a)web.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 2ff3f50..b7db266 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -1176,7 +1176,7 @@ static enum fill_status fill_cdromdrive( struct table *table, const struct expr if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED; - for (i = 0; i < sizeof(drives); i++) + for (i = 0; i < 26; i++) { if (drives & (1 << i)) { @@ -1598,7 +1598,7 @@ static enum fill_status fill_datafile( struct table *table, const struct expr *c dirstack = alloc_dirstack(2); - for (i = 0; i < sizeof(drives); i++) + for (i = 0; i < 26; i++) { if (!(drives & (1 << i))) continue; @@ -1719,7 +1719,7 @@ static enum fill_status fill_directory( struct table *table, const struct expr * dirstack = alloc_dirstack(2); - for (i = 0; i < sizeof(drives); i++) + for (i = 0; i < 26; i++) { if (!(drives & (1 << i))) continue; @@ -1831,7 +1831,7 @@ static enum fill_status fill_diskdrive( struct table *table, const struct expr * if (!resize_table( table, 2, sizeof(*rec) )) return FILL_STATUS_FAILED; - for (i = 0; i < sizeof(drives); i++) + for (i = 0; i < 26; i++) { if (drives & (1 << i)) { @@ -1895,7 +1895,7 @@ static enum fill_status fill_diskpartition( struct table *table, const struct ex if (!resize_table( table, 4, sizeof(*rec) )) return FILL_STATUS_FAILED; - for (i = 0; i < sizeof(drives); i++) + for (i = 0; i < 26; i++) { if (drives & (1 << i)) { @@ -1962,7 +1962,7 @@ static enum fill_status fill_logicaldisk( struct table *table, const struct expr if (!resize_table( table, 4, sizeof(*rec) )) return FILL_STATUS_FAILED; - for (i = 0; i < sizeof(drives); i++) + for (i = 0; i < 26; i++) { if (drives & (1 << i)) {

1 0

Nikolay Sivov : ntdll: Trace RTL_BITMAP api arguments as unsigned when appropriate.
by Alexandre Julliard Dec. 21, 2015

Dec. 21, 2015

Module: wine Branch: master Commit: 86df15cbf1e1bc323a05e5a6c15b982c4fd7b92a URL: http://source.winehq.org/git/wine.git/?a=commit;h=86df15cbf1e1bc323a05e5a6c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 17 16:06:50 2015 +0300 ntdll: Trace RTL_BITMAP api arguments as unsigned when appropriate. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/rtlbitmap.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/rtlbitmap.c b/dlls/ntdll/rtlbitmap.c index 20d6a02..318f6fc 100644 --- a/dlls/ntdll/rtlbitmap.c +++ b/dlls/ntdll/rtlbitmap.c @@ -74,7 +74,7 @@ static const signed char NTDLL_mostSignificant[16] = { */ VOID WINAPI RtlInitializeBitMap(PRTL_BITMAP lpBits, PULONG lpBuff, ULONG ulSize) { - TRACE("(%p,%p,%d)\n", lpBits,lpBuff,ulSize); + TRACE("(%p,%p,%u)\n", lpBits,lpBuff,ulSize); lpBits->SizeOfBitMap = ulSize; lpBits->Buffer = lpBuff; } @@ -130,7 +130,7 @@ VOID WINAPI RtlSetBits(PRTL_BITMAP lpBits, ULONG ulStart, ULONG ulCount) { LPBYTE lpOut; - TRACE("(%p,%d,%d)\n", lpBits, ulStart, ulCount); + TRACE("(%p,%u,%u)\n", lpBits, ulStart, ulCount); if (!lpBits || !ulCount || ulStart >= lpBits->SizeOfBitMap || @@ -191,7 +191,7 @@ VOID WINAPI RtlClearBits(PRTL_BITMAP lpBits, ULONG ulStart, ULONG ulCount) { LPBYTE lpOut; - TRACE("(%p,%d,%d)\n", lpBits, ulStart, ulCount); + TRACE("(%p,%u,%u)\n", lpBits, ulStart, ulCount); if (!lpBits || !ulCount || ulStart >= lpBits->SizeOfBitMap || @@ -254,7 +254,7 @@ BOOLEAN WINAPI RtlAreBitsSet(PCRTL_BITMAP lpBits, ULONG ulStart, ULONG ulCount) LPBYTE lpOut; ULONG ulRemainder; - TRACE("(%p,%d,%d)\n", lpBits, ulStart, ulCount); + TRACE("(%p,%u,%u)\n", lpBits, ulStart, ulCount); if (!lpBits || !ulCount || ulStart >= lpBits->SizeOfBitMap || @@ -327,7 +327,7 @@ BOOLEAN WINAPI RtlAreBitsClear(PCRTL_BITMAP lpBits, ULONG ulStart, ULONG ulCount LPBYTE lpOut; ULONG ulRemainder; - TRACE("(%p,%d,%d)\n", lpBits, ulStart, ulCount); + TRACE("(%p,%u,%u)\n", lpBits, ulStart, ulCount); if (!lpBits || !ulCount || ulStart >= lpBits->SizeOfBitMap || @@ -395,7 +395,7 @@ ULONG WINAPI RtlFindSetBits(PCRTL_BITMAP lpBits, ULONG ulCount, ULONG ulHint) { ULONG ulPos, ulEnd; - TRACE("(%p,%d,%d)\n", lpBits, ulCount, ulHint); + TRACE("(%p,%u,%u)\n", lpBits, ulCount, ulHint); if (!lpBits || !ulCount || ulCount > lpBits->SizeOfBitMap) return ~0U; @@ -442,7 +442,7 @@ ULONG WINAPI RtlFindClearBits(PCRTL_BITMAP lpBits, ULONG ulCount, ULONG ulHint) { ULONG ulPos, ulEnd; - TRACE("(%p,%d,%d)\n", lpBits, ulCount, ulHint); + TRACE("(%p,%u,%u)\n", lpBits, ulCount, ulHint); if (!lpBits || !ulCount || ulCount > lpBits->SizeOfBitMap) return ~0U; @@ -489,7 +489,7 @@ ULONG WINAPI RtlFindSetBitsAndClear(PRTL_BITMAP lpBits, ULONG ulCount, ULONG ulH { ULONG ulPos; - TRACE("(%p,%d,%d)\n", lpBits, ulCount, ulHint); + TRACE("(%p,%u,%u)\n", lpBits, ulCount, ulHint); ulPos = RtlFindSetBits(lpBits, ulCount, ulHint); if (ulPos != ~0U) @@ -514,7 +514,7 @@ ULONG WINAPI RtlFindClearBitsAndSet(PRTL_BITMAP lpBits, ULONG ulCount, ULONG ulH { ULONG ulPos; - TRACE("(%p,%d,%d)\n", lpBits, ulCount, ulHint); + TRACE("(%p,%u,%u)\n", lpBits, ulCount, ulHint); ulPos = RtlFindClearBits(lpBits, ulCount, ulHint); if (ulPos != ~0U) @@ -870,7 +870,7 @@ ULONG WINAPI RtlFindNextForwardRunSet(PCRTL_BITMAP lpBits, ULONG ulStart, PULONG { ULONG ulSize = 0; - TRACE("(%p,%d,%p)\n", lpBits, ulStart, lpPos); + TRACE("(%p,%u,%p)\n", lpBits, ulStart, lpPos); if (lpBits && ulStart < lpBits->SizeOfBitMap && lpPos) *lpPos = NTDLL_FindSetRun(lpBits, ulStart, &ulSize); @@ -897,7 +897,7 @@ ULONG WINAPI RtlFindNextForwardRunClear(PCRTL_BITMAP lpBits, ULONG ulStart, PULO { ULONG ulSize = 0; - TRACE("(%p,%d,%p)\n", lpBits, ulStart, lpPos); + TRACE("(%p,%u,%p)\n", lpBits, ulStart, lpPos); if (lpBits && ulStart < lpBits->SizeOfBitMap && lpPos) *lpPos = NTDLL_FindClearRun(lpBits, ulStart, &ulSize); @@ -922,7 +922,7 @@ ULONG WINAPI RtlFindNextForwardRunClear(PCRTL_BITMAP lpBits, ULONG ulStart, PULO */ ULONG WINAPI RtlFindLastBackwardRunSet(PCRTL_BITMAP lpBits, ULONG ulStart, PULONG lpPos) { - FIXME("(%p,%d,%p)-stub!\n", lpBits, ulStart, lpPos); + FIXME("(%p,%u,%p)-stub!\n", lpBits, ulStart, lpPos); return 0; } @@ -943,7 +943,7 @@ ULONG WINAPI RtlFindLastBackwardRunSet(PCRTL_BITMAP lpBits, ULONG ulStart, PULON */ ULONG WINAPI RtlFindLastBackwardRunClear(PCRTL_BITMAP lpBits, ULONG ulStart, PULONG lpPos) { - FIXME("(%p,%d,%p)-stub!\n", lpBits, ulStart, lpPos); + FIXME("(%p,%u,%p)-stub!\n", lpBits, ulStart, lpPos); return 0; } @@ -1021,7 +1021,7 @@ static ULONG NTDLL_FindRuns(PCRTL_BITMAP lpBits, PRTL_BITMAP_RUN lpSeries, ULONG WINAPI RtlFindSetRuns(PCRTL_BITMAP lpBits, PRTL_BITMAP_RUN lpSeries, ULONG ulCount, BOOLEAN bLongest) { - TRACE("(%p,%p,%d,%d)\n", lpBits, lpSeries, ulCount, bLongest); + TRACE("(%p,%p,%u,%d)\n", lpBits, lpSeries, ulCount, bLongest); return NTDLL_FindRuns(lpBits, lpSeries, ulCount, bLongest, NTDLL_FindSetRun); } @@ -1043,7 +1043,7 @@ ULONG WINAPI RtlFindSetRuns(PCRTL_BITMAP lpBits, PRTL_BITMAP_RUN lpSeries, ULONG WINAPI RtlFindClearRuns(PCRTL_BITMAP lpBits, PRTL_BITMAP_RUN lpSeries, ULONG ulCount, BOOLEAN bLongest) { - TRACE("(%p,%p,%d,%d)\n", lpBits, lpSeries, ulCount, bLongest); + TRACE("(%p,%p,%u,%d)\n", lpBits, lpSeries, ulCount, bLongest); return NTDLL_FindRuns(lpBits, lpSeries, ulCount, bLongest, NTDLL_FindClearRun); }

1 0