[Emacs-diffs] /srv/bzr/emacs/trunk r103735: src/w32term.c (x_set_glyph_string_clipping): Don't pass uninitialized region to CombineRgn.

[Juanma Barranquero]

------------------------------------------------------------
revno: 103735
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Thu 2011-03-24 03:30:26 +0100
message:
  src/w32term.c (x_set_glyph_string_clipping): Don't pass uninitialized region 
to CombineRgn.
modified:
  src/ChangeLog
  src/w32term.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-03-23 16:25:38 +0000
+++ b/src/ChangeLog     2011-03-24 02:30:26 +0000
@@ -1,3 +1,8 @@
+2011-03-24  Juanma Barranquero  <address@hidden>
+
+       * w32term.c (x_set_glyph_string_clipping):
+       Don't pass uninitialized region to CombineRgn.
+
 2011-03-23  Juanma Barranquero  <address@hidden>
 
        * w32fns.c (x_set_menu_bar_lines): Remove unused variable `olines'.

=== modified file 'src/w32term.c'
--- a/src/w32term.c     2011-03-23 16:25:38 +0000
+++ b/src/w32term.c     2011-03-24 02:30:26 +0000
@@ -1068,16 +1068,12 @@
     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;
 }