[PATCH 0/1] MR4543: wineps.drv: Return error when visible rectangle is empty in get_vis_rectangles.

[Piotr Caban (＠piotr)]

It fixes crash reported in [bug 55950](https://bugs.winehq.org/show_bug.cgi?id=55950). The printed document is still broken.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/4543

[PATCH 1/1] wineps.drv: Return error when visible rectangle is empty in get_vis_rectangles.

[Piotr Caban]

From: Piotr Caban <piotr(a)codeweavers.com>

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55950
---
 dlls/wineps.drv/printproc.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c
index 46ebe0b8e04..71e6c5acf74 100644
--- a/dlls/wineps.drv/printproc.c
+++ b/dlls/wineps.drv/printproc.c
@@ -301,7 +301,7 @@ static void clip_visrect(HDC hdc, RECT *dst, const RECT *src)
     DeleteObject(hrgn);
 }
 
-static void get_vis_rectangles(HDC hdc, struct ps_bitblt_coords *dst,
+static BOOL get_vis_rectangles(HDC hdc, struct ps_bitblt_coords *dst,
         const XFORM *xform, DWORD width, DWORD height, struct ps_bitblt_coords *src)
 {
     RECT rect;
@@ -323,7 +323,8 @@ static void get_vis_rectangles(HDC hdc, struct ps_bitblt_coords *dst,
     get_bounding_rect(&rect, dst->x, dst->y, dst->width, dst->height);
     clip_visrect(hdc, &dst->visrect, &rect);
 
-    if (!src) return;
+    if (IsRectEmpty(&dst->visrect)) return FALSE;
+    if (!src) return TRUE;
 
     rect.left   = src->log_x;
     rect.top    = src->log_y;
@@ -341,7 +342,7 @@ static void get_vis_rectangles(HDC hdc, struct ps_bitblt_coords *dst,
     if (rect.bottom > height) rect.bottom = height;
     src->visrect = rect;
 
-    intersect_vis_rectangles(dst, src);
+    return intersect_vis_rectangles(dst, src);
 }
 
 static int stretch_blt(print_ctx *ctx, const EMRSTRETCHBLT *blt,
@@ -363,7 +364,8 @@ static int stretch_blt(print_ctx *ctx, const EMRSTRETCHBLT *blt,
 
     if (!blt->cbBmiSrc)
     {
-        get_vis_rectangles(ctx->hdc, &dst, NULL, 0, 0, NULL);
+        if (!get_vis_rectangles(ctx->hdc, &dst, NULL, 0, 0, NULL))
+            return TRUE;
         return PSDRV_PatBlt(ctx, &dst, blt->dwRop);
     }
 
@@ -373,8 +375,9 @@ static int stretch_blt(print_ctx *ctx, const EMRSTRETCHBLT *blt,
     src.log_height = blt->cySrc;
     src.layout = 0;
 
-    get_vis_rectangles(ctx->hdc, &dst, &blt->xformSrc,
-            bi->bmiHeader.biWidth, abs(bi->bmiHeader.biHeight), &src);
+    if (!get_vis_rectangles(ctx->hdc, &dst, &blt->xformSrc,
+                bi->bmiHeader.biWidth, abs(bi->bmiHeader.biHeight), &src))
+        return TRUE;
 
     memcpy(dst_info, bi, blt->cbBmiSrc);
     memset(&bits, 0, sizeof(bits));
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/4543

[PATCH 0/1] MR4543: wineps.drv: Return error when visible rectangle is empty in get_vis_rectangles. - approved

[Huw Davies (＠huw)]

This merge request was approved by Huw Davies.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/4543