winex11: Simplify the EnumDisplayMonitors driver entry point.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2018-08-23 10:53:27 +02:00
parent 18564c76fc
commit 341192289b
1 changed files with 2 additions and 28 deletions

View File

@ -267,34 +267,8 @@ BOOL CDECL X11DRV_EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC pro
{
int i;
if (hdc)
{
POINT origin;
RECT limit;
for (i = 0; i < nb_monitors; i++)
if (!proc( index_to_monitor(i), 0, &monitors[i].rcMonitor, lp )) return FALSE;
if (!GetDCOrgEx( hdc, &origin )) return FALSE;
if (GetClipBox( hdc, &limit ) == ERROR) return FALSE;
if (rect && !IntersectRect( &limit, &limit, rect )) return TRUE;
for (i = 0; i < nb_monitors; i++)
{
RECT monrect = monitors[i].rcMonitor;
OffsetRect( &monrect, -origin.x, -origin.y );
if (IntersectRect( &monrect, &monrect, &limit ))
if (!proc( index_to_monitor(i), hdc, &monrect, lp ))
return FALSE;
}
}
else
{
for (i = 0; i < nb_monitors; i++)
{
RECT unused;
if (!rect || IntersectRect( &unused, &monitors[i].rcMonitor, rect ))
if (!proc( index_to_monitor(i), 0, &monitors[i].rcMonitor, lp ))
return FALSE;
}
}
return TRUE;
}