[PATCH 3/9] dwrite/tests: Do not segfault in tests if NULL is returned.

Giovanni Mascellani gmascellani at codeweavers.com
Thu Mar 4 04:23:06 CST 2021


Signed-off-by: Giovanni Mascellani <gmascellani at codeweavers.com>
---
 dlls/dwrite/tests/layout.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c
index df2cdb36f1c..11fb6e1541d 100644
--- a/dlls/dwrite/tests/layout.c
+++ b/dlls/dwrite/tests/layout.c
@@ -4761,6 +4761,7 @@ if (font) {
     ok(scale == 1.0f, "got %f\n", scale);
     ok(font != NULL, "got %p\n", font);
 
+if (font) {
     exists = FALSE;
     hr = IDWriteFont_GetInformationalStrings(font, DWRITE_INFORMATIONAL_STRING_WIN32_FAMILY_NAMES, &strings, &exists);
     ok(hr == S_OK && exists, "got 0x%08x, exists %d\n", hr, exists);
@@ -4769,6 +4770,7 @@ if (font) {
     ok(!lstrcmpW(buffW, L"Tahoma"), "Unexpected string %s.\n", wine_dbgstr_w(buffW));
     IDWriteLocalizedStrings_Release(strings);
     IDWriteFont_Release(font);
+}
 
     /* 2. Hiragana character, force Tahoma font does not support Japanese */
     g_source = str2W;
@@ -4782,6 +4784,7 @@ if (font) {
     ok(scale == 1.0f, "got %f\n", scale);
     ok(font != NULL, "got %p\n", font);
 
+if (font) {
     exists = FALSE;
     hr = IDWriteFont_GetInformationalStrings(font, DWRITE_INFORMATIONAL_STRING_WIN32_FAMILY_NAMES, &strings, &exists);
     ok(hr == S_OK && exists, "got 0x%08x, exists %d\n", hr, exists);
@@ -4791,6 +4794,7 @@ todo_wine
     ok(lstrcmpW(buffW, L"Tahoma"), "Unexpected string %s.\n", wine_dbgstr_w(buffW));
     IDWriteLocalizedStrings_Release(strings);
     IDWriteFont_Release(font);
+}
 
     IDWriteFontFallback_Release(fallback);
     IDWriteFactory2_Release(factory2);
-- 
2.30.1




More information about the wine-devel mailing list