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 ba858c28fd489a812ea0f55a11680a8edaf99ce5.

Browse Source
This commit is contained in:
Sebastian Lackner
2016-08-09 20:42:49 +02:00
parent 929a758ef4
commit b727968b45
5 changed files with 83 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

248
patches/Compiler_Warnings/0002-dwrite-tests-Avoid-misleading-indentation-warnings.patch
View File

@@ -1,248 +0,0 @@
From 41ec9334edb0453cbc979d7655b430061af02dbb Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 30 Jul 2016 23:54:51 +0200
Subject: dwrite/tests: Avoid misleading indentation warnings.
---
dlls/dwrite/tests/analyzer.c | 2 ++
dlls/dwrite/tests/font.c | 28 ++++++++++++++++++++++++++++
dlls/dwrite/tests/layout.c | 14 ++++++++++++++
3 files changed, 44 insertions(+)
diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c
index 1e3b318..ddd3584 100644
--- a/dlls/dwrite/tests/analyzer.c
+++ b/dlls/dwrite/tests/analyzer.c
@@ -1167,7 +1167,9 @@ static void test_GetScriptProperties(void)
ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
if (0) /* crashes on native */
+{
hr = IDWriteTextAnalyzer1_GetScriptProperties(analyzer1, sa, NULL);
+}
sa.script = 0;
hr = IDWriteTextAnalyzer1_GetScriptProperties(analyzer1, sa, &props);
diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c
index 3b402b8..5691388 100644
--- a/dlls/dwrite/tests/font.c
+++ b/dlls/dwrite/tests/font.c
@@ -842,8 +842,10 @@ static void test_CreateFontFromLOGFONT(void)
EXPECT_HR(hr, S_OK);
if (0)
+{
/* null out parameter crashes this call */
hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, NULL, NULL);
+}
font = (void*)0xdeadbeef;
hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, NULL, &font);
@@ -1013,7 +1015,9 @@ static void test_CreateBitmapRenderTarget(void)
EXPECT_HR(hr, S_OK);
if (0) /* crashes on native */
+{
hr = IDWriteBitmapRenderTarget_GetSize(target, NULL);
+}
size.cx = size.cy = -1;
hr = IDWriteBitmapRenderTarget_GetSize(target, &size);
@@ -1159,7 +1163,9 @@ if (0) /* crashes on native */
/* transform tests, current hdc transform is not immediately affected */
if (0) /* crashes on native */
+{
hr = IDWriteBitmapRenderTarget_GetCurrentTransform(target, NULL);
+}
memset(&m, 0xcc, sizeof(m));
hr = IDWriteBitmapRenderTarget_GetCurrentTransform(target, &m);
@@ -1406,7 +1412,9 @@ static void test_GetFamilyNames(void)
EXPECT_HR(hr, S_OK);
if (0) /* crashes on native */
+{
hr = IDWriteFontFamily_GetFamilyNames(family, NULL);
+}
hr = IDWriteFontFamily_GetFamilyNames(family, &names);
ok(hr == S_OK, "got 0x%08x\n", hr);
@@ -1421,7 +1429,9 @@ if (0) /* crashes on native */
/* GetStringLength */
if (0) /* crashes on native */
+{
hr = IDWriteLocalizedStrings_GetStringLength(names, 0, NULL);
+}
len = 100;
hr = IDWriteLocalizedStrings_GetStringLength(names, 10, &len);
@@ -1441,7 +1451,9 @@ if (0) /* crashes on native */
ok(hr == E_FAIL, "got 0x%08x\n", hr);
if (0)
+{
hr = IDWriteLocalizedStrings_GetString(names, 0, NULL, 100);
+}
buffer[0] = 1;
hr = IDWriteLocalizedStrings_GetString(names, 10, buffer, 100);
@@ -1513,7 +1525,9 @@ static void test_CreateFontFace(void)
ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr);
if (0) /* crashes on native */
+{
hr = IDWriteFont_CreateFontFace(font, NULL);
+}
fontface = NULL;
hr = IDWriteFont_CreateFontFace(font, &fontface);
@@ -1846,7 +1860,9 @@ static void test_GetMetrics(void)
DeleteObject(hfont);
if (0) /* crashes on native */
+{
IDWriteFont_GetMetrics(font, NULL);
+}
memset(&metrics, 0, sizeof(metrics));
IDWriteFont_GetMetrics(font, &metrics);
@@ -2649,7 +2665,9 @@ if (0) { /* crashes on win10 */
todo_wine
ok(hr == S_OK, "got 0x%08x\n", hr);
if (face2)
+{
IDWriteFontFace_Release(face2);
+}
file2 = NULL;
hr = IDWriteFactory_CreateCustomFontFileReference(factory, &fontrsrc, sizeof(HRSRC), &rloader, &file2);
@@ -2682,7 +2700,9 @@ if (face2)
ok(indices[1] == 11, "got index %i\n", indices[1]);
if (0) /* crashes on native */
+{
hr = IDWriteFontFace_GetGlyphIndices(face, NULL, 1, NULL);
+}
hr = IDWriteFontFace_GetGlyphIndices(face, codePoints, 1, indices);
ok(hr == S_OK, "got 0x%08x\n", hr);
@@ -4130,7 +4150,9 @@ static void test_GetKerningPairAdjustments(void)
ok(hr == E_INVALIDARG || broken(hr == S_OK) /* win8 */, "got 0x%08x\n", hr);
if (0) /* crashes on native */
+ {
hr = IDWriteFontFace1_GetKerningPairAdjustments(fontface1, 1, NULL, NULL);
+ }
adjustments[0] = 1;
hr = IDWriteFontFace1_GetKerningPairAdjustments(fontface1, 1, NULL, adjustments);
@@ -4837,7 +4859,9 @@ static void test_GetGdiCompatibleMetrics_face(IDWriteFontFace *face)
expected.subscriptSizeY = round(round(design_metrics1.subscriptSizeY * scale) / scale);
expected.superscriptPositionX = round(round(design_metrics1.superscriptPositionX * scale) / scale);
if (0) /* this fails for 3 emsizes, Tahoma from [5, 2048] range */
+ {
expected.superscriptPositionY = round(round(design_metrics1.superscriptPositionY * scale) / scale);
+ }
expected.superscriptSizeX = round(round(design_metrics1.superscriptSizeX * scale) / scale);
expected.superscriptSizeY = round(round(design_metrics1.superscriptSizeY * scale) / scale);
expected.hasTypographicMetrics = design_metrics1.hasTypographicMetrics;
@@ -4904,7 +4928,9 @@ static void test_GetPanose(void)
DWRITE_PANOSE panose;
if (0) /* crashes on native */
+ {
IDWriteFont1_GetPanose(font1, NULL);
+ }
memset(&panose, 0, sizeof(panose));
IDWriteFont1_GetPanose(font1, &panose);
@@ -5211,8 +5237,10 @@ static void test_GetRecommendedRenderingMode(void)
win_skip("IDWriteFontFace3::GetRecommendedRenderingMode() is not supported.\n");
if (0) /* crashes on native */
+{
hr = IDWriteFontFace_GetRecommendedRenderingMode(fontface, 3.0, 1.0,
DWRITE_MEASURING_MODE_GDI_CLASSIC, NULL, NULL);
+}
mode = 10;
hr = IDWriteFontFace_GetRecommendedRenderingMode(fontface, 3.0, 1.0,
diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c
index 03038d8..d92d419 100644
--- a/dlls/dwrite/tests/layout.c
+++ b/dlls/dwrite/tests/layout.c
@@ -983,7 +983,9 @@ static void test_CreateTextFormat(void)
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);
@@ -2235,7 +2237,9 @@ static void test_SetLocaleName(void)
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;
@@ -2447,7 +2451,9 @@ static void test_fallback(void)
}
if (0) /* crashes on native */
+{
hr = IDWriteTextLayout2_GetFontFallback(layout2, NULL);
+}
fallback = (void*)0xdeadbeef;
hr = IDWriteTextLayout2_GetFontFallback(layout2, &fallback);
@@ -4371,7 +4377,9 @@ todo_wine {
todo_wine
ok(font != NULL, "got %p\n", font);
if (font)
+{
IDWriteFont_Release(font);
+}
/* same latin text, full length */
g_source = strW;
@@ -4388,7 +4396,9 @@ todo_wine {
todo_wine
ok(font != NULL, "got %p\n", font);
if (font)
+{
IDWriteFont_Release(font);
+}
/* string 'a\x3058b' */
g_source = str2W;
@@ -4405,7 +4415,9 @@ todo_wine {
todo_wine
ok(font != NULL, "got %p\n", font);
if (font)
+{
IDWriteFont_Release(font);
+}
g_source = str2W;
mappedlength = 0;
@@ -4545,7 +4557,9 @@ static void test_FontFallbackBuilder(void)
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.9.0