procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

src/w32term.c (x_set_glyph_string_clipping): Don't pass uninitialized region to CombineRgn.

Browse source
This commit is contained in:
Juanma Barranquero 2011-03-24 03:30:26 +01:00
parent cb5af48e50
commit 1149507c7f
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2011-03-24 Juanma Barranquero <lekktu@gmail.com>
* w32term.c (x_set_glyph_string_clipping):
Don't pass uninitialized region to CombineRgn.
2011-03-23 Juanma Barranquero <lekktu@gmail.com>
* w32fns.c (x_set_menu_bar_lines): Remove unused variable `olines'.

12
src/w32term.c
View file

@ -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;
}