Module: wine Branch: master Commit: 1283d9873cd384f21c61e1a12220b33bab9f3bc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1283d9873cd384f21c61e1a12...
Author: Alexandre Julliard julliard@winehq.org Date: Wed Aug 22 13:09:48 2018 +0200
wineandroid: Simplify the EnumDisplayMonitors driver entry point.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/wineandroid.drv/init.c | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-)
diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index c0e3823..d199696 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -223,30 +223,7 @@ BOOL CDECL ANDROID_GetMonitorInfo( HMONITOR handle, LPMONITORINFO info ) */ BOOL CDECL ANDROID_EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPARAM lp ) { - if (hdc) - { - POINT origin; - RECT limit, monrect; - - if (!GetDCOrgEx( hdc, &origin )) return FALSE; - if (GetClipBox( hdc, &limit ) == ERROR) return FALSE; - - if (rect && !IntersectRect( &limit, &limit, rect )) return TRUE; - - monrect = default_monitor.rcMonitor; - OffsetRect( &monrect, -origin.x, -origin.y ); - if (IntersectRect( &monrect, &monrect, &limit )) - if (!proc( (HMONITOR)1, hdc, &monrect, lp )) - return FALSE; - } - else - { - RECT unused; - if (!rect || IntersectRect( &unused, &default_monitor.rcMonitor, rect )) - if (!proc( (HMONITOR)1, 0, &default_monitor.rcMonitor, lp )) - return FALSE; - } - return TRUE; + return proc( (HMONITOR)1, 0, &default_monitor.rcMonitor, lp ); }