system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-01 07:37:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

win32u: Add a BOOL force parameter to update_display_cache.

Browse source 
And call it recursively with force = TRUE instead of calling graphics
driver pUpdateDisplayDevices separately.
This commit is contained in:
Rémi Bernon 2022-09-14 11:45:22 +02:00 committed by Alexandre Julliard
parent d75f651404
commit 8a9c34edb5
1 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
dlls/win32u/sysparams.c
View file

@ -1512,7 +1512,7 @@ static BOOL update_display_cache_from_registry(void)
return ret;
}
static BOOL update_display_cache(void)
static BOOL update_display_cache( BOOL force )
{
HWINSTA winstation = NtUserGetProcessWindowStation();
struct device_manager_ctx ctx = {0};
@ -1529,17 +1529,7 @@ static BOOL update_display_cache(void)
return TRUE;
}
user_driver->pUpdateDisplayDevices( &device_manager, FALSE, &ctx );
release_display_manager_ctx( &ctx );
if (update_display_cache_from_registry()) return TRUE;
if (ctx.gpu_count)
{
ERR( "driver reported devices, but we failed to read them\n" );
return FALSE;
}
if (!user_driver->pUpdateDisplayDevices( &device_manager, TRUE, &ctx ))
if (!user_driver->pUpdateDisplayDevices( &device_manager, force, &ctx ) && force)
{
static const DEVMODEW modes[] =
{
@ -1578,15 +1568,27 @@ static BOOL update_display_cache(void)
if (!update_display_cache_from_registry())
{
ERR( "failed to read display config\n" );
return FALSE;
if (force)
{
ERR( "Failed to read display config.\n" );
return FALSE;
}
if (ctx.gpu_count)
{
ERR( "Driver reported devices, but we failed to read them.\n" );
return FALSE;
}
return update_display_cache( TRUE );
}
return TRUE;
}
static BOOL lock_display_devices(void)
{
if (!update_display_cache()) return FALSE;
if (!update_display_cache( FALSE )) return FALSE;
pthread_mutex_lock( &display_lock );
return TRUE;
}