From: Dmitry Timoshkov <dmitry@baikal.ru> Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru> --- dlls/windowscodecs/converter.c | 10 +++++----- dlls/windowscodecs/tests/converter.c | 4 +++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index 716dd065412..2ff662c71c1 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -2067,6 +2067,7 @@ static HRESULT copypixels_to_64bppRGBA(struct FormatConverter *This, const WICRe return hr; } + default: case format_32bppBGRA: { UINT srcstride, srcdatasize; @@ -2086,7 +2087,10 @@ static HRESULT copypixels_to_64bppRGBA(struct FormatConverter *This, const WICRe srcdata = malloc(srcdatasize); if (!srcdata) return E_OUTOFMEMORY; - hr = IWICBitmapSource_CopyPixels(This->source, prc, srcstride, srcdatasize, srcdata); + if (source_format == format_32bppBGRA) + hr = IWICBitmapSource_CopyPixels(This->source, prc, srcstride, srcdatasize, srcdata); + else + hr = copypixels_to_32bppBGRA(This, prc, srcstride, srcdatasize, srcdata, source_format); if (SUCCEEDED(hr)) { srcrow = srcdata; @@ -2110,10 +2114,6 @@ static HRESULT copypixels_to_64bppRGBA(struct FormatConverter *This, const WICRe free(srcdata); return hr; } - - default: - FIXME("Unimplemented conversion path %d.\n", source_format); - return WINCODEC_ERR_UNSUPPORTEDOPERATION; } } diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 974357ed8d9..fa0dd187d2a 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -2373,7 +2373,6 @@ START_TEST(converter) test_conversion(&testdata_24bppRGB, &testdata_32bppBGR, "24bppRGB -> 32bppBGR", FALSE); test_conversion(&testdata_32bppBGRA, &testdata_24bppRGB, "32bppBGRA -> 24bppRGB", FALSE); test_conversion(&testdata_32bppRGBA, &testdata_24bppBGR, "32bppRGBA -> 24bppBGR", FALSE); - test_conversion(&testdata_32bppRGBA, &testdata_64bppRGBA_1, "32bppRGBA -> 64bppRGBA", FALSE); test_conversion(&testdata_32bppRGBA, &testdata_32bppBGRA, "32bppRGBA -> 32bppBGRA", FALSE); test_conversion(&testdata_32bppBGRA, &testdata_32bppRGBA, "32bppBGRA -> 32bppRGBA", FALSE); @@ -2389,6 +2388,9 @@ START_TEST(converter) test_conversion(&testdata_32bppGrayFloat, &testdata_24bppBGR_gray, "32bppGrayFloat -> 24bppBGR gray", FALSE); test_conversion(&testdata_32bppGrayFloat, &testdata_8bppGray, "32bppGrayFloat -> 8bppGray", FALSE); test_conversion(&testdata_32bppBGRA, &testdata_16bppBGRA5551, "32bppBGRA -> 16bppBGRA5551", FALSE); + + test_conversion(&testdata_24bppBGR, &testdata_64bppRGBA_1, "24bppBGR -> 64bppRGBA", FALSE); + test_conversion(&testdata_32bppRGBA, &testdata_64bppRGBA_1, "32bppRGBA -> 64bppRGBA", FALSE); test_conversion(&testdata_32bppBGRA, &testdata_64bppRGBA_1, "32bppBGRA -> 64bppRGBA", FALSE); test_conversion(&testdata_48bppRGB, &testdata_64bppRGBA_2, "48bppRGB -> 64bppRGBA", FALSE); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9898