February 2020 - Wine-Commits

Daniel Lehman : include: Fix compile error with C++ winelib.
by Alexandre Julliard Feb. 19, 2020

Feb. 19, 2020

Module: wine Branch: master Commit: 2c23a77ccc9dcb36720a25638cec0742e1f0710e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c23a77ccc9dcb36720a2563… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Tue Feb 18 23:01:27 2020 -0800 include: Fix compile error with C++ winelib. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/wchar.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index 119f8a2a41..e6a5e57fd2 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -421,12 +421,12 @@ static inline int wmemcmp(const wchar_t *s1, const wchar_t *s2, size_t n) static inline wchar_t* __cdecl wmemcpy(wchar_t *dst, const wchar_t *src, size_t n) { - return memcpy(dst, src, n * sizeof(wchar_t)); + return (wchar_t*)memcpy(dst, src, n * sizeof(wchar_t)); } static inline wchar_t* __cdecl wmemmove(wchar_t *dst, const wchar_t *src, size_t n) { - return memmove(dst, src, n * sizeof(wchar_t)); + return (wchar_t*)memmove(dst, src, n * sizeof(wchar_t)); } static inline wchar_t* __cdecl wmemset(wchar_t *s, wchar_t c, size_t n)

1 0

Akihiro Sagawa : shlwapi: Fix wnsprintfA/wvnsprintfA %C conversion.
by Alexandre Julliard Feb. 19, 2020

Feb. 19, 2020

Module: wine Branch: master Commit: 5ddca3dc0f920c29d8ef3a03dafb9918526daebf URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ddca3dc0f920c29d8ef3a03… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Feb 19 23:21:37 2020 +0900 shlwapi: Fix wnsprintfA/wvnsprintfA %C conversion. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/wsprintf.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/wsprintf.c b/dlls/shlwapi/wsprintf.c index f2e5f0ace1..baf5ea601a 100644 --- a/dlls/shlwapi/wsprintf.c +++ b/dlls/shlwapi/wsprintf.c @@ -254,8 +254,11 @@ static UINT WPRINTF_GetLen( WPRINTF_FORMAT *format, WPRINTF_DATA *arg, switch(format->type) { case WPR_CHAR: - case WPR_WCHAR: return (format->precision = 1); + case WPR_WCHAR: + if (dst_is_wide) len = 1; + else len = WideCharToMultiByte( CP_ACP, 0, &arg->wchar_view, 1, NULL, 0, NULL, NULL ); + return (format->precision = len); case WPR_STRING: if (!arg->lpcstr_view) arg->lpcstr_view = null_stringA; if (dst_is_wide) @@ -397,7 +400,14 @@ INT WINAPI wvnsprintfA( LPSTR buffer, INT maxlen, LPCSTR spec, __ms_va_list args switch(format.type) { case WPR_WCHAR: - *p++ = argData.wchar_view; + { + CHAR mb[5]; + if (WideCharToMultiByte( CP_ACP, 0, &argData.wchar_view, 1, mb, sizeof(mb), NULL, NULL )) + { + memcpy( p, mb, len ); + p += len; + } + } break; case WPR_CHAR: *p++ = argData.char_view;

1 0

Florian Will : include: Add enums and GUID required for GdipSaveAdd().
by Alexandre Julliard Feb. 19, 2020

Feb. 19, 2020

Module: wine Branch: master Commit: cc0d5c4fc96a37aa3c6c9242e9c5cab91638d59b URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc0d5c4fc96a37aa3c6c9242… Author: Florian Will <florian.will(a)gmail.com> Date: Wed Feb 19 08:47:04 2020 +0100 include: Add enums and GUID required for GdipSaveAdd(). Signed-off-by: Florian Will <florian.will(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/gdiplusenums.h | 41 +++++++++++++++++++++++++++++++++++++++++ include/gdiplusimaging.h | 2 ++ 2 files changed, 43 insertions(+) diff --git a/include/gdiplusenums.h b/include/gdiplusenums.h index 905a87a451..0fcc11d4b9 100644 --- a/include/gdiplusenums.h +++ b/include/gdiplusenums.h @@ -336,6 +336,45 @@ enum ImageFlags ImageFlagsCaching = 0x00020000 }; +enum EncoderParameterValueType { + EncoderParameterValueTypeByte = 1, + EncoderParameterValueTypeASCII = 2, + EncoderParameterValueTypeShort = 3, + EncoderParameterValueTypeLong = 4, + EncoderParameterValueTypeRational = 5, + EncoderParameterValueTypeLongRange = 6, + EncoderParameterValueTypeUndefined = 7, + EncoderParameterValueTypeRationalRange = 8, + EncoderParameterValueTypePointer = 9 +}; + +enum EncoderValue { + EncoderValueColorTypeCMYK = 0, + EncoderValueColorTypeYCCK = 1, + EncoderValueCompressionLZW = 2, + EncoderValueCompressionCCITT3 = 3, + EncoderValueCompressionCCITT4 = 4, + EncoderValueCompressionRle = 5, + EncoderValueCompressionNone = 6, + EncoderValueScanMethodInterlaced = 7, + EncoderValueScanMethodNonInterlaced = 8, + EncoderValueVersionGif87 = 9, + EncoderValueVersionGif89 = 10, + EncoderValueRenderProgressive = 11, + EncoderValueRenderNonProgressive = 12, + EncoderValueTransformRotate90 = 13, + EncoderValueTransformRotate180 = 14, + EncoderValueTransformRotate270 = 15, + EncoderValueTransformFlipHorizontal = 16, + EncoderValueTransformFlipVertical = 17, + EncoderValueMultiFrame = 18, + EncoderValueLastFrame = 19, + EncoderValueFlush = 20, + EncoderValueFrameDimensionTime = 21, + EncoderValueFrameDimensionResolution = 22, + EncoderValueFrameDimensionPage = 23 +}; + enum CombineMode { CombineModeReplace, @@ -747,6 +786,8 @@ typedef enum HotkeyPrefix HotkeyPrefix; typedef enum PenAlignment PenAlignment; typedef enum PaletteFlags PaletteFlags; typedef enum ImageCodecFlags ImageCodecFlags; +typedef enum EncoderParameterValueType EncoderParameterValueType; +typedef enum EncoderValue EncoderValue; typedef enum CombineMode CombineMode; typedef enum FlushIntention FlushIntention; typedef enum CoordinateSpace CoordinateSpace; diff --git a/include/gdiplusimaging.h b/include/gdiplusimaging.h index 93114d95c4..9e6b58283f 100644 --- a/include/gdiplusimaging.h +++ b/include/gdiplusimaging.h @@ -35,6 +35,8 @@ DEFINE_GUID(FrameDimensionTime, 0x6aedbd6d, 0x3fb5, 0x418a, 0x83, 0xa6, 0x DEFINE_GUID(FrameDimensionPage, 0x7462dc86, 0x6180, 0x4c7e, 0x8e, 0x3f, 0xee, 0x73, 0x33, 0xa7, 0xa4, 0x83); DEFINE_GUID(FrameDimensionResolution, 0x84236f7b, 0x3bd3, 0x428f, 0x8d, 0xab, 0x4e, 0xa1, 0x43, 0x9c, 0xa3, 0x15); +DEFINE_GUID(EncoderSaveFlag, 0x292266fc, 0xac40, 0x47bf, 0x8c, 0xfc, 0xa8, 0x5b, 0x89, 0xa6, 0x55, 0xde); + enum ImageLockMode { ImageLockModeRead = 1,

1 0

Akihiro Sagawa : user32/tests: Use wide string literals in wsprintf tests.
by Alexandre Julliard Feb. 19, 2020

Feb. 19, 2020

Module: wine Branch: master Commit: 92014581b6c27a17b9b787e3017b67b588c6f768 URL: https://source.winehq.org/git/wine.git/?a=commit;h=92014581b6c27a17b9b787e3… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Feb 19 23:21:31 2020 +0900 user32/tests: Use wide string literals in wsprintf tests. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/wsprintf.c | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/dlls/user32/tests/wsprintf.c b/dlls/user32/tests/wsprintf.c index c7be43a08f..3aae012cec 100644 --- a/dlls/user32/tests/wsprintf.c +++ b/dlls/user32/tests/wsprintf.c @@ -53,9 +53,9 @@ static const struct static void wsprintfATest(void) { char buf[25], star[4], partial[4]; - static const WCHAR starW[] = {0x2606, 0}; - static const WCHAR fffeW[] = {0xfffe, 0}; - static const WCHAR wineW[] = {0xd83c, 0xdf77, 0}; /* U+1F377: wine glass */ + static const WCHAR starW[] = L"\x2606"; + static const WCHAR fffeW[] = L"\xfffe"; + static const WCHAR wineW[] = L"\xd83c\xdf77"; /* U+1F377: wine glass */ const struct { const void *input; const char *fmt; @@ -120,14 +120,8 @@ static void wsprintfATest(void) static void wsprintfWTest(void) { - static const WCHAR fmt_010ld[] = {'%','0','1','0','l','d','\0'}; - static const WCHAR res_010ld[] = {'-','0','0','0','0','0','0','0','0','1', '\0'}; - static const WCHAR fmt_I64x[] = {'%','I','6','4','x',0}; - static const WCHAR fmt_dot3S[] = {'%','.','3','S',0}; - static const WCHAR fmt__4S[] = {'%','-','4','S',0}; - static const WCHAR stars[] = {'*', 0x2606, 0x2605, 0}; - static const WCHAR nul_spc[] = {'*', 0, ' ', ' ', 0}; - WCHAR def_spc[] = {'*','?', 0x2605, ' ', 0}; + static const WCHAR stars[] = L"*\x2606\x2605"; + WCHAR def_spc[] = L"*?\x2605 "; WCHAR buf[25], fmt[25], res[25]; char stars_mb[8], partial00[8], partialFF[8]; const struct { @@ -137,25 +131,25 @@ static void wsprintfWTest(void) int rc; } testcase[] = { - { stars_mb, fmt_dot3S, stars, 3 }, - { partial00, fmt__4S, nul_spc, 4 }, - { partialFF, fmt__4S, def_spc, 4 }, + { stars_mb, L"%.3S", stars, 3 }, + { partial00, L"%-4S", L"*\0 ", 4 }, + { partialFF, L"%-4S", def_spc, 4 }, }; CPINFOEXW cpinfoex; unsigned int i; int rc; - rc=wsprintfW(buf, fmt_010ld, -1); + rc=wsprintfW(buf, L"%010ld", -1); if (rc==0 && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) { win_skip("wsprintfW is not implemented\n"); return; } ok(rc == 10, "wsPrintfW length failure: rc=%d error=%d\n",rc,GetLastError()); - ok((lstrcmpW(buf, res_010ld) == 0), + ok((lstrcmpW(buf, L"-000000001") == 0), "wsprintfW zero padded negative value failure\n"); - rc = wsprintfW(buf, fmt_I64x, (ULONGLONG)0 ); - if (rc == 4 && !lstrcmpW(buf, fmt_I64x + 1)) + rc = wsprintfW(buf, L"%I64x", (ULONGLONG)0 ); + if (rc == 4 && !lstrcmpW(buf, L"I64x")) { win_skip( "I64 formats not supported\n" ); return;

1 0

Florian Will : gdiplus: Implement GdipSaveAddImage() and GdipSaveAdd().
by Alexandre Julliard Feb. 19, 2020

Feb. 19, 2020

Module: wine Branch: master Commit: a7fc06f62cf6bd691b86abba24d83292bd1399e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7fc06f62cf6bd691b86abba… Author: Florian Will <florian.will(a)gmail.com> Date: Wed Feb 19 08:47:07 2020 +0100 gdiplus: Implement GdipSaveAddImage() and GdipSaveAdd(). Signed-off-by: Florian Will <florian.will(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/image.c | 56 +++++++++++++++++++++++++++++++++++++++------- dlls/gdiplus/tests/image.c | 24 ++++++++++---------- 2 files changed, 60 insertions(+), 20 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 94c03ede19..f33e2328bf 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -4426,6 +4426,9 @@ GpStatus WINGDIPAPI GdipSaveImageToFile(GpImage *image, GDIPCONST WCHAR* filenam if (!image || !filename|| !clsidEncoder) return InvalidParameter; + /* this might release an old file stream held by the encoder so we can re-create it below */ + terminate_encoder_wic(image); + stat = GdipCreateStreamOnFile(filename, GENERIC_WRITE, &stream); if (stat != Ok) return GenericError; @@ -4598,6 +4601,29 @@ static GpStatus encode_frame_wic(IWICBitmapEncoder *encoder, GpImage *image) return hresult_to_status(hr); } +static BOOL has_encoder_param_long(GDIPCONST EncoderParameters *params, GUID param_guid, ULONG val) +{ + int param_idx, value_idx; + + if (!params) + return FALSE; + + for (param_idx = 0; param_idx < params->Count; param_idx++) + { + EncoderParameter param = params->Parameter[param_idx]; + if (param.Type == EncoderParameterValueTypeLong && IsEqualCLSID(&param.Guid, &param_guid)) + { + ULONG *value_array = (ULONG*) param.Value; + for (value_idx = 0; value_idx < param.NumberOfValues; value_idx++) + { + if (value_array[value_idx] == val) + return TRUE; + } + } + } + return FALSE; +} + static GpStatus encode_image_wic(GpImage *image, IStream *stream, REFGUID container, GDIPCONST EncoderParameters *params) { @@ -4611,10 +4637,13 @@ static GpStatus encode_image_wic(GpImage *image, IStream *stream, if (status == Ok) status = encode_frame_wic(image->encoder, image); - /* always try to terminate, but if something already failed earlier, keep the old status. */ - terminate_status = terminate_encoder_wic(image); - if (status == Ok) - status = terminate_status; + if (!has_encoder_param_long(params, EncoderSaveFlag, EncoderValueMultiFrame)) + { + /* always try to terminate, but if something already failed earlier, keep the old status. */ + terminate_status = terminate_encoder_wic(image); + if (status == Ok) + status = terminate_status; + } return status; } @@ -4687,8 +4716,7 @@ GpStatus WINGDIPAPI GdipSaveImageToStream(GpImage *image, IStream* stream, */ GpStatus WINGDIPAPI GdipSaveAdd(GpImage *image, GDIPCONST EncoderParameters *params) { - FIXME("(%p,%p): stub\n", image, params); - return NotImplemented; + return GdipSaveAddImage(image, image, params); } /***************************************************************************** @@ -4704,8 +4732,20 @@ GpStatus WINGDIPAPI GdipSaveAdd(GpImage *image, GDIPCONST EncoderParameters *par GpStatus WINGDIPAPI GdipSaveAddImage(GpImage *image, GpImage *additional_image, GDIPCONST EncoderParameters *params) { - FIXME("(%p,%p,%p): stub\n", image, additional_image, params); - return NotImplemented; + TRACE("%p, %p, %p\n", image, additional_image, params); + + if (!image || !additional_image || !params) + return InvalidParameter; + + if (!image->encoder) + return Win32Error; + + if (has_encoder_param_long(params, EncoderSaveFlag, EncoderValueFlush)) + return terminate_encoder_wic(image); + else if (has_encoder_param_long(params, EncoderSaveFlag, EncoderValueFrameDimensionPage)) + return encode_frame_wic(image->encoder, additional_image); + else + return InvalidParameter; } /***************************************************************************** diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 01d79f08c4..bbb9365edb 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -552,41 +552,41 @@ static void test_SavingMultiPageTiff(void) /* invalid params: NULL */ stat = GdipSaveAdd(0, &params); - todo_wine expect(InvalidParameter, stat); + expect(InvalidParameter, stat); stat = GdipSaveAdd((GpImage*)bm1, 0); - todo_wine expect(InvalidParameter, stat); + expect(InvalidParameter, stat); stat = GdipSaveAddImage((GpImage*)bm1, (GpImage*)bm2, 0); - todo_wine expect(InvalidParameter, stat); + expect(InvalidParameter, stat); stat = GdipSaveAddImage((GpImage*)bm1, 0, &params); - todo_wine expect(InvalidParameter, stat); + expect(InvalidParameter, stat); stat = GdipSaveAddImage(0, (GpImage*)bm2, &params); - todo_wine expect(InvalidParameter, stat); + expect(InvalidParameter, stat); /* win32 error: SaveAdd() can only be called after Save() with the MultiFrame param */ stat = GdipSaveAdd((GpImage*)bm1, &params); - todo_wine expect(Win32Error, stat); + expect(Win32Error, stat); stat = GdipSaveAddImage((GpImage*)bm1, (GpImage*)bm2, &params); - todo_wine expect(Win32Error, stat); + expect(Win32Error, stat); stat = GdipSaveImageToFile((GpImage*)bm1, filename1, &tiff_clsid, 0); /* param not set! */ expect(Ok, stat); if (stat != Ok) goto cleanup; stat = GdipSaveAdd((GpImage*)bm1, &params); - todo_wine expect(Win32Error, stat); + expect(Win32Error, stat); stat = GdipSaveAddImage((GpImage*)bm1, (GpImage*)bm2, &params); - todo_wine expect(Win32Error, stat); + expect(Win32Error, stat); /* win32 error: can't flush before starting the encoding process */ paramValue = EncoderValueFlush; stat = GdipSaveAdd((GpImage*)bm1, &params); - todo_wine expect(Win32Error, stat); + expect(Win32Error, stat); /* win32 error: can't start encoding process through SaveAdd(), only Save() */ paramValue = EncoderValueMultiFrame; stat = GdipSaveAdd((GpImage*)bm1, &params); - todo_wine expect(Win32Error, stat); + expect(Win32Error, stat); /* start encoding process: add first frame (bm1) */ paramValue = EncoderValueMultiFrame; @@ -600,7 +600,7 @@ static void test_SavingMultiPageTiff(void) /* add second frame (bm2) */ paramValue = EncoderValueFrameDimensionPage; stat = GdipSaveAddImage((GpImage*)bm1, (GpImage*)bm2, &params); - todo_wine expect(Ok, stat); + expect(Ok, stat); if (stat != Ok) goto cleanup; /* finish encoding process */

1 0

Florian Will : gdiplus: Refactor to split up encode_image_wic().
by Alexandre Julliard Feb. 19, 2020

Feb. 19, 2020

Module: wine Branch: master Commit: b31fc788122c1b47b9a9f20e4578fb08e02507e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b31fc788122c1b47b9a9f20e… Author: Florian Will <florian.will(a)gmail.com> Date: Wed Feb 19 08:47:03 2020 +0100 gdiplus: Refactor to split up encode_image_wic(). New functions initialize_encoder_wic(), encode_frame_wic() and terminate_encoder_wic() are useful for implementing GdipSaveAdd() and GdipSaveAddImage() later. The WIC encoder is now stored in the new GpImage "encoder" field instead of a local variable. This makes it possible to keep the encoder active between multiple gdiplus API calls, which is also useful for GdipSaveAdd() and GdipSaveAddImage(). Signed-off-by: Florian Will <florian.will(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 2 + dlls/gdiplus/image.c | 93 ++++++++++++++++++++++++++++++++---------- 2 files changed, 73 insertions(+), 22 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 8c4fcceded..39caf1a91e 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -72,6 +72,7 @@ extern GpStatus gdip_transform_points(GpGraphics *graphics, GpCoordinateSpace ds extern GpStatus graphics_from_image(GpImage *image, GpGraphics **graphics) DECLSPEC_HIDDEN; extern GpStatus encode_image_png(GpImage *image, IStream* stream, GDIPCONST EncoderParameters* params) DECLSPEC_HIDDEN; +extern GpStatus terminate_encoder_wic(GpImage *image) DECLSPEC_HIDDEN; extern GpStatus METAFILE_GetGraphicsContext(GpMetafile* metafile, GpGraphics **result) DECLSPEC_HIDDEN; extern GpStatus METAFILE_GetDC(GpMetafile* metafile, HDC *hdc) DECLSPEC_HIDDEN; @@ -346,6 +347,7 @@ struct GpAdjustableArrowCap{ struct GpImage{ IWICBitmapDecoder *decoder; + IWICBitmapEncoder *encoder; ImageType type; GUID format; UINT flags; diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index dcdc49c6d6..6fee7c3854 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1827,6 +1827,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, (*bitmap)->height = height; (*bitmap)->format = format; (*bitmap)->image.decoder = NULL; + (*bitmap)->image.encoder = NULL; (*bitmap)->hbitmap = hbitmap; (*bitmap)->hdc = NULL; (*bitmap)->bits = bits; @@ -2046,6 +2047,8 @@ static void move_bitmap(GpBitmap *dst, GpBitmap *src, BOOL clobber_palette) if (dst->image.decoder) IWICBitmapDecoder_Release(dst->image.decoder); dst->image.decoder = src->image.decoder; + terminate_encoder_wic(&dst->image); /* terminate active encoder before overwriting with src */ + dst->image.encoder = src->image.encoder; dst->image.frame_count = src->image.frame_count; dst->image.current_frame = src->image.current_frame; dst->image.format = src->image.format; @@ -2078,6 +2081,7 @@ static GpStatus free_image_data(GpImage *image) } if (image->decoder) IWICBitmapDecoder_Release(image->decoder); + terminate_encoder_wic(image); heap_free(image->palette); return Ok; @@ -3744,6 +3748,8 @@ static GpStatus select_frame_wic(GpImage *image, UINT active_frame) new_image->busy = image->busy; memcpy(&new_image->format, &image->format, sizeof(GUID)); + new_image->encoder = image->encoder; + image->encoder = NULL; free_image_data(image); if (image->type == ImageTypeBitmap) *(GpBitmap *)image = *(GpBitmap *)new_image; @@ -4435,13 +4441,52 @@ GpStatus WINGDIPAPI GdipSaveImageToFile(GpImage *image, GDIPCONST WCHAR* filenam * These functions encode an image in different image file formats. */ -static GpStatus encode_image_wic(GpImage *image, IStream* stream, - REFGUID container, GDIPCONST EncoderParameters* params) +static GpStatus initialize_encoder_wic(IStream *stream, REFGUID container, GpImage *image) +{ + IWICImagingFactory *factory; + HRESULT hr; + + TRACE("%p,%s\n", stream, wine_dbgstr_guid(container)); + + terminate_encoder_wic(image); /* terminate previous encoder if it exists */ + + hr = WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, &factory); + if (FAILED(hr)) return hresult_to_status(hr); + hr = IWICImagingFactory_CreateEncoder(factory, container, NULL, &image->encoder); + IWICImagingFactory_Release(factory); + if (FAILED(hr)) + { + image->encoder = NULL; + return hresult_to_status(hr); + } + + hr = IWICBitmapEncoder_Initialize(image->encoder, stream, WICBitmapEncoderNoCache); + if (FAILED(hr)) + { + IWICBitmapEncoder_Release(image->encoder); + image->encoder = NULL; + return hresult_to_status(hr); + } + return Ok; +} + +GpStatus terminate_encoder_wic(GpImage *image) +{ + if (!image->encoder) + return Ok; + else + { + HRESULT hr = IWICBitmapEncoder_Commit(image->encoder); + IWICBitmapEncoder_Release(image->encoder); + image->encoder = NULL; + return hresult_to_status(hr); + } +} + +static GpStatus encode_frame_wic(IWICBitmapEncoder *encoder, GpImage *image) { GpStatus stat; GpBitmap *bitmap; - IWICImagingFactory *factory; - IWICBitmapEncoder *encoder; IWICBitmapFrameEncode *frameencode; IPropertyBag2 *encoderoptions; HRESULT hr; @@ -4466,20 +4511,7 @@ static GpStatus encode_image_wic(GpImage *image, IStream* stream, rc.Width = width; rc.Height = height; - hr = WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, &factory); - if (FAILED(hr)) - return hresult_to_status(hr); - hr = IWICImagingFactory_CreateEncoder(factory, container, NULL, &encoder); - IWICImagingFactory_Release(factory); - if (FAILED(hr)) - return hresult_to_status(hr); - - hr = IWICBitmapEncoder_Initialize(encoder, stream, WICBitmapEncoderNoCache); - - if (SUCCEEDED(hr)) - { - hr = IWICBitmapEncoder_CreateNewFrame(encoder, &frameencode, &encoderoptions); - } + hr = IWICBitmapEncoder_CreateNewFrame(encoder, &frameencode, &encoderoptions); if (SUCCEEDED(hr)) /* created frame */ { @@ -4563,13 +4595,30 @@ static GpStatus encode_image_wic(GpImage *image, IStream* stream, IPropertyBag2_Release(encoderoptions); } - if (SUCCEEDED(hr)) - hr = IWICBitmapEncoder_Commit(encoder); - - IWICBitmapEncoder_Release(encoder); return hresult_to_status(hr); } +static GpStatus encode_image_wic(GpImage *image, IStream *stream, + REFGUID container, GDIPCONST EncoderParameters *params) +{ + GpStatus status, terminate_status; + + if (image->type != ImageTypeBitmap) + return GenericError; + + status = initialize_encoder_wic(stream, container, image); + + if (status == Ok) + status = encode_frame_wic(image->encoder, image); + + /* always try to terminate, but if something already failed earlier, keep the old status. */ + terminate_status = terminate_encoder_wic(image); + if (status == Ok) + status = terminate_status; + + return status; +} + static GpStatus encode_image_BMP(GpImage *image, IStream* stream, GDIPCONST EncoderParameters* params) {

1 0

Florian Will : gdiplus: Add GdipSaveAddImage() stub.
by Alexandre Julliard Feb. 19, 2020

Feb. 19, 2020

Module: wine Branch: master Commit: 483aaf33085db4e2f0d900f9871e1aae2fecccd3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=483aaf33085db4e2f0d900f9… Author: Florian Will <florian.will(a)gmail.com> Date: Wed Feb 19 08:47:05 2020 +0100 gdiplus: Add GdipSaveAddImage() stub. Also update the GdipSaveAdd() stub to return NotImplemented instead of silently failing. Signed-off-by: Florian Will <florian.will(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 22 +++++++++++++++++++++- include/gdiplusflat.h | 2 ++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 11866633b3..43dc0a82d2 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -472,7 +472,7 @@ 472 stdcall GdipRotateTextureTransform(ptr float long) 473 stdcall GdipRotateWorldTransform(ptr float long) 474 stdcall GdipSaveAdd(ptr ptr) -475 stub GdipSaveAddImage +475 stdcall GdipSaveAddImage(ptr ptr ptr) 476 stdcall GdipSaveGraphics(ptr ptr) 477 stdcall GdipSaveImageToFile(ptr wstr ptr ptr) 478 stdcall GdipSaveImageToStream(ptr ptr ptr ptr) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 6fee7c3854..94c03ede19 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -4681,11 +4681,31 @@ GpStatus WINGDIPAPI GdipSaveImageToStream(GpImage *image, IStream* stream, /***************************************************************************** * GdipSaveAdd [GDIPLUS.@] + * + * Like GdipSaveAddImage(), but encode the currently active frame of the given image into the file + * or stream that is currently being encoded. */ GpStatus WINGDIPAPI GdipSaveAdd(GpImage *image, GDIPCONST EncoderParameters *params) { FIXME("(%p,%p): stub\n", image, params); - return Ok; + return NotImplemented; +} + +/***************************************************************************** + * GdipSaveAddImage [GDIPLUS.@] + * + * Encode the currently active frame of additional_image into the file or stream that is currently + * being encoded by the image given in the image parameter. The first frame of a multi-frame image + * must be encoded using the normal GdipSaveImageToStream() or GdipSaveImageToFile() functions, + * but with the "MultiFrame" encoding parameter set. The multi-frame encoding process must be + * finished after adding the last frame by calling GdipSaveAdd() with the "Flush" encoding parameter + * set. + */ +GpStatus WINGDIPAPI GdipSaveAddImage(GpImage *image, GpImage *additional_image, + GDIPCONST EncoderParameters *params) +{ + FIXME("(%p,%p,%p): stub\n", image, additional_image, params); + return NotImplemented; } /***************************************************************************** diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 1e26c0a9d5..ed0f498483 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -433,6 +433,8 @@ GpStatus WINGDIPAPI GdipRemovePropertyItem(GpImage*,PROPID); GpStatus WINGDIPAPI GdipSaveImageToFile(GpImage*,GDIPCONST WCHAR*,GDIPCONST CLSID*,GDIPCONST EncoderParameters*); GpStatus WINGDIPAPI GdipSaveImageToStream(GpImage*,IStream*, GDIPCONST CLSID*,GDIPCONST EncoderParameters*); +GpStatus WINGDIPAPI GdipSaveAdd(GpImage*,GDIPCONST EncoderParameters*); +GpStatus WINGDIPAPI GdipSaveAddImage(GpImage*,GpImage*,GDIPCONST EncoderParameters*); GpStatus WINGDIPAPI GdipSetImagePalette(GpImage*,GDIPCONST ColorPalette*); GpStatus WINGDIPAPI GdipSetPropertyItem(GpImage*,GDIPCONST PropertyItem*);

1 0

Zebediah Figura : qasf/dmowrapper: Create sink and source pins for each stream.
by Alexandre Julliard Feb. 19, 2020

Feb. 19, 2020

Module: wine Branch: master Commit: 8bc81fcad8e883443f5be0424b6beeb23dc060c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bc81fcad8e883443f5be042… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 18 23:19:07 2020 -0600 qasf/dmowrapper: Create sink and source pins for each stream. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qasf/dmowrapper.c | 166 ++++++++++++++ dlls/qasf/tests/Makefile.in | 2 +- dlls/qasf/tests/dmowrapper.c | 518 ++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 677 insertions(+), 9 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8bc81fcad8e883443f5b…

1 0

Jeff Smith : gdiplus: Fix LineCapRound path widening.
by Alexandre Julliard Feb. 19, 2020

Feb. 19, 2020

Module: wine Branch: master Commit: 26ffbf6b8c8bce461b1387e93e31e2d3aab25581 URL: https://source.winehq.org/git/wine.git/?a=commit;h=26ffbf6b8c8bce461b1387e9… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Tue Feb 18 23:51:57 2020 -0600 gdiplus: Fix LineCapRound path widening. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphicspath.c | 2 ++ dlls/gdiplus/tests/graphicspath.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 7ec6061cb4..5ea82f4d0e 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1955,6 +1955,8 @@ static void widen_cap(const GpPointF *endpoint, const GpPointF *nextpoint, *last_point = add_path_list_node(*last_point, endpoint->X - dy, endpoint->Y + dx, PathPointTypeBezier); } + else if (add_last_point) + add_bevel_point(endpoint, nextpoint, pen, 0, last_point); break; } case LineCapTriangle: diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index e12d9e2c49..91b83166ad 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -1260,8 +1260,8 @@ static path_test_t widenline_capsquare_path[] = { }; static path_test_t widenline_capround_path[] = { - {5.0, 5.0, PathPointTypeStart, 0, 2}, /*0*/ - {50.0, 5.0, PathPointTypeLine, 0, 1}, /*1*/ + {5.0, 5.0, PathPointTypeStart, 0, 0}, /*0*/ + {50.0, 5.0, PathPointTypeLine, 0, 0}, /*1*/ {52.761421, 5.0, PathPointTypeBezier, 0, 0}, /*2*/ {55.0, 7.238576, PathPointTypeBezier, 0, 0}, /*3*/ {55.0, 10.0, PathPointTypeBezier, 0, 0}, /*4*/ @@ -1379,7 +1379,7 @@ static void test_widen_cap(void) { LineCapSquare, widenline_capsquare_path, ARRAY_SIZE(widenline_capsquare_path) }, { LineCapRound, widenline_capround_path, - ARRAY_SIZE(widenline_capround_path), TRUE }, + ARRAY_SIZE(widenline_capround_path) }, { LineCapTriangle, widenline_captriangle_path, ARRAY_SIZE(widenline_captriangle_path), TRUE }, { LineCapNoAnchor, widenline_capflat_path,

1 0

Jeff Smith : gdiplus: Fix LineCapTriangle path widening.
by Alexandre Julliard Feb. 19, 2020

Feb. 19, 2020

Module: wine Branch: master Commit: b3a68db9a0dbb1c1f984a09a1db98bc4205c9ea8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3a68db9a0dbb1c1f984a09a… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Tue Feb 18 23:51:58 2020 -0600 gdiplus: Fix LineCapTriangle path widening. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphicspath.c | 2 +- dlls/gdiplus/tests/graphicspath.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 5ea82f4d0e..96078c3da9 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1976,7 +1976,7 @@ static void widen_cap(const GpPointF *endpoint, const GpPointF *nextpoint, *last_point = add_path_list_node(*last_point, endpoint->X - dx, endpoint->Y - dy, PathPointTypeLine); } - if (add_last_point) + if (add_first_points || add_last_point) add_bevel_point(endpoint, nextpoint, pen, 0, last_point); break; } diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 91b83166ad..b840801739 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -1283,8 +1283,8 @@ static path_test_t widenline_captriangle_path[] = { {55.0, 10.0, PathPointTypeLine, 0, 0}, /*2*/ {50.0, 15.0, PathPointTypeLine, 0, 0}, /*3*/ {5.0, 15.0, PathPointTypeLine, 0, 0}, /*4*/ - {0.0, 10.0, PathPointTypeLine, 0, 1}, /*5*/ - {5.0, 5.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 2} /*6*/ + {0.0, 10.0, PathPointTypeLine, 0, 0}, /*5*/ + {5.0, 5.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0} /*6*/ }; static path_test_t widenline_capsquareanchor_path[] = { @@ -1381,7 +1381,7 @@ static void test_widen_cap(void) { LineCapRound, widenline_capround_path, ARRAY_SIZE(widenline_capround_path) }, { LineCapTriangle, widenline_captriangle_path, - ARRAY_SIZE(widenline_captriangle_path), TRUE }, + ARRAY_SIZE(widenline_captriangle_path) }, { LineCapNoAnchor, widenline_capflat_path, ARRAY_SIZE(widenline_capflat_path) }, { LineCapSquareAnchor, widenline_capsquareanchor_path,

1 0