- Wine-Devel - list.winehq.org

[PATCH 1/5] riched20: Pass a para or run ptr to the char ofs propagation function.
by Huw Davies Nov. 9, 2020

Nov. 9, 2020

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/caret.c | 6 ++-- dlls/riched20/editor.h | 3 +- dlls/riched20/para.c | 12 +++----- dlls/riched20/run.c | 66 ++++++++++++++---------------------------- 4 files changed, 29 insertions(+), 58 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 813074599a7..2fa6842da13 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -413,10 +413,8 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, /* c = updated data now */ - if (c.run == cursor.run) - ME_SkipAndPropagateCharOffset( run_get_di( c.run ), shift ); - else - ME_PropagateCharOffset( run_get_di( c.run ), shift ); + if (c.run == cursor.run) c.run->nCharOfs -= shift; + editor_propagate_char_ofs( NULL, c.run, shift ); if (!cursor.run->len) { diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index d06fcef332f..c29619cc793 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -126,12 +126,12 @@ static inline ME_DisplayItem *row_get_di( ME_Row *row ) void cursor_from_char_ofs( ME_TextEditor *editor, int char_ofs, ME_Cursor *cursor ) DECLSPEC_HIDDEN; BOOL cursor_next_run( ME_Cursor *cursor, BOOL all_para ) DECLSPEC_HIDDEN; BOOL cursor_prev_run( ME_Cursor *cursor, BOOL all_para ) DECLSPEC_HIDDEN; +void editor_propagate_char_ofs( ME_Paragraph *para, ME_Run *run, int shift ) DECLSPEC_HIDDEN; int run_char_ofs( ME_Run *run, int ofs ) DECLSPEC_HIDDEN; ME_Run *run_create( ME_Style *s, int nFlags ) DECLSPEC_HIDDEN; ME_Run *run_insert( ME_TextEditor *editor, ME_Cursor *cursor, ME_Style *style, const WCHAR *str, int len, int flags ) DECLSPEC_HIDDEN; void ME_CheckCharOffsets(ME_TextEditor *editor) DECLSPEC_HIDDEN; -void ME_PropagateCharOffset(ME_DisplayItem *p, int shift) DECLSPEC_HIDDEN; /* this one accounts for 1/2 char tolerance */ int ME_CharFromPointContext(ME_Context *c, int cx, ME_Run *run, BOOL closest, BOOL visual_order) DECLSPEC_HIDDEN; int ME_CharFromPoint(ME_TextEditor *editor, int cx, ME_Run *run, BOOL closest, BOOL visual_order) DECLSPEC_HIDDEN; @@ -147,7 +147,6 @@ ME_Run *run_split( ME_TextEditor *editor, ME_Cursor *cursor ) DECLSPEC_HIDDEN; void ME_UpdateRunFlags(ME_TextEditor *editor, ME_Run *run) DECLSPEC_HIDDEN; SIZE ME_GetRunSizeCommon(ME_Context *c, const ME_Paragraph *para, ME_Run *run, int nLen, int startx, int *pAscent, int *pDescent) DECLSPEC_HIDDEN; -void ME_SkipAndPropagateCharOffset(ME_DisplayItem *p, int shift) DECLSPEC_HIDDEN; void ME_SetCharFormat(ME_TextEditor *editor, ME_Cursor *start, ME_Cursor *end, CHARFORMAT2W *pFmt) DECLSPEC_HIDDEN; void ME_SetSelectionCharFormat(ME_TextEditor *editor, CHARFORMAT2W *pFmt) DECLSPEC_HIDDEN; void ME_GetCharFormat(ME_TextEditor *editor, const ME_Cursor *from, diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index a8168ff0daa..1a53ba46a27 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -674,7 +674,7 @@ ME_Paragraph *para_split( ME_TextEditor *editor, ME_Run *run, ME_Style *style, para_mark_rewrap( editor, &new_para->prev_para->member.para ); /* we've added the end run, so we need to modify nCharOfs in the next paragraphs */ - ME_PropagateCharOffset( para_get_di( next_para ), eol_len ); + editor_propagate_char_ofs( next_para, NULL, eol_len ); editor->nParagraphs++; return new_para; @@ -688,8 +688,7 @@ ME_Paragraph *para_join( ME_TextEditor *editor, ME_Paragraph *para, BOOL use_fir ME_Paragraph *next = para_next( para ); ME_Run *end_run, *next_first_run, *tmp_run; ME_Cell *cell = NULL; - int i, shift; - int end_len; + int i, end_len; CHARFORMAT2W fmt; ME_Cursor startCur, endCur; ME_String *eol_str; @@ -751,8 +750,6 @@ ME_Paragraph *para_join( ME_TextEditor *editor, ME_Paragraph *para, BOOL use_fir para->border = next->border; } - shift = next->nCharOfs - para->nCharOfs - end_len; - /* Update selection cursors so they don't point to the removed end * paragraph run, and point to the correct paragraph. */ for (i = 0; i < editor->nCursors; i++) @@ -768,8 +765,7 @@ ME_Paragraph *para_join( ME_TextEditor *editor, ME_Paragraph *para, BOOL use_fir for (tmp_run = next_first_run; tmp_run; tmp_run = run_next( tmp_run )) { - TRACE( "shifting %s by %d (previous %d)\n", debugstr_run( tmp_run ), shift, tmp_run->nCharOfs ); - tmp_run->nCharOfs += shift; + tmp_run->nCharOfs += next->nCharOfs - para->nCharOfs - end_len; tmp_run->para = para; } @@ -789,7 +785,7 @@ ME_Paragraph *para_join( ME_TextEditor *editor, ME_Paragraph *para, BOOL use_fir ME_Remove( para_get_di(next) ); para_destroy( editor, next ); - ME_PropagateCharOffset( para->next_para, -end_len ); + editor_propagate_char_ofs( para_next( para ), NULL, -end_len ); ME_CheckCharOffsets(editor); diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index db0ae0a6aa0..fdda43ba51a 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -137,54 +137,32 @@ BOOL ME_CanJoinRuns(const ME_Run *run1, const ME_Run *run2) return TRUE; } -void ME_SkipAndPropagateCharOffset(ME_DisplayItem *p, int shift) -{ - p = ME_FindItemFwd(p, diRunOrParagraphOrEnd); - assert(p); - ME_PropagateCharOffset(p, shift); -} - /****************************************************************************** - * ME_PropagateCharOffsets + * editor_propagate_char_ofs * * Shifts (increases or decreases) character offset (relative to beginning of - * the document) of the part of the text starting from given place. + * the document) of the part of the text starting from given place. + * Call with only one of para or run non-NULL. */ -void ME_PropagateCharOffset(ME_DisplayItem *p, int shift) +void editor_propagate_char_ofs( ME_Paragraph *para, ME_Run *run, int shift ) { - /* Runs in one paragraph contain character offset relative to their owning - * paragraph. If we start the shifting from the run, we need to shift - * all the relative offsets until the end of the paragraph - */ - if (p->type == diRun) /* propagate in all runs in this para */ - { - TRACE("PropagateCharOffset(%s, %d)\n", debugstr_run( &p->member.run ), shift); - do { - p->member.run.nCharOfs += shift; - assert(p->member.run.nCharOfs >= 0); - p = ME_FindItemFwd(p, diRunOrParagraphOrEnd); - } while(p->type == diRun); - } - /* Runs in next paragraphs don't need their offsets updated, because they, - * again, those offsets are relative to their respective paragraphs. - * Instead of that, we're updating paragraphs' character offsets. - */ - if (p->type == diParagraph) /* propagate in all next paras */ - { - do { - p->member.para.nCharOfs += shift; - assert(p->member.para.nCharOfs >= 0); - p = p->member.para.next_para; - } while(p->type == diParagraph); - } - /* diTextEnd also has character offset in it, which makes finding text length - * easier. But it needs to be up to date first. - */ - if (p->type == diTextEnd) - { - p->member.para.nCharOfs += shift; - assert(p->member.para.nCharOfs >= 0); - } + assert( !para ^ !run ); + + if (run) + { + para = para_next( run->para ); + do + { + run->nCharOfs += shift; + run = run_next( run ); + } while (run); + } + + do + { + para->nCharOfs += shift; + para = para_next( para ); + } while (para); } /****************************************************************************** @@ -422,7 +400,7 @@ ME_Run *run_insert( ME_TextEditor *editor, ME_Cursor *cursor, ME_Style *style, ME_InsertString( run->para->text, run->nCharOfs, str, len ); ME_InsertBefore( run_get_di( insert_before ), run_get_di( run ) ); TRACE("Shift length:%d\n", len); - ME_PropagateCharOffset( run_get_di( insert_before ), len ); + editor_propagate_char_ofs( NULL, insert_before, len ); para_mark_rewrap( editor, insert_before->para ); /* Move any cursors that were at the end of the previous run to the end of the inserted run */ -- 2.23.0

1 0

[PATCH 1/3] tzres: Add Lord Howe Standard Time Zone.
by Daniel Lehman Nov. 9, 2020

Nov. 9, 2020

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/tzres/tzres.rc | 2 ++ loader/wine.inf.in | 12 ++++++++++++ 2 files changed, 14 insertions(+) diff --git a/dlls/tzres/tzres.rc b/dlls/tzres/tzres.rc index a339eae5671..cca44c0d1c9 100644 --- a/dlls/tzres/tzres.rc +++ b/dlls/tzres/tzres.rc @@ -140,6 +140,8 @@ STRINGTABLE 50769 "Libya Daylight Time" 16768 "Line Islands Standard Time" 16769 "Line Islands Daylight Time" + 8656 "Lord Howe Standard Time" + 8657 "Lord Howe Daylight Time" 8832 "Magadan Standard Time" 8833 "Magadan Daylight Time" 13120 "Magallanes Standard Time" diff --git a/loader/wine.inf.in b/loader/wine.inf.in index e9e9170d2d8..c1b9e4d30da 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3322,6 +3322,18 @@ HKLM,%CurrentVersionNT%\Time Zones\Line Islands Standard Time,"MUI_Dlt",,"@tzres HKLM,%CurrentVersionNT%\Time Zones\Line Islands Standard Time,"MUI_Std",,"@tzres.dll,-16768" HKLM,%CurrentVersionNT%\Time Zones\Line Islands Standard Time,"Std",,"Line Islands Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Line Islands Standard Time,"TZI",1,b8,fc,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time,"Display",,"Australia/Lord_Howe" +HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time,"Dlt",,"Lord Howe Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time,"MUI_Dlt",,"@tzres.dll,-8657" +HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time,"MUI_Std",,"@tzres.dll,-8656" +HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time,"Std",,"Lord Howe Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time,"TZI",1,8a,fd,ff,ff,00,00,00,00,e2,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time\Dynamic DST,"2005",1,8a,fd,ff,ff,00,00,00,00,e2,ff,ff,ff,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time\Dynamic DST,"2006",1,8a,fd,ff,ff,00,00,00,00,e2,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time\Dynamic DST,"2007",1,8a,fd,ff,ff,00,00,00,00,e2,ff,ff,ff,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time\Dynamic DST,"2008",1,8a,fd,ff,ff,00,00,00,00,e2,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time\Dynamic DST,"FirstEntry",0x10001,"2005" +HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time\Dynamic DST,"LastEntry",0x10001,"2008" HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time,"Display",,"Asia/Magadan" HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time,"Dlt",,"Magadan Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time,"MUI_Dlt",,"@tzres.dll,-8833" -- 2.25.1

1 2

[PATCH] ntdll: improve character device type detection on FreeBSD and macOS
by Damjan Jovanovic Nov. 9, 2020

Nov. 9, 2020

configure and include/config.h.in need to be regenerated. macOS wasn't tested. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- configure.ac | 2 +- dlls/ntdll/unix/file.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-)

2 2

[PATCH v2] ntdll: improve character device type detection on FreeBSD and macOS
by Damjan Jovanovic Nov. 9, 2020

Nov. 9, 2020

Try 2 adds a missing "|| defined(__APPLE__)". configure and include/config.h.in need to be regenerated. macOS wasn't tested. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- configure.ac | 2 +- dlls/ntdll/unix/file.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-)

1 0

wine-5.0.3-rc2 Available
by Michael Stefaniuc Nov. 8, 2020

Nov. 8, 2020

Hello guys, I have pushed wine-5.0.3-rc2 (282d527b60537139f2183bed57a6dae040699384) to https://github.com/mstefani/wine-stable/tree/stable https://people.redhat.com/mstefani/wine/stable/ The only change is to drop the patch d3d11: Stop advertising the ID3D10Device interface on devices created by d3d11. While not wrong it breaks Wine's D2D (bug 49395). bye michael

1 0

[PATCH] windowscodecs: Move jpeg decoding to the unix lib.
by Esme Povirk Nov. 8, 2020

Nov. 8, 2020

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/windowscodecs/Makefile.in | 1 + dlls/windowscodecs/decoder.c | 7 + dlls/windowscodecs/jpegformat.c | 671 +------------------------ dlls/windowscodecs/libjpeg.c | 464 +++++++++++++++++ dlls/windowscodecs/unix_lib.c | 3 + dlls/windowscodecs/wincodecs_private.h | 2 + 6 files changed, 491 insertions(+), 657 deletions(-) create mode 100644 dlls/windowscodecs/libjpeg.c diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in index 2dd6a78e147..94b75b62596 100644 --- a/dlls/windowscodecs/Makefile.in +++ b/dlls/windowscodecs/Makefile.in @@ -22,6 +22,7 @@ C_SRCS = \ imgfactory.c \ info.c \ jpegformat.c \ + libjpeg.c \ libpng.c \ libtiff.c \ main.c \ diff --git a/dlls/windowscodecs/decoder.c b/dlls/windowscodecs/decoder.c index b51ca0a8def..ad5127cd258 100644 --- a/dlls/windowscodecs/decoder.c +++ b/dlls/windowscodecs/decoder.c @@ -460,6 +460,13 @@ static HRESULT WINAPI CommonDecoderFrame_GetColorContexts(IWICBitmapFrameDecode if (!pcActualCount) return E_INVALIDARG; + if (This->parent->file_info.flags & DECODER_FLAGS_UNSUPPORTED_COLOR_CONTEXT) + { + FIXME("not supported for %s\n", wine_dbgstr_guid(&This->parent->decoder_info.clsid)); + *pcActualCount = 0; + return WINCODEC_ERR_UNSUPPORTEDOPERATION; + } + *pcActualCount = This->decoder_frame.num_color_contexts; if (This->decoder_frame.num_color_contexts && cCount && ppIColorContexts) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index e04e914cda1..5be35a1ccb4 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -143,657 +143,6 @@ static void emit_message_fn(j_common_ptr cinfo, int msg_level) } } -typedef struct { - IWICBitmapDecoder IWICBitmapDecoder_iface; - IWICBitmapFrameDecode IWICBitmapFrameDecode_iface; - IWICMetadataBlockReader IWICMetadataBlockReader_iface; - 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]; - UINT bpp, stride; - BYTE *image_data; - CRITICAL_SECTION lock; -} JpegDecoder; - -static inline JpegDecoder *impl_from_IWICBitmapDecoder(IWICBitmapDecoder *iface) -{ - return CONTAINING_RECORD(iface, JpegDecoder, IWICBitmapDecoder_iface); -} - -static inline JpegDecoder *impl_from_IWICBitmapFrameDecode(IWICBitmapFrameDecode *iface) -{ - return CONTAINING_RECORD(iface, JpegDecoder, IWICBitmapFrameDecode_iface); -} - -static inline JpegDecoder *decoder_from_decompress(j_decompress_ptr decompress) -{ - return CONTAINING_RECORD(decompress, JpegDecoder, cinfo); -} - -static inline JpegDecoder *impl_from_IWICMetadataBlockReader(IWICMetadataBlockReader *iface) -{ - return CONTAINING_RECORD(iface, JpegDecoder, IWICMetadataBlockReader_iface); -} - -static HRESULT WINAPI JpegDecoder_QueryInterface(IWICBitmapDecoder *iface, REFIID iid, - void **ppv) -{ - JpegDecoder *This = impl_from_IWICBitmapDecoder(iface); - TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); - - if (!ppv) return E_INVALIDARG; - - if (IsEqualIID(&IID_IUnknown, iid) || - IsEqualIID(&IID_IWICBitmapDecoder, iid)) - { - *ppv = &This->IWICBitmapDecoder_iface; - } - else - { - *ppv = NULL; - return E_NOINTERFACE; - } - - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; -} - -static ULONG WINAPI JpegDecoder_AddRef(IWICBitmapDecoder *iface) -{ - JpegDecoder *This = impl_from_IWICBitmapDecoder(iface); - ULONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p) refcount=%u\n", iface, ref); - - return ref; -} - -static ULONG WINAPI JpegDecoder_Release(IWICBitmapDecoder *iface) -{ - JpegDecoder *This = impl_from_IWICBitmapDecoder(iface); - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p) refcount=%u\n", iface, ref); - - if (ref == 0) - { - This->lock.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&This->lock); - 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); - } - - return ref; -} - -static HRESULT WINAPI JpegDecoder_QueryCapability(IWICBitmapDecoder *iface, IStream *stream, - DWORD *capability) -{ - HRESULT hr; - - TRACE("(%p,%p,%p)\n", iface, stream, capability); - - if (!stream || !capability) return E_INVALIDARG; - - hr = IWICBitmapDecoder_Initialize(iface, stream, WICDecodeMetadataCacheOnDemand); - if (hr != S_OK) return hr; - - *capability = WICBitmapDecoderCapabilityCanDecodeAllImages | - WICBitmapDecoderCapabilityCanDecodeSomeImages; - /* FIXME: WICBitmapDecoderCapabilityCanEnumerateMetadata */ - return S_OK; -} - -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 (FAILED(hr) || 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) -{ - JpegDecoder *This = impl_from_IWICBitmapDecoder(iface); - int ret; - LARGE_INTEGER seek; - jmp_buf jmpbuf; - UINT data_size, i; - - TRACE("(%p,%p,%u)\n", iface, pIStream, cacheOptions); - - EnterCriticalSection(&This->lock); - - if (This->cinfo_initialized) - { - LeaveCriticalSection(&This->lock); - return WINCODEC_ERR_WRONGSTATE; - } - - pjpeg_std_error(&This->jerr); - - This->jerr.error_exit = error_exit_fn; - This->jerr.emit_message = emit_message_fn; - - This->cinfo.err = &This->jerr; - - This->cinfo.client_data = jmpbuf; - - if (setjmp(jmpbuf)) - { - LeaveCriticalSection(&This->lock); - return E_FAIL; - } - - pjpeg_CreateDecompress(&This->cinfo, JPEG_LIB_VERSION, sizeof(struct jpeg_decompress_struct)); - - This->cinfo_initialized = TRUE; - - This->stream = pIStream; - IStream_AddRef(pIStream); - - seek.QuadPart = 0; - IStream_Seek(This->stream, seek, STREAM_SEEK_SET, NULL); - - 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); - LeaveCriticalSection(&This->lock); - return E_FAIL; - } - - switch (This->cinfo.jpeg_color_space) - { - case JCS_GRAYSCALE: - This->cinfo.out_color_space = JCS_GRAYSCALE; - break; - case JCS_RGB: - case JCS_YCbCr: - This->cinfo.out_color_space = JCS_RGB; - break; - case JCS_CMYK: - case JCS_YCCK: - This->cinfo.out_color_space = JCS_CMYK; - break; - default: - ERR("Unknown JPEG color space %i\n", This->cinfo.jpeg_color_space); - LeaveCriticalSection(&This->lock); - return E_FAIL; - } - - if (!pjpeg_start_decompress(&This->cinfo)) - { - ERR("jpeg_start_decompress failed\n"); - LeaveCriticalSection(&This->lock); - return E_FAIL; - } - - if (This->cinfo.out_color_space == JCS_GRAYSCALE) This->bpp = 8; - else if (This->cinfo.out_color_space == JCS_CMYK) This->bpp = 32; - else This->bpp = 24; - - This->stride = (This->bpp * This->cinfo.output_width + 7) / 8; - data_size = This->stride * This->cinfo.output_height; - - This->image_data = heap_alloc(data_size); - if (!This->image_data) - { - LeaveCriticalSection(&This->lock); - return E_OUTOFMEMORY; - } - - while (This->cinfo.output_scanline < This->cinfo.output_height) - { - UINT first_scanline = This->cinfo.output_scanline; - UINT max_rows; - JSAMPROW out_rows[4]; - 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 + This->stride * (first_scanline+i); - - ret = pjpeg_read_scanlines(&This->cinfo, out_rows, max_rows); - if (ret == 0) - { - ERR("read_scanlines failed\n"); - LeaveCriticalSection(&This->lock); - return E_FAIL; - } - } - - if (This->bpp == 24) - { - /* libjpeg gives us RGB data and we want BGR, so byteswap the data */ - reverse_bgr8(3, This->image_data, - This->cinfo.output_width, This->cinfo.output_height, - This->stride); - } - - if (This->cinfo.out_color_space == JCS_CMYK && This->cinfo.saw_Adobe_marker) - { - /* Adobe JPEG's have inverted CMYK data. */ - for (i=0; i<data_size; i++) - This->image_data[i] ^= 0xff; - } - - This->initialized = TRUE; - - LeaveCriticalSection(&This->lock); - - return S_OK; -} - -static HRESULT WINAPI JpegDecoder_GetContainerFormat(IWICBitmapDecoder *iface, - GUID *pguidContainerFormat) -{ - memcpy(pguidContainerFormat, &GUID_ContainerFormatJpeg, sizeof(GUID)); - return S_OK; -} - -static HRESULT WINAPI JpegDecoder_GetDecoderInfo(IWICBitmapDecoder *iface, - IWICBitmapDecoderInfo **ppIDecoderInfo) -{ - TRACE("(%p,%p)\n", iface, ppIDecoderInfo); - - return get_decoder_info(&CLSID_WICJpegDecoder, ppIDecoderInfo); -} - -static HRESULT WINAPI JpegDecoder_CopyPalette(IWICBitmapDecoder *iface, - IWICPalette *pIPalette) -{ - TRACE("(%p,%p)\n", iface, pIPalette); - - return WINCODEC_ERR_PALETTEUNAVAILABLE; -} - -static HRESULT WINAPI JpegDecoder_GetMetadataQueryReader(IWICBitmapDecoder *iface, - IWICMetadataQueryReader **reader) -{ - TRACE("(%p,%p)\n", iface, reader); - - if (!reader) return E_INVALIDARG; - - *reader = NULL; - return WINCODEC_ERR_UNSUPPORTEDOPERATION; -} - -static HRESULT WINAPI JpegDecoder_GetPreview(IWICBitmapDecoder *iface, - IWICBitmapSource **ppIBitmapSource) -{ - FIXME("(%p,%p): stub\n", iface, ppIBitmapSource); - return WINCODEC_ERR_UNSUPPORTEDOPERATION; -} - -static HRESULT WINAPI JpegDecoder_GetColorContexts(IWICBitmapDecoder *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_GetThumbnail(IWICBitmapDecoder *iface, - IWICBitmapSource **ppIThumbnail) -{ - FIXME("(%p,%p): stub\n", iface, ppIThumbnail); - return WINCODEC_ERR_CODECNOTHUMBNAIL; -} - -static HRESULT WINAPI JpegDecoder_GetFrameCount(IWICBitmapDecoder *iface, - UINT *pCount) -{ - if (!pCount) return E_INVALIDARG; - - *pCount = 1; - return S_OK; -} - -static HRESULT WINAPI JpegDecoder_GetFrame(IWICBitmapDecoder *iface, - UINT index, IWICBitmapFrameDecode **ppIBitmapFrame) -{ - JpegDecoder *This = impl_from_IWICBitmapDecoder(iface); - TRACE("(%p,%u,%p)\n", iface, index, ppIBitmapFrame); - - if (!This->initialized) return WINCODEC_ERR_FRAMEMISSING; - - if (index != 0) return E_INVALIDARG; - - IWICBitmapDecoder_AddRef(iface); - *ppIBitmapFrame = &This->IWICBitmapFrameDecode_iface; - - return S_OK; -} - -static const IWICBitmapDecoderVtbl JpegDecoder_Vtbl = { - JpegDecoder_QueryInterface, - JpegDecoder_AddRef, - JpegDecoder_Release, - JpegDecoder_QueryCapability, - JpegDecoder_Initialize, - JpegDecoder_GetContainerFormat, - JpegDecoder_GetDecoderInfo, - JpegDecoder_CopyPalette, - JpegDecoder_GetMetadataQueryReader, - JpegDecoder_GetPreview, - JpegDecoder_GetColorContexts, - JpegDecoder_GetThumbnail, - JpegDecoder_GetFrameCount, - JpegDecoder_GetFrame -}; - -static HRESULT WINAPI JpegDecoder_Frame_QueryInterface(IWICBitmapFrameDecode *iface, REFIID iid, - void **ppv) -{ - JpegDecoder *This = impl_from_IWICBitmapFrameDecode(iface); - - 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 = &This->IWICBitmapFrameDecode_iface; - } - else - { - *ppv = NULL; - return E_NOINTERFACE; - } - - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; -} - -static ULONG WINAPI JpegDecoder_Frame_AddRef(IWICBitmapFrameDecode *iface) -{ - JpegDecoder *This = impl_from_IWICBitmapFrameDecode(iface); - return IWICBitmapDecoder_AddRef(&This->IWICBitmapDecoder_iface); -} - -static ULONG WINAPI JpegDecoder_Frame_Release(IWICBitmapFrameDecode *iface) -{ - JpegDecoder *This = impl_from_IWICBitmapFrameDecode(iface); - return IWICBitmapDecoder_Release(&This->IWICBitmapDecoder_iface); -} - -static HRESULT WINAPI JpegDecoder_Frame_GetSize(IWICBitmapFrameDecode *iface, - UINT *puiWidth, UINT *puiHeight) -{ - JpegDecoder *This = impl_from_IWICBitmapFrameDecode(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, - WICPixelFormatGUID *pPixelFormat) -{ - JpegDecoder *This = impl_from_IWICBitmapFrameDecode(iface); - TRACE("(%p,%p)\n", iface, pPixelFormat); - if (This->cinfo.out_color_space == JCS_RGB) - memcpy(pPixelFormat, &GUID_WICPixelFormat24bppBGR, sizeof(GUID)); - else if (This->cinfo.out_color_space == JCS_CMYK) - memcpy(pPixelFormat, &GUID_WICPixelFormat32bppCMYK, 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, - double *pDpiX, double *pDpiY) -{ - JpegDecoder *This = impl_from_IWICBitmapFrameDecode(iface); - - EnterCriticalSection(&This->lock); - - switch (This->cinfo.density_unit) - { - case 2: /* pixels per centimeter */ - *pDpiX = This->cinfo.X_density * 2.54; - *pDpiY = This->cinfo.Y_density * 2.54; - break; - - case 1: /* pixels per inch */ - *pDpiX = This->cinfo.X_density; - *pDpiY = This->cinfo.Y_density; - break; - - case 0: /* unknown */ - default: - *pDpiX = 96.0; - *pDpiY = 96.0; - break; - } - - LeaveCriticalSection(&This->lock); - - TRACE("(%p)->(%0.2f,%0.2f)\n", iface, *pDpiX, *pDpiY); - - return S_OK; -} - -static HRESULT WINAPI JpegDecoder_Frame_CopyPalette(IWICBitmapFrameDecode *iface, - IWICPalette *pIPalette) -{ - TRACE("(%p,%p)\n", iface, pIPalette); - - return WINCODEC_ERR_PALETTEUNAVAILABLE; -} - -static HRESULT WINAPI JpegDecoder_Frame_CopyPixels(IWICBitmapFrameDecode *iface, - const WICRect *prc, UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer) -{ - JpegDecoder *This = impl_from_IWICBitmapFrameDecode(iface); - - TRACE("(%p,%s,%u,%u,%p)\n", iface, debug_wic_rect(prc), cbStride, cbBufferSize, pbBuffer); - - return copy_pixels(This->bpp, This->image_data, - This->cinfo.output_width, This->cinfo.output_height, This->stride, - prc, cbStride, cbBufferSize, pbBuffer); -} - -static HRESULT WINAPI JpegDecoder_Frame_GetMetadataQueryReader(IWICBitmapFrameDecode *iface, - IWICMetadataQueryReader **ppIMetadataQueryReader) -{ - JpegDecoder *This = impl_from_IWICBitmapFrameDecode(iface); - - TRACE("(%p,%p)\n", iface, ppIMetadataQueryReader); - - if (!ppIMetadataQueryReader) - return E_INVALIDARG; - - return MetadataQueryReader_CreateInstance(&This->IWICMetadataBlockReader_iface, NULL, ppIMetadataQueryReader); -} - -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 -}; - -static HRESULT WINAPI JpegDecoder_Block_QueryInterface(IWICMetadataBlockReader *iface, REFIID iid, - void **ppv) -{ - JpegDecoder *This = impl_from_IWICMetadataBlockReader(iface); - return IWICBitmapFrameDecode_QueryInterface(&This->IWICBitmapFrameDecode_iface, iid, ppv); -} - -static ULONG WINAPI JpegDecoder_Block_AddRef(IWICMetadataBlockReader *iface) -{ - JpegDecoder *This = impl_from_IWICMetadataBlockReader(iface); - return IWICBitmapDecoder_AddRef(&This->IWICBitmapDecoder_iface); -} - -static ULONG WINAPI JpegDecoder_Block_Release(IWICMetadataBlockReader *iface) -{ - JpegDecoder *This = impl_from_IWICMetadataBlockReader(iface); - return IWICBitmapDecoder_Release(&This->IWICBitmapDecoder_iface); -} - -static HRESULT WINAPI JpegDecoder_Block_GetContainerFormat(IWICMetadataBlockReader *iface, - GUID *pguidContainerFormat) -{ - TRACE("%p,%p\n", iface, pguidContainerFormat); - - if (!pguidContainerFormat) return E_INVALIDARG; - - memcpy(pguidContainerFormat, &GUID_ContainerFormatJpeg, sizeof(GUID)); - - return S_OK; -} - -static HRESULT WINAPI JpegDecoder_Block_GetCount(IWICMetadataBlockReader *iface, - UINT *pcCount) -{ - FIXME("%p,%p\n", iface, pcCount); - - if (!pcCount) return E_INVALIDARG; - - *pcCount = 0; - - return S_OK; -} - -static HRESULT WINAPI JpegDecoder_Block_GetReaderByIndex(IWICMetadataBlockReader *iface, - UINT nIndex, IWICMetadataReader **ppIMetadataReader) -{ - FIXME("%p,%d,%p\n", iface, nIndex, ppIMetadataReader); - return E_INVALIDARG; -} - -static HRESULT WINAPI JpegDecoder_Block_GetEnumerator(IWICMetadataBlockReader *iface, - IEnumUnknown **ppIEnumMetadata) -{ - FIXME("%p,%p\n", iface, ppIEnumMetadata); - return E_NOTIMPL; -} - -static const IWICMetadataBlockReaderVtbl JpegDecoder_Block_Vtbl = { - JpegDecoder_Block_QueryInterface, - JpegDecoder_Block_AddRef, - JpegDecoder_Block_Release, - JpegDecoder_Block_GetContainerFormat, - JpegDecoder_Block_GetCount, - JpegDecoder_Block_GetReaderByIndex, - JpegDecoder_Block_GetEnumerator, -}; - -HRESULT JpegDecoder_CreateInstance(REFIID iid, void** ppv) -{ - JpegDecoder *This; - HRESULT ret; - - TRACE("(%s,%p)\n", debugstr_guid(iid), ppv); - - if (!libjpeg_handle && !load_libjpeg()) - { - ERR("Failed reading JPEG because unable to find %s\n", SONAME_LIBJPEG); - return E_FAIL; - } - - *ppv = NULL; - - This = HeapAlloc(GetProcessHeap(), 0, sizeof(JpegDecoder)); - if (!This) return E_OUTOFMEMORY; - - This->IWICBitmapDecoder_iface.lpVtbl = &JpegDecoder_Vtbl; - This->IWICBitmapFrameDecode_iface.lpVtbl = &JpegDecoder_Frame_Vtbl; - This->IWICMetadataBlockReader_iface.lpVtbl = &JpegDecoder_Block_Vtbl; - This->ref = 1; - This->initialized = FALSE; - This->cinfo_initialized = FALSE; - This->stream = NULL; - This->image_data = NULL; - InitializeCriticalSection(&This->lock); - This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": JpegDecoder.lock"); - - ret = IWICBitmapDecoder_QueryInterface(&This->IWICBitmapDecoder_iface, iid, ppv); - IWICBitmapDecoder_Release(&This->IWICBitmapDecoder_iface); - - return ret; -} - typedef struct jpeg_compress_format { const WICPixelFormatGUID *guid; int bpp; @@ -1548,12 +897,6 @@ HRESULT JpegEncoder_CreateInstance(REFIID iid, void** ppv) #else /* !defined(SONAME_LIBJPEG) */ -HRESULT JpegDecoder_CreateInstance(REFIID iid, void** ppv) -{ - ERR("Trying to load JPEG picture, but JPEG support is not compiled in.\n"); - return E_FAIL; -} - HRESULT JpegEncoder_CreateInstance(REFIID iid, void** ppv) { ERR("Trying to save JPEG picture, but JPEG support is not compiled in.\n"); @@ -1561,3 +904,17 @@ HRESULT JpegEncoder_CreateInstance(REFIID iid, void** ppv) } #endif + +HRESULT JpegDecoder_CreateInstance(REFIID iid, void** ppv) +{ + HRESULT hr; + struct decoder *decoder; + struct decoder_info decoder_info; + + hr = get_unix_decoder(&CLSID_WICJpegDecoder, &decoder_info, &decoder); + + if (SUCCEEDED(hr)) + hr = CommonDecoder_CreateInstance(decoder, &decoder_info, iid, ppv); + + return hr; +} diff --git a/dlls/windowscodecs/libjpeg.c b/dlls/windowscodecs/libjpeg.c new file mode 100644 index 00000000000..58ca58e93b4 --- /dev/null +++ b/dlls/windowscodecs/libjpeg.c @@ -0,0 +1,464 @@ +/* + * Copyright 2009 Vincent Povirk for CodeWeavers + * + * 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 + */ + +#if 0 +#pragma makedep unix +#endif + +#include "config.h" +#include "wine/port.h" + +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif +#include <stdarg.h> +#include <stdio.h> +#include <string.h> +#include <setjmp.h> + +#ifdef SONAME_LIBJPEG +/* This is a hack, so jpeglib.h does not redefine INT32 and the like*/ +#define XMD_H +#define UINT8 JPEG_UINT8 +#define UINT16 JPEG_UINT16 +#define boolean jpeg_boolean +#undef HAVE_STDLIB_H +# include <jpeglib.h> +#undef HAVE_STDLIB_H +#define HAVE_STDLIB_H 1 +#undef UINT8 +#undef UINT16 +#undef boolean +#endif + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winternl.h" +#include "winbase.h" +#include "objbase.h" + +#include "wincodecs_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); + +#ifdef SONAME_LIBJPEG +WINE_DECLARE_DEBUG_CHANNEL(jpeg); + +static CRITICAL_SECTION init_jpeg_cs; +static CRITICAL_SECTION_DEBUG init_jpeg_cs_debug = +{ + 0, 0, &init_jpeg_cs, + { &init_jpeg_cs_debug.ProcessLocksList, + &init_jpeg_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": init_jpeg_cs") } +}; +static CRITICAL_SECTION init_jpeg_cs = { &init_jpeg_cs_debug, -1, 0, 0, 0, 0 }; + +static void *libjpeg_handle; + +#define MAKE_FUNCPTR(f) static typeof(f) * p##f +MAKE_FUNCPTR(jpeg_CreateCompress); +MAKE_FUNCPTR(jpeg_CreateDecompress); +MAKE_FUNCPTR(jpeg_destroy_compress); +MAKE_FUNCPTR(jpeg_destroy_decompress); +MAKE_FUNCPTR(jpeg_finish_compress); +MAKE_FUNCPTR(jpeg_read_header); +MAKE_FUNCPTR(jpeg_read_scanlines); +MAKE_FUNCPTR(jpeg_resync_to_restart); +MAKE_FUNCPTR(jpeg_set_defaults); +MAKE_FUNCPTR(jpeg_start_compress); +MAKE_FUNCPTR(jpeg_start_decompress); +MAKE_FUNCPTR(jpeg_std_error); +MAKE_FUNCPTR(jpeg_write_scanlines); +#undef MAKE_FUNCPTR + +static void *load_libjpeg(void) +{ + void *result; + + RtlEnterCriticalSection(&init_jpeg_cs); + + if((libjpeg_handle = dlopen(SONAME_LIBJPEG, RTLD_NOW)) != NULL) { + +#define LOAD_FUNCPTR(f) \ + if((p##f = dlsym(libjpeg_handle, #f)) == NULL) { \ + ERR("failed to load symbol %s\n", #f); \ + libjpeg_handle = NULL; \ + RtlLeaveCriticalSection(&init_jpeg_cs); \ + return NULL; \ + } + + LOAD_FUNCPTR(jpeg_CreateCompress); + LOAD_FUNCPTR(jpeg_CreateDecompress); + LOAD_FUNCPTR(jpeg_destroy_compress); + LOAD_FUNCPTR(jpeg_destroy_decompress); + LOAD_FUNCPTR(jpeg_finish_compress); + LOAD_FUNCPTR(jpeg_read_header); + LOAD_FUNCPTR(jpeg_read_scanlines); + LOAD_FUNCPTR(jpeg_resync_to_restart); + LOAD_FUNCPTR(jpeg_set_defaults); + LOAD_FUNCPTR(jpeg_start_compress); + LOAD_FUNCPTR(jpeg_start_decompress); + LOAD_FUNCPTR(jpeg_std_error); + LOAD_FUNCPTR(jpeg_write_scanlines); +#undef LOAD_FUNCPTR + } + result = libjpeg_handle; + + RtlLeaveCriticalSection(&init_jpeg_cs); + + return result; +} + +static void error_exit_fn(j_common_ptr cinfo) +{ + char message[JMSG_LENGTH_MAX]; + if (ERR_ON(jpeg)) + { + cinfo->err->format_message(cinfo, message); + ERR_(jpeg)("%s\n", message); + } + longjmp(*(jmp_buf*)cinfo->client_data, 1); +} + +static void emit_message_fn(j_common_ptr cinfo, int msg_level) +{ + char message[JMSG_LENGTH_MAX]; + + if (msg_level < 0 && ERR_ON(jpeg)) + { + cinfo->err->format_message(cinfo, message); + ERR_(jpeg)("%s\n", message); + } + else if (msg_level == 0 && WARN_ON(jpeg)) + { + cinfo->err->format_message(cinfo, message); + WARN_(jpeg)("%s\n", message); + } + else if (msg_level > 0 && TRACE_ON(jpeg)) + { + cinfo->err->format_message(cinfo, message); + TRACE_(jpeg)("%s\n", message); + } +} + +struct jpeg_decoder { + struct decoder decoder; + struct decoder_frame frame; + 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]; + UINT stride; + BYTE *image_data; +}; + +static inline struct jpeg_decoder *impl_from_decoder(struct decoder* iface) +{ + return CONTAINING_RECORD(iface, struct jpeg_decoder, decoder); +} + +static inline struct jpeg_decoder *decoder_from_decompress(j_decompress_ptr decompress) +{ + return CONTAINING_RECORD(decompress, struct jpeg_decoder, cinfo); +} + +static void CDECL jpeg_decoder_destroy(struct decoder* iface) +{ + struct jpeg_decoder *This = impl_from_decoder(iface); + + if (This->cinfo_initialized) pjpeg_destroy_decompress(&This->cinfo); + free(This->image_data); + RtlFreeHeap(GetProcessHeap(), 0, This); +} + +static void source_mgr_init_source(j_decompress_ptr cinfo) +{ +} + +static jpeg_boolean source_mgr_fill_input_buffer(j_decompress_ptr cinfo) +{ + struct jpeg_decoder *This = decoder_from_decompress(cinfo); + HRESULT hr; + ULONG bytesread; + + hr = stream_read(This->stream, This->source_buffer, 1024, &bytesread); + + if (FAILED(hr) || 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) +{ + struct jpeg_decoder *This = decoder_from_decompress(cinfo); + + if (num_bytes > This->source_mgr.bytes_in_buffer) + { + stream_seek(This->stream, num_bytes - This->source_mgr.bytes_in_buffer, 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 CDECL jpeg_decoder_initialize(struct decoder* iface, IStream *stream, struct decoder_stat *st) +{ + struct jpeg_decoder *This = impl_from_decoder(iface); + int ret; + jmp_buf jmpbuf; + UINT data_size, i; + + if (This->cinfo_initialized) + return WINCODEC_ERR_WRONGSTATE; + + pjpeg_std_error(&This->jerr); + + This->jerr.error_exit = error_exit_fn; + This->jerr.emit_message = emit_message_fn; + + This->cinfo.err = &This->jerr; + + This->cinfo.client_data = jmpbuf; + + if (setjmp(jmpbuf)) + return E_FAIL; + + pjpeg_CreateDecompress(&This->cinfo, JPEG_LIB_VERSION, sizeof(struct jpeg_decompress_struct)); + + This->cinfo_initialized = TRUE; + + This->stream = stream; + + stream_seek(This->stream, 0, STREAM_SEEK_SET, NULL); + + 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; + } + + switch (This->cinfo.jpeg_color_space) + { + case JCS_GRAYSCALE: + This->cinfo.out_color_space = JCS_GRAYSCALE; + This->frame.bpp = 8; + This->frame.pixel_format = GUID_WICPixelFormat8bppGray; + break; + case JCS_RGB: + case JCS_YCbCr: + This->cinfo.out_color_space = JCS_RGB; + This->frame.bpp = 24; + This->frame.pixel_format = GUID_WICPixelFormat24bppBGR; + break; + case JCS_CMYK: + case JCS_YCCK: + This->cinfo.out_color_space = JCS_CMYK; + This->frame.bpp = 32; + This->frame.pixel_format = GUID_WICPixelFormat32bppCMYK; + break; + default: + ERR("Unknown JPEG color space %i\n", This->cinfo.jpeg_color_space); + return E_FAIL; + } + + if (!pjpeg_start_decompress(&This->cinfo)) + { + ERR("jpeg_start_decompress failed\n"); + return E_FAIL; + } + + This->frame.width = This->cinfo.output_width; + This->frame.height = This->cinfo.output_height; + + switch (This->cinfo.density_unit) + { + case 2: /* pixels per centimeter */ + This->frame.dpix = This->cinfo.X_density * 2.54; + This->frame.dpiy = This->cinfo.Y_density * 2.54; + break; + + case 1: /* pixels per inch */ + This->frame.dpix = This->cinfo.X_density; + This->frame.dpiy = This->cinfo.Y_density; + break; + + case 0: /* unknown */ + default: + This->frame.dpix = This->frame.dpiy = 96.0; + break; + } + + This->frame.num_color_contexts = 0; + This->frame.num_colors = 0; + + This->stride = (This->frame.bpp * This->cinfo.output_width + 7) / 8; + data_size = This->stride * This->cinfo.output_height; + + This->image_data = malloc(data_size); + if (!This->image_data) + return E_OUTOFMEMORY; + + while (This->cinfo.output_scanline < This->cinfo.output_height) + { + UINT first_scanline = This->cinfo.output_scanline; + UINT max_rows; + JSAMPROW out_rows[4]; + 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 + This->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 (This->frame.bpp == 24) + { + /* libjpeg gives us RGB data and we want BGR, so byteswap the data */ + reverse_bgr8(3, This->image_data, + This->cinfo.output_width, This->cinfo.output_height, + This->stride); + } + + if (This->cinfo.out_color_space == JCS_CMYK && This->cinfo.saw_Adobe_marker) + { + /* Adobe JPEG's have inverted CMYK data. */ + for (i=0; i<data_size; i++) + This->image_data[i] ^= 0xff; + } + + st->frame_count = 1; + st->flags = WICBitmapDecoderCapabilityCanDecodeAllImages | + WICBitmapDecoderCapabilityCanDecodeSomeImages | + WICBitmapDecoderCapabilityCanEnumerateMetadata | + DECODER_FLAGS_UNSUPPORTED_COLOR_CONTEXT; + return S_OK; +} + +static HRESULT CDECL jpeg_decoder_get_frame_info(struct decoder* iface, UINT frame, struct decoder_frame *info) +{ + struct jpeg_decoder *This = impl_from_decoder(iface); + *info = This->frame; + return S_OK; +} + +static HRESULT CDECL jpeg_decoder_copy_pixels(struct decoder* iface, UINT frame, + const WICRect *prc, UINT stride, UINT buffersize, BYTE *buffer) +{ + struct jpeg_decoder *This = impl_from_decoder(iface); + return copy_pixels(This->frame.bpp, This->image_data, + This->frame.width, This->frame.height, This->stride, + prc, stride, buffersize, buffer); +} + +static HRESULT CDECL jpeg_decoder_get_metadata_blocks(struct decoder* iface, UINT frame, + UINT *count, struct decoder_block **blocks) +{ + FIXME("stub\n"); + *count = 0; + *blocks = NULL; + return S_OK; +} + +static HRESULT CDECL jpeg_decoder_get_color_context(struct decoder* This, UINT frame, UINT num, + BYTE **data, DWORD *datasize) +{ + /* This should never be called because we report 0 color contexts and the unsupported flag. */ + FIXME("stub\n"); + return E_NOTIMPL; +} + +static const struct decoder_funcs jpeg_decoder_vtable = { + jpeg_decoder_initialize, + jpeg_decoder_get_frame_info, + jpeg_decoder_copy_pixels, + jpeg_decoder_get_metadata_blocks, + jpeg_decoder_get_color_context, + jpeg_decoder_destroy +}; + +HRESULT CDECL jpeg_decoder_create(struct decoder_info *info, struct decoder **result) +{ + struct jpeg_decoder *This; + + if (!load_libjpeg()) + { + ERR("Failed reading JPEG because unable to find %s\n", SONAME_LIBJPEG); + return E_FAIL; + } + + This = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(struct jpeg_decoder)); + if (!This) return E_OUTOFMEMORY; + + This->decoder.vtable = &jpeg_decoder_vtable; + This->cinfo_initialized = FALSE; + This->stream = NULL; + This->image_data = NULL; + *result = &This->decoder; + + info->container_format = GUID_ContainerFormatJpeg; + info->block_format = GUID_ContainerFormatJpeg; + info->clsid = CLSID_WICJpegDecoder; + + return S_OK; +} + +#else /* !defined(SONAME_LIBJPEG) */ + +HRESULT CDECL jpeg_decoder_create(struct decoder_info *info, struct decoder **result) +{ + ERR("Trying to load JPEG picture, but JPEG support is not compiled in.\n"); + return E_FAIL; +} + +#endif diff --git a/dlls/windowscodecs/unix_lib.c b/dlls/windowscodecs/unix_lib.c index ca2b38ef990..dc8549e1eb8 100644 --- a/dlls/windowscodecs/unix_lib.c +++ b/dlls/windowscodecs/unix_lib.c @@ -70,6 +70,9 @@ HRESULT CDECL decoder_create(const CLSID *decoder_clsid, struct decoder_info *in if (IsEqualGUID(decoder_clsid, &CLSID_WICTiffDecoder)) return tiff_decoder_create(info, result); + if (IsEqualGUID(decoder_clsid, &CLSID_WICJpegDecoder)) + return jpeg_decoder_create(info, result); + return E_NOTIMPL; } diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index 3d7a46f0f59..d60b281faef 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -262,6 +262,7 @@ struct decoder_info }; #define DECODER_FLAGS_CAPABILITY_MASK 0x1f +#define DECODER_FLAGS_UNSUPPORTED_COLOR_CONTEXT 0x80000000 struct decoder_stat { @@ -333,6 +334,7 @@ void CDECL decoder_destroy(struct decoder *This); HRESULT CDECL png_decoder_create(struct decoder_info *info, struct decoder **result); HRESULT CDECL tiff_decoder_create(struct decoder_info *info, struct decoder **result); +HRESULT CDECL jpeg_decoder_create(struct decoder_info *info, struct decoder **result); struct unix_funcs { -- 2.17.1

1 0

[PATCH] windowscodecs: Correctly set pixel format of uncompressed DDS with extended header.
by Ziqing Hui Nov. 8, 2020

Nov. 8, 2020

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 36 ++++++++++++++++++++++++---- dlls/windowscodecs/tests/ddsformat.c | 5 ---- 2 files changed, 32 insertions(+), 9 deletions(-)

2 1

[PATCH] ntdll: implement get_thread_times() on FreeBSD
by Damjan Jovanovic Nov. 7, 2020

Nov. 7, 2020

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/ntdll/Makefile.in | 2 +- dlls/ntdll/unix/thread.c | 54 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 50 insertions(+), 6 deletions(-)

1 0

Wine staging 5.21 release
by Alistair Leslie-Hughes Nov. 7, 2020

Nov. 7, 2020

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 5.21 (737 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * winegstreamer: Insert videoconvert into decoded-video streams. * winegstreamer: Insert audioconvert into decoded audio streams. * ntdll: Add stub for NtQuerySystemInformation(SystemExtendedProcessInformation). * ntdll: Add stub for NtQuerySystemInformation(SystemModuleInformationEx). * winegstreamer: Replace gst_pad_get_current_caps with gst_pad_query_caps. * winegstreamer: Implement IMFMediaSource::CreatePresentationDescriptor. * mfreadwrite: Abort ReadSample when unable to request any samples. * winegstreamer: Implement IMFMediaSource::Start. * winegstreamer: Implement IMFMediaStream::RequestSample. * mfplat: Add I420 format information. * mfmediaengine: Provide the partial topology to the media session. * mfmediaengine: Issue MF_MEDIA_ENGINE_EVENT_CANPLAY upon MF_TOPOSTATUS_READY. * mfmediaengine: Issue MF_MEDIA_ENGINE_EVENT_PLAYING upon MESessionStarted. * mfmediaengine: Issue MF_MEDIA_ENGINE_EVENT_ENDED upon MESessionEnded. * netutils: New DLL * srvcli: New DLL * mfmediaengine: Implement GetNativeVideoSize. * winegstreamer: Implement IMFMedisStream::GetMediaSource. Added: * None Updated: * ntdll-DOS_Attributes * server-Stored_ACLs * ntdll-Fix_Aligment * bcrypt-ECDHSecretAgreement * ntdll-Junction_Points * widl-winrt-support * dinput-remap-joystick * mfplat-streaming-support * msxml3-FreeThreadedXMLHTTP60 * ntdll-Syscall_Emulation Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH 1/2] quartz: Don't hold an extra reference in async_run_cb().
by Zebediah Figura Nov. 6, 2020

Nov. 6, 2020

We don't actually need to, because we'll wait for the callback when stopping the graph. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49907 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/filtergraph.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index e2e293ebfb9..9e385052315 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1837,7 +1837,6 @@ static void CALLBACK async_run_cb(TP_CALLBACK_INSTANCE *instance, void *context, } LeaveCriticalSection(&graph->cs); - IUnknown_Release(graph->outer_unk); } static HRESULT WINAPI MediaControl_Run(IMediaControl *iface) @@ -1897,7 +1896,6 @@ static HRESULT WINAPI MediaControl_Run(IMediaControl *iface) if (!graph->async_run_work) graph->async_run_work = CreateThreadpoolWork(async_run_cb, graph, NULL); graph->needs_async_run = 1; - IUnknown_AddRef(graph->outer_unk); SubmitThreadpoolWork(graph->async_run_work); } else @@ -5017,9 +5015,8 @@ static HRESULT WINAPI MediaFilter_Stop(IMediaFilter *iface) LeaveCriticalSection(&graph->cs); - /* Don't cancel the callback; it's holding a reference to the graph. */ if (work) - WaitForThreadpoolWorkCallbacks(work, FALSE); + WaitForThreadpoolWorkCallbacks(work, TRUE); return hr; } @@ -5068,9 +5065,8 @@ static HRESULT WINAPI MediaFilter_Pause(IMediaFilter *iface) LeaveCriticalSection(&graph->cs); - /* Don't cancel the callback; it's holding a reference to the graph. */ if (work) - WaitForThreadpoolWorkCallbacks(work, FALSE); + WaitForThreadpoolWorkCallbacks(work, TRUE); return hr; } -- 2.29.2

2 2