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

Jacek Caban : mshtml: Better removeAttribute implementation.
by Alexandre Julliard Nov. 28, 2014

Nov. 28, 2014

Module: wine Branch: master Commit: 5f913d5afbe218bbba1ced89467540757a519c76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f913d5afbe218bbba1ced894… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 28 16:19:04 2014 +0100 mshtml: Better removeAttribute implementation. --- dlls/mshtml/dispex.c | 80 +++++++++++++++++++++++++++++++------------- dlls/mshtml/htmlelem.c | 13 ++++++- dlls/mshtml/htmlstyle.c | 2 +- dlls/mshtml/mshtml_private.h | 2 +- 4 files changed, 71 insertions(+), 26 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 1f1204a..707fe7f 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -1261,41 +1261,75 @@ static HRESULT invoke_builtin_prop(DispatchEx *This, DISPID id, LCID lcid, WORD return hres; } -HRESULT remove_prop(DispatchEx *This, BSTR name, VARIANT_BOOL *success) +HRESULT remove_attribute(DispatchEx *This, DISPID id, VARIANT_BOOL *success) { - dynamic_prop_t *prop; - DISPID id; - HRESULT hres; + switch(get_dispid_type(id)) { + case DISPEXPROP_CUSTOM: + FIXME("DISPEXPROP_CUSTOM not supported\n"); + return E_NOTIMPL; + + case DISPEXPROP_DYNAMIC: { + DWORD idx = id - DISPID_DYNPROP_0; + dynamic_prop_t *prop; - hres = get_builtin_id(This, name, 0, &id); - if(hres == S_OK) { - DISPID named_id = DISPID_PROPERTYPUT; + prop = This->dynamic_data->props+idx; + VariantClear(&prop->var); + prop->flags |= DYNPROP_DELETED; + *success = VARIANT_TRUE; + return S_OK; + } + case DISPEXPROP_BUILTIN: { VARIANT var; - DISPPARAMS dp = {&var,&named_id,1,1}; - EXCEPINFO ei; + DISPPARAMS dp = {&var,NULL,1,0}; + dispex_data_t *data; + func_info_t *func; + HRESULT hres; + + data = get_dispex_data(This); + if(!data) + return E_FAIL; + + hres = get_builtin_func(data, id, &func); + if(FAILED(hres)) + return hres; + + /* For builtin functions, we set their value to the original function. */ + if(func->func_disp_idx != -1) { + func_obj_entry_t *entry; + + if(!This->dynamic_data || !This->dynamic_data->func_disps + || !This->dynamic_data->func_disps[func->func_disp_idx].func_obj) { + *success = VARIANT_FALSE; + return S_OK; + } + + entry = This->dynamic_data->func_disps + func->func_disp_idx; + if(V_VT(&entry->val) == VT_DISPATCH + && V_DISPATCH(&entry->val) == (IDispatch*)&entry->func_obj->dispex.IDispatchEx_iface) { + *success = VARIANT_FALSE; + return S_OK; + } + + VariantClear(&entry->val); + V_VT(&entry->val) = VT_DISPATCH; + V_DISPATCH(&entry->val) = (IDispatch*)&entry->func_obj->dispex.IDispatchEx_iface; + IDispatch_AddRef(V_DISPATCH(&entry->val)); + *success = VARIANT_TRUE; + return S_OK; + } V_VT(&var) = VT_EMPTY; - memset(&ei, 0, sizeof(ei)); - hres = invoke_builtin_prop(This, id, 0, DISPATCH_PROPERTYPUT, &dp, NULL, &ei, NULL); + hres = builtin_propput(This, func, &dp, NULL); if(FAILED(hres)) return hres; *success = VARIANT_TRUE; return S_OK; } - - hres = get_dynamic_prop(This, name, 0, &prop); - if(FAILED(hres)) { - if(hres != DISP_E_UNKNOWNNAME) - return hres; - *success = VARIANT_FALSE; - return S_OK; + default: + assert(0); + return E_FAIL; } - - VariantClear(&prop->var); - prop->flags |= DYNPROP_DELETED; - *success = VARIANT_TRUE; - return S_OK; } static inline DispatchEx *impl_from_IDispatchEx(IDispatchEx *iface) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 1140776..a24d497 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -664,10 +664,21 @@ static HRESULT WINAPI HTMLElement_removeAttribute(IHTMLElement *iface, BSTR strA LONG lFlags, VARIANT_BOOL *pfSuccess) { HTMLElement *This = impl_from_IHTMLElement(iface); + DISPID id; + HRESULT hres; TRACE("(%p)->(%s %x %p)\n", This, debugstr_w(strAttributeName), lFlags, pfSuccess); - return remove_prop(&This->node.dispex, strAttributeName, pfSuccess); + hres = IDispatchEx_GetDispID(&This->node.dispex.IDispatchEx_iface, strAttributeName, + lFlags&1 ? fdexNameCaseSensitive : fdexNameCaseInsensitive, &id); + if(hres == DISP_E_UNKNOWNNAME) { + *pfSuccess = VARIANT_FALSE; + return S_OK; + } + if(FAILED(hres)) + return hres; + + return remove_attribute(&This->node.dispex, id, pfSuccess); } static HRESULT WINAPI HTMLElement_put_className(IHTMLElement *iface, BSTR v) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index d9898a9..45e5b9a 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -2915,7 +2915,7 @@ static HRESULT WINAPI HTMLStyle_removeAttribute(IHTMLStyle *iface, BSTR strAttri } if(i == sizeof(style_tbl)/sizeof(*style_tbl)) - return remove_prop(&This->dispex, strAttributeName, pfSuccess); + return remove_attribute(&This->dispex, dispid, pfSuccess); style_entry = style_tbl+i; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 07d1564..497a9e1 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -278,7 +278,7 @@ void release_dispex(DispatchEx*) DECLSPEC_HIDDEN; BOOL dispex_query_interface(DispatchEx*,REFIID,void**) DECLSPEC_HIDDEN; HRESULT dispex_get_dprop_ref(DispatchEx*,const WCHAR*,BOOL,VARIANT**) DECLSPEC_HIDDEN; HRESULT get_dispids(tid_t,DWORD*,DISPID**) DECLSPEC_HIDDEN; -HRESULT remove_prop(DispatchEx*,BSTR,VARIANT_BOOL*) DECLSPEC_HIDDEN; +HRESULT remove_attribute(DispatchEx*,DISPID,VARIANT_BOOL*) DECLSPEC_HIDDEN; HRESULT dispex_get_dynid(DispatchEx*,const WCHAR*,DISPID*) DECLSPEC_HIDDEN; void dispex_traverse(DispatchEx*,nsCycleCollectionTraversalCallback*) DECLSPEC_HIDDEN; void dispex_unlink(DispatchEx*) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Allow setting function properties to any VARIANT type.
by Alexandre Julliard Nov. 28, 2014

Nov. 28, 2014

Module: wine Branch: master Commit: 275a231fbb403a2020b72a5724d531789d0a1cd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=275a231fbb403a2020b72a572… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 28 16:18:53 2014 +0100 mshtml: Allow setting function properties to any VARIANT type. --- dlls/mshtml/dispex.c | 63 +++++++++++++++++++++------------------------- dlls/mshtml/tests/script.c | 2 +- 2 files changed, 29 insertions(+), 36 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index f294d91..1f1204a 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -87,7 +87,7 @@ typedef struct { typedef struct { func_disp_t *func_obj; - IDispatch *val; + VARIANT val; } func_obj_entry_t; struct dispex_dynamic_data_t { @@ -833,6 +833,7 @@ static HRESULT invoke_disp_value(DispatchEx *This, IDispatch *func_disp, LCID lc static HRESULT get_func_obj_entry(DispatchEx *This, func_info_t *func, func_obj_entry_t **ret) { dispex_dynamic_data_t *dynamic_data; + func_obj_entry_t *entry; dynamic_data = get_dynamic_data(This); if(!dynamic_data) @@ -844,20 +845,18 @@ static HRESULT get_func_obj_entry(DispatchEx *This, func_info_t *func, func_obj_ return E_OUTOFMEMORY; } - if(!dynamic_data->func_disps[func->func_disp_idx].func_obj) { - func_disp_t *func_obj; - - func_obj = create_func_disp(This, func); - if(!func_obj) + entry = dynamic_data->func_disps + func->func_disp_idx; + if(!entry->func_obj) { + entry->func_obj = create_func_disp(This, func); + if(!entry->func_obj) return E_OUTOFMEMORY; - dynamic_data->func_disps[func->func_disp_idx].func_obj = func_obj; - - IDispatchEx_AddRef(&func_obj->dispex.IDispatchEx_iface); - dynamic_data->func_disps[func->func_disp_idx].val = (IDispatch*)&func_obj->dispex.IDispatchEx_iface; + IDispatchEx_AddRef(&entry->func_obj->dispex.IDispatchEx_iface); + V_VT(&entry->val) = VT_DISPATCH; + V_DISPATCH(&entry->val) = (IDispatch*)&entry->func_obj->dispex.IDispatchEx_iface; } - *ret = dynamic_data->func_disps+func->func_disp_idx; + *ret = entry; return S_OK; } @@ -1131,13 +1130,18 @@ static HRESULT function_invoke(DispatchEx *This, func_info_t *func, WORD flags, && This->dynamic_data->func_disps[func->func_disp_idx].func_obj) { func_obj_entry_t *entry = This->dynamic_data->func_disps + func->func_disp_idx; - if((IDispatch*)&entry->func_obj->dispex.IDispatchEx_iface != entry->val) { - if(!entry->val) { + if(V_VT(&entry->val) != VT_DISPATCH) { + FIXME("calling %s not supported\n", debugstr_variant(&entry->val)); + return E_NOTIMPL; + } + + if((IDispatch*)&entry->func_obj->dispex.IDispatchEx_iface != V_DISPATCH(&entry->val)) { + if(!V_DISPATCH(&entry->val)) { FIXME("Calling null\n"); return E_FAIL; } - hres = invoke_disp_value(This, entry->val, 0, flags, dp, res, ei, NULL); + hres = invoke_disp_value(This, V_DISPATCH(&entry->val), 0, flags, dp, res, ei, NULL); break; } } @@ -1166,16 +1170,11 @@ static HRESULT function_invoke(DispatchEx *This, func_info_t *func, WORD flags, if(FAILED(hres)) return hres; - V_VT(res) = VT_DISPATCH; - V_DISPATCH(res) = entry->val; - if(V_DISPATCH(res)) - IDispatch_AddRef(V_DISPATCH(res)); - hres = S_OK; - break; + V_VT(res) = VT_EMPTY; + return VariantCopy(res, &entry->val); } case DISPATCH_PROPERTYPUT: { func_obj_entry_t *entry; - VARIANT *v; if(dp->cArgs != 1 || (dp->cNamedArgs == 1 && *dp->rgdispidNamedArgs != DISPID_PROPERTYPUT) || dp->cNamedArgs > 1) { @@ -1183,22 +1182,17 @@ static HRESULT function_invoke(DispatchEx *This, func_info_t *func, WORD flags, return E_INVALIDARG; } - v = dp->rgvarg; - /* FIXME: not exactly right */ - if(V_VT(v) != VT_DISPATCH) - return E_NOTIMPL; - + /* + * NOTE: Although we have IDispatchEx tests showing, that it's not allowed to set + * function property using InvokeEx, it's possible to do that from jscript. + * Native probably uses some undocumented interface in this case, but it should + * be fine for us to allow IDispatchEx handle that. + */ hres = get_func_obj_entry(This, func, &entry); if(FAILED(hres)) return hres; - if(entry->val) - IDispatch_Release(entry->val); - entry->val = V_DISPATCH(v); - if(entry->val) - IDispatch_AddRef(entry->val); - hres = S_OK; - break; + return VariantCopy(&entry->val, dp->rgvarg); } default: FIXME("Unimplemented flags %x\n", flags); @@ -1722,8 +1716,7 @@ void release_dispex(DispatchEx *This) iter->func_obj->obj = NULL; IDispatchEx_Release(&iter->func_obj->dispex.IDispatchEx_iface); } - if(iter->val) - IDispatch_Release(iter->val); + VariantClear(&iter->val); } heap_free(This->dynamic_data->func_disps); diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index c9b9eb5..9681fd6 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -1915,7 +1915,7 @@ static void test_func(IDispatchEx *obj) V_VT(&var) = VT_I4; V_I4(&var) = 100; hres = dispex_propput(obj, id, 0, &var, NULL); - ok(hres == E_NOTIMPL, "InvokeEx failed: %08x\n", hres); + todo_wine ok(hres == E_NOTIMPL, "InvokeEx failed: %08x\n", hres); hres = dispex_propget(dispex, DISPID_VALUE, &var, NULL); ok(hres == E_ACCESSDENIED, "InvokeEx returned: %08x, expected E_ACCESSDENIED\n", hres);

1 0

Jacek Caban : jscript: Use DISPATCH_PROPERTYPUTREF flag when setting a property to VT_DISPATCH.
by Alexandre Julliard Nov. 28, 2014

Nov. 28, 2014

Module: wine Branch: master Commit: 7e43408eaaaad7c0629628acfd552444ff722905 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e43408eaaaad7c0629628acf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 28 16:18:32 2014 +0100 jscript: Use DISPATCH_PROPERTYPUTREF flag when setting a property to VT_DISPATCH. --- dlls/jscript/dispex.c | 8 ++++++-- dlls/jscript/tests/run.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 604bd26..ac2ec67 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1346,6 +1346,7 @@ HRESULT disp_propput(script_ctx_t *ctx, IDispatch *disp, DISPID id, jsval_t val) jsdisp_release(jsdisp); }else { DISPID dispid = DISPID_PROPERTYPUT; + DWORD flags = DISPATCH_PROPERTYPUT; VARIANT var; DISPPARAMS dp = {&var, &dispid, 1, 1}; IDispatchEx *dispex; @@ -1354,17 +1355,20 @@ HRESULT disp_propput(script_ctx_t *ctx, IDispatch *disp, DISPID id, jsval_t val) if(FAILED(hres)) return hres; + if(V_VT(&var) == VT_DISPATCH) + flags |= DISPATCH_PROPERTYPUTREF; + clear_ei(ctx); hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); if(SUCCEEDED(hres)) { - hres = IDispatchEx_InvokeEx(dispex, id, ctx->lcid, DISPATCH_PROPERTYPUT, &dp, NULL, &ctx->ei.ei, + hres = IDispatchEx_InvokeEx(dispex, id, ctx->lcid, flags, &dp, NULL, &ctx->ei.ei, &ctx->jscaller->IServiceProvider_iface); IDispatchEx_Release(dispex); }else { ULONG err = 0; TRACE("using IDispatch\n"); - hres = IDispatch_Invoke(disp, id, &IID_NULL, ctx->lcid, DISPATCH_PROPERTYPUT, &dp, NULL, &ctx->ei.ei, &err); + hres = IDispatch_Invoke(disp, id, &IID_NULL, ctx->lcid, flags, &dp, NULL, &ctx->ei.ei, &err); } VariantClear(&var); diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 452f810..122db60 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -80,6 +80,8 @@ DEFINE_EXPECT(global_propget_d); DEFINE_EXPECT(global_propget_i); DEFINE_EXPECT(global_propput_d); DEFINE_EXPECT(global_propput_i); +DEFINE_EXPECT(global_propputref_d); +DEFINE_EXPECT(global_propputref_i); DEFINE_EXPECT(global_propdelete_d); DEFINE_EXPECT(global_nopropdelete_d); DEFINE_EXPECT(global_success_d); @@ -136,6 +138,7 @@ DEFINE_EXPECT(DeleteMemberByDispID_false); #define DISPID_GLOBAL_TESTRES 0x1018 #define DISPID_GLOBAL_TESTNORES 0x1019 #define DISPID_GLOBAL_DISPEXFUNC 0x101a +#define DISPID_GLOBAL_TESTPROPPUTREF 0x101b #define DISPID_GLOBAL_TESTPROPDELETE 0x2000 #define DISPID_GLOBAL_TESTNOPROPDELETE 0x2001 @@ -608,6 +611,12 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD *pid = DISPID_GLOBAL_TESTPROPPUT; return S_OK; } + if(!strcmp_wa(bstrName, "testPropPutRef")) { + CHECK_EXPECT(global_propputref_d); + test_grfdex(grfdex, fdexNameCaseSensitive); + *pid = DISPID_GLOBAL_TESTPROPPUTREF; + return S_OK; + } if(!strcmp_wa(bstrName, "testPropDelete")) { CHECK_EXPECT(global_propdelete_d); test_grfdex(grfdex, fdexNameCaseSensitive); @@ -841,6 +850,21 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, ok(V_I4(pdp->rgvarg) == 1, "V_I4(pdp->rgvarg)=%d\n", V_I4(pdp->rgvarg)); return S_OK; + case DISPID_GLOBAL_TESTPROPPUTREF: + CHECK_EXPECT(global_propputref_i); + + ok(wFlags == (INVOKE_PROPERTYPUT|INVOKE_PROPERTYPUTREF), "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); + ok(pdp->rgdispidNamedArgs != NULL, "rgdispidNamedArgs == NULL\n"); + ok(pdp->cArgs == 1, "cArgs = %d\n", pdp->cArgs); + ok(pdp->cNamedArgs == 1, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pdp->rgdispidNamedArgs[0] == DISPID_PROPERTYPUT, "pdp->rgdispidNamedArgs[0] = %d\n", pdp->rgdispidNamedArgs[0]); + ok(!pvarRes, "pvarRes != NULL\n"); + + ok(V_VT(pdp->rgvarg) == VT_DISPATCH, "V_VT(pdp->rgvarg)=%d\n", V_VT(pdp->rgvarg)); + return S_OK; + case DISPID_GLOBAL_GETVT: ok(pdp != NULL, "pdp == NULL\n"); ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); @@ -2049,6 +2073,18 @@ static BOOL run_tests(void) CHECK_CALLED(global_propput_d); CHECK_CALLED(global_propput_i); + SET_EXPECT(global_propputref_d); + SET_EXPECT(global_propputref_i); + parse_script_a("testPropPutRef = new Object();"); + CHECK_CALLED(global_propputref_d); + CHECK_CALLED(global_propputref_i); + + SET_EXPECT(global_propputref_d); + SET_EXPECT(global_propputref_i); + parse_script_a("testPropPutRef = testObj;"); + CHECK_CALLED(global_propputref_d); + CHECK_CALLED(global_propputref_i); + SET_EXPECT(global_success_d); SET_EXPECT(global_success_i); parse_script_a("reportSuccess();"); @@ -2187,6 +2223,12 @@ static BOOL run_tests(void) CHECK_CALLED(global_propget_d); CHECK_CALLED(global_propget_i); + SET_EXPECT(global_propputref_d); + SET_EXPECT(global_propputref_i); + parse_script_a("testPropPutRef = nullDisp;"); + CHECK_CALLED(global_propputref_d); + CHECK_CALLED(global_propputref_i); + SET_EXPECT(global_propget_d); SET_EXPECT(global_propget_i); parse_script_a("(function () { this.testPropGet; })();");

1 0

Nikolay Sivov : dwrite: Fix lineGap metric using 'hhea' table values.
by Alexandre Julliard Nov. 28, 2014

Nov. 28, 2014

Module: wine Branch: master Commit: 82e66b4b4767532e0030562883dfeed6e7011723 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82e66b4b4767532e003056288… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 28 09:23:51 2014 +0300 dwrite: Fix lineGap metric using 'hhea' table values. --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/font.c | 19 ++++--------- dlls/dwrite/opentype.c | 67 +++++++++++++++++++++++++++++++++++++------- dlls/dwrite/tests/font.c | 4 --- 4 files changed, 64 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=82e66b4b4767532e00305…

1 0

Piotr Caban : ntdll: Handle ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID flag when opening manifest in RtlCreateActivationContext.
by Alexandre Julliard Nov. 28, 2014

Nov. 28, 2014

Module: wine Branch: master Commit: f87767bc35b0da4df7c7104c04943ed67e06ea78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f87767bc35b0da4df7c7104c0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 28 08:01:26 2014 +0100 ntdll: Handle ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID flag when opening manifest in RtlCreateActivationContext. --- dlls/kernel32/tests/actctx.c | 59 ++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/actctx.c | 25 ++++++++++++++++++- 2 files changed, 83 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 1f5683f..c964743 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -2166,6 +2166,65 @@ todo_wine handle = pCreateActCtxA(&actctx); ok(handle == INVALID_HANDLE_VALUE, "got handle %p\n", handle); ok(GetLastError() == ERROR_RESOURCE_TYPE_NOT_FOUND, "got error %d\n", GetLastError()); + + /* load manifest from lpAssemblyDirectory directory */ + write_manifest("testdir.manifest", manifest1); + GetTempPathA(sizeof(path)/sizeof(path[0]), path); + SetCurrentDirectoryA(path); + strcat(path, "assembly_dir"); + strcpy(dir, path); + strcat(path, "\\testdir.manifest"); + + memset(&actctx, 0, sizeof(actctx)); + actctx.cbSize = sizeof(actctx); + actctx.dwFlags = ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID; + actctx.lpSource = "testdir.manifest"; + actctx.lpAssemblyDirectory = dir; + + SetLastError(0xdeadbeef); + handle = pCreateActCtxA(&actctx); + ok(handle == INVALID_HANDLE_VALUE, "got handle %p\n", handle); + ok(GetLastError()==ERROR_PATH_NOT_FOUND || + broken(GetLastError()==ERROR_FILE_NOT_FOUND) /* WinXP */, + "got error %d\n", GetLastError()); + + CreateDirectoryA(dir, NULL); + memset(&actctx, 0, sizeof(actctx)); + actctx.cbSize = sizeof(actctx); + actctx.dwFlags = ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID; + actctx.lpSource = "testdir.manifest"; + actctx.lpAssemblyDirectory = dir; + + SetLastError(0xdeadbeef); + handle = pCreateActCtxA(&actctx); + ok(handle == INVALID_HANDLE_VALUE, "got handle %p\n", handle); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "got error %d\n", GetLastError()); + SetCurrentDirectoryW(work_dir); + + write_manifest("assembly_dir\\testdir.manifest", manifest1); + memset(&actctx, 0, sizeof(actctx)); + actctx.cbSize = sizeof(actctx); + actctx.dwFlags = ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID; + actctx.lpSource = "testdir.manifest"; + actctx.lpAssemblyDirectory = dir; + + handle = pCreateActCtxA(&actctx); + ok(handle != INVALID_HANDLE_VALUE, "got handle %p\n", handle); + pReleaseActCtx(handle); + + memset(&actctx, 0, sizeof(actctx)); + actctx.cbSize = sizeof(actctx); + actctx.dwFlags = ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID; + actctx.lpSource = path; + actctx.lpAssemblyDirectory = dir; + + handle = pCreateActCtxA(&actctx); + ok(handle != INVALID_HANDLE_VALUE, "got handle %p\n", handle); + pReleaseActCtx(handle); + + delete_manifest_file("testdir.manifest"); + delete_manifest_file("assembly_dir\\testdir.manifest"); + RemoveDirectoryA(dir); } static BOOL init_funcs(void) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 9a9dec9..15c9994 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -4535,7 +4535,30 @@ NTSTATUS WINAPI RtlCreateActivationContext( HANDLE *handle, const void *ptr ) if (pActCtx->lpSource && !((pActCtx->dwFlags & ACTCTX_FLAG_RESOURCE_NAME_VALID) && (pActCtx->dwFlags & ACTCTX_FLAG_HMODULE_VALID))) { - if (!RtlDosPathNameToNtPathName_U(pActCtx->lpSource, &nameW, NULL, NULL)) + WCHAR *source = NULL; + BOOLEAN ret; + + if (pActCtx->dwFlags & ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID && + RtlDetermineDosPathNameType_U(pActCtx->lpSource) == RELATIVE_PATH) + { + DWORD dir_len, source_len; + + dir_len = strlenW(pActCtx->lpAssemblyDirectory); + source_len = strlenW(pActCtx->lpSource); + if (!(source = RtlAllocateHeap( GetProcessHeap(), 0, (dir_len+source_len+2)*sizeof(WCHAR)))) + { + status = STATUS_NO_MEMORY; + goto error; + } + + memcpy(source, pActCtx->lpAssemblyDirectory, dir_len*sizeof(WCHAR)); + source[dir_len] = '\\'; + memcpy(source+dir_len+1, pActCtx->lpSource, (source_len+1)*sizeof(WCHAR)); + } + + ret = RtlDosPathNameToNtPathName_U(source ? source : pActCtx->lpSource, &nameW, NULL, NULL); + if (source) RtlFreeHeap( GetProcessHeap(), 0, source ); + if (!ret) { status = STATUS_NO_SUCH_FILE; goto error;

1 0

Stefan Dösinger : includes: Remove some double defines in d3d11.idl.
by Alexandre Julliard Nov. 28, 2014

Nov. 28, 2014

Module: wine Branch: master Commit: 06010471c25955cd11c17dd94cec17a0994dc6fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=06010471c25955cd11c17dd94… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Nov 28 11:16:42 2014 +0100 includes: Remove some double defines in d3d11.idl. --- include/d3d11.idl | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/include/d3d11.idl b/include/d3d11.idl index 7bd8af7..eef826f 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -89,7 +89,6 @@ cpp_quote("#define D3D11_FLOAT32_MAX (3.402823466e+38f)") const unsigned int D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT = 8; -const UINT D3D11_REQ_TEXTURE2D_U_OR_V_DIMENSION = 16384; const UINT D3D11_MAX_MAXANISOTROPY = 16; const UINT D3D11_MAX_MULTISAMPLE_SAMPLE_COUNT = 32; const UINT D3D11_VIEWPORT_BOUNDS_MAX = 32767; @@ -156,18 +155,9 @@ const UINT D3D11_REQ_TEXTURECUBE_DIMENSION = 16384; const UINT D3D11_RESINFO_INSTRUCTION_MISSING_COMPONENT_RETVAL = 0; -const UINT D3D11_SHADER_MAJOR_VERSION = 5; -const UINT D3D11_SHADER_MAX_INSTANCES = 65535; -const UINT D3D11_SHADER_MAX_INTERFACES = 253; -const UINT D3D11_SHADER_MAX_INTERFACE_CALL_SITES = 4096; -const UINT D3D11_SHADER_MAX_TYPES = 65535; -const UINT D3D11_SHADER_MINOR_VERSION = 0; - const UINT D3D11_SHIFT_INSTRUCTION_PAD_VALUE = 0; const UINT D3D11_SHIFT_INSTRUCTION_SHIFT_VALUE_BIT_COUNT = 5; -const UINT D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT = 8; - const UINT D3D11_SO_BUFFER_MAX_STRIDE_IN_BYTES = 2048; const UINT D3D11_SO_BUFFER_MAX_WRITE_WINDOW_IN_BYTES = 512; const UINT D3D11_SO_BUFFER_SLOT_COUNT = 4;

1 0

Piotr Caban : ws2_32/tests: Add more select tests.
by Alexandre Julliard Nov. 28, 2014

Nov. 28, 2014

Module: wine Branch: master Commit: 6d5b7c7344154dfe7c6faabe813ca69772e17740 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d5b7c7344154dfe7c6faabe8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 27 18:52:15 2014 +0100 ws2_32/tests: Add more select tests. --- dlls/ws2_32/tests/sock.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index acc2783..106588d 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3229,6 +3229,8 @@ static void test_listen(void) static void test_select(void) { + static const char tmp_buf[1024]; + SOCKET fdRead, fdWrite; fd_set readfds, writefds, exceptfds; unsigned int maxfd; @@ -3327,6 +3329,79 @@ static void test_select(void) ok ( (ret == SOCKET_ERROR), "expected SOCKET_ERROR, got %i\n", ret); ok ( WSAGetLastError() == WSAENOTSOCK, "expected WSAENOTSOCK, got %i\n", WSAGetLastError()); ok ( !FD_ISSET(fdRead, &exceptfds), "FD should not be set\n"); + + ok(!tcp_socketpair(&fdRead, &fdWrite), "creating socket pair failed\n"); + maxfd = fdRead; + if(fdWrite > maxfd) maxfd = fdWrite; + + FD_ZERO(&readfds); + FD_SET(fdRead, &readfds); + ret = select(fdRead+1, &readfds, NULL, NULL, &select_timeout); + ok(!ret, "select returned %d\n", ret); + + FD_ZERO(&writefds); + FD_SET(fdWrite, &writefds); + ret = select(fdWrite+1, NULL, &writefds, NULL, &select_timeout); + ok(ret == 1, "select returned %d\n", ret); + ok(FD_ISSET(fdWrite, &writefds), "fdWrite socket is not in the set\n"); + + /* tests for overlapping fd_set pointers */ + FD_ZERO(&readfds); + FD_SET(fdWrite, &readfds); + ret = select(fdWrite+1, &readfds, &readfds, NULL, &select_timeout); + ok(ret == 1, "select returned %d\n", ret); + ok(FD_ISSET(fdWrite, &readfds), "fdWrite socket is not in the set\n"); + + FD_ZERO(&readfds); + FD_SET(fdWrite, &readfds); + FD_SET(fdRead, &readfds); + ret = select(maxfd+1, &readfds, &readfds, NULL, &select_timeout); + ok(ret == 2, "select returned %d\n", ret); + ok(FD_ISSET(fdWrite, &readfds), "fdWrite socket is not in the set\n"); + ok(FD_ISSET(fdRead, &readfds), "fdWrite socket is not in the set\n"); + + ok(send(fdWrite, "test", 4, 0) == 4, "failed to send data\n"); + FD_ZERO(&readfds); + FD_SET(fdRead, &readfds); + ret = select(fdRead+1, &readfds, NULL, NULL, &select_timeout); + ok(ret == 1, "select returned %d\n", ret); + ok(FD_ISSET(fdRead, &readfds), "fdWrite socket is not in the set\n"); + + FD_ZERO(&readfds); + FD_SET(fdWrite, &readfds); + FD_SET(fdRead, &readfds); + ret = select(maxfd+1, &readfds, &readfds, NULL, &select_timeout); + ok(ret == 2, "select returned %d\n", ret); + ok(FD_ISSET(fdWrite, &readfds), "fdWrite socket is not in the set\n"); + ok(FD_ISSET(fdRead, &readfds), "fdWrite socket is not in the set\n"); + + while(1) { + FD_ZERO(&writefds); + FD_SET(fdWrite, &writefds); + ret = select(fdWrite+1, NULL, &writefds, NULL, &select_timeout); + if(!ret) break; + ok(send(fdWrite, tmp_buf, sizeof(tmp_buf), 0) > 0, "failed to send data\n"); + } + FD_ZERO(&readfds); + FD_SET(fdWrite, &readfds); + FD_SET(fdRead, &readfds); + ret = select(maxfd+1, &readfds, &readfds, NULL, &select_timeout); + ok(ret == 1, "select returned %d\n", ret); + ok(!FD_ISSET(fdWrite, &readfds), "fdWrite socket is in the set\n"); + ok(FD_ISSET(fdRead, &readfds), "fdWrite socket is not in the set\n"); + + ok(send(fdRead, "test", 4, 0) == 4, "failed to send data\n"); + Sleep(100); + FD_ZERO(&readfds); + FD_SET(fdWrite, &readfds); + FD_SET(fdRead, &readfds); + ret = select(maxfd+1, &readfds, &readfds, NULL, &select_timeout); + ok(ret == 2, "select returned %d\n", ret); + ok(FD_ISSET(fdWrite, &readfds), "fdWrite socket is not in the set\n"); + ok(FD_ISSET(fdRead, &readfds), "fdWrite socket is not in the set\n"); + + closesocket(fdRead); + closesocket(fdWrite); } static DWORD WINAPI AcceptKillThread(void *param)

1 0

Jacek Caban : mshtml: style attribute is a special case for setAttribute and removeAttribute.
by Alexandre Julliard Nov. 28, 2014

Nov. 28, 2014

Module: wine Branch: master Commit: 53e9acbf28c68d3558372597311dda14b4fe0345 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53e9acbf28c68d35583725973… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 28 16:19:35 2014 +0100 mshtml: style attribute is a special case for setAttribute and removeAttribute. --- dlls/mshtml/htmlelem.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index e302f2a..48fff3f 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -28,6 +28,7 @@ #include "winreg.h" #include "ole2.h" #include "shlwapi.h" +#include "mshtmdid.h" #include "wine/debug.h" @@ -621,6 +622,11 @@ static HRESULT WINAPI HTMLElement_setAttribute(IHTMLElement *iface, BSTR strAttr if(FAILED(hres)) return hres; + if(dispid == DISPID_IHTMLELEMENT_STYLE) { + TRACE("Ignoring call on style attribute\n"); + return S_OK; + } + dispParams.cArgs = 1; dispParams.cNamedArgs = 1; dispParams.rgdispidNamedArgs = &dispidNamed; @@ -675,6 +681,24 @@ static HRESULT WINAPI HTMLElement_removeAttribute(IHTMLElement *iface, BSTR strA if(FAILED(hres)) return hres; + if(id == DISPID_IHTMLELEMENT_STYLE) { + IHTMLStyle *style; + + TRACE("Special case: style\n"); + + hres = IHTMLElement_get_style(&This->IHTMLElement_iface, &style); + if(FAILED(hres)) + return hres; + + hres = IHTMLStyle_put_cssText(style, NULL); + IHTMLStyle_Release(style); + if(FAILED(hres)) + return hres; + + *pfSuccess = VARIANT_TRUE; + return S_OK; + } + return remove_attribute(&This->node.dispex, id, pfSuccess); }

1 0

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

Nov. 28, 2014

Module: wine Branch: master Commit: 0bb1ed41015711911d641cf667b2c651f64c8a07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bb1ed41015711911d641cf66… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 28 16:19:15 2014 +0100 mshtml: Correctly handle flags in IHTMLElement:setAttribute. --- dlls/mshtml/htmlelem.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index a24d497..7d5813a 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -617,7 +617,7 @@ static HRESULT WINAPI HTMLElement_setAttribute(IHTMLElement *iface, BSTR strAttr TRACE("(%p)->(%s %s %08x)\n", This, debugstr_w(strAttributeName), debugstr_variant(&AttributeValue), lFlags); hres = IDispatchEx_GetDispID(&This->node.dispex.IDispatchEx_iface, strAttributeName, - fdexNameCaseInsensitive | fdexNameEnsure, &dispid); + (lFlags&1 ? fdexNameCaseSensitive : fdexNameCaseInsensitive) | fdexNameEnsure, &dispid); if(FAILED(hres)) return hres; @@ -626,9 +626,8 @@ static HRESULT WINAPI HTMLElement_setAttribute(IHTMLElement *iface, BSTR strAttr dispParams.rgdispidNamedArgs = &dispidNamed; dispParams.rgvarg = &AttributeValue; - hres = IDispatchEx_InvokeEx(&This->node.dispex.IDispatchEx_iface, dispid, + return IDispatchEx_InvokeEx(&This->node.dispex.IDispatchEx_iface, dispid, LOCALE_SYSTEM_DEFAULT, DISPATCH_PROPERTYPUT, &dispParams, NULL, &excep, NULL); - return hres; } static HRESULT WINAPI HTMLElement_getAttribute(IHTMLElement *iface, BSTR strAttributeName,

1 0

Stefan Dösinger : wined3d: Update fragment program constants when switching from arb ffp draws.
by Alexandre Julliard Nov. 28, 2014

Nov. 28, 2014

Module: wine Branch: master Commit: 7b5bf3d4d65935cd8d4deb2ddffff10e7f4358bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b5bf3d4d65935cd8d4deb2dd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Nov 28 11:16:43 2014 +0100 wined3d: Update fragment program constants when switching from arb ffp draws. --- dlls/wined3d/arb_program_shader.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index f5e614e..cf27d1f 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6536,7 +6536,11 @@ static void fragment_prog_arbfp(struct wined3d_context *context, const struct wi state_arb_specularenable(context, state, STATE_RENDER(WINED3D_RS_SPECULARENABLE)); } context->last_was_pshader = FALSE; - } else { + } + else if (!context->last_was_pshader) + { + if (device->shader_backend == &arb_program_shader_backend) + context->constant_update_mask |= WINED3D_SHADER_CONST_PS_F; context->last_was_pshader = TRUE; }

1 0

Nikolay Sivov : dwrite: Respect typographic metrics when font instructs us to.
by Alexandre Julliard Nov. 28, 2014

Nov. 28, 2014

Module: wine Branch: master Commit: 188bfd6fd4e242a07c6cc0e9e5950a63cb81201b URL: http://source.winehq.org/git/wine.git/?a=commit;h=188bfd6fd4e242a07c6cc0e9e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 27 14:59:00 2014 +0300 dwrite: Respect typographic metrics when font instructs us to. --- dlls/dwrite/opentype.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 8a22699..28923c5 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -185,6 +185,19 @@ typedef struct } TT_OS2_V2; #include "poppack.h" +enum OS2_FSSELECTION { + OS2_FSSELECTION_ITALIC = 1 << 0, + OS2_FSSELECTION_UNDERSCORE = 1 << 1, + OS2_FSSELECTION_NEGATIVE = 1 << 2, + OS2_FSSELECTION_OUTLINED = 1 << 3, + OS2_FSSELECTION_STRIKEOUT = 1 << 4, + OS2_FSSELECTION_BOLD = 1 << 5, + OS2_FSSELECTION_REGULAR = 1 << 6, + OS2_FSSELECTION_USE_TYPO_METRICS = 1 << 7, + OS2_FSSELECTION_WWS = 1 << 8, + OS2_FSSELECTION_OBLIQUE = 1 << 9 +}; + typedef struct { WORD platformID; WORD encodingID; @@ -875,8 +888,12 @@ void opentype_get_font_metrics(const void *os2, const void *head, const void *po } if (tt_os2) { + USHORT version = GET_BE_WORD(tt_os2->version); + metrics->ascent = GET_BE_WORD(tt_os2->usWinAscent); metrics->descent = GET_BE_WORD(tt_os2->usWinDescent); + /* FIXME: sTypoLineGap should only be used when USE_TYPO_METRICS is set, + if not set this value is probably derived from other metrics */ metrics->lineGap = GET_BE_WORD(tt_os2->sTypoLineGap); metrics->strikethroughPosition = GET_BE_WORD(tt_os2->yStrikeoutPosition); metrics->strikethroughThickness = GET_BE_WORD(tt_os2->yStrikeoutSize); @@ -891,10 +908,21 @@ void opentype_get_font_metrics(const void *os2, const void *head, const void *po metrics->superscriptSizeY = GET_BE_WORD(tt_os2->ySuperscriptYSize); /* version 2 fields */ - if (tt_os2->version >= 2) { + if (version >= 2) { metrics->capHeight = GET_BE_WORD(tt_os2->sCapHeight); metrics->xHeight = GET_BE_WORD(tt_os2->sxHeight); } + + /* version 4 fields */ + if (version >= 4) { + if (GET_BE_WORD(tt_os2->fsSelection) & OS2_FSSELECTION_USE_TYPO_METRICS) { + SHORT descent = GET_BE_WORD(tt_os2->sTypoDescender); + metrics->ascent = GET_BE_WORD(tt_os2->sTypoAscender); + metrics->descent = descent < 0 ? -descent : 0; + metrics->lineGap = GET_BE_WORD(tt_os2->sTypoLineGap); + metrics->hasTypographicMetrics = TRUE; + } + } } if (tt_post) {

1 0

Sebastian Lackner : configure: Fix detection of gnutls on Ubuntu 14.10.
by Alexandre Julliard Nov. 28, 2014

Nov. 28, 2014

Module: wine Branch: master Commit: 79e0cb3a26f8ddefa12a7bf1023cf442f4072b81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79e0cb3a26f8ddefa12a7bf10… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Sep 7 08:09:54 2014 +0200 configure: Fix detection of gnutls on Ubuntu 14.10. --- configure | 16 ++++++++-------- configure.ac | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/configure b/configure index 4b1a37d..6f45fee 100755 --- a/configure +++ b/configure @@ -6001,7 +6001,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -6047,7 +6047,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -6071,7 +6071,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -6116,7 +6116,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -6140,7 +6140,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -11278,10 +11278,10 @@ _ACEOF if ac_fn_c_try_link "$LINENO"; then : case "$LIBEXT" in dll) ac_cv_lib_soname_gnutls=`$ac_cv_path_LDD conftest.exe | grep "gnutls" | sed -e "s/dll.*/dll/"';2,$d'` ;; - dylib) ac_cv_lib_soname_gnutls=`otool -L conftest$ac_exeext | grep "libgnutls\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/$libgnutls\.[0-9A-Za-z.]*dylib$.*$/\1/"';2,$d'` ;; - *) ac_cv_lib_soname_gnutls=`$READELF -d conftest$ac_exeext | grep "NEEDED.*libgnutls\\.$LIBEXT" | sed -e "s/^.*\\[\$libgnutls\\.$LIBEXT[^ ]*\$\\].*$/\1/"';2,$d'` + dylib) ac_cv_lib_soname_gnutls=`otool -L conftest$ac_exeext | grep "libgnutls\$-deb0\$\\{0,1\\}\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/$libgnutls\\(-deb0\$\\{0,1\\}\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;; + *) ac_cv_lib_soname_gnutls=`$READELF -d conftest$ac_exeext | grep "NEEDED.*libgnutls\$-deb0\$\\{0,1\\}\\.$LIBEXT" | sed -e "s/^.*\\[\$libgnutls\\(-deb0\$\\{0,1\\}\\.$LIBEXT[^ ]*\\)\\].*$/\1/"';2,$d'` if ${ac_cv_lib_soname_gnutls:+false} :; then : - ac_cv_lib_soname_gnutls=`$LDD conftest$ac_exeext | grep "libgnutls\\.$LIBEXT" | sed -e "s/^.*$libgnutls\.$LIBEXT[^ ]*$.*$/\1/"';2,$d'` + ac_cv_lib_soname_gnutls=`$LDD conftest$ac_exeext | grep "libgnutls\$-deb0\$\\{0,1\\}\\.$LIBEXT" | sed -e "s/^.*$libgnutls\\(-deb0\$\\{0,1\\}\.$LIBEXT[^ ]*\).*$/\1/"';2,$d'` fi ;; esac fi diff --git a/configure.ac b/configure.ac index 5521af2..edf5408 100644 --- a/configure.ac +++ b/configure.ac @@ -1359,7 +1359,7 @@ then [AC_CHECK_HEADER(gnutls/gnutls.h, [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gnutls/gnutls.h> #include <gnutls/crypto.h>]], [[static typeof(gnutls_mac_get_key_size) *func; if (func) return 0;]])], - [WINE_CHECK_SONAME(gnutls,gnutls_global_init,,[GNUTLS_CFLAGS=""],[$GNUTLS_LIBS])])], + [WINE_CHECK_SONAME(gnutls,gnutls_global_init,,[GNUTLS_CFLAGS=""],[$GNUTLS_LIBS],[[libgnutls\$-deb0\$\\{0,1\\}]])])], [GNUTLS_CFLAGS=""])]) fi WINE_WARNING_WITH(gnutls,[test "x$ac_cv_lib_soname_gnutls" = "x"],

1 0

Stefan Dösinger : d3d/tests: Rename fog_interpolation_test for consistency.
by Alexandre Julliard Nov. 27, 2014

Nov. 27, 2014

Module: wine Branch: master Commit: 871fc4a38fa44b5484eb651236b182efef790248 URL: http://source.winehq.org/git/wine.git/?a=commit;h=871fc4a38fa44b5484eb65123… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Nov 27 12:12:36 2014 +0100 d3d/tests: Rename fog_interpolation_test for consistency. --- dlls/d3d8/tests/visual.c | 6 +++--- dlls/d3d9/tests/visual.c | 6 +++--- dlls/ddraw/tests/ddraw7.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index ec406f1..a8a771e 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -5217,7 +5217,7 @@ done: DestroyWindow(window); } -static void fog_interpolation_test(void) +static void test_fog_interpolation(void) { HRESULT hr; IDirect3DDevice8 *device; @@ -5433,7 +5433,7 @@ static void test_negative_fixedfunction_fog(void) * parameters to 0.0 and 1.0 in the table fog case. */ {D3DFVF_XYZRHW, tquad, sizeof(*tquad), &identity, {-1.0f}, {0.0f}, D3DFOG_NONE, D3DFOG_LINEAR, 0x00808000, 0x00ff0000}, - /* fog_interpolation_test shows that vertex fog evaluates the fog + /* test_fog_interpolation shows that vertex fog evaluates the fog * equation in the vertex pipeline. Start = -1.0 && end = 0.0 shows * that the abs happens before the fog equation is evaluated. */ {D3DFVF_XYZ, quad, sizeof(*quad), &zero, { 0.0f}, {1.0f}, @@ -5565,6 +5565,6 @@ START_TEST(visual) volume_v16u16_test(); add_dirty_rect_test(); test_3dc_formats(); - fog_interpolation_test(); + test_fog_interpolation(); test_negative_fixedfunction_fog(); } diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 59f5ba8..d1aa3d4 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -16820,7 +16820,7 @@ done: DestroyWindow(window); } -static void fog_interpolation_test(void) +static void test_fog_interpolation(void) { HRESULT hr; IDirect3DDevice9 *device; @@ -17036,7 +17036,7 @@ static void test_negative_fixedfunction_fog(void) * parameters to 0.0 and 1.0 in the table fog case. */ {D3DFVF_XYZRHW, tquad, sizeof(*tquad), &identity, {-1.0f}, {0.0f}, D3DFOG_NONE, D3DFOG_LINEAR, 0x00808000, 0x00ff0000}, - /* fog_interpolation_test shows that vertex fog evaluates the fog + /* test_fog_interpolation shows that vertex fog evaluates the fog * equation in the vertex pipeline. Start = -1.0 && end = 0.0 shows * that the abs happens before the fog equation is evaluated. */ {D3DFVF_XYZ, quad, sizeof(*quad), &zero, { 0.0f}, {1.0f}, @@ -17226,6 +17226,6 @@ START_TEST(visual) stencil_cull_test(); test_per_stage_constant(); test_3dc_formats(); - fog_interpolation_test(); + test_fog_interpolation(); test_negative_fixedfunction_fog(); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index e9510c4..0ac7d7e 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -7878,7 +7878,7 @@ static void test_surface_desc_lock(void) DestroyWindow(window); } -static void fog_interpolation_test(void) +static void test_fog_interpolation(void) { HRESULT hr; IDirect3DDevice7 *device; @@ -8069,7 +8069,7 @@ static void test_negative_fixedfunction_fog(void) /* r200 GPUs and presumably all d3d8 and older HW clamp the fog * parameters to 0.0 and 1.0 in the table fog case. */ {D3DFVF_XYZRHW, tquad, &identity, {-1.0f}, {0.0f}, D3DFOG_NONE, D3DFOG_LINEAR, 0x00808000, 0x00ff0000}, - /* fog_interpolation_test shows that vertex fog evaluates the fog + /* test_fog_interpolation shows that vertex fog evaluates the fog * equation in the vertex pipeline. Start = -1.0 && end = 0.0 shows * that the abs happens before the fog equation is evaluated. */ {D3DFVF_XYZ, quad, &zero, { 0.0f}, {1.0f}, D3DFOG_LINEAR, D3DFOG_NONE, 0x00808000, 0x00808000}, @@ -8229,6 +8229,6 @@ START_TEST(ddraw7) test_lost_device(); test_resource_priority(); test_surface_desc_lock(); - fog_interpolation_test(); + test_fog_interpolation(); test_negative_fixedfunction_fog(); }

1 0

Stefan Dösinger : d3d/tests: Table fog does not abs the fog coordinate.
by Alexandre Julliard Nov. 27, 2014

Nov. 27, 2014

Module: wine Branch: master Commit: 96519f9be9471ce418f020fb31ac38e2f4d2ed14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96519f9be9471ce418f020fb3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Nov 27 12:12:35 2014 +0100 d3d/tests: Table fog does not abs the fog coordinate. --- dlls/d3d8/tests/visual.c | 86 +++++++++++++++++++++++++++++++++++++---------- dlls/d3d9/tests/visual.c | 86 +++++++++++++++++++++++++++++++++++++---------- dlls/ddraw/tests/ddraw7.c | 73 +++++++++++++++++++++++++++++++--------- 3 files changed, 193 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=96519f9be9471ce418f02…

1 0

Stefan Dösinger : d3d/tests: Show that the vfog abs is not a property of D3DFOG_LINEAR.
by Alexandre Julliard Nov. 27, 2014

Nov. 27, 2014

Module: wine Branch: master Commit: cfd741c6b60881f767c71f2b9a1f02252d7b4d95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfd741c6b60881f767c71f2b9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Nov 27 12:12:34 2014 +0100 d3d/tests: Show that the vfog abs is not a property of D3DFOG_LINEAR. --- dlls/d3d8/tests/visual.c | 10 ++++++---- dlls/d3d9/tests/visual.c | 10 ++++++---- dlls/ddraw/tests/ddraw7.c | 10 ++++++---- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 317df5a..1cd066c 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -5389,6 +5389,7 @@ static void test_negative_fixedfunction_fog(void) float f; DWORD d; } start, end; + D3DFOGMODE vfog; DWORD color; } tests[] = @@ -5396,8 +5397,9 @@ static void test_negative_fixedfunction_fog(void) /* fog_interpolation_test shows that vertex fog evaluates the fog * equation in the vertex pipeline. Start = -1.0 && end = 0.0 shows * that the abs happens before the fog equation is evaluated. */ - {{ 0.0f}, {1.0f}, 0x00808000}, - {{-1.0f}, {0.0f}, 0x0000ff00}, + {{ 0.0f}, {1.0f}, D3DFOG_LINEAR, 0x00808000}, + {{-1.0f}, {0.0f}, D3DFOG_LINEAR, 0x0000ff00}, + {{ 0.0f}, {1.0f}, D3DFOG_EXP, 0x009b6400}, }; static const D3DMATRIX proj_mat = {{{ @@ -5430,8 +5432,6 @@ static void test_negative_fixedfunction_fog(void) ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGCOLOR, 0x0000ff00); ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGVERTEXMODE, D3DFOG_LINEAR); - ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); hr = IDirect3DDevice8_SetTransform(device, D3DTS_PROJECTION, &proj_mat); ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#x.\n", hr); @@ -5444,6 +5444,8 @@ static void test_negative_fixedfunction_fog(void) ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGEND, tests[i].end.d); ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGVERTEXMODE, tests[i].vfog); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); hr = IDirect3DDevice8_BeginScene(device); ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 6ee19b0..6bf9adc 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -16992,6 +16992,7 @@ static void test_negative_fixedfunction_fog(void) float f; DWORD d; } start, end; + D3DFOGMODE vfog; DWORD color; } tests[] = @@ -16999,8 +17000,9 @@ static void test_negative_fixedfunction_fog(void) /* fog_interpolation_test shows that vertex fog evaluates the fog * equation in the vertex pipeline. Start = -1.0 && end = 0.0 shows * that the abs happens before the fog equation is evaluated. */ - {{ 0.0f}, {1.0f}, 0x00808000}, - {{-1.0f}, {0.0f}, 0x0000ff00}, + {{ 0.0f}, {1.0f}, D3DFOG_LINEAR, 0x00808000}, + {{-1.0f}, {0.0f}, D3DFOG_LINEAR, 0x0000ff00}, + {{ 0.0f}, {1.0f}, D3DFOG_EXP, 0x009b6400}, }; static const D3DMATRIX proj_mat = {{{ @@ -17033,8 +17035,6 @@ static void test_negative_fixedfunction_fog(void) ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGCOLOR, 0x0000ff00); ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGVERTEXMODE, D3DFOG_LINEAR); - ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); hr = IDirect3DDevice9_SetTransform(device, D3DTS_PROJECTION, &proj_mat); ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#x.\n", hr); @@ -17047,6 +17047,8 @@ static void test_negative_fixedfunction_fog(void) ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGEND, tests[i].end.d); ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGVERTEXMODE, tests[i].vfog); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); hr = IDirect3DDevice9_BeginScene(device); ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 647ec82..a1dbd5e 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -8030,6 +8030,7 @@ static void test_negative_fixedfunction_fog(void) float f; DWORD d; } start, end; + D3DFOGMODE vfog; DWORD color; } tests[] = @@ -8037,8 +8038,9 @@ static void test_negative_fixedfunction_fog(void) /* fog_interpolation_test shows that vertex fog evaluates the fog * equation in the vertex pipeline. Start = -1.0 && end = 0.0 shows * that the abs happens before the fog equation is evaluated. */ - {{ 0.0f}, {1.0f}, 0x00808000}, - {{-1.0f}, {0.0f}, 0x0000ff00}, + {{ 0.0f}, {1.0f}, D3DFOG_LINEAR, 0x00808000}, + {{-1.0f}, {0.0f}, D3DFOG_LINEAR, 0x0000ff00}, + {{ 0.0f}, {1.0f}, D3DFOG_EXP, 0x009b6400}, }; static D3DMATRIX proj_mat = { @@ -8069,8 +8071,6 @@ static void test_negative_fixedfunction_fog(void) ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_FOGCOLOR, 0x0000ff00); ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); - hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_FOGVERTEXMODE, D3DFOG_LINEAR); - ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_PROJECTION, &proj_mat); ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#x.\n", hr); @@ -8083,6 +8083,8 @@ static void test_negative_fixedfunction_fog(void) ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_FOGEND, tests[i].end.d); ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_FOGVERTEXMODE, tests[i].vfog); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); hr = IDirect3DDevice7_BeginScene(device); ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP,

1 0