winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
November 2014
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
394 discussions
Start a n
N
ew thread
Stefan Dösinger : ddraw/tests: Test mode changes on focus loss and restore.
by Alexandre Julliard
19 Nov '14
19 Nov '14
Module: wine Branch: master Commit: a9e0ece68a5f0fe65910c80d30ab55e928d1a6f0 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a9e0ece68a5f0fe65910c80d3…
Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 18 21:26:56 2014 +0100 ddraw/tests: Test mode changes on focus loss and restore. --- dlls/ddraw/tests/ddraw1.c | 18 ++++++++++++++++-- dlls/ddraw/tests/ddraw2.c | 20 ++++++++++++++++++-- dlls/ddraw/tests/ddraw4.c | 20 ++++++++++++++++++-- dlls/ddraw/tests/ddraw7.c | 20 ++++++++++++++++++-- 4 files changed, 70 insertions(+), 8 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=a9e0ece68a5f0fe65910c…
1
0
0
0
Stefan Dösinger : d3d8/tests: Test mode restoration on focus loss.
by Alexandre Julliard
19 Nov '14
19 Nov '14
Module: wine Branch: master Commit: b30901415aee1dcd2da8ebda8beffe3bd2d518de URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b30901415aee1dcd2da8ebda8…
Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 18 21:26:55 2014 +0100 d3d8/tests: Test mode restoration on focus loss. --- dlls/d3d8/tests/device.c | 112 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 105 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 3b2d4ac..8dcd163 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -2237,7 +2237,13 @@ static void test_wndproc(void) ULONG ref; DWORD res, tid; HWND tmp; + UINT i, adapter_mode_count; HRESULT hr; + D3DDISPLAYMODE d3ddm; + DWORD d3d_width = 0, d3d_height = 0, user32_width = 0, user32_height = 0; + DEVMODEW devmode; + LONG change_ret; + BOOL ret; static const struct message create_messages[] = { @@ -2258,6 +2264,9 @@ static void test_wndproc(void) * not reliable on X11 WMs. When the window focus follows the * mouse pointer the message is not sent. * {WM_ACTIVATE, FOCUS_WINDOW, TRUE, WA_INACTIVE}, */ + {WM_DISPLAYCHANGE, DEVICE_WINDOW, FALSE, 0}, + /* WM_DISPLAYCHANGE is sent to the focus window too, but the order is + * not deterministic. */ {WM_WINDOWPOSCHANGING, DEVICE_WINDOW, FALSE, 0}, /* Windows sends WM_ACTIVATE to the device window, indicating that * SW_SHOWMINIMIZED is used instead of SW_MINIMIZE. Yet afterwards @@ -2277,6 +2286,57 @@ static void test_wndproc(void) d3d8 = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d8, "Failed to create a D3D object.\n"); + adapter_mode_count = IDirect3D8_GetAdapterModeCount(d3d8, D3DADAPTER_DEFAULT); + for (i = 0; i < adapter_mode_count; ++i) + { + hr = IDirect3D8_EnumAdapterModes(d3d8, D3DADAPTER_DEFAULT, i, &d3ddm); + ok(SUCCEEDED(hr), "Failed to enumerate display mode, hr %#x.\n", hr); + + if (d3ddm.Format != D3DFMT_X8R8G8B8) + continue; + if (d3ddm.Width == registry_mode.dmPelsWidth && d3ddm.Height == registry_mode.dmPelsHeight) + continue; + /* The r200 driver on Windows XP enumerates modes like 320x200 and 320x240 but + * refuses to create a device at these sizes. */ + if (d3ddm.Width < 640 || d3ddm.Height < 480) + continue; + + if (!user32_width) + { + user32_width = d3ddm.Width; + user32_height = d3ddm.Height; + continue; + } + + /* Make sure the d3d mode is smaller in width or height and at most + * equal in the other dimension than the mode passed to + * ChangeDisplaySettings. Otherwise Windows shrinks the window to + * the ChangeDisplaySettings parameters + 12. */ + if (d3ddm.Width == user32_width && d3ddm.Height == user32_height) + continue; + if (d3ddm.Width <= user32_width && d3ddm.Height <= user32_height) + { + d3d_width = d3ddm.Width; + d3d_height = d3ddm.Height; + break; + } + if (user32_width <= d3ddm.Width && user32_height <= d3ddm.Height) + { + d3d_width = user32_width; + d3d_height = user32_height; + user32_width = d3ddm.Width; + user32_height = d3ddm.Height; + break; + } + } + + if (!d3d_width) + { + skip("Could not find adequate modes, skipping mode tests.\n"); + IDirect3D8_Release(d3d8); + return; + } + wc.lpfnWndProc = test_proc; wc.lpszClassName = "d3d8_test_wndproc_wc"; ok(RegisterClassA(&wc), "Failed to register window class.\n"); @@ -2286,12 +2346,18 @@ static void test_wndproc(void) thread_params.test_finished = CreateEventA(NULL, FALSE, FALSE, NULL); ok(!!thread_params.test_finished, "CreateEvent failed, last error %#x.\n", GetLastError()); + memset(&devmode, 0, sizeof(devmode)); + devmode.dmSize = sizeof(devmode); + devmode.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT; + devmode.dmPelsWidth = user32_width; + devmode.dmPelsHeight = user32_height; + change_ret = ChangeDisplaySettingsW(&devmode, CDS_FULLSCREEN); + ok(change_ret == DISP_CHANGE_SUCCESSFUL, "Failed to change display mode, ret %#x.\n", change_ret); + focus_window = CreateWindowA("d3d8_test_wndproc_wc", "d3d8_test", - WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION , 0, 0, registry_mode.dmPelsWidth, - registry_mode.dmPelsHeight, 0, 0, 0, 0); + WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION , 0, 0, user32_width, user32_height, 0, 0, 0, 0); device_window = CreateWindowA("d3d8_test_wndproc_wc", "d3d8_test", - WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION , 0, 0, registry_mode.dmPelsWidth, - registry_mode.dmPelsHeight, 0, 0, 0, 0); + WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION , 0, 0, user32_width, user32_height, 0, 0, 0, 0); thread = CreateThread(NULL, 0, wndproc_thread, &thread_params, 0, &tid); ok(!!thread, "Failed to create thread, last error %#x.\n", GetLastError()); @@ -2324,8 +2390,8 @@ static void test_wndproc(void) expect_messages = create_messages; device_desc.device_window = device_window; - device_desc.width = registry_mode.dmPelsWidth; - device_desc.height = registry_mode.dmPelsHeight; + device_desc.width = d3d_width; + device_desc.height = d3d_height; device_desc.flags = CREATE_DEVICE_FULLSCREEN; if (!(device = create_device(d3d8, focus_window, &device_desc))) { @@ -2354,6 +2420,22 @@ static void test_wndproc(void) proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC); ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx.\n", (LONG_PTR)test_proc); + /* Change the mode while the device is in use and then drop focus. */ + devmode.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT; + devmode.dmPelsWidth = user32_width; + devmode.dmPelsHeight = user32_height; + change_ret = ChangeDisplaySettingsW(&devmode, CDS_FULLSCREEN); + ok(change_ret == DISP_CHANGE_SUCCESSFUL, "Failed to change display mode, ret %#x, i=%u.\n", change_ret, i); + + /* Wine doesn't (yet) mark the device not reset when the mode is changed, thus the todo_wine. + * But sometimes focus-follows-mouse WMs also temporarily drop window focus, which makes + * mark the device lost, then not reset, causing the test to succeed for the wrong reason. */ + hr = IDirect3DDevice8_TestCooperativeLevel(device); + if (hr == D3DERR_DEVICENOTRESET) + ok(hr == D3DERR_DEVICENOTRESET, "Got unexpected hr %#x.\n", hr); + else + todo_wine ok(hr == D3DERR_DEVICENOTRESET, "Got unexpected hr %#x.\n", hr); + expect_messages = focus_loss_messages; /* SetForegroundWindow is a poor replacement for the user pressing alt-tab or * manually changing the focus. It generates the same messages, but the task @@ -2361,7 +2443,7 @@ static void test_wndproc(void) * an inactive titlebar if reactivated with SetForegroundWindow. Reactivating * the device is difficult, see below. */ SetForegroundWindow(GetDesktopWindow()); - ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it.\n", + todo_wine ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it.\n", expect_messages->message, expect_messages->window); expect_messages = NULL; tmp = GetFocus(); @@ -2378,6 +2460,12 @@ static void test_wndproc(void) else ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); + ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); + ok(ret, "Failed to get display mode.\n"); + todo_wine ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth + && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpect screen size %ux%u.\n", + devmode.dmPelsWidth, devmode.dmPelsHeight); + /* I have to minimize and restore the focus window, otherwise native d3d9 fails * device::reset with D3DERR_DEVICELOST. This does not happen when the window * restore is triggered by the user. */ @@ -2392,6 +2480,12 @@ static void test_wndproc(void) hr = IDirect3DDevice8_TestCooperativeLevel(device); ok(hr == D3DERR_DEVICENOTRESET, "Got unexpected hr %#x.\n", hr); + ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); + ok(ret, "Failed to get display mode.\n"); + todo_wine ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth + && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpect screen size %ux%u.\n", + devmode.dmPelsWidth, devmode.dmPelsHeight); + /* Releasing a device in lost state breaks follow-up tests on native. */ hr = reset_device(device, &device_desc); ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); @@ -2400,6 +2494,10 @@ static void test_wndproc(void) ref = IDirect3DDevice8_Release(device); ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); + /* Fix up the mode until Wine's device release behavior is fixed. */ + change_ret = ChangeDisplaySettingsW(NULL, CDS_FULLSCREEN); + ok(change_ret == DISP_CHANGE_SUCCESSFUL, "Failed to change display mode, ret %#x.\n", change_ret); + proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC); ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", (LONG_PTR)test_proc, proc);
1
0
0
0
Stefan Dösinger : d3d9/tests: Test mode restoration on focus loss.
by Alexandre Julliard
19 Nov '14
19 Nov '14
Module: wine Branch: master Commit: 1851e2618bc9510de1ca184774d69e2c2231ecec URL:
http://source.winehq.org/git/wine.git/?a=commit;h=1851e2618bc9510de1ca18477…
Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 18 21:26:54 2014 +0100 d3d9/tests: Test mode restoration on focus loss. --- dlls/d3d9/tests/d3d9ex.c | 118 +++++++++++++++++++++++++++++++++++++++++++---- dlls/d3d9/tests/device.c | 112 ++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 214 insertions(+), 16 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=1851e2618bc9510de1ca1…
1
0
0
0
Stefan Dösinger : ddraw/tests: Test focus loss style changes.
by Alexandre Julliard
19 Nov '14
19 Nov '14
Module: wine Branch: master Commit: a0715873734bb4036caa300d64f3a2bd51e03474 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a0715873734bb4036caa300d6…
Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 18 21:26:53 2014 +0100 ddraw/tests: Test focus loss style changes. --- dlls/ddraw/tests/ddraw1.c | 37 ++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw2.c | 37 ++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw4.c | 37 ++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw7.c | 37 ++++++++++++++++++++++++++++++++++++- 4 files changed, 144 insertions(+), 4 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=a0715873734bb4036caa3…
1
0
0
0
Stefan Dösinger : ddraw/tests: Test messages on focus loss.
by Alexandre Julliard
19 Nov '14
19 Nov '14
Module: wine Branch: master Commit: be01a7637dd823b99d113d1e80e51ecc60e086fa URL:
http://source.winehq.org/git/wine.git/?a=commit;h=be01a7637dd823b99d113d1e8…
Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 18 21:26:52 2014 +0100 ddraw/tests: Test messages on focus loss. --- dlls/ddraw/tests/ddraw1.c | 100 +++++++++++++++++++++++++++++++------------- dlls/ddraw/tests/ddraw2.c | 104 ++++++++++++++++++++++++++++++++-------------- dlls/ddraw/tests/ddraw4.c | 104 ++++++++++++++++++++++++++++++++-------------- dlls/ddraw/tests/ddraw7.c | 104 ++++++++++++++++++++++++++++++++-------------- 4 files changed, 290 insertions(+), 122 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=be01a7637dd823b99d113…
1
0
0
0
Sebastian Lackner : server: Avoid reallocating region data when there is still enough space.
by Alexandre Julliard
19 Nov '14
19 Nov '14
Module: wine Branch: master Commit: 9d63e3f9496781d7717a445d52e7580f9397f5ee URL:
http://source.winehq.org/git/wine.git/?a=commit;h=9d63e3f9496781d7717a445d5…
Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Nov 19 05:45:50 2014 +0100 server: Avoid reallocating region data when there is still enough space. --- server/region.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/region.c b/server/region.c index 8b85c34..464c5ad 100644 --- a/server/region.c +++ b/server/region.c @@ -108,7 +108,7 @@ static const rectangle_t empty_rect; /* all-zero rectangle for empty regions */ /* add a rectangle to a region */ static inline rectangle_t *add_rect( struct region *reg ) { - if (reg->num_rects >= reg->size - 1) + if (reg->num_rects >= reg->size) { rectangle_t *new_rect = realloc( reg->rects, 2 * sizeof(rectangle_t) * reg->size ); if (!new_rect)
1
0
0
0
Jacek Caban : mshtml: Added IHTMLFrameBase::get_src implementation.
by Alexandre Julliard
18 Nov '14
18 Nov '14
Module: wine Branch: master Commit: 516ed8e71297e105ee71c7a48f88cd5e2803388f URL:
http://source.winehq.org/git/wine.git/?a=commit;h=516ed8e71297e105ee71c7a48…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 18 15:01:10 2014 +0100 mshtml: Added IHTMLFrameBase::get_src implementation. --- dlls/mshtml/htmlframebase.c | 18 ++++++++++++++++-- dlls/mshtml/tests/dom.c | 23 +++++++++++++++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlframebase.c b/dlls/mshtml/htmlframebase.c index e0c64f4..bd5c1de 100644 --- a/dlls/mshtml/htmlframebase.c +++ b/dlls/mshtml/htmlframebase.c @@ -157,8 +157,22 @@ static HRESULT WINAPI HTMLFrameBase_put_src(IHTMLFrameBase *iface, BSTR v) static HRESULT WINAPI HTMLFrameBase_get_src(IHTMLFrameBase *iface, BSTR *p) { HTMLFrameBase *This = impl_from_IHTMLFrameBase(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + if(!This->nsframe && !This->nsiframe) { + ERR("No attached frame object\n"); + return E_UNEXPECTED; + } + + nsAString_Init(&nsstr, NULL); + if(This->nsframe) + nsres = nsIDOMHTMLFrameElement_GetSrc(This->nsframe, &nsstr); + else + nsres = nsIDOMHTMLIFrameElement_GetSrc(This->nsiframe, &nsstr); + return return_nsstr(nsres, &nsstr, p); } static HRESULT WINAPI HTMLFrameBase_put_name(IHTMLFrameBase *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 978b79c..f0896f6 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5283,6 +5283,27 @@ static void _test_framebase_put_name(unsigned line, IHTMLElement *elem, const ch IHTMLFrameBase_Release(fbase); } +#define test_framebase_src(a,b) _test_framebase_src(__LINE__,a,b) +static void _test_framebase_src(unsigned line, IHTMLElement *elem, const char *src) +{ + BSTR str = (void*)0xdeadbeef; + IHTMLFrameBase *fbase; + HRESULT hres; + + hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLFrameBase, (void**)&fbase); + ok(hres == S_OK, "Could not get IHTMLFrameBase interface: 0x%08x\n", hres); + + hres = IHTMLFrameBase_get_src(fbase, &str); + ok_(__FILE__,line)(hres == S_OK, "IHTMLFrameBase_get_src failed: 0x%08x\n", hres); + if(src) + ok_(__FILE__,line)(!strcmp_wa(str, src), "src = %s, expected %s\n", wine_dbgstr_w(str), src); + else + ok_(__FILE__,line)(!str, "src = %s, expected NULL\n", wine_dbgstr_w(str)); + SysFreeString(str); + + IHTMLFrameBase_Release(fbase); +} + #define test_framebase_marginheight(a,b) _test_framebase_marginheight(__LINE__,a,b) static void _test_framebase_marginheight(unsigned line, IHTMLFrameBase *framebase, const char *exval) { @@ -6890,6 +6911,7 @@ static void test_iframe_elem(IHTMLElement *elem) set_iframe_width(elem, "150px"); set_iframe_width(elem, "70%"); test_iframe_width(elem, "70%"); + test_framebase_src(elem, "about:blank"); str = a2bstr("text/html"); V_VT(&errv) = VT_ERROR; @@ -8636,6 +8658,7 @@ static void test_frameset(IHTMLDocument2 *doc) test_framebase_put_name(elem, "frame name"); test_framebase_put_name(elem, NULL); test_framebase_put_name(elem, "nm1"); + test_framebase_src(elem, "about:blank"); IHTMLElement_Release(elem); /* get_name with no name attr */
1
0
0
0
Jacek Caban : mshtml: Added support for IHTMLFrameBase:: put_src call on detached element.
by Alexandre Julliard
18 Nov '14
18 Nov '14
Module: wine Branch: master Commit: 49c7277505edfad6488a05d66f593bb5e03f87d3 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=49c7277505edfad6488a05d66…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 18 15:00:58 2014 +0100 mshtml: Added support for IHTMLFrameBase::put_src call on detached element. --- dlls/mshtml/htmlframebase.c | 17 +++++++++++++++-- dlls/mshtml/tests/nav_test.html | 15 +++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlframebase.c b/dlls/mshtml/htmlframebase.c index 9808379..e0c64f4 100644 --- a/dlls/mshtml/htmlframebase.c +++ b/dlls/mshtml/htmlframebase.c @@ -134,8 +134,21 @@ static HRESULT WINAPI HTMLFrameBase_put_src(IHTMLFrameBase *iface, BSTR v) TRACE("(%p)->(%s)\n", This, debugstr_w(v)); if(!This->content_window || !This->element.node.doc || !This->element.node.doc->basedoc.window) { - FIXME("detached element\n"); - return E_FAIL; + nsAString nsstr; + nsresult nsres; + + nsAString_InitDepend(&nsstr, v); + if(This->nsframe) + nsres = nsIDOMHTMLFrameElement_SetSrc(This->nsframe, &nsstr); + else + nsres = nsIDOMHTMLIFrameElement_SetSrc(This->nsiframe, &nsstr); + nsAString_Finish(&nsstr); + if(NS_FAILED(nsres)) { + ERR("SetSrc failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } return navigate_url(This->content_window, v, This->element.node.doc->basedoc.window->uri, BINDING_NAVIGATED); diff --git a/dlls/mshtml/tests/nav_test.html b/dlls/mshtml/tests/nav_test.html index 536b238..11c4c0c 100644 --- a/dlls/mshtml/tests/nav_test.html +++ b/dlls/mshtml/tests/nav_test.html @@ -43,9 +43,24 @@ function window_navigate_test() { iframe.contentWindow.navigate("about:blank"); } +function detached_src_test() { + var iframe = document.createElement("iframe"); + var onload_called = false; + + iframe.onload = function() { + onload_called = true; + next_test(); + } + + iframe.src = "blank.html"; + document.body.appendChild(iframe); + ok(onload_called === false, "called onload too early?"); +} + var tests = [ nav_back_test, window_navigate_test, + detached_src_test, function() { external.reportSuccess(); } ];
1
0
0
0
Jacek Caban : mshtml: Added IHTMLStyleSheet::cssText tests.
by Alexandre Julliard
18 Nov '14
18 Nov '14
Module: wine Branch: master Commit: 90017fb3d80898c7b53520c96182f7a6bb590db8 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=90017fb3d80898c7b53520c96…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 18 15:04:17 2014 +0100 mshtml: Added IHTMLStyleSheet::cssText tests. --- dlls/mshtml/tests/dom.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 61 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 39c3a7d..978b79c 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -478,6 +478,20 @@ static int strcmp_wa(LPCWSTR strw, const char *stra) return lstrcmpA(stra, buf); } +static BOOL is_prefix_wa(const WCHAR *strw, const char *prefix) +{ + int len, prefix_len; + CHAR buf[512]; + + len = WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), NULL, NULL)-1; + prefix_len = lstrlenA(prefix); + if(len < prefix_len) + return FALSE; + + buf[prefix_len] = 0; + return !lstrcmpA(buf, prefix); +} + static BSTR a2bstr(const char *str) { BSTR ret; @@ -2155,8 +2169,8 @@ static void _test_range_paste_html(unsigned line, IHTMLTxtRange *range, const ch HRESULT hres; hres = IHTMLTxtRange_pasteHTML(range, str); - ok_(__FILE__,line)(hres == S_OK, "pasteHTML failed: %08x\n", hres); - SysFreeString(str); + ok_(__FILE__,line)(hres == S_OK, "pasteHTML failed: %08x\n", hres); + SysFreeString(str); } #define test_range_parent(r,t) _test_range_parent(__LINE__,r,t) @@ -6911,6 +6925,43 @@ static void test_iframe_elem(IHTMLElement *elem) IHTMLDocument2_Release(content_doc); } +#define test_stylesheet_csstext(a,b,c) _test_stylesheet_csstext(__LINE__,a,b,c) +static void _test_stylesheet_csstext(unsigned line, IHTMLStyleSheet *stylesheet, const char *exstr, BOOL is_todo) +{ + BSTR str; + HRESULT hres; + + hres = IHTMLStyleSheet_get_cssText(stylesheet, &str); + ok_(__FILE__,line)(hres == S_OK, "get_cssText failed: %08x\n", hres); + if(!is_todo) { + if(exstr) + ok_(__FILE__,line)(is_prefix_wa(str, exstr), "cssText = %s\n", wine_dbgstr_w(str)); + else + ok_(__FILE__,line)(!str, "cssText = %s\n", wine_dbgstr_w(str)); + }else todo_wine { + if(exstr) + ok_(__FILE__,line)(is_prefix_wa(str, exstr), "cssText = %s\n", wine_dbgstr_w(str)); + else + ok_(__FILE__,line)(!str, "cssText = %s\n", wine_dbgstr_w(str)); + } + + SysFreeString(str); +} + +#define set_stylesheet_csstext(a,b,c) _set_stylesheet_csstext(__LINE__,a,b,c) +static void _set_stylesheet_csstext(unsigned line, IHTMLStyleSheet *stylesheet, const char *csstext, BOOL is_todo) +{ + BSTR str = a2bstr(csstext); + HRESULT hres; + + hres = IHTMLStyleSheet_put_cssText(stylesheet, str); + if(!is_todo) + ok_(__FILE__,line)(hres == S_OK, "put_cssText failed: %08x\n", hres); + else + todo_wine ok_(__FILE__,line)(hres == S_OK, "put_cssText failed: %08x\n", hres); + SysFreeString(str); +} + static void test_stylesheet(IDispatch *disp) { IHTMLStyleSheetRulesCollection *col = NULL; @@ -6936,6 +6987,14 @@ static void test_stylesheet(IDispatch *disp) ok(href == NULL, "got href != NULL\n"); SysFreeString(href); + test_stylesheet_csstext(stylesheet, ".body {", FALSE); + set_stylesheet_csstext(stylesheet, ".div { margin-right: 1px; }\n.body { margin-right: 2px; }", TRUE); + test_stylesheet_csstext(stylesheet, ".div {", TRUE); + set_stylesheet_csstext(stylesheet, "", FALSE); + test_stylesheet_csstext(stylesheet, NULL, FALSE); + set_stylesheet_csstext(stylesheet, ".div { margin-right: 1px; }", FALSE); + test_stylesheet_csstext(stylesheet, ".div {", FALSE); + IHTMLStyleSheet_Release(stylesheet); }
1
0
0
0
Jacek Caban : mshtml: Added IHTMLStyleSheet:: cssText property partial implementation.
by Alexandre Julliard
18 Nov '14
18 Nov '14
Module: wine Branch: master Commit: cc8d9f238d701b6f69d28d321f0bb9f39557e2a1 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=cc8d9f238d701b6f69d28d321…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 18 15:03:01 2014 +0100 mshtml: Added IHTMLStyleSheet::cssText property partial implementation. --- dlls/mshtml/htmlstylesheet.c | 64 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 60 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c index 6480975..d2960d2 100644 --- a/dlls/mshtml/htmlstylesheet.c +++ b/dlls/mshtml/htmlstylesheet.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -629,15 +630,70 @@ static HRESULT WINAPI HTMLStyleSheet_get_media(IHTMLStyleSheet *iface, BSTR *p) static HRESULT WINAPI HTMLStyleSheet_put_cssText(IHTMLStyleSheet *iface, BSTR v) { HTMLStyleSheet *This = impl_from_IHTMLStyleSheet(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + do { + nsres = nsIDOMCSSStyleSheet_DeleteRule(This->nsstylesheet, 0); + }while(NS_SUCCEEDED(nsres)); + + if(v && *v) { + nsAString nsstr; + UINT32 idx; + + /* FIXME: This won't work for multiple rules in the string. */ + nsAString_InitDepend(&nsstr, v); + nsres = nsIDOMCSSStyleSheet_InsertRule(This->nsstylesheet, &nsstr, 0, &idx); + nsAString_Finish(&nsstr); + if(NS_FAILED(nsres)) { + FIXME("InsertRule failed for string %s. Probably multiple rules passed.\n", debugstr_w(v)); + return E_FAIL; + } + } + + return S_OK; } static HRESULT WINAPI HTMLStyleSheet_get_cssText(IHTMLStyleSheet *iface, BSTR *p) { HTMLStyleSheet *This = impl_from_IHTMLStyleSheet(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMCSSRuleList *nslist = NULL; + nsIDOMCSSRule *nsrule; + nsAString nsstr; + UINT32 len; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMCSSStyleSheet_GetCssRules(This->nsstylesheet, &nslist); + if(NS_FAILED(nsres)) { + ERR("GetCssRules failed: %08x\n", nsres); + return E_FAIL; + } + + nsres = nsIDOMCSSRuleList_GetLength(nslist, &len); + assert(nsres == NS_OK); + + if(len) { + nsres = nsIDOMCSSRuleList_Item(nslist, 0, &nsrule); + if(NS_FAILED(nsres)) + ERR("Item failed: %08x\n", nsres); + } + + nsIDOMCSSRuleList_Release(nslist); + if(NS_FAILED(nsres)) + return E_FAIL; + + if(!len) { + *p = NULL; + return S_OK; + } + + nsAString_Init(&nsstr, NULL); + nsres = nsIDOMCSSRule_GetCssText(nsrule, &nsstr); + nsIDOMCSSRule_Release(nsrule); + return return_nsstr(nsres, &nsstr, p); } static HRESULT WINAPI HTMLStyleSheet_get_rules(IHTMLStyleSheet *iface,
1
0
0
0
← Newer
1
...
11
12
13
14
15
16
17
...
40
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
Results per page:
10
25
50
100
200