[Spice-commits] display/rop.c

[Izik Eidus]

 display/rop.c |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 6bf33523a1f2c92484b3db59248f917e49fa3b64
Author: Izik Eidus <ieidus at redhat.com>
Date:   Mon Apr 12 12:32:06 2010 +0300

    spice: qxl win32 driver: fix wrong MIN check at BitBltFromDev
    
    Signed-off-by: Izik Eidus <ieidus at redhat.com>

diff --git a/display/rop.c b/display/rop.c
index 2673ee5..57a92ab 100644
--- a/display/rop.c
+++ b/display/rop.c
@@ -1003,15 +1003,19 @@ static BOOL BitBltFromDev(PDev *pdev, SURFOBJ *src, SURFOBJ *dest, SURFOBJ *mask
     SURFOBJ* surf_obj;
     BOOL ret;
     UINT32 surface_id;
+    SurfaceInfo *surface;
 
+    surface = (SurfaceInfo *)src->dhsurf;
     surface_id = GetSurfaceId(src);
 
     DEBUG_PRINT((pdev, 6, "%s\n", __FUNCTION__));
 
     area.top = MAX(0, src_pos.y);
-    area.bottom = MIN(src_pos.y + dest_rect->bottom - dest_rect->top, pdev->resolution.cy);
+    area.bottom = MIN(src_pos.y + dest_rect->bottom - dest_rect->top,
+                      surface->draw_area.surf_obj->sizlBitmap.cy);
     area.left = MAX(0, src_pos.x);
-    area.right = MIN(src_pos.x + dest_rect->right - dest_rect->left, pdev->resolution.cx);
+    area.right = MIN(src_pos.x + dest_rect->right - dest_rect->left,
+                     surface->draw_area.surf_obj->sizlBitmap.cx);
 
     UpdateArea(pdev, &area, surface_id);
 
@@ -1023,9 +1027,6 @@ static BOOL BitBltFromDev(PDev *pdev, SURFOBJ *src, SURFOBJ *dest, SURFOBJ *mask
         src_pos.y = src_pos.y - area.top;
         src_pos.x = src_pos.x - area.left;
     } else {
-        SurfaceInfo *surface;
-
-        surface = (SurfaceInfo *)src->dhsurf;
         surf_obj = surface->draw_area.surf_obj;
     }