April 2020 - Wine-commits - list.winehq.org

Hans Leidekker : msi: Add support for bitmap buttons.
by Alexandre Julliard 21 Apr '20

21 Apr '20

Module: wine Branch: master Commit: 9cc044957791e0658ec3d0d8ad08eebfc08b522c URL: https://source.winehq.org/git/wine.git/?a=commit;h=9cc044957791e0658ec3d0d8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 21 11:55:09 2020 +0200 msi: Add support for bitmap buttons. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48974 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/dialog.c | 166 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 91 insertions(+), 75 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 67a0633991..81b0d3dba0 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -1014,38 +1014,120 @@ static UINT msi_dialog_button_handler( msi_dialog *dialog, msi_control *control, return r; } +static HBITMAP msi_load_picture( MSIDATABASE *db, const WCHAR *name, INT cx, INT cy, DWORD flags ) +{ + HBITMAP hOleBitmap = 0, hBitmap = 0, hOldSrcBitmap, hOldDestBitmap; + MSIRECORD *rec = NULL; + IStream *stm = NULL; + IPicture *pic = NULL; + HDC srcdc, destdc; + BITMAP bm; + UINT r; + + rec = msi_get_binary_record( db, name ); + if (!rec) + goto end; + + r = MSI_RecordGetIStream( rec, 2, &stm ); + msiobj_release( &rec->hdr ); + if (r != ERROR_SUCCESS) + goto end; + + r = OleLoadPicture( stm, 0, TRUE, &IID_IPicture, (void **)&pic ); + IStream_Release( stm ); + if (FAILED( r )) + { + ERR("failed to load picture\n"); + goto end; + } + + r = IPicture_get_Handle( pic, (OLE_HANDLE *)&hOleBitmap ); + if (FAILED( r )) + { + ERR("failed to get bitmap handle\n"); + goto end; + } + + /* make the bitmap the desired size */ + r = GetObjectW( hOleBitmap, sizeof(bm), &bm ); + if (r != sizeof(bm)) + { + ERR("failed to get bitmap size\n"); + goto end; + } + + if (flags & LR_DEFAULTSIZE) + { + cx = bm.bmWidth; + cy = bm.bmHeight; + } + + srcdc = CreateCompatibleDC( NULL ); + hOldSrcBitmap = SelectObject( srcdc, hOleBitmap ); + destdc = CreateCompatibleDC( NULL ); + hBitmap = CreateCompatibleBitmap( srcdc, cx, cy ); + hOldDestBitmap = SelectObject( destdc, hBitmap ); + StretchBlt( destdc, 0, 0, cx, cy, srcdc, 0, 0, bm.bmWidth, bm.bmHeight, SRCCOPY ); + SelectObject( srcdc, hOldSrcBitmap ); + SelectObject( destdc, hOldDestBitmap ); + DeleteDC( srcdc ); + DeleteDC( destdc ); + +end: + if (pic) IPicture_Release( pic ); + return hBitmap; +} + static UINT msi_dialog_button_control( msi_dialog *dialog, MSIRECORD *rec ) { msi_control *control; - UINT attributes, style; + UINT attributes, style, cx = 0, cy = 0, flags = 0; + WCHAR *name = NULL; TRACE("%p %p\n", dialog, rec); style = WS_TABSTOP; attributes = MSI_RecordGetInteger( rec, 8 ); - if( attributes & msidbControlAttributesIcon ) - style |= BS_ICON; + if (attributes & msidbControlAttributesIcon) style |= BS_ICON; + else if (attributes & msidbControlAttributesBitmap) + { + style |= BS_BITMAP; + if (attributes & msidbControlAttributesFixedSize) flags |= LR_DEFAULTSIZE; + else + { + cx = msi_dialog_scale_unit( dialog, MSI_RecordGetInteger(rec, 6) ); + cy = msi_dialog_scale_unit( dialog, MSI_RecordGetInteger(rec, 7) ); + } + } control = msi_dialog_add_control( dialog, rec, szButton, style ); - if( !control ) + if (!control) return ERROR_FUNCTION_FAILED; control->handler = msi_dialog_button_handler; if (attributes & msidbControlAttributesIcon) { - /* set the icon */ - LPWSTR name = msi_get_binary_name( dialog->package, rec ); + name = msi_get_binary_name( dialog->package, rec ); control->hIcon = msi_load_icon( dialog->package->db, name, attributes ); if (control->hIcon) { SendMessageW( control->hwnd, BM_SETIMAGE, IMAGE_ICON, (LPARAM) control->hIcon ); } - else - ERR("Failed to load icon %s\n", debugstr_w(name)); - msi_free( name ); + else ERR("Failed to load icon %s\n", debugstr_w(name)); + } + else if (attributes & msidbControlAttributesBitmap) + { + name = msi_get_binary_name( dialog->package, rec ); + control->hBitmap = msi_load_picture( dialog->package->db, name, cx, cy, flags ); + if (control->hBitmap) + { + SendMessageW( control->hwnd, BM_SETIMAGE, IMAGE_BITMAP, (LPARAM) control->hBitmap ); + } + else ERR("Failed to load bitmap %s\n", debugstr_w(name)); } + msi_free( name ); return ERROR_SUCCESS; } @@ -1341,72 +1423,6 @@ static UINT msi_dialog_scrolltext_control( msi_dialog *dialog, MSIRECORD *rec ) return ERROR_SUCCESS; } -static HBITMAP msi_load_picture( MSIDATABASE *db, LPCWSTR name, - INT cx, INT cy, DWORD flags ) -{ - HBITMAP hOleBitmap = 0, hBitmap = 0, hOldSrcBitmap, hOldDestBitmap; - MSIRECORD *rec = NULL; - IStream *stm = NULL; - IPicture *pic = NULL; - HDC srcdc, destdc; - BITMAP bm; - UINT r; - - rec = msi_get_binary_record( db, name ); - if( !rec ) - goto end; - - r = MSI_RecordGetIStream( rec, 2, &stm ); - msiobj_release( &rec->hdr ); - if( r != ERROR_SUCCESS ) - goto end; - - r = OleLoadPicture( stm, 0, TRUE, &IID_IPicture, (LPVOID*) &pic ); - IStream_Release( stm ); - if( FAILED( r ) ) - { - ERR("failed to load picture\n"); - goto end; - } - - r = IPicture_get_Handle( pic, (OLE_HANDLE*) &hOleBitmap ); - if( FAILED( r ) ) - { - ERR("failed to get bitmap handle\n"); - goto end; - } - - /* make the bitmap the desired size */ - r = GetObjectW( hOleBitmap, sizeof bm, &bm ); - if (r != sizeof bm ) - { - ERR("failed to get bitmap size\n"); - goto end; - } - - if (flags & LR_DEFAULTSIZE) - { - cx = bm.bmWidth; - cy = bm.bmHeight; - } - - srcdc = CreateCompatibleDC( NULL ); - hOldSrcBitmap = SelectObject( srcdc, hOleBitmap ); - destdc = CreateCompatibleDC( NULL ); - hBitmap = CreateCompatibleBitmap( srcdc, cx, cy ); - hOldDestBitmap = SelectObject( destdc, hBitmap ); - StretchBlt( destdc, 0, 0, cx, cy, - srcdc, 0, 0, bm.bmWidth, bm.bmHeight, SRCCOPY); - SelectObject( srcdc, hOldSrcBitmap ); - SelectObject( destdc, hOldDestBitmap ); - DeleteDC( srcdc ); - DeleteDC( destdc ); - -end: - if ( pic ) - IPicture_Release( pic ); - return hBitmap; -} static UINT msi_dialog_bitmap_control( msi_dialog *dialog, MSIRECORD *rec ) {

1 0

Piotr Caban : ucrtbase: Change ptd fields offsets to match with native.
by Alexandre Julliard 21 Apr '20

21 Apr '20

Module: wine Branch: master Commit: 9b94e4c80580325e62097ed6c08cc37c28575470 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b94e4c80580325e62097ed6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 21 13:11:56 2020 +0200 ucrtbase: Change ptd fields offsets to match with native. Makes it possible to use native vcruntime140_1.dll. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr90/tests/msvcr90.c | 3 +-- dlls/msvcrt/msvcrt.h | 5 ++--- dlls/ucrtbase/tests/misc.c | 26 ++++++++++++++++++++++++++ 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index eb0970f4c1..630b56f8a6 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -1139,8 +1139,7 @@ struct __thread_data { void* terminate_handler; void* unexpected_handler; void* se_translator; - void *unk6[3]; - int unk7; + void *unk6; EXCEPTION_RECORD *exc_record; }; diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 244df7d23c..a45b82a944 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -285,9 +285,8 @@ struct __thread_data { int unk5[1]; MSVCRT_terminate_function terminate_handler; MSVCRT_unexpected_function unexpected_handler; - MSVCRT__se_translator_function se_translator; - void *unk6[3]; - int unk7; + MSVCRT__se_translator_function se_translator; /* preserve offset to exc_record and processing_throw */ + void *unk6; EXCEPTION_RECORD *exc_record; CONTEXT *ctx_record; int processing_throw; diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index dfbe0256ca..eb0c79be2b 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -100,12 +100,17 @@ typedef struct { const wchar_t *locnameW; } __lc_time_data; +typedef void (__cdecl *_se_translator_function)(unsigned int code, struct _EXCEPTION_POINTERS *info); + static LONGLONG crt_init_end; _ACRTIMP int __cdecl _o__initialize_onexit_table(_onexit_table_t *table); _ACRTIMP int __cdecl _o__register_onexit_function(_onexit_table_t *table, _onexit_t func); _ACRTIMP int __cdecl _o__execute_onexit_table(_onexit_table_t *table); _ACRTIMP void *__cdecl _o_malloc(size_t); +_se_translator_function __cdecl _set_se_translator(_se_translator_function func); +void** __cdecl __current_exception(void); +int* __cdecl __processing_throw(void); static void test__initialize_onexit_table(void) { @@ -1297,6 +1302,26 @@ static void test_clock(void) c, expect_min - thresh, expect_min + max_load_delay); } +static void __cdecl se_translator(unsigned int u, EXCEPTION_POINTERS *ep) +{ +} + +static void test_thread_storage(void) +{ + void **current_exception; + void *processing_throw; + + _set_se_translator(se_translator); + current_exception = __current_exception(); + processing_throw = __processing_throw(); + + ok(current_exception+2 == processing_throw, + "current_exception = %p, processing_throw = %p\n", + current_exception, processing_throw); + ok(current_exception[-2] == se_translator, + "can't find se_translator in thread storage\n"); +} + START_TEST(misc) { int arg_c; @@ -1335,4 +1360,5 @@ START_TEST(misc) test__stat32(); test__o_malloc(); test_clock(); + test_thread_storage(); }

1 0

Piotr Caban : vcruntime140_1: Export functions only on x86_64.
by Alexandre Julliard 21 Apr '20

21 Apr '20

Module: wine Branch: master Commit: 311d040e24aa26a68a5ef089f33f573d373893d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=311d040e24aa26a68a5ef089… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 21 13:12:01 2020 +0200 vcruntime140_1: Export functions only on x86_64. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcruntime140_1/vcruntime140_1.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/vcruntime140_1/vcruntime140_1.spec b/dlls/vcruntime140_1/vcruntime140_1.spec index 55f568ef13..5119df9b99 100644 --- a/dlls/vcruntime140_1/vcruntime140_1.spec +++ b/dlls/vcruntime140_1/vcruntime140_1.spec @@ -1,3 +1,3 @@ -@ stub __CxxFrameHandler4 -@ stub __NLG_Dispatch2 -@ stub __NLG_Return2 +@ stub -arch=x86_64 __CxxFrameHandler4 +@ stub -arch=x86_64 __NLG_Dispatch2 +@ stub -arch=x86_64 __NLG_Return2

1 0

Piotr Caban : vcruntime140_1: Add __CxxFrameHandler4 stub.
by Alexandre Julliard 21 Apr '20

21 Apr '20

Module: wine Branch: master Commit: 68bbf86483d88df3442bfb3332b71438f6a508c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=68bbf86483d88df3442bfb33… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 21 13:12:04 2020 +0200 vcruntime140_1: Add __CxxFrameHandler4 stub. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcruntime140_1/Makefile.in | 5 +++++ dlls/vcruntime140_1/except_x86_64.c | 34 +++++++++++++++++++++++++++++++++ dlls/vcruntime140_1/vcruntime140_1.spec | 2 +- 3 files changed, 40 insertions(+), 1 deletion(-) diff --git a/dlls/vcruntime140_1/Makefile.in b/dlls/vcruntime140_1/Makefile.in index b5e20fe92f..ab17b330be 100644 --- a/dlls/vcruntime140_1/Makefile.in +++ b/dlls/vcruntime140_1/Makefile.in @@ -1 +1,6 @@ MODULE = vcruntime140_1.dll + +EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + except_x86_64.c diff --git a/dlls/vcruntime140_1/except_x86_64.c b/dlls/vcruntime140_1/except_x86_64.c new file mode 100644 index 0000000000..ff582e44da --- /dev/null +++ b/dlls/vcruntime140_1/except_x86_64.c @@ -0,0 +1,34 @@ +/* + * C++ exception handling (ver. 4) + * + * Copyright 2020 Piotr Caban + * + * 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 + */ + +#ifdef __x86_64__ + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(seh); + +EXCEPTION_DISPOSITION __cdecl __CxxFrameHandler4(EXCEPTION_RECORD *rec, + ULONG64 frame, CONTEXT *context, DISPATCHER_CONTEXT *dispatch) +{ + FIXME("%p %lx %p %p\n", rec, frame, context, dispatch); + return ExceptionContinueSearch; +} + +#endif diff --git a/dlls/vcruntime140_1/vcruntime140_1.spec b/dlls/vcruntime140_1/vcruntime140_1.spec index 5119df9b99..f41c7d2a12 100644 --- a/dlls/vcruntime140_1/vcruntime140_1.spec +++ b/dlls/vcruntime140_1/vcruntime140_1.spec @@ -1,3 +1,3 @@ -@ stub -arch=x86_64 __CxxFrameHandler4 +@ cdecl -arch=x86_64 __CxxFrameHandler4(ptr long ptr ptr) @ stub -arch=x86_64 __NLG_Dispatch2 @ stub -arch=x86_64 __NLG_Return2

1 0

Piotr Caban : vcruntime140_1: Implement function description version 4 structures reading.
by Alexandre Julliard 21 Apr '20

21 Apr '20

Module: wine Branch: master Commit: 7f4a880fc5b3169ba54bc39b2bcf704a8079591a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f4a880fc5b3169ba54bc39b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 21 13:12:09 2020 +0200 vcruntime140_1: Implement function description version 4 structures reading. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcruntime140_1/cppexcept.h | 54 +++++++ dlls/vcruntime140_1/except_x86_64.c | 289 ++++++++++++++++++++++++++++++++++++ 2 files changed, 343 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7f4a880fc5b3169ba54b…

1 0

Piotr Caban : vcruntime140_1: Add __CxxFrameHandler4 implementation.
by Alexandre Julliard 21 Apr '20

21 Apr '20

Module: wine Branch: master Commit: a715a0c4cafe150ebbbf4245127907309cd389e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a715a0c4cafe150ebbbf4245… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 21 13:12:13 2020 +0200 vcruntime140_1: Add __CxxFrameHandler4 implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcruntime140_1/cppexcept.h | 65 +++++ dlls/vcruntime140_1/except_x86_64.c | 471 +++++++++++++++++++++++++++++++++++- 2 files changed, 534 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a715a0c4cafe150ebbbf…

1 0

Ziqing Hui : windowscodecs/tests: Add tests for global properties of DdsDecoder.
by Alexandre Julliard 21 Apr '20

21 Apr '20

Module: wine Branch: master Commit: f74797d3da4daab1f427055180422879a1b89416 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f74797d3da4daab1f4270551… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Apr 20 11:59:37 2020 +0800 windowscodecs/tests: Add tests for global properties of DdsDecoder. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/ddsformat.c | 50 ++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 8569d0e291..de109b8299 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -142,6 +142,55 @@ static void test_dds_decoder_initialize(void) } } +static void test_dds_decoder_global_properties(IWICBitmapDecoder *decoder) +{ + HRESULT hr; + IWICPalette *pallette = NULL; + IWICMetadataQueryReader *metadata_reader = NULL; + IWICBitmapSource *preview = NULL, *thumnail = NULL; + IWICColorContext *color_context = NULL; + UINT count; + + hr = IWICImagingFactory_CreatePalette(factory, &pallette); + ok (hr == S_OK, "CreatePalette failed, hr=%x\n", hr); + if (hr == S_OK) { + todo_wine { + hr = IWICBitmapDecoder_CopyPalette(decoder, pallette); + ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "Expected hr=WINCODEC_ERR_PALETTEUNAVAILABLE, got %x\n", hr); + hr = IWICBitmapDecoder_CopyPalette(decoder, NULL); + ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "Expected hr=WINCODEC_ERR_PALETTEUNAVAILABLE, got %x\n", hr); + }; + } + + todo_wine { + hr = IWICBitmapDecoder_GetMetadataQueryReader(decoder, &metadata_reader); + ok (hr == S_OK, "Expected hr=S_OK, got %x\n", hr); + hr = IWICBitmapDecoder_GetMetadataQueryReader(decoder, NULL); + ok (hr == E_INVALIDARG, "Expected hr=E_INVALIDARG, got %x\n", hr); + + hr = IWICBitmapDecoder_GetPreview(decoder, &preview); + ok (hr == WINCODEC_ERR_UNSUPPORTEDOPERATION, "Expected hr=WINCODEC_ERR_UNSUPPORTEDOPERATION, got %x\n", hr); + hr = IWICBitmapDecoder_GetPreview(decoder, NULL); + ok (hr == WINCODEC_ERR_UNSUPPORTEDOPERATION, "Expected hr=WINCODEC_ERR_UNSUPPORTEDOPERATION, got %x\n", hr); + + hr = IWICBitmapDecoder_GetColorContexts(decoder, 1, &color_context, &count); + ok (hr == WINCODEC_ERR_UNSUPPORTEDOPERATION, "Expected hr=WINCODEC_ERR_UNSUPPORTEDOPERATION, got %x\n", hr); + hr = IWICBitmapDecoder_GetColorContexts(decoder, 1, NULL, NULL); + ok (hr == WINCODEC_ERR_UNSUPPORTEDOPERATION, "Expected hr=WINCODEC_ERR_UNSUPPORTEDOPERATION, got %x\n", hr); + + hr = IWICBitmapDecoder_GetThumbnail(decoder, &thumnail); + ok (hr == WINCODEC_ERR_CODECNOTHUMBNAIL, "Expected hr=WINCODEC_ERR_CODECNOTHUMBNAIL, got %x\n", hr); + hr = IWICBitmapDecoder_GetThumbnail(decoder, NULL); + ok (hr == WINCODEC_ERR_CODECNOTHUMBNAIL, "Expected hr=WINCODEC_ERR_CODECNOTHUMBNAIL, got %x\n", hr); + }; + + if (pallette) IWICPalette_Release(pallette); + if (metadata_reader) IWICMetadataQueryReader_Release(metadata_reader); + if (preview) IWICBitmapSource_Release(preview); + if (color_context) IWICColorContext_Release(color_context); + if (thumnail) IWICBitmapSource_Release(thumnail); +} + static void test_dds_decoder(void) { HRESULT hr; @@ -158,6 +207,7 @@ static void test_dds_decoder(void) if (FAILED(hr)) goto end; test_dds_decoder_initialize(); + test_dds_decoder_global_properties(decoder); end: if (decoder) IWICBitmapDecoder_Release(decoder);

1 0

Ziqing Hui : windowscodecs: Implement global property functions for DdsDecoder.
by Alexandre Julliard 21 Apr '20

21 Apr '20

Module: wine Branch: master Commit: f634aa28364da8d0315f9262d7f67fc48f8b2686 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f634aa28364da8d0315f9262… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Apr 20 12:00:03 2020 +0800 windowscodecs: Implement global property functions for DdsDecoder. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/ddsformat.c | 20 +++++++++++--------- dlls/windowscodecs/tests/ddsformat.c | 6 +----- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index ac832e2116..a5036f23d6 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -208,15 +208,17 @@ static HRESULT WINAPI DdsDecoder_GetDecoderInfo(IWICBitmapDecoder *iface, static HRESULT WINAPI DdsDecoder_CopyPalette(IWICBitmapDecoder *iface, IWICPalette *pIPalette) { - FIXME("(%p,%p): stub.\n", iface, pIPalette); + TRACE("(%p,%p)\n", iface, pIPalette); - return E_NOTIMPL; + return WINCODEC_ERR_PALETTEUNAVAILABLE; } static HRESULT WINAPI DdsDecoder_GetMetadataQueryReader(IWICBitmapDecoder *iface, IWICMetadataQueryReader **ppIMetadataQueryReader) { - FIXME("(%p,%p): stub.\n", iface, ppIMetadataQueryReader); + if (!ppIMetadataQueryReader) return E_INVALIDARG; + + FIXME("(%p,%p)\n", iface, ppIMetadataQueryReader); return E_NOTIMPL; } @@ -224,25 +226,25 @@ static HRESULT WINAPI DdsDecoder_GetMetadataQueryReader(IWICBitmapDecoder *iface static HRESULT WINAPI DdsDecoder_GetPreview(IWICBitmapDecoder *iface, IWICBitmapSource **ppIBitmapSource) { - FIXME("(%p,%p): stub.\n", iface, ppIBitmapSource); + TRACE("(%p,%p)\n", iface, ppIBitmapSource); - return E_NOTIMPL; + return WINCODEC_ERR_UNSUPPORTEDOPERATION; } static HRESULT WINAPI DdsDecoder_GetColorContexts(IWICBitmapDecoder *iface, UINT cCount, IWICColorContext **ppDdslorContexts, UINT *pcActualCount) { - FIXME("(%p,%u,%p,%p): stub.\n", iface, cCount, ppDdslorContexts, pcActualCount); + TRACE("(%p,%u,%p,%p)\n", iface, cCount, ppDdslorContexts, pcActualCount); - return E_NOTIMPL; + return WINCODEC_ERR_UNSUPPORTEDOPERATION; } static HRESULT WINAPI DdsDecoder_GetThumbnail(IWICBitmapDecoder *iface, IWICBitmapSource **ppIThumbnail) { - FIXME("(%p,%p): stub.\n", iface, ppIThumbnail); + TRACE("(%p,%p)\n", iface, ppIThumbnail); - return E_NOTIMPL; + return WINCODEC_ERR_CODECNOTHUMBNAIL; } static HRESULT WINAPI DdsDecoder_GetFrameCount(IWICBitmapDecoder *iface, diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index de109b8299..0d8e728abc 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -154,17 +154,14 @@ static void test_dds_decoder_global_properties(IWICBitmapDecoder *decoder) hr = IWICImagingFactory_CreatePalette(factory, &pallette); ok (hr == S_OK, "CreatePalette failed, hr=%x\n", hr); if (hr == S_OK) { - todo_wine { hr = IWICBitmapDecoder_CopyPalette(decoder, pallette); ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "Expected hr=WINCODEC_ERR_PALETTEUNAVAILABLE, got %x\n", hr); hr = IWICBitmapDecoder_CopyPalette(decoder, NULL); ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "Expected hr=WINCODEC_ERR_PALETTEUNAVAILABLE, got %x\n", hr); - }; } - todo_wine { hr = IWICBitmapDecoder_GetMetadataQueryReader(decoder, &metadata_reader); - ok (hr == S_OK, "Expected hr=S_OK, got %x\n", hr); + todo_wine ok (hr == S_OK, "Expected hr=S_OK, got %x\n", hr); hr = IWICBitmapDecoder_GetMetadataQueryReader(decoder, NULL); ok (hr == E_INVALIDARG, "Expected hr=E_INVALIDARG, got %x\n", hr); @@ -182,7 +179,6 @@ static void test_dds_decoder_global_properties(IWICBitmapDecoder *decoder) ok (hr == WINCODEC_ERR_CODECNOTHUMBNAIL, "Expected hr=WINCODEC_ERR_CODECNOTHUMBNAIL, got %x\n", hr); hr = IWICBitmapDecoder_GetThumbnail(decoder, NULL); ok (hr == WINCODEC_ERR_CODECNOTHUMBNAIL, "Expected hr=WINCODEC_ERR_CODECNOTHUMBNAIL, got %x\n", hr); - }; if (pallette) IWICPalette_Release(pallette); if (metadata_reader) IWICMetadataQueryReader_Release(metadata_reader);

1 0

Ziqing Hui : windowscodecs/tests: Avoid using SUCCEEDED() and FAILED() in ddsformat.c.
by Alexandre Julliard 21 Apr '20

21 Apr '20

Module: wine Branch: master Commit: b34d4bdcb80fefa9bf49a93a0b1592ae2efeb5e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b34d4bdcb80fefa9bf49a93a… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Apr 20 12:00:18 2020 +0800 windowscodecs/tests: Avoid using SUCCEEDED() and FAILED() in ddsformat.c. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/ddsformat.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 0d8e728abc..ddb20e7b63 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -45,12 +45,12 @@ static IWICStream *create_stream(const void *image_data, UINT image_size) IWICStream *stream = NULL; hr = IWICImagingFactory_CreateStream(factory, &stream); - ok(SUCCEEDED(hr), "CreateStream failed, hr=%x\n", hr); - if (FAILED(hr)) goto fail; + ok(hr == S_OK, "CreateStream failed, hr=%x\n", hr); + if (hr != S_OK) goto fail; hr = IWICStream_InitializeFromMemory(stream, (BYTE *)image_data, image_size); - ok(SUCCEEDED(hr), "InitializeFromMemory failed, hr=%x\n", hr); - if (FAILED(hr)) goto fail; + ok(hr == S_OK, "InitializeFromMemory failed, hr=%x\n", hr); + if (hr != S_OK) goto fail; return stream; @@ -67,14 +67,14 @@ static IWICBitmapDecoder *create_decoder(void) hr = CoCreateInstance(&CLSID_WICDdsDecoder, NULL, CLSCTX_INPROC_SERVER, &IID_IWICBitmapDecoder, (void **)&decoder); - if (FAILED(hr)) { + if (hr != S_OK) { win_skip("Dds decoder is not supported\n"); return NULL; } memset(&guidresult, 0, sizeof(guidresult)); hr = IWICBitmapDecoder_GetContainerFormat(decoder, &guidresult); - ok(SUCCEEDED(hr), "GetContainerFormat failed, hr=%x\n", hr); + ok(hr == S_OK, "GetContainerFormat failed, hr=%x\n", hr); ok(IsEqualGUID(&guidresult, &GUID_ContainerFormatDds), "Unexpected container format\n"); return decoder; @@ -86,7 +86,7 @@ static HRESULT init_decoder(IWICBitmapDecoder *decoder, IWICStream *stream, HRES hr = IWICBitmapDecoder_Initialize(decoder, (IStream*)stream, WICDecodeMetadataCacheOnDemand); if (index == -1) { - ok(SUCCEEDED(hr), "Decoder Initialize failed, hr=%x\n", hr); + ok(hr == S_OK, "Decoder Initialize failed, hr=%x\n", hr); } else { ok(hr == expected, "%d: Expected hr=%x, got %x\n", index, expected, hr); } @@ -200,7 +200,7 @@ static void test_dds_decoder(void) if (!decoder) goto end; hr = init_decoder(decoder, stream, S_OK, -1); - if (FAILED(hr)) goto end; + if (hr != S_OK) goto end; test_dds_decoder_initialize(); test_dds_decoder_global_properties(decoder); @@ -217,8 +217,8 @@ START_TEST(ddsformat) hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, &IID_IWICImagingFactory, (void **)&factory); - ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); - if (FAILED(hr)) goto end; + ok(hr == S_OK, "CoCreateInstance failed, hr=%x\n", hr); + if (hr != S_OK) goto end; test_dds_decoder();

1 0

Dmitry Timoshkov : windowscodecs: Add support for 16bppGray and 32bppGrayFloat formats to TIFF decoder.
by Alexandre Julliard 21 Apr '20

21 Apr '20

Module: wine Branch: master Commit: fa753b5cf20dae0666537a3324dc83dc671b3d18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa753b5cf20dae0666537a33… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 21 12:01:57 2020 +0800 windowscodecs: Add support for 16bppGray and 32bppGrayFloat formats to TIFF decoder. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/regsvr.c | 2 ++ dlls/windowscodecs/tiffformat.c | 22 ++++++++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index 2c053bc5e4..c15daf2022 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1223,6 +1223,8 @@ static GUID const * const tiff_decode_formats[] = { &GUID_WICPixelFormatBlackWhite, &GUID_WICPixelFormat4bppGray, &GUID_WICPixelFormat8bppGray, + &GUID_WICPixelFormat16bppGray, + &GUID_WICPixelFormat32bppGrayFloat, &GUID_WICPixelFormat1bppIndexed, &GUID_WICPixelFormat2bppIndexed, &GUID_WICPixelFormat4bppIndexed, diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index a4c441e706..7354781eed 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -319,6 +319,8 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) } decode_info->planar = planar; + TRACE("planar %u, photometric %u, samples %u, bps %u\n", planar, photometric, samples, bps); + switch(photometric) { case 0: /* WhiteIsZero */ @@ -383,9 +385,25 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) } } break; + case 16: + if (samples != 1) + { + FIXME("unhandled 16bpp grayscale sample count %u\n", samples); + return WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT; + } + decode_info->format = &GUID_WICPixelFormat16bppGray; + break; + case 32: + if (samples != 1) + { + FIXME("unhandled 32bpp grayscale sample count %u\n", samples); + return WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT; + } + decode_info->format = &GUID_WICPixelFormat32bppGrayFloat; + break; default: - FIXME("unhandled greyscale bit count %u\n", bps); - return E_FAIL; + WARN("unhandled greyscale bit count %u\n", bps); + return WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT; } break; case 2: /* RGB */

1 0