dwrite: Remove "crashes on native" tests that were already if(0)-ed. if(0)-ed.
Gerald Pfeifer
gerald at pfeifer.com
Tue Jan 12 05:44:10 CST 2016
I noticed those via the new -Wmisleading-indentation warnings. All
of these are tests that are disabled (if (0)) since they crash native.
Am I missing something, or can we just remove them as dead code?
(If not, okay to add braces for those cases not having them yet?)
Gerald
Signed-off-by: Gerald Pfeifer <gerald at pfeifer.com>
---
dlls/dwrite/tests/layout.c | 21 ---------------------
1 file changed, 21 deletions(-)
diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c
index bb5963f..45109ba 100644
--- a/dlls/dwrite/tests/layout.c
+++ b/dlls/dwrite/tests/layout.c
@@ -910,9 +910,6 @@ static void test_CreateTextFormat(void)
DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format);
ok(hr == S_OK, "got 0x%08x\n", hr);
-if (0) /* crashes on native */
- hr = IDWriteTextFormat_GetFontCollection(format, NULL);
-
collection = NULL;
hr = IDWriteTextFormat_GetFontCollection(format, &collection);
ok(hr == S_OK, "got 0x%08x\n", hr);
@@ -1074,10 +1071,6 @@ static void test_CreateEllipsisTrimmingSign(void)
hr = IDWriteInlineObject_QueryInterface(sign, &IID_IDWriteTextLayout, (void**)&unk);
ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr);
-if (0) {/* crashes on native */
- hr = IDWriteInlineObject_GetBreakConditions(sign, NULL, NULL);
- hr = IDWriteInlineObject_GetMetrics(sign, NULL);
-}
metrics.width = 0.0;
metrics.height = 123.0;
metrics.baseline = 123.0;
@@ -2056,9 +2049,6 @@ static void test_SetLocaleName(void)
hr = IDWriteTextLayout_GetLocaleName(layout, 0, NULL, 0, NULL);
ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
-if (0) /* crashes on native */
- hr = IDWriteTextLayout_GetLocaleName(layout, 0, NULL, 1, NULL);
-
buffW[0] = 0;
range.length = 0;
hr = IDWriteTextLayout_GetLocaleName(layout, 0, buffW, sizeof(buffW)/sizeof(WCHAR), &range);
@@ -2149,11 +2139,6 @@ static void test_SetPairKerning(void)
return;
}
-if (0) { /* crashes on native */
- hr = IDWriteTextLayout1_GetPairKerning(layout1, 0, NULL, NULL);
- hr = IDWriteTextLayout1_GetPairKerning(layout1, 0, NULL, &range);
-}
-
hr = IDWriteTextLayout1_GetPairKerning(layout1, 0, &kerning, NULL);
ok(hr == S_OK, "got 0x%08x\n", hr);
@@ -2270,9 +2255,6 @@ static void test_fallback(void)
return;
}
-if (0) /* crashes on native */
- hr = IDWriteTextLayout2_GetFontFallback(layout2, NULL);
-
fallback = (void*)0xdeadbeef;
hr = IDWriteTextLayout2_GetFontFallback(layout2, &fallback);
ok(hr == S_OK, "got 0x%08x\n", hr);
@@ -4054,9 +4036,6 @@ static void test_FontFallbackBuilder(void)
hr = IDWriteFontFallbackBuilder_AddMapping(builder, &range, 1, &familyW, 1, NULL, NULL, NULL, 4.0f);
ok(hr == S_OK, "got 0x%08x\n", hr);
-if (0) /* crashes on native */
- hr = IDWriteFontFallbackBuilder_CreateFontFallback(builder, NULL);
-
hr = IDWriteFontFallbackBuilder_CreateFontFallback(builder, &fallback);
ok(hr == S_OK, "got 0x%08x\n", hr);
--
2.6.4
More information about the wine-patches
mailing list