Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-05 13:11:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WIN32SS] Only refresh graphics mode list when iModeNum = 0

Browse source 
We don't expect graphics mode list to change while enumerating it.
This commit is contained in:
Hervé Poussineau 2022-05-22 13:19:55 +02:00
parent 434cf85d96
commit c243133b2c
1 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
win32ss/user/ntuser/display.c
View file

@ -412,27 +412,36 @@ UserEnumDisplaySettings(
PGRAPHICS_DEVICE pGraphicsDevice; PGRAPHICS_DEVICE pGraphicsDevice;
PDEVMODEENTRY pdmentry; PDEVMODEENTRY pdmentry;
ULONG i, iFoundMode; ULONG i, iFoundMode;
PPDEVOBJ ppdev;
TRACE("Enter UserEnumDisplaySettings('%wZ', %lu)\n", TRACE("Enter UserEnumDisplaySettings('%wZ', %lu)\n",
pustrDevice, iModeNum); pustrDevice, iModeNum);
/* Ask GDI for the GRAPHICS_DEVICE */ /* Ask GDI for the GRAPHICS_DEVICE */
pGraphicsDevice = EngpFindGraphicsDevice(pustrDevice, 0); pGraphicsDevice = EngpFindGraphicsDevice(pustrDevice, 0);
ppdev = EngpGetPDEV(pustrDevice); if (!pGraphicsDevice)
if (!pGraphicsDevice || !ppdev)
{ {
/* No device found */ /* No device found */
ERR("No device found!\n"); ERR("No device found!\n");
return STATUS_INVALID_PARAMETER_1; return STATUS_INVALID_PARAMETER_1;
} }
/* let's politely ask the driver for an updated mode list, if (iModeNum == 0)
just in case there's something new in there (vbox) */ {
PPDEVOBJ ppdev;
ppdev = EngpGetPDEV(pustrDevice);
if (!ppdev)
{
/* No device found */
ERR("No device found!\n");
return STATUS_INVALID_PARAMETER_1;
}
PDEVOBJ_vRefreshModeList(ppdev); /* Let's politely ask the driver for an updated mode list,
PDEVOBJ_vRelease(ppdev); * just in case there's something new in there (vbox) */
PDEVOBJ_vRefreshModeList(ppdev);
PDEVOBJ_vRelease(ppdev);
}
iFoundMode = 0; iFoundMode = 0;
for (i = 0; i < pGraphicsDevice->cDevModes; i++) for (i = 0; i < pGraphicsDevice->cDevModes; i++)