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
October 2019
----- 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
614 discussions
Start a n
N
ew thread
Nikolay Sivov : dwrite: Update to IDWriteFontCollection3.
by Alexandre Julliard
08 Oct '19
08 Oct '19
Module: wine Branch: master Commit: 3360dfec40815779bc8a6500c80da3d9fe35782d URL:
https://source.winehq.org/git/wine.git/?a=commit;h=3360dfec40815779bc8a6500…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 8 13:04:34 2019 +0300 dwrite: Update to IDWriteFontCollection3. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 7 ++- dlls/dwrite/font.c | 147 +++++++++++++++++++++++++++++-------------- dlls/dwrite/main.c | 8 +-- dlls/dwrite/tests/font.c | 15 +++++ include/dwrite_3.idl | 2 +- 5 files changed, 125 insertions(+), 54 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=3360dfec40815779bc8a…
1
0
0
0
Nikolay Sivov : dwrite: Add a stub for IDWriteTextFormat3.
by Alexandre Julliard
08 Oct '19
08 Oct '19
Module: wine Branch: master Commit: 3afa0d6346358f303406179f835c940fff37e4bc URL:
https://source.winehq.org/git/wine.git/?a=commit;h=3afa0d6346358f303406179f…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 8 13:04:33 2019 +0300 dwrite: Add a stub for IDWriteTextFormat3. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 228 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 137 insertions(+), 91 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=3afa0d6346358f303406…
1
0
0
0
Nikolay Sivov : dwrite/tests: Remove test failing on RTL locales.
by Alexandre Julliard
08 Oct '19
08 Oct '19
Module: wine Branch: master Commit: 16c8b2569dca5f4ccb69e5fa5a9f961670cf99f5 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=16c8b2569dca5f4ccb69e5fa…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 8 13:04:32 2019 +0300 dwrite/tests: Remove test failing on RTL locales. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 2c90e31a85..b153bcbb69 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1702,14 +1702,6 @@ static const struct drawcall_entry draw_ltr_reordered_run_seq[] = { { DRAW_LAST_KIND } }; -static const struct drawcall_entry draw_rtl_reordered_run_seq[] = { - { DRAW_GLYPHRUN, {'1','2','3','-','5','2',0}, {'r','u',0}, 6, 2 }, - { DRAW_GLYPHRUN, {0x64a,0x64f,0x633,0x627,0x648,0x650,0x64a,0}, {'r','u',0}, 7, 1 }, - { DRAW_GLYPHRUN, {'7','1',0}, {'r','u',0}, 2, 2 }, - { DRAW_GLYPHRUN, {'.',0}, {'r','u',0}, 1, 1 }, - { DRAW_LAST_KIND } -}; - static void test_Draw(void) { static const WCHAR str3W[] = {'1','2','3','-','5','2',0x64a,0x64f,0x633,0x627,0x648,0x650, @@ -1916,14 +1908,6 @@ todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); ok_sequence(sequences, RENDERER_ID, draw_ltr_reordered_run_seq, "draw test 11", FALSE); - hr = IDWriteTextLayout_SetReadingDirection(layout, DWRITE_READING_DIRECTION_RIGHT_TO_LEFT); - ok(hr == S_OK, "Failed to set reading direction, hr %#x.\n", hr); - - flush_sequence(sequences, RENDERER_ID); - hr = IDWriteTextLayout_Draw(layout, &ctxt, &testrenderer, 0.0f, 0.0f); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok_sequence(sequences, RENDERER_ID, draw_rtl_reordered_run_seq, "draw test 12", FALSE); - IDWriteTextLayout_Release(layout); IDWriteTextFormat_Release(format);
1
0
0
0
Evgeny Litvinenko : ntdll: Solaris requires sys/regset.h.
by Alexandre Julliard
08 Oct '19
08 Oct '19
Module: wine Branch: master Commit: 893e9d1b72cb31212b07d3261d589a2b7d65ff7d URL:
https://source.winehq.org/git/wine.git/?a=commit;h=893e9d1b72cb31212b07d326…
Author: Evgeny Litvinenko <evgeny.v.litvinenko(a)gmail.com> Date: Sun Oct 6 23:18:18 2019 +0300 ntdll: Solaris requires sys/regset.h. Signed-off-by: Evgeny Litvinenko <evgeny.v.litvinenko(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 534b05c717..fd761246c5 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -272,8 +272,11 @@ typedef struct trapframe ucontext_t; #elif defined(__svr4__) || defined(_SCO_DS) || defined(__sun) -#ifdef _SCO_DS +#if defined(_SCO_DS) || defined(__sun) #include <sys/regset.h> +#endif + +#ifdef _SCO_DS #define gregs regs #endif
1
0
0
0
Alistair Leslie-Hughes : dinput/tests: Add checks for Acquire/Unacquire.
by Alexandre Julliard
08 Oct '19
08 Oct '19
Module: wine Branch: master Commit: 0555209757e842818c16c6868e73bf076daa349b URL:
https://source.winehq.org/git/wine.git/?a=commit;h=0555209757e842818c16c686…
Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Oct 7 22:56:06 2019 +0000 dinput/tests: Add checks for Acquire/Unacquire. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/mouse.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c index e4d24e8916..11da951d10 100644 --- a/dlls/dinput/tests/mouse.c +++ b/dlls/dinput/tests/mouse.c @@ -148,15 +148,20 @@ static void test_acquire(IDirectInputA *pDI, HWND hwnd) ok(hr == S_OK && cnt > 0, "GetDeviceData() failed: %08x cnt:%d\n", hr, cnt); mouse_event(MOUSEEVENTF_MOVE, 10, 10, 0, 0); - IDirectInputDevice_Unacquire(pMouse); + hr = IDirectInputDevice_Unacquire(pMouse); + ok(hr == S_OK, "Failed: %08x\n", hr); cnt = 1; hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state), &mouse_state, &cnt, 0); ok(hr == S_OK && cnt > 0, "GetDeviceData() failed: %08x cnt:%d\n", hr, cnt); - IDirectInputDevice_Acquire(pMouse); + hr = IDirectInputDevice_Acquire(pMouse); + ok(hr == S_OK, "Failed: %08x\n", hr); mouse_event(MOUSEEVENTF_MOVE, 10, 10, 0, 0); - IDirectInputDevice_Unacquire(pMouse); - IDirectInputDevice_Acquire(pMouse); + hr = IDirectInputDevice_Unacquire(pMouse); + ok(hr == S_OK, "Failed: %08x\n", hr); + + hr = IDirectInputDevice_Acquire(pMouse); + ok(hr == S_OK, "Failed: %08x\n", hr); cnt = 1; hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state), &mouse_state, &cnt, 0); ok(hr == S_OK && cnt > 0, "GetDeviceData() failed: %08x cnt:%d\n", hr, cnt);
1
0
0
0
Zebediah Figura : strmbase: Do not activate the window when changing its position.
by Alexandre Julliard
08 Oct '19
08 Oct '19
Module: wine Branch: master Commit: 47ec8ce9113d875b0d4ac1d4f68c3dfc890ef140 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=47ec8ce9113d875b0d4ac1d4…
Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Oct 7 18:55:46 2019 -0500 strmbase: Do not activate the window when changing its position. Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=10440
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 4 ++-- dlls/strmbase/window.c | 14 +++++++++----- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index f4c3f92e28..f1f901d164 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -1762,9 +1762,9 @@ static void test_video_window_position(IVideoWindow *window, HWND hwnd, HWND our ok(rect.right == 400, "Got window right %d.\n", rect.right); ok(rect.bottom == 600, "Got window bottom %d.\n", rect.bottom); - todo_wine ok(GetActiveWindow() == our_hwnd, "Got active window %p.\n", GetActiveWindow()); + ok(GetActiveWindow() == our_hwnd, "Got active window %p.\n", GetActiveWindow()); top_hwnd = get_top_window(); - todo_wine ok(top_hwnd == our_hwnd, "Got top window %p.\n", top_hwnd); + ok(top_hwnd == our_hwnd, "Got top window %p.\n", top_hwnd); } static void test_video_window_owner(IVideoWindow *window, HWND hwnd, HWND our_hwnd) diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index 446c389220..cb41aee2f4 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -462,7 +462,8 @@ HRESULT WINAPI BaseControlWindowImpl_put_Left(IVideoWindow *iface, LONG Left) TRACE("(%p/%p)->(%d)\n", This, iface, Left); GetWindowRect(This->baseWindow.hWnd, &WindowPos); - if (!SetWindowPos(This->baseWindow.hWnd, NULL, Left, WindowPos.top, 0, 0, SWP_NOZORDER|SWP_NOSIZE)) + if (!SetWindowPos(This->baseWindow.hWnd, NULL, Left, WindowPos.top, 0, 0, + SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOSIZE)) return E_FAIL; return S_OK; @@ -487,7 +488,8 @@ HRESULT WINAPI BaseControlWindowImpl_put_Width(IVideoWindow *iface, LONG Width) TRACE("(%p/%p)->(%d)\n", This, iface, Width); - if (!SetWindowPos(This->baseWindow.hWnd, NULL, 0, 0, Width, This->baseWindow.Height, SWP_NOZORDER|SWP_NOMOVE)) + if (!SetWindowPos(This->baseWindow.hWnd, NULL, 0, 0, Width, This->baseWindow.Height, + SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOMOVE)) return E_FAIL; This->baseWindow.Width = Width; @@ -514,7 +516,8 @@ HRESULT WINAPI BaseControlWindowImpl_put_Top(IVideoWindow *iface, LONG Top) TRACE("(%p/%p)->(%d)\n", This, iface, Top); GetWindowRect(This->baseWindow.hWnd, &WindowPos); - if (!SetWindowPos(This->baseWindow.hWnd, NULL, WindowPos.left, Top, 0, 0, SWP_NOZORDER|SWP_NOSIZE)) + if (!SetWindowPos(This->baseWindow.hWnd, NULL, WindowPos.left, Top, 0, 0, + SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOSIZE)) return E_FAIL; return S_OK; @@ -539,7 +542,8 @@ HRESULT WINAPI BaseControlWindowImpl_put_Height(IVideoWindow *iface, LONG Height TRACE("(%p/%p)->(%d)\n", This, iface, Height); - if (!SetWindowPos(This->baseWindow.hWnd, NULL, 0, 0, This->baseWindow.Width, Height, SWP_NOZORDER|SWP_NOMOVE)) + if (!SetWindowPos(This->baseWindow.hWnd, NULL, 0, 0, This->baseWindow.Width, + Height, SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOMOVE)) return E_FAIL; This->baseWindow.Height = Height; @@ -675,7 +679,7 @@ HRESULT WINAPI BaseControlWindowImpl_SetWindowPosition(IVideoWindow *iface, LONG TRACE("(%p/%p)->(%d, %d, %d, %d)\n", This, iface, Left, Top, Width, Height); - if (!SetWindowPos(This->baseWindow.hWnd, NULL, Left, Top, Width, Height, SWP_NOZORDER)) + if (!SetWindowPos(This->baseWindow.hWnd, NULL, Left, Top, Width, Height, SWP_NOACTIVATE | SWP_NOZORDER)) return E_FAIL; This->baseWindow.Width = Width;
1
0
0
0
Zebediah Figura : strmbase: Correctly implement IVideoWindow::put_Owner().
by Alexandre Julliard
08 Oct '19
08 Oct '19
Module: wine Branch: master Commit: 9b98246e82fabed674d04a7e637dd78ae0e8b3fd URL:
https://source.winehq.org/git/wine.git/?a=commit;h=9b98246e82fabed674d04a7e…
Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Oct 7 18:55:45 2019 -0500 strmbase: Correctly implement IVideoWindow::put_Owner(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 4 ++-- dlls/strmbase/window.c | 27 +++++++++++++-------------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index ae467ed71a..f4c3f92e28 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -1795,9 +1795,9 @@ static void test_video_window_owner(IVideoWindow *window, HWND hwnd, HWND our_hw parent = GetAncestor(hwnd, GA_PARENT); ok(parent == our_hwnd, "Got parent %p.\n", parent); style = GetWindowLongA(hwnd, GWL_STYLE); - todo_wine ok((style & WS_CHILD), "Got style %#x.\n", style); + ok((style & WS_CHILD), "Got style %#x.\n", style); - todo_wine ok(GetActiveWindow() == our_hwnd, "Got active window %p.\n", GetActiveWindow()); + ok(GetActiveWindow() == our_hwnd, "Got active window %p.\n", GetActiveWindow()); top_hwnd = get_top_window(); ok(top_hwnd == our_hwnd, "Got top window %p.\n", top_hwnd); diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index f280b323ab..446c389220 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -558,23 +558,22 @@ HRESULT WINAPI BaseControlWindowImpl_get_Height(IVideoWindow *iface, LONG *pHeig return S_OK; } -HRESULT WINAPI BaseControlWindowImpl_put_Owner(IVideoWindow *iface, OAHWND Owner) +HRESULT WINAPI BaseControlWindowImpl_put_Owner(IVideoWindow *iface, OAHWND owner) { - BaseControlWindow* This = impl_from_IVideoWindow(iface); + BaseControlWindow *window = impl_from_IVideoWindow(iface); + HWND hwnd = window->baseWindow.hWnd; - TRACE("(%p/%p)->(%08x)\n", This, iface, (DWORD) Owner); + TRACE("window %p, owner %#lx.\n", window, owner); - This->hwndOwner = (HWND)Owner; - SetParent(This->baseWindow.hWnd, This->hwndOwner); - if (This->baseWindow.WindowStyles & WS_CHILD) - { - LONG old = GetWindowLongW(This->baseWindow.hWnd, GWL_STYLE); - if (old != This->baseWindow.WindowStyles) - { - SetWindowLongW(This->baseWindow.hWnd, GWL_STYLE, This->baseWindow.WindowStyles); - SetWindowPos(This->baseWindow.hWnd,0,0,0,0,0,SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOZORDER); - } - } + /* Make sure we are marked as WS_CHILD before reparenting ourselves, so that + * we do not steal focus. LEGO Island depends on this. */ + + window->hwndOwner = (HWND)owner; + if (owner) + SetWindowLongPtrW(hwnd, GWL_STYLE, GetWindowLongPtrW(hwnd, GWL_STYLE) | WS_CHILD); + else + SetWindowLongPtrW(hwnd, GWL_STYLE, GetWindowLongPtrW(hwnd, GWL_STYLE) & ~WS_CHILD); + SetParent(hwnd, (HWND)owner); return S_OK; }
1
0
0
0
Zebediah Figura : strmbase: IVideoWindow::SetWindowForeground takes OATRUE, not TRUE.
by Alexandre Julliard
08 Oct '19
08 Oct '19
Module: wine Branch: master Commit: ed1c18e8c98b551b9b409fddb512074b1687f34f URL:
https://source.winehq.org/git/wine.git/?a=commit;h=ed1c18e8c98b551b9b409fdd…
Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Oct 7 18:55:44 2019 -0500 strmbase: IVideoWindow::SetWindowForeground takes OATRUE, not TRUE. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 18 +++++++++--------- dlls/strmbase/window.c | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index cd8fa4d511..ae467ed71a 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -1609,17 +1609,17 @@ static void test_video_window_state(IVideoWindow *window, HWND hwnd, HWND our_hw hr = IVideoWindow_put_WindowState(window, SW_SHOWNA); ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IVideoWindow_SetWindowForeground(window, TRUE); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + SetWindowPos(our_hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE); hr = IVideoWindow_SetWindowForeground(window, OATRUE); - todo_wine - { - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(GetActiveWindow() == hwnd, "Got active window %p.\n", GetActiveWindow()); - ok(GetFocus() == hwnd, "Got focus window %p.\n", GetFocus()); - ok(GetForegroundWindow() == hwnd, "Got foreground window %p.\n", GetForegroundWindow()); - top = get_top_window(); - ok(top == hwnd, "Got top window %p.\n", top); - } + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(GetActiveWindow() == hwnd, "Got active window %p.\n", GetActiveWindow()); + ok(GetFocus() == hwnd, "Got focus window %p.\n", GetFocus()); + ok(GetForegroundWindow() == hwnd, "Got foreground window %p.\n", GetForegroundWindow()); + top = get_top_window(); + todo_wine ok(top == hwnd, "Got top window %p.\n", top); hr = IVideoWindow_SetWindowForeground(window, OAFALSE); ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index 4ecc81c24e..f280b323ab 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -652,7 +652,7 @@ HRESULT WINAPI BaseControlWindowImpl_SetWindowForeground(IVideoWindow *iface, LO TRACE("(%p/%p)->(%d)\n", This, iface, Focus); - if ((Focus != FALSE) && (Focus != TRUE)) + if ((Focus != OAFALSE) && (Focus != OATRUE)) return E_INVALIDARG; hr = IPin_ConnectedTo(&This->pPin->IPin_iface, &pPin);
1
0
0
0
Zebediah Figura : strmbase: Fix implementation of IVideoWindow::get_Caption().
by Alexandre Julliard
08 Oct '19
08 Oct '19
Module: wine Branch: master Commit: 058926db97d657b3b2907e12a3cc8906c524d82e URL:
https://source.winehq.org/git/wine.git/?a=commit;h=058926db97d657b3b2907e12…
Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Oct 7 18:55:42 2019 -0500 strmbase: Fix implementation of IVideoWindow::get_Caption(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/window.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index b7c0bae47b..4ecc81c24e 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -297,15 +297,24 @@ HRESULT WINAPI BaseControlWindowImpl_put_Caption(IVideoWindow *iface, BSTR strCa return S_OK; } -HRESULT WINAPI BaseControlWindowImpl_get_Caption(IVideoWindow *iface, BSTR *strCaption) +HRESULT WINAPI BaseControlWindowImpl_get_Caption(IVideoWindow *iface, BSTR *caption) { - BaseControlWindow* This = impl_from_IVideoWindow(iface); + BaseControlWindow *window = impl_from_IVideoWindow(iface); + WCHAR *str; + int len; - TRACE("(%p/%p)->(%p)\n", This, iface, strCaption); + TRACE("window %p, caption %p.\n", window, caption); - GetWindowTextW(This->baseWindow.hWnd, (LPWSTR)strCaption, 100); + *caption = NULL; - return S_OK; + len = GetWindowTextLengthW(window->baseWindow.hWnd) + 1; + if (!(str = heap_alloc(len * sizeof(WCHAR)))) + return E_OUTOFMEMORY; + + GetWindowTextW(window->baseWindow.hWnd, str, len); + *caption = SysAllocString(str); + heap_free(str); + return *caption ? S_OK : E_OUTOFMEMORY; } HRESULT WINAPI BaseControlWindowImpl_put_WindowStyle(IVideoWindow *iface, LONG WindowStyle)
1
0
0
0
Zebediah Figura : quartz/tests: Add tests for IVideoWindow on the video renderer.
by Alexandre Julliard
08 Oct '19
08 Oct '19
Module: wine Branch: master Commit: 9cb8fd4e6b93dedb006846eeb2a149003596f272 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=9cb8fd4e6b93dedb006846ee…
Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Oct 7 18:55:43 2019 -0500 quartz/tests: Add tests for IVideoWindow on the video renderer. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 735 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 735 insertions(+) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=9cb8fd4e6b93dedb0068…
1
0
0
0
← Newer
1
...
41
42
43
44
45
46
47
...
62
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
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
Results per page:
10
25
50
100
200