[PATCH 3/6] dwrite: Skip failing font metrics test for Goha
Lucian Poston
lucianposton at pm.me
Wed May 23 13:06:09 CDT 2018
Signed-off-by: Lucian Poston <lucianposton at pm.me>
---
dlls/dwrite/tests/layout.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c
index 2b665fd74e..5157d0562d 100644
--- a/dlls/dwrite/tests/layout.c
+++ b/dlls/dwrite/tests/layout.c
@@ -622,6 +622,7 @@ static HRESULT WINAPI testrenderer_DrawUnderline(IDWriteTextRenderer *iface,
{
struct renderer_context *ctxt = (struct renderer_context*)context;
struct drawcall_entry entry = { 0 };
+ static const WCHAR gohaW[] = {'G','o','h','a','-','T','i','b','e','b',' ','Z','e','m','e','n',0};
if (ctxt)
TEST_MEASURING_MODE(ctxt, underline->measuringMode);
@@ -637,9 +638,13 @@ static HRESULT WINAPI testrenderer_DrawUnderline(IDWriteTextRenderer *iface,
IDWriteFontFace_GetMetrics(fontface, &metrics);
ok(emsize == metrics.designUnitsPerEm, "Unexpected font size %f\n", emsize);
- /* Expected height is in design units, allow some absolute difference from it. Seems to only happen on Vista */
- ok(fabs(metrics.capHeight - underline->runHeight) < 2.0f, "Expected runHeight %u, got %f, family %s\n",
- metrics.capHeight, underline->runHeight, wine_dbgstr_w(ctxt->familyW));
+ if (lstrcmpW(gohaW, ctxt->familyW)) {
+ /* Expected height is in design units, allow some absolute difference from it. Seems to only happen on Vista */
+ ok(fabs(metrics.capHeight - underline->runHeight) < 2.0f, "Expected runHeight %u, got %f, family %s\n",
+ metrics.capHeight, underline->runHeight, wine_dbgstr_w(ctxt->familyW));
+ } else {
+ skip("%s is an invalid font, rejected by windows.\n", wine_dbgstr_w(gohaW));
+ }
IDWriteFontFace_Release(fontface);
}
--
2.16.1
More information about the wine-devel
mailing list