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

gdiplus: Derive GpFont from GpFontFamily.

Browse Source
This commit is contained in:
Dmitry Timoshkov 2012-05-08 19:29:41 +09:00 committed by Alexandre Julliard
parent 5b5ecf2193
commit 54b69043eb
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dlls/gdiplus/font.c
View File

@ -1,5 +1,6 @@
/* /*
* Copyright (C) 2007 Google (Evan Stade) * Copyright (C) 2007 Google (Evan Stade)
* Copyright (C) 2012 Dmitry Timoshkov
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
@ -158,6 +159,13 @@ GpStatus WINGDIPAPI GdipCreateFont(GDIPCONST GpFontFamily *fontFamily,
(*font)->height = otm->otmEMSquare; (*font)->height = otm->otmEMSquare;
(*font)->line_spacing = otm->otmTextMetrics.tmAscent + otm->otmTextMetrics.tmDescent + otm->otmTextMetrics.tmExternalLeading; (*font)->line_spacing = otm->otmTextMetrics.tmAscent + otm->otmTextMetrics.tmDescent + otm->otmTextMetrics.tmExternalLeading;
stat = GdipCloneFontFamily((GpFontFamily *)fontFamily, &(*font)->family);
if (stat != Ok)
{
GdipFree(*font);
return stat;
}
TRACE("<-- %p\n", *font); TRACE("<-- %p\n", *font);
return Ok; return Ok;
@ -171,6 +179,7 @@ GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC hdc,
{ {
HFONT hfont, oldfont; HFONT hfont, oldfont;
TEXTMETRICW textmet; TEXTMETRICW textmet;
GpStatus stat;
TRACE("(%p, %p, %p)\n", hdc, logfont, font); TRACE("(%p, %p, %p)\n", hdc, logfont, font);
@ -206,6 +215,13 @@ GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC hdc,
SelectObject(hdc, oldfont); SelectObject(hdc, oldfont);
DeleteObject(hfont); DeleteObject(hfont);
stat = GdipCreateFontFamilyFromName(logfont->lfFaceName, NULL, &(*font)->family);
if (stat != Ok)
{
GdipFree(*font);
return NotTrueTypeFont;
}
TRACE("<-- %p\n", *font); TRACE("<-- %p\n", *font);
return Ok; return Ok;
@ -242,6 +258,7 @@ GpStatus WINGDIPAPI GdipDeleteFont(GpFont* font)
if(!font) if(!font)
return InvalidParameter; return InvalidParameter;
GdipDeleteFontFamily(font->family);
GdipFree(font); GdipFree(font);
return Ok; return Ok;
@ -290,7 +307,7 @@ GpStatus WINGDIPAPI GdipGetFamily(GpFont *font, GpFontFamily **family)
if (!(font && family)) if (!(font && family))
return InvalidParameter; return InvalidParameter;
return GdipCreateFontFamilyFromName(font->lfw.lfFaceName, NULL, family); return GdipCloneFontFamily(font->family, family);
} }
/****************************************************************************** /******************************************************************************
@ -424,6 +441,8 @@ GpStatus WINGDIPAPI GdipGetLogFontW(GpFont *font, GpGraphics *graphics,
*/ */
GpStatus WINGDIPAPI GdipCloneFont(GpFont *font, GpFont **cloneFont) GpStatus WINGDIPAPI GdipCloneFont(GpFont *font, GpFont **cloneFont)
{ {
GpStatus stat;
TRACE("(%p, %p)\n", font, cloneFont); TRACE("(%p, %p)\n", font, cloneFont);
if(!font || !cloneFont) if(!font || !cloneFont)
@ -433,8 +452,10 @@ GpStatus WINGDIPAPI GdipCloneFont(GpFont *font, GpFont **cloneFont)
if(!*cloneFont) return OutOfMemory; if(!*cloneFont) return OutOfMemory;
**cloneFont = *font; **cloneFont = *font;
stat = GdipCloneFontFamily(font->family, &(*cloneFont)->family);
if (stat != Ok) GdipFree(*cloneFont);
return Ok; return stat;
} }
/******************************************************************************* /*******************************************************************************

1
dlls/gdiplus/gdiplus_private.h
View File

@ -346,6 +346,7 @@ struct GpImageAttributes{
}; };
struct GpFont{ struct GpFont{
GpFontFamily *family;
LOGFONTW lfw; LOGFONTW lfw;
REAL emSize; REAL emSize;
REAL pixel_size; REAL pixel_size;