From ec2caa4baeadf5c173fcacb2117eef6483d982ee Mon Sep 17 00:00:00 2001 From: Cody Russell Date: Mon, 23 Apr 2007 18:44:15 +0000 Subject: [PATCH] Fix premature DC release svn path=/branches/gtk-2-10/; revision=17621 --- ChangeLog | 8 ++++++++ modules/engines/ms-windows/msw_style.c | 5 ++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3262a8bd7a..c42296df91 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-04-23 Cody Russell + + Backported from trunk: + + * modules/engines/ms-windows/msw_style.c: Fix prematurely + released DC that prevented fonts with multi-byte font names from + being loaded. (#404506, Hiroyuki Yamamoto) + 2007-04-23 Matthias Clasen Mreged from trunk: diff --git a/modules/engines/ms-windows/msw_style.c b/modules/engines/ms-windows/msw_style.c index f82b43599d..0d6904f470 100755 --- a/modules/engines/ms-windows/msw_style.c +++ b/modules/engines/ms-windows/msw_style.c @@ -466,12 +466,15 @@ sys_font_to_pango_font (XpThemeClass klazz, XpThemeFont type, char *buf, { pt_size = -MulDiv (lf.lfHeight, 72, GetDeviceCaps (hDC, LOGPIXELSY)); - ReleaseDC (hwnd, hDC); } else pt_size = 10; font = get_family_name (&lf, hDC); + + if (hDC) + ReleaseDC (hwnd, hDC); + if(!(font && *font)) return NULL;