aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2001-01-29 12:36:52 +0000
committerEli Zaretskii2001-01-29 12:36:52 +0000
commitfccb8288473eb856cdb824162af27fb85e8ba614 (patch)
tree720d31399b5f2f0945c41c90dbb8555a526fe737 /src
parentd4ffda100dab1847208ccaae97f9c84bf184eefa (diff)
downloademacs-fccb8288473eb856cdb824162af27fb85e8ba614.tar.gz
emacs-fccb8288473eb856cdb824162af27fb85e8ba614.zip
(x_draw_row_bitmaps): Delay obtaining HDC to avoid returning without
releasing it.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/w32term.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 82003628dfa..54e6e6f0c18 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12001-01-29 Jason Rumney <jasonr@gnu.org>
2
3 w32term.c (x_draw_row_bitmaps): Delay obtaining HDC to avoid
4 returning without releasing it.
5
12001-01-29 Kenichi Handa <handa@etl.go.jp> 62001-01-29 Kenichi Handa <handa@etl.go.jp>
2 7
3 * w32fns.c (w32_font_match): Allocate three more bytes to regex 8 * w32fns.c (w32_font_match): Allocate three more bytes to regex
diff --git a/src/w32term.c b/src/w32term.c
index 0d6f8c4bf20..6756cfa105f 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -898,7 +898,7 @@ x_draw_row_bitmaps (w, row)
898 enum bitmap_type bitmap; 898 enum bitmap_type bitmap;
899 struct face *face; 899 struct face *face;
900 int header_line_height = -1; 900 int header_line_height = -1;
901 HDC hdc = get_frame_dc (f); 901 HDC hdc;
902 902
903 xassert (interrupt_input_blocked); 903 xassert (interrupt_input_blocked);
904 904
@@ -922,6 +922,8 @@ x_draw_row_bitmaps (w, row)
922 else 922 else
923 bitmap = NO_BITMAP; 923 bitmap = NO_BITMAP;
924 924
925 hdc = get_frame_dc (f);
926
925 /* Clear flags area if no bitmap to draw or if bitmap doesn't fill 927 /* Clear flags area if no bitmap to draw or if bitmap doesn't fill
926 the flags area. */ 928 the flags area. */
927 if (bitmap == NO_BITMAP 929 if (bitmap == NO_BITMAP