wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 40fef0fb71b079c1bf9667d80384cc43ec7f11fd

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2019-05-14 08:18:42 +10:00
parent 6e49a945cf
commit f3e2363b52
5 changed files with 23 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
patches/dwrite-FontFallback/0001-dwrite-Test-IDWriteTextFormat-with-nonexistent-font.patch
View File

@@ -1,15 +1,15 @@
From e2978c13fca913a14991e286c463ede69f61831d Mon Sep 17 00:00:00 2001
From 947b2e9978e50d159f8bc368aa1d5e967c1ad593 Mon Sep 17 00:00:00 2001
From: Lucian Poston <lucianposton@pm.me>
Date: Sun, 20 May 2018 21:40:39 -0700
Subject: [PATCH 1/6] dwrite: Test IDWriteTextFormat with nonexistent font
Subject: [PATCH] dwrite: Test IDWriteTextFormat with nonexistent font
Signed-off-by: Lucian Poston <lucianposton@pm.me>
---
dlls/dwrite/tests/layout.c | 46 ++++++++++++++++++++++++++++++++++++++
dlls/dwrite/tests/layout.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 46 insertions(+)
diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c
index 652f6b78ac..4198b8a1b1 100644
index 8337ce7..03da3c0 100644
--- a/dlls/dwrite/tests/layout.c
+++ b/dlls/dwrite/tests/layout.c
@@ -30,6 +30,7 @@
@@ -20,11 +20,10 @@ index 652f6b78ac..4198b8a1b1 100644
static const WCHAR enusW[] = {'e','n','-','u','s',0};
struct testanalysissink
@@ -3292,6 +3293,51 @@ todo_wine
ok(metrics.lineCount == 1, "got %u\n", metrics.lineCount);
@@ -3311,6 +3312,51 @@ todo_wine
IDWriteTextLayout_Release(layout);
+ IDWriteTextFormat_Release(format);
IDWriteTextFormat_Release(format);
+
+ /* nonexistent font */
+ hr = IDWriteFactory_CreateTextFormat(factory, nonExistentFontW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL,
@@ -69,9 +68,10 @@ index 652f6b78ac..4198b8a1b1 100644
+
+ IDWriteTextLayout_Release(layout);
+
IDWriteTextFormat_Release(format);
+ IDWriteTextFormat_Release(format);
IDWriteFactory_Release(factory);
}
--
2.18.0
1.9.1