Module: wine Branch: master Commit: 99ef2dc4e1754054535c89e07df8eb41d8bdc70d URL: https://gitlab.winehq.org/wine/wine/-/commit/99ef2dc4e1754054535c89e07df8eb4...
Author: Rémi Bernon rbernon@codeweavers.com Date: Tue Jun 27 13:40:03 2023 +0200
explorer: Rename initialize_display_settings local variable.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55146
---
programs/explorer/desktop.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 51f53630ae6..49141f1c9cf 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -939,26 +939,25 @@ static const char *debugstr_devmodew( const DEVMODEW *devmode )
static void initialize_display_settings(void) { - DISPLAY_DEVICEW ddW; + DISPLAY_DEVICEW device = {.cb = sizeof(DISPLAY_DEVICEW)}; DWORD i = 0;
/* Store current display mode in the registry */ - ddW.cb = sizeof(ddW); - while (EnumDisplayDevicesW( NULL, i++, &ddW, 0 )) + while (EnumDisplayDevicesW( NULL, i++, &device, 0 )) { DEVMODEW devmode = {.dmSize = sizeof(DEVMODEW)};
- if (!EnumDisplaySettingsExW( ddW.DeviceName, ENUM_CURRENT_SETTINGS, &devmode, 0)) + if (!EnumDisplaySettingsExW( device.DeviceName, ENUM_CURRENT_SETTINGS, &devmode, 0)) { - ERR( "Failed to query current display settings for %s.\n", debugstr_w(ddW.DeviceName) ); + ERR( "Failed to query current display settings for %s.\n", debugstr_w( device.DeviceName ) ); continue; }
- TRACE( "Device %s current display mode %s.\n", debugstr_w( ddW.DeviceName ), debugstr_devmodew( &devmode ) ); + TRACE( "Device %s current display mode %s.\n", debugstr_w( device.DeviceName ), debugstr_devmodew( &devmode ) );
- if (ChangeDisplaySettingsExW( ddW.DeviceName, &devmode, 0, + if (ChangeDisplaySettingsExW( device.DeviceName, &devmode, 0, CDS_GLOBAL | CDS_NORESET | CDS_UPDATEREGISTRY, 0 )) - ERR( "Failed to initialize registry display settings for %s.\n", debugstr_w(ddW.DeviceName) ); + ERR( "Failed to initialize registry display settings for %s.\n", debugstr_w( device.DeviceName ) ); } }