[PATCH 3/3] gdi32: Don't call GetObjectW() unless necessary.
Huw Davies
huw at codeweavers.com
Fri Jul 29 07:13:07 CDT 2016
Signed-off-by: Huw Davies <huw at codeweavers.com>
---
dlls/gdi32/font.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c
index 7261901..1155ee4 100644
--- a/dlls/gdi32/font.c
+++ b/dlls/gdi32/font.c
@@ -681,13 +681,15 @@ static void update_font_code_page( DC *dc, HANDLE font )
{
CHARSETINFO csi;
int charset = get_text_charset_info( dc, NULL, 0 );
- LOGFONTW lf;
- GetObjectW( font, sizeof(lf), &lf );
+ if (charset == ANSI_CHARSET && get_associated_charset_info() & ASSOC_CHARSET_ANSI)
+ {
+ LOGFONTW lf;
- if (charset == ANSI_CHARSET && !(lf.lfClipPrecision & CLIP_DFA_DISABLE) &&
- get_associated_charset_info() & ASSOC_CHARSET_ANSI)
- charset = DEFAULT_CHARSET;
+ GetObjectW( font, sizeof(lf), &lf );
+ if (!(lf.lfClipPrecision & CLIP_DFA_DISABLE))
+ charset = DEFAULT_CHARSET;
+ }
/* Hmm, nicely designed api this one! */
if (TranslateCharsetInfo( ULongToPtr(charset), &csi, TCI_SRCCHARSET) )
--
2.7.4
More information about the wine-patches
mailing list