ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdiplus: Select the font into the appropriate hdc in GdipMeasureString.

This commit is contained in:
Vincent Povirk 2011-03-18 09:47:58 -05:00 committed by Alexandre Julliard
parent a48ed33609
commit 314ec7178d
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/gdiplus/graphics.c
View File

@ -4427,7 +4427,7 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics,
{ {
HFONT oldfont; HFONT oldfont;
struct measure_string_args args; struct measure_string_args args;
HDC temp_hdc=NULL; HDC temp_hdc=NULL, hdc;
TRACE("(%p, %s, %i, %p, %s, %p, %p, %p, %p)\n", graphics, TRACE("(%p, %s, %i, %p, %s, %p, %p, %p, %p)\n", graphics,
debugstr_wn(string, length), length, font, debugstr_rectf(rect), format, debugstr_wn(string, length), length, font, debugstr_rectf(rect), format,
@ -4438,9 +4438,11 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics,
if(!graphics->hdc) if(!graphics->hdc)
{ {
temp_hdc = CreateCompatibleDC(0); hdc = temp_hdc = CreateCompatibleDC(0);
if (!temp_hdc) return OutOfMemory; if (!temp_hdc) return OutOfMemory;
} }
else
hdc = graphics->hdc;
if(linesfilled) *linesfilled = 0; if(linesfilled) *linesfilled = 0;
if(codepointsfitted) *codepointsfitted = 0; if(codepointsfitted) *codepointsfitted = 0;
@ -4448,7 +4450,7 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics,
if(format) if(format)
TRACE("may be ignoring some format flags: attr %x\n", format->attr); TRACE("may be ignoring some format flags: attr %x\n", format->attr);
oldfont = SelectObject(graphics->hdc, CreateFontIndirectW(&font->lfw)); oldfont = SelectObject(hdc, CreateFontIndirectW(&font->lfw));
bounds->X = rect->X; bounds->X = rect->X;
bounds->Y = rect->Y; bounds->Y = rect->Y;
@ -4459,10 +4461,10 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics,
args.codepointsfitted = codepointsfitted; args.codepointsfitted = codepointsfitted;
args.linesfilled = linesfilled; args.linesfilled = linesfilled;
gdip_format_string(graphics->hdc ? graphics->hdc : temp_hdc, string, length, font, rect, format, gdip_format_string(hdc, string, length, font, rect, format,
measure_string_callback, &args); measure_string_callback, &args);
DeleteObject(SelectObject(graphics->hdc, oldfont)); DeleteObject(SelectObject(hdc, oldfont));
if (temp_hdc) if (temp_hdc)
DeleteDC(temp_hdc); DeleteDC(temp_hdc);