wine-commits October 2012

wine-commits@winehq.org

2 participants
960 discussions

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

26 Oct '12

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 26 Oct '12

26 Oct '12

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

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

26 Oct '12

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: Display a clearer error message for not found commands.
by Alexandre Julliard 26 Oct '12

26 Oct '12

1 0

Huw Davies : gdi32: Use a symbol charmap if all else fails.
by Alexandre Julliard 26 Oct '12

26 Oct '12

Module: wine Branch: master Commit: 7cd8dc6bf2b0d81338db9a6d13669b2f31da33d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cd8dc6bf2b0d81338db9a6d1… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 26 14:04:05 2012 +0100 gdi32: Use a symbol charmap if all else fails. --- dlls/gdi32/freetype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index c62070f..6af977c 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4410,7 +4410,7 @@ static BOOL freetype_DeleteDC( PHYSDEV dev ) static FT_Encoding pick_charmap( FT_Face face, int charset ) { - static const FT_Encoding regular_order[] = { FT_ENCODING_UNICODE, FT_ENCODING_APPLE_ROMAN, 0 }; + static const FT_Encoding regular_order[] = { FT_ENCODING_UNICODE, FT_ENCODING_APPLE_ROMAN, FT_ENCODING_MS_SYMBOL, 0 }; static const FT_Encoding symbol_order[] = { FT_ENCODING_MS_SYMBOL, FT_ENCODING_UNICODE, FT_ENCODING_APPLE_ROMAN, 0 }; const FT_Encoding *encs = regular_order;

1 0

Huw Davies : gdi32: Simplify the code for charmap selection.
by Alexandre Julliard 26 Oct '12

26 Oct '12

Module: wine Branch: master Commit: 8ef70039d366bf45900c7e7999767be2ccf9704c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ef70039d366bf45900c7e799… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 26 14:04:04 2012 +0100 gdi32: Simplify the code for charmap selection. --- dlls/gdi32/freetype.c | 26 ++++++++++++++++---------- 1 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 81ba8a3..c62070f 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4408,6 +4408,21 @@ static BOOL freetype_DeleteDC( PHYSDEV dev ) return TRUE; } +static FT_Encoding pick_charmap( FT_Face face, int charset ) +{ + static const FT_Encoding regular_order[] = { FT_ENCODING_UNICODE, FT_ENCODING_APPLE_ROMAN, 0 }; + static const FT_Encoding symbol_order[] = { FT_ENCODING_MS_SYMBOL, FT_ENCODING_UNICODE, FT_ENCODING_APPLE_ROMAN, 0 }; + const FT_Encoding *encs = regular_order; + + if (charset == SYMBOL_CHARSET) encs = symbol_order; + + while (*encs != 0) + { + if (select_charmap( face, *encs )) break; + encs++; + } + return *encs; +} /************************************************************* * freetype_SelectFont @@ -4824,16 +4839,7 @@ found_face: ret->ntmFlags = face->ntmFlags; - if (ret->charset == SYMBOL_CHARSET && - select_charmap(ret->ft_face, FT_ENCODING_MS_SYMBOL)) { - /* No ops */ - } - else if (select_charmap(ret->ft_face, FT_ENCODING_UNICODE)) { - /* No ops */ - } - else { - select_charmap(ret->ft_face, FT_ENCODING_APPLE_ROMAN); - } + pick_charmap( ret->ft_face, ret->charset ); ret->orientation = FT_IS_SCALABLE(ret->ft_face) ? lf.lfOrientation : 0; ret->name = psub ? strdupW(psub->from.name) : strdupW(family->FamilyName);

1 0

Jacek Caban : jscript: Optimize object refcount handling.
by Alexandre Julliard 26 Oct '12

26 Oct '12

Module: wine Branch: master Commit: 79a30a4e0ae3a7ef640fa38e3a9f77e1e73cc576 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79a30a4e0ae3a7ef640fa38e3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 26 13:28:17 2012 +0200 jscript: Optimize object refcount handling. --- dlls/jscript/dispex.c | 78 ++++++++++++++++++++++++++++++------------------ dlls/jscript/jscript.h | 21 +++++++++++- 2 files changed, 68 insertions(+), 31 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 2a5225f..211ed8a 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -543,46 +543,23 @@ static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, return E_NOINTERFACE; } - IUnknown_AddRef((IUnknown*)*ppv); + jsdisp_addref(This); return S_OK; } static ULONG WINAPI DispatchEx_AddRef(IDispatchEx *iface) { jsdisp_t *This = impl_from_IDispatchEx(iface); - LONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p) ref=%d\n", This, ref); - - return ref; + jsdisp_addref(This); + return This->ref; } static ULONG WINAPI DispatchEx_Release(IDispatchEx *iface) { jsdisp_t *This = impl_from_IDispatchEx(iface); - LONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p) ref=%d\n", This, ref); - - if(!ref) { - dispex_prop_t *prop; - - for(prop = This->props; prop < This->props+This->prop_cnt; prop++) { - if(prop->type == PROP_JSVAL) - jsval_release(prop->u.val); - heap_free(prop->name); - } - heap_free(This->props); - script_release(This->ctx); - if(This->prototype) - jsdisp_release(This->prototype); - - if(This->builtin_info->destructor) - This->builtin_info->destructor(This); - else - heap_free(This); - } - + ULONG ref = --This->ref; + if(!ref) + jsdisp_free(This); return ref; } @@ -931,6 +908,49 @@ HRESULT create_dispex(script_ctx_t *ctx, const builtin_info_t *builtin_info, jsd return S_OK; } +void jsdisp_free(jsdisp_t *obj) +{ + dispex_prop_t *prop; + + TRACE("(%p)\n", obj); + + for(prop = obj->props; prop < obj->props+obj->prop_cnt; prop++) { + if(prop->type == PROP_JSVAL) + jsval_release(prop->u.val); + heap_free(prop->name); + } + heap_free(obj->props); + script_release(obj->ctx); + if(obj->prototype) + jsdisp_release(obj->prototype); + + if(obj->builtin_info->destructor) + obj->builtin_info->destructor(obj); + else + heap_free(obj); +} + +#ifdef TRACE_REFCNT + +jsdisp_t *jsdisp_addref(jsdisp_t *jsdisp) +{ + ULONG ref = ++jsdisp->ref; + TRACE("(%p) ref=%d\n", jsdisp, ref); + return jsdisp; +} + +void jsdisp_release(jsdisp_t *jsdisp) +{ + ULONG ref = --jsdisp->ref; + + TRACE("(%p) ref=%d\n", jsdisp, ref); + + if(!ref) + jsdisp_free(jsdisp); +} + +#endif + HRESULT init_dispex_from_constr(jsdisp_t *dispex, script_ctx_t *ctx, const builtin_info_t *builtin_info, jsdisp_t *constr) { jsdisp_t *prot = NULL; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 2630ff0..18ac1db 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -223,18 +223,35 @@ static inline IDispatch *to_disp(jsdisp_t *jsdisp) jsdisp_t *as_jsdisp(IDispatch*) DECLSPEC_HIDDEN; jsdisp_t *to_jsdisp(IDispatch*) DECLSPEC_HIDDEN; +void jsdisp_free(jsdisp_t*) DECLSPEC_HIDDEN; +#ifndef TRACE_REFCNT + +/* + * We do a lot of refcount calls during script execution, so having an inline + * version is a nice perf win. Define TRACE_REFCNT macro when debugging + * refcount bugs to have traces. Also, since jsdisp_t is not thread safe anyways, + * there is no point in using atomic operations. + */ static inline jsdisp_t *jsdisp_addref(jsdisp_t *jsdisp) { - IDispatchEx_AddRef(&jsdisp->IDispatchEx_iface); + jsdisp->ref++; return jsdisp; } static inline void jsdisp_release(jsdisp_t *jsdisp) { - IDispatchEx_Release(&jsdisp->IDispatchEx_iface); + if(!--jsdisp->ref) + jsdisp_free(jsdisp); } +#else + +jsdisp_t *jsdisp_addref(jsdisp_t*) DECLSPEC_HIDDEN; +void jsdisp_release(jsdisp_t*) DECLSPEC_HIDDEN; + +#endif + HRESULT create_dispex(script_ctx_t*,const builtin_info_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT init_dispex(jsdisp_t*,script_ctx_t*,const builtin_info_t*,jsdisp_t*) DECLSPEC_HIDDEN; HRESULT init_dispex_from_constr(jsdisp_t*,script_ctx_t*,const builtin_info_t*,jsdisp_t*) DECLSPEC_HIDDEN;

1 0

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

26 Oct '12

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 -@todo_wine@B GTR A -@todo_wine@AB GTR A -@todo_wine@BA GTR A -@todo_wine@AA GTR A -@todo_wine@BA GTR B -@todo_wine@B GTR AB -@todo_wine@BA GTR AB -@todo_wine@B GTR AA -@todo_wine@AB GTR AA -@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 -@todo_wine@1 GTR 0 -@todo_wine@10 GTR 0 -@todo_wine@9 GTR 0 -@todo_wine@10 GTR 1 -@todo_wine@9 GTR 1 -@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 GEQ comparison operator in if statements.
by Alexandre Julliard 26 Oct '12

26 Oct '12

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 -@todo_wine@A GEQ A -@todo_wine@B GEQ A -@todo_wine@AB GEQ A -@todo_wine@BA GEQ A -@todo_wine@AA GEQ A -@todo_wine@B GEQ B -@todo_wine@BA GEQ B -@todo_wine@B GEQ AB -@todo_wine@AB GEQ AB -@todo_wine@BA GEQ AB -@todo_wine@BA GEQ BA -@todo_wine@B GEQ AA -@todo_wine@AB GEQ AA -@todo_wine@BA GEQ AA -@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@B GTR A @todo_wine@AB GTR A @todo_wine@BA GTR A @@ -576,16 +576,16 @@ string/hexa compare ok 0 NEQ 9 1 NEQ 9 10 NEQ 9 -@todo_wine@0 GEQ 0 -@todo_wine@1 GEQ 0 -@todo_wine@10 GEQ 0 -@todo_wine@9 GEQ 0 -@todo_wine@1 GEQ 1 -@todo_wine@10 GEQ 1 -@todo_wine@9 GEQ 1 -@todo_wine@10 GEQ 10 -@todo_wine@10 GEQ 9 -@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@1 GTR 0 @todo_wine@10 GTR 0 @todo_wine@9 GTR 0 @@ -596,19 +596,19 @@ string/hexa compare ok strings and integers not equal strings and integers not equal foo -@todo_wine@"10" GEQ "1" -@todo_wine@'1' GEQ 1@or_broken@NT4 -@todo_wine@1 GEQ "1" -@todo_wine@"1" GEQ "1" -@todo_wine@'1' GEQ "1" -@todo_wine@"10" GEQ "1" -@todo_wine@non NT4@or_broken@1 GEQ '1' -@todo_wine@'1' GEQ '1' -@todo_wine@foo -@todo_wine@1 GEQ "10" -@todo_wine@foo -@todo_wine@'1' GEQ "10" -@todo_wine@"10" GEQ "10" +"10" GEQ "1" +'1' GEQ 1@or_broken@NT4 +1 GEQ "1" +"1" GEQ "1" +'1' GEQ "1" +"10" GEQ "1" +non NT4@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 NEQ comparison operator in if statements.
by Alexandre Julliard 26 Oct '12

26 Oct '12

Module: wine Branch: master Commit: 80f8d49b07e493a6753518ff5b07ab475fc4b0d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80f8d49b07e493a6753518ff5… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Oct 25 23:48:05 2012 +0200 cmd: Add support for NEQ comparison operator in if statements. --- programs/cmd/builtins.c | 9 ++++ programs/cmd/tests/test_builtins.cmd.exp | 64 +++++++++++++++--------------- 2 files changed, 41 insertions(+), 32 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 3a8dfba..e15c7c8 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2358,6 +2358,7 @@ static int evaluate_if_comparison(const WCHAR *leftOperand, const WCHAR *operato static const WCHAR lssW[] = {'l','s','s','\0'}; static const WCHAR leqW[] = {'l','e','q','\0'}; static const WCHAR equW[] = {'e','q','u','\0'}; + static const WCHAR neqW[] = {'n','e','q','\0'}; /* == is a special case, as it always compares strings */ if (!lstrcmpiW(operator, eqeqW)) @@ -2394,6 +2395,14 @@ static int evaluate_if_comparison(const WCHAR *leftOperand, const WCHAR *operato : lstrcmpW (leftOperand, rightOperand) == 0; } + if (!lstrcmpiW(operator, neqW)) { + 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 009473e..9adc016 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -487,26 +487,26 @@ AB EQU AB BA EQU BA AA EQU AA A EQU a insensitive -@todo_wine@B NEQ A -@todo_wine@AB NEQ A -@todo_wine@BA NEQ A -@todo_wine@AA NEQ A -@todo_wine@A NEQ B -@todo_wine@AB NEQ B -@todo_wine@BA NEQ B -@todo_wine@AA NEQ B -@todo_wine@A NEQ AB -@todo_wine@B NEQ AB -@todo_wine@BA NEQ AB -@todo_wine@AA NEQ AB -@todo_wine@A NEQ BA -@todo_wine@B NEQ BA -@todo_wine@AB NEQ BA -@todo_wine@AA NEQ BA -@todo_wine@A NEQ AA -@todo_wine@B NEQ AA -@todo_wine@AB NEQ AA -@todo_wine@BA NEQ AA +B NEQ A +AB NEQ A +BA NEQ A +AA NEQ A +A NEQ B +AB NEQ B +BA NEQ B +AA NEQ B +A NEQ AB +B NEQ AB +BA NEQ AB +AA NEQ AB +A NEQ BA +B NEQ BA +AB NEQ BA +AA NEQ BA +A NEQ AA +B NEQ AA +AB NEQ AA +BA NEQ AA @todo_wine@A GEQ A @todo_wine@B GEQ A @todo_wine@AB GEQ A @@ -564,18 +564,18 @@ octal ok hexa ok string/hexa compare ok string/hexa compare ok -@todo_wine@1 NEQ 0 -@todo_wine@10 NEQ 0 -@todo_wine@9 NEQ 0 -@todo_wine@0 NEQ 1 -@todo_wine@10 NEQ 1 -@todo_wine@9 NEQ 1 -@todo_wine@0 NEQ 10 -@todo_wine@1 NEQ 10 -@todo_wine@9 NEQ 10 -@todo_wine@0 NEQ 9 -@todo_wine@1 NEQ 9 -@todo_wine@10 NEQ 9 +1 NEQ 0 +10 NEQ 0 +9 NEQ 0 +0 NEQ 1 +10 NEQ 1 +9 NEQ 1 +0 NEQ 10 +1 NEQ 10 +9 NEQ 10 +0 NEQ 9 +1 NEQ 9 +10 NEQ 9 @todo_wine@0 GEQ 0 @todo_wine@1 GEQ 0 @todo_wine@10 GEQ 0

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2012