From 20b08209f84a73cf93980b10ae37685358de0e52 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 3 Jun 2017 19:01:59 +0000 Subject: [PATCH] [GDIPLUS_WINETEST] Sync with Wine Staging 2.9. CORE-13362 svn path=/trunk/; revision=74796 --- rostests/winetests/gdiplus/font.c | 6 ++ rostests/winetests/gdiplus/region.c | 2 + rostests/winetests/gdiplus/stringformat.c | 70 +++++++++++++++++++---- 3 files changed, 67 insertions(+), 11 deletions(-) diff --git a/rostests/winetests/gdiplus/font.c b/rostests/winetests/gdiplus/font.c index c49878c9787..19405f7d939 100644 --- a/rostests/winetests/gdiplus/font.c +++ b/rostests/winetests/gdiplus/font.c @@ -553,6 +553,12 @@ static void gdip_get_font_metrics(GpFont *font, struct font_metrics *fm) stat = GdipGetFontStyle(font, &style); expect(Ok, stat); + stat = GdipGetFontHeight(NULL, NULL, &fm->font_height); + expect(InvalidParameter, stat); + + stat = GdipGetFontHeight(font, NULL, NULL); + expect(InvalidParameter, stat); + stat = GdipGetFontHeight(font, NULL, &fm->font_height); expect(Ok, stat); stat = GdipGetFontSize(font, &fm->font_size); diff --git a/rostests/winetests/gdiplus/region.c b/rostests/winetests/gdiplus/region.c index bb23fa09654..b09c55c8637 100644 --- a/rostests/winetests/gdiplus/region.c +++ b/rostests/winetests/gdiplus/region.c @@ -152,6 +152,8 @@ static void test_region_data(DWORD *data, UINT size, INT line) /* some Windows versions fail to properly clear the aligned DWORD */ ok_(__FILE__, line)(data[size - 1] == buf[size - 1] || broken(data[size - 1] != buf[size - 1]), "off %u: %#x != %#x\n", size - 1, data[size - 1], buf[size - 1]); + + GdipDeleteRegion(region); } static void test_getregiondata(void) diff --git a/rostests/winetests/gdiplus/stringformat.c b/rostests/winetests/gdiplus/stringformat.c index f6f0acb9b16..0135d6e4393 100644 --- a/rostests/winetests/gdiplus/stringformat.c +++ b/rostests/winetests/gdiplus/stringformat.c @@ -36,7 +36,7 @@ static void test_constructor(void) GpStringFormat *format; GpStatus stat; INT n, count; - StringAlignment align, valign; + StringAlignment align, line_align; StringTrimming trimming; StringDigitSubstitute digitsub; LANGID digitlang; @@ -45,7 +45,7 @@ static void test_constructor(void) expect(Ok, stat); GdipGetStringFormatAlign(format, &align); - GdipGetStringFormatLineAlign(format, &valign); + GdipGetStringFormatLineAlign(format, &line_align); GdipGetStringFormatHotkeyPrefix(format, &n); GdipGetStringFormatTrimming(format, &trimming); GdipGetStringFormatDigitSubstitution(format, &digitlang, &digitsub); @@ -53,7 +53,7 @@ static void test_constructor(void) expect(HotkeyPrefixNone, n); expect(StringAlignmentNear, align); - expect(StringAlignmentNear, align); + expect(StringAlignmentNear, line_align); expect(StringTrimmingCharacter, trimming); expect(StringDigitSubstituteUser, digitsub); expect(LANG_NEUTRAL, digitlang); @@ -146,11 +146,11 @@ static void test_digitsubstitution(void) static void test_getgenerictypographic(void) { - GpStringFormat *format; + GpStringFormat *format, *format2; GpStatus stat; INT flags; INT n; - StringAlignment align, valign; + StringAlignment align, line_align; StringTrimming trimming; StringDigitSubstitute digitsub; LANGID digitlang; @@ -163,9 +163,15 @@ static void test_getgenerictypographic(void) stat = GdipStringFormatGetGenericTypographic(&format); expect(Ok, stat); + stat = GdipStringFormatGetGenericTypographic(&format2); + expect(Ok, stat); + ok(format == format2, "expected same format object\n"); + stat = GdipDeleteStringFormat(format2); + expect(Ok, stat); + GdipGetStringFormatFlags(format, &flags); GdipGetStringFormatAlign(format, &align); - GdipGetStringFormatLineAlign(format, &valign); + GdipGetStringFormatLineAlign(format, &line_align); GdipGetStringFormatHotkeyPrefix(format, &n); GdipGetStringFormatTrimming(format, &trimming); GdipGetStringFormatDigitSubstitution(format, &digitlang, &digitsub); @@ -175,12 +181,30 @@ static void test_getgenerictypographic(void) flags); expect(HotkeyPrefixNone, n); expect(StringAlignmentNear, align); - expect(StringAlignmentNear, align); + expect(StringAlignmentNear, line_align); expect(StringTrimmingNone, trimming); expect(StringDigitSubstituteUser, digitsub); expect(LANG_NEUTRAL, digitlang); expect(0, tabcount); + /* Change format parameters, release, get format object again. */ + stat = GdipSetStringFormatFlags(format, StringFormatFlagsNoWrap); + expect(Ok, stat); + + stat = GdipGetStringFormatFlags(format, &flags); + expect(Ok, stat); + expect(StringFormatFlagsNoWrap, flags); + + stat = GdipDeleteStringFormat(format); + expect(Ok, stat); + + stat = GdipStringFormatGetGenericTypographic(&format); + expect(Ok, stat); + + stat = GdipGetStringFormatFlags(format, &flags); + expect(Ok, stat); + expect(StringFormatFlagsNoWrap, flags); + stat = GdipDeleteStringFormat(format); expect(Ok, stat); } @@ -292,12 +316,12 @@ static void test_tabstops(void) static void test_getgenericdefault(void) { - GpStringFormat *format; + GpStringFormat *format, *format2; GpStatus stat; INT flags; INT n; - StringAlignment align, valign; + StringAlignment align, line_align; StringTrimming trimming; StringDigitSubstitute digitsub; LANGID digitlang; @@ -310,9 +334,15 @@ static void test_getgenericdefault(void) stat = GdipStringFormatGetGenericDefault(&format); expect(Ok, stat); + stat = GdipStringFormatGetGenericDefault(&format2); + expect(Ok, stat); + ok(format == format2, "expected same format object\n"); + stat = GdipDeleteStringFormat(format2); + expect(Ok, stat); + GdipGetStringFormatFlags(format, &flags); GdipGetStringFormatAlign(format, &align); - GdipGetStringFormatLineAlign(format, &valign); + GdipGetStringFormatLineAlign(format, &line_align); GdipGetStringFormatHotkeyPrefix(format, &n); GdipGetStringFormatTrimming(format, &trimming); GdipGetStringFormatDigitSubstitution(format, &digitlang, &digitsub); @@ -321,12 +351,30 @@ static void test_getgenericdefault(void) expect(0, flags); expect(HotkeyPrefixNone, n); expect(StringAlignmentNear, align); - expect(StringAlignmentNear, align); + expect(StringAlignmentNear, line_align); expect(StringTrimmingCharacter, trimming); expect(StringDigitSubstituteUser, digitsub); expect(LANG_NEUTRAL, digitlang); expect(0, tabcount); + /* Change default format parameters, release, get format object again. */ + stat = GdipSetStringFormatFlags(format, StringFormatFlagsNoWrap); + expect(Ok, stat); + + stat = GdipGetStringFormatFlags(format, &flags); + expect(Ok, stat); + expect(StringFormatFlagsNoWrap, flags); + + stat = GdipDeleteStringFormat(format); + expect(Ok, stat); + + stat = GdipStringFormatGetGenericDefault(&format); + expect(Ok, stat); + + stat = GdipGetStringFormatFlags(format, &flags); + expect(Ok, stat); + expect(StringFormatFlagsNoWrap, flags); + stat = GdipDeleteStringFormat(format); expect(Ok, stat); } -- 2.17.1