February 2021 - Wine-commits

Haoyang Chen : gdiplus: Avoid negative integer overflow due to implicit type conversion.
by Alexandre Julliard 01 Feb '21

01 Feb '21

Module: wine Branch: master Commit: 4c4a5cb799f54326941f5d38eafef908867271dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c4a5cb799f54326941f5d38… Author: Haoyang Chen <chenhaoyang(a)uniontech.com> Date: Fri Jan 29 18:08:20 2021 +0800 gdiplus: Avoid negative integer overflow due to implicit type conversion. Signed-off-by: Haoyang Chen <chenhaoyang(a)uniontech.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 2e6c0d7c9c8..7b4794e3620 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -972,9 +972,9 @@ static ARGB sample_bitmap_pixel(GDIPCONST GpRect *src_rect, LPBYTE bits, UINT wi { /* Tiling. Make sure co-ordinates are positive as it simplifies the math. */ if (x < 0) - x = width*2 + x % (width * 2); + x = width*2 + x % (INT)(width * 2); if (y < 0) - y = height*2 + y % (height * 2); + y = height*2 + y % (INT)(height * 2); if (attributes->wrap & WrapModeTileFlipX) {

1 0

Rémi Bernon : include: Add IWMPVideoRenderConfig interface to wmprealestate.idl.
by Alexandre Julliard 01 Feb '21

01 Feb '21

Module: wine Branch: master Commit: 67bce6f1b1de69eb88384a4662b1cd78cf7b4709 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67bce6f1b1de69eb88384a46… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 1 09:29:26 2021 +0100 include: Add IWMPVideoRenderConfig interface to wmprealestate.idl. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/wmprealestate.idl | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index fc5ffbbc721..b03c2e8c602 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -797,6 +797,7 @@ SOURCES = \ wmiutils.idl \ wmp.idl \ wmpids.h \ + wmprealestate.idl \ wmsbuffer.idl \ wmsdk.h \ wmsdkidl.idl \ diff --git a/include/wmprealestate.idl b/include/wmprealestate.idl new file mode 100644 index 00000000000..34100a12aa8 --- /dev/null +++ b/include/wmprealestate.idl @@ -0,0 +1,31 @@ +/* + * Copyright 2021 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "unknwn.idl"; +import "ocidl.idl"; +import "mfidl.idl"; + +[ + odl, + uuid(6d6cf803-1ec0-4c8d-b3ca-f18e27282074), + oleautomation +] +interface IWMPVideoRenderConfig : IUnknown +{ + [propput] HRESULT presenterActivate([in] IMFActivate *activate); +}

1 0

Francois Gouget : testbot/TestWTBS: Allow mission-specific directives, e.g. for test=module.
by Alexandre Julliard 01 Feb '21

01 Feb '21

Module: tools Branch: master Commit: 6c4b3a308721c8c21806781de0ec4af03288fb7f URL: https://source.winehq.org/git/tools.git/?a=commit;h=6c4b3a308721c8c21806781… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 1 12:02:45 2021 +0100 testbot/TestWTBS: Allow mission-specific directives, e.g. for test=module. A different set of tests are run depending on whether a VM's mission is test=test (the default) or test=module. Being unable to distinguish these two cases prevents checking that the right set of test units is being run in many cases. So add support for the wine:build, wine:test, wine:module categories to allow providing specific checks for the test=build/test/module cases respectively. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/tests/TestWTBS | 184 +++++++++++++++++++++++++++++++++++-------------- 1 file changed, 131 insertions(+), 53 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=6c4b3a308721c8c2180…

1 0

Francois Gouget : testbot/LogUtils: Always set IsWineTest in _CheckUnit().
by Alexandre Julliard 01 Feb '21

01 Feb '21

Module: tools Branch: master Commit: c9aa4dbf830563f13b53a1c7561b89569cc92412 URL: https://source.winehq.org/git/tools.git/?a=commit;h=c9aa4dbf830563f13b53a1c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 1 12:58:32 2021 +0100 testbot/LogUtils: Always set IsWineTest in _CheckUnit(). _CheckUnit() is only called on Wine test lines. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 15ec31a..2f30493 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -384,13 +384,11 @@ sub _CheckUnit($$$$) { my ($LogInfo, $Cur, $Unit, $Type) = @_; - if ($Cur->{Units}->{$Unit} or $Cur->{Unit} eq "") - { - $LogInfo->{IsWineTest} = 1; - } - # To avoid issuing many duplicate errors, - # only report the first misplaced message. - elsif ($LogInfo->{IsWineTest} and !$Cur->{IsBroken}) + # _CheckUnit() is only called for Wine test lines. + $LogInfo->{IsWineTest} = 1; + + # Only report the first misplaced message to avoid duplicate errors. + if (!$Cur->{Units}->{$Unit} and $Cur->{Unit} ne "" and !$Cur->{IsBroken}) { _AddExtra($LogInfo, "contains a misplaced $Type message for $Unit", $Cur); $Cur->{IsBroken} = 1;

1 0

Francois Gouget : winetest/dissect: Don't issue multiple errors in check_unit().
by Alexandre Julliard 01 Feb '21

01 Feb '21

Module: tools Branch: master Commit: e202221249991184a8bbf974bde85acaee33d56f URL: https://source.winehq.org/git/tools.git/?a=commit;h=e202221249991184a8bbf97… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 1 12:58:55 2021 +0100 winetest/dissect: Don't issue multiple errors in check_unit(). Don't complain about misplaced lines after the first one has been reported (or if the test has already been tagged as broken for some other reason, e.g. missing start line). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winetest/dissect b/winetest/dissect index 27bcf17..12a939d 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -483,7 +483,7 @@ sub add_test_line($$) sub check_unit($$) { my ($l_unit, $l_type) = @_; - if (!$units{$l_unit}) + if (!$units{$l_unit} and !$broken) { add_test_line("end", "Misplaced $l_type message\n"); $extra_failures++;

1 0