system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-21 16:04:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

dwrite: Implement ConvertFontFaceToLOGFONT().

Browse source
This commit is contained in:
Nikolay Sivov 2014-01-06 01:24:17 +04:00 committed by Alexandre Julliard
parent 07ded6bb36
commit 5e4d5ebde7
4 changed files with 68 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
dlls/dwrite/dwrite_private.h
View file

@ -72,6 +72,7 @@ static inline LPWSTR heap_strdupnW(const WCHAR *str, UINT32 len)
}
extern HRESULT create_font_from_logfont(const LOGFONTW*, IDWriteFont**) DECLSPEC_HIDDEN;
extern HRESULT convert_fontface_to_logfont(IDWriteFontFace*, LOGFONTW*) DECLSPEC_HIDDEN;
extern HRESULT create_textformat(const WCHAR*,IDWriteFontCollection*,DWRITE_FONT_WEIGHT,DWRITE_FONT_STYLE,DWRITE_FONT_STRETCH,
FLOAT,const WCHAR*,IDWriteTextFormat**) DECLSPEC_HIDDEN;
extern HRESULT create_textlayout(const WCHAR*,UINT32,IDWriteTextFormat*,IDWriteTextLayout**) DECLSPEC_HIDDEN;

11
dlls/dwrite/font.c
View file

@ -396,6 +396,8 @@ static HRESULT create_fontface(struct dwrite_font *font, IDWriteFontFace **face)
memset(&This->logfont, 0, sizeof(This->logfont));
This->logfont.lfItalic = font->style == DWRITE_FONT_STYLE_ITALIC;
/* weight values from DWRITE_FONT_WEIGHT match values used for LOGFONT */
This->logfont.lfWeight = font->weight;
strcpyW(This->logfont.lfFaceName, font->facename);
*face = &This->IDWriteFontFace_iface;
@ -403,6 +405,15 @@ static HRESULT create_fontface(struct dwrite_font *font, IDWriteFontFace **face)
return S_OK;
}
HRESULT convert_fontface_to_logfont(IDWriteFontFace *face, LOGFONTW *logfont)
{
struct dwrite_fontface *fontface = impl_from_IDWriteFontFace(face);
*logfont = fontface->logfont;
return S_OK;
}
static HRESULT WINAPI dwritefont_QueryInterface(IDWriteFont *iface, REFIID riid, void **obj)
{
struct dwrite_font *This = impl_from_IDWriteFont(iface);

6
dlls/dwrite/gdiinterop.c
View file

@ -242,10 +242,10 @@ static HRESULT WINAPI gdiinterop_ConvertFontToLOGFONT(IDWriteGdiInterop *iface,
}
static HRESULT WINAPI gdiinterop_ConvertFontFaceToLOGFONT(IDWriteGdiInterop *iface,
IDWriteFontFace *font, LOGFONTW *logfont)
IDWriteFontFace *fontface, LOGFONTW *logfont)
{
FIXME("(%p %p): stub\n", font, logfont);
return E_NOTIMPL;
TRACE("(%p %p)\n", fontface, logfont);
return convert_fontface_to_logfont(fontface, logfont);
}
static HRESULT WINAPI gdiinterop_CreateFontFaceFromHdc(IDWriteGdiInterop *iface,

53
dlls/dwrite/tests/font.c
View file

@ -561,6 +561,58 @@ static void test_system_fontcollection(void)
IDWriteFontCollection_Release(collection);
}
static void test_ConvertFontFaceToLOGFONT(void)
{
IDWriteGdiInterop *interop;
IDWriteFontFace *fontface;
IDWriteFont *font;
LOGFONTW logfont;
HRESULT hr;
hr = IDWriteFactory_GetGdiInterop(factory, &interop);
ok(hr == S_OK, "got 0x%08x\n", hr);
memset(&logfont, 0, sizeof(logfont));
logfont.lfHeight = 12;
logfont.lfWidth = 12;
logfont.lfEscapement = 100;
logfont.lfWeight = FW_NORMAL;
logfont.lfItalic = 1;
logfont.lfUnderline = 1;
logfont.lfStrikeOut = 1;
lstrcpyW(logfont.lfFaceName, tahomaW);
hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, &logfont, &font);
ok(hr == S_OK, "got 0x%08x\n", hr);
hr = IDWriteFont_CreateFontFace(font, &fontface);
ok(hr == S_OK, "got 0x%08x\n", hr);
if (0) /* crashes on native */
{
hr = IDWriteGdiInterop_ConvertFontFaceToLOGFONT(interop, NULL, NULL);
hr = IDWriteGdiInterop_ConvertFontFaceToLOGFONT(interop, fontface, NULL);
}
memset(&logfont, 0xa, sizeof(logfont));
logfont.lfFaceName[0] = 0;
hr = IDWriteGdiInterop_ConvertFontFaceToLOGFONT(interop, fontface, &logfont);
ok(hr == S_OK, "got 0x%08x\n", hr);
ok(logfont.lfHeight == 0, "got %d\n", logfont.lfHeight);
ok(logfont.lfWidth == 0, "got %d\n", logfont.lfWidth);
ok(logfont.lfWeight == FW_NORMAL, "got %d\n", logfont.lfWeight);
ok(logfont.lfEscapement == 0, "got %d\n", logfont.lfEscapement);
ok(logfont.lfItalic == 1, "got %d\n", logfont.lfItalic);
ok(logfont.lfUnderline == 0, "got %d\n", logfont.lfUnderline);
ok(logfont.lfStrikeOut == 0, "got %d\n", logfont.lfStrikeOut);
ok(!lstrcmpW(logfont.lfFaceName, tahomaW), "got %s\n", wine_dbgstr_w(logfont.lfFaceName));
IDWriteGdiInterop_Release(interop);
IDWriteFontFace_Release(fontface);
}
START_TEST(font)
{
HRESULT hr;
@ -580,6 +632,7 @@ START_TEST(font)
test_CreateFontFace();
test_GetMetrics();
test_system_fontcollection();
test_ConvertFontFaceToLOGFONT();
IDWriteFactory_Release(factory);
}