October 2012 - Wine-Commits

Francois Gouget : testbot/lib: Automatically reconnect to the database.
by Alexandre Julliard Oct. 26, 2012

Oct. 26, 2012

Module: tools Branch: master Commit: e81915fade44523f693da35762847a521feea824 URL: http://source.winehq.org/git/tools.git/?a=commit;h=e81915fade44523f693da357… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Oct 26 18:18:28 2012 +0200 testbot/lib: Automatically reconnect to the database. This way short idle timeouts don't break WineTestBot. --- testbot/lib/ObjectModel/DBIBackEnd.pm | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index 5e61eed..72ff3c5 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -43,7 +43,13 @@ sub GetDb { my $self = shift; - if (! defined($self->{Db})) + if (defined $self->{Db} && !$self->{Db}->ping()) + { + # This connection no longer works, probably due to the database idle timeout + $self->{Db}->disconnect(); + $self->{Db} = undef; + } + if (!defined $self->{Db}) { $self->{Db} = DBI->connect(@{$self->{ConnectArgs}}); }

1 0

Dmitry Timoshkov : gdiplus: GdipGetLogFont should use device scale and transform when appropriate.
by Alexandre Julliard Oct. 26, 2012

Oct. 26, 2012

Module: wine Branch: master Commit: 84ea75f1c69df802c8e37e79a59a3819fc1748d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84ea75f1c69df802c8e37e79a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 24 18:11:29 2012 +0900 gdiplus: GdipGetLogFont should use device scale and transform when appropriate. --- dlls/gdiplus/font.c | 30 +++++++++++++++++++++++++----- dlls/gdiplus/tests/font.c | 21 +++++++-------------- 2 files changed, 32 insertions(+), 19 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 6588f12..f6a5d1c 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -454,18 +454,22 @@ GpStatus WINGDIPAPI GdipGetLogFontA(GpFont *font, GpGraphics *graphics, */ GpStatus WINGDIPAPI GdipGetLogFontW(GpFont *font, GpGraphics *graphics, LOGFONTW *lf) { - REAL height; + REAL angle, rel_height, height; + GpMatrix *matrix; + GpPointF pt[3]; TRACE("(%p, %p, %p)\n", font, graphics, lf); if (!font || !graphics || !lf) return InvalidParameter; + GdipCloneMatrix(graphics->worldtrans, &matrix); + if (font->unit == UnitPixel) { height = units_to_pixels(font->emSize, graphics->unit, graphics->yres); if (graphics->unit != UnitDisplay) - height *= graphics->scale; + GdipScaleMatrix(matrix, graphics->scale, graphics->scale, MatrixOrderAppend); } else { @@ -475,10 +479,26 @@ GpStatus WINGDIPAPI GdipGetLogFontW(GpFont *font, GpGraphics *graphics, LOGFONTW height = units_to_pixels(font->emSize, font->unit, graphics->yres); } - lf->lfHeight = -(height + 0.5); + pt[0].X = 0.0; + pt[0].Y = 0.0; + pt[1].X = 1.0; + pt[1].Y = 0.0; + pt[2].X = 0.0; + pt[2].Y = 1.0; + GdipTransformMatrixPoints(matrix, pt, 3); + angle = -gdiplus_atan2((pt[1].Y - pt[0].Y), (pt[1].X - pt[0].X)); + rel_height = sqrt((pt[2].Y - pt[0].Y) * (pt[2].Y - pt[0].Y)+ + (pt[2].X - pt[0].X) * (pt[2].X - pt[0].X)); + GdipDeleteMatrix(matrix); + + lf->lfHeight = -gdip_round(height * rel_height); lf->lfWidth = 0; - lf->lfEscapement = 0; - lf->lfOrientation = 0; + lf->lfEscapement = lf->lfOrientation = gdip_round((angle / M_PI) * 1800.0); + if (lf->lfEscapement < 0) + { + lf->lfEscapement += 3600; + lf->lfOrientation += 3600; + } lf->lfWeight = font->otm.otmTextMetrics.tmWeight; lf->lfItalic = font->otm.otmTextMetrics.tmItalic ? 1 : 0; lf->lfUnderline = font->otm.otmTextMetrics.tmUnderlined ? 1 : 0; diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index fade7d3..de6d657 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -26,6 +26,7 @@ #include "wine/test.h" #define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) +#define expect_(expected, got, precision) ok(abs((expected) - (got)) <= (precision), "Expected %d, got %d\n", (expected), (got)) #define expectf_(expected, got, precision) ok(fabs((expected) - (got)) <= (precision), "Expected %f, got %f\n", (expected), (got)) #define expectf(expected, got) expectf_((expected), (got), 0.001) @@ -904,7 +905,6 @@ todo_wine expect(Ok, status); status = GdipGetLogFontA(font, graphics, &lf); expect(Ok, status); -todo_wine expect(-300, lf.lfHeight); expect(0, lf.lfWidth); expect(0, lf.lfEscapement); @@ -954,13 +954,10 @@ todo_wine expect(Ok, status); status = GdipGetLogFontA(font, graphics, &lf); expect(Ok, status); -todo_wine expect(-300, lf.lfHeight); expect(0, lf.lfWidth); -todo_wine - expect(3151, lf.lfEscapement); -todo_wine - expect(3151, lf.lfOrientation); + expect_(3151, lf.lfEscapement, 1); + expect_(3151, lf.lfOrientation, 1); status = GdipGetFontHeight(font, graphics, &height); expect(Ok, status); expectf(120.703125, height); @@ -1010,10 +1007,8 @@ todo_wine todo_wine expect(1032, lf.lfHeight); expect(0, lf.lfWidth); -todo_wine - expect(3099, lf.lfEscapement); -todo_wine - expect(3099, lf.lfOrientation); + expect_(3099, lf.lfEscapement, 1); + expect_(3099, lf.lfOrientation, 1); status = GdipGetFontHeight(font, graphics, &height); expect(Ok, status); expectf(120.703125, height); @@ -1063,10 +1058,8 @@ todo_wine todo_wine expect(1032, lf.lfHeight); expect(0, lf.lfWidth); -todo_wine - expect(3099, lf.lfEscapement); -todo_wine - expect(3099, lf.lfOrientation); + expect_(3099, lf.lfEscapement, 1); + expect_(3099, lf.lfOrientation, 1); status = GdipGetFontHeight(font, graphics, &height); expect(Ok, status); expectf(120.703125, height);

1 0

Frédéric Delanoy : cmd: Display a clearer error message for not found commands.
by Alexandre Julliard Oct. 26, 2012

Oct. 26, 2012

1 0

Dmitry Timoshkov : gdiplus: Move internal helper get_log_fontW() out of public GdipGetLogFontW() export.
by Alexandre Julliard Oct. 26, 2012

Oct. 26, 2012

Module: wine Branch: master Commit: 71eb1644821bb2707c5d6ccf3a14436ddb91410e URL: http://source.winehq.org/git/wine.git/?a=commit;h=71eb1644821bb2707c5d6ccf3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 24 18:10:30 2012 +0900 gdiplus: Move internal helper get_log_fontW() out of public GdipGetLogFontW() export. --- dlls/gdiplus/font.c | 25 ++++++++++--------------- dlls/gdiplus/graphics.c | 34 ++++++++++++++++++++++++++++++++-- 2 files changed, 42 insertions(+), 17 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index e4f979c..6588f12 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -449,10 +449,18 @@ GpStatus WINGDIPAPI GdipGetLogFontA(GpFont *font, GpGraphics *graphics, return Ok; } -void get_log_fontW(const GpFont *font, GpGraphics *graphics, LOGFONTW *lf) +/******************************************************************************* + * GdipGetLogFontW [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipGetLogFontW(GpFont *font, GpGraphics *graphics, LOGFONTW *lf) { REAL height; + TRACE("(%p, %p, %p)\n", font, graphics, lf); + + if (!font || !graphics || !lf) + return InvalidParameter; + if (font->unit == UnitPixel) { height = units_to_pixels(font->emSize, graphics->unit, graphics->yres); @@ -481,21 +489,8 @@ void get_log_fontW(const GpFont *font, GpGraphics *graphics, LOGFONTW *lf) lf->lfQuality = DEFAULT_QUALITY; lf->lfPitchAndFamily = 0; strcpyW(lf->lfFaceName, font->family->FamilyName); -} - -/******************************************************************************* - * GdipGetLogFontW [GDIPLUS.@] - */ -GpStatus WINGDIPAPI GdipGetLogFontW(GpFont *font, GpGraphics *graphics, - LOGFONTW *lfw) -{ - TRACE("(%p, %p, %p)\n", font, graphics, lfw); - - if(!font || !graphics || !lfw) - return InvalidParameter; - get_log_fontW(font, graphics, lfw); - TRACE("=> %s,%d\n", debugstr_w(lfw->lfFaceName), lfw->lfHeight); + TRACE("=> %s,%d\n", debugstr_w(lf->lfFaceName), lf->lfHeight); return Ok; } diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index b2ebf40..726885b 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2133,6 +2133,38 @@ end: return stat; } +void get_log_fontW(const GpFont *font, GpGraphics *graphics, LOGFONTW *lf) +{ + REAL height; + + if (font->unit == UnitPixel) + { + height = units_to_pixels(font->emSize, graphics->unit, graphics->yres); + } + else + { + if (graphics->unit == UnitDisplay || graphics->unit == UnitPixel) + height = units_to_pixels(font->emSize, font->unit, graphics->xres); + else + height = units_to_pixels(font->emSize, font->unit, graphics->yres); + } + + lf->lfHeight = -(height + 0.5); + lf->lfWidth = 0; + lf->lfEscapement = 0; + lf->lfOrientation = 0; + lf->lfWeight = font->otm.otmTextMetrics.tmWeight; + lf->lfItalic = font->otm.otmTextMetrics.tmItalic ? 1 : 0; + lf->lfUnderline = font->otm.otmTextMetrics.tmUnderlined ? 1 : 0; + lf->lfStrikeOut = font->otm.otmTextMetrics.tmStruckOut ? 1 : 0; + lf->lfCharSet = font->otm.otmTextMetrics.tmCharSet; + lf->lfOutPrecision = OUT_DEFAULT_PRECIS; + lf->lfClipPrecision = CLIP_DEFAULT_PRECIS; + lf->lfQuality = DEFAULT_QUALITY; + lf->lfPitchAndFamily = 0; + strcpyW(lf->lfFaceName, font->family->FamilyName); +} + static void get_font_hfont(GpGraphics *graphics, GDIPCONST GpFont *font, GDIPCONST GpStringFormat *format, HFONT *hfont) { @@ -2153,8 +2185,6 @@ static void get_font_hfont(GpGraphics *graphics, GDIPCONST GpFont *font, unit_scale = units_scale(font->unit, graphics->unit, res); font_height = font->emSize * unit_scale; - if (graphics->unit != UnitDisplay) - font_height /= graphics->scale; } pt[0].X = 0.0;

1 0

Frédéric Delanoy : cmd: Add support for GEQ comparison operator in if statements.
by Alexandre Julliard Oct. 26, 2012

Oct. 26, 2012

Module: wine Branch: master Commit: 73995c71e05a7bd33784b0f994951d6fc3ca9c9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=73995c71e05a7bd33784b0f99… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Oct 25 23:48:06 2012 +0200 cmd: Add support for GEQ comparison operator in if statements. --- programs/cmd/builtins.c | 9 ++++ programs/cmd/tests/test_builtins.cmd.exp | 76 +++++++++++++++--------------- 2 files changed, 47 insertions(+), 38 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index e15c7c8..112d678 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2359,6 +2359,7 @@ static int evaluate_if_comparison(const WCHAR *leftOperand, const WCHAR *operato static const WCHAR leqW[] = {'l','e','q','\0'}; static const WCHAR equW[] = {'e','q','u','\0'}; static const WCHAR neqW[] = {'n','e','q','\0'}; + static const WCHAR geqW[] = {'g','e','q','\0'}; /* == is a special case, as it always compares strings */ if (!lstrcmpiW(operator, eqeqW)) @@ -2403,6 +2404,14 @@ static int evaluate_if_comparison(const WCHAR *leftOperand, const WCHAR *operato : lstrcmpW (leftOperand, rightOperand) != 0; } + if (!lstrcmpiW(operator, geqW)) { + if (int_operands) + return leftOperand_int >= rightOperand_int; + else + return caseInsensitive ? lstrcmpiW(leftOperand, rightOperand) >= 0 + : lstrcmpW (leftOperand, rightOperand) >= 0; + } + return -1; } diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 9adc016..c451c70 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -507,21 +507,21 @@ A NEQ AA B NEQ AA AB NEQ AA BA NEQ AA -(a)todo_wine@A GEQ A -(a)todo_wine@B GEQ A -(a)todo_wine@AB GEQ A -(a)todo_wine@BA GEQ A -(a)todo_wine@AA GEQ A -(a)todo_wine@B GEQ B -(a)todo_wine@BA GEQ B -(a)todo_wine@B GEQ AB -(a)todo_wine@AB GEQ AB -(a)todo_wine@BA GEQ AB -(a)todo_wine@BA GEQ BA -(a)todo_wine@B GEQ AA -(a)todo_wine@AB GEQ AA -(a)todo_wine@BA GEQ AA -(a)todo_wine@AA GEQ AA +A GEQ A +B GEQ A +AB GEQ A +BA GEQ A +AA GEQ A +B GEQ B +BA GEQ B +B GEQ AB +AB GEQ AB +BA GEQ AB +BA GEQ BA +B GEQ AA +AB GEQ AA +BA GEQ AA +AA GEQ AA @todo_wine(a)B GTR A @todo_wine(a)AB GTR A @todo_wine(a)BA GTR A @@ -576,16 +576,16 @@ string/hexa compare ok 0 NEQ 9 1 NEQ 9 10 NEQ 9 -(a)todo_wine@0 GEQ 0 -(a)todo_wine@1 GEQ 0 -(a)todo_wine@10 GEQ 0 -(a)todo_wine@9 GEQ 0 -(a)todo_wine@1 GEQ 1 -(a)todo_wine@10 GEQ 1 -(a)todo_wine@9 GEQ 1 -(a)todo_wine@10 GEQ 10 -(a)todo_wine@10 GEQ 9 -(a)todo_wine@9 GEQ 9 +0 GEQ 0 +1 GEQ 0 +10 GEQ 0 +9 GEQ 0 +1 GEQ 1 +10 GEQ 1 +9 GEQ 1 +10 GEQ 10 +10 GEQ 9 +9 GEQ 9 @todo_wine(a)1 GTR 0 @todo_wine(a)10 GTR 0 @todo_wine(a)9 GTR 0 @@ -596,19 +596,19 @@ string/hexa compare ok strings and integers not equal strings and integers not equal foo -(a)todo_wine@"10" GEQ "1" -(a)todo_wine@'1' GEQ 1(a)or_broken@NT4 -(a)todo_wine@1 GEQ "1" -(a)todo_wine@"1" GEQ "1" -(a)todo_wine@'1' GEQ "1" -(a)todo_wine@"10" GEQ "1" -(a)todo_wine@non NT4(a)or_broken@1 GEQ '1' -(a)todo_wine@'1' GEQ '1' -(a)todo_wine@foo -(a)todo_wine@1 GEQ "10" -(a)todo_wine@foo -(a)todo_wine@'1' GEQ "10" -(a)todo_wine@"10" GEQ "10" +"10" GEQ "1" +'1' GEQ 1(a)or_broken@NT4 +1 GEQ "1" +"1" GEQ "1" +'1' GEQ "1" +"10" GEQ "1" +non NT4(a)or_broken@1 GEQ '1' +'1' GEQ '1' +foo +1 GEQ "10" +foo +'1' GEQ "10" +"10" GEQ "10" ------------ Testing for ------------ --- plain FOR A

1 0

Frédéric Delanoy : cmd: Add support for GTR comparison operator in if statements.
by Alexandre Julliard Oct. 26, 2012

Oct. 26, 2012

Module: wine Branch: master Commit: 90c6f57fa9d9c9caf1b469ae82ed13bccb9625ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=90c6f57fa9d9c9caf1b469ae8… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Oct 25 23:48:07 2012 +0200 cmd: Add support for GTR comparison operator in if statements. --- programs/cmd/builtins.c | 9 ++++++++ programs/cmd/tests/test_builtins.cmd.exp | 32 +++++++++++++++--------------- 2 files changed, 25 insertions(+), 16 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 112d678..855040e 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2360,6 +2360,7 @@ static int evaluate_if_comparison(const WCHAR *leftOperand, const WCHAR *operato static const WCHAR equW[] = {'e','q','u','\0'}; static const WCHAR neqW[] = {'n','e','q','\0'}; static const WCHAR geqW[] = {'g','e','q','\0'}; + static const WCHAR gtrW[] = {'g','t','r','\0'}; /* == is a special case, as it always compares strings */ if (!lstrcmpiW(operator, eqeqW)) @@ -2412,6 +2413,14 @@ static int evaluate_if_comparison(const WCHAR *leftOperand, const WCHAR *operato : lstrcmpW (leftOperand, rightOperand) >= 0; } + if (!lstrcmpiW(operator, gtrW)) { + if (int_operands) + return leftOperand_int > rightOperand_int; + else + return caseInsensitive ? lstrcmpiW(leftOperand, rightOperand) > 0 + : lstrcmpW (leftOperand, rightOperand) > 0; + } + return -1; } diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index c451c70..aeaa14d 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -522,16 +522,16 @@ B GEQ AA AB GEQ AA BA GEQ AA AA GEQ AA -(a)todo_wine@B GTR A -(a)todo_wine@AB GTR A -(a)todo_wine@BA GTR A -(a)todo_wine@AA GTR A -(a)todo_wine@BA GTR B -(a)todo_wine@B GTR AB -(a)todo_wine@BA GTR AB -(a)todo_wine@B GTR AA -(a)todo_wine@AB GTR AA -(a)todo_wine@BA GTR AA +B GTR A +AB GTR A +BA GTR A +AA GTR A +BA GTR B +B GTR AB +BA GTR AB +B GTR AA +AB GTR AA +BA GTR AA ------ for numbers negative numbers handled negative numbers handled @@ -586,12 +586,12 @@ string/hexa compare ok 10 GEQ 10 10 GEQ 9 9 GEQ 9 -(a)todo_wine@1 GTR 0 -(a)todo_wine@10 GTR 0 -(a)todo_wine@9 GTR 0 -(a)todo_wine@10 GTR 1 -(a)todo_wine@9 GTR 1 -(a)todo_wine@10 GTR 9 +1 GTR 0 +10 GTR 0 +9 GTR 0 +10 GTR 1 +9 GTR 1 +10 GTR 9 ------ for numbers and stringified numbers strings and integers not equal strings and integers not equal

1 0

Frédéric Delanoy : cmd: Add support for LEQ comparison operator in if statements.
by Alexandre Julliard Oct. 26, 2012

Oct. 26, 2012

Module: wine Branch: master Commit: 78af04f427a43b1a40c01ee98a888deec0480863 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78af04f427a43b1a40c01ee98… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Oct 25 23:48:03 2012 +0200 cmd: Add support for LEQ comparison operator in if statements. --- programs/cmd/builtins.c | 9 ++++ programs/cmd/tests/test_builtins.cmd.exp | 62 +++++++++++++++--------------- 2 files changed, 40 insertions(+), 31 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 95419a1..3505817 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2356,6 +2356,7 @@ static int evaluate_if_comparison(const WCHAR *leftOperand, const WCHAR *operato long int leftOperand_int, rightOperand_int; BOOL int_operands; static const WCHAR lssW[] = {'l','s','s','\0'}; + static const WCHAR leqW[] = {'l','e','q','\0'}; /* == is a special case, as it always compares strings */ if (!lstrcmpiW(operator, eqeqW)) @@ -2376,6 +2377,14 @@ static int evaluate_if_comparison(const WCHAR *leftOperand, const WCHAR *operato : lstrcmpW (leftOperand, rightOperand) < 0; } + if (!lstrcmpiW(operator, leqW)) { + if (int_operands) + return leftOperand_int <= rightOperand_int; + else + return caseInsensitive ? lstrcmpiW(leftOperand, rightOperand) <= 0 + : lstrcmpW (leftOperand, rightOperand) <= 0; + } + return -1; } diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index b25eb9e..ec85db6 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -460,27 +460,27 @@ a LSS B(a)or_broken@NT4 a LSS B insensitive A LSS b A LSS b insensitive -(a)todo_wine@A LEQ A -(a)todo_wine@A LEQ B -(a)todo_wine@B LEQ B -(a)todo_wine@AB LEQ B -(a)todo_wine@AA LEQ B -(a)todo_wine@A LEQ AB -(a)todo_wine@AB LEQ AB -(a)todo_wine@AA LEQ AB -(a)todo_wine@A LEQ BA -(a)todo_wine@B LEQ BA -(a)todo_wine@AB LEQ BA -(a)todo_wine@BA LEQ BA -(a)todo_wine@AA LEQ BA -(a)todo_wine@A LEQ AA -(a)todo_wine@AA LEQ AA -(a)todo_wine@b LEQ B(a)or_broken@NT4 -(a)todo_wine@b LEQ B insensitive -(a)todo_wine@a LEQ B(a)or_broken@NT4 -(a)todo_wine@a LEQ B insensitive -(a)todo_wine@A LEQ b -(a)todo_wine@A LEQ b insensitive +A LEQ A +A LEQ B +B LEQ B +AB LEQ B +AA LEQ B +A LEQ AB +AB LEQ AB +AA LEQ AB +A LEQ BA +B LEQ BA +AB LEQ BA +BA LEQ BA +AA LEQ BA +A LEQ AA +AA LEQ AA +b LEQ B(a)or_broken@NT4 +b LEQ B insensitive +a LEQ B(a)or_broken@NT4 +a LEQ B insensitive +A LEQ b +A LEQ b insensitive @todo_wine(a)A EQU A @todo_wine(a)B EQU B @todo_wine(a)AB EQU AB @@ -546,16 +546,16 @@ also in negative form 9 LSS 10 0 LSS 9 1 LSS 9 -(a)todo_wine@0 LEQ 0 -(a)todo_wine@0 LEQ 1 -(a)todo_wine@1 LEQ 1 -(a)todo_wine@0 LEQ 10 -(a)todo_wine@1 LEQ 10 -(a)todo_wine@10 LEQ 10 -(a)todo_wine@9 LEQ 10 -(a)todo_wine@0 LEQ 9 -(a)todo_wine@1 LEQ 9 -(a)todo_wine@9 LEQ 9 +0 LEQ 0 +0 LEQ 1 +1 LEQ 1 +0 LEQ 10 +1 LEQ 10 +10 LEQ 10 +9 LEQ 10 +0 LEQ 9 +1 LEQ 9 +9 LEQ 9 @todo_wine(a)0 EQU 0 @todo_wine(a)1 EQU 1 @todo_wine(a)10 EQU 10

1 0

Frédéric Delanoy : cmd: Add support for LSS comparison operator in if statements.
by Alexandre Julliard Oct. 26, 2012

Oct. 26, 2012

Module: wine Branch: master Commit: 154710a0932e915426b3f08356794aeb7141aa72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=154710a0932e915426b3f0835… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Oct 25 23:48:02 2012 +0200 cmd: Add support for LSS comparison operator in if statements. --- programs/cmd/builtins.c | 63 ++++++++++++++++++++++++++--- programs/cmd/tests/test_builtins.cmd.exp | 50 ++++++++++++------------ 2 files changed, 81 insertions(+), 32 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index af669d3..95419a1 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -104,6 +104,7 @@ static const WCHAR onW[] = {'O','N','\0'}; static const WCHAR offW[] = {'O','F','F','\0'}; static const WCHAR parmY[] = {'/','Y','\0'}; static const WCHAR parmNoY[] = {'/','-','Y','\0'}; +static const WCHAR eqeqW[] = {'=','=','\0'}; static HINSTANCE hinst; struct env_stack *saved_environment; @@ -2332,6 +2333,52 @@ void WCMD_popd (void) { LocalFree (temp); } +/******************************************************************* + * evaluate_if_comparison + * + * Evaluates an "if" comparison operation + * + * PARAMS + * leftOperand [I] left operand, non NULL + * operator [I] "if" binary comparison operator, non NULL + * rightOperand [I] right operand, non NULL + * caseInsensitive [I] 0 for case sensitive comparison, anything else for insensitive + * + * RETURNS + * Success: 1 if operator applied to the operands evaluates to TRUE + * 0 if operator applied to the operands evaluates to FALSE + * Failure: -1 if operator is not recognized + */ +static int evaluate_if_comparison(const WCHAR *leftOperand, const WCHAR *operator, + const WCHAR *rightOperand, int caseInsensitive) +{ + WCHAR *endptr_leftOp, *endptr_rightOp; + long int leftOperand_int, rightOperand_int; + BOOL int_operands; + static const WCHAR lssW[] = {'l','s','s','\0'}; + + /* == is a special case, as it always compares strings */ + if (!lstrcmpiW(operator, eqeqW)) + return caseInsensitive ? lstrcmpiW(leftOperand, rightOperand) == 0 + : lstrcmpW (leftOperand, rightOperand) == 0; + + /* Check if we have plain integers (in decimal, octal or hexadecimal notation) */ + leftOperand_int = strtolW(leftOperand, &endptr_leftOp, 0); + rightOperand_int = strtolW(rightOperand, &endptr_rightOp, 0); + int_operands = (!*endptr_leftOp) && (!*endptr_rightOp); + + /* Perform actual (integer or string) comparison */ + if (!lstrcmpiW(operator, lssW)) { + if (int_operands) + return leftOperand_int < rightOperand_int; + else + return caseInsensitive ? lstrcmpiW(leftOperand, rightOperand) < 0 + : lstrcmpW (leftOperand, rightOperand) < 0; + } + + return -1; +} + /**************************************************************************** * WCMD_if * @@ -2355,7 +2402,6 @@ void WCMD_if (WCHAR *p, CMD_LIST **cmdList) static const WCHAR errlvlW[] = {'e','r','r','o','r','l','e','v','e','l','\0'}; static const WCHAR existW[] = {'e','x','i','s','t','\0'}; static const WCHAR defdW[] = {'d','e','f','i','n','e','d','\0'}; - static const WCHAR eqeqW[] = {'=','=','\0'}; static const WCHAR parmI[] = {'/','I','\0'}; int caseInsensitive = (strstrW(quals, parmI) != NULL); @@ -2394,18 +2440,21 @@ void WCMD_if (WCHAR *p, CMD_LIST **cmdList) while (*p == ' ' || *p == '\t') p++; - if (strncmpW(p, eqeqW, strlenW(eqeqW))) - goto syntax_err; - - strcpyW(operator, eqeqW); + if (!strncmpW(p, eqeqW, strlenW(eqeqW))) + strcpyW(operator, eqeqW); + else { + strcpyW(operator, WCMD_parameter(p, 0, &paramStart, FALSE, FALSE)); + if (!*operator) goto syntax_err; + } p += strlenW(operator); strcpyW(rightOperand, WCMD_parameter(p, 0, &paramStart, TRUE, FALSE)); if (!*rightOperand) goto syntax_err; - test = caseInsensitive ? lstrcmpiW(leftOperand, rightOperand) == 0 - : lstrcmpW (leftOperand, rightOperand) == 0; + test = evaluate_if_comparison(leftOperand, operator, rightOperand, caseInsensitive); + if (test == -1) + goto syntax_err; p = paramStart + strlenW(rightOperand); WCMD_parameter(p, 0, &command, FALSE, FALSE); diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 9b5eb3b..b25eb9e 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -441,25 +441,25 @@ quake --- comparison operators ------ for strings LSS string can be used as operand for LSS comparison -(a)todo_wine@floats are handled as strings -(a)todo_wine@numbers in quotes are handled as strings -(a)todo_wine@negative numbers as well(a)or_broken@NT4 -(a)todo_wine@if /i seems to work for LSS -(a)todo_wine@A LSS B -(a)todo_wine@AB LSS B -(a)todo_wine@AA LSS B -(a)todo_wine@A LSS AB -(a)todo_wine@AA LSS AB -(a)todo_wine@A LSS BA -(a)todo_wine@B LSS BA -(a)todo_wine@AB LSS BA -(a)todo_wine@AA LSS BA -(a)todo_wine@A LSS AA -(a)todo_wine@b LSS B(a)or_broken@NT4 -(a)todo_wine@a LSS B(a)or_broken@NT4 -(a)todo_wine@a LSS B insensitive -(a)todo_wine@A LSS b -(a)todo_wine@A LSS b insensitive +floats are handled as strings +numbers in quotes are handled as strings +negative numbers as well(a)or_broken@NT4 +if /i seems to work for LSS +A LSS B +AB LSS B +AA LSS B +A LSS AB +AA LSS AB +A LSS BA +B LSS BA +AB LSS BA +AA LSS BA +A LSS AA +b LSS B(a)or_broken@NT4 +a LSS B(a)or_broken@NT4 +a LSS B insensitive +A LSS b +A LSS b insensitive @todo_wine(a)A LEQ A @todo_wine(a)A LEQ B @todo_wine(a)B LEQ B @@ -540,12 +540,12 @@ also in negative form hexa handled also in negative form 11 LSS 101 -(a)todo_wine@0 LSS 1 -(a)todo_wine@0 LSS 10 -(a)todo_wine@1 LSS 10 -(a)todo_wine@9 LSS 10 -(a)todo_wine@0 LSS 9 -(a)todo_wine@1 LSS 9 +0 LSS 1 +0 LSS 10 +1 LSS 10 +9 LSS 10 +0 LSS 9 +1 LSS 9 @todo_wine(a)0 LEQ 0 @todo_wine(a)0 LEQ 1 @todo_wine(a)1 LEQ 1

1 0

Frédéric Delanoy : cmd: Avoid using strstr to match == operator in WCMD_if.
by Alexandre Julliard Oct. 26, 2012

Oct. 26, 2012

Module: wine Branch: master Commit: 17607b8020edb820389e22138dbda4446748eee1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17607b8020edb820389e22138… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Oct 25 23:48:01 2012 +0200 cmd: Avoid using strstr to match == operator in WCMD_if. --- programs/cmd/builtins.c | 46 +++++++++++++++++++++++++++++----------------- 1 files changed, 29 insertions(+), 17 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index ffdfe8d..af669d3 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2350,7 +2350,7 @@ void WCMD_if (WCHAR *p, CMD_LIST **cmdList) { int negate; /* Negate condition */ int test; /* Condition evaluation result */ - WCHAR condition[MAX_PATH], *command, *s; + WCHAR condition[MAX_PATH], *command; static const WCHAR notW[] = {'n','o','t','\0'}; static const WCHAR errlvlW[] = {'e','r','r','o','r','l','e','v','e','l','\0'}; static const WCHAR existW[] = {'e','x','i','s','t','\0'}; @@ -2381,23 +2381,35 @@ void WCMD_if (WCHAR *p, CMD_LIST **cmdList) NULL, 0) > 0); WCMD_parameter(p, 2+negate, &command, FALSE, FALSE); } - else if ((s = strstrW (p, eqeqW))) { - /* We need to get potential surrounding double quotes, so param1/2 can't be used */ - WCHAR *leftPart, *rightPart; - unsigned int leftPartLen, rightPartLen; - s += 2; - leftPartLen = strlenW(WCMD_parameter(p, 0+negate+caseInsensitive, &leftPart, TRUE, FALSE)); - rightPartLen = strlenW(WCMD_parameter(p, 1+negate+caseInsensitive, &rightPart, TRUE, FALSE)); - test = caseInsensitive - ? (CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, - leftPart, leftPartLen, - rightPart, rightPartLen) == CSTR_EQUAL) - : (CompareStringW(LOCALE_SYSTEM_DEFAULT, 0, - leftPart, leftPartLen, - rightPart, rightPartLen) == CSTR_EQUAL); - WCMD_parameter(s, 1, &command, FALSE, FALSE); - } - else goto syntax_err; + else { /* comparison operation */ + WCHAR leftOperand[MAXSTRING], rightOperand[MAXSTRING], operator[MAXSTRING]; + WCHAR *paramStart; + + strcpyW(leftOperand, WCMD_parameter(p, negate+caseInsensitive, &paramStart, TRUE, FALSE)); + if (!*leftOperand) + goto syntax_err; + + /* Note: '==' can't be returned by WCMD_parameter since '=' is a separator */ + p = paramStart + strlenW(leftOperand); + while (*p == ' ' || *p == '\t') + p++; + + if (strncmpW(p, eqeqW, strlenW(eqeqW))) + goto syntax_err; + + strcpyW(operator, eqeqW); + p += strlenW(operator); + + strcpyW(rightOperand, WCMD_parameter(p, 0, &paramStart, TRUE, FALSE)); + if (!*rightOperand) + goto syntax_err; + + test = caseInsensitive ? lstrcmpiW(leftOperand, rightOperand) == 0 + : lstrcmpW (leftOperand, rightOperand) == 0; + + p = paramStart + strlenW(rightOperand); + WCMD_parameter(p, 0, &command, FALSE, FALSE); + } /* Process rest of IF statement which is on the same line Note: This may process all or some of the cmdList (eg a GOTO) */

1 0

Frédéric Delanoy : cmd: Correctly set the 'raw' parameter in calls to WCMD_parameter in WCMD_if.
by Alexandre Julliard Oct. 26, 2012

Oct. 26, 2012

Module: wine Branch: master Commit: 517ed443963e1babcc37fbeade984a5e1fc12605 URL: http://source.winehq.org/git/wine.git/?a=commit;h=517ed443963e1babcc37fbead… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Oct 25 23:47:58 2012 +0200 cmd: Correctly set the 'raw' parameter in calls to WCMD_parameter in WCMD_if. --- programs/cmd/builtins.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 8eaa9e7..768a53b 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2389,8 +2389,8 @@ void WCMD_if (WCHAR *p, CMD_LIST **cmdList) { /* We need to get potential surrounding double quotes, so param1/2 can't be used */ WCHAR *leftPart, *leftPartEnd, *rightPart, *rightPartEnd; s += 2; - WCMD_parameter(p, 0+negate+caseInsensitive, &leftPart, &leftPartEnd, FALSE, FALSE); - WCMD_parameter(p, 1+negate+caseInsensitive, &rightPart, &rightPartEnd, FALSE, FALSE); + WCMD_parameter(p, 0+negate+caseInsensitive, &leftPart, &leftPartEnd, TRUE, FALSE); + WCMD_parameter(p, 1+negate+caseInsensitive, &rightPart, &rightPartEnd, TRUE, FALSE); test = caseInsensitive ? (CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, leftPart, leftPartEnd-leftPart+1,

1 0