Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-07 05:52:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WIN32SS:ENG] Do not allocate 0 bytes if no monitor is reported

Browse source 
Addendum to 2f00ca4663
This commit is contained in:
Hervé Poussineau 2025-05-28 18:22:00 +02:00
parent 4534537036
commit 9f21cc3e98
1 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

33
win32ss/gdi/eng/device.c
View file

@ -616,23 +616,28 @@ EngpUpdateMonitorDevices(
pGraphicsDevice->pvMonDev = NULL;
pGraphicsDevice->dwMonCnt = 0;
}
pGraphicsDevice->pvMonDev = ExAllocatePoolZero(PagedPool,
monitorCount * sizeof(VIDEO_MONITOR_DEVICE),
GDITAG_GDEVICE);
if (!pGraphicsDevice->pvMonDev)
if (monitorCount > 0)
{
for (i = 0; pMonitorDevices[i].pdo; ++i)
ObDereferenceObject(pMonitorDevices[i].pdo);
ExFreePool(pMonitorDevices);
return STATUS_INSUFFICIENT_RESOURCES;
pGraphicsDevice->pvMonDev = ExAllocatePoolZero(PagedPool,
monitorCount * sizeof(VIDEO_MONITOR_DEVICE),
GDITAG_GDEVICE);
if (!pGraphicsDevice->pvMonDev)
{
for (i = 0; pMonitorDevices[i].pdo; ++i)
ObDereferenceObject(pMonitorDevices[i].pdo);
ExFreePool(pMonitorDevices);
return STATUS_INSUFFICIENT_RESOURCES;
}
/* Copy data */
for (i = 0; i < monitorCount; i++)
{
TRACE("%S\\Monitor%u: PDO %p HwID %u\n", pGraphicsDevice->szWinDeviceName, i, pMonitorDevices[i].pdo, pMonitorDevices[i].HwID);
pGraphicsDevice->pvMonDev[pGraphicsDevice->dwMonCnt++] = pMonitorDevices[i];
}
}
/* Copy data */
for (i = 0; i < monitorCount; i++)
{
TRACE("%S\\Monitor%u: PDO %p HwID %u\n", pGraphicsDevice->szWinDeviceName, i, pMonitorDevices[i].pdo, pMonitorDevices[i].HwID);
pGraphicsDevice->pvMonDev[pGraphicsDevice->dwMonCnt++] = pMonitorDevices[i];
}
ExFreePool(pMonitorDevices);
return STATUS_SUCCESS;
}