November 2014 - Wine-Commits

Alexandre Julliard : Wine release 1.7.32
by Alexandre Julliard Nov. 28, 2014

Nov. 28, 2014

Module: website Branch: master Commit: 422a63015da754ae6569aaebef3c22de921d5a1d URL: http://source.winehq.org/git/website.git/?a=commit;h=422a63015da754ae6569aa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 28 20:57:57 2014 +0100 Wine release 1.7.32 --- news/en/2014112801.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2014112801.xml b/news/en/2014112801.xml new file mode 100644 index 0000000..89bcb8c --- /dev/null +++ b/news/en/2014112801.xml @@ -0,0 +1,16 @@ +<news> +<date>November 28, 2014</date> +<title>Wine 1.7.32 Released</title> +<body> +<p> The Wine development release 1.7.32 is now available.</p> +<p> <a href="{$root}/announce/1.7.32">What's new</a> in this release: +<ul> + <li>New version of the Mono engine.</li> + <li>A few more functions implemented in MSHTML.</li> + <li>Improved support for restoring display mode.</li> + <li>Font metrics improvements in DirectWrite.</li> + <li>Various bug fixes.</li> +</ul> +<p>The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.32.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</p></body></news>

1 0

Tag wine-1.7.32 : Alexandre Julliard : Release 1.7.32
by Alexandre Julliard Nov. 28, 2014

Nov. 28, 2014

Module: wine Branch: refs/tags/wine-1.7.32 Tag: a5f42b4b5d52276963369652bc0c388312f3dadf URL: http://source.winehq.org/git/wine.git/?a=tag;h=a5f42b4b5d52276963369652bc0c… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 28 20:48:59 2014 +0100 Release 1.7.32

1 0

Alexandre Julliard : Release 1.7.32.
by Alexandre Julliard Nov. 28, 2014

Nov. 28, 2014

Module: wine Branch: master Commit: fe2466ffdfa505329d009dac14cf933e77a14495 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe2466ffdfa505329d009dac1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 28 20:48:59 2014 +0100 Release 1.7.32. --- .mailmap | 1 + ANNOUNCE | 567 +++++++++++++++++++++++++++++--------------------------------- AUTHORS | 2 +- VERSION | 2 +- configure | 18 +- 5 files changed, 278 insertions(+), 312 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fe2466ffdfa505329d009…

1 0

Alexandre Julliard : msxml3: Update pure_parser directive to avoid a deprecation warning.
by Alexandre Julliard Nov. 28, 2014

Nov. 28, 2014

Module: wine Branch: master Commit: c24fe2253c3e6efd968a6c0c5167cdc10a00cafa URL: http://source.winehq.org/git/wine.git/?a=commit;h=c24fe2253c3e6efd968a6c0c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 28 18:17:04 2014 +0100 msxml3: Update pure_parser directive to avoid a deprecation warning. --- dlls/msxml3/xslpattern.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msxml3/xslpattern.y b/dlls/msxml3/xslpattern.y index 9adb318..0cefe59 100644 --- a/dlls/msxml3/xslpattern.y +++ b/dlls/msxml3/xslpattern.y @@ -70,7 +70,7 @@ static void xslpattern_error(parser_param* param, void const* scanner, char cons %start XSLPattern -%pure_parser +%pure-parser %parse-param {parser_param* p} %parse-param {void* scanner} %lex-param {yyscan_t* scanner}

1 0

Jacek Caban : mshtml: Correctly handle flags in IHTMLElement:getAttribute.
by Alexandre Julliard Nov. 28, 2014

Nov. 28, 2014

Module: wine Branch: master Commit: 96f628175d0e41a7b07359124563ee6035c8b790 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96f628175d0e41a7b07359124… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 28 16:19:20 2014 +0100 mshtml: Correctly handle flags in IHTMLElement:getAttribute. --- dlls/mshtml/htmlelem.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 7d5813a..e302f2a 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -642,7 +642,7 @@ static HRESULT WINAPI HTMLElement_getAttribute(IHTMLElement *iface, BSTR strAttr TRACE("(%p)->(%s %08x %p)\n", This, debugstr_w(strAttributeName), lFlags, AttributeValue); hres = IDispatchEx_GetDispID(&This->node.dispex.IDispatchEx_iface, strAttributeName, - fdexNameCaseInsensitive, &dispid); + lFlags&1 ? fdexNameCaseSensitive : fdexNameCaseInsensitive, &dispid); if(hres == DISP_E_UNKNOWNNAME) { V_VT(AttributeValue) = VT_NULL; return S_OK; @@ -653,10 +653,8 @@ static HRESULT WINAPI HTMLElement_getAttribute(IHTMLElement *iface, BSTR strAttr return hres; } - hres = IDispatchEx_InvokeEx(&This->node.dispex.IDispatchEx_iface, dispid, LOCALE_SYSTEM_DEFAULT, + return IDispatchEx_InvokeEx(&This->node.dispex.IDispatchEx_iface, dispid, LOCALE_SYSTEM_DEFAULT, DISPATCH_PROPERTYGET, &dispParams, AttributeValue, &excep, NULL); - - return hres; } static HRESULT WINAPI HTMLElement_removeAttribute(IHTMLElement *iface, BSTR strAttributeName,

1 0

Jacek Caban : mshtml: Always ignore DISPATCH_PROPERTYPUTREF in InvokeEx.
by Alexandre Julliard Nov. 28, 2014

Nov. 28, 2014

Module: wine Branch: master Commit: 6a74a0785a6f898d66f355d52a3002b196af0ce0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a74a0785a6f898d66f355d52… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 28 16:18:18 2014 +0100 mshtml: Always ignore DISPATCH_PROPERTYPUTREF in InvokeEx. --- dlls/mshtml/dispex.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 4a872a8..f294d91 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -1230,7 +1230,6 @@ static HRESULT invoke_builtin_prop(DispatchEx *This, DISPID id, LCID lcid, WORD switch(flags) { case DISPATCH_PROPERTYPUT: - case DISPATCH_PROPERTYPUT | DISPATCH_PROPERTYPUTREF: if(res) V_VT(res) = VT_EMPTY; hres = builtin_propput(This, func, dp, caller); @@ -1421,6 +1420,9 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); + if(wFlags == (DISPATCH_PROPERTYPUT|DISPATCH_PROPERTYPUTREF)) + wFlags = DISPATCH_PROPERTYPUT; + switch(get_dispid_type(id)) { case DISPEXPROP_CUSTOM: if(!This->data->vtbl || !This->data->vtbl->invoke) @@ -1453,7 +1455,6 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc return DISP_E_UNKNOWNNAME; V_VT(pvarRes) = VT_EMPTY; return variant_copy(pvarRes, &prop->var); - case DISPATCH_PROPERTYPUT|DISPATCH_PROPERTYPUTREF: case DISPATCH_PROPERTYPUT: if(pdp->cArgs != 1 || (pdp->cNamedArgs == 1 && *pdp->rgdispidNamedArgs != DISPID_PROPERTYPUT) || pdp->cNamedArgs > 1) {

1 0

Stefan Dösinger : Revert "d3d10_1.idl: Added D3D10_1_SHADER_*_VERSION constants.".
by Alexandre Julliard Nov. 28, 2014

Nov. 28, 2014

Module: wine Branch: master Commit: 832aa40ae69056e1055c034223d4788f29d05b62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=832aa40ae69056e1055c03422… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Nov 28 11:16:41 2014 +0100 Revert "d3d10_1.idl: Added D3D10_1_SHADER_*_VERSION constants.". This reverts commit 044d7e82bf915d36c2921b29f129aae303355af4. These were added later by 9e942d29 in the _D3D10_1_CONSTANTS ifdef block. The double define causes a compile error with midl. --- include/d3d10_1.idl | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/d3d10_1.idl b/include/d3d10_1.idl index ba5517b..4ee49c6 100644 --- a/include/d3d10_1.idl +++ b/include/d3d10_1.idl @@ -48,8 +48,6 @@ cpp_quote("#define D3D10_1_FLOAT32_TO_INTEGER_TOLERANCE_IN_ULP (0.6f)") import "d3d10.idl"; cpp_quote("#include <d3d10_1shader.h>") -const UINT D3D10_1_SHADER_MAJOR_VERSION = 4; -const UINT D3D10_1_SHADER_MINOR_VERSION = 1; typedef enum D3D10_FEATURE_LEVEL1 {

1 0

Michael Stefaniuc : gdi32/tests: Don' t clear a variable before it goes out of scope (PVS-Studio).
by Alexandre Julliard Nov. 28, 2014

Nov. 28, 2014

Module: wine Branch: master Commit: 80218d19ef5af1d3169e7a4d05f5fc1e802f8476 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80218d19ef5af1d3169e7a4d0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Nov 28 10:57:45 2014 +0100 gdi32/tests: Don't clear a variable before it goes out of scope (PVS-Studio). --- dlls/gdi32/tests/bitmap.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 2a2dd3a..351a5ca 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -4540,7 +4540,6 @@ static void test_GetDIBits_scanlines(void) ok( ret == 2, "got %d\n", ret ); ok( !memcmp( data, inverted_bits + 32, 16 * 4 ), "bits differ\n"); for (i = 16; i < 128; i++) ok( data[i] == 0xaaaaaaaa, "%d: got %08x\n", i, data[i] ); - memset( data, 0xaa, sizeof(data) ); DeleteObject( dib );

1 0

Piotr Caban : ws2_32: Add support for overlapping fd_sets in select.
by Alexandre Julliard Nov. 28, 2014

Nov. 28, 2014

Module: wine Branch: master Commit: 459837ece419d8068f8e6657ed727d8449f61a2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=459837ece419d8068f8e6657e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 27 18:51:38 2014 +0100 ws2_32: Add support for overlapping fd_sets in select. --- dlls/ws2_32/socket.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index b3db306..29ac800 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4386,27 +4386,36 @@ static void release_poll_fds( const WS_fd_set *readfds, const WS_fd_set *writefd static int get_poll_results( WS_fd_set *readfds, WS_fd_set *writefds, WS_fd_set *exceptfds, const struct pollfd *fds ) { + unsigned int exceptfds_off = (readfds ? readfds->fd_count : 0) + (writefds ? writefds->fd_count : 0); unsigned int i, j = 0, k, total = 0; if (readfds) { for (i = k = 0; i < readfds->fd_count; i++, j++) - if (fds[j].revents) readfds->fd_array[k++] = readfds->fd_array[i]; + { + + if (fds[j].revents || + (readfds==writefds && (fds[readfds->fd_count+i].revents & POLLOUT) && + !(fds[readfds->fd_count+i].revents & POLLHUP)) || + (readfds==exceptfds && fds[exceptfds_off+i].revents)) + readfds->fd_array[k++] = readfds->fd_array[i]; + } readfds->fd_count = k; total += k; } - if (writefds) + if (writefds && writefds!=readfds) { for (i = k = 0; i < writefds->fd_count; i++, j++) - if ((fds[j].revents & POLLOUT) && !(fds[j].revents & POLLHUP)) + if (((fds[j].revents & POLLOUT) && !(fds[j].revents & POLLHUP)) || + (writefds==exceptfds && fds[exceptfds_off+i].revents)) writefds->fd_array[k++] = writefds->fd_array[i]; writefds->fd_count = k; total += k; } - if (exceptfds) + if (exceptfds && exceptfds!=readfds && exceptfds!=writefds) { - for (i = k = 0; i < exceptfds->fd_count; i++, j++) - if (fds[j].revents) exceptfds->fd_array[k++] = exceptfds->fd_array[i]; + for (i = k = 0; i < exceptfds->fd_count; i++) + if (fds[exceptfds_off+i].revents) exceptfds->fd_array[k++] = exceptfds->fd_array[i]; exceptfds->fd_count = k; total += k; }

1 0

Jacek Caban : mshtml: Added more attribute and IDispatchEx tests.
by Alexandre Julliard Nov. 28, 2014

Nov. 28, 2014

Module: wine Branch: master Commit: 2c2f576163595d7824886ef3cb95953e151cd3b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c2f576163595d7824886ef3c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 28 16:19:42 2014 +0100 mshtml: Added more attribute and IDispatchEx tests. --- dlls/mshtml/tests/jstest.html | 110 ++++++++++++++++++++++++++++++++++++++++-- dlls/mshtml/tests/script.c | 19 ++++++++ 2 files changed, 126 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index 792e28e..39cdae5 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -5,6 +5,10 @@ function ok(b,m) { return external.ok(b, m); } +function broken(expr) { + return external.broken(expr); +} + function test_removeAttribute(e) { ok(e.removeAttribute('nonexisting') === false, "removeAttribute('nonexisting') didn't return false"); @@ -98,11 +102,13 @@ function test_clone_node() { ok(cloned.style.filter === "alpha(opacity=50)", "cloned.style.filter = " + cloned.style.filter); } -function test_setAttribute() { - var input; +function test_attrs() { + var input, s, x, f, b; document.body.innerHTML = '<input id="inputid"></input>'; input = document.getElementById("inputid"); + s = input.style; + f = input.fireEvent; ok(input.checked === false, "input.checked = " + input.checked); input.setAttribute("checked", "test"); @@ -113,6 +119,104 @@ function test_setAttribute() { input.setAttribute("checked", ""); ok(input.checked === false, "input.checked = " + input.checked); + + input.setAttribute("Checked", 1, 0); + ok(input.checked === true, "input.checked = " + input.checked); + ok(!("Checked" in input), "Checked added to input"); + + input.setAttribute("checked", 0, 0); + input.setAttribute("Checked", 1, 1); + ok(input.checked === false, "input.checked = " + input.checked); + ok("Checked" in input, "checked not added to input"); + ok(input.Checked === 1, "input.Checked = " + input.Checked); + + input.removeAttribute("Checked", 1); + ok(!("Checked" in input), "Checked is still in input"); + ok(input.checked === false, "input.checked = " + input.checked); + + input.setAttribute("checked", 1, 0); + input.setAttribute("Checked", 0); + ok(input.checked === true, "input.checked = " + input.checked); + ok("Checked" in input, "checked not added to input"); + ok(input.Checked === 0, "input.Checked = " + input.Checked); + + input.setAttribute("Checked", 2, 2); + ok(input.Checked === 0, "input.Checked = " + input.Checked); + input.setAttribute("Checked", 3, 3); + ok(input.Checked === 3, "input.Checked = " + input.Checked); + + x = input.getAttribute("style"); + ok(x === s, "getAttribute('style') = " + x); + ok(s.cssText === "", "s.cssText = " + s.cssText); + + input.setAttribute("style", "display: none"); + x = input.getAttribute("style"); + ok(x === s, "getAttribute('style') = " + x); + ok(s.cssText === "", "s.cssText = " + s.cssText); + ok(s.display === "", "s.display = " + s.display); + + s.display = "none"; + ok(s.cssText != "", "s.cssText = " + s.cssText); + ok(s.display === "none", "s.display = " + s.display); + input.setAttribute("style", ""); + x = input.getAttribute("style"); + ok(x === s, "getAttribute('style') = " + x); + ok(s.cssText != "", "s.cssText = " + s.cssText); + ok(s.display === "none", "s.display = " + s.display); + + input.setAttribute("style", null); + x = input.getAttribute("style"); + ok(input.style === s, "input.style = " + input.style); + ok(x === s, "getAttribute('style') = " + x); + ok(s.cssText != "", "s.cssText = " + s.cssText); + ok(s.display === "none", "s.display = " + s.display); + + x = input.getAttribute("fireEvent"); + ok(x === input.fireEvent, "input.getAttribute('fireEvent') = " + x); + + input.setAttribute("fireEvent", 3); + ok(input.fireEvent === 3, "input.fireEvent = " + input.fireEvent); + x = input.getAttribute("fireEvent"); + ok(x === 3, "input.getAttribute('fireEvent') = " + x); + + b = input.removeAttribute("style"); + ok(b === true, "removeAttribute('style') failed"); + ok(input.style === s, "input.style = " + input.style); + x = input.getAttribute("style"); + ok(x === s, "getAttribute('style') = " + x); + ok(s.display === "", "s.display = " + s.display); + ok(s.cssText === "", "s.cssText = " + s.cssText); + b = input.removeAttribute("style"); + ok(b === true, "removeAttribute('style') failed"); + + b = false; + try { + input.setAttribute("tagName", "xxx"); + }catch(e) { + b = true; + } + ok(b, "Expected exception on setAttribute(tagName)"); + + b = false; + try { + input.setAttribute("parentElement", "xxx"); + }catch(e) { + b = true; + } + ok(b, "Expected exception on setAttribute(parentElement)"); + + b = input.removeAttribute("fireEvent"); + ok(b === true, "removeAttribute(fireEvent) failed"); + ok(input.fireEvent === f, "input.fireEvent = " + input.fireEvent); + x = input.getAttribute("fireEvent"); + ok(x === f, "input.getAttribute('fireEvent') = " + x); + b = input.removeAttribute("fireEvent"); + ok(b === false || broken(b === true), "removeAttribute(fireEvent) returned " + b); + + input.fireEvent = 3; + x = input.getAttribute("fireEvent"); + ok(x === 3, "input.getAttribute('fireEvent') = " + x); + ok(input.fireEvent === 3, "input.fireEvent' = " + input.fireEvent); } function test_attribute_collection() { @@ -239,7 +343,7 @@ function runTests() { test_document_name_as_index(); test_remove_style_attribute(); test_getter_call(); - test_setAttribute(); + test_attrs(); test_attribute_collection(); test_arg_conv(); test_override_functions(); diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 9681fd6..b92b66b 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -146,6 +146,7 @@ DEFINE_EXPECT(ChangeType); #define DISPID_EXTERNAL_TRACE 0x300001 #define DISPID_EXTERNAL_REPORTSUCCESS 0x300002 #define DISPID_EXTERNAL_TODO_WINE_OK 0x300003 +#define DISPID_EXTERNAL_BROKEN 0x300004 static const GUID CLSID_TestScript = {0x178fc163,0xf585,0x4e24,{0x9c,0x13,0x4b,0xb7,0xfa,0xf8,0x07,0x46}}; @@ -594,6 +595,10 @@ static HRESULT WINAPI externalDisp_GetDispID(IDispatchEx *iface, BSTR bstrName, *pid = DISPID_EXTERNAL_TODO_WINE_OK; return S_OK; } + if(!strcmp_wa(bstrName, "broken")) { + *pid = DISPID_EXTERNAL_BROKEN; + return S_OK; + } ok(0, "unexpected name %s\n", wine_dbgstr_w(bstrName)); return DISP_E_UNKNOWNNAME; @@ -673,6 +678,20 @@ static HRESULT WINAPI externalDisp_InvokeEx(IDispatchEx *iface, DISPID id, LCID return S_OK; + case DISPID_EXTERNAL_BROKEN: + ok(wFlags == INVOKE_FUNC || wFlags == (INVOKE_FUNC|INVOKE_PROPERTYGET), "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(pdp->cArgs == 1, "cArgs = %d\n", pdp->cArgs); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pei != NULL, "pei == NULL\n"); + + ok(V_VT(pdp->rgvarg) == VT_BOOL, "V_VT(psp->rgvargs) = %d\n", V_VT(pdp->rgvarg)); + V_VT(pvarRes) = VT_BOOL; + V_BOOL(pvarRes) = broken(V_BOOL(pdp->rgvarg)) ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; + default: ok(0, "unexpected call\n"); return E_NOTIMPL;

1 0