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 2022
----- 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
1171 discussions
Start a n
N
ew thread
Alex Henrie : include: Add freopen_s.
by Alexandre Julliard
03 Nov '22
03 Nov '22
Module: wine Branch: master Commit: d24cbd11653166202fdb5fef5546ac1c48d798fd URL:
https://gitlab.winehq.org/wine/wine/-/commit/d24cbd11653166202fdb5fef5546ac…
Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 2 22:08:37 2022 -0600 include: Add freopen_s. Needed to compile Tera Term. --- include/msvcrt/stdio.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index ce198542285..745257ea5cc 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -121,6 +121,7 @@ _ACRTIMP int __cdecl fputs(const char*,FILE*); _ACRTIMP size_t __cdecl fread(void*,size_t,size_t,FILE*); _ACRTIMP size_t __cdecl fread_s(void*,size_t,size_t,size_t,FILE*); _ACRTIMP FILE* __cdecl freopen(const char*,const char*,FILE*); +_ACRTIMP errno_t __cdecl freopen_s(FILE**,const char*,const char*,FILE*); _ACRTIMP int __cdecl fseek(FILE*,__msvcrt_long,int); _ACRTIMP int __cdecl _fseeki64(FILE*,__int64,int); _ACRTIMP int __cdecl fsetpos(FILE*,fpos_t*);
1
0
0
0
Alex Henrie : msvcrt: Change return type of freopen_s to errno_t.
by Alexandre Julliard
03 Nov '22
03 Nov '22
Module: wine Branch: master Commit: 4db1aeb5502b9e7f58799180bd43b658f62c111c URL:
https://gitlab.winehq.org/wine/wine/-/commit/4db1aeb5502b9e7f58799180bd43b6…
Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 2 22:07:50 2022 -0600 msvcrt: Change return type of freopen_s to errno_t. --- dlls/msvcrt/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index affa2fbdd43..0874d52fbc4 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -4650,7 +4650,7 @@ FILE* CDECL freopen(const char *path, const char *mode, FILE* file) /********************************************************************* * freopen_s (MSVCRT.@) */ -int CDECL freopen_s(FILE** pFile, +errno_t CDECL freopen_s(FILE** pFile, const char *path, const char *mode, FILE* file) { if (!MSVCRT_CHECK_PMT(pFile != NULL)) return EINVAL;
1
0
0
0
Alex Henrie : include: Add _splitpath_s.
by Alexandre Julliard
03 Nov '22
03 Nov '22
Module: wine Branch: master Commit: 01777127cf6fa9004ab74964cb8aec9b7b676e4e URL:
https://gitlab.winehq.org/wine/wine/-/commit/01777127cf6fa9004ab74964cb8aec…
Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 2 21:47:57 2022 -0600 include: Add _splitpath_s. Needed to compile Tera Term. --- include/msvcrt/stdlib.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index c608344b115..7c2d7d7f9ad 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -190,6 +190,7 @@ _ACRTIMP int __cdecl _set_error_mode(int); _ACRTIMP void __cdecl _seterrormode(int); _ACRTIMP void __cdecl _sleep(__msvcrt_ulong); _ACRTIMP void __cdecl _splitpath(const char*,char*,char*,char*,char*); +_ACRTIMP errno_t __cdecl _splitpath_s(const char*,char*,size_t,char*,size_t,char*,size_t,char*,size_t); _ACRTIMP void __cdecl _swab(char*,char*,int); _ACRTIMP char* __cdecl _ui64toa(unsigned __int64,char*,int); _ACRTIMP errno_t __cdecl _ui64toa_s(unsigned __int64,char*,size_t,int);
1
0
0
0
Alex Henrie : msvcrt: Change return type of _splitpath_s to errno_t.
by Alexandre Julliard
03 Nov '22
03 Nov '22
Module: wine Branch: master Commit: 52066ef2487f36e0fabe89dba00ef433506b802b URL:
https://gitlab.winehq.org/wine/wine/-/commit/52066ef2487f36e0fabe89dba00ef4…
Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 2 21:46:42 2022 -0600 msvcrt: Change return type of _splitpath_s to errno_t. --- dlls/msvcrt/dir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index 91aaaf5ff18..72c8018a74b 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -1062,7 +1062,7 @@ int CDECL _wrmdir(const wchar_t * dir) /****************************************************************** * _splitpath_s (MSVCRT.@) */ -int CDECL _splitpath_s(const char* inpath, +errno_t CDECL _splitpath_s(const char* inpath, char* drive, size_t sz_drive, char* dir, size_t sz_dir, char* fname, size_t sz_fname,
1
0
0
0
Rémi Bernon : win32u: Read mode from the registry if GetCurrentDisplaySettings fails.
by Alexandre Julliard
03 Nov '22
03 Nov '22
Module: wine Branch: master Commit: 38bef31fb6aaf13ca78a92a0005d4f20e3a11826 URL:
https://gitlab.winehq.org/wine/wine/-/commit/38bef31fb6aaf13ca78a92a0005d4f…
Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 20 11:12:55 2022 +0200 win32u: Read mode from the registry if GetCurrentDisplaySettings fails. --- dlls/win32u/driver.c | 2 +- dlls/win32u/sysparams.c | 24 ++++++++++++++++++++++-- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index e7dda4a5cf4..557d555d673 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -761,7 +761,7 @@ static LONG nulldrv_ChangeDisplaySettings( LPDEVMODEW displays, LPCWSTR primary_ static BOOL nulldrv_GetCurrentDisplaySettings( LPCWSTR name, BOOL is_primary, LPDEVMODEW mode ) { - return FALSE; + return FALSE; /* use default implementation */ } static BOOL nulldrv_UpdateDisplayDevices( const struct gdi_device_manager *manager, BOOL force, void *param ) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 63661e0e3aa..376487b6a63 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -506,7 +506,26 @@ static BOOL adapter_set_registry_settings( const struct adapter *adapter, const static BOOL adapter_get_current_settings( const struct adapter *adapter, DEVMODEW *mode ) { BOOL is_primary = !!(adapter->dev.state_flags & DISPLAY_DEVICE_PRIMARY_DEVICE); - return user_driver->pGetCurrentDisplaySettings( adapter->dev.device_name, is_primary, mode ); + HANDLE mutex; + HKEY hkey; + BOOL ret; + + if ((ret = user_driver->pGetCurrentDisplaySettings( adapter->dev.device_name, is_primary, mode ))) return TRUE; + + /* default implementation: read current display settings from the registry. */ + + mutex = get_display_device_init_mutex(); + + if (!config_key && !(config_key = reg_open_key( NULL, config_keyW, sizeof(config_keyW) ))) ret = FALSE; + else if (!(hkey = reg_open_key( config_key, adapter->config_key, lstrlenW( adapter->config_key ) * sizeof(WCHAR) ))) ret = FALSE; + else + { + ret = read_adapter_mode( hkey, ENUM_CURRENT_SETTINGS, mode ); + NtClose( hkey ); + } + + release_display_device_init_mutex( mutex ); + return ret; } static BOOL adapter_set_current_settings( const struct adapter *adapter, const DEVMODEW *mode ) @@ -2511,7 +2530,8 @@ static LONG apply_display_settings( const WCHAR *devname, const DEVMODEW *devmod if ((adapter = find_adapter( NULL ))) { DEVMODEW current_mode = {.dmSize = sizeof(DEVMODEW)}; - adapter_get_current_settings( adapter, ¤t_mode ); + + if (!adapter_get_current_settings( adapter, ¤t_mode )) WARN( "Failed to get primary adapter current display settings.\n" ); adapter_release( adapter ); send_notify_message( NtUserGetDesktopWindow(), WM_DISPLAYCHANGE, current_mode.dmBitsPerPel,
1
0
0
0
Rémi Bernon : win32u: Write display settings to the registry in apply_display_settings.
by Alexandre Julliard
03 Nov '22
03 Nov '22
Module: wine Branch: master Commit: 6ecffdad774da98b4fa5c47e9ba4b72b37d57049 URL:
https://gitlab.winehq.org/wine/wine/-/commit/6ecffdad774da98b4fa5c47e9ba4b7…
Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 14 11:52:50 2022 +0200 win32u: Write display settings to the registry in apply_display_settings. As a fallback if ChangeDisplaySettings returns E_NOTIMPL. --- dlls/win32u/driver.c | 2 +- dlls/win32u/sysparams.c | 53 +++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 50 insertions(+), 5 deletions(-) diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index f8aa15c46ce..e7dda4a5cf4 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -756,7 +756,7 @@ static void nulldrv_UpdateClipboard(void) static LONG nulldrv_ChangeDisplaySettings( LPDEVMODEW displays, LPCWSTR primary_name, HWND hwnd, DWORD flags, LPVOID lparam ) { - return DISP_CHANGE_FAILED; + return E_NOTIMPL; /* use default implementation */ } static BOOL nulldrv_GetCurrentDisplaySettings( LPCWSTR name, BOOL is_primary, LPDEVMODEW mode ) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 990d9e090fb..63661e0e3aa 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -509,6 +509,26 @@ static BOOL adapter_get_current_settings( const struct adapter *adapter, DEVMODE return user_driver->pGetCurrentDisplaySettings( adapter->dev.device_name, is_primary, mode ); } +static BOOL adapter_set_current_settings( const struct adapter *adapter, const DEVMODEW *mode ) +{ + HANDLE mutex; + HKEY hkey; + BOOL ret; + + mutex = get_display_device_init_mutex(); + + if (!config_key && !(config_key = reg_open_key( NULL, config_keyW, sizeof(config_keyW) ))) ret = FALSE; + if (!(hkey = reg_open_key( config_key, adapter->config_key, lstrlenW( adapter->config_key ) * sizeof(WCHAR) ))) ret = FALSE; + else + { + ret = write_adapter_mode( hkey, ENUM_CURRENT_SETTINGS, mode ); + NtClose( hkey ); + } + + release_display_device_init_mutex( mutex ); + return ret; +} + static int mode_compare(const void *p1, const void *p2) { BOOL a_interlaced, b_interlaced, a_stretched, b_stretched; @@ -1537,6 +1557,9 @@ static BOOL update_display_cache( BOOL force ) if (!user_driver->pUpdateDisplayDevices( &device_manager, force, &ctx ) && force) { + /* default implementation: expose an adapter and a monitor with a few standard modes, + * and read / write current display settings from / to the registry. + */ static const DEVMODEW modes[] = { { .dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY, @@ -1560,13 +1583,24 @@ static BOOL update_display_cache( BOOL force ) struct gdi_monitor monitor = { .state_flags = DISPLAY_DEVICE_ACTIVE | DISPLAY_DEVICE_ATTACHED, - .rc_monitor = {.right = modes[2].dmPelsWidth, .bottom = modes[2].dmPelsHeight}, - .rc_work = {.right = modes[2].dmPelsWidth, .bottom = modes[2].dmPelsHeight}, }; + DEVMODEW mode = {{0}}; UINT i; add_gpu( &gpu, &ctx ); add_adapter( &adapter, &ctx ); + + if (!read_adapter_mode( ctx.adapter_key, ENUM_CURRENT_SETTINGS, &mode )) + { + mode = modes[2]; + mode.dmFields |= DM_POSITION; + write_adapter_mode( ctx.adapter_key, ENUM_CURRENT_SETTINGS, &mode ); + } + monitor.rc_monitor.right = mode.dmPelsWidth; + monitor.rc_monitor.bottom = mode.dmPelsHeight; + monitor.rc_work.right = mode.dmPelsWidth; + monitor.rc_work.bottom = mode.dmPelsHeight; + add_monitor( &monitor, &ctx ); for (i = 0; i < ARRAY_SIZE(modes); ++i) add_mode( modes + i, &ctx ); } @@ -2430,8 +2464,8 @@ static LONG apply_display_settings( const WCHAR *devname, const DEVMODEW *devmod { WCHAR primary_name[CCHDEVICENAME]; struct display_device *primary; + DEVMODEW *mode, *displays; struct adapter *adapter; - DEVMODEW *displays; LONG ret; if (!lock_display_devices()) return DISP_CHANGE_FAILED; @@ -2454,7 +2488,18 @@ static LONG apply_display_settings( const WCHAR *devname, const DEVMODEW *devmod if (!(primary = find_adapter_device_by_id( 0 ))) primary_name[0] = 0; else wcscpy( primary_name, primary->device_name ); - ret = user_driver->pChangeDisplaySettings( displays, primary_name, hwnd, flags, lparam ); + if ((ret = user_driver->pChangeDisplaySettings( displays, primary_name, hwnd, flags, lparam )) == E_NOTIMPL) + { + /* default implementation: write current display settings to the registry. */ + mode = displays; + LIST_FOR_EACH_ENTRY( adapter, &adapters, struct adapter, entry ) + { + if (!adapter_set_current_settings( adapter, mode )) + WARN( "Failed to write adapter %s current mode.\n", debugstr_w(adapter->dev.device_name) ); + mode = NEXT_DEVMODEW(mode); + } + ret = DISP_CHANGE_SUCCESSFUL; + } unlock_display_devices(); free( displays );
1
0
0
0
Rémi Bernon : win32u: Lock display devices while applying display settings.
by Alexandre Julliard
03 Nov '22
03 Nov '22
Module: wine Branch: master Commit: 3468e96d3b3f6fd34eb346cd592e83b73459fb2f URL:
https://gitlab.winehq.org/wine/wine/-/commit/3468e96d3b3f6fd34eb346cd592e83…
Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 27 18:26:39 2022 +0200 win32u: Lock display devices while applying display settings. --- dlls/win32u/sysparams.c | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index f7bca4d9e73..990d9e090fb 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -2211,10 +2211,8 @@ static DEVMODEW *get_display_settings( const WCHAR *devname, const DEVMODEW *dev struct adapter *adapter; BOOL ret; - if (!lock_display_devices()) return NULL; - /* allocate an extra mode for easier iteration */ - if (!(displays = calloc( list_count( &adapters ) + 1, sizeof(DEVMODEW) ))) goto done; + if (!(displays = calloc( list_count( &adapters ) + 1, sizeof(DEVMODEW) ))) return NULL; mode = displays; LIST_FOR_EACH_ENTRY( adapter, &adapters, struct adapter, entry ) @@ -2226,20 +2224,18 @@ static DEVMODEW *get_display_settings( const WCHAR *devname, const DEVMODEW *dev { if (!devname) ret = adapter_get_registry_settings( adapter, mode ); else ret = adapter_get_current_settings( adapter, mode ); - if (!ret) goto done; + if (!ret) + { + free( displays ); + return NULL; + } } lstrcpyW( mode->dmDeviceName, adapter->dev.device_name ); mode = NEXT_DEVMODEW(mode); } - unlock_display_devices(); return displays; - -done: - unlock_display_devices(); - free( displays ); - return NULL; } static INT offset_length( POINT offset ) @@ -2433,15 +2429,21 @@ static LONG apply_display_settings( const WCHAR *devname, const DEVMODEW *devmod HWND hwnd, DWORD flags, void *lparam ) { WCHAR primary_name[CCHDEVICENAME]; + struct display_device *primary; struct adapter *adapter; DEVMODEW *displays; LONG ret; - displays = get_display_settings( devname, devmode ); - if (!displays) return DISP_CHANGE_FAILED; + if (!lock_display_devices()) return DISP_CHANGE_FAILED; + if (!(displays = get_display_settings( devname, devmode ))) + { + unlock_display_devices(); + return DISP_CHANGE_FAILED; + } if (all_detached_settings( displays )) { + unlock_display_devices(); WARN( "Detaching all modes is not permitted.\n" ); free( displays ); return DISP_CHANGE_SUCCESSFUL; @@ -2449,14 +2451,11 @@ static LONG apply_display_settings( const WCHAR *devname, const DEVMODEW *devmod place_all_displays( displays ); - if (!(adapter = find_adapter( NULL ))) primary_name[0] = 0; - else - { - wcscpy( primary_name, adapter->dev.device_name ); - adapter_release( adapter ); - } + if (!(primary = find_adapter_device_by_id( 0 ))) primary_name[0] = 0; + else wcscpy( primary_name, primary->device_name ); ret = user_driver->pChangeDisplaySettings( displays, primary_name, hwnd, flags, lparam ); + unlock_display_devices(); free( displays ); if (ret) return ret;
1
0
0
0
Nikolay Sivov : mf/session: Add support for MESessionScrubSampleComplete event.
by Alexandre Julliard
03 Nov '22
03 Nov '22
Module: wine Branch: master Commit: de1d2223c4ec4baa1b5e25f21593207745b9f686 URL:
https://gitlab.winehq.org/wine/wine/-/commit/de1d2223c4ec4baa1b5e25f2159320…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 3 08:34:36 2022 +0300 mf/session: Add support for MESessionScrubSampleComplete event. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/session.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index b410a5fe861..d5ff3384299 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -160,6 +160,7 @@ struct transform_stream enum topo_node_flags { TOPO_NODE_END_OF_STREAM = 0x1, + TOPO_NODE_SCRUB_SAMPLE_COMPLETE = 0x2, }; struct topo_node @@ -3317,6 +3318,30 @@ static BOOL session_nodes_is_mask_set(struct media_session *session, MF_TOPOLOGY return TRUE; } +static void session_nodes_unset_mask(struct media_session *session, MF_TOPOLOGY_TYPE node_type, unsigned int flags) +{ + struct media_source *source; + struct topo_node *node; + + if (node_type == MF_TOPOLOGY_MAX) + { + LIST_FOR_EACH_ENTRY(source, &session->presentation.sources, struct media_source, entry) + { + source->flags &= ~flags; + } + } + else + { + LIST_FOR_EACH_ENTRY(node, &session->presentation.nodes, struct topo_node, entry) + { + if (node->type == node_type) + { + node->flags &= ~flags; + } + } + } +} + static void session_raise_end_of_presentation(struct media_session *session) { if (!(session_nodes_is_mask_set(session, MF_TOPOLOGY_SOURCESTREAM_NODE, TOPO_NODE_END_OF_STREAM))) @@ -3387,6 +3412,28 @@ static void session_sink_stream_marker(struct media_session *session, IMFStreamS } } +static void session_sink_stream_scrub_complete(struct media_session *session, IMFStreamSink *stream_sink) +{ + struct topo_node *node; + + if (!(node = session_get_node_object(session, (IUnknown *)stream_sink, MF_TOPOLOGY_OUTPUT_NODE)) + || node->flags & TOPO_NODE_SCRUB_SAMPLE_COMPLETE) + { + return; + } + + node->flags |= TOPO_NODE_SCRUB_SAMPLE_COMPLETE; + + /* Scrubbing event is not limited to the started state transition, or even the started state. + Events are processed and forwarded at any point after transition from initial idle state. */ + if (session->presentation.flags & SESSION_FLAG_SOURCES_SUBSCRIBED && + session_nodes_is_mask_set(session, MF_TOPOLOGY_OUTPUT_NODE, TOPO_NODE_SCRUB_SAMPLE_COMPLETE)) + { + IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionScrubSampleComplete, &GUID_NULL, S_OK, NULL); + session_nodes_unset_mask(session, MF_TOPOLOGY_OUTPUT_NODE, TOPO_NODE_SCRUB_SAMPLE_COMPLETE); + } +} + static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { struct media_session *session = impl_from_events_callback_IMFAsyncCallback(iface); @@ -3523,6 +3570,12 @@ static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IM session_request_sample(session, (IMFStreamSink *)event_source); LeaveCriticalSection(&session->cs); + break; + case MEStreamSinkScrubSampleComplete: + + EnterCriticalSection(&session->cs); + session_sink_stream_scrub_complete(session, (IMFStreamSink *)event_source); + LeaveCriticalSection(&session->cs); break; case MEMediaSample:
1
0
0
0
Alexandre Julliard : wow64: Load dependencies of 64-bit modules only from the 64-bit system directory.
by Alexandre Julliard
03 Nov '22
03 Nov '22
Module: wine Branch: master Commit: 483085ad3f2ec3dd66b0acd1f7727d993d218a40 URL:
https://gitlab.winehq.org/wine/wine/-/commit/483085ad3f2ec3dd66b0acd1f7727d…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 3 15:08:05 2022 +0100 wow64: Load dependencies of 64-bit modules only from the 64-bit system directory. --- dlls/wow64/syscall.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 6709a575afa..86c5b61157e 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -492,7 +492,7 @@ static HMODULE load_64bit_module( const WCHAR *name ) swprintf( path, MAX_PATH, L"%s\\%s", dir, name ); RtlInitUnicodeString( &str, path ); - if ((status = LdrLoadDll( NULL, 0, &str, &module ))) + if ((status = LdrLoadDll( dir, 0, &str, &module ))) { ERR( "failed to load dll %lx\n", status ); NtTerminateProcess( GetCurrentProcess(), status );
1
0
0
0
Alexandre Julliard : ntdll: Fix trace formats for 64-bit values on ARM64.
by Alexandre Julliard
03 Nov '22
03 Nov '22
Module: wine Branch: master Commit: c302b28729f3e85742ea9e476fffc20d5ae0eacc URL:
https://gitlab.winehq.org/wine/wine/-/commit/c302b28729f3e85742ea9e476fffc2…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 3 14:40:46 2022 +0100 ntdll: Fix trace formats for 64-bit values on ARM64. --- dlls/ntdll/signal_arm64.c | 66 +++++++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 33 deletions(-)
1
0
0
0
← Newer
1
...
107
108
109
110
111
112
113
...
118
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
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
Results per page:
10
25
50
100
200