March 2015 - Wine-commits - list.winehq.org

Alexandre Julliard : msvcp60: Move string iterator functions to match msvcp90.
by Alexandre Julliard 13 Mar '15

13 Mar '15

Module: wine Branch: master Commit: e38ae09043127f14a1138e96fc841e8cd3fa273e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e38ae09043127f14a1138e96f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 13 15:24:20 2015 +0900 msvcp60: Move string iterator functions to match msvcp90. --- dlls/msvcp60/string.c | 654 +++++++++++++++++++++++++------------------------- 1 file changed, 328 insertions(+), 326 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e38ae09043127f14a1138…

1 0

Alexandre Julliard : msvcp60: Merge the char_traits functions with msvcp90.
by Alexandre Julliard 13 Mar '15

13 Mar '15

Module: wine Branch: master Commit: 3a55206787d2cc7836193847a3f120a9916c5012 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a55206787d2cc7836193847a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 13 15:37:47 2015 +0900 msvcp60: Merge the char_traits functions with msvcp90. --- dlls/msvcp60/string.c | 321 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 193 insertions(+), 128 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3a55206787d2cc7836193…

1 0

Ken Thomases : winemac: When exiting Cocoa full-screen mode for a no-longer-eligible window, bypass the override of -toggleFullScreen:.
by Alexandre Julliard 13 Mar '15

13 Mar '15

Module: wine Branch: master Commit: 4af5d5bd99737345a1a6452da1e8fefe909f8bc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4af5d5bd99737345a1a6452da… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Mar 12 18:44:44 2015 -0500 winemac: When exiting Cocoa full-screen mode for a no-longer-eligible window, bypass the override of -toggleFullScreen:. The override checks the disabled state of the window, but that's for user- driven changes, not programmatic changes. --- dlls/winemac.drv/cocoa_window.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index a937d5d..8a02ff4 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -709,7 +709,7 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif behavior &= ~NSWindowCollectionBehaviorFullScreenPrimary; behavior |= NSWindowCollectionBehaviorFullScreenAuxiliary; if (style & NSFullScreenWindowMask) - [self toggleFullScreen:nil]; + [super toggleFullScreen:nil]; } }

1 0

Ken Thomases : winemac: Prevent maximized windows from entering Cocoa full-screen mode.
by Alexandre Julliard 13 Mar '15

13 Mar '15

Module: wine Branch: master Commit: 14a0fc3cccc682796d3788f19f6195f1a9530852 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14a0fc3cccc682796d3788f19… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Mar 12 18:45:25 2015 -0500 winemac: Prevent maximized windows from entering Cocoa full-screen mode. OS X doesn't really have the concept of windows being maximized; that is, being in a mode where they can't be moved or resized. As a consequence, it doesn't have a button in the window title bar to restore a maximized window to normal. So, when a Wine window is maximized, the Mac driver hijacks the green zoom button to act as a restore button. (When a window is zoomed, the green button "unzooms" back to its last user size and position, so it's analogous.) However, with OS X 10.10 (Yosemite), the green button prefers to act as a toggle for the Cocoa full-screen mode rather than zooming and unzooming. This made it difficult for users to restore a maximized window. They would have to Option-click the green button, double-click the title bar, or choose Zoom from the Window menu, none of which is obvious. The fix is to disable Cocoa full-screen mode for maximized windows. Then, the green button reverts to unzoom and restoring the window. --- dlls/winemac.drv/cocoa_window.m | 44 ++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 8a02ff4..7f71fea 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -699,7 +699,7 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif NSUInteger style = [self styleMask]; if (behavior & NSWindowCollectionBehaviorParticipatesInCycle && - style & NSResizableWindowMask && !(style & NSUtilityWindowMask)) + style & NSResizableWindowMask && !(style & NSUtilityWindowMask) && !maximized) { behavior |= NSWindowCollectionBehaviorFullScreenPrimary; behavior &= ~NSWindowCollectionBehaviorFullScreenAuxiliary; @@ -852,25 +852,6 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif [[WineApplicationController sharedController] adjustWindowLevels]; } - behavior = NSWindowCollectionBehaviorDefault; - if (state->excluded_by_expose) - behavior |= NSWindowCollectionBehaviorTransient; - else - behavior |= NSWindowCollectionBehaviorManaged; - if (state->excluded_by_cycle) - { - behavior |= NSWindowCollectionBehaviorIgnoresCycle; - if ([self isOrderedIn]) - [NSApp removeWindowsItem:self]; - } - else - { - behavior |= NSWindowCollectionBehaviorParticipatesInCycle; - if ([self isOrderedIn]) - [NSApp addWindowsItem:self title:[self title] filename:NO]; - } - [self adjustFullScreenBehavior:behavior]; - if (state->minimized_valid) { macdrv_event_mask discard = event_mask_for_type(WINDOW_DID_UNMINIMIZE); @@ -912,6 +893,25 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif maximized = state->maximized; [self adjustFeaturesForState]; } + + behavior = NSWindowCollectionBehaviorDefault; + if (state->excluded_by_expose) + behavior |= NSWindowCollectionBehaviorTransient; + else + behavior |= NSWindowCollectionBehaviorManaged; + if (state->excluded_by_cycle) + { + behavior |= NSWindowCollectionBehaviorIgnoresCycle; + if ([self isOrderedIn]) + [NSApp removeWindowsItem:self]; + } + else + { + behavior |= NSWindowCollectionBehaviorParticipatesInCycle; + if ([self isOrderedIn]) + [NSApp addWindowsItem:self title:[self title] filename:NO]; + } + [self adjustFullScreenBehavior:behavior]; } - (BOOL) addChildWineWindow:(WineWindow*)child assumeVisible:(BOOL)assumeVisible @@ -1570,7 +1570,7 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif if ([menuItem action] == @selector(makeKeyAndOrderFront:)) ret = [self isKeyWindow] || (!self.disabled && !self.noActivate); - if ([menuItem action] == @selector(toggleFullScreen:) && self.disabled) + if ([menuItem action] == @selector(toggleFullScreen:) && (self.disabled || maximized)) ret = NO; return ret; @@ -1609,7 +1609,7 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif - (void) toggleFullScreen:(id)sender { - if (!self.disabled) + if (!self.disabled && !maximized) [super toggleFullScreen:sender]; }

1 0

Daniel Lehman : wininet: Accept Version in cookies.
by Alexandre Julliard 13 Mar '15

13 Mar '15

Module: wine Branch: master Commit: e889dd8eaac42019b2c7a34f52d1c6178a514cad URL: http://source.winehq.org/git/wine.git/?a=commit;h=e889dd8eaac42019b2c7a34f5… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Mar 12 23:18:14 2015 -0700 wininet: Accept Version in cookies. --- dlls/wininet/cookie.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index fe0615a..af9dcdf 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -943,6 +943,7 @@ DWORD set_cookie(const WCHAR *domain, const WCHAR *path, const WCHAR *cookie_nam static const WCHAR szExpires[] = {'e','x','p','i','r','e','s','=',0}; static const WCHAR szSecure[] = {'s','e','c','u','r','e',0}; static const WCHAR szHttpOnly[] = {'h','t','t','p','o','n','l','y',0}; + static const WCHAR szVersion[] = {'v','e','r','s','i','o','n','=',0}; if (!(ptr = strchrW(ptr,';'))) break; *ptr++ = 0; @@ -1023,6 +1024,11 @@ DWORD set_cookie(const WCHAR *domain, const WCHAR *path, const WCHAR *cookie_nam cookie_flags |= INTERNET_COOKIE_HTTPONLY; ptr += strlenW(szHttpOnly); } + else if (strncmpiW(ptr, szVersion, 8) == 0) + { + FIXME("version not handled (%s)\n",debugstr_w(ptr)); + ptr += strlenW(szVersion); + } else if (*ptr) { FIXME("Unknown additional option %s\n",debugstr_w(ptr));

1 0

Piotr Caban : gdiplus: Don' t create new instance of IWICBitmapDecoder to encode every frame of animation.
by Alexandre Julliard 13 Mar '15

13 Mar '15

Module: wine Branch: master Commit: a1819978557f974a88cf8b56f753aa54972b9e67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1819978557f974a88cf8b56f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 12 10:17:03 2015 +0100 gdiplus: Don't create new instance of IWICBitmapDecoder to encode every frame of animation. --- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/image.c | 197 ++++++++++++++++++++++++++--------------- 2 files changed, 128 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a1819978557f974a88cf8…

1 0

Piotr Caban : windowscodecs: Store stream reference in gif decoder.
by Alexandre Julliard 13 Mar '15

13 Mar '15

Module: wine Branch: master Commit: b68112338577ed80424046ce0341ccef249c147c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b68112338577ed80424046ce0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 12 10:17:12 2015 +0100 windowscodecs: Store stream reference in gif decoder. --- dlls/windowscodecs/gifformat.c | 5 +++++ dlls/windowscodecs/tests/gifformat.c | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index 7fccb5e..3a82c09 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -578,6 +578,7 @@ static HRESULT create_metadata_reader(const void *data, int data_size, typedef struct { IWICBitmapDecoder IWICBitmapDecoder_iface; IWICMetadataBlockReader IWICMetadataBlockReader_iface; + IStream *stream; BYTE LSD_data[13]; /* Logical Screen Descriptor */ LONG ref; BOOL initialized; @@ -1054,6 +1055,7 @@ static ULONG WINAPI GifDecoder_Release(IWICBitmapDecoder *iface) if (ref == 0) { + IStream_Release(This->stream); This->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->lock); DGifCloseFile(This->gif); @@ -1141,6 +1143,9 @@ static HRESULT WINAPI GifDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p IStream_Seek(pIStream, seek, STREAM_SEEK_SET, NULL); IStream_Read(pIStream, This->LSD_data, sizeof(This->LSD_data), NULL); + This->stream = pIStream; + IStream_AddRef(This->stream); + This->initialized = TRUE; LeaveCriticalSection(&This->lock); diff --git a/dlls/windowscodecs/tests/gifformat.c b/dlls/windowscodecs/tests/gifformat.c index 2925911..863a91f 100644 --- a/dlls/windowscodecs/tests/gifformat.c +++ b/dlls/windowscodecs/tests/gifformat.c @@ -67,6 +67,7 @@ static IWICBitmapDecoder *create_decoder(const void *image_data, UINT image_size IWICBitmapDecoder *decoder = NULL; IStream *stream; GUID format; + LONG refcount; hmem = GlobalAlloc(0, image_size); data = GlobalLock(hmem); @@ -84,7 +85,8 @@ static IWICBitmapDecoder *create_decoder(const void *image_data, UINT image_size ok(IsEqualGUID(&format, &GUID_ContainerFormatGif), "wrong container format %s\n", wine_dbgstr_guid(&format)); - IStream_Release(stream); + refcount = IStream_Release(stream); + ok(refcount > 0, "expected stream refcount > 0\n"); return decoder; }

1 0

Piotr Caban : windowscodecs: Store stream reference in png decoder.
by Alexandre Julliard 13 Mar '15

13 Mar '15

Module: wine Branch: master Commit: 531992c760a34b2bb38d43b53f021a4440343a41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=531992c760a34b2bb38d43b53… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 12 10:17:19 2015 +0100 windowscodecs: Store stream reference in png decoder. --- dlls/windowscodecs/pngformat.c | 5 +++++ dlls/windowscodecs/tests/pngformat.c | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 59b1976..260330f 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -296,6 +296,7 @@ typedef struct { IWICBitmapFrameDecode IWICBitmapFrameDecode_iface; IWICMetadataBlockReader IWICMetadataBlockReader_iface; LONG ref; + IStream *stream; png_structp png_ptr; png_infop info_ptr; png_infop end_info; @@ -366,6 +367,7 @@ static ULONG WINAPI PngDecoder_Release(IWICBitmapDecoder *iface) if (ref == 0) { + IStream_Release(This->stream); if (This->png_ptr) ppng_destroy_read_struct(&This->png_ptr, &This->info_ptr, &This->end_info); This->lock.DebugInfo->Spare[0] = 0; @@ -605,6 +607,9 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p ppng_read_end(This->png_ptr, This->end_info); + This->stream = pIStream; + IStream_AddRef(This->stream); + This->initialized = TRUE; end: diff --git a/dlls/windowscodecs/tests/pngformat.c b/dlls/windowscodecs/tests/pngformat.c index af50daa..bf370a3 100644 --- a/dlls/windowscodecs/tests/pngformat.c +++ b/dlls/windowscodecs/tests/pngformat.c @@ -283,6 +283,7 @@ static IWICBitmapDecoder *create_decoder(const void *image_data, UINT image_size IWICBitmapDecoder *decoder = NULL; IStream *stream; GUID format; + LONG refcount; hmem = GlobalAlloc(0, image_size); data = GlobalLock(hmem); @@ -300,7 +301,8 @@ static IWICBitmapDecoder *create_decoder(const void *image_data, UINT image_size ok(IsEqualGUID(&format, &GUID_ContainerFormatPng), "wrong container format %s\n", wine_dbgstr_guid(&format)); - IStream_Release(stream); + refcount = IStream_Release(stream); + ok(refcount > 0, "expected stream refcount > 0\n"); return decoder; }

1 0

Piotr Caban : gdiplus: Don't store stream reference in GpImage, it' s done by IWICBitmapDecoder.
by Alexandre Julliard 13 Mar '15

13 Mar '15

Module: wine Branch: master Commit: b3a9c698e855d7212f37400a6bb3bf1988e5ad94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3a9c698e855d7212f37400a6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 12 10:17:25 2015 +0100 gdiplus: Don't store stream reference in GpImage, it's done by IWICBitmapDecoder. --- dlls/gdiplus/gdiplus_private.h | 1 - dlls/gdiplus/image.c | 42 ++++++++++++++++++++++-------------------- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 1d53da1..0d62eef 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -270,7 +270,6 @@ struct GpAdustableArrowCap{ struct GpImage{ IPicture *picture; - IStream *stream; /* source stream */ IWICBitmapDecoder *decoder; ImageType type; GUID format; diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 07eb07e..36502d7 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1871,7 +1871,6 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, (*bitmap)->height = height; (*bitmap)->format = format; (*bitmap)->image.picture = NULL; - (*bitmap)->image.stream = NULL; (*bitmap)->image.decoder = NULL; (*bitmap)->hbitmap = hbitmap; (*bitmap)->hdc = NULL; @@ -2089,9 +2088,6 @@ static void move_bitmap(GpBitmap *dst, GpBitmap *src, BOOL clobber_palette) GdipFree(dst->prop_item); dst->prop_item = src->prop_item; dst->prop_count = src->prop_count; - if (dst->image.stream) - IStream_Release(dst->image.stream); - dst->image.stream = src->image.stream; if (dst->image.decoder) IWICBitmapDecoder_Release(dst->image.decoder); dst->image.decoder = src->image.decoder; @@ -2140,8 +2136,6 @@ static GpStatus free_image_data(GpImage *image) } if (image->picture) IPicture_Release(image->picture); - if (image->stream) - IStream_Release(image->stream); if (image->decoder) IWICBitmapDecoder_Release(image->decoder); GdipFree(image->palette); @@ -3427,7 +3421,7 @@ static GpStatus initialize_decoder_wic(IStream *stream, REFGUID container, IWICB typedef void (*metadata_reader_func)(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UINT frame); -static GpStatus decode_frame_wic(IStream *stream, IWICBitmapDecoder *decoder, +static GpStatus decode_frame_wic(IWICBitmapDecoder *decoder, UINT active_frame, metadata_reader_func metadata_reader, GpImage **image) { GpStatus status=Ok; @@ -3556,7 +3550,6 @@ static GpStatus decode_frame_wic(IStream *stream, IWICBitmapDecoder *decoder, bitmap->image.flags |= ImageFlagsReadOnly|ImageFlagsHasRealPixelSize|ImageFlagsHasRealDPI|ImageFlagsColorSpaceRGB; bitmap->image.frame_count = frame_count; bitmap->image.current_frame = active_frame; - bitmap->image.stream = stream; bitmap->image.decoder = decoder; IWICBitmapDecoder_AddRef(decoder); if (palette) @@ -3569,8 +3562,6 @@ static GpStatus decode_frame_wic(IStream *stream, IWICBitmapDecoder *decoder, if (IsEqualGUID(&wic_format, &GUID_WICPixelFormatBlackWhite)) bitmap->image.palette->Flags = 0; } - /* Pin the source stream */ - IStream_AddRef(stream); TRACE("=> %p\n", *image); } @@ -3587,7 +3578,7 @@ static GpStatus decode_image_wic(IStream *stream, REFGUID container, if(status != Ok) return status; - status = decode_frame_wic(stream, decoder, 0, metadata_reader, image); + status = decode_frame_wic(decoder, 0, metadata_reader, image); IWICBitmapDecoder_Release(decoder); return status; } @@ -3597,7 +3588,7 @@ static GpStatus select_frame_wic(GpImage *image, UINT active_frame) GpImage *new_image; GpStatus status; - status = decode_frame_wic(image->stream, image->decoder, active_frame, NULL, &new_image); + status = decode_frame_wic(image->decoder, active_frame, NULL, &new_image); if(status != Ok) return status; @@ -3617,7 +3608,7 @@ static GpStatus select_frame_gif(GpImage *image, UINT active_frame) GpImage *new_image; GpStatus status; - status = decode_frame_wic(image->stream, image->decoder, active_frame, gif_metadata_reader, &new_image); + status = decode_frame_wic(image->decoder, active_frame, gif_metadata_reader, &new_image); if(status != Ok) return status; @@ -3782,6 +3773,23 @@ static GpStatus get_decoder_info(IStream* stream, const struct image_codec **res return GenericError; } +static GpStatus get_decoder_info_from_image(GpImage *image, const struct image_codec **result) +{ + int i; + + for (i = 0; i < NUM_CODECS; i++) { + if ((codecs[i].info.Flags & ImageCodecFlagsDecoder) && + IsEqualIID(&codecs[i].info.FormatID, &image->format)) + { + *result = &codecs[i]; + return Ok; + } + } + + TRACE("no match for format: %s\n", wine_dbgstr_guid(&image->format)); + return GenericError; +} + GpStatus WINGDIPAPI GdipImageSelectActiveFrame(GpImage *image, GDIPCONST GUID *dimensionID, UINT frame) { @@ -3808,12 +3816,6 @@ GpStatus WINGDIPAPI GdipImageSelectActiveFrame(GpImage *image, GDIPCONST GUID *d if (image->current_frame == frame) return Ok; - if (!image->stream) - { - TRACE("image doesn't have an associated stream\n"); - return Ok; - } - if (!image->decoder) { TRACE("image doesn't have an associated decoder\n"); @@ -3821,7 +3823,7 @@ GpStatus WINGDIPAPI GdipImageSelectActiveFrame(GpImage *image, GDIPCONST GUID *d } /* choose an appropriate image decoder */ - stat = get_decoder_info(image->stream, &codec); + stat = get_decoder_info_from_image(image, &codec); if (stat != Ok) { WARN("can't find decoder info\n");

1 0

Piotr Caban : gdiplus: Convert animated gif to PixelFormat32bppARGB on load.
by Alexandre Julliard 13 Mar '15

13 Mar '15

Module: wine Branch: master Commit: 799362a0b7afa59d8238ed1536d791088f6cee9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=799362a0b7afa59d8238ed153… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 12 10:17:34 2015 +0100 gdiplus: Convert animated gif to PixelFormat32bppARGB on load. --- dlls/gdiplus/image.c | 55 ++++++++++++++++++++++++++++++++-------------- dlls/gdiplus/tests/image.c | 16 ++++++++++++++ 2 files changed, 55 insertions(+), 16 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 36502d7..409a3c6 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3421,7 +3421,7 @@ static GpStatus initialize_decoder_wic(IStream *stream, REFGUID container, IWICB typedef void (*metadata_reader_func)(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UINT frame); -static GpStatus decode_frame_wic(IWICBitmapDecoder *decoder, +static GpStatus decode_frame_wic(IWICBitmapDecoder *decoder, BOOL force_conversion, UINT active_frame, metadata_reader_func metadata_reader, GpImage **image) { GpStatus status=Ok; @@ -3449,25 +3449,25 @@ static GpStatus decode_frame_wic(IWICBitmapDecoder *decoder, if (SUCCEEDED(hr)) { - IWICBitmapSource *bmp_source; - IWICBitmapFrameDecode_QueryInterface(frame, &IID_IWICBitmapSource, (void **)&bmp_source); - - for (i=0; pixel_formats[i].wic_format; i++) + if (!force_conversion) { - if (IsEqualGUID(&wic_format, pixel_formats[i].wic_format)) + for (i=0; pixel_formats[i].wic_format; i++) { - source = bmp_source; - gdip_format = pixel_formats[i].gdip_format; - palette_type = pixel_formats[i].palette_type; - break; + if (IsEqualGUID(&wic_format, pixel_formats[i].wic_format)) + { + source = (IWICBitmapSource*)frame; + IWICBitmapSource_AddRef(source); + gdip_format = pixel_formats[i].gdip_format; + palette_type = pixel_formats[i].palette_type; + break; + } } } if (!source) { /* unknown format; fall back on 32bppARGB */ - hr = WICConvertBitmapSource(&GUID_WICPixelFormat32bppBGRA, bmp_source, &source); + hr = WICConvertBitmapSource(&GUID_WICPixelFormat32bppBGRA, (IWICBitmapSource*)frame, &source); gdip_format = PixelFormat32bppARGB; - IWICBitmapSource_Release(bmp_source); } TRACE("%s => %#x\n", wine_dbgstr_guid(&wic_format), gdip_format); } @@ -3578,7 +3578,7 @@ static GpStatus decode_image_wic(IStream *stream, REFGUID container, if(status != Ok) return status; - status = decode_frame_wic(decoder, 0, metadata_reader, image); + status = decode_frame_wic(decoder, FALSE, 0, metadata_reader, image); IWICBitmapDecoder_Release(decoder); return status; } @@ -3588,7 +3588,7 @@ static GpStatus select_frame_wic(GpImage *image, UINT active_frame) GpImage *new_image; GpStatus status; - status = decode_frame_wic(image->decoder, active_frame, NULL, &new_image); + status = decode_frame_wic(image->decoder, FALSE, active_frame, NULL, &new_image); if(status != Ok) return status; @@ -3608,7 +3608,7 @@ static GpStatus select_frame_gif(GpImage *image, UINT active_frame) GpImage *new_image; GpStatus status; - status = decode_frame_wic(image->decoder, active_frame, gif_metadata_reader, &new_image); + status = decode_frame_wic(image->decoder, TRUE, active_frame, gif_metadata_reader, &new_image); if(status != Ok) return status; @@ -3658,7 +3658,30 @@ static GpStatus decode_image_png(IStream* stream, GpImage **image) static GpStatus decode_image_gif(IStream* stream, GpImage **image) { - return decode_image_wic(stream, &GUID_ContainerFormatGif, gif_metadata_reader, image); + IWICBitmapDecoder *decoder; + UINT frame_count; + GpStatus status; + HRESULT hr; + + status = initialize_decoder_wic(stream, &GUID_ContainerFormatGif, &decoder); + if(status != Ok) + return status; + + hr = IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); + if(FAILED(hr)) + return hresult_to_status(hr); + + status = decode_frame_wic(decoder, frame_count>1 ? TRUE : FALSE, + 0, gif_metadata_reader, image); + IWICBitmapDecoder_Release(decoder); + if(status != Ok) + return status; + + if(frame_count > 1) { + GdipFree((*image)->palette); + (*image)->palette = NULL; + } + return Ok; } static GpStatus decode_image_tiff(IStream* stream, GpImage **image) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index fe80bd6..f33cb90 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -2434,6 +2434,8 @@ static void test_multiframegif(void) ARGB color; UINT count; GUID dimension; + PixelFormat pixel_format; + INT palette_size; /* Test frame functions with an animated GIF */ hglob = GlobalAlloc (0, sizeof(gifanimation)); @@ -2452,6 +2454,16 @@ static void test_multiframegif(void) return; } + stat = GdipGetImagePixelFormat((GpImage*)bmp, &pixel_format); + expect(Ok, stat); + expect(PixelFormat32bppARGB, pixel_format); + + stat = GdipGetImagePaletteSize((GpImage*)bmp, &palette_size); + expect(Ok, stat); + ok(palette_size == sizeof(ColorPalette) || + broken(palette_size == sizeof(ColorPalette)+sizeof(ARGB[3])), + "palette_size = %d\n", palette_size); + /* Bitmap starts at frame 0 */ color = 0xdeadbeef; stat = GdipBitmapGetPixel(bmp, 0, 0, &color); @@ -2543,6 +2555,10 @@ static void test_multiframegif(void) return; } + stat = GdipGetImagePixelFormat((GpImage*)bmp, &pixel_format); + expect(Ok, stat); + expect(PixelFormat8bppIndexed, pixel_format); + /* Check metadata */ stat = GdipImageGetFrameDimensionsCount((GpImage*)bmp,&count); expect(Ok, stat);

1 0