November 2016 - Wine-Commits

Aric Stewart : hid: Correct issues with getting packed values.
by Alexandre Julliard Nov. 14, 2016

Nov. 14, 2016

Module: wine Branch: master Commit: 20a4842a896c950511919ba623a3d93c28e9a67d URL: http://source.winehq.org/git/wine.git/?a=commit;h=20a4842a896c950511919ba62… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Nov 7 13:44:33 2016 -0600 hid: Correct issues with getting packed values. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 4a0fa64..56bb91a 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -53,23 +53,26 @@ static NTSTATUS get_report_data(BYTE *report, INT reportLength, INT startBit, IN } else { - ULONG byte_index = (startBit + valueSize - 1) / 8; + ULONG byte_index = startBit / 8; ULONG data = 0; ULONG remainingBits = valueSize; + ULONG shift = 0; + ULONG begin_offset = startBit % 8; while (remainingBits) { - data <<= 8; - if (remainingBits >= 8) { - data |= report[byte_index]; - byte_index --; - remainingBits -= 8; + BYTE mask = 0xff << begin_offset; + data |= (report[byte_index] & mask) << shift; + byte_index ++; + remainingBits -= (8-begin_offset); + shift += (8-begin_offset); + begin_offset = 0; } else if (remainingBits > 0) { - BYTE mask = ~(0xff << (8-remainingBits)); - data |= report[byte_index] & mask; + BYTE mask = (0xff >> (8-remainingBits)) << begin_offset; + data |= (report[byte_index] & mask) << shift; remainingBits = 0; } }

1 0

Nikolay Sivov : mshtml/tests: Fix some BSTR leaks in various tests ( Valgrind).
by Alexandre Julliard Nov. 14, 2016

Nov. 14, 2016

Module: wine Branch: master Commit: 1f9ab34b5e7dab9c08a538163580a2f7c5595088 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f9ab34b5e7dab9c08a538163… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 13 18:54:20 2016 +0300 mshtml/tests: Fix some BSTR leaks in various tests (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/dom.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index dec9cdd..be279cc 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1903,7 +1903,6 @@ static void _test_comment_text(unsigned line, IUnknown *unk, const char *extext) BSTR text; HRESULT hres; - text = a2bstr(extext); hres = IHTMLCommentElement_get_text(comment, &text); ok_(__FILE__,line)(hres == S_OK, "get_text failed: %08x\n", hres); ok_(__FILE__,line)(!strcmp_wa(text, extext), "text = \"%s\", expected \"%s\"\n", wine_dbgstr_w(text), extext); @@ -3747,6 +3746,7 @@ static void test_contenteditable(IUnknown *unk) hres = IHTMLElement3_get_contentEditable(elem3, &str); ok(hres == S_OK, "get_contentEditable failed: 0x%08x\n", hres); ok(!strcmp_wa(str, "true"), "Got %s, expected %s\n", wine_dbgstr_w(str), "true"); + SysFreeString(str); /* Restore origin contentEditable */ hres = IHTMLElement3_put_contentEditable(elem3, strDefault); @@ -4708,6 +4708,7 @@ static void _test_link_rel(unsigned line, IHTMLElement *elem, const char *v) ok_(__FILE__,line)(!strcmp_wa(rel, v), "rel = %s, expected %s\n", wine_dbgstr_w(rel), v); else ok_(__FILE__,line)(!rel, "rel = %s, expected NULL\n", wine_dbgstr_w(rel)); + SysFreeString(rel); IHTMLLinkElement_Release(link); } @@ -4739,6 +4740,7 @@ static void _test_link_rev(unsigned line, IHTMLElement *elem, const char *v) ok_(__FILE__,line)(!strcmp_wa(rev, v), "rev = %s, expected %s\n", wine_dbgstr_w(rev), v); else ok_(__FILE__,line)(!rev, "rev = %s, expected NULL\n", wine_dbgstr_w(rev)); + SysFreeString(rev); IHTMLLinkElement_Release(link); } @@ -4770,6 +4772,7 @@ static void _test_link_type(unsigned line, IHTMLElement *elem, const char *v) ok_(__FILE__,line)(!strcmp_wa(type, v), "type = %s, expected %s\n", wine_dbgstr_w(type), v); else ok_(__FILE__,line)(!type, "type = %s, expected NULL\n", wine_dbgstr_w(type)); + SysFreeString(type); IHTMLLinkElement_Release(link); } @@ -4814,6 +4817,7 @@ static void _test_link_href(unsigned line, IHTMLElement *elem, const char *v) ok_(__FILE__,line)(!strcmp_wa(href, v), "href = %s, expected %s\n", wine_dbgstr_w(href), v); else ok_(__FILE__,line)(!href, "href = %s, expected NULL\n", wine_dbgstr_w(href)); + SysFreeString(href); IHTMLLinkElement_Release(link); } @@ -5743,6 +5747,7 @@ static void _test_compatmode(unsigned line, IHTMLDocument2 *doc2, const char *e hres = IHTMLDocument5_get_compatMode(doc, &str); ok_(__FILE__,line)(hres == S_OK, "get_compatMode failed: %08x\n", hres); ok_(__FILE__,line)(!strcmp_wa(str, excompat), "compatMode = %s, expected %s\n", wine_dbgstr_w(str), excompat); + SysFreeString(str); IHTMLDocument5_Release(doc); } @@ -6026,6 +6031,7 @@ static void test_framebase(IUnknown *unk) hres = IHTMLFrameBase_get_frameBorder(fbase, &str); ok(hres == S_OK, "get_frameBorder failed: %08x\n", hres); ok(!strcmp_wa(str, "1"), "frameBorder = %s, expected \"1\"\n", wine_dbgstr_w(str)); + SysFreeString(str); test_framebase_marginheight(fbase, NULL); set_framebase_marginheight(fbase, "1px"); @@ -6978,6 +6984,7 @@ static void _set_button_value(unsigned line, IHTMLElement *elem, const char *val hres = IHTMLButtonElement_put_value(button, str); ok_(__FILE__,line)(hres == S_OK, "put_value failed: %08x\n", hres); IHTMLButtonElement_Release(button); + SysFreeString(str); _test_button_value(line, elem, value); } @@ -7252,6 +7259,7 @@ static void test_label_elem(IHTMLElement *elem) hres = IHTMLLabelElement_get_htmlFor(label, &str); ok(hres == S_OK, "get_htmlFor failed: %08x\n", hres); ok(!strcmp_wa(str, ""), "htmlFor = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); str = a2bstr("abc"); hres = IHTMLLabelElement_put_htmlFor(label, str); @@ -8005,6 +8013,7 @@ static void test_selectors(IHTMLDocument2 *doc, IHTMLElement *div) ok(collection != NULL, "collection == NULL\n"); test_children_collection_length(collection, 0); IHTMLDOMChildrenCollection_Release(collection); + SysFreeString(str); collection = NULL; str = a2bstr(".cl1"); @@ -8013,6 +8022,7 @@ static void test_selectors(IHTMLDocument2 *doc, IHTMLElement *div) ok(collection != NULL, "collection == NULL\n"); test_children_collection_length(collection, 2); IHTMLDOMChildrenCollection_Release(collection); + SysFreeString(str); IDocumentSelector_Release(doc_selector); @@ -8026,6 +8036,7 @@ static void test_selectors(IHTMLDocument2 *doc, IHTMLElement *div) ok(collection != NULL, "collection == NULL\n"); test_children_collection_length(collection, 0); IHTMLDOMChildrenCollection_Release(collection); + SysFreeString(str); collection = NULL; str = a2bstr(".cl1"); @@ -8034,6 +8045,7 @@ static void test_selectors(IHTMLDocument2 *doc, IHTMLElement *div) ok(collection != NULL, "collection == NULL\n"); test_children_collection_length(collection, 2); IHTMLDOMChildrenCollection_Release(collection); + SysFreeString(str); IElementSelector_Release(elem_selector); } @@ -8063,6 +8075,7 @@ static void test_elemsbyclass(IHTMLElement *div) ok(collection != NULL, "collection == NULL\n"); test_elem_collection((IUnknown*)collection, NULL, 0); IHTMLElementCollection_Release(collection); + SysFreeString(str); collection = NULL; str = a2bstr("cl1"); @@ -8071,6 +8084,7 @@ static void test_elemsbyclass(IHTMLElement *div) ok(collection != NULL, "collection == NULL\n"); test_elem_collection((IUnknown*)collection, types, sizeof(types)/sizeof(*types)); IHTMLElementCollection_Release(collection); + SysFreeString(str); IHTMLElement6_Release(elem); } @@ -8778,6 +8792,7 @@ static void test_attr(IHTMLDocument2 *doc, IHTMLElement *elem) V_VT(&v) = VT_BSTR; V_BSTR(&v) = a2bstr("divid2"); put_attr_node_value(attr, v); + VariantClear(&v); get_attr_node_value(attr, &v, VT_BSTR); ok(!strcmp_wa(V_BSTR(&v), "divid2"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v)));

1 0

Nikolay Sivov : mshtml: Fix outer window url leak (Valgrind).
by Alexandre Julliard Nov. 14, 2016

Nov. 14, 2016

Module: wine Branch: master Commit: a5f27c6cdc2f36505469bd79978057281d8c916c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5f27c6cdc2f36505469bd799… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 10 16:40:22 2016 +0300 mshtml: Fix outer window url leak (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index da1af2c..b4ec425 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -217,6 +217,7 @@ static void release_outer_window(HTMLOuterWindow *This) remove_target_tasks(This->task_magic); set_current_mon(This, NULL, 0); + set_current_uri(This, NULL); if(This->base.inner_window) detach_inner_window(This->base.inner_window); release_children(This);

1 0

Nikolay Sivov : mshtml: Fix some IUri leaks (Valgrind).
by Alexandre Julliard Nov. 14, 2016

Nov. 14, 2016

Module: wine Branch: master Commit: 892d2e8c29e3d1dad0ee11491eef9ddd9d826351 URL: http://source.winehq.org/git/wine.git/?a=commit;h=892d2e8c29e3d1dad0ee11491… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 10 10:44:37 2016 +0300 mshtml: Fix some IUri leaks (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/script.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index f10a702..cb8f54a 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -1056,12 +1056,15 @@ HRESULT load_script(HTMLScriptElement *script_elem, const WCHAR *src, BOOL async return hres; hres = CreateURLMonikerEx2(NULL, uri, &mon, URL_MK_UNIFORM); - if(FAILED(hres)) + if(FAILED(hres)) { + IUri_Release(uri); return hres; + } bsc = heap_alloc_zero(sizeof(*bsc)); if(!bsc) { IMoniker_Release(mon); + IUri_Release(uri); return E_OUTOFMEMORY; } @@ -1069,6 +1072,7 @@ HRESULT load_script(HTMLScriptElement *script_elem, const WCHAR *src, BOOL async IMoniker_Release(mon); hres = IUri_GetScheme(uri, &bsc->scheme); + IUri_Release(uri); if(FAILED(hres)) bsc->scheme = URL_SCHEME_UNKNOWN;

1 0

Nikolay Sivov : d3dx11: Implement async data loader interfaces.
by Alexandre Julliard Nov. 14, 2016

Nov. 14, 2016

Module: wine Branch: master Commit: 03a09e7363598e01726dd640f04e8fc1bc217a86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03a09e7363598e01726dd640f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 13 17:26:42 2016 -0600 d3dx11: Implement async data loader interfaces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/d3dx11_43/async.c | 329 +++++++++++++++++++++++++++++++++++++++ dlls/d3dx11_43/d3dx11_43.spec | 10 +- dlls/d3dx11_43/tests/Makefile.in | 5 + dlls/d3dx11_43/tests/d3dx11.c | 213 +++++++++++++++++++++++++ include/d3dx11async.h | 6 + 7 files changed, 560 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=03a09e7363598e01726dd…

1 0

Aric Stewart : hid: Fix HidP_MaxUsageListLength to handle UsagePage == 0 properly.
by Alexandre Julliard Nov. 14, 2016

Nov. 14, 2016

Module: wine Branch: master Commit: 86f4aa1993e35f71bc937a5a8f5aa8d8bcfe125c URL: http://source.winehq.org/git/wine.git/?a=commit;h=86f4aa1993e35f71bc937a5a8… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Nov 3 10:42:59 2016 -0500 hid: Fix HidP_MaxUsageListLength to handle UsagePage == 0 properly. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 56bb91a..b94e7b0 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -510,7 +510,8 @@ ULONG WINAPI HidP_MaxUsageListLength(HIDP_REPORT_TYPE ReportType, USAGE UsagePag int j; for (j = 0; j < report->elementCount; j++) { - if (report->Elements[j].caps.button.UsagePage == UsagePage) + if (report->Elements[j].ElementType == ButtonElement && + (UsagePage == 0 || report->Elements[j].caps.button.UsagePage == UsagePage)) { if (report->Elements[j].caps.button.IsRange) count += (report->Elements[j].caps.button.u.Range.UsageMax -

1 0

Nikolay Sivov : ieframe/tests: Fix BSTR leak (Valgrind).
by Alexandre Julliard Nov. 14, 2016

Nov. 14, 2016

Module: wine Branch: master Commit: eaef858b7a93382675f409d55c05175a3f391648 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaef858b7a93382675f409d55… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 10 11:22:34 2016 +0300 ieframe/tests: Fix BSTR leak (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/tests/webbrowser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 763e0b9..ca2a131 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -260,7 +260,7 @@ static void _test_LocationURL(unsigned line, IWebBrowser2 *wb, const char *exurl hres = IWebBrowser2_get_LocationURL(wb, &url); ok_(__FILE__,line) (hres == (*exurl ? S_OK : S_FALSE), "get_LocationURL failed: %08x\n", hres); - if (hres == S_OK) + if (SUCCEEDED(hres)) { ok_(__FILE__,line) (!strcmp_wa(url, exurl), "unexpected URL: %s\n", wine_dbgstr_w(url)); SysFreeString(url);

1 0

Nikolay Sivov : mshtml: Fix uri builder leak on nsIFileURL release ( Valgrind).
by Alexandre Julliard Nov. 14, 2016

Nov. 14, 2016

Module: wine Branch: master Commit: f45d82eb4cd39de8db09b64398d36a52dbb4896b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f45d82eb4cd39de8db09b6439… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 12 22:27:18 2016 +0300 mshtml: Fix uri builder leak on nsIFileURL release (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsio.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index ba21312..f8463d2 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2346,6 +2346,8 @@ static nsrefcnt NSAPI nsURI_Release(nsIFileURL *iface) nsIWebBrowserChrome_Release(&This->container->nsIWebBrowserChrome_iface); if(This->uri) IUri_Release(This->uri); + if(This->uri_builder) + IUriBuilder_Release(This->uri_builder); heap_free(This->origin_charset); heap_free(This); }

1 0

Huw Davies : user32/tests: Don't perform character lookup ToUnicode() tests on non-US keyboards.
by Alexandre Julliard Nov. 14, 2016

Nov. 14, 2016

Module: wine Branch: master Commit: e574350b62b7859665454a553a5e5add6d100578 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e574350b62b7859665454a553… Author: Huw Davies <huw(a)codeweavers.com> Date: Sun Nov 13 14:29:56 2016 -0600 user32/tests: Don't perform character lookup ToUnicode() tests on non-US keyboards. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 8e89481..6684089 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1648,6 +1648,8 @@ static void test_ToUnicode(void) const BYTE SC_RETURN = 0x1c, SC_TAB = 0x0f, SC_A = 0x1e; const BYTE HIGHEST_BIT = 0x80; int i, ret; + BOOL us_kbd = (GetKeyboardLayout(0) == (HKL)(ULONG_PTR)0x04090409); + for(i=0; i<256; i++) state[i]=0; @@ -1674,7 +1676,10 @@ static void test_ToUnicode(void) if(!vk) { - short vk_ret = VkKeyScanW(utests[i].chr); + short vk_ret; + + if (!us_kbd) continue; + vk_ret = VkKeyScanW(utests[i].chr); if (vk_ret == -1) continue; vk = vk_ret & 0xff; if (vk_ret & 0x100) mod |= shift;

1 0

Matteo Bruni : include: Fix FACILITY_AUDCLNT defines.
by Alexandre Julliard Nov. 14, 2016

Nov. 14, 2016

Module: wine Branch: master Commit: 07f39224351fe8dcdb683e7b7ca3428727cd3e5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=07f39224351fe8dcdb683e7b7… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Sun Nov 13 17:26:39 2016 -0600 include: Fix FACILITY_AUDCLNT defines. Move the definition to winerror.h (its new place in recent Windows SDKs) while at it. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/audioclient.idl | 5 ++--- include/winerror.h | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/audioclient.idl b/include/audioclient.idl index a755604..72b3ae9 100644 --- a/include/audioclient.idl +++ b/include/audioclient.idl @@ -285,9 +285,8 @@ interface IChannelAudioVolume : IUnknown ); } -cpp_quote("#define FACILIY_AUDCLNT 0x889") -cpp_quote("#define AUDCLNT_ERR(n) MAKE_HRESULT(SEVERITY_ERROR, FACILIY_AUDCLNT, n)") -cpp_quote("#define AUDCLNT_SUCCESS(n) MAKE_SCODE(SEVERITY_SUCCESS, FACILIY_AUDCLNT, n)") +cpp_quote("#define AUDCLNT_ERR(n) MAKE_HRESULT(SEVERITY_ERROR, FACILITY_AUDCLNT, n)") +cpp_quote("#define AUDCLNT_SUCCESS(n) MAKE_SCODE(SEVERITY_SUCCESS, FACILITY_AUDCLNT, n)") cpp_quote("#define AUDCLNT_E_NOT_INITIALIZED AUDCLNT_ERR(1)") cpp_quote("#define AUDCLNT_E_ALREADY_INITIALIZED AUDCLNT_ERR(2)") cpp_quote("#define AUDCLNT_E_WRONG_ENDPOINT_TYPE AUDCLNT_ERR(3)") diff --git a/include/winerror.h b/include/winerror.h index 9c1b7f1..b0848b5 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -60,6 +60,7 @@ #define FACILITY_FVE 49 #define FACILITY_WINDOWS_DEFENDER 80 #define FACILITY_DIRECT3D11 0x87c +#define FACILITY_AUDCLNT 0x889 #define SEVERITY_SUCCESS 0 #define SEVERITY_ERROR 1

1 0