From 1149507c7fe8c24d93448eea2d0114746c580782 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Thu, 24 Mar 2011 03:30:26 +0100 Subject: [PATCH] src/w32term.c (x_set_glyph_string_clipping): Don't pass uninitialized region to CombineRgn. --- src/ChangeLog | 5 +++++ src/w32term.c | 12 ++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index b306ff78ff..ae40e4638f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-03-24 Juanma Barranquero + + * w32term.c (x_set_glyph_string_clipping): + Don't pass uninitialized region to CombineRgn. + 2011-03-23 Juanma Barranquero * w32fns.c (x_set_menu_bar_lines): Remove unused variable `olines'. diff --git a/src/w32term.c b/src/w32term.c index 56454faddb..2252c93071 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -1068,16 +1068,12 @@ x_set_glyph_string_clipping (struct glyph_string *s) w32_set_clip_rectangle (s->hdc, r); else if (n > 1) { - HRGN full_clip, clip1, clip2; - clip1 = CreateRectRgnIndirect (r); - clip2 = CreateRectRgnIndirect (r + 1); - if (CombineRgn (full_clip, clip1, clip2, RGN_OR) != ERROR) - { - SelectClipRgn (s->hdc, full_clip); - } + HRGN clip1 = CreateRectRgnIndirect (r); + HRGN clip2 = CreateRectRgnIndirect (r + 1); + if (CombineRgn (clip1, clip1, clip2, RGN_OR) != ERROR) + SelectClipRgn (s->hdc, clip1); DeleteObject (clip1); DeleteObject (clip2); - DeleteObject (full_clip); } s->num_clips = n; } -- 2.20.1