August 2009 - Wine-commits - list.winehq.org

Vincent Povirk : windowscodecs: Print a FIXME when WICConvertBitmapSource fails.
by Alexandre Julliard 25 Aug '09

25 Aug '09

Module: wine Branch: master Commit: 341b6ffd714f5e35e57063371d34816648f840be URL: http://source.winehq.org/git/wine.git/?a=commit;h=341b6ffd714f5e35e57063371… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 24 13:11:08 2009 -0500 windowscodecs: Print a FIXME when WICConvertBitmapSource fails. --- dlls/windowscodecs/info.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index a89759b..64c3855 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -1064,6 +1064,7 @@ HRESULT WINAPI WICConvertBitmapSource(REFWICPixelFormatGUID dstFormat, IWICBitma } else { + FIXME("cannot convert %s to %s\n", debugstr_guid(&srcFormat), debugstr_guid(dstFormat)); *ppIDst = NULL; return WINCODEC_ERR_COMPONENTNOTFOUND; }

1 0

Vincent Povirk : windowscodecs: Implement CopyPixels for the JPEG decoder.
by Alexandre Julliard 25 Aug '09

25 Aug '09

Module: wine Branch: master Commit: 529bdca8a85cf1803fb855cc221abcf5f036fab8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=529bdca8a85cf1803fb855cc2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 24 13:08:30 2009 -0500 windowscodecs: Implement CopyPixels for the JPEG decoder. --- dlls/windowscodecs/jpegformat.c | 70 +++++++++++++++++++++++++++++++++++++- 1 files changed, 68 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 50ee013..6f78821 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -63,6 +63,7 @@ static void *libjpeg_handle; MAKE_FUNCPTR(jpeg_CreateDecompress); MAKE_FUNCPTR(jpeg_destroy_decompress); MAKE_FUNCPTR(jpeg_read_header); +MAKE_FUNCPTR(jpeg_read_scanlines); MAKE_FUNCPTR(jpeg_resync_to_restart); MAKE_FUNCPTR(jpeg_start_decompress); MAKE_FUNCPTR(jpeg_std_error); @@ -81,6 +82,7 @@ static void *load_libjpeg(void) LOAD_FUNCPTR(jpeg_CreateDecompress); LOAD_FUNCPTR(jpeg_destroy_decompress); LOAD_FUNCPTR(jpeg_read_header); + LOAD_FUNCPTR(jpeg_read_scanlines); LOAD_FUNCPTR(jpeg_resync_to_restart); LOAD_FUNCPTR(jpeg_start_decompress); LOAD_FUNCPTR(jpeg_std_error); @@ -100,6 +102,7 @@ typedef struct { struct jpeg_error_mgr jerr; struct jpeg_source_mgr source_mgr; BYTE source_buffer[1024]; + BYTE *image_data; } JpegDecoder; static inline JpegDecoder *decoder_from_decompress(j_decompress_ptr decompress) @@ -155,6 +158,7 @@ static ULONG WINAPI JpegDecoder_Release(IWICBitmapDecoder *iface) { if (This->cinfo_initialized) pjpeg_destroy_decompress(&This->cinfo); if (This->stream) IStream_Release(This->stream); + HeapFree(GetProcessHeap(), 0, This->image_data); HeapFree(GetProcessHeap(), 0, This); } @@ -428,8 +432,69 @@ static HRESULT WINAPI JpegDecoder_Frame_CopyPalette(IWICBitmapFrameDecode *iface static HRESULT WINAPI JpegDecoder_Frame_CopyPixels(IWICBitmapFrameDecode *iface, const WICRect *prc, UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer) { - FIXME("(%p,%p,%u,%u,%p): stub\n", iface, prc, cbStride, cbBufferSize, pbBuffer); - return E_NOTIMPL; + JpegDecoder *This = decoder_from_frame(iface); + UINT bpp; + UINT stride; + UINT data_size; + UINT max_row_needed; + TRACE("(%p,%p,%u,%u,%p)\n", iface, prc, cbStride, cbBufferSize, pbBuffer); + + if (This->cinfo.out_color_space == JCS_GRAYSCALE) bpp = 8; + else bpp = 24; + + stride = bpp * This->cinfo.output_width; + data_size = stride * This->cinfo.output_height; + + max_row_needed = prc->Y + prc->Height; + if (max_row_needed > This->cinfo.output_height) return E_INVALIDARG; + + if (!This->image_data) + { + This->image_data = HeapAlloc(GetProcessHeap(), 0, data_size); + if (!This->image_data) return E_OUTOFMEMORY; + } + + while (max_row_needed > This->cinfo.output_scanline) + { + UINT first_scanline = This->cinfo.output_scanline; + UINT max_rows; + JSAMPROW out_rows[4]; + UINT i, j; + JDIMENSION ret; + + max_rows = min(This->cinfo.output_height-first_scanline, 4); + for (i=0; i<max_rows; i++) + out_rows[i] = This->image_data + stride * (first_scanline+i); + + ret = pjpeg_read_scanlines(&This->cinfo, out_rows, max_rows); + + if (ret == 0) + { + ERR("read_scanlines failed\n"); + return E_FAIL; + } + + if (bpp == 24) + { + /* libjpeg gives us RGB data and we want BGR, so byteswap the data */ + for (i=first_scanline; i<This->cinfo.output_scanline; i++) + { + BYTE *pixel = This->image_data + stride * i; + for (j=0; j<This->cinfo.output_width; j++) + { + BYTE red=pixel[0]; + BYTE blue=pixel[2]; + pixel[0]=blue; + pixel[2]=red; + pixel+=3; + } + } + } + } + + return copy_pixels(bpp, This->image_data, + This->cinfo.output_width, This->cinfo.output_height, stride, + prc, cbStride, cbBufferSize, pbBuffer); } static HRESULT WINAPI JpegDecoder_Frame_GetMetadataQueryReader(IWICBitmapFrameDecode *iface, @@ -493,6 +558,7 @@ HRESULT JpegDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This->initialized = FALSE; This->cinfo_initialized = FALSE; This->stream = NULL; + This->image_data = NULL; ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); IUnknown_Release((IUnknown*)This);

1 0

Vincent Povirk : windowscodecs: Implement GetSize for the JPEG decoder.
by Alexandre Julliard 25 Aug '09

25 Aug '09

Module: wine Branch: master Commit: 7d63abc9ec61719849d753c7e713559f6a5ed7bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d63abc9ec61719849d753c7e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 24 12:35:51 2009 -0500 windowscodecs: Implement GetSize for the JPEG decoder. --- dlls/windowscodecs/jpegformat.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 69a07db..50ee013 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -392,8 +392,11 @@ static ULONG WINAPI JpegDecoder_Frame_Release(IWICBitmapFrameDecode *iface) static HRESULT WINAPI JpegDecoder_Frame_GetSize(IWICBitmapFrameDecode *iface, UINT *puiWidth, UINT *puiHeight) { - FIXME("(%p,%p,%p)\n", iface, puiWidth, puiHeight); - return E_NOTIMPL; + JpegDecoder *This = decoder_from_frame(iface); + *puiWidth = This->cinfo.output_width; + *puiHeight = This->cinfo.output_height; + TRACE("(%p)->(%u,%u)\n", iface, *puiWidth, *puiHeight); + return S_OK; } static HRESULT WINAPI JpegDecoder_Frame_GetPixelFormat(IWICBitmapFrameDecode *iface,

1 0

Vincent Povirk : windowscodecs: Implement GetPixelFormat for the JPEG decoder.
by Alexandre Julliard 25 Aug '09

25 Aug '09

Module: wine Branch: master Commit: 0ab6e9853c4a3a2db2216daf4141519356169b58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ab6e9853c4a3a2db2216daf4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 24 12:29:02 2009 -0500 windowscodecs: Implement GetPixelFormat for the JPEG decoder. --- dlls/windowscodecs/jpegformat.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 38292bd..69a07db 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -399,8 +399,13 @@ static HRESULT WINAPI JpegDecoder_Frame_GetSize(IWICBitmapFrameDecode *iface, static HRESULT WINAPI JpegDecoder_Frame_GetPixelFormat(IWICBitmapFrameDecode *iface, WICPixelFormatGUID *pPixelFormat) { - FIXME("(%p,%p)\n", iface, pPixelFormat); - return E_NOTIMPL; + JpegDecoder *This = decoder_from_frame(iface); + TRACE("(%p,%p)\n", iface, pPixelFormat); + if (This->cinfo.out_color_space == JCS_RGB) + memcpy(pPixelFormat, &GUID_WICPixelFormat24bppBGR, sizeof(GUID)); + else /* This->cinfo.out_color_space == JCS_GRAYSCALE */ + memcpy(pPixelFormat, &GUID_WICPixelFormat8bppGray, sizeof(GUID)); + return S_OK; } static HRESULT WINAPI JpegDecoder_Frame_GetResolution(IWICBitmapFrameDecode *iface,

1 0

Vincent Povirk : windowscodecs: Implement GetFrame for the JPEG decoder.
by Alexandre Julliard 25 Aug '09

25 Aug '09

Module: wine Branch: master Commit: 5ef3b51756bb2181a77e8748a3f4ec5b2c401bfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ef3b51756bb2181a77e8748a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 24 12:23:34 2009 -0500 windowscodecs: Implement GetFrame for the JPEG decoder. --- dlls/windowscodecs/jpegformat.c | 125 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 123 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 8759905..38292bd 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -91,6 +91,7 @@ static void *load_libjpeg(void) typedef struct { const IWICBitmapDecoderVtbl *lpVtbl; + const IWICBitmapFrameDecodeVtbl *lpFrameVtbl; LONG ref; BOOL initialized; BOOL cinfo_initialized; @@ -106,6 +107,11 @@ static inline JpegDecoder *decoder_from_decompress(j_decompress_ptr decompress) return CONTAINING_RECORD(decompress, JpegDecoder, cinfo); } +static inline JpegDecoder *decoder_from_frame(IWICBitmapFrameDecode *iface) +{ + return CONTAINING_RECORD(iface, JpegDecoder, lpFrameVtbl); +} + static HRESULT WINAPI JpegDecoder_QueryInterface(IWICBitmapDecoder *iface, REFIID iid, void **ppv) { @@ -318,8 +324,17 @@ static HRESULT WINAPI JpegDecoder_GetFrameCount(IWICBitmapDecoder *iface, static HRESULT WINAPI JpegDecoder_GetFrame(IWICBitmapDecoder *iface, UINT index, IWICBitmapFrameDecode **ppIBitmapFrame) { - FIXME("(%p,%u,%p): stub\n", iface, index, ppIBitmapFrame); - return E_NOTIMPL; + JpegDecoder *This = (JpegDecoder*)iface; + TRACE("(%p,%u,%p)\n", iface, index, ppIBitmapFrame); + + if (!This->initialized) return WINCODEC_ERR_NOTINITIALIZED; + + if (index != 0) return E_INVALIDARG; + + IWICBitmapDecoder_AddRef(iface); + *ppIBitmapFrame = (IWICBitmapFrameDecode*)&This->lpFrameVtbl; + + return S_OK; } static const IWICBitmapDecoderVtbl JpegDecoder_Vtbl = { @@ -339,6 +354,111 @@ static const IWICBitmapDecoderVtbl JpegDecoder_Vtbl = { JpegDecoder_GetFrame }; +static HRESULT WINAPI JpegDecoder_Frame_QueryInterface(IWICBitmapFrameDecode *iface, REFIID iid, + void **ppv) +{ + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_IWICBitmapSource, iid) || + IsEqualIID(&IID_IWICBitmapFrameDecode, iid)) + { + *ppv = iface; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI JpegDecoder_Frame_AddRef(IWICBitmapFrameDecode *iface) +{ + JpegDecoder *This = decoder_from_frame(iface); + return IUnknown_AddRef((IUnknown*)This); +} + +static ULONG WINAPI JpegDecoder_Frame_Release(IWICBitmapFrameDecode *iface) +{ + JpegDecoder *This = decoder_from_frame(iface); + return IUnknown_Release((IUnknown*)This); +} + +static HRESULT WINAPI JpegDecoder_Frame_GetSize(IWICBitmapFrameDecode *iface, + UINT *puiWidth, UINT *puiHeight) +{ + FIXME("(%p,%p,%p)\n", iface, puiWidth, puiHeight); + return E_NOTIMPL; +} + +static HRESULT WINAPI JpegDecoder_Frame_GetPixelFormat(IWICBitmapFrameDecode *iface, + WICPixelFormatGUID *pPixelFormat) +{ + FIXME("(%p,%p)\n", iface, pPixelFormat); + return E_NOTIMPL; +} + +static HRESULT WINAPI JpegDecoder_Frame_GetResolution(IWICBitmapFrameDecode *iface, + double *pDpiX, double *pDpiY) +{ + FIXME("(%p,%p,%p): stub\n", iface, pDpiX, pDpiY); + return E_NOTIMPL; +} + +static HRESULT WINAPI JpegDecoder_Frame_CopyPalette(IWICBitmapFrameDecode *iface, + IWICPalette *pIPalette) +{ + FIXME("(%p,%p): stub\n", iface, pIPalette); + return E_NOTIMPL; +} + +static HRESULT WINAPI JpegDecoder_Frame_CopyPixels(IWICBitmapFrameDecode *iface, + const WICRect *prc, UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer) +{ + FIXME("(%p,%p,%u,%u,%p): stub\n", iface, prc, cbStride, cbBufferSize, pbBuffer); + return E_NOTIMPL; +} + +static HRESULT WINAPI JpegDecoder_Frame_GetMetadataQueryReader(IWICBitmapFrameDecode *iface, + IWICMetadataQueryReader **ppIMetadataQueryReader) +{ + FIXME("(%p,%p): stub\n", iface, ppIMetadataQueryReader); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; +} + +static HRESULT WINAPI JpegDecoder_Frame_GetColorContexts(IWICBitmapFrameDecode *iface, + UINT cCount, IWICColorContext **ppIColorContexts, UINT *pcActualCount) +{ + FIXME("(%p,%u,%p,%p): stub\n", iface, cCount, ppIColorContexts, pcActualCount); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; +} + +static HRESULT WINAPI JpegDecoder_Frame_GetThumbnail(IWICBitmapFrameDecode *iface, + IWICBitmapSource **ppIThumbnail) +{ + FIXME("(%p,%p): stub\n", iface, ppIThumbnail); + return WINCODEC_ERR_CODECNOTHUMBNAIL; +} + +static const IWICBitmapFrameDecodeVtbl JpegDecoder_Frame_Vtbl = { + JpegDecoder_Frame_QueryInterface, + JpegDecoder_Frame_AddRef, + JpegDecoder_Frame_Release, + JpegDecoder_Frame_GetSize, + JpegDecoder_Frame_GetPixelFormat, + JpegDecoder_Frame_GetResolution, + JpegDecoder_Frame_CopyPalette, + JpegDecoder_Frame_CopyPixels, + JpegDecoder_Frame_GetMetadataQueryReader, + JpegDecoder_Frame_GetColorContexts, + JpegDecoder_Frame_GetThumbnail +}; + HRESULT JpegDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) { JpegDecoder *This; @@ -360,6 +480,7 @@ HRESULT JpegDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) if (!This) return E_OUTOFMEMORY; This->lpVtbl = &JpegDecoder_Vtbl; + This->lpFrameVtbl = &JpegDecoder_Frame_Vtbl; This->ref = 1; This->initialized = FALSE; This->cinfo_initialized = FALSE;

1 0

Vincent Povirk : windowscodecs: Implement Initialize for the JPEG decoder.
by Alexandre Julliard 25 Aug '09

25 Aug '09

Module: wine Branch: master Commit: 4185c0d9fe5a8236f73a6ba8201ad09e98c60452 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4185c0d9fe5a8236f73a6ba82… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 24 11:45:46 2009 -0500 windowscodecs: Implement Initialize for the JPEG decoder. --- dlls/windowscodecs/jpegformat.c | 120 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 118 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index ecbc167..8759905 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -60,6 +60,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); static void *libjpeg_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p##f +MAKE_FUNCPTR(jpeg_CreateDecompress); +MAKE_FUNCPTR(jpeg_destroy_decompress); +MAKE_FUNCPTR(jpeg_read_header); +MAKE_FUNCPTR(jpeg_resync_to_restart); +MAKE_FUNCPTR(jpeg_start_decompress); MAKE_FUNCPTR(jpeg_std_error); #undef MAKE_FUNCPTR @@ -73,6 +78,11 @@ static void *load_libjpeg(void) return NULL; \ } + LOAD_FUNCPTR(jpeg_CreateDecompress); + LOAD_FUNCPTR(jpeg_destroy_decompress); + LOAD_FUNCPTR(jpeg_read_header); + LOAD_FUNCPTR(jpeg_resync_to_restart); + LOAD_FUNCPTR(jpeg_start_decompress); LOAD_FUNCPTR(jpeg_std_error); #undef LOAD_FUNCPTR } @@ -82,8 +92,20 @@ static void *load_libjpeg(void) typedef struct { const IWICBitmapDecoderVtbl *lpVtbl; LONG ref; + BOOL initialized; + BOOL cinfo_initialized; + IStream *stream; + struct jpeg_decompress_struct cinfo; + struct jpeg_error_mgr jerr; + struct jpeg_source_mgr source_mgr; + BYTE source_buffer[1024]; } JpegDecoder; +static inline JpegDecoder *decoder_from_decompress(j_decompress_ptr decompress) +{ + return CONTAINING_RECORD(decompress, JpegDecoder, cinfo); +} + static HRESULT WINAPI JpegDecoder_QueryInterface(IWICBitmapDecoder *iface, REFIID iid, void **ppv) { @@ -125,6 +147,8 @@ static ULONG WINAPI JpegDecoder_Release(IWICBitmapDecoder *iface) if (ref == 0) { + if (This->cinfo_initialized) pjpeg_destroy_decompress(&This->cinfo); + if (This->stream) IStream_Release(This->stream); HeapFree(GetProcessHeap(), 0, This); } @@ -138,11 +162,100 @@ static HRESULT WINAPI JpegDecoder_QueryCapability(IWICBitmapDecoder *iface, IStr return E_NOTIMPL; } +static void source_mgr_init_source(j_decompress_ptr cinfo) +{ +} + +static jpeg_boolean source_mgr_fill_input_buffer(j_decompress_ptr cinfo) +{ + JpegDecoder *This = decoder_from_decompress(cinfo); + HRESULT hr; + ULONG bytesread; + + hr = IStream_Read(This->stream, This->source_buffer, 1024, &bytesread); + + if (hr != S_OK || bytesread == 0) + { + return FALSE; + } + else + { + This->source_mgr.next_input_byte = This->source_buffer; + This->source_mgr.bytes_in_buffer = bytesread; + return TRUE; + } +} + +static void source_mgr_skip_input_data(j_decompress_ptr cinfo, long num_bytes) +{ + JpegDecoder *This = decoder_from_decompress(cinfo); + LARGE_INTEGER seek; + + if (num_bytes > This->source_mgr.bytes_in_buffer) + { + seek.QuadPart = num_bytes - This->source_mgr.bytes_in_buffer; + IStream_Seek(This->stream, seek, STREAM_SEEK_CUR, NULL); + This->source_mgr.bytes_in_buffer = 0; + } + else if (num_bytes > 0) + { + This->source_mgr.next_input_byte += num_bytes; + This->source_mgr.bytes_in_buffer -= num_bytes; + } +} + +static void source_mgr_term_source(j_decompress_ptr cinfo) +{ +} + static HRESULT WINAPI JpegDecoder_Initialize(IWICBitmapDecoder *iface, IStream *pIStream, WICDecodeOptions cacheOptions) { - FIXME("(%p,%p,%u): stub\n", iface, pIStream, cacheOptions); - return E_NOTIMPL; + JpegDecoder *This = (JpegDecoder*)iface; + int ret; + TRACE("(%p,%p,%u)\n", iface, pIStream, cacheOptions); + + if (This->cinfo_initialized) return WINCODEC_ERR_WRONGSTATE; + + This->cinfo.err = pjpeg_std_error(&This->jerr); + + pjpeg_CreateDecompress(&This->cinfo, JPEG_LIB_VERSION, sizeof(struct jpeg_decompress_struct)); + + This->cinfo_initialized = TRUE; + + This->stream = pIStream; + IStream_AddRef(pIStream); + + This->source_mgr.bytes_in_buffer = 0; + This->source_mgr.init_source = source_mgr_init_source; + This->source_mgr.fill_input_buffer = source_mgr_fill_input_buffer; + This->source_mgr.skip_input_data = source_mgr_skip_input_data; + This->source_mgr.resync_to_restart = pjpeg_resync_to_restart; + This->source_mgr.term_source = source_mgr_term_source; + + This->cinfo.src = &This->source_mgr; + + ret = pjpeg_read_header(&This->cinfo, TRUE); + + if (ret != JPEG_HEADER_OK) { + WARN("Jpeg image in stream has bad format, read header returned %d.\n",ret); + return E_FAIL; + } + + if (This->cinfo.jpeg_color_space == JCS_GRAYSCALE) + This->cinfo.out_color_space = JCS_GRAYSCALE; + else + This->cinfo.out_color_space = JCS_RGB; + + if (!pjpeg_start_decompress(&This->cinfo)) + { + ERR("jpeg_start_decompress failed\n"); + return E_FAIL; + } + + This->initialized = TRUE; + + return S_OK; } static HRESULT WINAPI JpegDecoder_GetContainerFormat(IWICBitmapDecoder *iface, @@ -248,6 +361,9 @@ HRESULT JpegDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This->lpVtbl = &JpegDecoder_Vtbl; This->ref = 1; + This->initialized = FALSE; + This->cinfo_initialized = FALSE; + This->stream = NULL; ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); IUnknown_Release((IUnknown*)This);

1 0

Vincent Povirk : windowscodecs: Add stub JPEG decoder.
by Alexandre Julliard 25 Aug '09

25 Aug '09

Module: wine Branch: master Commit: bec465e467b9d502abb3ed0ca83196b0a7f8b861 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bec465e467b9d502abb3ed0ca… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 24 10:19:37 2009 -0500 windowscodecs: Add stub JPEG decoder. --- dlls/windowscodecs/Makefile.in | 1 + dlls/windowscodecs/clsfactory.c | 1 + dlls/windowscodecs/jpegformat.c | 266 ++++++++++++++++++++++++++++++++ dlls/windowscodecs/regsvr.c | 29 ++++ dlls/windowscodecs/wincodecs_private.h | 1 + 5 files changed, 298 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bec465e467b9d502abb3e…

1 0

Vincent Povirk : include: Add 8-bit grayscale pixel format.
by Alexandre Julliard 25 Aug '09

25 Aug '09

Module: wine Branch: master Commit: 79292ea1c14fb7af9fdef81f5b1fb38f75812ff8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79292ea1c14fb7af9fdef81f5… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 24 10:19:50 2009 -0500 include: Add 8-bit grayscale pixel format. --- include/wincodec.idl | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/wincodec.idl b/include/wincodec.idl index 80601c1..b2d7cff 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -126,6 +126,8 @@ cpp_quote("DEFINE_GUID(GUID_WICPixelFormat2bppIndexed, 0x6fddc324,0x4e03,0x4bfe, cpp_quote("DEFINE_GUID(GUID_WICPixelFormat4bppIndexed, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x03);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat8bppIndexed, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x04);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat8bppGray, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x08);") + cpp_quote("DEFINE_GUID(GUID_WICPixelFormat16bppBGR555, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x09);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat16bppBGR565, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x0a);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat24bppBGR, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x0c);")

1 0

Andrew Eikum : gdiplus: Support regions of more than one rectangle in GdipCreateRegionHrgn.
by Alexandre Julliard 25 Aug '09

25 Aug '09

Module: wine Branch: master Commit: 9ec5f9ad6fb97deaa443ce68ce4ca67c4b2f7298 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ec5f9ad6fb97deaa443ce68c… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Aug 24 16:49:31 2009 -0500 gdiplus: Support regions of more than one rectangle in GdipCreateRegionHrgn. --- dlls/gdiplus/region.c | 66 +++++++++++++++++++++++++----------------- dlls/gdiplus/tests/region.c | 14 ++++----- 2 files changed, 45 insertions(+), 35 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 039e789..ce6b60d 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -579,51 +579,63 @@ GpStatus WINGDIPAPI GdipCreateRegionRgnData(GDIPCONST BYTE *data, INT size, GpRe */ GpStatus WINGDIPAPI GdipCreateRegionHrgn(HRGN hrgn, GpRegion **region) { - union { - RGNDATA data; - char buf[sizeof(RGNDATAHEADER) + sizeof(RECT)]; - } rdata; DWORD size; - GpRectF rectf; - GpPath *path; + LPRGNDATA buf; + LPRECT rect; GpStatus stat; + GpPath* path; + GpRegion* local; + int i; TRACE("(%p, %p)\n", hrgn, region); if(!region || !(size = GetRegionData(hrgn, 0, NULL))) return InvalidParameter; - if(size > sizeof(RGNDATAHEADER) + sizeof(RECT)){ - FIXME("Only simple rect regions supported.\n"); - *region = NULL; - return NotImplemented; - } + buf = GdipAlloc(size); + if(!buf) + return OutOfMemory; - if(!GetRegionData(hrgn, sizeof(rdata), &rdata.data)) + if(!GetRegionData(hrgn, size, buf)){ + GdipFree(buf); return GenericError; - - /* return empty region */ - if(IsRectEmpty(&rdata.data.rdh.rcBound)){ - stat = GdipCreateRegion(region); - if(stat == Ok) - GdipSetEmpty(*region); - return stat; } - rectf.X = (REAL)rdata.data.rdh.rcBound.left; - rectf.Y = (REAL)rdata.data.rdh.rcBound.top; - rectf.Width = (REAL)rdata.data.rdh.rcBound.right - rectf.X; - rectf.Height = (REAL)rdata.data.rdh.rcBound.bottom - rectf.Y; + if(buf->rdh.nCount == 0){ + if((stat = GdipCreateRegion(&local)) != Ok){ + GdipFree(buf); + return stat; + } + if((stat = GdipSetEmpty(local)) != Ok){ + GdipFree(buf); + GdipDeleteRegion(local); + return stat; + } + *region = local; + GdipFree(buf); + return Ok; + } - stat = GdipCreatePath(FillModeAlternate, &path); - if(stat != Ok) + if((stat = GdipCreatePath(FillModeAlternate, &path)) != Ok){ + GdipFree(buf); return stat; + } - GdipAddPathRectangle(path, rectf.X, rectf.Y, rectf.Width, rectf.Height); + rect = (LPRECT)buf->Buffer; + for(i = 0; i < buf->rdh.nCount; i++){ + if((stat = GdipAddPathRectangle(path, (REAL)rect->left, (REAL)rect->top, + (REAL)(rect->right - rect->left), (REAL)(rect->bottom - rect->top))) != Ok){ + GdipFree(buf); + GdipDeletePath(path); + return stat; + } + rect++; + } stat = GdipCreateRegionPath(path, region); - GdipDeletePath(path); + GdipFree(buf); + GdipDeletePath(path); return stat; } diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 8b1b04e..fddceb3 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -704,7 +704,7 @@ static void test_combinereplace(void) static void test_fromhrgn(void) { GpStatus status; - GpRegion *region; + GpRegion *region = (GpRegion*)0xabcdef01; HRGN hrgn; UINT needed; DWORD buf[220]; @@ -720,6 +720,7 @@ static void test_fromhrgn(void) expect(InvalidParameter, status); status = GdipCreateRegionHrgn((HRGN)0xdeadbeef, &region); expect(InvalidParameter, status); + ok(region == (GpRegion*)0xabcdef01, "Expected region not to be created\n"); /* empty rectangle */ hrgn = CreateRectRgn(0, 0, 0, 0); @@ -788,21 +789,19 @@ static void test_fromhrgn(void) /* ellipse */ hrgn = CreateEllipticRgn(0, 0, 100, 10); status = GdipCreateRegionHrgn(hrgn, &region); - todo_wine expect(Ok, status); + expect(Ok, status); status = GdipGetRegionDataSize(region, &needed); -todo_wine{ expect(Ok, status); ok(needed == 216 || needed == 196, /* win98 */ "Got %.8x\n", needed); -} + status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); - todo_wine expect(Ok, status); + expect(Ok, status); if(status == Ok && needed == 216) /* Don't try to test win98 layout */ { -todo_wine{ expect(Ok, status); expect(216, needed); expect_dword(buf, 208); @@ -812,8 +811,7 @@ todo_wine{ expect_dword(buf + 5, 0x000000C0); expect_magic((DWORD*)(buf + 6)); expect_dword(buf + 7, 0x00000024); - expect_dword(buf + 8, 0x00006000); /* ?? */ -} + todo_wine expect_dword(buf + 8, 0x00006000); /* ?? */ } GdipDeleteRegion(region);

1 0

Ge van Geldorp : ntdll/tests: Pass properly aligned buffers.
by Alexandre Julliard 25 Aug '09

25 Aug '09

Module: wine Branch: master Commit: cf5e2938a9c15e2fb4a3e62861ae5d25589eaa2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf5e2938a9c15e2fb4a3e6286… Author: Ge van Geldorp <ggeldorp(a)vmware.com> Date: Mon Aug 24 21:26:25 2009 +0200 ntdll/tests: Pass properly aligned buffers. --- dlls/ntdll/tests/info.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 6e3851d..f09acc9 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -124,18 +124,22 @@ static void test_query_performance(void) ULONG FullLength; ULONG ReturnLength; SYSTEM_PERFORMANCE_INFORMATION spi; - BYTE Buffer[sizeof(SYSTEM_PERFORMANCE_INFORMATION) + 2]; + struct SPI_PLUS_EXTRA + { + SYSTEM_PERFORMANCE_INFORMATION spi; + BYTE extra[2]; + } spi_plus_extra; - status = pNtQuerySystemInformation(SystemPerformanceInformation, Buffer, 0, &FullLength); + status = pNtQuerySystemInformation(SystemPerformanceInformation, &spi, 0, &FullLength); ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); - status = pNtQuerySystemInformation(SystemPerformanceInformation, Buffer, sizeof(spi), &ReturnLength); + status = pNtQuerySystemInformation(SystemPerformanceInformation, &spi, sizeof(spi), &ReturnLength); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok( sizeof(spi) == ReturnLength, "Inconsistent length %d\n", ReturnLength); - status = pNtQuerySystemInformation(SystemPerformanceInformation, &Buffer, sizeof(Buffer), &ReturnLength); + status = pNtQuerySystemInformation(SystemPerformanceInformation, &spi_plus_extra, sizeof(spi_plus_extra), &ReturnLength); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( ReturnLength == min(FullLength, sizeof(Buffer)), "Inconsistent length %d\n", ReturnLength); + ok( ReturnLength == min(FullLength, sizeof(spi_plus_extra)), "Inconsistent length %d\n", ReturnLength); /* Not return values yet, as struct members are unknown */ }

1 0