Nikolay Sivov : gdiplus/tests: Fix copy/paste error in format tests.

Alexandre Julliard julliard at winehq.org
Fri Apr 28 12:44:31 CDT 2017


Module: wine
Branch: master
Commit: 8b649fe2f4ba9b5b5b1f5c016f70b67d3c8a0413
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8b649fe2f4ba9b5b5b1f5c016f70b67d3c8a0413

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Fri Apr 28 01:20:30 2017 +0300

gdiplus/tests: Fix copy/paste error in format tests.

Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Vincent Povirk <vincent at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/gdiplus/tests/stringformat.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/dlls/gdiplus/tests/stringformat.c b/dlls/gdiplus/tests/stringformat.c
index f0fcff9..f7f7a8f 100644
--- a/dlls/gdiplus/tests/stringformat.c
+++ b/dlls/gdiplus/tests/stringformat.c
@@ -30,7 +30,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;
@@ -39,7 +39,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);
@@ -47,7 +47,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);
@@ -144,7 +144,7 @@ static void test_getgenerictypographic(void)
     GpStatus stat;
     INT flags;
     INT n;
-    StringAlignment align, valign;
+    StringAlignment align, line_align;
     StringTrimming trimming;
     StringDigitSubstitute digitsub;
     LANGID digitlang;
@@ -159,7 +159,7 @@ static void test_getgenerictypographic(void)
 
     GdipGetStringFormatFlags(format, &flags);
     GdipGetStringFormatAlign(format, &align);
-    GdipGetStringFormatLineAlign(format, &valign);
+    GdipGetStringFormatLineAlign(format, &line_align);
     GdipGetStringFormatHotkeyPrefix(format, &n);
     GdipGetStringFormatTrimming(format, &trimming);
     GdipGetStringFormatDigitSubstitution(format, &digitlang, &digitsub);
@@ -169,7 +169,7 @@ 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);
@@ -291,7 +291,7 @@ static void test_getgenericdefault(void)
 
     INT flags;
     INT n;
-    StringAlignment align, valign;
+    StringAlignment align, line_align;
     StringTrimming trimming;
     StringDigitSubstitute digitsub;
     LANGID digitlang;
@@ -306,7 +306,7 @@ static void test_getgenericdefault(void)
 
     GdipGetStringFormatFlags(format, &flags);
     GdipGetStringFormatAlign(format, &align);
-    GdipGetStringFormatLineAlign(format, &valign);
+    GdipGetStringFormatLineAlign(format, &line_align);
     GdipGetStringFormatHotkeyPrefix(format, &n);
     GdipGetStringFormatTrimming(format, &trimming);
     GdipGetStringFormatDigitSubstitution(format, &digitlang, &digitsub);
@@ -315,7 +315,7 @@ 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);




More information about the wine-cvs mailing list