September 2017 - Wine-commits

Fabian Maurer : evr: Add interface definitions for EVR filter.
by Alexandre Julliard 11 Sep '17

11 Sep '17

Module: wine Branch: master Commit: 0f94101716c25703578e5737819b925bfca8374d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f94101716c25703578e57378… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Sep 11 00:40:12 2017 +0200 evr: Add interface definitions for EVR filter. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/evr.idl | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 99 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 8a774e9..2bd41e9 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -70,6 +70,7 @@ IDL_SRCS = \ dyngraph.idl \ endpointvolume.idl \ errrec.idl \ + evr.idl \ exdisp.idl \ fusion.idl \ gameux.idl \ diff --git a/include/evr.idl b/include/evr.idl new file mode 100644 index 0000000..22f745e --- /dev/null +++ b/include/evr.idl @@ -0,0 +1,98 @@ +/* + * COM Classes for evr + * + * Copyright 2017 Fabian Maurer + * + * 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 "propidl.idl"; +import "mfidl.idl"; +import "mftransform.idl"; +import "mediaobj.idl"; +import "strmif.idl"; + +typedef enum _MFVP_MESSAGE_TYPE { + MFVP_MESSAGE_FLUSH, + MFVP_MESSAGE_INVALIDATEMEDIATYPE, + MFVP_MESSAGE_PROCESSINPUTNOTIFY, + MFVP_MESSAGE_BEGINSTREAMING, + MFVP_MESSAGE_ENDSTREAMING, + MFVP_MESSAGE_ENDOFSTREAM, + MFVP_MESSAGE_STEP, + MFVP_MESSAGE_CANCELSTEP, +} MFVP_MESSAGE_TYPE; + +[ + object, + uuid(29aff080-182a-4a5d-af3b-448f3a6346cb), + local +] +interface IMFVideoPresenter : IMFClockStateSink +{ + HRESULT ProcessMessage( + [in] MFVP_MESSAGE_TYPE eMessage, + [in] ULONG_PTR ulParam + ); + HRESULT GetCurrentMediaType( + [out] IMFVideoMediaType **ppMediaType + ); +} + +[ + object, + uuid(83e91e85-82c1-4ea7-801d-85dc50b75086), + local +] +interface IEVRFilterConfig : IUnknown +{ + HRESULT SetNumberOfStreams( + [in] DWORD dwMaxStreams + ); + HRESULT GetNumberOfStreams( + [out] DWORD *pdwMaxStreams + ); +} + +[ + object, + uuid(1f6a9f17-e70b-4e24-8ae4-0b2c3ba7a4ae), + local +] +interface IMFVideoPositionMapper : IUnknown +{ + HRESULT MapOutputCoordinateToInputStream( + [in] float xOut, + [in] float yOut, + [in] DWORD dwOutputStreamIndex, + [in] DWORD dwInputStreamIndex, + [out] float *pxIn, + [out] float *pyIn + ); +} + +[ + object, + uuid(dfdfd197-a9ca-43d8-b341-6af3503792cd), + local +] +interface IMFVideoRenderer : IUnknown +{ + HRESULT InitializeRenderer( + [in] IMFTransform *pVideoMixer, + [in] IMFVideoPresenter *pVideoPresenter + ); +}

1 0

Dmitry Timoshkov : windowscodecs: Implement IWICBitmapFrameEncode:: SetPalette in JPEG encoder.
by Alexandre Julliard 11 Sep '17

11 Sep '17

Module: wine Branch: master Commit: a901fa9dc39b02049db9cebdfbae03369f08d5db URL: http://source.winehq.org/git/wine.git/?a=commit;h=a901fa9dc39b02049db9cebdf… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 11 11:40:27 2017 -0500 windowscodecs: Implement IWICBitmapFrameEncode::SetPalette in JPEG encoder. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/jpegformat.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 014620f..69d1187 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -868,6 +868,8 @@ typedef struct JpegEncoder { double xres, yres; const jpeg_compress_format *format; IStream *stream; + WICColor palette[256]; + UINT colors; CRITICAL_SECTION lock; BYTE dest_buffer[1024]; } JpegEncoder; @@ -1070,10 +1072,24 @@ static HRESULT WINAPI JpegEncoder_Frame_SetColorContexts(IWICBitmapFrameEncode * } static HRESULT WINAPI JpegEncoder_Frame_SetPalette(IWICBitmapFrameEncode *iface, - IWICPalette *pIPalette) + IWICPalette *palette) { - FIXME("(%p,%p): stub\n", iface, pIPalette); - return WINCODEC_ERR_UNSUPPORTEDOPERATION; + JpegEncoder *This = impl_from_IWICBitmapFrameEncode(iface); + HRESULT hr; + + TRACE("(%p,%p)\n", iface, palette); + + if (!palette) return E_INVALIDARG; + + EnterCriticalSection(&This->lock); + + if (This->frame_initialized) + hr = IWICPalette_GetColors(palette, 256, This->palette, &This->colors); + else + hr = WINCODEC_ERR_NOTINITIALIZED; + + LeaveCriticalSection(&This->lock); + return hr; } static HRESULT WINAPI JpegEncoder_Frame_SetThumbnail(IWICBitmapFrameEncode *iface, @@ -1543,6 +1559,7 @@ HRESULT JpegEncoder_CreateInstance(REFIID iid, void** ppv) This->xres = This->yres = 0.0; This->format = NULL; This->stream = NULL; + This->colors = 0; InitializeCriticalSection(&This->lock); This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": JpegEncoder.lock");

1 0

Rosanne DiMesio : Change extra comments to match other textareas
by Jeremy Newman 11 Sep '17

11 Sep '17

Module: appdb Branch: master Commit: 0c964b6dfefedcf2f028eb46dbbcf727da61261b URL: http://source.winehq.org/git/appdb.git/?a=commit;h=0c964b6dfefedcf2f028eb46… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Mon Sep 11 10:09:52 2017 -0500 Change extra comments to match other textareas Makes the input field on the test report form wysiwyg and removes the pre-formatted text styling from the test results display so that it matches the other textareas in the test report. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/testData.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/testData.php b/include/testData.php index 7f05db2..86771d2 100644 --- a/include/testData.php +++ b/include/testData.php @@ -584,7 +584,7 @@ class testData{ "Workarounds\n{$this->shWorkarounds}\n". "What was not tested\n{$this->shWhatNotTested}\n". "Hardware tested\nGraphics: </ul><li>GPU: {$this->sGpuMfr}</li><li>Driver: {$this->sGraphicsDriver}</li></ul>". - "Additional Comments\n<pre style='white-space: pre-wrap;'>{$this->sComments}</pre>\n"; + "Additional Comments\n{$this->sComments}\n"; } function CreateTestTable() @@ -907,7 +907,7 @@ class testData{ echo '<a href="https://wiki.winehq.org/AppDB_Maintainer_Rating_Definitions" target="_blank">Rating definitions</a></td></tr>',"\n"; // extra comments echo '<tr valign=top><td>Extra comments</td>',"\n"; - echo '<td><textarea name="sComments" id="extra_comments" rows=10 cols=65>'; + echo '<td><textarea name="sComments" id="extra_comments" rows=20 cols=80 class="wysiwyg">'; echo $this->sComments.'</textarea></td></tr>',"\n"; /* Graphics hardware/driver

1 0

Rosanne DiMesio : Adjust test results table ratings colors
by Jeremy Newman 11 Sep '17

11 Sep '17

Module: appdb Branch: master Commit: 2c2c8996408ab41ef29fddc342dc905cab3f8a56 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=2c2c8996408ab41ef29fddc3… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Mon Sep 11 10:42:03 2017 -0500 Adjust test results table ratings colors Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- css/styles.css | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/css/styles.css b/css/styles.css index be5eef0..f09174d 100644 --- a/css/styles.css +++ b/css/styles.css @@ -746,20 +746,20 @@ table tr.rowtitle td:last-child { .color4 { background-color: #999999 } /* table row colors for ratings (alternating colors for rows) */ -tr:nth-child(odd) td.Platinum { background-color: #333333 !important; color: #ffffff !important; } -tr:nth-child(even) td.Platinum { background-color: #666666 !important; color: #ffffff !important; } +tr:nth-child(odd) td.Platinum { background-color: #E5E4E2 !important; } +tr:nth-child(even) td.Platinum { background-color: #F5F5F5 !important; } tr:nth-child(odd) td.Gold { background-color: #FFF600 !important; } tr:nth-child(even) td.Gold { background-color: #fffcb3 !important; } -tr:nth-child(odd) td.Silver { background-color: #C0C0C0 !important; } -tr:nth-child(even) td.Silver { background-color: #e6e6e6 !important; } +tr:nth-child(odd) td.Silver { background-color: #A9A9A9 !important; } +tr:nth-child(even) td.Silver { background-color: #D3D3D3 !important; } -tr:nth-child(odd) td.Bronze { background-color: #FCBA0A !important; } +tr:nth-child(odd) td.Bronze { background-color: #DAA520 !important; } tr:nth-child(even) td.Bronze { background-color: #FCBA0A !important; } tr:nth-child(odd) td.Garbage { background-color: #999966 !important; } -tr:nth-child(even) td.Garbage { background-color: #ebebe0 !important; } +tr:nth-child(even) td.Garbage { background-color: #BDB76B !important; } /* labels */ TD.label { font-weight: bold }

1 0

Rosanne DiMesio : Order screenshot queue by submitTime
by Jeremy Newman 11 Sep '17

11 Sep '17

Module: appdb Branch: master Commit: c807880551bee62d5465071795181065871af7af URL: http://source.winehq.org/git/appdb.git/?a=commit;h=c807880551bee62d54650717… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Mon Sep 11 12:54:25 2017 -0500 Order screenshot queue by submitTime Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/appData.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/appData.php b/include/appData.php index 87f751d..52ba8b0 100644 --- a/include/appData.php +++ b/include/appData.php @@ -517,7 +517,7 @@ class appData AND appData.state = '?' AND - appData.type = '?' $sVersionWhereFilter$sWhereFilter ORDER BY appFamily.appName $sLimit + appData.type = '?' $sVersionWhereFilter$sWhereFilter ORDER BY appData.submitTime, appFamily.appName $sLimit )"; if(!$iRows && !$iStart) {

1 0

Francois Gouget : dwrite: Factory_release_cached_fontface() is unused so remove it.
by Alexandre Julliard 08 Sep '17

08 Sep '17

Module: wine Branch: master Commit: 2f86c81f7f4f47a61ef3e4e2f261d8c19b06054c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f86c81f7f4f47a61ef3e4e2f… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 8 02:18:04 2017 +0200 dwrite: Factory_release_cached_fontface() is unused so remove it. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/main.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 555860a..0dce133 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -947,12 +947,6 @@ struct fontfacecached *factory_cache_fontface(IDWriteFactory5 *iface, struct lis return cached; } -void factory_release_cached_fontface(struct fontfacecached *cached) -{ - list_remove(&cached->entry); - heap_free(cached); -} - static HRESULT WINAPI dwritefactory_CreateFontFace(IDWriteFactory5 *iface, DWRITE_FONT_FACE_TYPE req_facetype, UINT32 files_number, IDWriteFontFile* const* font_files, UINT32 index, DWRITE_FONT_SIMULATIONS simulations, IDWriteFontFace **fontface)

1 0

Francois Gouget : webservices: Alloc_utf16_text() is unused, so remove it.
by Alexandre Julliard 08 Sep '17

08 Sep '17

Module: wine Branch: master Commit: 73ef39fe639724b5f42a64bbd30a3d59fe44d8ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=73ef39fe639724b5f42a64bbd… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 8 02:21:53 2017 +0200 webservices: Alloc_utf16_text() is unused, so remove it. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 12 ------------ dlls/webservices/webservices_private.h | 1 - 2 files changed, 13 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 798e5f7..0e5cdd3 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -787,18 +787,6 @@ WS_XML_UTF8_TEXT *alloc_utf8_text( const BYTE *data, ULONG len ) return ret; } -WS_XML_UTF16_TEXT *alloc_utf16_text( const BYTE *data, ULONG len ) -{ - WS_XML_UTF16_TEXT *ret; - - if (!(ret = heap_alloc( sizeof(*ret) + len ))) return NULL; - ret->text.textType = WS_XML_TEXT_TYPE_UTF16; - ret->byteCount = len; - ret->bytes = len ? (BYTE *)(ret + 1) : NULL; - if (data) memcpy( ret->bytes, data, len ); - return ret; -} - WS_XML_BASE64_TEXT *alloc_base64_text( const BYTE *data, ULONG len ) { WS_XML_BASE64_TEXT *ret; diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index 219dd39..d30f7a3 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -69,7 +69,6 @@ HRESULT read_header( WS_XML_READER *, const WS_XML_STRING *, const WS_XML_STRING HRESULT create_header_buffer( WS_XML_READER *, WS_HEAP *, WS_XML_BUFFER ** ) DECLSPEC_HIDDEN; WS_XML_UTF8_TEXT *alloc_utf8_text( const BYTE *, ULONG ) DECLSPEC_HIDDEN; -WS_XML_UTF16_TEXT *alloc_utf16_text( const BYTE *, ULONG ) DECLSPEC_HIDDEN; WS_XML_BASE64_TEXT *alloc_base64_text( const BYTE *, ULONG ) DECLSPEC_HIDDEN; WS_XML_BOOL_TEXT *alloc_bool_text( BOOL ) DECLSPEC_HIDDEN; WS_XML_INT32_TEXT *alloc_int32_text( INT32 ) DECLSPEC_HIDDEN;

1 0

Dmitry Timoshkov : windowscodecs/tests: Make create_decoder() return an error code in PNG tests.
by Alexandre Julliard 08 Sep '17

08 Sep '17

Module: wine Branch: master Commit: c87e06bb92407b8fcaabea09a99e543b48950818 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c87e06bb92407b8fcaabea09a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 7 15:52:03 2017 -0500 windowscodecs/tests: Make create_decoder() return an error code in PNG tests. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/pngformat.c | 63 ++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 31 deletions(-) diff --git a/dlls/windowscodecs/tests/pngformat.c b/dlls/windowscodecs/tests/pngformat.c index d266910..7fb9abf 100644 --- a/dlls/windowscodecs/tests/pngformat.c +++ b/dlls/windowscodecs/tests/pngformat.c @@ -276,37 +276,38 @@ static const char png_color_profile[] = { static IWICImagingFactory *factory; -static IWICBitmapDecoder *create_decoder(const void *image_data, UINT image_size) +static HRESULT create_decoder(const void *image_data, UINT image_size, IWICBitmapDecoder **decoder) { HRESULT hr; - IWICBitmapDecoder *decoder = NULL; IStream *stream; GUID format; LONG refcount; ULARGE_INTEGER pos; LARGE_INTEGER zero; + *decoder = NULL; + stream = SHCreateMemStream (image_data, image_size); ok(stream != NULL, "SHCreateMemStream error\n"); - hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, 0, &decoder); - ok(hr == S_OK, "CreateDecoderFromStream error %#x\n", hr); - if (FAILED(hr)) return NULL; - - hr = IWICBitmapDecoder_GetContainerFormat(decoder, &format); - ok(hr == S_OK, "GetContainerFormat error %#x\n", hr); - ok(IsEqualGUID(&format, &GUID_ContainerFormatPng), - "wrong container format %s\n", wine_dbgstr_guid(&format)); - - zero.QuadPart = 0; - IStream_Seek (stream, zero, STREAM_SEEK_CUR, &pos); - ok(pos.QuadPart < image_size, "seek beyond the end of stream: %x%08x >= %x\n", - (UINT)(pos.QuadPart >> 32), (UINT)pos.QuadPart, image_size); - - refcount = IStream_Release(stream); - ok(refcount > 0, "expected stream refcount > 0\n"); + hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, 0, decoder); + if (hr == S_OK) + { + hr = IWICBitmapDecoder_GetContainerFormat(*decoder, &format); + ok(hr == S_OK, "GetContainerFormat error %#x\n", hr); + ok(IsEqualGUID(&format, &GUID_ContainerFormatPng), + "wrong container format %s\n", wine_dbgstr_guid(&format)); + + zero.QuadPart = 0; + IStream_Seek (stream, zero, STREAM_SEEK_CUR, &pos); + ok(pos.QuadPart < image_size, "seek beyond the end of stream: %x%08x >= %x\n", + (UINT)(pos.QuadPart >> 32), (UINT)pos.QuadPart, image_size); + + refcount = IStream_Release(stream); + ok(refcount > 0, "expected stream refcount > 0\n"); + } - return decoder; + return hr; } static WCHAR *save_profile( BYTE *buffer, UINT size ) @@ -342,9 +343,9 @@ static void test_color_contexts(void) BYTE *buffer; BOOL ret; - decoder = create_decoder(png_no_color_profile, sizeof(png_no_color_profile)); - ok(decoder != 0, "Failed to load PNG image data\n"); - if (!decoder) return; + hr = create_decoder(png_no_color_profile, sizeof(png_no_color_profile), &decoder); + ok(hr == S_OK, "Failed to load PNG image data %#x\n", hr); + if (hr != S_OK) return; /* global color context */ hr = IWICBitmapDecoder_GetColorContexts(decoder, 0, NULL, NULL); @@ -370,9 +371,9 @@ static void test_color_contexts(void) IWICBitmapFrameDecode_Release(frame); IWICBitmapDecoder_Release(decoder); - decoder = create_decoder(png_color_profile, sizeof(png_color_profile)); - ok(decoder != 0, "Failed to load PNG image data\n"); - if (!decoder) return; + hr = create_decoder(png_color_profile, sizeof(png_color_profile), &decoder); + ok(hr == S_OK, "Failed to load PNG image data %#x\n", hr); + if (hr != S_OK) return; /* global color context */ count = 0xdeadbeef; @@ -548,9 +549,9 @@ static void test_png_palette(void) UINT count, ret; WICColor color[256]; - decoder = create_decoder(png_PLTE_tRNS, sizeof(png_PLTE_tRNS)); - ok(decoder != 0, "Failed to load PNG image data\n"); - if (!decoder) return; + hr = create_decoder(png_PLTE_tRNS, sizeof(png_PLTE_tRNS), &decoder); + ok(hr == S_OK, "Failed to load PNG image data %#x\n", hr); + if (hr != S_OK) return; hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); ok(hr == S_OK, "GetFrame error %#x\n", hr); @@ -618,9 +619,9 @@ static void test_color_formats(void) buf[24] = td[i].bit_depth; buf[25] = td[i].color_type; - decoder = create_decoder(buf, sizeof(buf)); - ok(decoder != NULL, "Failed to load PNG image data\n"); - if (!decoder) continue; + hr = create_decoder(buf, sizeof(buf), &decoder); + ok(hr == S_OK, "Failed to load PNG image data %#x\n", hr); + if (hr != S_OK) return; hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); ok(hr == S_OK, "GetFrame error %#x\n", hr);

1 0

Dmitry Timoshkov : windowscodecs/tests: Add more tests for loading PNG images in various color formats.
by Alexandre Julliard 08 Sep '17

08 Sep '17

Module: wine Branch: master Commit: 9991e4f2ae5dfc7178656cc3180c779ff2e26cd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9991e4f2ae5dfc7178656cc31… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 7 15:52:04 2017 -0500 windowscodecs/tests: Add more tests for loading PNG images in various color formats. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/pngformat.c | 218 +++++++++++++++++++++++++++++++++-- 1 file changed, 208 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9991e4f2ae5dfc7178656…

1 0

Vincent Povirk : windowscodecs: Generate a palette for color-keyed grayscale PNG's.
by Alexandre Julliard 08 Sep '17

08 Sep '17

Module: wine Branch: master Commit: 66b126b67539d23c61645e1dcff2191d42fc0249 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66b126b67539d23c61645e1dc… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Sep 7 15:52:05 2017 -0500 windowscodecs: Generate a palette for color-keyed grayscale PNG's. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 16 ----- configure.ac | 4 +- dlls/windowscodecs/pngformat.c | 124 +++++++++++++++++++---------------- dlls/windowscodecs/tests/pngformat.c | 8 +-- include/config.h.in | 3 - 5 files changed, 73 insertions(+), 82 deletions(-) diff --git a/configure b/configure index 5138198..47a41cd 100755 --- a/configure +++ b/configure @@ -13890,23 +13890,7 @@ cat >>confdefs.h <<_ACEOF #define SONAME_LIBPNG "$ac_cv_lib_soname_png" _ACEOF - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <png.h> -int -main () -{ -typeof(png_set_expand_gray_1_2_4_to_8) *p - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : -$as_echo "#define HAVE_PNG_SET_EXPAND_GRAY_1_2_4_TO_8 1" >>confdefs.h - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi else PNG_CFLAGS="" diff --git a/configure.ac b/configure.ac index a2ef1b4..cd5a50b 100644 --- a/configure.ac +++ b/configure.ac @@ -1647,9 +1647,7 @@ then [AC_CHECK_HEADERS([png.h]) if test "$ac_cv_header_png_h" = "yes" then - WINE_CHECK_SONAME(png,png_create_read_struct, - [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <png.h>]],[[typeof(png_set_expand_gray_1_2_4_to_8) *p]])], - [AC_DEFINE(HAVE_PNG_SET_EXPAND_GRAY_1_2_4_TO_8,1,[Define to 1 if libpng has the png_set_expand_gray_1_2_4_to_8 function.])])], + WINE_CHECK_SONAME(png,png_create_read_struct,, [PNG_CFLAGS=""],[$PNG_LIBS -lm -lz],[[libpng[[0-9]]*]]) else PNG_CFLAGS="" diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index b4fd346..9e837ca 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -319,11 +319,6 @@ MAKE_FUNCPTR(png_get_tRNS); MAKE_FUNCPTR(png_set_bgr); MAKE_FUNCPTR(png_set_crc_action); MAKE_FUNCPTR(png_set_error_fn); -#ifdef HAVE_PNG_SET_EXPAND_GRAY_1_2_4_TO_8 -MAKE_FUNCPTR(png_set_expand_gray_1_2_4_to_8); -#else -MAKE_FUNCPTR(png_set_gray_1_2_4_to_8); -#endif MAKE_FUNCPTR(png_set_filler); MAKE_FUNCPTR(png_set_filter); MAKE_FUNCPTR(png_set_gray_to_rgb); @@ -388,11 +383,6 @@ static void *load_libpng(void) LOAD_FUNCPTR(png_set_bgr); LOAD_FUNCPTR(png_set_crc_action); LOAD_FUNCPTR(png_set_error_fn); -#ifdef HAVE_PNG_SET_EXPAND_GRAY_1_2_4_TO_8 - LOAD_FUNCPTR(png_set_expand_gray_1_2_4_to_8); -#else - LOAD_FUNCPTR(png_set_gray_1_2_4_to_8); -#endif LOAD_FUNCPTR(png_set_filler); LOAD_FUNCPTR(png_set_filter); LOAD_FUNCPTR(png_set_gray_to_rgb); @@ -651,43 +641,18 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p /* check for color-keyed alpha */ transparency = ppng_get_tRNS(This->png_ptr, This->info_ptr, &trans, &num_trans, &trans_values); - if (transparency && color_type != PNG_COLOR_TYPE_PALETTE) + if (transparency && (color_type == PNG_COLOR_TYPE_RGB || + (color_type == PNG_COLOR_TYPE_GRAY && bit_depth == 16))) { /* expand to RGBA */ if (color_type == PNG_COLOR_TYPE_GRAY) - { - if (bit_depth < 8) - { -#ifdef HAVE_PNG_SET_EXPAND_GRAY_1_2_4_TO_8 - ppng_set_expand_gray_1_2_4_to_8(This->png_ptr); -#else - ppng_set_gray_1_2_4_to_8(This->png_ptr); -#endif - bit_depth = 8; - } ppng_set_gray_to_rgb(This->png_ptr); - } ppng_set_tRNS_to_alpha(This->png_ptr); color_type = PNG_COLOR_TYPE_RGB_ALPHA; } switch (color_type) { - case PNG_COLOR_TYPE_GRAY: - This->bpp = bit_depth; - switch (bit_depth) - { - case 1: This->format = &GUID_WICPixelFormatBlackWhite; break; - case 2: This->format = &GUID_WICPixelFormat2bppGray; break; - case 4: This->format = &GUID_WICPixelFormat4bppGray; break; - case 8: This->format = &GUID_WICPixelFormat8bppGray; break; - case 16: This->format = &GUID_WICPixelFormat16bppGray; break; - default: - ERR("invalid grayscale bit depth: %i\n", bit_depth); - hr = E_FAIL; - goto end; - } - break; case PNG_COLOR_TYPE_GRAY_ALPHA: /* WIC does not support grayscale alpha formats so use RGBA */ ppng_set_gray_to_rgb(This->png_ptr); @@ -707,6 +672,25 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p goto end; } break; + case PNG_COLOR_TYPE_GRAY: + This->bpp = bit_depth; + if (!transparency) + { + switch (bit_depth) + { + case 1: This->format = &GUID_WICPixelFormatBlackWhite; break; + case 2: This->format = &GUID_WICPixelFormat2bppGray; break; + case 4: This->format = &GUID_WICPixelFormat4bppGray; break; + case 8: This->format = &GUID_WICPixelFormat8bppGray; break; + case 16: This->format = &GUID_WICPixelFormat16bppGray; break; + default: + ERR("invalid grayscale bit depth: %i\n", bit_depth); + hr = E_FAIL; + goto end; + } + break; + } + /* else fall through */ case PNG_COLOR_TYPE_PALETTE: This->bpp = bit_depth; switch (bit_depth) @@ -1034,7 +1018,7 @@ static HRESULT WINAPI PngDecoder_Frame_CopyPalette(IWICBitmapFrameDecode *iface, IWICPalette *pIPalette) { PngDecoder *This = impl_from_IWICBitmapFrameDecode(iface); - png_uint_32 ret; + png_uint_32 ret, color_type, bit_depth; png_colorp png_palette; int num_palette; WICColor palette[256]; @@ -1048,30 +1032,58 @@ static HRESULT WINAPI PngDecoder_Frame_CopyPalette(IWICBitmapFrameDecode *iface, EnterCriticalSection(&This->lock); - ret = ppng_get_PLTE(This->png_ptr, This->info_ptr, &png_palette, &num_palette); - if (!ret) - { - hr = WINCODEC_ERR_PALETTEUNAVAILABLE; - goto end; - } + color_type = ppng_get_color_type(This->png_ptr, This->info_ptr); + bit_depth = ppng_get_bit_depth(This->png_ptr, This->info_ptr); - if (num_palette > 256) + if (color_type == PNG_COLOR_TYPE_PALETTE) { - ERR("palette has %i colors?!\n", num_palette); - hr = E_FAIL; - goto end; + ret = ppng_get_PLTE(This->png_ptr, This->info_ptr, &png_palette, &num_palette); + if (!ret) + { + hr = WINCODEC_ERR_PALETTEUNAVAILABLE; + goto end; + } + + if (num_palette > 256) + { + ERR("palette has %i colors?!\n", num_palette); + hr = E_FAIL; + goto end; + } + + ret = ppng_get_tRNS(This->png_ptr, This->info_ptr, &trans_alpha, &num_trans, &trans_values); + if (!ret) num_trans = 0; + + for (i=0; i<num_palette; i++) + { + BYTE alpha = (i < num_trans) ? trans_alpha[i] : 0xff; + palette[i] = (alpha << 24 | + png_palette[i].red << 16| + png_palette[i].green << 8| + png_palette[i].blue); + } } + else if (color_type == PNG_COLOR_TYPE_GRAY) { + ret = ppng_get_tRNS(This->png_ptr, This->info_ptr, &trans_alpha, &num_trans, &trans_values); - ret = ppng_get_tRNS(This->png_ptr, This->info_ptr, &trans_alpha, &num_trans, &trans_values); - if (!ret) num_trans = 0; + if (!ret) + { + hr = WINCODEC_ERR_PALETTEUNAVAILABLE; + goto end; + } - for (i=0; i<num_palette; i++) + num_palette = 1 << bit_depth; + + for (i=0; i<num_palette; i++) + { + BYTE alpha = (i == trans_values[0].gray) ? 0 : 0xff; + BYTE val = i * 255 / (num_palette - 1); + palette[i] = (alpha << 24 | val << 16 | val << 8 | val); + } + } + else { - BYTE alpha = (i < num_trans) ? trans_alpha[i] : 0xff; - palette[i] = (alpha << 24 | - png_palette[i].red << 16| - png_palette[i].green << 8| - png_palette[i].blue); + hr = WINCODEC_ERR_PALETTEUNAVAILABLE; } end: diff --git a/dlls/windowscodecs/tests/pngformat.c b/dlls/windowscodecs/tests/pngformat.c index f34711d..4b84cce 100644 --- a/dlls/windowscodecs/tests/pngformat.c +++ b/dlls/windowscodecs/tests/pngformat.c @@ -674,10 +674,10 @@ static void test_color_formats(void) { 24, 2, NULL, NULL, NULL }, { 32, 2, NULL, NULL, NULL }, /* 0 - PNG_COLOR_TYPE_GRAY */ - { 1, 0, &GUID_WICPixelFormatBlackWhite, &GUID_WICPixelFormatBlackWhite, &GUID_WICPixelFormat1bppIndexed, TRUE }, - { 2, 0, &GUID_WICPixelFormat2bppGray, &GUID_WICPixelFormat2bppGray, &GUID_WICPixelFormat2bppIndexed, TRUE }, - { 4, 0, &GUID_WICPixelFormat4bppGray, &GUID_WICPixelFormat4bppGray, &GUID_WICPixelFormat4bppIndexed, TRUE }, - { 8, 0, &GUID_WICPixelFormat8bppGray, &GUID_WICPixelFormat8bppGray, &GUID_WICPixelFormat8bppIndexed, TRUE }, + { 1, 0, &GUID_WICPixelFormatBlackWhite, &GUID_WICPixelFormatBlackWhite, &GUID_WICPixelFormat1bppIndexed }, + { 2, 0, &GUID_WICPixelFormat2bppGray, &GUID_WICPixelFormat2bppGray, &GUID_WICPixelFormat2bppIndexed }, + { 4, 0, &GUID_WICPixelFormat4bppGray, &GUID_WICPixelFormat4bppGray, &GUID_WICPixelFormat4bppIndexed }, + { 8, 0, &GUID_WICPixelFormat8bppGray, &GUID_WICPixelFormat8bppGray, &GUID_WICPixelFormat8bppIndexed }, { 16, 0, &GUID_WICPixelFormat16bppGray, &GUID_WICPixelFormat16bppGray, &GUID_WICPixelFormat64bppRGBA }, { 24, 0, NULL, NULL, NULL }, { 32, 0, NULL, NULL, NULL }, diff --git a/include/config.h.in b/include/config.h.in index b0b5925..dd7a3a2 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -711,9 +711,6 @@ /* Define to 1 if you have the <png.h> header file. */ #undef HAVE_PNG_H -/* Define to 1 if libpng has the png_set_expand_gray_1_2_4_to_8 function. */ -#undef HAVE_PNG_SET_EXPAND_GRAY_1_2_4_TO_8 - /* Define to 1 if you have the `poll' function. */ #undef HAVE_POLL

1 0