wine-commits November 2015

wine-commits@winehq.org

2 participants
623 discussions

Nikolay Sivov : d2d1: Properly free brush data buffer is created from.
by Alexandre Julliard 19 Nov '15

19 Nov '15

Module: wine Branch: master Commit: 39f2ed321d87d888ac3f81e764d0e5c661db74ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=39f2ed321d87d888ac3f81e76… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 19 15:08:40 2015 +0300 d2d1: Properly free brush data buffer is created from. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 2014f47..aa92318 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -860,8 +860,7 @@ HRESULT d2d_brush_get_ps_cb(struct d2d_brush *brush, struct d2d_brush *opacity_b HeapFree(GetProcessHeap(), 0, cb_data); return E_NOTIMPL; } - cb_data += brush_sizes[brush->type]; - if (opacity_brush && !d2d_brush_fill_cb(opacity_brush, render_target, cb_data)) + if (opacity_brush && !d2d_brush_fill_cb(opacity_brush, render_target, cb_data + brush_sizes[brush->type])) { HeapFree(GetProcessHeap(), 0, cb_data); return E_NOTIMPL;

1 0

Jacek Caban : kernel32: Call registry functions with full key path.
by Alexandre Julliard 19 Nov '15

19 Nov '15

Module: wine Branch: master Commit: 6a7363b69432ceed1ddb8e6172272773fdd64d63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a7363b69432ceed1ddb8e617… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 19 12:53:33 2015 +0100 kernel32: Call registry functions with full key path. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/computername.c | 3 ++- dlls/kernel32/except.c | 3 ++- dlls/kernel32/locale.c | 6 +++--- dlls/kernel32/oldconfig.c | 6 +++--- dlls/kernel32/path.c | 3 ++- dlls/kernel32/process.c | 9 ++++++--- 6 files changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/computername.c b/dlls/kernel32/computername.c index 0c81ac0..1b5f4aa 100644 --- a/dlls/kernel32/computername.c +++ b/dlls/kernel32/computername.c @@ -50,7 +50,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(computername); /* Registry key and value names */ -static const WCHAR ComputerW[] = {'M','a','c','h','i','n','e','\\', +static const WCHAR ComputerW[] = {'\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\', 'S','y','s','t','e','m','\\', 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', 'C','o','n','t','r','o','l','\\', diff --git a/dlls/kernel32/except.c b/dlls/kernel32/except.c index 2a7dbaa..1a1521a 100644 --- a/dlls/kernel32/except.c +++ b/dlls/kernel32/except.c @@ -192,7 +192,8 @@ static BOOL start_debugger(PEXCEPTION_POINTERS epointers, HANDLE hEvent) BOOL ret = FALSE; char buffer[256]; - static const WCHAR AeDebugW[] = {'M','a','c','h','i','n','e','\\', + static const WCHAR AeDebugW[] = {'\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\', 'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', 'W','i','n','d','o','w','s',' ','N','T','\\', diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 6dc0d05..3b632b4 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -62,13 +62,13 @@ static const union cptable *mac_cptable; static const union cptable *unix_cptable; /* NULL if UTF8 */ static const WCHAR szLocaleKeyName[] = { - 'M','a','c','h','i','n','e','\\','S','y','s','t','e','m','\\', + '\\','R','e','g','i','s','t','r','y','\\','M','a','c','h','i','n','e','\\','S','y','s','t','e','m','\\', 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', 'C','o','n','t','r','o','l','\\','N','l','s','\\','L','o','c','a','l','e',0 }; static const WCHAR szLangGroupsKeyName[] = { - 'M','a','c','h','i','n','e','\\','S','y','s','t','e','m','\\', + '\\','R','e','g','i','s','t','r','y','\\','M','a','c','h','i','n','e','\\','S','y','s','t','e','m','\\', 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', 'C','o','n','t','r','o','l','\\','N','l','s','\\', 'L','a','n','g','u','a','g','e',' ','G','r','o','u','p','s',0 @@ -875,7 +875,7 @@ void LOCALE_InitRegistry(void) if (locale_update_registry( hkey, lc_ctypeW, lcid_LC_CTYPE, NULL, 0 )) { static const WCHAR codepageW[] = - {'M','a','c','h','i','n','e','\\','S','y','s','t','e','m','\\', + {'\\','R','e','g','i','s','t','r','y','\\','M','a','c','h','i','n','e','\\','S','y','s','t','e','m','\\', 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', 'C','o','n','t','r','o','l','\\','N','l','s','\\','C','o','d','e','p','a','g','e',0}; diff --git a/dlls/kernel32/oldconfig.c b/dlls/kernel32/oldconfig.c index 2c8bc18..6c80dc6 100644 --- a/dlls/kernel32/oldconfig.c +++ b/dlls/kernel32/oldconfig.c @@ -100,11 +100,11 @@ static void create_scsi_entry( PSCSI_ADDRESS scsi_addr, LPCSTR lpDriver, UINT uD HANDLE lunKey; DWORD disp; - if (create_key( 0, "Machine\\HARDWARE\\DEVICEMAP", &scsiKey, &disp )) return; + if (create_key( 0, "\\Registry\\Machine\\HARDWARE\\DEVICEMAP", &scsiKey, &disp )) return; NtClose( scsiKey ); /* Ensure there is Scsi key */ - if (create_key( 0, "Machine\\HARDWARE\\DEVICEMAP\\Scsi", &scsiKey, &disp )) return; + if (create_key( 0, "\\Registry\\Machine\\HARDWARE\\DEVICEMAP\\Scsi", &scsiKey, &disp )) return; snprintf(buffer,sizeof(buffer),"Scsi Port %d",scsi_addr->PortNumber); if (create_key( scsiKey, buffer, &portKey, &disp )) return; @@ -398,7 +398,7 @@ void convert_old_config(void) DWORD disp; /* create some hardware keys (FIXME: should not be done here) */ - if (create_key( 0, "Machine\\HARDWARE", &key, &disp )) return; + if (create_key( 0, "\\Registry\\Machine\\HARDWARE", &key, &disp )) return; NtClose( key ); if (disp != REG_OPENED_EXISTING_KEY) create_hardware_branch(); } diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index d8977f9..ff94227 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -120,7 +120,8 @@ static BOOL add_boot_rename_entry( LPCWSTR source, LPCWSTR dest, DWORD flags ) static const WCHAR ValueName[] = {'P','e','n','d','i','n','g', 'F','i','l','e','R','e','n','a','m','e', 'O','p','e','r','a','t','i','o','n','s',0}; - static const WCHAR SessionW[] = {'M','a','c','h','i','n','e','\\', + static const WCHAR SessionW[] = {'\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\', 'S','y','s','t','e','m','\\', 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', 'C','o','n','t','r','o','l','\\', diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 17ae16d..89ae5c4 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -400,7 +400,8 @@ static void set_registry_variables( HANDLE hkey, ULONG type ) */ static BOOL set_registry_environment( BOOL volatile_only ) { - static const WCHAR env_keyW[] = {'M','a','c','h','i','n','e','\\', + static const WCHAR env_keyW[] = {'\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\', 'S','y','s','t','e','m','\\', 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', 'C','o','n','t','r','o','l','\\', @@ -504,7 +505,8 @@ static WCHAR *get_reg_value( HKEY hkey, const WCHAR *name ) */ static void set_additional_environment(void) { - static const WCHAR profile_keyW[] = {'M','a','c','h','i','n','e','\\', + static const WCHAR profile_keyW[] = {'\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\', 'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', 'W','i','n','d','o','w','s',' ','N','T','\\', @@ -570,7 +572,8 @@ static void set_wow64_environment(void) static const WCHAR archW[] = {'P','R','O','C','E','S','S','O','R','_','A','R','C','H','I','T','E','C','T','U','R','E',0}; static const WCHAR arch6432W[] = {'P','R','O','C','E','S','S','O','R','_','A','R','C','H','I','T','E','W','6','4','3','2',0}; static const WCHAR x86W[] = {'x','8','6',0}; - static const WCHAR versionW[] = {'M','a','c','h','i','n','e','\\', + static const WCHAR versionW[] = {'\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\', 'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', 'W','i','n','d','o','w','s','\\',

1 0

Jacek Caban : ntdll: Added more NtOpenKey tests.
by Alexandre Julliard 19 Nov '15

19 Nov '15

Module: wine Branch: master Commit: 26df0863ca6d57c2d5ce24b79a5cd9f5e711ae83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26df0863ca6d57c2d5ce24b79… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 19 12:48:22 2015 +0100 ntdll: Added more NtOpenKey tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/reg.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 0e00f99..e688fd2 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -340,6 +340,7 @@ static void test_NtOpenKey(void) NTSTATUS status; OBJECT_ATTRIBUTES attr; ACCESS_MASK am = KEY_READ; + UNICODE_STRING str; /* All NULL */ status = pNtOpenKey(NULL, 0, NULL); @@ -361,6 +362,27 @@ static void test_NtOpenKey(void) status = pNtOpenKey(&key, am, &attr); ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got: 0x%08x\n", status); + /* Calling without parent key requres full registry path. */ + pRtlCreateUnicodeStringFromAsciiz( &str, "Machine" ); + InitializeObjectAttributes(&attr, &str, 0, 0, 0); + status = pNtOpenKey(&key, KEY_READ, &attr); + todo_wine ok(status == STATUS_OBJECT_PATH_SYNTAX_BAD, "NtOpenKey Failed: 0x%08x\n", status); + if (!status) + pNtClose(key); + + /* Open is case sensitive unless OBJ_CASE_INSENSITIVE is specified. */ + pRtlCreateUnicodeStringFromAsciiz( &str, "\\Registry\\Machine" ); + status = pNtOpenKey(&key, KEY_READ, &attr); + todo_wine ok(status == STATUS_OBJECT_PATH_NOT_FOUND, "NtOpenKey Failed: 0x%08x\n", status); + if (!status) + pNtClose(key); + + attr.Attributes = OBJ_CASE_INSENSITIVE; + status = pNtOpenKey(&key, KEY_READ, &attr); + ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08x\n", status); + if (!status) + pNtClose(key); + if (!pNtOpenKeyEx) { win_skip("NtOpenKeyEx not available\n");

1 0

Jacek Caban : mshtml: Added support for getElementsByTagName in document fragment nodes.
by Alexandre Julliard 19 Nov '15

19 Nov '15

Module: wine Branch: master Commit: 808c2d6c7fefb38fe50357749439ea9af9c2cf48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=808c2d6c7fefb38fe50357749… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 19 12:14:59 2015 +0100 mshtml: Added support for getElementsByTagName in document fragment nodes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 46 +++++++++++++++++++++++++++++++++++---------- dlls/mshtml/tests/dom.c | 50 +++++++++++++++++++++++++++++++++++-------------- 2 files changed, 72 insertions(+), 24 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 8e53b8b..cdeb371 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2371,19 +2371,45 @@ static HRESULT WINAPI HTMLDocument3_getElementsByTagName(IHTMLDocument3 *iface, TRACE("(%p)->(%s %p)\n", This, debugstr_w(v), pelColl); - if(!This->doc_node->nsdoc) { - WARN("NULL nsdoc\n"); - return E_UNEXPECTED; - } + if(This->doc_node->nsdoc) { + nsAString_InitDepend(&id_str, v); + nsres = nsIDOMHTMLDocument_GetElementsByTagName(This->doc_node->nsdoc, &id_str, &nslist); + nsAString_Finish(&id_str); + if(FAILED(nsres)) { + ERR("GetElementByName failed: %08x\n", nsres); + return E_FAIL; + } + }else { + nsIDOMDocumentFragment *docfrag; + nsAString nsstr; + + if(v) { + const WCHAR *ptr; + for(ptr=v; *ptr; ptr++) { + if(!isalnumW(*ptr)) { + FIXME("Unsupported invalid tag %s\n", debugstr_w(v)); + return E_NOTIMPL; + } + } + } - nsAString_InitDepend(&id_str, v); - nsres = nsIDOMHTMLDocument_GetElementsByTagName(This->doc_node->nsdoc, &id_str, &nslist); - nsAString_Finish(&id_str); - if(FAILED(nsres)) { - ERR("GetElementByName failed: %08x\n", nsres); - return E_FAIL; + nsres = nsIDOMNode_QueryInterface(This->doc_node->node.nsnode, &IID_nsIDOMDocumentFragment, (void**)&docfrag); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIDOMDocumentFragment iface: %08x\n", nsres); + return E_UNEXPECTED; + } + + nsAString_InitDepend(&nsstr, v); + nsres = nsIDOMDocumentFragment_QuerySelectorAll(docfrag, &nsstr, &nslist); + nsAString_Finish(&nsstr); + nsIDOMDocumentFragment_Release(docfrag); + if(NS_FAILED(nsres)) { + ERR("QuerySelectorAll failed: %08x\n", nsres); + return E_FAIL; + } } + *pelColl = create_collection_from_nodelist(This->doc_node, nslist); nsIDOMNodeList_Release(nslist); diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 896e6ad..bc60ff0 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2693,6 +2693,35 @@ static void _test_elem_getelembytag(unsigned line, IUnknown *unk, elem_type_t ty IHTMLElementCollection_Release(col); } +#define test_doc_getelembytag(a,b,c,d) _test_doc_getelembytag(__LINE__,a,b,c,d) +static void _test_doc_getelembytag(unsigned line, IHTMLDocument2 *unk, const char *tag, elem_type_t type, LONG exlen) +{ + IHTMLDocument3 *doc = _get_doc3_iface(line, unk); + IHTMLElementCollection *col = NULL; + elem_type_t *types = NULL; + BSTR tmp; + int i; + HRESULT hres; + + tmp = a2bstr(elem_type_infos[type].tag); + hres = IHTMLDocument3_getElementsByTagName(doc, tmp, &col); + SysFreeString(tmp); + ok_(__FILE__,line) (hres == S_OK, "getElementByTagName failed: %08x\n", hres); + ok_(__FILE__,line) (col != NULL, "col == NULL\n"); + + if(exlen) { + types = HeapAlloc(GetProcessHeap(), 0, exlen*sizeof(elem_type_t)); + for(i=0; i<exlen; i++) + types[i] = type; + } + + _test_elem_collection(line, (IUnknown*)col, types, exlen); + + HeapFree(GetProcessHeap(), 0, types); + IHTMLElementCollection_Release(col); + IHTMLDocument3_Release(doc); +} + #define test_elem_innertext(e,t) _test_elem_innertext(__LINE__,e,t) static void _test_elem_innertext(unsigned line, IHTMLElement *elem, const char *extext) { @@ -8283,20 +8312,7 @@ static void test_elems(IHTMLDocument2 *doc) } IDispatch_Release(disp); - hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument3, (void**)&doc3); - ok(hres == S_OK, "Could not get IHTMLDocument3 iface: %08x\n", hres); - - str = a2bstr("Img"); - hres = IHTMLDocument3_getElementsByTagName(doc3, str, &col); - ok(hres == S_OK, "getElementsByTagName(%s) failed: %08x\n", wine_dbgstr_w(str), hres); - SysFreeString(str); - if(hres == S_OK) - { - static const elem_type_t img_types[] = { ET_IMG }; - - test_elem_collection((IUnknown*)col, img_types, sizeof(img_types)/sizeof(img_types[0])); - IHTMLElementCollection_Release(col); - } + test_doc_getelembytag(doc, "Img", ET_IMG, 1); elem = get_doc_elem_by_id(doc, "y"); test_elem_set_innerhtml((IUnknown*)elem, "inner html"); @@ -8313,6 +8329,9 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElement_Release(elem2); IHTMLElement_Release(elem); + hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument3, (void**)&doc3); + ok(hres == S_OK, "Could not get IHTMLDocument3 iface: %08x\n", hres); + hres = IHTMLDocument3_recalc(doc3, VARIANT_TRUE); ok(hres == S_OK, "recalc failed: %08x\n", hres); @@ -9263,6 +9282,9 @@ static void test_docfrag(IHTMLDocument2 *doc) test_elem_source_index(br, 0); IHTMLElement_Release(br); + test_doc_getelembytag(frag, "a", ET_A, 0); + test_doc_getelembytag(frag, "Br", ET_BR, 1); + div = get_elem_by_id(doc, "divid", TRUE); test_node_append_child((IUnknown*)div, (IUnknown*)frag); IHTMLElement_Release(div);

1 0

Piotr Caban : msxml3/tests: Add CDATA block to whitespace trimming tests.
by Alexandre Julliard 19 Nov '15

19 Nov '15

Module: wine Branch: master Commit: ef127caef2206a6a1935a4b7335bc43dfe1a8e16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef127caef2206a6a1935a4b73… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 18 12:56:01 2015 +0100 msxml3/tests: Add CDATA block to whitespace trimming 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 | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 10e5d55..c894361 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -481,7 +481,7 @@ static const char szExampleXML[] = " <d>D1 field</d>\n" " <description xmlns:foo='http://www.winehq.org' xmlns:bar='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'>\n" " <html xmlns='http://www.w3.org/1999/xhtml'>\n" -" This is a description<dot>. </dot><bar:x/>\n" +" <![CDATA[]]> This is a description<dot>. </dot><bar:x/>\n" " </html>\n" " <html xml:space='preserve' xmlns='http://www.w3.org/1999/xhtml'>\n" " This is a description with preserved whitespace. <bar:x/>\n" @@ -4163,7 +4163,9 @@ static inline void _check_ws_ignored(int line, IXMLDOMDocument2* doc, char const helper_expect_list_and_release(list, "E1.E5.E1.E2.D1 E2.E5.E1.E2.D1"); helper_ole_check(IXMLDOMNode_get_childNodes(node1, &list)); - helper_expect_list_and_release(list, "T1.E1.E5.E1.E2.D1 E2.E1.E5.E1.E2.D1 E3.E1.E5.E1.E2.D1 E4.E1.E5.E1.E2.D1 E5.E1.E5.E1.E2.D1"); + helper_expect_list_and_release(list, + "[4]1.E1.E5.E1.E2.D1 T2.E1.E5.E1.E2.D1 E3.E1.E5.E1.E2.D1 " + "E4.E1.E5.E1.E2.D1 E5.E1.E5.E1.E2.D1 E6.E1.E5.E1.E2.D1"); helper_ole_check(IXMLDOMNode_get_text(node1, &bstr)); if (str) { @@ -4171,7 +4173,7 @@ static inline void _check_ws_ignored(int line, IXMLDOMDocument2* doc, char const } else { - todo_wine helper_expect_bstr_and_release(bstr, "This is a description."); + todo_wine helper_expect_bstr_and_release(bstr, " This is a description."); } IXMLDOMNode_Release(node1); @@ -4196,7 +4198,10 @@ static inline void _check_ws_preserved(int line, IXMLDOMDocument2* doc, char con helper_expect_list_and_release(list, "E2.E10.E2.E2.D1 E4.E10.E2.E2.D1"); helper_ole_check(IXMLDOMNode_get_childNodes(node1, &list)); - helper_expect_list_and_release(list, "T1.E2.E10.E2.E2.D1 E2.E2.E10.E2.E2.D1 T3.E2.E10.E2.E2.D1 E4.E2.E10.E2.E2.D1 E5.E2.E10.E2.E2.D1 E6.E2.E10.E2.E2.D1 T7.E2.E10.E2.E2.D1"); + helper_expect_list_and_release(list, + "T1.E2.E10.E2.E2.D1 [4]2.E2.E10.E2.E2.D1 T3.E2.E10.E2.E2.D1 " + "E4.E2.E10.E2.E2.D1 T5.E2.E10.E2.E2.D1 E6.E2.E10.E2.E2.D1 " + "E7.E2.E10.E2.E2.D1 E8.E2.E10.E2.E2.D1 T9.E2.E10.E2.E2.D1"); helper_ole_check(IXMLDOMNode_get_text(node1, &bstr)); if (str) { @@ -4204,7 +4209,7 @@ static inline void _check_ws_preserved(int line, IXMLDOMDocument2* doc, char con } else { - todo_wine helper_expect_bstr_and_release(bstr, "\n This is a description. \n "); + todo_wine helper_expect_bstr_and_release(bstr, "\n This is a description. \n "); } IXMLDOMNode_Release(node1); @@ -4311,8 +4316,8 @@ static void test_whitespace(void) ole_check(IXMLDOMDocument2_put_preserveWhiteSpace(doc2, VARIANT_FALSE)); /* the trailing "\n " isn't there, because it was ws-only node */ - check_ws_ignored(doc1, "\n This is a description. "); - check_ws_preserved(doc2, "This is a description."); + check_ws_ignored(doc1, " This is a description. "); + check_ws_preserved(doc2, " This is a description."); /* it takes effect on reload */ ole_check(IXMLDOMDocument2_get_preserveWhiteSpace(doc1, &b)); @@ -4602,7 +4607,7 @@ if (0) ole_check(IXMLDOMNode_selectNodes(elem1Node, _bstr_("//test:c"), &list)); expect_list_and_release(list, "E3.E3.E2.D1 E3.E4.E2.D1"); ole_check(IXMLDOMNode_selectNodes(elem1Node, _bstr_(".//test:x"), &list)); - expect_list_and_release(list, "E5.E1.E5.E1.E2.D1 E6.E2.E5.E1.E2.D1"); + expect_list_and_release(list, "E6.E1.E5.E1.E2.D1 E6.E2.E5.E1.E2.D1"); /* SelectionNamespaces syntax error - the namespaces doesn't work anymore but the value is stored */ ole_expect(IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionNamespaces"), @@ -6894,7 +6899,7 @@ static const xslpattern_test_t xslpattern_test[] = { static const xslpattern_test_t xslpattern_test_no_ns[] = { /* prefixes don't need to be registered, you may use them as they are in the doc */ - { "//bar:x", "E5.E1.E5.E1.E2.D1 E6.E2.E5.E1.E2.D1" }, + { "//bar:x", "E6.E1.E5.E1.E2.D1 E6.E2.E5.E1.E2.D1" }, /* prefixes must be explicitly specified in the name */ { "//foo:elem", "" }, { "//foo:c", "E3.E4.E2.D1" },

1 0

Piotr Caban : msxml3/tests: Show that sub-elements should not be divided with ' ' in IXMLDOMNode_get_text.
by Alexandre Julliard 19 Nov '15

19 Nov '15

Module: wine Branch: master Commit: fa01cd0880c7499f7bd6723b27f3c3816f027835 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa01cd0880c7499f7bd6723b2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 18 12:55:48 2015 +0100 msxml3/tests: Show that sub-elements should not be divided with ' ' in IXMLDOMNode_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/tests/domdoc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 835ddd5..10e5d55 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -481,7 +481,7 @@ static const char szExampleXML[] = " <d>D1 field</d>\n" " <description xmlns:foo='http://www.winehq.org' xmlns:bar='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'>\n" " <html xmlns='http://www.w3.org/1999/xhtml'>\n" -" This is a description. <bar:x/>\n" +" This is a description<dot>. </dot><bar:x/>\n" " </html>\n" " <html xml:space='preserve' xmlns='http://www.w3.org/1999/xhtml'>\n" " This is a description with preserved whitespace. <bar:x/>\n" @@ -4163,11 +4163,11 @@ static inline void _check_ws_ignored(int line, IXMLDOMDocument2* doc, char const helper_expect_list_and_release(list, "E1.E5.E1.E2.D1 E2.E5.E1.E2.D1"); helper_ole_check(IXMLDOMNode_get_childNodes(node1, &list)); - helper_expect_list_and_release(list, "T1.E1.E5.E1.E2.D1 E2.E1.E5.E1.E2.D1 E3.E1.E5.E1.E2.D1 T4.E1.E5.E1.E2.D1 E5.E1.E5.E1.E2.D1"); + helper_expect_list_and_release(list, "T1.E1.E5.E1.E2.D1 E2.E1.E5.E1.E2.D1 E3.E1.E5.E1.E2.D1 E4.E1.E5.E1.E2.D1 E5.E1.E5.E1.E2.D1"); helper_ole_check(IXMLDOMNode_get_text(node1, &bstr)); if (str) { - helper_expect_bstr_and_release(bstr, str); + todo_wine helper_expect_bstr_and_release(bstr, str); } else { @@ -4196,7 +4196,7 @@ static inline void _check_ws_preserved(int line, IXMLDOMDocument2* doc, char con helper_expect_list_and_release(list, "E2.E10.E2.E2.D1 E4.E10.E2.E2.D1"); helper_ole_check(IXMLDOMNode_get_childNodes(node1, &list)); - helper_expect_list_and_release(list, "T1.E2.E10.E2.E2.D1 E2.E2.E10.E2.E2.D1 T3.E2.E10.E2.E2.D1 E4.E2.E10.E2.E2.D1 T5.E2.E10.E2.E2.D1 E6.E2.E10.E2.E2.D1 T7.E2.E10.E2.E2.D1"); + helper_expect_list_and_release(list, "T1.E2.E10.E2.E2.D1 E2.E2.E10.E2.E2.D1 T3.E2.E10.E2.E2.D1 E4.E2.E10.E2.E2.D1 E5.E2.E10.E2.E2.D1 E6.E2.E10.E2.E2.D1 T7.E2.E10.E2.E2.D1"); helper_ole_check(IXMLDOMNode_get_text(node1, &bstr)); if (str) { @@ -4204,7 +4204,7 @@ static inline void _check_ws_preserved(int line, IXMLDOMDocument2* doc, char con } else { - helper_expect_bstr_and_release(bstr, "\n This is a description. \n "); + todo_wine helper_expect_bstr_and_release(bstr, "\n This is a description. \n "); } IXMLDOMNode_Release(node1);

1 0

Piotr Caban : msxml3/tests: Add tests for sub-nodes whitespaces trimming while getting node text.
by Alexandre Julliard 19 Nov '15

19 Nov '15

Module: wine Branch: master Commit: 80df8c03e23a2831bd7154a595341d41028e386c URL: http://source.winehq.org/git/wine.git/?a=commit;h=80df8c03e23a2831bd7154a59… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 18 12:55:38 2015 +0100 msxml3/tests: Add tests for sub-nodes whitespaces trimming while getting node 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/tests/domdoc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 5518494..835ddd5 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -481,7 +481,7 @@ static const char szExampleXML[] = " <d>D1 field</d>\n" " <description xmlns:foo='http://www.winehq.org' xmlns:bar='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'>\n" " <html xmlns='http://www.w3.org/1999/xhtml'>\n" -" This is a description. <bar:x/>\n" +" This is a description. <bar:x/>\n" " </html>\n" " <html xml:space='preserve' xmlns='http://www.w3.org/1999/xhtml'>\n" " This is a description with preserved whitespace. <bar:x/>\n" @@ -4171,7 +4171,7 @@ static inline void _check_ws_ignored(int line, IXMLDOMDocument2* doc, char const } else { - helper_expect_bstr_and_release(bstr, "This is a description."); + todo_wine helper_expect_bstr_and_release(bstr, "This is a description."); } IXMLDOMNode_Release(node1);

1 0

Piotr Caban : msxml3/tests: Add more IXMLDOMNode_get_text tests.
by Alexandre Julliard 19 Nov '15

19 Nov '15

Module: wine Branch: master Commit: 4386cac6cad601fb8afb97b65ebc08d9f6151dd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4386cac6cad601fb8afb97b65… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 18 12:55:21 2015 +0100 msxml3/tests: Add more 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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index b563a80..5518494 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -481,7 +481,7 @@ static const char szExampleXML[] = " <d>D1 field</d>\n" " <description xmlns:foo='http://www.winehq.org' xmlns:bar='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'>\n" " <html xmlns='http://www.w3.org/1999/xhtml'>\n" -" This is a description. <bar:x/>\n" +" This is a description. <bar:x/>\n" " </html>\n" " <html xml:space='preserve' xmlns='http://www.w3.org/1999/xhtml'>\n" " This is a description with preserved whitespace. <bar:x/>\n" @@ -4200,11 +4200,11 @@ static inline void _check_ws_preserved(int line, IXMLDOMDocument2* doc, char con helper_ole_check(IXMLDOMNode_get_text(node1, &bstr)); if (str) { - helper_expect_bstr_and_release(bstr, str); + todo_wine helper_expect_bstr_and_release(bstr, str); } else { - 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

Francois Gouget : msvcp120/tests: Make i386_Thrd_current() static.
by Alexandre Julliard 19 Nov '15

19 Nov '15

Module: wine Branch: master Commit: 7740fa69ef375d504f6e8aa03115818b1ee87646 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7740fa69ef375d504f6e8aa03… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Nov 18 14:59:13 2015 +0100 msvcp120/tests: Make i386_Thrd_current() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index e69405f..12ca12d 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -150,7 +150,7 @@ static int (__cdecl *p__Thrd_join)(_Thrd_t, int*); #ifdef __i386__ static ULONGLONG (__cdecl *p_i386_Thrd_current)(void); -_Thrd_t __cdecl i386_Thrd_current(void) +static _Thrd_t __cdecl i386_Thrd_current(void) { union { _Thrd_t thr;

1 0

Alexandre Julliard : user32: Add workaround for removed SC_TASKLIST system menu item.
by Alexandre Julliard 19 Nov '15

19 Nov '15

Module: wine Branch: master Commit: c82626a4c1fe8e941ab1dc61053d98dcb8e16887 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c82626a4c1fe8e941ab1dc610… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 19 20:54:34 2015 +0900 user32: Add workaround for removed SC_TASKLIST system menu item. Word 95 assumes that the item exists. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 27 +++++-- dlls/user32/tests/menu.c | 189 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 209 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c82626a4c1fe8e941ab1d…

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
63
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2015