wine-commits August 2020

wine-commits@winehq.org

2 participants
692 discussions

Francois Gouget : winapi: Remove obsolete entries from win32.api.
by Alexandre Julliard 18 Aug '20

18 Aug '20

Module: wine Branch: master Commit: f57c5dde00f158a96b184c28fea56ea9588961f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f57c5dde00f158a96b184c28… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 18 12:22:30 2020 +0200 winapi: Remove obsolete entries from win32.api. Wine no longer has d3dx8.dll, d3dxof.dll, glut32.dll, msacmmap.dll, winedos.dll, wineesd.drv, winenas.drv and winetty.drv dlls. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winapi/win32.api | 189 ------------------------------------------------- 1 file changed, 189 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index ed14ecc034..d9b77dbce3 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -924,48 +924,6 @@ LPCWSTR void -%%d3dx8.dll - -%long - -DWORD -HFONT -HRESULT -UINT - -%float - -FLOAT - -%ptr - -D3DXCOLOR * -D3DXMATRIX * -D3DXPLANE * -D3DXQUATERNION * -D3DXVECTOR2 * -D3DXVECTOR3 * -D3DXVECTOR4 * -D3DVIEWPORT8 * -FLOAT * -LPCVOID -LPD3DXBUFFER * -LPD3DXFONT * -LPD3DXMATRIXSTACK * -LPDIRECT3DDEVICE8 - -%str - -LPCSTR - -%wstr - -LPCWSTR - -%void - -void - %%d3dxof.dll %long @@ -1761,31 +1719,6 @@ char * void -%%glut32.dll - -%double - -double - -%float - -float - -%long - -int -unsigned int - -%ptr - -void (*)(int) -void * -void ** - -%void - -void - %%gphoto2.ds %long @@ -2671,16 +2604,6 @@ PHACMSTREAM PWAVEFILTER PWAVEFORMATEX -%%msacmmap.dll - -%long - -DWORD -HDRVR -LONG -UINT -WORD - %%mscms.dll %long @@ -5692,61 +5615,6 @@ IUnknown * IWineD3D * IWineD3DClipper * -%%winedos.dll - -%long - -BOOL -BYTE -DWORD -UINT -WORD -int - -%ptr - -LPVOID -UINT16 * -void * - -%str - -LPCSTR - -%void - -void - -%%wineesd.drv - -%long - -DWORD -HDRVR -LPARAM -LRESULT -UINT -WORD - -%long --pointer - -DWORD_PTR - -%%winejack.drv - -%long - -DWORD -HDRVR -LPARAM -LRESULT -UINT -WORD - -%long --pointer - -DWORD_PTR - %%winejoystick.drv %long @@ -5773,21 +5641,6 @@ UINT DWORD_PTR -%%winenas.drv - -%long - -DWORD -HDRVR -LPARAM -LRESULT -UINT -WORD - -%long --pointer - -DWORD_PTR - %%wineoss.drv %long @@ -5857,48 +5710,6 @@ void LPCWSTR -%%winetty.drv - -%long - -BOOL -COLORREF -DWORD -HANDLE -HBITMAP -HDC -HFONT -HRGN -HWND -INT -LONG -UINT - -%ptr - -BITMAPINFO * -CREATESTRUCTA * -DEVMODEW * -DWORD * -INT * -LPCVOID -LPINT -LPPALETTEENTRY -LPPOINT -LPSIZE -LPTEXTMETRICW -LPVOID -POINT * -RECT * -TTYDRV_PDEVICE * -TTYDRV_PDEVICE ** -WINDOWPOS * -void * - -%wstr - -LPCWSTR - %%winex11.drv %long

1 0

Gijs Vermeulen : fsutil: Initialize ret in hardlink() (Coverity).
by Alexandre Julliard 18 Aug '20

18 Aug '20

Module: wine Branch: master Commit: 5e300f063305ae3c199a7284dcd24a0d99a17131 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e300f063305ae3c199a7284… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Aug 17 18:59:10 2020 +0200 fsutil: Initialize ret in hardlink() (Coverity). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/fsutil/main.c | 2 +- programs/fsutil/tests/fsutil.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/programs/fsutil/main.c b/programs/fsutil/main.c index bde07ac2df..0bc8817b88 100644 --- a/programs/fsutil/main.c +++ b/programs/fsutil/main.c @@ -97,7 +97,7 @@ static int create_hardlink(int argc, WCHAR *argv[]) static int hardlink(int argc, WCHAR *argv[]) { - int ret; + int ret = 0; if (argc > 2) { diff --git a/programs/fsutil/tests/fsutil.c b/programs/fsutil/tests/fsutil.c index 9867788274..1111b5b2fe 100644 --- a/programs/fsutil/tests/fsutil.c +++ b/programs/fsutil/tests/fsutil.c @@ -63,6 +63,12 @@ static void test_hardlink(void) ok(hfile != INVALID_HANDLE_VALUE, "failed to create a file\n"); CloseHandle(hfile); + rc = runcmd("fsutil"); + ok(rc == 0, "failed to run fsutil\n"); + + rc = runcmd("fsutil hardlink"); + ok(rc == 0, "failed to run fsutil hardlink\n"); + rc = runcmd("fsutil hardlink create link file"); ok(rc == 0, "failed to create a hardlink\n");

1 0

Andrew Eikum : winepulse: Don't rely on pulseaudio callbacks for timing.
by Alexandre Julliard 18 Aug '20

18 Aug '20

Module: wine Branch: master Commit: a10824a03cb7ad1a2a1987433c5ad832dcdf6962 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a10824a03cb7ad1a2a198743… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Aug 17 10:38:18 2020 -0500 winepulse: Don't rely on pulseaudio callbacks for timing. Contains contributions from Mark Harmstone and Zhiyi Zhang. Some devices, especially USB devices, have very irregular timing or very long periods. Some Windows applications (The Witcher 3) are built to expect regular, short period times, and so would underrun when the device timing didn't match their expectations. This patch decouples the Windows-side timing from the OS-side timing so we can meet those applications' requirements. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 613 +++++++++++++++++++----------------------- 1 file changed, 279 insertions(+), 334 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a10824a03cb7ad1a2a19…

1 0

Jacek Caban : server: Use passed console handle to inherit console for created process.
by Alexandre Julliard 18 Aug '20

18 Aug '20

Module: wine Branch: master Commit: 30596feb03098b392bd5078a1a2d390567681b3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=30596feb03098b392bd5078a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 17 15:08:36 2020 +0200 server: Use passed console handle to inherit console for created process. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/process.c | 1 + server/console.c | 37 +++++++++++++------------------------ server/process.c | 2 +- server/process.h | 2 +- 4 files changed, 16 insertions(+), 26 deletions(-) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index 58fba52415..936eed4d18 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -193,6 +193,7 @@ static RTL_USER_PROCESS_PARAMETERS *create_process_params( const WCHAR *filename if (flags & CREATE_NEW_PROCESS_GROUP) params->ConsoleFlags = 1; if (flags & CREATE_NEW_CONSOLE) params->ConsoleHandle = (HANDLE)1; /* KERNEL32_CONSOLE_ALLOC */ + else if (!(flags & DETACHED_PROCESS)) params->ConsoleHandle = NtCurrentTeb()->Peb->ProcessParameters->ConsoleHandle; if (startup->dwFlags & STARTF_USESTDHANDLES) { diff --git a/server/console.c b/server/console.c index 54b7a74382..4509905c2c 100644 --- a/server/console.c +++ b/server/console.c @@ -620,40 +620,29 @@ int free_console( struct process *process ) * 2/ parent is a renderer which launches process, and process should attach to the console * rendered by parent */ -obj_handle_t inherit_console( struct thread *parent_thread, struct process *parent, struct process *process, +obj_handle_t inherit_console( struct thread *parent_thread, obj_handle_t handle, struct process *process, obj_handle_t hconin ) { - int done = 0; + struct console_input *console = NULL; + + if (handle && !(console = (struct console_input *)get_handle_obj( current->process, handle, 0, + &console_input_ops ))) + return 0; /* if parent is a renderer, then attach current process to its console * a bit hacky.... */ - if (hconin && parent_thread) + if (!console && hconin && parent_thread) { - struct console_input *console; - /* FIXME: should we check some access rights ? */ - if ((console = (struct console_input *)get_handle_obj( parent, hconin, - 0, &console_input_ops ))) - { - if (console->renderer == parent_thread) - { - process->console = (struct console_input *)grab_object( console ); - process->console->num_proc++; - done = 1; - } - release_object( console ); - } - else clear_error(); /* ignore error */ - } - /* otherwise, if parent has a console, attach child to this console */ - if (!done && parent->console) - { - process->console = (struct console_input *)grab_object( parent->console ); - process->console->num_proc++; + if (!(console = (struct console_input *)get_handle_obj( parent_thread->process, hconin, + 0, &console_input_ops ))) + clear_error(); /* ignore error */ } + if (!console) return 0; - if (!process->console) return 0; + process->console = console; + console->num_proc++; return alloc_handle( process, process->console, SYNCHRONIZE | FILE_READ_ATTRIBUTES | FILE_WRITE_ATTRIBUTES, 0 ); } diff --git a/server/process.c b/server/process.c index 61ba1549e9..c1bdb591f6 100644 --- a/server/process.c +++ b/server/process.c @@ -1224,7 +1224,7 @@ DECL_HANDLER(new_process) * like if hConOut and hConIn are console handles, then they should be on the same * physical console */ - info->data->console = inherit_console( parent_thread, parent, + info->data->console = inherit_console( parent_thread, info->data->console, process, req->inherit_all ? info->data->hstdin : 0 ); } diff --git a/server/process.h b/server/process.h index 3944a67d57..0fdf070b78 100644 --- a/server/process.h +++ b/server/process.h @@ -131,7 +131,7 @@ extern void detach_debugged_processes( struct thread *debugger ); extern void enum_processes( int (*cb)(struct process*, void*), void *user); /* console functions */ -extern obj_handle_t inherit_console( struct thread *parent_thread, struct process *parent, +extern obj_handle_t inherit_console( struct thread *parent_thread, obj_handle_t handle, struct process *process, obj_handle_t hconin ); extern int free_console( struct process *process ); extern struct thread *console_get_renderer( struct console_input *console );

1 0

Jacek Caban : wineconsole: Make sure that console process is not attached to another console.
by Alexandre Julliard 18 Aug '20

18 Aug '20

Module: wine Branch: master Commit: ca30fa5cb42f3f7d69590cbf4f74dcb58987c730 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca30fa5cb42f3f7d69590cbf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 17 15:08:11 2020 +0200 wineconsole: Make sure that console process is not attached to another console. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/wineconsole.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 1104963f0f..76e1d17dd6 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -853,6 +853,9 @@ int PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmdLine, INT nCmdSh int ret = 1; struct wc_init wci; + /* make sure we're not connected to inherited console */ + FreeConsole(); + if ((ret = WINECON_ParseOptions(lpCmdLine, &wci)) != 0) { printf_res(ret & 0xffff);

1 0

Jacek Caban : server: Remove no longer used set_console_input_info.
by Alexandre Julliard 18 Aug '20

18 Aug '20

Module: wine Branch: master Commit: 2a62242747aa17a1a4ad7443b0ace900f72682c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a62242747aa17a1a4ad7443… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 17 15:07:51 2020 +0200 server: Remove no longer used set_console_input_info. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 7 ++++++ include/wine/server_protocol.h | 33 +---------------------------- server/console.c | 48 ------------------------------------------ server/protocol.def | 22 ------------------- server/request.h | 12 ----------- server/trace.c | 17 --------------- 6 files changed, 8 insertions(+), 131 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2a62242747aa17a1a4ad…

1 0

Jacek Caban : kernelbase: Use IOCTL_CONDRV_SET_TITLE in SetConsoleTitleW.
by Alexandre Julliard 18 Aug '20

18 Aug '20

Module: wine Branch: master Commit: 6cff65900dd299f596636ca5449b0f99e825cf97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cff65900dd299f596636ca5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 17 15:07:39 2020 +0200 kernelbase: Use IOCTL_CONDRV_SET_TITLE in SetConsoleTitleW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 4 ++++ dlls/kernelbase/console.c | 14 +++----------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 1adf4af064..3a374c7797 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3655,6 +3655,10 @@ static void test_FreeConsole(void) ok(title[0] == 0xc0c0, "title byffer changed\n"); ok(GetLastError() == ERROR_INVALID_HANDLE, "last error %u\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = SetConsoleTitleW( L"test" ); + ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, "SetConsoleTitleW returned %x(%u)\n", ret, GetLastError()); + SetLastError(0xdeadbeef); hwnd = GetConsoleWindow(); ok(!hwnd, "hwnd = %p\n", hwnd); diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 2611fd5864..e5a9fbd501 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1305,18 +1305,10 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleTextAttribute( HANDLE handle, WORD attr */ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleTitleW( LPCWSTR title ) { - BOOL ret; - TRACE( "%s\n", debugstr_w( title )); - SERVER_START_REQ( set_console_input_info ) - { - req->handle = 0; - req->mask = SET_CONSOLE_INPUT_INFO_TITLE; - wine_server_add_data( req, title, lstrlenW(title) * sizeof(WCHAR) ); - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; - return ret; + + return console_ioctl( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle, IOCTL_CONDRV_SET_TITLE, + (void *)title, lstrlenW(title) * sizeof(WCHAR), NULL, 0, NULL ); }

1 0

Jacek Caban : kernelbase: Use IOCTL_CONDRV_SET_INPUT_INFO in SetConsoleOutputCP.
by Alexandre Julliard 18 Aug '20

18 Aug '20

Module: wine Branch: master Commit: 32eb41de8caaa9462406c859c8242df5a6ebf343 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32eb41de8caaa9462406c859… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 17 15:07:30 2020 +0200 kernelbase: Use IOCTL_CONDRV_SET_INPUT_INFO in SetConsoleOutputCP. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 4 ++++ dlls/kernelbase/console.c | 15 +++++---------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 38ec621da6..1adf4af064 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3644,6 +3644,10 @@ static void test_FreeConsole(void) ret = SetConsoleCP(GetOEMCP()); ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, "SetConsoleCP returned %x(%u)\n", ret, GetLastError()); + SetLastError(0xdeadbeef); + ret = SetConsoleOutputCP(GetOEMCP()); + ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, "SetConsoleCP returned %x(%u)\n", ret, GetLastError()); + SetLastError(0xdeadbeef); memset( title, 0xc0, sizeof(title) ); size = GetConsoleTitleW( title, ARRAY_SIZE(title) ); diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 536f1912e9..2611fd5864 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1222,22 +1222,17 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleMode( HANDLE handle, DWORD mode ) */ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleOutputCP( UINT cp ) { - BOOL ret; + struct condrv_input_info_params params = { SET_CONSOLE_INPUT_INFO_OUTPUT_CODEPAGE }; if (!IsValidCodePage( cp )) { SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } - SERVER_START_REQ( set_console_input_info ) - { - req->handle = 0; - req->mask = SET_CONSOLE_INPUT_INFO_OUTPUT_CODEPAGE; - req->output_cp = cp; - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; - return ret; + + params.info.output_cp = cp; + return console_ioctl( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle, + IOCTL_CONDRV_SET_INPUT_INFO, &params, sizeof(params), NULL, 0, NULL ); }

1 0

Jacek Caban : kernelbase: Use IOCTL_CONDRV_SET_INPUT_INFO in SetConsoleCP.
by Alexandre Julliard 18 Aug '20

18 Aug '20

Module: wine Branch: master Commit: c6e0cb6c720c56541ebb45a6b4821d46f0300f36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6e0cb6c720c56541ebb45a6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 17 15:07:21 2020 +0200 kernelbase: Use IOCTL_CONDRV_SET_INPUT_INFO in SetConsoleCP. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 4 ++++ dlls/kernelbase/console.c | 15 +++++---------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 1702369d7a..38ec621da6 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3640,6 +3640,10 @@ static void test_FreeConsole(void) ok(!cp, "cp = %x\n", cp); ok(GetLastError() == ERROR_INVALID_HANDLE, "last error %u\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = SetConsoleCP(GetOEMCP()); + ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, "SetConsoleCP returned %x(%u)\n", ret, GetLastError()); + SetLastError(0xdeadbeef); memset( title, 0xc0, sizeof(title) ); size = GetConsoleTitleW( title, ARRAY_SIZE(title) ); diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index a3271712d9..536f1912e9 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1043,22 +1043,17 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleActiveScreenBuffer( HANDLE handle ) */ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleCP( UINT cp ) { - BOOL ret; + struct condrv_input_info_params params = { SET_CONSOLE_INPUT_INFO_INPUT_CODEPAGE }; if (!IsValidCodePage( cp )) { SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } - SERVER_START_REQ( set_console_input_info ) - { - req->handle = 0; - req->mask = SET_CONSOLE_INPUT_INFO_INPUT_CODEPAGE; - req->input_cp = cp; - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; - return ret; + + params.info.input_cp = cp; + return console_ioctl( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle, + IOCTL_CONDRV_SET_INPUT_INFO, &params, sizeof(params), NULL, 0, NULL ); }

1 0

Zhiyi Zhang : winemac.drv: Initialize new display device registry display settings.
by Alexandre Julliard 18 Aug '20

18 Aug '20

Module: wine Branch: master Commit: 580024c68474521ca624265dda4581ee0096075e URL: https://source.winehq.org/git/wine.git/?a=commit;h=580024c68474521ca624265d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Aug 17 16:36:41 2020 +0800 winemac.drv: Initialize new display device registry display settings. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/display.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 9a80308e89..a96a7b2c5f 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -1362,6 +1362,41 @@ done: return (err == kCGErrorSuccess); } +/*********************************************************************** + * init_registry_display_settings + * + * Initialize registry display settings when new display devices are added. + */ +static void init_registry_display_settings(void) +{ + DEVMODEW dm = {.dmSize = sizeof(dm)}; + DISPLAY_DEVICEW dd = {sizeof(dd)}; + DWORD i = 0; + LONG ret; + + while (EnumDisplayDevicesW(NULL, i++, &dd, 0)) + { + /* Skip if the device already has registry display settings */ + if (EnumDisplaySettingsExW(dd.DeviceName, ENUM_REGISTRY_SETTINGS, &dm, 0)) + continue; + + if (!EnumDisplaySettingsExW(dd.DeviceName, ENUM_CURRENT_SETTINGS, &dm, 0)) + { + ERR("Failed to query current display settings for %s.\n", wine_dbgstr_w(dd.DeviceName)); + continue; + } + + TRACE("Device %s current display mode %ux%u %ubits %uHz at %d,%d.\n", + wine_dbgstr_w(dd.DeviceName), dm.dmPelsWidth, dm.dmPelsHeight, dm.dmBitsPerPel, + dm.dmDisplayFrequency, dm.dmPosition.x, dm.dmPosition.y); + + ret = ChangeDisplaySettingsExW(dd.DeviceName, &dm, NULL, + CDS_GLOBAL | CDS_NORESET | CDS_UPDATEREGISTRY, NULL); + if (ret != DISP_CHANGE_SUCCESSFUL) + ERR("Failed to save registry display settings for %s, returned %d.\n", + wine_dbgstr_w(dd.DeviceName), ret); + } +} /*********************************************************************** * macdrv_displays_changed @@ -1392,6 +1427,7 @@ void macdrv_displays_changed(const macdrv_event *event) CGDisplayModeRelease(mode); macdrv_init_display_devices(TRUE); + init_registry_display_settings(); if (is_original && retina_enabled) {

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
70
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2020