November 2022 - Wine-commits

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

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, &current_mode ); + + if (!adapter_get_current_settings( adapter, &current_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

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

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

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

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

Alex Henrie : msvcrt: Change return type of wcsncat_s to errno_t.
by Alexandre Julliard 03 Nov '22

03 Nov '22

Module: wine Branch: master Commit: 26c9879a6c19847fb867d74340950535cc4014a5 URL: https://gitlab.winehq.org/wine/wine/-/commit/26c9879a6c19847fb867d743409505… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 2 22:12:21 2022 -0600 msvcrt: Change return type of wcsncat_s to errno_t. --- dlls/msvcrt/wcs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index afc2498dae2..c5696071846 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2508,7 +2508,7 @@ wchar_t* __cdecl wcscat( wchar_t *dst, const wchar_t *src ) /********************************************************************* * wcsncat_s (MSVCRT.@) */ -INT CDECL wcsncat_s(wchar_t *dst, size_t elem, const wchar_t *src, size_t count) +errno_t CDECL wcsncat_s(wchar_t *dst, size_t elem, const wchar_t *src, size_t count) { size_t i, j;

1 0

Alex Henrie : include: Add wcsncat_s.
by Alexandre Julliard 03 Nov '22

03 Nov '22

Module: wine Branch: master Commit: 5f46d556fe22415ce423b34e453c20a89e809d34 URL: https://gitlab.winehq.org/wine/wine/-/commit/5f46d556fe22415ce423b34e453c20… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 2 22:12:21 2022 -0600 include: Add wcsncat_s. Needed to compile Tera Term. --- include/msvcrt/corecrt_wstring.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/msvcrt/corecrt_wstring.h b/include/msvcrt/corecrt_wstring.h index 00e7863b5c3..bcf9f947625 100644 --- a/include/msvcrt/corecrt_wstring.h +++ b/include/msvcrt/corecrt_wstring.h @@ -59,6 +59,7 @@ _ACRTIMP errno_t __cdecl wcscpy_s(wchar_t*,size_t,const wchar_t*); _ACRTIMP size_t __cdecl wcscspn(const wchar_t*,const wchar_t*); _ACRTIMP size_t __cdecl wcslen(const wchar_t*); _ACRTIMP wchar_t* __cdecl wcsncat(wchar_t*,const wchar_t*,size_t); +_ACRTIMP errno_t __cdecl wcsncat_s(wchar_t*,size_t,const wchar_t*,size_t); _ACRTIMP int __cdecl wcsncmp(const wchar_t*,const wchar_t*,size_t); _ACRTIMP wchar_t* __cdecl wcsncpy(wchar_t*,const wchar_t*,size_t); _ACRTIMP errno_t __cdecl wcsncpy_s(wchar_t*,size_t,const wchar_t*,size_t);

1 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

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