October 2009 - Wine-commits

Alexandre Julliard : Release 1.1.31.
by Alexandre Julliard 09 Oct '09

09 Oct '09

Module: wine Branch: master Commit: e8ce3e600a40a739f75d6716aae555c31b0b4d0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8ce3e600a40a739f75d6716a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 9 18:05:57 2009 +0200 Release 1.1.31. --- ANNOUNCE | 1517 +++++++++++++++++++++++++++++-------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 722 insertions(+), 815 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e8ce3e600a40a739f75d6…

1 0

Tag wine-1.1.31 : Alexandre Julliard : Release 1.1.31
by Alexandre Julliard 09 Oct '09

09 Oct '09

Module: wine Branch: refs/tags/wine-1.1.31 Tag: 1246a1ba827ab47b27091dda85c3f619968b0b0f URL: http://source.winehq.org/git/wine.git/?a=tag;h=1246a1ba827ab47b27091dda85c3… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 9 18:05:58 2009 +0200 Release 1.1.31

1 0

Alexandre Julliard : rpcrt4/tests: Remove tests for specific values of bit fields.
by Alexandre Julliard 09 Oct '09

09 Oct '09

Module: wine Branch: master Commit: 8ce9b8f1be4f53d3d9dc73bfa9919c87010be3a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ce9b8f1be4f53d3d9dc73bfa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 9 16:09:20 2009 +0200 rpcrt4/tests: Remove tests for specific values of bit fields. --- dlls/rpcrt4/tests/ndr_marshall.c | 19 ++----------------- 1 files changed, 2 insertions(+), 17 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index f4ef592..9781115 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -1184,30 +1184,15 @@ static void test_common_stub_data( const char *prefix, const MIDL_STUB_MESSAGE * "%s: pAsyncMsg should have been set to zero instead of %d\n", prefix, stubMsg->PointerLength ); TEST_ZERO(fInDontFree, "%d"); TEST_ZERO(fDontCallFreeInst, "%d"); - ok(stubMsg->fInOnlyParam == 0 || - stubMsg->fInOnlyParam == -1, /* Vista */ - "%s: fInOnlyParam should have been set to 0 or -1 instead of %d\n", prefix, stubMsg->fInOnlyParam); - ok( stubMsg->fHasReturn == 0 || - broken(stubMsg->fHasReturn == -1), /* win9x, nt4 */ + ok( stubMsg->fHasReturn == 0 || broken(stubMsg->fHasReturn), /* win9x, nt4 */ "%s: fHasReturn should have been set to zero instead of %d\n", prefix, stubMsg->fHasReturn ); TEST_ZERO(fHasExtensions, "%d"); TEST_ZERO(fHasNewCorrDesc, "%d"); - ok(stubMsg->fIsIn == 0 || - broken(stubMsg->fIsIn == -1), /* win9x, nt4 */ + ok(stubMsg->fIsIn == 0 || broken(stubMsg->fIsIn), /* win9x, nt4 */ "%s: fIsIn should have been set to 0 instead of %d\n", prefix, stubMsg->fIsIn); - ok(stubMsg->fIsOut == 0 || - stubMsg->fIsOut == -1, /* XP-SP3 */ - "%s: fIsOut should have been set to 0 or -1 instead of %d\n", prefix, stubMsg->fIsOut); TEST_ZERO(fIsOicf, "%d"); ok(stubMsg->fBufferValid == 0, "%s: fBufferValid should have been set to 0 instead of %d\n", prefix, stubMsg->fBufferValid); - ok(stubMsg->fHasMemoryValidateCallback == 0 || - stubMsg->fHasMemoryValidateCallback == -1, /* XP-SP3 */ - "%s: fHasMemoryValidateCallback should have been set to 0 or -1 instead of %d\n", - prefix, stubMsg->fHasMemoryValidateCallback); - ok(stubMsg->fInFree == 0 || - stubMsg->fInFree == -1, /* XP-SP3 */ - "%s: fInFree should have been set to 0 or -1 instead of %d\n", prefix, stubMsg->fInFree); TEST_ZERO(fNeedMCCP, "%d"); ok(stubMsg->fUnused == 0 || stubMsg->fUnused == -2, /* Vista */

1 0

Vincent Povirk : windowscodecs: Implement Commit for the PNG encoder.
by Alexandre Julliard 09 Oct '09

09 Oct '09

Module: wine Branch: master Commit: 3db6ef498097676644c87ad2130552ac98a73a5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3db6ef498097676644c87ad21… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Sep 23 17:21:46 2009 -0500 windowscodecs: Implement Commit for the PNG encoder. --- dlls/windowscodecs/pngformat.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 404fa25..6aaca6b 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -715,6 +715,7 @@ typedef struct PngEncoder { double xres, yres; UINT lines_written; BOOL frame_committed; + BOOL committed; } PngEncoder; static inline PngEncoder *encoder_from_frame(IWICBitmapFrameEncode *iface) @@ -1195,8 +1196,15 @@ static HRESULT WINAPI PngEncoder_CreateNewFrame(IWICBitmapEncoder *iface, static HRESULT WINAPI PngEncoder_Commit(IWICBitmapEncoder *iface) { - TRACE("(%p): stub\n", iface); - return E_NOTIMPL; + PngEncoder *This = (PngEncoder*)iface; + TRACE("(%p)\n", iface); + + if (!This->frame_committed || This->committed) + return WINCODEC_ERR_WRONGSTATE; + + This->committed = TRUE; + + return S_OK; } static HRESULT WINAPI PngEncoder_GetMetadataQueryWriter(IWICBitmapEncoder *iface, @@ -1258,6 +1266,7 @@ HRESULT PngEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This->yres = 0.0; This->lines_written = 0; This->frame_committed = FALSE; + This->committed = FALSE; ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); IUnknown_Release((IUnknown*)This);

1 0

Vincent Povirk : windowscodecs: Add test for PNG encoder.
by Alexandre Julliard 09 Oct '09

09 Oct '09

Module: wine Branch: master Commit: d80630e8c9e6f32ba3ce9bdbb5745c818d1c671c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d80630e8c9e6f32ba3ce9bdbb… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Sep 23 13:46:06 2009 -0500 windowscodecs: Add test for PNG encoder. --- dlls/windowscodecs/tests/converter.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 680c350..3f82369 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -236,6 +236,12 @@ static void compare_bitmap_data(const struct bitmap_data *expect, IWICBitmapSour HeapFree(GetProcessHeap(), 0, converted_bits); } +static const BYTE bits_24bppBGR[] = { + 255,0,0, 0,255,0, 0,0,255, 0,0,0, + 0,255,255, 255,0,255, 255,255,0, 255,255,255}; +static const struct bitmap_data testdata_24bppBGR = { + &GUID_WICPixelFormat24bppBGR, 24, bits_24bppBGR, 4, 2, 96.0, 96.0}; + static const BYTE bits_32bppBGR[] = { 255,0,0,80, 0,255,0,80, 0,0,255,80, 0,0,0,80, 0,255,255,80, 255,0,255,80, 255,255,0,80, 255,255,255,80}; @@ -425,5 +431,8 @@ START_TEST(converter) test_encoder(&testdata_32bppBGR, &CLSID_WICBmpEncoder, &testdata_32bppBGR, &CLSID_WICBmpDecoder, "BMP encoder 32bppBGR"); + test_encoder(&testdata_24bppBGR, &CLSID_WICPngEncoder, + &testdata_24bppBGR, &CLSID_WICPngDecoder, "PNG encoder 24bppBGR"); + CoUninitialize(); }

1 0

Vincent Povirk : gdiplus: Enable encoding of PNG images.
by Alexandre Julliard 09 Oct '09

09 Oct '09

Module: wine Branch: master Commit: cab50432f6eb20ca2224a8df9882507282ee7851 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cab50432f6eb20ca2224a8df9… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Sep 23 17:33:53 2009 -0500 gdiplus: Enable encoding of PNG images. --- dlls/gdiplus/image.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index da94ee2..9813e52 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -2131,6 +2131,12 @@ static GpStatus encode_image_BMP(GpImage *image, IStream* stream, return encode_image_WIC(image, stream, &CLSID_WICBmpEncoder, params); } +static GpStatus encode_image_png(GpImage *image, IStream* stream, + GDIPCONST CLSID* clsid, GDIPCONST EncoderParameters* params) +{ + return encode_image_WIC(image, stream, &CLSID_WICPngEncoder, params); +} + /***************************************************************************** * GdipSaveImageToStream [GDIPLUS.@] */ @@ -2354,14 +2360,14 @@ static const struct image_codec codecs[NUM_CODECS] = { /* FormatDescription */ png_format, /* FilenameExtension */ png_extension, /* MimeType */ png_mimetype, - /* Flags */ ImageCodecFlagsDecoder | ImageCodecFlagsSupportBitmap | ImageCodecFlagsBuiltin, + /* Flags */ ImageCodecFlagsEncoder | ImageCodecFlagsDecoder | ImageCodecFlagsSupportBitmap | ImageCodecFlagsBuiltin, /* Version */ 1, /* SigCount */ 1, /* SigSize */ 8, /* SigPattern */ png_sig_pattern, /* SigMask */ png_sig_mask, }, - NULL, + encode_image_png, decode_image_png }, {

1 0

Vincent Povirk : windowscodecs: Implement SetResolution for the PNG encoder .
by Alexandre Julliard 09 Oct '09

09 Oct '09

Module: wine Branch: master Commit: 6bc71039b193caafe730e0219ab589c317299a58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bc71039b193caafe730e0219… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Sep 23 16:56:56 2009 -0500 windowscodecs: Implement SetResolution for the PNG encoder. --- dlls/windowscodecs/pngformat.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index af074e8..48295b2 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -700,6 +700,7 @@ typedef struct PngEncoder { const struct png_pixelformat *format; BOOL info_written; UINT width, height; + double xres, yres; } PngEncoder; static inline PngEncoder *encoder_from_frame(IWICBitmapFrameEncode *iface) @@ -772,8 +773,15 @@ static HRESULT WINAPI PngFrameEncode_SetSize(IWICBitmapFrameEncode *iface, static HRESULT WINAPI PngFrameEncode_SetResolution(IWICBitmapFrameEncode *iface, double dpiX, double dpiY) { - FIXME("(%p,%0.2f,%0.2f): stub\n", iface, dpiX, dpiY); - return E_NOTIMPL; + PngEncoder *This = encoder_from_frame(iface); + TRACE("(%p,%0.2f,%0.2f)\n", iface, dpiX, dpiY); + + if (!This->frame_initialized || This->info_written) return WINCODEC_ERR_WRONGSTATE; + + This->xres = dpiX; + This->yres = dpiY; + + return S_OK; } static HRESULT WINAPI PngFrameEncode_SetPixelFormat(IWICBitmapFrameEncode *iface, @@ -1099,6 +1107,8 @@ HRESULT PngEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This->info_written = FALSE; This->width = 0; This->height = 0; + This->xres = 0.0; + This->yres = 0.0; ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); IUnknown_Release((IUnknown*)This);

1 0

Vincent Povirk : windowscodecs: Implement WritePixels for the PNG encoder.
by Alexandre Julliard 09 Oct '09

09 Oct '09

Module: wine Branch: master Commit: 2e14644937031f045072d925df3c0a3e543320ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e14644937031f045072d925d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Sep 23 17:15:36 2009 -0500 windowscodecs: Implement WritePixels for the PNG encoder. --- dlls/windowscodecs/pngformat.c | 68 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 66 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 48295b2..1ac4772 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -58,8 +58,11 @@ MAKE_FUNCPTR(png_get_pHYs); MAKE_FUNCPTR(png_get_PLTE); MAKE_FUNCPTR(png_get_tRNS); MAKE_FUNCPTR(png_set_bgr); +MAKE_FUNCPTR(png_set_filler); MAKE_FUNCPTR(png_set_gray_1_2_4_to_8); MAKE_FUNCPTR(png_set_gray_to_rgb); +MAKE_FUNCPTR(png_set_IHDR); +MAKE_FUNCPTR(png_set_pHYs); MAKE_FUNCPTR(png_set_read_fn); MAKE_FUNCPTR(png_set_strip_16); MAKE_FUNCPTR(png_set_tRNS_to_alpha); @@ -67,6 +70,8 @@ MAKE_FUNCPTR(png_set_write_fn); MAKE_FUNCPTR(png_read_end); MAKE_FUNCPTR(png_read_image); MAKE_FUNCPTR(png_read_info); +MAKE_FUNCPTR(png_write_info); +MAKE_FUNCPTR(png_write_rows); #undef MAKE_FUNCPTR static void *load_libpng(void) @@ -93,8 +98,11 @@ static void *load_libpng(void) LOAD_FUNCPTR(png_get_PLTE); LOAD_FUNCPTR(png_get_tRNS); LOAD_FUNCPTR(png_set_bgr); + LOAD_FUNCPTR(png_set_filler); LOAD_FUNCPTR(png_set_gray_1_2_4_to_8); LOAD_FUNCPTR(png_set_gray_to_rgb); + LOAD_FUNCPTR(png_set_IHDR); + LOAD_FUNCPTR(png_set_pHYs); LOAD_FUNCPTR(png_set_read_fn); LOAD_FUNCPTR(png_set_strip_16); LOAD_FUNCPTR(png_set_tRNS_to_alpha); @@ -102,6 +110,8 @@ static void *load_libpng(void) LOAD_FUNCPTR(png_read_end); LOAD_FUNCPTR(png_read_image); LOAD_FUNCPTR(png_read_info); + LOAD_FUNCPTR(png_write_info); + LOAD_FUNCPTR(png_write_rows); #undef LOAD_FUNCPTR } @@ -701,6 +711,7 @@ typedef struct PngEncoder { BOOL info_written; UINT width, height; double xres, yres; + UINT lines_written; } PngEncoder; static inline PngEncoder *encoder_from_frame(IWICBitmapFrameEncode *iface) @@ -831,8 +842,60 @@ static HRESULT WINAPI PngFrameEncode_SetThumbnail(IWICBitmapFrameEncode *iface, static HRESULT WINAPI PngFrameEncode_WritePixels(IWICBitmapFrameEncode *iface, UINT lineCount, UINT cbStride, UINT cbBufferSize, BYTE *pbPixels) { - FIXME("(%p,%u,%u,%u,%p): stub\n", iface, lineCount, cbStride, cbBufferSize, pbPixels); - return E_NOTIMPL; + PngEncoder *This = encoder_from_frame(iface); + png_byte **row_pointers=NULL; + UINT i; + TRACE("(%p,%u,%u,%u,%p)\n", iface, lineCount, cbStride, cbBufferSize, pbPixels); + + if (!This->frame_initialized || !This->width || !This->height || !This->format) + return WINCODEC_ERR_WRONGSTATE; + + if (lineCount == 0 || lineCount + This->lines_written > This->height) + return E_INVALIDARG; + + /* set up setjmp/longjmp error handling */ + if (setjmp(png_jmpbuf(This->png_ptr))) + { + if (row_pointers) HeapFree(GetProcessHeap(), 0, row_pointers); + return E_FAIL; + } + + if (!This->info_written) + { + ppng_set_IHDR(This->png_ptr, This->info_ptr, This->width, This->height, + This->format->bit_depth, This->format->color_type, PNG_INTERLACE_NONE, + PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); + + if (This->xres != 0.0 && This->yres != 0.0) + { + ppng_set_pHYs(This->png_ptr, This->info_ptr, (This->xres+0.0127) / 0.0254, + (This->yres+0.0127) / 0.0254, PNG_RESOLUTION_METER); + } + + ppng_write_info(This->png_ptr, This->info_ptr); + + if (This->format->remove_filler) + ppng_set_filler(This->png_ptr, 0, PNG_FILLER_AFTER); + + if (This->format->swap_rgb) + ppng_set_bgr(This->png_ptr); + + This->info_written = TRUE; + } + + row_pointers = HeapAlloc(GetProcessHeap(), 0, lineCount * sizeof(png_byte*)); + if (!row_pointers) + return E_OUTOFMEMORY; + + for (i=0; i<lineCount; i++) + row_pointers[i] = pbPixels + cbStride * i; + + ppng_write_rows(This->png_ptr, row_pointers, lineCount); + This->lines_written += lineCount; + + HeapFree(GetProcessHeap(), 0, row_pointers); + + return S_OK; } static HRESULT WINAPI PngFrameEncode_WriteSource(IWICBitmapFrameEncode *iface, @@ -1109,6 +1172,7 @@ HRESULT PngEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This->height = 0; This->xres = 0.0; This->yres = 0.0; + This->lines_written = 0; ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); IUnknown_Release((IUnknown*)This);

1 0

Vincent Povirk : windowscodecs: Implement WriteSource for the PNG encoder.
by Alexandre Julliard 09 Oct '09

09 Oct '09

Module: wine Branch: master Commit: b3790010fdf1eaae04a6cfc8c59d0699b93418d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3790010fdf1eaae04a6cfc8c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Sep 23 16:53:15 2009 -0500 windowscodecs: Implement WriteSource for the PNG encoder. --- dlls/windowscodecs/pngformat.c | 70 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 68 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 1ac4772..c888b5a 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -901,8 +901,74 @@ static HRESULT WINAPI PngFrameEncode_WritePixels(IWICBitmapFrameEncode *iface, static HRESULT WINAPI PngFrameEncode_WriteSource(IWICBitmapFrameEncode *iface, IWICBitmapSource *pIBitmapSource, WICRect *prc) { - FIXME("(%p,%p,%p): stub\n", iface, pIBitmapSource, prc); - return E_NOTIMPL; + PngEncoder *This = encoder_from_frame(iface); + HRESULT hr; + WICRect rc; + WICPixelFormatGUID guid; + UINT stride; + BYTE *pixeldata; + TRACE("(%p,%p,%p)\n", iface, pIBitmapSource, prc); + + if (!This->frame_initialized || !This->width || !This->height) + return WINCODEC_ERR_WRONGSTATE; + + if (!This->format) + { + hr = IWICBitmapSource_GetPixelFormat(pIBitmapSource, &guid); + if (FAILED(hr)) return hr; + hr = IWICBitmapFrameEncode_SetPixelFormat(iface, &guid); + if (FAILED(hr)) return hr; + } + + hr = IWICBitmapSource_GetPixelFormat(pIBitmapSource, &guid); + if (FAILED(hr)) return hr; + if (memcmp(&guid, This->format->guid, sizeof(GUID)) != 0) + { + /* FIXME: should use WICConvertBitmapSource to convert */ + ERR("format %s unsupported\n", debugstr_guid(&guid)); + return E_FAIL; + } + + if (This->xres == 0.0 || This->yres == 0.0) + { + double xres, yres; + hr = IWICBitmapSource_GetResolution(pIBitmapSource, &xres, &yres); + if (FAILED(hr)) return hr; + hr = IWICBitmapFrameEncode_SetResolution(iface, xres, yres); + if (FAILED(hr)) return hr; + } + + if (!prc) + { + UINT width, height; + hr = IWICBitmapSource_GetSize(pIBitmapSource, &width, &height); + if (FAILED(hr)) return hr; + rc.X = 0; + rc.Y = 0; + rc.Width = width; + rc.Height = height; + prc = &rc; + } + + if (prc->Width != This->width) return E_INVALIDARG; + + stride = (This->format->bpp * This->width + 7)/8; + + pixeldata = HeapAlloc(GetProcessHeap(), 0, stride * prc->Height); + if (!pixeldata) return E_OUTOFMEMORY; + + hr = IWICBitmapSource_CopyPixels(pIBitmapSource, prc, stride, + stride*prc->Height, pixeldata); + + if (SUCCEEDED(hr)) + { + hr = IWICBitmapFrameEncode_WritePixels(iface, prc->Height, stride, + stride*prc->Height, pixeldata); + } + + HeapFree(GetProcessHeap(), 0, pixeldata); + + return hr; } static HRESULT WINAPI PngFrameEncode_Commit(IWICBitmapFrameEncode *iface)

1 0

Vincent Povirk : windowscodecs: Implement Commit for the PNG frame encoder.
by Alexandre Julliard 09 Oct '09

09 Oct '09

Module: wine Branch: master Commit: e7eadeec92af44edf9bca23a3e5b4a960aebb3c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7eadeec92af44edf9bca23a3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Sep 23 17:20:07 2009 -0500 windowscodecs: Implement Commit for the PNG frame encoder. --- dlls/windowscodecs/pngformat.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index c888b5a..404fa25 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -70,6 +70,7 @@ MAKE_FUNCPTR(png_set_write_fn); MAKE_FUNCPTR(png_read_end); MAKE_FUNCPTR(png_read_image); MAKE_FUNCPTR(png_read_info); +MAKE_FUNCPTR(png_write_end); MAKE_FUNCPTR(png_write_info); MAKE_FUNCPTR(png_write_rows); #undef MAKE_FUNCPTR @@ -110,6 +111,7 @@ static void *load_libpng(void) LOAD_FUNCPTR(png_read_end); LOAD_FUNCPTR(png_read_image); LOAD_FUNCPTR(png_read_info); + LOAD_FUNCPTR(png_write_end); LOAD_FUNCPTR(png_write_info); LOAD_FUNCPTR(png_write_rows); @@ -712,6 +714,7 @@ typedef struct PngEncoder { UINT width, height; double xres, yres; UINT lines_written; + BOOL frame_committed; } PngEncoder; static inline PngEncoder *encoder_from_frame(IWICBitmapFrameEncode *iface) @@ -973,8 +976,23 @@ static HRESULT WINAPI PngFrameEncode_WriteSource(IWICBitmapFrameEncode *iface, static HRESULT WINAPI PngFrameEncode_Commit(IWICBitmapFrameEncode *iface) { - FIXME("(%p): stub\n", iface); - return E_NOTIMPL; + PngEncoder *This = encoder_from_frame(iface); + TRACE("(%p)\n", iface); + + if (!This->info_written || This->lines_written != This->height || This->frame_committed) + return WINCODEC_ERR_WRONGSTATE; + + /* set up setjmp/longjmp error handling */ + if (setjmp(png_jmpbuf(This->png_ptr))) + { + return E_FAIL; + } + + ppng_write_end(This->png_ptr, This->info_ptr); + + This->frame_committed = TRUE; + + return S_OK; } static HRESULT WINAPI PngFrameEncode_GetMetadataQueryWriter(IWICBitmapFrameEncode *iface, @@ -1239,6 +1257,7 @@ HRESULT PngEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This->xres = 0.0; This->yres = 0.0; This->lines_written = 0; + This->frame_committed = FALSE; ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); IUnknown_Release((IUnknown*)This);

1 0