wine-commits March 2014

wine-commits@winehq.org

2 participants
530 discussions

Francois Gouget : testbot: Don' t show the TestAgent server version when failing to set the time.
by Alexandre Julliard 12 Mar '14

12 Mar '14

Module: tools Branch: master Commit: b7f27a6b914689b7e05073e56ac40750ce2b04b4 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b7f27a6b914689b7e05073e5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 12 14:22:59 2014 +0100 testbot: Don't show the TestAgent server version when failing to set the time. The connection may have failed in which case we don't have this information. --- testbot/bin/WineRunTask.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index ce1adb5..efeac8d 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -231,7 +231,7 @@ if (defined $ErrMessage) if (!$TA->SetTime()) { # Not a fatal error - LogTaskError("Unable to set the VM system time (". $TA->GetVersion() ."): ". $TA->GetLastError() ."\n", $FullErrFileName); + LogTaskError("Unable to set the VM system time: ". $TA->GetLastError() ."\n", $FullErrFileName); } my $FileType = $Step->FileType;

1 0

Jacek Caban : mshtml: Adder _parent target support to navigate_anchor.
by Alexandre Julliard 11 Mar '14

11 Mar '14

Module: wine Branch: master Commit: 31faed571d5a846925b22c08dc488eb42344c41d URL: http://source.winehq.org/git/wine.git/?a=commit;h=31faed571d5a846925b22c08d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 11 19:01:45 2014 +0100 mshtml: Adder _parent target support to navigate_anchor. --- dlls/mshtml/htmlanchor.c | 12 +++++++---- dlls/mshtml/tests/blank.html | 1 + dlls/mshtml/tests/nav_test.html | 42 +++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/rsrc.rc | 9 +++++++++ dlls/mshtml/tests/script.c | 1 + 5 files changed, 61 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 97ef900..f177ff2 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -77,7 +77,7 @@ static HRESULT navigate_anchor(HTMLAnchorElement *This) nsresult nsres; HRESULT hres = E_FAIL; - static const WCHAR _parentW[] = {'p','a','r','e','n','t',0}; + static const WCHAR _parentW[] = {'_','p','a','r','e','n','t',0}; static const WCHAR _selfW[] = {'_','s','e','l','f',0}; static const WCHAR _topW[] = {'_','t','o','p',0}; @@ -93,9 +93,13 @@ static HRESULT navigate_anchor(HTMLAnchorElement *This) TRACE("target _top\n"); get_top_window(This->element.node.doc->basedoc.window, &window); }else if(!strcmpiW(target, _parentW)) { - FIXME("Navigating to target _parent is not implemented\n"); - nsAString_Finish(&target_str); - return S_OK; + window = This->element.node.doc->basedoc.window; + if(!window->parent) { + WARN("Window has no parent\n"); + nsAString_Finish(&target_str); + return S_OK; + } + window = window->parent; }else { HTMLOuterWindow *top_window; diff --git a/dlls/mshtml/tests/blank.html b/dlls/mshtml/tests/blank.html new file mode 100644 index 0000000..18ecdcb --- /dev/null +++ b/dlls/mshtml/tests/blank.html @@ -0,0 +1 @@ +<html></html> diff --git a/dlls/mshtml/tests/nav_test.html b/dlls/mshtml/tests/nav_test.html new file mode 100644 index 0000000..d106dfc --- /dev/null +++ b/dlls/mshtml/tests/nav_test.html @@ -0,0 +1,42 @@ +<html> +<head> +<script> +function ok(b,m) { + return external.ok(b, m); +} + +function nav_back_test() { + external.trace("Running _parent navigation tests..."); + + var iframe = document.getElementById("testframe"); + var subframe = iframe.contentWindow.document.createElement("iframe"); + + subframe.onload = function() { + var doc = subframe.contentWindow.document; + doc.body.innerHTML = '<a href="blank2.html" id="aid" target="_parent">test</a>'; + doc.getElementById("aid").click(); + } + + iframe.onload = function() { + var href = iframe.contentWindow.location.href; + ok(/.*blank2.html/.test(href), "Unexpected href " + href); + next_test(); + } + + iframe.contentWindow.document.body.appendChild(subframe); + subframe.src = "blank.html"; +} + +var tests = [ + nav_back_test, + function() { external.reportSuccess(); } +]; + +function next_test() { + window.setTimeout(tests.shift(), 0); +} +</script> +<body onload="next_test()"> +<iframe src="about:blank" id="testframe"></iframe> +</body> +</html> diff --git a/dlls/mshtml/tests/rsrc.rc b/dlls/mshtml/tests/rsrc.rc index 07d816d..d498b82 100644 --- a/dlls/mshtml/tests/rsrc.rc +++ b/dlls/mshtml/tests/rsrc.rc @@ -31,6 +31,15 @@ events.html HTML "events.html" /* @makedep: externscr.js */ externscr.js HTML "externscr.js" +/* @makedep: nav_test.html */ +nav_test.html HTML "nav_test.html" + +/* @makedep: blank.html */ +blank.html HTML "blank.html" + +/* @makedep: blank.html */ +blank2.html HTML "blank.html" + /* @makedep: test_tlb.tlb */ 1 TYPELIB test_tlb.tlb diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index ac6b8a2..de0bf65 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -2831,6 +2831,7 @@ static void run_js_tests(void) run_js_script("exectest.html"); run_js_script("vbtest.html"); run_js_script("events.html"); + run_js_script("nav_test.html"); } static BOOL init_registry(BOOL init)

1 0

Jacek Caban : mshtml: Added IHTMLFrameBase2:: onload property implementation.
by Alexandre Julliard 11 Mar '14

11 Mar '14

Module: wine Branch: master Commit: d6bb86e84cb441ab1b1321113f602fe41f252d8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6bb86e84cb441ab1b1321113… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 11 19:01:09 2014 +0100 mshtml: Added IHTMLFrameBase2::onload property implementation. --- dlls/mshtml/htmlframebase.c | 13 +++++--- dlls/mshtml/tests/events.c | 69 ++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 74 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlframebase.c b/dlls/mshtml/htmlframebase.c index e05e219..380691f 100644 --- a/dlls/mshtml/htmlframebase.c +++ b/dlls/mshtml/htmlframebase.c @@ -28,6 +28,7 @@ #include "mshtml_private.h" #include "binding.h" +#include "htmlevent.h" #include "wine/debug.h" @@ -593,15 +594,19 @@ static HRESULT WINAPI HTMLFrameBase2_get_contentWindow(IHTMLFrameBase2 *iface, I static HRESULT WINAPI HTMLFrameBase2_put_onload(IHTMLFrameBase2 *iface, VARIANT v) { HTMLFrameBase *This = impl_from_IHTMLFrameBase2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_node_event(&This->element.node, EVENTID_LOAD, &v); } static HRESULT WINAPI HTMLFrameBase2_get_onload(IHTMLFrameBase2 *iface, VARIANT *p) { HTMLFrameBase *This = impl_from_IHTMLFrameBase2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_node_event(&This->element.node, EVENTID_LOAD, p); } static HRESULT WINAPI HTMLFrameBase2_put_onreadystatechange(IHTMLFrameBase2 *iface, VARIANT v) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 7d8fef4..d1a36f0 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -83,6 +83,7 @@ DEFINE_EXPECT(submit_onclick_attached); DEFINE_EXPECT(submit_onclick_attached_check_cancel); DEFINE_EXPECT(submit_onclick_setret); DEFINE_EXPECT(elem2_cp_onclick); +DEFINE_EXPECT(iframe_onload); static HWND container_hwnd = NULL; static IHTMLWindow2 *window; @@ -243,6 +244,18 @@ static IHTMLElement3 *_get_elem3_iface(unsigned line, IUnknown *unk) return elem3; } +#define get_iframe_iface(u) _get_iframe_iface(__LINE__,u) +static IHTMLIFrameElement *_get_iframe_iface(unsigned line, IUnknown *unk) +{ + IHTMLIFrameElement *iframe; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLIFrameElement, (void**)&iframe); + ok_(__FILE__,line)(hres == S_OK, "QueryInterface(IID_IHTMLIFrameElement) failed: %08x\n", hres); + + return iframe; +} + #define doc_get_body(d) _doc_get_body(__LINE__,d) static IHTMLElement *_doc_get_body(unsigned line, IHTMLDocument2 *doc) { @@ -993,6 +1006,17 @@ static HRESULT WINAPI submit_onclick(IDispatchEx *iface, DISPID id, LCID lcid, W EVENT_HANDLER_FUNC_OBJ(submit_onclick); +static HRESULT WINAPI iframe_onload(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) +{ + CHECK_EXPECT(iframe_onload); + test_event_args(&DIID_DispHTMLIFrame, id, wFlags, pdp, pvarRes, pei, pspCaller); + test_event_src("IFRAME"); + return S_OK; +} + +EVENT_HANDLER_FUNC_OBJ(iframe_onload); + static HRESULT WINAPI submit_onclick_attached(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { @@ -2058,6 +2082,8 @@ static void test_submit(IHTMLDocument2 *doc) CHECK_CALLED(submit_onclick_attached_check_cancel); CHECK_CALLED(submit_onclick_attached); + if(1)pump_msgs(NULL); + IHTMLElement_Release(submit); } @@ -2144,16 +2170,21 @@ static IHTMLDocument2* get_iframe_doc(IHTMLIFrameElement *iframe) static void test_iframe_connections(IHTMLDocument2 *doc) { - HRESULT hres; + IHTMLFrameBase2 *frame_base2; IHTMLIFrameElement *iframe; IHTMLDocument2 *iframes_doc; DWORD cookie; IConnectionPoint *cp; - IHTMLElement *element = find_element_by_id(doc, "ifr"); + IHTMLElement *element; + VARIANT v; + BSTR str; + HRESULT hres; + + trace("iframe tests...\n"); - hres = IHTMLElement_QueryInterface(element, &IID_IHTMLIFrameElement, (void**)&iframe); + element = find_element_by_id(doc, "ifr"); + iframe = get_iframe_iface((IUnknown*)element); IHTMLElement_Release(element); - ok(hres == S_OK, "QueryInterface(IID_IHTMLIFrameElement) failed: %08x\n", hres); iframes_doc = get_iframe_doc(iframe); IHTMLIFrameElement_Release(iframe); @@ -2165,6 +2196,36 @@ static void test_iframe_connections(IHTMLDocument2 *doc) IConnectionPoint_Release(cp); ok(hres == CONNECT_E_NOCONNECTION, "Unadvise returned %08x, expected CONNECT_E_NOCONNECTION\n", hres); + unregister_cp((IUnknown*)iframes_doc, &IID_IDispatch, cookie); + + hres = IHTMLIFrameElement_QueryInterface(iframe, &IID_IHTMLFrameBase2, (void**)&frame_base2); + ok(hres == S_OK, "Could not get IHTMLFrameBase2 iface: %08x\n", hres); + + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = (IDispatch*)&iframe_onload_obj; + hres = IHTMLFrameBase2_put_onload(frame_base2, v); + ok(hres == S_OK, "put_onload failed: %08x\n", hres); + + IHTMLFrameBase2_Release(frame_base2); + + str = a2bstr("about:blank"); + hres = IHTMLDocument2_put_URL(iframes_doc, str); + ok(hres == S_OK, "put_URL failed: %08x\n", hres); + SysFreeString(str); + + SET_EXPECT(iframe_onload); + pump_msgs(&called_iframe_onload); + CHECK_CALLED(iframe_onload); + + str = a2bstr("about:test"); + hres = IHTMLDocument2_put_URL(iframes_doc, str); + ok(hres == S_OK, "put_URL failed: %08x\n", hres); + SysFreeString(str); + + SET_EXPECT(iframe_onload); + pump_msgs(&called_iframe_onload); + CHECK_CALLED(iframe_onload); + IHTMLDocument2_Release(iframes_doc); }

1 0

Jacek Caban : mshtml: Bind events not sent to default view to body element instead of directly to target.
by Alexandre Julliard 11 Mar '14

11 Mar '14

Module: wine Branch: master Commit: 9c45b34c62dfadb600d271c17694fe9510d68011 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c45b34c62dfadb600d271c17… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 11 19:00:50 2014 +0100 mshtml: Bind events not sent to default view to body element instead of directly to target. --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmldoc3.c | 2 +- dlls/mshtml/htmlelem2.c | 2 +- dlls/mshtml/htmlevent.c | 82 +++++++++++++++++++--------------------------- dlls/mshtml/htmlevent.h | 10 +++--- dlls/mshtml/htmlwindow.c | 4 +-- 6 files changed, 44 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9c45b34c62dfadb600d27…

1 0

Henri Verbeet : wined3d: Handle shader_arb_free_context_data() during context creation.
by Alexandre Julliard 11 Mar '14

11 Mar '14

Module: wine Branch: master Commit: a05dcd911ebaf64138d330ecf5db3e3ce8700bda URL: http://source.winehq.org/git/wine.git/?a=commit;h=a05dcd911ebaf64138d330ecf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 11 18:41:47 2014 +0100 wined3d: Handle shader_arb_free_context_data() during context creation. --- 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 d7e9ef7..1eab0eb 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5052,8 +5052,12 @@ static BOOL shader_arb_allocate_context_data(struct wined3d_context *context) static void shader_arb_free_context_data(struct wined3d_context *context) { - struct shader_arb_priv *priv = context->swapchain->device->shader_priv; + struct shader_arb_priv *priv; + + if (!context->swapchain) + return; + priv = context->swapchain->device->shader_priv; if (priv->last_context == context) priv->last_context = NULL; }

1 0

Henri Verbeet : ddraw/tests: Skip the overlay tests in test_block_formats_creation() if overlays are not supported.
by Alexandre Julliard 11 Mar '14

11 Mar '14

Module: wine Branch: master Commit: 82780d6ba62f105e06a96fa5c0328a65078ca047 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82780d6ba62f105e06a96fa5c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 11 18:41:46 2014 +0100 ddraw/tests: Skip the overlay tests in test_block_formats_creation() if overlays are not supported. --- dlls/ddraw/tests/ddraw4.c | 11 ++++++++++- dlls/ddraw/tests/ddraw7.c | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 3b1f8d4..bb725e7 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -4043,6 +4043,8 @@ static void test_block_formats_creation(void) DWORD supported_fmts = 0, supported_overlay_fmts = 0; DWORD num_fourcc_codes = 0, *fourcc_codes; DDSURFACEDESC2 ddsd; + DDCAPS hal_caps; + static const struct { DWORD fourcc; @@ -4132,12 +4134,19 @@ static void test_block_formats_creation(void) } HeapFree(GetProcessHeap(), 0, fourcc_codes); + memset(&hal_caps, 0, sizeof(hal_caps)); + hal_caps.dwSize = sizeof(hal_caps); + hr = IDirectDraw4_GetCaps(ddraw, &hal_caps, NULL); + ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); + for (i = 0; i < sizeof(formats) / sizeof(*formats); i++) { for (j = 0; j < sizeof(types) / sizeof(*types); j++) { BOOL support; - if (formats[i].overlay != types[j].overlay) + + if (formats[i].overlay != types[j].overlay + || (types[j].overlay && !(hal_caps.dwCaps & DDCAPS_OVERLAY))) continue; if (formats[i].overlay) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index b4570af..15e89a1 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -3850,6 +3850,8 @@ static void test_block_formats_creation(void) DWORD supported_fmts = 0, supported_overlay_fmts = 0; DWORD num_fourcc_codes = 0, *fourcc_codes; DDSURFACEDESC2 ddsd; + DDCAPS hal_caps; + static const struct { DWORD fourcc; @@ -3939,12 +3941,19 @@ static void test_block_formats_creation(void) } HeapFree(GetProcessHeap(), 0, fourcc_codes); + memset(&hal_caps, 0, sizeof(hal_caps)); + hal_caps.dwSize = sizeof(hal_caps); + hr = IDirectDraw7_GetCaps(ddraw, &hal_caps, NULL); + ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); + for (i = 0; i < sizeof(formats) / sizeof(*formats); i++) { for (j = 0; j < sizeof(types) / sizeof(*types); j++) { BOOL support; - if (formats[i].overlay != types[j].overlay) + + if (formats[i].overlay != types[j].overlay + || (types[j].overlay && !(hal_caps.dwCaps & DDCAPS_OVERLAY))) continue; if (formats[i].overlay)

1 0

Henri Verbeet : gdi32/tests: Fix test_device_caps() on multihead setups.
by Alexandre Julliard 11 Mar '14

11 Mar '14

Module: wine Branch: master Commit: cf5023bfffa28973406527761ad2447dc48096e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf5023bfffa28973406527761… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 11 18:41:45 2014 +0100 gdi32/tests: Fix test_device_caps() on multihead setups. Unfortunately this currently mostly fails on Wine. --- dlls/gdi32/tests/dc.c | 44 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 39 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 10e194a..d215d9c 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -457,12 +457,46 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr, int scale type = GetClipBox( ref_dc, &rect ); if (type != COMPLEXREGION && type != ERROR) /* region can be complex on multi-monitor setups */ { + RECT ref_rect; + ok( type == SIMPLEREGION, "GetClipBox returned %d on %s\n", type, descr ); - ok( rect.left == 0 && rect.top == 0 && - rect.right == GetDeviceCaps( ref_dc, DESKTOPHORZRES ) && - rect.bottom == GetDeviceCaps( ref_dc, DESKTOPVERTRES ), - "GetClipBox returned %d,%d,%d,%d on %s\n", - rect.left, rect.top, rect.right, rect.bottom, descr ); + if (GetDeviceCaps( ref_dc, TECHNOLOGY ) == DT_RASDISPLAY) + { + if (GetSystemMetrics( SM_CXSCREEN ) != GetSystemMetrics( SM_CXVIRTUALSCREEN )) + todo_wine ok( GetDeviceCaps( ref_dc, DESKTOPHORZRES ) == GetSystemMetrics( SM_CXSCREEN ), + "Got DESKTOPHORZRES %d on %s, expected %d\n", + GetDeviceCaps( ref_dc, DESKTOPHORZRES ), descr, GetSystemMetrics( SM_CXSCREEN ) ); + else + ok( GetDeviceCaps( ref_dc, DESKTOPHORZRES ) == GetSystemMetrics( SM_CXSCREEN ), + "Got DESKTOPHORZRES %d on %s, expected %d\n", + GetDeviceCaps( ref_dc, DESKTOPHORZRES ), descr, GetSystemMetrics( SM_CXSCREEN ) ); + + if (GetSystemMetrics( SM_CYSCREEN ) != GetSystemMetrics( SM_CYVIRTUALSCREEN )) + todo_wine ok( GetDeviceCaps( ref_dc, DESKTOPVERTRES ) == GetSystemMetrics( SM_CYSCREEN ), + "Got DESKTOPVERTRES %d on %s, expected %d\n", + GetDeviceCaps( ref_dc, DESKTOPVERTRES ), descr, GetSystemMetrics( SM_CYSCREEN ) ); + else + ok( GetDeviceCaps( ref_dc, DESKTOPVERTRES ) == GetSystemMetrics( SM_CYSCREEN ), + "Got DESKTOPVERTRES %d on %s, expected %d\n", + GetDeviceCaps( ref_dc, DESKTOPVERTRES ), descr, GetSystemMetrics( SM_CYSCREEN ) ); + + SetRect( &ref_rect, GetSystemMetrics( SM_XVIRTUALSCREEN ), GetSystemMetrics( SM_YVIRTUALSCREEN ), + GetSystemMetrics( SM_XVIRTUALSCREEN ) + GetSystemMetrics( SM_CXVIRTUALSCREEN ), + GetSystemMetrics( SM_YVIRTUALSCREEN ) + GetSystemMetrics( SM_CYVIRTUALSCREEN ) ); + } + else + { + SetRect( &ref_rect, 0, 0, GetDeviceCaps( ref_dc, DESKTOPHORZRES ), + GetDeviceCaps( ref_dc, DESKTOPVERTRES ) ); + } + + if (GetDeviceCaps( ref_dc, TECHNOLOGY ) == DT_RASDISPLAY && GetObjectType( hdc ) != OBJ_ENHMETADC && + (GetSystemMetrics( SM_XVIRTUALSCREEN ) || GetSystemMetrics( SM_YVIRTUALSCREEN ))) + todo_wine ok( EqualRect( &rect, &ref_rect ), "GetClipBox returned %d,%d,%d,%d on %s\n", + rect.left, rect.top, rect.right, rect.bottom, descr ); + else + ok( EqualRect( &rect, &ref_rect ), "GetClipBox returned %d,%d,%d,%d on %s\n", + rect.left, rect.top, rect.right, rect.bottom, descr ); } SetBoundsRect( ref_dc, NULL, DCB_RESET | DCB_ACCUMULATE );

1 0

Henri Verbeet : gdi32/tests: Fix test_window_dc_clipping() when the virtual screen origin is not (0, 0).
by Alexandre Julliard 11 Mar '14

11 Mar '14

Module: wine Branch: master Commit: d8ec2b5d952b3d240da866e1332ca44486c9aa04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8ec2b5d952b3d240da866e13… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 11 18:41:44 2014 +0100 gdi32/tests: Fix test_window_dc_clipping() when the virtual screen origin is not (0, 0). --- dlls/gdi32/tests/clipping.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/tests/clipping.c b/dlls/gdi32/tests/clipping.c index 6257c17..e90f2f4 100644 --- a/dlls/gdi32/tests/clipping.c +++ b/dlls/gdi32/tests/clipping.c @@ -438,7 +438,7 @@ static void test_window_dc_clipping(void) HDC hdc; HRGN hrgn, hrgn_empty; HWND hwnd; - RECT rc; + RECT rc, virtual_rect; int ret, screen_width, screen_height; /* Windows versions earlier than Win2k do not support the virtual screen metrics, @@ -447,6 +447,8 @@ static void test_window_dc_clipping(void) if(!screen_width) screen_width = GetSystemMetrics(SM_CXSCREEN); screen_height = GetSystemMetrics(SM_CYVIRTUALSCREEN); if(!screen_height) screen_height = GetSystemMetrics(SM_CYSCREEN); + SetRect(&virtual_rect, GetSystemMetrics(SM_XVIRTUALSCREEN), GetSystemMetrics(SM_YVIRTUALSCREEN), + GetSystemMetrics(SM_XVIRTUALSCREEN) + screen_width, GetSystemMetrics(SM_YVIRTUALSCREEN) + screen_height); trace("screen resolution %d x %d\n", screen_width, screen_height); @@ -474,9 +476,9 @@ static void test_window_dc_clipping(void) ret = GetRgnBox(hrgn, &rc); ok(ret == SIMPLEREGION, "expected SIMPLEREGION, got %d\n", ret); - ok(rc.left == 0 && rc.top == 0 && rc.right == screen_width && rc.bottom == screen_height, - "expected 0,0-%d,%d, got %d,%d-%d,%d\n", screen_width, screen_height, - rc.left, rc.top, rc.right, rc.bottom); + ok(EqualRect(&rc, &virtual_rect), "expected %d,%d-%d,%d, got %d,%d-%d,%d\n", + virtual_rect.left, virtual_rect.top, virtual_rect.right, virtual_rect.bottom, + rc.left, rc.top, rc.right, rc.bottom); SetRect( &rc, 10, 10, 20, 20 ); ret = RectVisible( hdc, &rc ); @@ -494,9 +496,9 @@ static void test_window_dc_clipping(void) ret = GetRgnBox(hrgn, &rc); ok(ret == SIMPLEREGION, "expected SIMPLEREGION, got %d\n", ret); - ok(rc.left == 0 && rc.top == 0 && rc.right == screen_width && rc.bottom == screen_height, - "expected 0,0-%d,%d, got %d,%d-%d,%d\n", screen_width, screen_height, - rc.left, rc.top, rc.right, rc.bottom); + ok(EqualRect(&rc, &virtual_rect), "expected %d,%d-%d,%d, got %d,%d-%d,%d\n", + virtual_rect.left, virtual_rect.top, virtual_rect.right, virtual_rect.bottom, + rc.left, rc.top, rc.right, rc.bottom); ret = ExtSelectClipRgn(hdc, 0, RGN_COPY); ok(ret == SIMPLEREGION || (ret == COMPLEXREGION && GetSystemMetrics(SM_CMONITORS) > 1),

1 0

Henri Verbeet : user32: Fix TEXT_WordBreak() when no characters fit.
by Alexandre Julliard 11 Mar '14

11 Mar '14

Module: wine Branch: master Commit: ec66785f02ff5fba9ec7a18a8697c19140059ae8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec66785f02ff5fba9ec7a18a8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 11 18:41:43 2014 +0100 user32: Fix TEXT_WordBreak() when no characters fit. --- dlls/user32/tests/text.c | 16 ++++++++++++++++ dlls/user32/text.c | 4 ++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/text.c b/dlls/user32/tests/text.c index 217baab..19bcd72 100644 --- a/dlls/user32/tests/text.c +++ b/dlls/user32/tests/text.c @@ -42,6 +42,8 @@ static void test_DrawTextCalcRect(void) 's','t','r','i','n','g','\0'}; static CHAR emptystring[] = ""; static WCHAR emptystringW[] = { 0 }; + static CHAR wordbreak_text[] = "line1 line2"; + static WCHAR wordbreak_textW[] = {'l','i','n','e','1',' ','l','i','n','e','2',0}; INT textlen, textheight, heightcheck; RECT rect = { 0, 0, 100, 0 }; BOOL ret; @@ -556,6 +558,20 @@ static void test_DrawTextCalcRect(void) ok(rect.bottom, "rect.bottom should not be 0\n"); } + SetRect(&rect, 0, 0, 1, 1); + heightcheck = DrawTextA(hdc, wordbreak_text, -1, &rect, DT_CALCRECT); + SetRect(&rect, 0, 0, 1, 1); + textheight = DrawTextA(hdc, wordbreak_text, -1, &rect, DT_CALCRECT | DT_WORDBREAK); + ok(textheight == heightcheck * 2, "Got unexpected textheight %d, expected %d.\n", + textheight, heightcheck * 2); + + SetRect(&rect, 0, 0, 1, 1); + heightcheck = DrawTextW(hdc, wordbreak_textW, -1, &rect, DT_CALCRECT); + SetRect(&rect, 0, 0, 1, 1); + textheight = DrawTextW(hdc, wordbreak_textW, -1, &rect, DT_CALCRECT | DT_WORDBREAK); + ok(textheight == heightcheck * 2, "Got unexpected textheight %d, expected %d.\n", + textheight, heightcheck * 2); + SelectObject(hdc, hOldFont); ret = DeleteObject(hFont); ok( ret, "DeleteObject error %u\n", GetLastError()); diff --git a/dlls/user32/text.c b/dlls/user32/text.c index 7bef476..fdc3554 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -379,7 +379,7 @@ static void TEXT_WordBreak (HDC hdc, WCHAR *str, unsigned int max_str, i = chars_fit; word_fits = TRUE; if (!chars_fit) - ; /* we pretend that it fits anyway */ + word_fits = FALSE; else if (sla[i].fSoftBreak) /* chars_fit < *len_str so this is valid */ { /* the word just fitted */ @@ -392,7 +392,7 @@ static void TEXT_WordBreak (HDC hdc, WCHAR *str, unsigned int max_str, word_fits = (i != 0 || sla[i+1].fSoftBreak ); } - /* If there was one or the first character didn't fit then */ + /* If there was one. */ if (word_fits) { BOOL next_is_space;

1 0

Jacek Caban : mshtml: Removed test failing on Windows 8.1.
by Alexandre Julliard 11 Mar '14

11 Mar '14

Module: wine Branch: master Commit: cbfeef4b8b09ed30312ed888d82f2d5ffbd01c64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbfeef4b8b09ed30312ed888d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 11 16:01:00 2014 +0100 mshtml: Removed test failing on Windows 8.1. --- dlls/mshtml/tests/dom.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 892e812..cf78450 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6014,7 +6014,6 @@ static void test_stylesheets(IHTMLDocument2 *doc) hres = IHTMLStyleSheetsCollection_item(col, &idx, &res); ok(hres == E_INVALIDARG, "item failed: %08x, expected E_INVALIDARG\n", hres); ok(V_VT(&res) == VT_EMPTY, "V_VT(res) = %d\n", V_VT(&res)); - ok(V_DISPATCH(&res) != NULL, "V_DISPATCH(&res) == NULL\n"); VariantClear(&res); IHTMLStyleSheetsCollection_Release(col);

1 0

← Newer
1
...
31
32
33
34
35
36
37
...
53
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2014