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
May 2020
----- 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
1 participants
743 discussions
Start a n
N
ew thread
Tag wine-5.8 : Alexandre Julliard : Release 5.8
by Alexandre Julliard
08 May '20
08 May '20
Module: wine Branch: refs/tags/wine-5.8 Tag: 09ebdfe73ebf3eeeb414054a39de169add168523 URL:
https://source.winehq.org/git/wine.git/?a=tag;h=09ebdfe73ebf3eeeb414054a39d…
Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 8 22:18:56 2020 +0200 Release 5.8
1
0
0
0
Alexandre Julliard : Release 5.8.
by Alexandre Julliard
08 May '20
08 May '20
Module: wine Branch: master Commit: bf1abbac0c93e46b6b037dbd7f975c8b2f951b2e URL:
https://source.winehq.org/git/wine.git/?a=commit;h=bf1abbac0c93e46b6b037dbd…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 8 22:18:56 2020 +0200 Release 5.8. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 970 ++++++++++++++++++++++++++++---------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 448 insertions(+), 543 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=bf1abbac0c93e46b6b03…
1
0
0
0
Zhiyi Zhang : dxgi/tests: Add more get swapchain containing output tests.
by Alexandre Julliard
08 May '20
08 May '20
Module: wine Branch: master Commit: c84c7a553d3ac6927565f4652f78edc8e8af093f URL:
https://source.winehq.org/git/wine.git/?a=commit;h=c84c7a553d3ac6927565f465…
Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu May 7 15:54:31 2020 +0800 dxgi/tests: Add more get swapchain containing output tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 251 +++++++++++++++++++++++++++++++------------------ 1 file changed, 161 insertions(+), 90 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=c84c7a553d3ac6927565…
1
0
0
0
Zhiyi Zhang : wined3d: Move device window to the correct output when changing swapchain state to full screen.
by Alexandre Julliard
08 May '20
08 May '20
Module: wine Branch: master Commit: e847b082296547376309f25d9947f2367f98a9ec URL:
https://source.winehq.org/git/wine.git/?a=commit;h=e847b082296547376309f25d…
Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu May 7 15:52:12 2020 +0800 wined3d: Move device window to the correct output when changing swapchain state to full screen. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 20 +++++++++++++++----- dlls/wined3d/swapchain.c | 38 +++++++++++++++++++++++++++++++------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 47 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e16bd84164..1711014c8d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4954,6 +4954,12 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, || swapchain_desc->backbuffer_height != current_desc->backbuffer_height; windowed = current_desc->windowed; + if (!(output = wined3d_swapchain_get_output(swapchain))) + { + ERR("Failed to get output from swapchain %p.\n", swapchain); + return E_FAIL; + } + if (!swapchain_desc->windowed != !windowed || swapchain->reapply_mode || mode || (!swapchain_desc->windowed && backbuffer_resized)) { @@ -4971,11 +4977,6 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, } } - if (!(output = wined3d_swapchain_get_output(swapchain))) - { - ERR("Failed to get output from swapchain %p.\n", swapchain); - return E_FAIL; - } if (FAILED(hr = wined3d_swapchain_state_set_fullscreen(&swapchain->state, swapchain_desc, output, mode))) return hr; @@ -4988,13 +4989,22 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, { DWORD style = swapchain_state->style; DWORD exstyle = swapchain_state->exstyle; + struct wined3d_output_desc output_desc; + /* If we're in fullscreen, and the mode wasn't changed, we have to get * the window back into the right position. Some applications * (Battlefield 2, Guild Wars) move it and then call Reset() to clean * up their mess. Guild Wars also loses the device during that. */ + if (FAILED(hr = wined3d_output_get_desc(output, &output_desc))) + { + ERR("Failed to get output description, hr %#x.\n", hr); + return hr; + } + swapchain_state->style = 0; swapchain_state->exstyle = 0; wined3d_swapchain_state_setup_fullscreen(swapchain_state, swapchain_state->device_window, + output_desc.desktop_rect.left, output_desc.desktop_rect.top, swapchain_desc->backbuffer_width, swapchain_desc->backbuffer_height); swapchain_state->style = style; swapchain_state->exstyle = exstyle; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 3071afb8ae..466bcd95ca 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -872,13 +872,14 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc const struct wined3d_swapchain_ops *swapchain_ops) { struct wined3d_resource_desc texture_desc; + struct wined3d_output_desc output_desc; struct wined3d_output *output; BOOL displaymode_set = FALSE; DWORD texture_flags = 0; + HRESULT hr = E_FAIL; RECT client_rect; unsigned int i; HWND window; - HRESULT hr; wined3d_mutex_lock(); @@ -933,8 +934,21 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc } else { - wined3d_swapchain_state_setup_fullscreen(&swapchain->state, - window, desc->backbuffer_width, desc->backbuffer_height); + if (!(output = wined3d_swapchain_get_output(swapchain))) + { + ERR("Failed to get output from swapchain %p.\n", swapchain); + goto err; + } + + if (FAILED(hr = wined3d_output_get_desc(output, &output_desc))) + { + ERR("Failed to get output description, hr %#x.\n", hr); + goto err; + } + + wined3d_swapchain_state_setup_fullscreen(&swapchain->state, window, + output_desc.desktop_rect.left, output_desc.desktop_rect.top, desc->backbuffer_width, + desc->backbuffer_height); } swapchain->state.desc = *desc; wined3d_swapchain_apply_sample_count_override(swapchain, swapchain->state.desc.backbuffer_format, @@ -1551,7 +1565,7 @@ static LONG fullscreen_exstyle(LONG exstyle) } HRESULT wined3d_swapchain_state_setup_fullscreen(struct wined3d_swapchain_state *state, - HWND window, unsigned int w, unsigned int h) + HWND window, int x, int y, int width, int height) { LONG style, exstyle; BOOL filter; @@ -1583,7 +1597,8 @@ HRESULT wined3d_swapchain_state_setup_fullscreen(struct wined3d_swapchain_state SetWindowLongW(window, GWL_STYLE, style); SetWindowLongW(window, GWL_EXSTYLE, exstyle); - SetWindowPos(window, HWND_TOPMOST, 0, 0, w, h, SWP_FRAMECHANGED | SWP_SHOWWINDOW | SWP_NOACTIVATE); + SetWindowPos(window, HWND_TOPMOST, x, y, width, height, + SWP_FRAMECHANGED | SWP_SHOWWINDOW | SWP_NOACTIVATE); wined3d_filter_messages(window, filter); @@ -1647,6 +1662,7 @@ HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_st const struct wined3d_display_mode *mode) { struct wined3d_display_mode actual_mode; + struct wined3d_output_desc output_desc; HRESULT hr; TRACE("state %p, swapchain_desc %p, output %p, mode %p.\n", @@ -1695,10 +1711,17 @@ HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_st unsigned int width = actual_mode.width; unsigned int height = actual_mode.height; + if (FAILED(hr = wined3d_output_get_desc(output, &output_desc))) + { + ERR("Failed to get output description, hr %#x.\n", hr); + return hr; + } + if (state->desc.windowed) { /* Switch from windowed to fullscreen */ - if (FAILED(hr = wined3d_swapchain_state_setup_fullscreen(state, state->device_window, width, height))) + if (FAILED(hr = wined3d_swapchain_state_setup_fullscreen(state, state->device_window, + output_desc.desktop_rect.left, output_desc.desktop_rect.top, width, height))) return hr; } else @@ -1708,7 +1731,8 @@ HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_st /* Fullscreen -> fullscreen mode change */ filter = wined3d_filter_messages(window, TRUE); - MoveWindow(window, 0, 0, width, height, TRUE); + MoveWindow(window, output_desc.desktop_rect.left, output_desc.desktop_rect.top, width, + height, TRUE); ShowWindow(window, SW_SHOW); wined3d_filter_messages(window, filter); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7a412d7a8e..0e20d1fc9b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4720,7 +4720,7 @@ struct wined3d_swapchain_state void wined3d_swapchain_state_restore_from_fullscreen(struct wined3d_swapchain_state *state, HWND window, const RECT *window_rect) DECLSPEC_HIDDEN; HRESULT wined3d_swapchain_state_setup_fullscreen(struct wined3d_swapchain_state *state, - HWND window, unsigned int w, unsigned int h) DECLSPEC_HIDDEN; + HWND window, int x, int y, int width, int height) DECLSPEC_HIDDEN; struct wined3d_swapchain_ops {
1
0
0
0
Zhiyi Zhang : wined3d: Release wined3d mutex if wined3d_swapchain_state_init() failed in wined3d_swapchain_init().
by Alexandre Julliard
08 May '20
08 May '20
Module: wine Branch: master Commit: 094c344f2783a578bc7fed4a61f891f0c7b1e7ac URL:
https://source.winehq.org/git/wine.git/?a=commit;h=094c344f2783a578bc7fed4a…
Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu May 7 15:51:56 2020 +0800 wined3d: Release wined3d mutex if wined3d_swapchain_state_init() failed in wined3d_swapchain_init(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index dd0419412a..3071afb8ae 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -895,7 +895,10 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc window = desc->device_window ? desc->device_window : device->create_parms.focus_window; if (FAILED(hr = wined3d_swapchain_state_init(&swapchain->state, desc, window, device->wined3d))) - return hr; + { + ERR("Failed to initialise swapchain state, hr %#x.\n", hr); + goto err; + } swapchain->swapchain_ops = swapchain_ops; swapchain->device = device;
1
0
0
0
Zhiyi Zhang : dxgi/tests: Add more default full screen swapchain target output tests.
by Alexandre Julliard
08 May '20
08 May '20
Module: wine Branch: master Commit: 3a93767da77fd1bf5c735f659a540b28b5a2e1e6 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=3a93767da77fd1bf5c735f65…
Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu May 7 15:51:03 2020 +0800 dxgi/tests: Add more default full screen swapchain target output tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 208 +++++++++++++++++++++++++++++++++---------------- 1 file changed, 139 insertions(+), 69 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=3a93767da77fd1bf5c73…
1
0
0
0
Jacek Caban : comdlg32: Improve error handling in get_config_key_string.
by Alexandre Julliard
08 May '20
08 May '20
Module: wine Branch: master Commit: a16b9ff58334e47a170170a339f2bbb3ae942a80 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=a16b9ff58334e47a170170a3…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 8 16:41:12 2020 +0200 comdlg32: Improve error handling in get_config_key_string. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/filedlg.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 6b79fcfc83..538358bd5f 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -250,11 +250,10 @@ static BOOL get_config_key_string(HKEY hkey, const WCHAR *name, WCHAR **value) DWORD type, size; WCHAR *str; - if (hkey && !RegQueryValueExW(hkey, name, 0, &type, NULL, &size)) - { - if (type != REG_SZ && type != REG_EXPAND_SZ) - return FALSE; - } + if (RegQueryValueExW(hkey, name, 0, &type, NULL, &size)) + return FALSE; + if (type != REG_SZ && type != REG_EXPAND_SZ) + return FALSE; str = heap_alloc(size); if (RegQueryValueExW(hkey, name, 0, &type, (BYTE *)str, &size))
1
0
0
0
Andrew Eikum : winmm/tests: Test using a device handle in wave{In,Out}GetDevCaps and wave{In,Out}Open.
by Alexandre Julliard
08 May '20
08 May '20
Module: wine Branch: master Commit: 0239026bf3da2bc5114ba60c7da8f7f54d30c0f5 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=0239026bf3da2bc5114ba60c…
Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri May 8 09:25:16 2020 -0500 winmm/tests: Test using a device handle in wave{In,Out}GetDevCaps and wave{In,Out}Open. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/capture.c | 17 ++++++++++++++++- dlls/winmm/tests/wave.c | 17 ++++++++++++++++- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/tests/capture.c b/dlls/winmm/tests/capture.c index 4290c358a9..f60b44b096 100644 --- a/dlls/winmm/tests/capture.c +++ b/dlls/winmm/tests/capture.c @@ -130,7 +130,7 @@ static void check_position(int device, HWAVEIN win, DWORD bytes, static void wave_in_test_deviceIn(int device, WAVEFORMATEX *pwfx, DWORD format, DWORD flags, WAVEINCAPSA *pcaps) { - HWAVEIN win; + HWAVEIN win, win2; HANDLE hevent = CreateEventW(NULL, FALSE, FALSE, NULL); WAVEHDR frag; MMRESULT rc; @@ -139,6 +139,7 @@ static void wave_in_test_deviceIn(int device, WAVEFORMATEX *pwfx, DWORD format, WORD nChannels = pwfx->nChannels; WORD wBitsPerSample = pwfx->wBitsPerSample; DWORD nSamplesPerSec = pwfx->nSamplesPerSec; + WAVEINCAPSW capsW; win=NULL; flags |= CALLBACK_EVENT; @@ -181,6 +182,20 @@ static void wave_in_test_deviceIn(int device, WAVEFORMATEX *pwfx, DWORD format, pwfx->nSamplesPerSec, pwfx->wBitsPerSample, pwfx->nChannels, nSamplesPerSec, wBitsPerSample, nChannels); + /* waveInGetDevCaps allows an open handle instead of a device id */ + rc=waveInGetDevCapsW(HandleToUlong(win),&capsW,sizeof(capsW)); + ok(rc==MMSYSERR_NOERROR, + "waveInGetDevCapsW(%s): MMSYSERR_NOERROR " + "expected, got %s\n",dev_name(device),wave_in_error(rc)); + + /* waveInOpen does not allow an open handle instead of a device id */ + rc=waveInOpen(&win2,HandleToUlong(win),pwfx,0,0,CALLBACK_NULL); + ok(rc==MMSYSERR_BADDEVICEID, + "waveInOpen(%s): MMSYSERR_BADDEVICEID " + "expected, got %s\n",dev_name(device),wave_in_error(rc)); + if(rc==MMSYSERR_NOERROR) + waveInClose(win2); + /* Check that the position is 0 at start */ check_position(device, win, 0, pwfx); diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index f9fc5c5aad..eec1ba2a03 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -599,9 +599,10 @@ static void wave_out_test_deviceOut(int device, double duration, int headers, in WAVEFORMATEX *pwfx, DWORD format, DWORD flags, WAVEOUTCAPSA *pcaps, BOOL interactive, BOOL sine, BOOL pause) { - HWAVEOUT wout; + HWAVEOUT wout, wout2; HANDLE hevent = CreateEventW(NULL, FALSE, FALSE, NULL); WAVEHDR *frags = 0; + WAVEOUTCAPSW capsW; MMRESULT rc; DWORD volume; WORD nChannels = pwfx->nChannels; @@ -705,6 +706,20 @@ static void wave_out_test_deviceOut(int device, double duration, int headers, in ok(has_volume ? rc==MMSYSERR_NOERROR : rc==MMSYSERR_NOTSUPPORTED, "waveOutGetVolume(%s): rc=%s\n",dev_name(device),wave_out_error(rc)); + /* waveOutGetDevCaps allows an open handle instead of a device id */ + rc=waveOutGetDevCapsW(HandleToUlong(wout),&capsW,sizeof(capsW)); + ok(rc==MMSYSERR_NOERROR, + "waveOutGetDevCapsW(%s): MMSYSERR_NOERROR " + "expected, got %s\n",dev_name(device),wave_out_error(rc)); + + /* waveOutOpen does not allow an open handle instead of a device id */ + rc=waveOutOpen(&wout2,HandleToUlong(wout),pwfx,0,0,CALLBACK_NULL); + ok(rc==MMSYSERR_BADDEVICEID, + "waveOutOpen(%s): MMSYSERR_BADDEVICEID " + "expected, got %s\n",dev_name(device),wave_out_error(rc)); + if(rc==MMSYSERR_NOERROR) + waveOutClose(wout2); + /* make sure fragment length is a multiple of block size */ frag_length = ((length / headers) / pwfx->nBlockAlign) * pwfx->nBlockAlign;
1
0
0
0
Andrew Eikum : winmm: Accept open handles in wave{In,Out}GetDevCaps.
by Alexandre Julliard
08 May '20
08 May '20
Module: wine Branch: master Commit: ae13a279e1994268638caae7043e08076facc1a2 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=ae13a279e1994268638caae7…
Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri May 8 08:45:57 2020 -0500 winmm: Accept open handles in wave{In,Out}GetDevCaps. Based on a patch by Changping Yu <dead.ash(a)hotmail.com>. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/waveform.c | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index b08768577b..39461743c4 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -2669,10 +2669,18 @@ UINT WINAPI waveOutGetDevCapsW(UINT_PTR uDeviceID, LPWAVEOUTCAPSW lpCaps, caps = &mapper_caps; }else{ - if(uDeviceID >= g_outmmdevices_count) - return MMSYSERR_BADDEVICEID; + if(uDeviceID >= g_outmmdevices_count){ + WINMM_Device *device = WINMM_GetDeviceFromHWAVE((HWAVE)uDeviceID); + + if(!WINMM_ValidateAndLock(device)) + return MMSYSERR_BADDEVICEID; + + caps = &device->parent->out_caps; - caps = &read_map(g_out_map, uDeviceID)->out_caps; + LeaveCriticalSection(&device->lock); + }else{ + caps = &read_map(g_out_map, uDeviceID)->out_caps; + } } memcpy(lpCaps, caps, min(uSize, sizeof(*lpCaps))); @@ -3336,10 +3344,18 @@ UINT WINAPI waveInGetDevCapsW(UINT_PTR uDeviceID, LPWAVEINCAPSW lpCaps, UINT uSi caps = &mapper_caps; }else{ - if(uDeviceID >= g_inmmdevices_count) - return MMSYSERR_BADDEVICEID; + if(uDeviceID >= g_inmmdevices_count){ + WINMM_Device *device = WINMM_GetDeviceFromHWAVE((HWAVE)uDeviceID); + + if(!WINMM_ValidateAndLock(device)) + return MMSYSERR_BADDEVICEID; + + caps = &device->parent->in_caps; - caps = &read_map(g_in_map, uDeviceID)->in_caps; + LeaveCriticalSection(&device->lock); + }else{ + caps = &read_map(g_in_map, uDeviceID)->in_caps; + } } memcpy(lpCaps, caps, min(uSize, sizeof(*lpCaps)));
1
0
0
0
Nikolay Sivov : qmgr: Update to IBackgroundCopyJob4.
by Alexandre Julliard
08 May '20
08 May '20
Module: wine Branch: master Commit: 60837d12a7c33ee634f1a8e6665f45d212896764 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=60837d12a7c33ee634f1a8e6…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 8 15:40:21 2020 +0300 qmgr: Update to IBackgroundCopyJob4. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qmgr/enum_jobs.c | 14 +- dlls/qmgr/file.c | 4 +- dlls/qmgr/job.c | 629 +++++++++++++++++++++++--------------------------- dlls/qmgr/qmgr.c | 10 +- dlls/qmgr/qmgr.h | 2 +- 5 files changed, 300 insertions(+), 359 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=60837d12a7c33ee634f1…
1
0
0
0
← Newer
1
...
54
55
56
57
58
59
60
...
75
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
63
64
65
66
67
68
69
70
71
72
73
74
75
Results per page:
10
25
50
100
200