wine-commits April 2020

wine-commits@winehq.org

2 participants
1016 discussions

Francois Gouget : testbot/build: Add support for shared Gecko and Mono installs.
by Alexandre Julliard 23 Apr '20

23 Apr '20

Module: tools Branch: master Commit: 81386ee720fffa9c55e52e9ce405e0ae0395ba7d URL: https://source.winehq.org/git/tools.git/?a=commit;h=81386ee720fffa9c55e52e9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 23 15:04:27 2020 +0200 testbot/build: Add support for shared Gecko and Mono installs. This adds the _UpdateSharedAddOn() method and only calls _UpdateMSIAddOn() as a fallback. This also updates _IsAddOnBad() to check for the presence of the shared install so the addon is not updated if it is present in either the shared install or MSI form. _IsAddOnBad() also stores the information needed to locate and update the addon for use by the update methods. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/Build/Utils.pm | 53 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index a6d38fc..aa78618 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -373,9 +373,14 @@ sub _IsAddOnBad($$) my $Basename = "wine-$AddOn->{name}-$AddOn->{version}"; my $ArchSuffix = $Arch eq "" ? "" : "-$Arch"; $AddOnArch->{msifile} = "$Basename$ArchSuffix.msi"; + $AddOnArch->{shareddir} = $Basename; + $AddOnArch->{shareddir} .= $ArchSuffix if ($AddOn->{name} ne "mono"); + $AddOnArch->{basetar} = "$Basename$ArchSuffix"; mkdir "$AddOn->{basedir}"; } + return undef if (-d "$AddOn->{basedir}/$AddOnArch->{shareddir}"); + my $Sha256 = Digest::SHA->new(256); eval { $Sha256->addfile("$AddOn->{basedir}/$AddOnArch->{msifile}") }; return "$@" if ($@); @@ -405,6 +410,52 @@ sub _UpdateMSIAddOn($$) return 0; } +sub _UpdateSharedAddOn($$) +{ + my ($AddOn, $Arch) = @_; + + my $AddOnArch = $AddOn->{$Arch}; + InfoMsg "Downloading $AddOnArch->{basetar}\n"; + my $ErrMessage; + for (1..3) + { + foreach my $Suffix (".tar.xz", ".tar.bz2") + { + my $Tarfile = "$AddOnArch->{basetar}$Suffix"; + my $Url="$ADDONS_URL/wine-$AddOn->{name}/$AddOn->{version}/$Tarfile"; + system("cd '$AddOn->{basedir}' && set -x && ". + "wget --no-verbose -O- '$Url' >'$Tarfile'"); + if ($?) + { + unlink "$AddOn->{basedir}/$Tarfile"; + $ErrMessage ||= "Could not download the $AddOnArch->{basetar}* archive"; + } + else + { + my $Decompress = $Suffix eq ".tar.xz" ? "xz" : "bzip2"; + system("cd '$AddOn->{basedir}' && set -x && ". + "$Decompress -c -d '$Tarfile' | tar xf -"); + unlink "$AddOn->{basedir}/$Tarfile"; + if ($?) + { + $ErrMessage = "Could not decompress '$Tarfile'"; + } + elsif (!-d "$AddOn->{basedir}/$AddOnArch->{shareddir}") + { + $ErrMessage = "$Tarfile did not contain $AddOnArch->{shareddir}"; + } + else + { + return 1; # Success! + } + } + } + } + + LogMsg "$ErrMessage\n"; + return 0; +} + sub _UpdateAddOn($$$) { my ($AddOns, $Name, $Arch) = @_; @@ -427,7 +478,7 @@ sub _UpdateAddOn($$$) } return 1 if (!_IsAddOnBad($AddOn, $Arch)); - return _UpdateMSIAddOn($AddOn, $Arch); + return _UpdateSharedAddOn($AddOn, $Arch) || _UpdateMSIAddOn($AddOn, $Arch); } sub UpdateAddOns()

1 0

Francois Gouget : testbot/build: Prepare for having multiple way to update addons.
by Alexandre Julliard 23 Apr '20

23 Apr '20

Module: tools Branch: master Commit: 66cca7b09689d2b05bf9a31c07444dccde64b330 URL: https://source.winehq.org/git/tools.git/?a=commit;h=66cca7b09689d2b05bf9a31… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 23 15:04:23 2020 +0200 testbot/build: Prepare for having multiple way to update addons. Check whether the addon needs to be updated before any update method is called. Since _IsAddOnBad() needs all the information required to locate the addon it now stores it in the architecture-specific structure for reuse by the update methods such as _UpdateMSIAddOn(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/Build/Utils.pm | 77 ++++++++++++++++++++++++++++------------------ 1 file changed, 47 insertions(+), 30 deletions(-) diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 17addee..a6d38fc 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -1,5 +1,5 @@ # -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- -# Copyright 2018 Francois Gouget +# Copyright 2018-2020 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -360,23 +360,56 @@ sub BuildWine($$$$;$) # Wine addons updates # +my $ADDONS_URL = "http://dl.winehq.org/wine"; + sub _IsAddOnBad($$) { my ($AddOn, $Arch) = @_; + my $AddOnArch = $AddOn->{$Arch}; + if (!$AddOnArch->{msifile}) + { + $AddOn->{basedir} = "$DataDir/$AddOn->{name}"; + my $Basename = "wine-$AddOn->{name}-$AddOn->{version}"; + my $ArchSuffix = $Arch eq "" ? "" : "-$Arch"; + $AddOnArch->{msifile} = "$Basename$ArchSuffix.msi"; + mkdir "$AddOn->{basedir}"; + } + my $Sha256 = Digest::SHA->new(256); - eval { $Sha256->addfile("$DataDir/$AddOn->{name}/$AddOn->{filename}") }; + eval { $Sha256->addfile("$AddOn->{basedir}/$AddOnArch->{msifile}") }; return "$@" if ($@); my $Checksum = $Sha256->hexdigest(); - return undef if ($Checksum eq $AddOn->{$Arch}); - return "Bad checksum for '$AddOn->{filename}'"; + return undef if ($Checksum eq $AddOnArch->{checksum}); + return "Bad checksum for '$AddOnArch->{msifile}'"; +} + +sub _UpdateMSIAddOn($$) +{ + my ($AddOn, $Arch) = @_; + + my $AddOnArch = $AddOn->{$Arch}; + InfoMsg "Downloading $AddOnArch->{msifile}\n"; + my $Url="$ADDONS_URL/wine-$AddOn->{name}/$AddOn->{version}/$AddOnArch->{msifile}"; + my $ErrMessage; + for (1..3) + { + system("cd '$AddOn->{basedir}' && set -x && ". + "wget --no-verbose -O- '$Url' >'$AddOnArch->{msifile}'"); + $ErrMessage = _IsAddOnBad($AddOn, $Arch); + return 1 if (!defined $ErrMessage); + unlink "$AddOn->{basedir}/$AddOnArch->{msifile}"; + } + LogMsg "$ErrMessage\n"; + return 0; } sub _UpdateAddOn($$$) { - my ($AddOn, $Name, $Arch) = @_; + my ($AddOns, $Name, $Arch) = @_; + my $AddOn = $AddOns->{$Name}; if (!defined $AddOn) { LogMsg "Could not get information on the $Name addon\n"; @@ -389,33 +422,17 @@ sub _UpdateAddOn($$$) } if (!$AddOn->{$Arch}) { - LogMsg "Could not get the $Name $Arch checksum\n"; + LogMsg "Could not get the $Name $Arch MSI checksum\n"; return 0; } - $AddOn->{filename} = "wine-$Name-$AddOn->{version}". - ($Arch eq "" ? "" : "-$Arch") .".msi"; return 1 if (!_IsAddOnBad($AddOn, $Arch)); - - InfoMsg "Downloading $AddOn->{filename}\n"; - mkdir "$DataDir/$Name"; - - my $Url="http://dl.winehq.org/wine/wine-$Name/$AddOn->{version}/$AddOn->{filename}"; - for (1..3) - { - system("cd '$DataDir/$Name' && set -x && ". - "wget --no-verbose -O- '$Url' >'$AddOn->{filename}'"); - last if ($? == 0); - } - my $ErrMessage = _IsAddOnBad($AddOn, $Arch); - return 1 if (!defined $ErrMessage); - LogMsg "$ErrMessage\n"; - return 0; + return _UpdateMSIAddOn($AddOn, $Arch); } sub UpdateAddOns() { - my %AddOns; + my $AddOns; my $AddonSrc = "wine/dlls/appwiz.cpl/addons.c"; if (open(my $fh, "<", "$DataDir/$AddonSrc")) { @@ -434,14 +451,14 @@ sub UpdateAddOns() { my ($AddOn, $Version) = ($1, $2); $AddOn =~ tr/A-Z/a-z/; - $AddOns{$AddOn}->{name} = $AddOn; - $AddOns{$AddOn}->{version} = $Version; + $AddOns->{$AddOn}->{name} = $AddOn; + $AddOns->{$AddOn}->{version} = $Version; } elsif ($Line =~ /^\s*#\s*define\s*(GECKO|MONO)_SHA\s*"([^"]+)"/) { my ($AddOn, $Checksum) = ($1, $2); $AddOn =~ tr/A-Z/a-z/; - $AddOns{$AddOn}->{$Arch} = $Checksum; + $AddOns->{$AddOn}->{$Arch}->{checksum} = $Checksum; $Arch = ""; } } @@ -453,9 +470,9 @@ sub UpdateAddOns() return 0; } - return _UpdateAddOn($AddOns{gecko}, "gecko", "x86") && - _UpdateAddOn($AddOns{gecko}, "gecko", "x86_64") && - _UpdateAddOn($AddOns{mono}, "mono", "x86"); + return _UpdateAddOn($AddOns, "gecko", "x86") && + _UpdateAddOn($AddOns, "gecko", "x86_64") && + _UpdateAddOn($AddOns, "mono", "x86"); }

1 0

Francois Gouget : testbot/build: Rename _VerifyAddOn() to _IsAddOnBad().
by Alexandre Julliard 23 Apr '20

23 Apr '20

Module: tools Branch: master Commit: 977f84ac127647ed91b02ad226b4ba7d115073a1 URL: https://source.winehq.org/git/tools.git/?a=commit;h=977f84ac127647ed91b02ad… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 23 15:04:17 2020 +0200 testbot/build: Rename _VerifyAddOn() to _IsAddOnBad(). The new name makes it clearer that _IsAddOnBad() returns true (the error message) if the addon is bad and false otherwise. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/Build/Utils.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 7d0739e..17addee 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -360,7 +360,7 @@ sub BuildWine($$$$;$) # Wine addons updates # -sub _VerifyAddOn($$) +sub _IsAddOnBad($$) { my ($AddOn, $Arch) = @_; @@ -395,7 +395,7 @@ sub _UpdateAddOn($$$) $AddOn->{filename} = "wine-$Name-$AddOn->{version}". ($Arch eq "" ? "" : "-$Arch") .".msi"; - return 1 if (!_VerifyAddOn($AddOn, $Arch)); + return 1 if (!_IsAddOnBad($AddOn, $Arch)); InfoMsg "Downloading $AddOn->{filename}\n"; mkdir "$DataDir/$Name"; @@ -407,7 +407,7 @@ sub _UpdateAddOn($$$) "wget --no-verbose -O- '$Url' >'$AddOn->{filename}'"); last if ($? == 0); } - my $ErrMessage = _VerifyAddOn($AddOn, $Arch); + my $ErrMessage = _IsAddOnBad($AddOn, $Arch); return 1 if (!defined $ErrMessage); LogMsg "$ErrMessage\n"; return 0;

1 0

Francois Gouget : testbot/build: Don't duplicate the addon.c filename.
by Alexandre Julliard 23 Apr '20

23 Apr '20

Module: tools Branch: master Commit: 696f3d92dbfb29fd140413ae29145dc879c59b13 URL: https://source.winehq.org/git/tools.git/?a=commit;h=696f3d92dbfb29fd140413a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 23 15:04:02 2020 +0200 testbot/build: Don't duplicate the addon.c filename. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/Build/Utils.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 8c26327..7d0739e 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -416,7 +416,8 @@ sub _UpdateAddOn($$$) sub UpdateAddOns() { my %AddOns; - if (open(my $fh, "<", "$DataDir/wine/dlls/appwiz.cpl/addons.c")) + my $AddonSrc = "wine/dlls/appwiz.cpl/addons.c"; + if (open(my $fh, "<", "$DataDir/$AddonSrc")) { my $Arch = ""; while (my $Line= <$fh>) @@ -448,7 +449,7 @@ sub UpdateAddOns() } else { - LogMsg "Could not open 'wine/dlls/appwiz.cpl/addons.c': $!\n"; + LogMsg "Could not open '$AddonSrc': $!\n"; return 0; }

1 0

Piotr Caban : vcruntime140_1: Fix rethrow handling in __CxxFrameHandler4.
by Alexandre Julliard 22 Apr '20

22 Apr '20

Module: wine Branch: master Commit: f52b33c63064aa59f48a9c10d624e3508da55b88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f52b33c63064aa59f48a9c10… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 22 12:21:35 2020 +0200 vcruntime140_1: Fix rethrow handling in __CxxFrameHandler4. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcruntime140_1/except_x86_64.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/vcruntime140_1/except_x86_64.c b/dlls/vcruntime140_1/except_x86_64.c index 5d07a1ac2c..4cc6897223 100644 --- a/dlls/vcruntime140_1/except_x86_64.c +++ b/dlls/vcruntime140_1/except_x86_64.c @@ -452,12 +452,12 @@ static LONG CALLBACK cxx_rethrow_filter(PEXCEPTION_POINTERS eptrs, void *c) EXCEPTION_RECORD *rec = eptrs->ExceptionRecord; cxx_catch_ctx *ctx = c; - FlsSetValue(fls_index, (void*)(DWORD_PTR)ctx->search_state); + if (rec->ExceptionCode == CXX_EXCEPTION && !rec->ExceptionInformation[1] && !rec->ExceptionInformation[2]) + return EXCEPTION_EXECUTE_HANDLER; + FlsSetValue(fls_index, (void*)(DWORD_PTR)ctx->search_state); if (rec->ExceptionCode != CXX_EXCEPTION) return EXCEPTION_CONTINUE_SEARCH; - if (!rec->ExceptionInformation[1] && !rec->ExceptionInformation[2]) - return EXCEPTION_EXECUTE_HANDLER; if (rec->ExceptionInformation[1] == ((EXCEPTION_RECORD*)*__current_exception())->ExceptionInformation[1]) ctx->rethrow = TRUE; return EXCEPTION_CONTINUE_SEARCH; @@ -499,6 +499,7 @@ static void* WINAPI call_catch_block4(EXCEPTION_RECORD *rec) { TRACE("detect rethrow: exception code: %x\n", prev_rec->ExceptionCode); ctx.rethrow = TRUE; + FlsSetValue(fls_index, (void*)(DWORD_PTR)ctx.search_state); if (untrans_rec) {

1 0

Dmitry Timoshkov : windowscodecs/tests: Add a separate test for 4bps BGRA TIFF format.
by Alexandre Julliard 22 Apr '20

22 Apr '20

Module: wine Branch: master Commit: 962bb9935270eb7c70ac943bf37a546ce24925a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=962bb9935270eb7c70ac943b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 22 17:41:03 2020 +0800 windowscodecs/tests: Add a separate test for 4bps BGRA TIFF format. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/tiffformat.c | 104 ++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c index 5f82550494..4769b9c8d2 100644 --- a/dlls/windowscodecs/tests/tiffformat.c +++ b/dlls/windowscodecs/tests/tiffformat.c @@ -302,6 +302,47 @@ static const struct tiff_24bpp_data { 900, 3 }, { 0x11, 0x22, 0x33 } }; + +static const struct tiff_4bps_bgra +{ + USHORT byte_order; + USHORT version; + ULONG dir_offset; + USHORT number_of_entries; + struct IFD_entry entry[14]; + ULONG next_IFD; + struct IFD_rational res; + BYTE pixel_data[4]; +} tiff_4bps_bgra = +{ +#ifdef WORDS_BIGENDIAN + 'M' | 'M' << 8, +#else + 'I' | 'I' << 8, +#endif + 42, + FIELD_OFFSET(struct tiff_4bps_bgra, number_of_entries), + 14, + { + { 0xff, IFD_SHORT, 1, 0 }, /* SUBFILETYPE */ + { 0x100, IFD_LONG, 1, 3 }, /* IMAGEWIDTH */ + { 0x101, IFD_LONG, 1, 2 }, /* IMAGELENGTH */ + { 0x102, IFD_SHORT, 1, 1 }, /* BITSPERSAMPLE */ + { 0x103, IFD_SHORT, 1, 1 }, /* COMPRESSION */ + { 0x106, IFD_SHORT, 1, 2 }, /* PHOTOMETRIC */ + { 0x111, IFD_LONG, 1, FIELD_OFFSET(struct tiff_4bps_bgra, pixel_data) }, /* STRIPOFFSETS */ + { 0x115, IFD_SHORT, 1, 4 }, /* SAMPLESPERPIXEL */ + { 0x116, IFD_LONG, 1, 2 }, /* ROWSPERSTRIP */ + { 0x117, IFD_LONG, 1, 4 }, /* STRIPBYTECOUNT */ + { 0x11a, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_4bps_bgra, res) }, /* XRESOLUTION */ + { 0x11b, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_4bps_bgra, res) }, /* YRESOLUTION */ + { 0x11c, IFD_SHORT, 1, 1 }, /* PLANARCONFIGURATION */ + { 0x128, IFD_SHORT, 1, 2 } /* RESOLUTIONUNIT */ + }, + 0, + { 96, 1 }, + { 0x12,0x30, 0x47,0xe0 } +}; #include "poppack.h" static IWICImagingFactory *factory; @@ -1221,6 +1262,68 @@ static void test_color_formats(void) } } +static void test_tiff_4bps_bgra(void) +{ + HRESULT hr; + IWICBitmapDecoder *decoder; + IWICBitmapFrameDecode *frame; + UINT frame_count, width, height, i; + double dpi_x, dpi_y; + IWICPalette *palette; + GUID format; + WICRect rc; + BYTE data[24]; + static const BYTE expected_data[24] = { 0,0,0,0xff, 0xff,0,0,0, 0xff,0,0,0xff, + 0,0xff,0,0, 0xff,0xff,0,0xff, 0xff,0xff,0xff,0 }; + + hr = create_decoder(&tiff_4bps_bgra, sizeof(tiff_4bps_bgra), &decoder); + ok(hr == S_OK, "Failed to load TIFF image data %#x\n", hr); + if (hr != S_OK) return; + + hr = IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); + ok(hr == S_OK, "GetFrameCount error %#x\n", hr); + ok(frame_count == 1, "expected 1, got %u\n", frame_count); + + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); + ok(hr == S_OK, "GetFrame error %#x\n", hr); + + hr = IWICBitmapFrameDecode_GetSize(frame, &width, &height); + ok(hr == S_OK, "GetSize error %#x\n", hr); + ok(width == 3, "got %u\n", width); + ok(height == 2, "got %u\n", height); + + hr = IWICBitmapFrameDecode_GetResolution(frame, &dpi_x, &dpi_y); + ok(hr == S_OK, "GetResolution error %#x\n", hr); + ok(dpi_x == 96.0, "expected 96.0, got %f\n", dpi_x); + ok(dpi_y == 96.0, "expected 96.0, got %f\n", dpi_y); + + hr = IWICBitmapFrameDecode_GetPixelFormat(frame, &format); + ok(hr == S_OK, "GetPixelFormat error %#x\n", hr); + ok(IsEqualGUID(&format, &GUID_WICPixelFormat32bppBGRA), + "got wrong format %s\n", wine_dbgstr_guid(&format)); + + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "CreatePalette error %#x\n", hr); + hr = IWICBitmapFrameDecode_CopyPalette(frame, palette); + ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, + "expected WINCODEC_ERR_PALETTEUNAVAILABLE, got %#x\n", hr); + IWICPalette_Release(palette); + + memset(data, 0xaa, sizeof(data)); + rc.X = 0; + rc.Y = 0; + rc.Width = 3; + rc.Height = 2; + hr = IWICBitmapFrameDecode_CopyPixels(frame, &rc, 12, sizeof(data), data); + ok(hr == S_OK, "CopyPixels error %#x\n", hr); + + for (i = 0; i < sizeof(data); i++) + ok(data[i] == expected_data[i], "%u: expected %02x, got %02x\n", i, expected_data[i], data[i]); + + IWICBitmapFrameDecode_Release(frame); + IWICBitmapDecoder_Release(decoder); +} + START_TEST(tiffformat) { HRESULT hr; @@ -1232,6 +1335,7 @@ START_TEST(tiffformat) ok(hr == S_OK, "CoCreateInstance error %#x\n", hr); if (FAILED(hr)) return; + test_tiff_4bps_bgra(); test_color_formats(); test_tiff_1bpp_palette(); test_tiff_8bpp_palette();

1 0

Dmitry Timoshkov : windowscodecs/tests: Add some tests for various TIFF color formats.
by Alexandre Julliard 22 Apr '20

22 Apr '20

Module: wine Branch: master Commit: d9ac1915420612c9131ed31cee3661a4a8d9e9ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9ac1915420612c9131ed31c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 22 17:41:00 2020 +0800 windowscodecs/tests: Add some tests for various TIFF color formats. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/tiffformat.c | 481 ++++++++++++++++++++++++++++++++++ 1 file changed, 481 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d9ac1915420612c9131e…

1 0

Dmitry Timoshkov : windowscodecs: Add support for 96bppRGBFloat and 128bppPRGBAFloat formats to TIFF decoder.
by Alexandre Julliard 22 Apr '20

22 Apr '20

Module: wine Branch: master Commit: a0b1f229c78d04ae600b498c6b160141c07e9712 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0b1f229c78d04ae600b498c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 22 17:40:57 2020 +0800 windowscodecs: Add support for 96bppRGBFloat and 128bppPRGBAFloat formats to TIFF decoder. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/regsvr.c | 29 +++++++++++++++++++++++++++++ dlls/windowscodecs/tiffformat.c | 22 ++++++++++++++++------ 2 files changed, 45 insertions(+), 6 deletions(-) diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index 3329c2d811..4750ab8484 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1238,7 +1238,9 @@ static GUID const * const tiff_decode_formats[] = { &GUID_WICPixelFormat64bppPRGBA, &GUID_WICPixelFormat32bppCMYK, &GUID_WICPixelFormat64bppCMYK, + &GUID_WICPixelFormat96bppRGBFloat, &GUID_WICPixelFormat128bppRGBAFloat, + &GUID_WICPixelFormat128bppPRGBAFloat, NULL }; @@ -1769,6 +1771,10 @@ static BYTE const channel_mask_16bit4[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, static BYTE const channel_mask_32bit[] = { 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 }; +static BYTE const channel_mask_96bit1[] = { 0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }; +static BYTE const channel_mask_96bit2[] = { 0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00 }; +static BYTE const channel_mask_96bit3[] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff }; + static BYTE const channel_mask_128bit1[] = { 0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }; static BYTE const channel_mask_128bit2[] = { 0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }; static BYTE const channel_mask_128bit3[] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00 }; @@ -1791,6 +1797,7 @@ static BYTE const * const channel_masks_16bit[] = { channel_mask_16bit, channel_mask_16bit2, channel_mask_16bit3, channel_mask_16bit4}; static BYTE const * const channel_masks_32bit[] = { channel_mask_32bit }; +static BYTE const * const channel_masks_96bit[] = { channel_mask_96bit1, channel_mask_96bit2, channel_mask_96bit3 }; static BYTE const * const channel_masks_128bit[] = { channel_mask_128bit1, channel_mask_128bit2, channel_mask_128bit3, channel_mask_128bit4 }; static BYTE const * const channel_masks_BGRA5551[] = { channel_mask_5bit, @@ -2086,6 +2093,17 @@ static struct regsvr_pixelformat const pixelformat_list[] = { WICPixelFormatNumericRepresentationUnsignedInteger, 0 }, + { &GUID_WICPixelFormat96bppRGBFloat, + "The Wine Project", + "96bpp RGBFloat", + NULL, /* no version */ + &GUID_VendorMicrosoft, + 96, /* bitsperpixel */ + 3, /* channel count */ + channel_masks_96bit, + WICPixelFormatNumericRepresentationFloat, + 0 + }, { &GUID_WICPixelFormat128bppRGBAFloat, "The Wine Project", "128bpp RGBAFloat", @@ -2097,6 +2115,17 @@ static struct regsvr_pixelformat const pixelformat_list[] = { WICPixelFormatNumericRepresentationFloat, 1 }, + { &GUID_WICPixelFormat128bppPRGBAFloat, + "The Wine Project", + "128bpp PRGBAFloat", + NULL, /* no version */ + &GUID_VendorMicrosoft, + 128, /* bitsperpixel */ + 4, /* channel count */ + channel_masks_128bit, + WICPixelFormatNumericRepresentationFloat, + 1 + }, { NULL } /* list terminator */ }; diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 3d43c967d9..19cb0cf928 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -467,12 +467,22 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) } break; case 32: - if (samples != 4) - { - FIXME("unhandled 32bpp RGB sample count %u\n", samples); - return WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT; - } - decode_info->format = &GUID_WICPixelFormat128bppRGBAFloat; + if (samples == 3) + decode_info->format = &GUID_WICPixelFormat96bppRGBFloat; + else + switch(extra_samples[0]) + { + case 1: /* Associated (pre-multiplied) alpha data */ + decode_info->format = &GUID_WICPixelFormat128bppPRGBAFloat; + break; + case 0: /* Unspecified data */ + case 2: /* Unassociated alpha data */ + decode_info->format = &GUID_WICPixelFormat128bppRGBAFloat; + break; + default: + FIXME("unhandled extra sample type %i\n", extra_samples[0]); + return E_FAIL; + } break; default: WARN("unhandled RGB bit count %u\n", bps);

1 0

Ziqing Hui : windowscodecs: Add support for extended DDS header.
by Alexandre Julliard 22 Apr '20

22 Apr '20

Module: wine Branch: master Commit: 2e7056b4ac995ded7b75fc8aac05dc6f5b647d93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e7056b4ac995ded7b75fc8a… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Apr 22 16:38:07 2020 +0800 windowscodecs: Add support for extended DDS header. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/ddsformat.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index 06b40bcbc7..04914ead3a 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -34,6 +34,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); #define DDS_MAGIC 0x20534444 +#ifndef MAKEFOURCC +#define MAKEFOURCC(ch0, ch1, ch2, ch3) \ + ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \ + ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24 )) +#endif + +#define DDPF_ALPHAPIXELS 0x00000001 +#define DDPF_ALPHA 0x00000002 +#define DDPF_FOURCC 0x00000004 +#define DDPF_PALETTEINDEXED8 0x00000020 +#define DDPF_RGB 0x00000040 +#define DDPF_LUMINANCE 0x00020000 +#define DDPF_BUMPDUDV 0x00080000 typedef struct { DWORD size; @@ -63,6 +76,14 @@ typedef struct { DWORD reserved2; } DDS_HEADER; +typedef struct { + DWORD dxgiFormat; + DWORD resourceDimension; + DWORD miscFlag; + DWORD arraySize; + DWORD miscFlags2; +} DDS_HEADER_DXT10; + typedef struct DdsDecoder { IWICBitmapDecoder IWICBitmapDecoder_iface; LONG ref; @@ -70,6 +91,7 @@ typedef struct DdsDecoder { IStream *stream; CRITICAL_SECTION lock; DDS_HEADER header; + DDS_HEADER_DXT10 header_dxt10; } DdsDecoder; static inline DdsDecoder *impl_from_IWICBitmapDecoder(IWICBitmapDecoder *iface) @@ -180,6 +202,16 @@ static HRESULT WINAPI DdsDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p goto end; } + if (This->header.ddspf.flags & DDPF_FOURCC && + This->header.ddspf.fourCC == MAKEFOURCC('D', 'X', '1', '0')) { + hr = IStream_Read(pIStream, &This->header_dxt10, sizeof(This->header_dxt10), &bytesread); + if (FAILED(hr)) goto end; + if (bytesread != sizeof(This->header_dxt10)) { + hr = WINCODEC_ERR_STREAMREAD; + goto end; + } + } + This->initialized = TRUE; This->stream = pIStream; IStream_AddRef(pIStream);

1 0

Ziqing Hui : windowscodecs/tests: Add tests for DdsDecoder_GetFrameCount().
by Alexandre Julliard 22 Apr '20

22 Apr '20

Module: wine Branch: master Commit: 3d247caab5d8e1854c5129f2410757fa02582e2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d247caab5d8e1854c5129f2… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Apr 22 16:37:51 2020 +0800 windowscodecs/tests: Add tests for DdsDecoder_GetFrameCount(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/ddsformat.c | 48 ++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 342a120a88..99f19eb175 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -276,6 +276,53 @@ static void test_dds_decoder_global_properties(IWICBitmapDecoder *decoder) if (thumnail) IWICBitmapSource_Release(thumnail); } +static void test_dds_decoder_frame_count(void) +{ + static struct test_data { + void *data; + UINT size; + UINT expected; + } test_data[] = { + { test_dds_image, sizeof(test_dds_image), 1 }, + { test_dds_mipmaps, sizeof(test_dds_mipmaps), 3 }, + { test_dds_volume, sizeof(test_dds_volume), 7 }, + { test_dds_array, sizeof(test_dds_array), 9 }, + }; + + int i; + HRESULT hr; + + for (i = 0; i < ARRAY_SIZE(test_data); i++) + { + UINT frame_count; + IWICStream *stream = NULL; + IWICBitmapDecoder *decoder = NULL; + + stream = create_stream(test_data[i].data, test_data[i].size); + if (!stream) goto next; + + decoder = create_decoder(); + if (!decoder) goto next; + + hr = init_decoder(decoder, stream, S_OK, -1); + if (hr != S_OK) goto next; + + todo_wine { + hr = IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); + ok (hr == S_OK, "GetFrameCount failed, hr=%x\n", hr); + if (hr == S_OK) { + ok (frame_count == test_data[i].expected, "%d: expected frame count %d, got %d\n", + i, test_data[i].expected, frame_count); + } + }; + + next: + if (decoder) IWICBitmapDecoder_Release(decoder); + if (stream) IWICStream_Release(stream); + + } +} + static void test_dds_decoder(void) { HRESULT hr; @@ -293,6 +340,7 @@ static void test_dds_decoder(void) test_dds_decoder_initialize(); test_dds_decoder_global_properties(decoder); + test_dds_decoder_frame_count(); end: if (decoder) IWICBitmapDecoder_Release(decoder);

1 0

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 April 2020