July 2012 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Get rid of the GL extension function pointer typedefs.
by Alexandre Julliard 25 Jul '12

25 Jul '12

Module: wine Branch: master Commit: 4b90d7947393f8d1bc6352c51fcee2ff5956646a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b90d7947393f8d1bc6352c51… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 24 11:32:25 2012 +0200 wined3d: Get rid of the GL extension function pointer typedefs. --- dlls/wined3d/wined3d_gl.h | 562 ---------------------------------------- dlls/wined3d/wined3d_private.h | 46 ++-- 2 files changed, 27 insertions(+), 581 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4b90d7947393f8d1bc635…

1 0

Henri Verbeet : wined3d: Pass a gl_info structure to fragment_pipeline. enable_extension().
by Alexandre Julliard 25 Jul '12

25 Jul '12

Module: wine Branch: master Commit: af1ba676c84b378166e8ef26c4a6bd88c667aa96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af1ba676c84b378166e8ef26c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 24 11:32:26 2012 +0200 wined3d: Pass a gl_info structure to fragment_pipeline.enable_extension(). --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/ati_fragment_shader.c | 2 +- dlls/wined3d/context.c | 13 ++++++------- dlls/wined3d/nvidia_texture_shader.c | 6 +++--- dlls/wined3d/state.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 6 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 85f51d2..4a4fdc8 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5585,7 +5585,7 @@ struct arbfp_ffp_desc }; /* Context activation and GL locking are done by the caller. */ -static void arbfp_enable(BOOL enable) +static void arbfp_enable(const struct wined3d_gl_info *gl_info, BOOL enable) { if(enable) { glEnable(GL_FRAGMENT_PROGRAM_ARB); diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 680367a..4d77e1d 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -1093,7 +1093,7 @@ static const struct StateEntryTemplate atifs_fragmentstate_template[] = { }; /* Context activation and GL locking are done by the caller. */ -static void atifs_enable(BOOL enable) +static void atifs_enable(const struct wined3d_gl_info *gl_info, BOOL enable) { if(enable) { glEnable(GL_FRAGMENT_SHADER_ATI); diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e53936f..24f812d 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1569,7 +1569,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, { GL_EXTCALL(glProvokingVertexEXT(GL_FIRST_VERTEX_CONVENTION_EXT)); } - device->frag_pipe->enable_extension(TRUE); + device->frag_pipe->enable_extension(gl_info, TRUE); /* If this happens to be the first context for the device, dummy textures * are not created yet. In that case, they will be created (and bound) by @@ -1866,7 +1866,7 @@ static void SetupForBlit(const struct wined3d_device *device, struct wined3d_con context_invalidate_state(context, STATE_RENDER(WINED3D_RS_CLIPPING)); set_blit_dimension(rt_size.cx, rt_size.cy); - device->frag_pipe->enable_extension(FALSE); + device->frag_pipe->enable_extension(gl_info, FALSE); LEAVE_GL(); @@ -2139,6 +2139,7 @@ static BOOL context_validate_rt_config(UINT rt_count, BOOL context_apply_clear_state(struct wined3d_context *context, const struct wined3d_device *device, UINT rt_count, const struct wined3d_fb_state *fb) { + const struct wined3d_gl_info *gl_info = context->gl_info; DWORD rt_mask = 0, *cur_mask; UINT i; struct wined3d_surface **rts = fb->render_targets; @@ -2221,7 +2222,7 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win if (context->last_was_blit) { - device->frag_pipe->enable_extension(TRUE); + device->frag_pipe->enable_extension(gl_info, TRUE); context->last_was_blit = FALSE; } @@ -2349,9 +2350,7 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de ENTER_GL(); if (context->last_was_blit) - { - device->frag_pipe->enable_extension(TRUE); - } + device->frag_pipe->enable_extension(context->gl_info, TRUE); for (i = 0; i < context->numDirtyEntries; ++i) { @@ -2491,7 +2490,7 @@ struct wined3d_context *context_acquire(const struct wined3d_device *device, str else { ENTER_GL(); - device->frag_pipe->enable_extension(!context->last_was_blit); + device->frag_pipe->enable_extension(context->gl_info, !context->last_was_blit); LEAVE_GL(); } } diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index 48eacd5..35dd6ac 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -630,7 +630,7 @@ static void nvrc_texfactor(struct wined3d_context *context, const struct wined3d } /* Context activation is done by the caller. */ -static void nvrc_enable(BOOL enable) +static void nvrc_enable(const struct wined3d_gl_info *gl_info, BOOL enable) { if (enable) { @@ -645,9 +645,9 @@ static void nvrc_enable(BOOL enable) } /* Context activation and GL locking are done by the caller. */ -static void nvts_enable(BOOL enable) +static void nvts_enable(const struct wined3d_gl_info *gl_info, BOOL enable) { - nvrc_enable(enable); + nvrc_enable(gl_info, enable); if (enable) { glEnable(GL_TEXTURE_SHADER_NV); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index f4a9f13..888f7da 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5571,7 +5571,7 @@ static const struct StateEntryTemplate ffp_fragmentstate_template[] = { }; /* Context activation and GL locking are done by the caller. */ -static void ffp_enable(BOOL enable) {} +static void ffp_enable(const struct wined3d_gl_info *gl_info, BOOL enable) {} static void ffp_fragment_get_caps(const struct wined3d_gl_info *gl_info, struct fragment_caps *caps) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7cc159d..a19088a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1166,7 +1166,7 @@ struct fragment_caps struct fragment_pipeline { - void (*enable_extension)(BOOL enable); + void (*enable_extension)(const struct wined3d_gl_info *gl_info, BOOL enable); void (*get_caps)(const struct wined3d_gl_info *gl_info, struct fragment_caps *caps); HRESULT (*alloc_private)(struct wined3d_device *device); void (*free_private)(struct wined3d_device *device);

1 0

Henri Verbeet : wined3d: Call core GL functions through gl_info. gl_ops as well.
by Alexandre Julliard 25 Jul '12

25 Jul '12

Module: wine Branch: master Commit: 894d1618912367be91594fe213f9db09f88f8768 URL: http://source.winehq.org/git/wine.git/?a=commit;h=894d1618912367be91594fe21… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 24 11:32:27 2012 +0200 wined3d: Call core GL functions through gl_info.gl_ops as well. --- dlls/wined3d/arb_program_shader.c | 99 ++-- dlls/wined3d/ati_fragment_shader.c | 11 +- dlls/wined3d/buffer.c | 15 +- dlls/wined3d/context.c | 160 ++-- dlls/wined3d/device.c | 89 ++- dlls/wined3d/directx.c | 181 +++--- dlls/wined3d/drawprim.c | 161 ++-- dlls/wined3d/gl_compat.c | 84 +- dlls/wined3d/nvidia_texture_shader.c | 41 +- dlls/wined3d/state.c | 1436 ++++++++++++++++++---------------- dlls/wined3d/surface.c | 435 ++++++----- dlls/wined3d/swapchain.c | 49 +- dlls/wined3d/texture.c | 52 +- dlls/wined3d/utils.c | 267 ++++--- dlls/wined3d/wined3d_gl.h | 692 ---------------- dlls/wined3d/wined3d_private.h | 9 +- 16 files changed, 1622 insertions(+), 2159 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=894d1618912367be91594…

1 0

Dmitry Timoshkov : gdiplus: Retrieve image palette from WIC.
by Alexandre Julliard 25 Jul '12

25 Jul '12

Module: wine Branch: master Commit: dce93479ea26c3317a362be93d9f523b9b563e83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dce93479ea26c3317a362be93… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jul 18 17:24:58 2012 +0900 gdiplus: Retrieve image palette from WIC. --- dlls/gdiplus/image.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 53 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index a5b560d..111bafd 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1,5 +1,6 @@ /* * Copyright (C) 2007 Google (Evan Stade) + * Copyright (C) 2012 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -41,6 +42,46 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); #define PIXELFORMATBPP(x) ((x) ? ((x) >> 8) & 255 : 24) +static ColorPalette *get_palette(IWICBitmapFrameDecode *frame) +{ + HRESULT hr; + IWICImagingFactory *factory; + IWICPalette *wic_palette; + ColorPalette *palette = NULL; + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void **)&factory); + if (hr != S_OK) return NULL; + + hr = IWICImagingFactory_CreatePalette(factory, &wic_palette); + if (hr == S_OK) + { + hr = IWICBitmapFrameDecode_CopyPalette(frame, wic_palette); + if (hr == S_OK) + { + UINT count; + BOOL mono, gray; + + IWICPalette_IsBlackWhite(wic_palette, &mono); + IWICPalette_IsGrayscale(wic_palette, &gray); + + IWICPalette_GetColorCount(wic_palette, &count); + palette = HeapAlloc(GetProcessHeap(), 0, 2 * sizeof(UINT) + count * sizeof(ARGB)); + IWICPalette_GetColors(wic_palette, count, palette->Entries, &palette->Count); + + if (mono) + palette->Flags = 0; + else if (gray) + palette->Flags = PaletteFlagsGrayScale; + else + palette->Flags = PaletteFlagsHalftone; + } + IWICPalette_Release(wic_palette); + } + IWICImagingFactory_Release(factory); + return palette; +} + static INT ipicture_pixel_height(IPicture *pic) { HDC hdcref; @@ -2994,6 +3035,7 @@ static GpStatus decode_image_wic(IStream* stream, REFCLSID clsid, UINT active_fr IWICMetadataBlockReader *block_reader; WICPixelFormatGUID wic_format; PixelFormat gdip_format=0; + ColorPalette *palette = NULL; int i; UINT width, height, frame_count; BitmapData lockeddata; @@ -3102,6 +3144,7 @@ static GpStatus decode_image_wic(IStream* stream, REFCLSID clsid, UINT active_fr IWICMetadataBlockReader_Release(block_reader); } + palette = get_palette(frame); IWICBitmapFrameDecode_Release(frame); } @@ -3119,8 +3162,16 @@ end: bitmap->image.frame_count = frame_count; bitmap->image.current_frame = active_frame; bitmap->image.stream = stream; - if (IsEqualGUID(&wic_format, &GUID_WICPixelFormatBlackWhite)) - bitmap->image.palette->Flags = 0; + if (palette) + { + GdipFree(bitmap->image.palette); + bitmap->image.palette = palette; + } + else + { + if (IsEqualGUID(&wic_format, &GUID_WICPixelFormatBlackWhite)) + bitmap->image.palette->Flags = 0; + } /* Pin the source stream */ IStream_AddRef(stream); }

1 0

Dmitry Timoshkov : gdiplus: Add 8bppIndexed to the list of supported formats.
by Alexandre Julliard 25 Jul '12

25 Jul '12

Module: wine Branch: master Commit: 45cdafc5e8bd813ea4ddf93913b1deef53119183 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45cdafc5e8bd813ea4ddf9391… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jul 18 17:25:54 2012 +0900 gdiplus: Add 8bppIndexed to the list of supported formats. --- dlls/gdiplus/image.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 111bafd..81fa16b 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3006,6 +3006,7 @@ GpStatus WINGDIPAPI GdipLoadImageFromFileICM(GDIPCONST WCHAR* filename,GpImage * static const WICPixelFormatGUID * const wic_pixel_formats[] = { &GUID_WICPixelFormatBlackWhite, &GUID_WICPixelFormat1bppIndexed, + &GUID_WICPixelFormat8bppIndexed, &GUID_WICPixelFormat16bppBGR555, &GUID_WICPixelFormat24bppBGR, &GUID_WICPixelFormat32bppBGR, @@ -3017,6 +3018,7 @@ static const WICPixelFormatGUID * const wic_pixel_formats[] = { static const PixelFormat wic_gdip_formats[] = { PixelFormat1bppIndexed, PixelFormat1bppIndexed, + PixelFormat8bppIndexed, PixelFormat16bppRGB555, PixelFormat24bppRGB, PixelFormat32bppRGB,

1 0

Dmitry Timoshkov : gdiplus: Use predefined palette if an image doesn' t provide one.
by Alexandre Julliard 25 Jul '12

25 Jul '12

Module: wine Branch: master Commit: 271d801ea49538e196f04290fc83cd57955fed17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=271d801ea49538e196f04290f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jul 18 17:26:38 2012 +0900 gdiplus: Use predefined palette if an image doesn't provide one. --- dlls/gdiplus/image.c | 88 +++++++++++++++++++++++-------------------------- 1 files changed, 41 insertions(+), 47 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 81fa16b..a93ade5 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -42,7 +42,26 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); #define PIXELFORMATBPP(x) ((x) ? ((x) >> 8) & 255 : 24) -static ColorPalette *get_palette(IWICBitmapFrameDecode *frame) +static const struct +{ + const WICPixelFormatGUID *wic_format; + PixelFormat gdip_format; + /* predefined palette type to use for pixel format conversions */ + WICBitmapPaletteType palette_type; +} pixel_formats[] = +{ + { &GUID_WICPixelFormatBlackWhite, PixelFormat1bppIndexed, WICBitmapPaletteTypeFixedBW }, + { &GUID_WICPixelFormat1bppIndexed, PixelFormat1bppIndexed, WICBitmapPaletteTypeFixedBW }, + { &GUID_WICPixelFormat8bppIndexed, PixelFormat8bppIndexed, WICBitmapPaletteTypeFixedHalftone256 }, + { &GUID_WICPixelFormat16bppBGR555, PixelFormat16bppRGB555, WICBitmapPaletteTypeFixedHalftone256 }, + { &GUID_WICPixelFormat24bppBGR, PixelFormat24bppRGB, WICBitmapPaletteTypeFixedHalftone256 }, + { &GUID_WICPixelFormat32bppBGR, PixelFormat32bppRGB, WICBitmapPaletteTypeFixedHalftone256 }, + { &GUID_WICPixelFormat32bppBGRA, PixelFormat32bppARGB, WICBitmapPaletteTypeFixedHalftone256 }, + { &GUID_WICPixelFormat32bppPBGRA, PixelFormat32bppPARGB, WICBitmapPaletteTypeFixedHalftone256 }, + { NULL } +}; + +static ColorPalette *get_palette(IWICBitmapFrameDecode *frame, WICBitmapPaletteType palette_type) { HRESULT hr; IWICImagingFactory *factory; @@ -57,6 +76,11 @@ static ColorPalette *get_palette(IWICBitmapFrameDecode *frame) if (hr == S_OK) { hr = IWICBitmapFrameDecode_CopyPalette(frame, wic_palette); + if (hr != S_OK) + { + TRACE("using predefined palette %#x\n", palette_type); + hr = IWICPalette_InitializePredefined(wic_palette, palette_type, FALSE); + } if (hr == S_OK) { UINT count; @@ -3003,29 +3027,6 @@ GpStatus WINGDIPAPI GdipLoadImageFromFileICM(GDIPCONST WCHAR* filename,GpImage * return GdipLoadImageFromFile(filename, image); } -static const WICPixelFormatGUID * const wic_pixel_formats[] = { - &GUID_WICPixelFormatBlackWhite, - &GUID_WICPixelFormat1bppIndexed, - &GUID_WICPixelFormat8bppIndexed, - &GUID_WICPixelFormat16bppBGR555, - &GUID_WICPixelFormat24bppBGR, - &GUID_WICPixelFormat32bppBGR, - &GUID_WICPixelFormat32bppBGRA, - &GUID_WICPixelFormat32bppPBGRA, - NULL -}; - -static const PixelFormat wic_gdip_formats[] = { - PixelFormat1bppIndexed, - PixelFormat1bppIndexed, - PixelFormat8bppIndexed, - PixelFormat16bppRGB555, - PixelFormat24bppRGB, - PixelFormat32bppRGB, - PixelFormat32bppARGB, - PixelFormat32bppPARGB, -}; - static GpStatus decode_image_wic(IStream* stream, REFCLSID clsid, UINT active_frame, GpImage **image) { GpStatus status=Ok; @@ -3038,6 +3039,7 @@ static GpStatus decode_image_wic(IStream* stream, REFCLSID clsid, UINT active_fr WICPixelFormatGUID wic_format; PixelFormat gdip_format=0; ColorPalette *palette = NULL; + WICBitmapPaletteType palette_type = WICBitmapPaletteTypeFixedHalftone256; int i; UINT width, height, frame_count; BitmapData lockeddata; @@ -3066,12 +3068,13 @@ static GpStatus decode_image_wic(IStream* stream, REFCLSID clsid, UINT active_fr IWICBitmapSource *bmp_source; IWICBitmapFrameDecode_QueryInterface(frame, &IID_IWICBitmapSource, (void **)&bmp_source); - for (i=0; wic_pixel_formats[i]; i++) + for (i=0; pixel_formats[i].wic_format; i++) { - if (IsEqualGUID(&wic_format, wic_pixel_formats[i])) + if (IsEqualGUID(&wic_format, pixel_formats[i].wic_format)) { source = bmp_source; - gdip_format = wic_gdip_formats[i]; + gdip_format = pixel_formats[i].gdip_format; + palette_type = pixel_formats[i].palette_type; break; } } @@ -3146,7 +3149,7 @@ static GpStatus decode_image_wic(IStream* stream, REFCLSID clsid, UINT active_fr IWICMetadataBlockReader_Release(block_reader); } - palette = get_palette(frame); + palette = get_palette(frame, palette_type); IWICBitmapFrameDecode_Release(frame); } @@ -3566,30 +3569,21 @@ static GpStatus encode_image_WIC(GpImage *image, IStream* stream, if (SUCCEEDED(hr)) { - for (i=0; wic_pixel_formats[i]; i++) + for (i=0; pixel_formats[i].wic_format; i++) { - if (wic_gdip_formats[i] == bitmap->format) - break; + if (pixel_formats[i].gdip_format == bitmap->format) + { + memcpy(&wicformat, pixel_formats[i].wic_format, sizeof(GUID)); + gdipformat = bitmap->format; + } } - if (wic_pixel_formats[i]) - memcpy(&wicformat, wic_pixel_formats[i], sizeof(GUID)); - else + if (!gdipformat) + { memcpy(&wicformat, &GUID_WICPixelFormat32bppBGRA, sizeof(GUID)); + gdipformat = PixelFormat32bppARGB; + } hr = IWICBitmapFrameEncode_SetPixelFormat(frameencode, &wicformat); - - for (i=0; wic_pixel_formats[i]; i++) - { - if (IsEqualGUID(&wicformat, wic_pixel_formats[i])) - break; - } - if (wic_pixel_formats[i]) - gdipformat = wic_gdip_formats[i]; - else - { - ERR("cannot provide pixel format %s\n", debugstr_guid(&wicformat)); - hr = E_FAIL; - } } if (SUCCEEDED(hr))

1 0

Dmitry Timoshkov : gdiplus: Add 8bppGray to the list of supported formats.
by Alexandre Julliard 25 Jul '12

25 Jul '12

Module: wine Branch: master Commit: f165e2725f79dbb879fdf692600673d2c5386cff URL: http://source.winehq.org/git/wine.git/?a=commit;h=f165e2725f79dbb879fdf6926… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jul 18 17:27:29 2012 +0900 gdiplus: Add 8bppGray to the list of supported formats. --- dlls/gdiplus/image.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index a93ade5..cef619f 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -52,6 +52,7 @@ static const struct { { &GUID_WICPixelFormatBlackWhite, PixelFormat1bppIndexed, WICBitmapPaletteTypeFixedBW }, { &GUID_WICPixelFormat1bppIndexed, PixelFormat1bppIndexed, WICBitmapPaletteTypeFixedBW }, + { &GUID_WICPixelFormat8bppGray, PixelFormat8bppIndexed, WICBitmapPaletteTypeFixedGray256 }, { &GUID_WICPixelFormat8bppIndexed, PixelFormat8bppIndexed, WICBitmapPaletteTypeFixedHalftone256 }, { &GUID_WICPixelFormat16bppBGR555, PixelFormat16bppRGB555, WICBitmapPaletteTypeFixedHalftone256 }, { &GUID_WICPixelFormat24bppBGR, PixelFormat24bppRGB, WICBitmapPaletteTypeFixedHalftone256 },

1 0

Dmitry Timoshkov : gdiplus: Make get_palette() usable for generating predefined palettes.
by Alexandre Julliard 25 Jul '12

25 Jul '12

Module: wine Branch: master Commit: 0b40df2990284ae5d6f5386c994e8902cb7114e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b40df2990284ae5d6f5386c9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jul 18 17:28:20 2012 +0900 gdiplus: Make get_palette() usable for generating predefined palettes. --- dlls/gdiplus/image.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index cef619f..c20eee5 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -76,7 +76,9 @@ static ColorPalette *get_palette(IWICBitmapFrameDecode *frame, WICBitmapPaletteT hr = IWICImagingFactory_CreatePalette(factory, &wic_palette); if (hr == S_OK) { - hr = IWICBitmapFrameDecode_CopyPalette(frame, wic_palette); + hr = WINCODEC_ERR_PALETTEUNAVAILABLE; + if (frame) + hr = IWICBitmapFrameDecode_CopyPalette(frame, wic_palette); if (hr != S_OK) { TRACE("using predefined palette %#x\n", palette_type);

1 0

Dmitry Timoshkov : gdiplus: Handle image loading failures under some XP versions.
by Alexandre Julliard 25 Jul '12

25 Jul '12

Module: wine Branch: master Commit: c67951c70adb8c719e35769b9fcfa2b24b78be42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c67951c70adb8c719e35769b9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jul 25 18:11:05 2012 +0900 gdiplus: Handle image loading failures under some XP versions. --- dlls/gdiplus/tests/image.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 7f89aec..3d17f3d 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -2702,7 +2702,13 @@ static GpImage *load_image(const BYTE *image_data, UINT image_size) ok(refcount == 1, "expected stream refcount 1, got %d\n", refcount); status = GdipLoadImageFromStream(stream, &image); - ok(status == Ok, "GdipLoadImageFromStream error %d\n", status); + ok(status == Ok || broken(status == InvalidParameter), /* XP */ + "GdipLoadImageFromStream error %d\n", status); + if (status != Ok) + { + IStream_Release(stream); + return NULL; + } status = GdipGetImageType(image, &image_type); ok(status == Ok, "GdipGetImageType error %d\n", status); @@ -2770,8 +2776,11 @@ static void test_image_properties(void) for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) { image = load_image(td[i].image_data, td[i].image_size); - ok(image != 0, "%u: failed to load image data\n", i); - if (!image) continue; + if (!image) + { + trace("%u: failed to load image data\n", i); + continue; + } status = GdipGetImageType(image, &image_type); ok(status == Ok, "%u: GdipGetImageType error %d\n", i, status);

1 0

Dan Kegel : msvcp100: Add _Container_base0::_Swap_all, _Container_base0:: _Orphan_all.
by Alexandre Julliard 25 Jul '12

25 Jul '12

Module: wine Branch: master Commit: 47b9dd1b55979bd810517f2bf4e0f5947c73ab60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47b9dd1b55979bd810517f2bf… Author: Dan Kegel <dank(a)kegel.com> Date: Tue Jul 24 13:33:40 2012 -0700 msvcp100: Add _Container_base0::_Swap_all, _Container_base0::_Orphan_all. --- dlls/msvcp100/msvcp100.c | 46 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp100/msvcp100.spec | 8 +++--- 2 files changed, 50 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp100/msvcp100.c b/dlls/msvcp100/msvcp100.c index ed44b72..6a24a97 100644 --- a/dlls/msvcp100/msvcp100.c +++ b/dlls/msvcp100/msvcp100.c @@ -18,14 +18,60 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" + #include <stdarg.h> #include "windef.h" #include "winbase.h" +/* Copied from dlls/msvcrt/cpp.c */ +#ifdef __i386__ /* thiscall functions are i386-specific */ + +#define THISCALL(func) __thiscall_ ## func +#define THISCALL_NAME(func) __ASM_NAME("__thiscall_" #func) +#define __thiscall __stdcall +#define DEFINE_THISCALL_WRAPPER(func,args) \ + extern void THISCALL(func)(void); \ + __ASM_GLOBAL_FUNC(__thiscall_ ## func, \ + "popl %eax\n\t" \ + "pushl %ecx\n\t" \ + "pushl %eax\n\t" \ + "jmp " __ASM_NAME(#func) __ASM_STDCALL(args) ) +#else /* __i386__ */ + +#define THISCALL(func) func +#define THISCALL_NAME(func) __ASM_NAME(#func) +#define __thiscall __cdecl +#define DEFINE_THISCALL_WRAPPER(func,args) /* nothing */ + +#endif /* __i386__ */ + /* ?_BADOFF(a)std@@3_JB -> __int64 const std::_BADOFF */ const __int64 std_BADOFF = -1; +/* _Container_base0 is used by apps compiled without iterator checking + * (i.e. with _ITERATOR_DEBUG_LEVEL=0 ). + * It provides empty versions of methods used by visual c++'s stl's + * iterator checking. + * msvcr100 has to provide them in case apps are compiled with /Od + * or the optimizer fails to inline those (empty) calls. + */ + +/* ?_Orphan_all(a)_Container_base0@std@@QAEXXZ */ +/* ?_Orphan_all(a)_Container_base0@std@@QEAAXXZ */ +DEFINE_THISCALL_WRAPPER(Container_base0_Orphan_all, 4) +void __thiscall Container_base0_Orphan_all(void *this) +{ +} + +/* ?_Swap_all(a)_Container_base0@std@@QAEXAAU12@@Z */ +/* ?_Swap_all(a)_Container_base0@std@@QEAAXAEAU12@@Z */ +DEFINE_THISCALL_WRAPPER(Container_base0_Swap_all, 8) +void __thiscall Container_base0_Swap_all(void *this, void *that) +{ +} + BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) { switch (reason) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index c26de60..5fb3c39 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -1123,8 +1123,8 @@ @ cdecl -arch=win32 ?_Mutex_dtor(a)_Mutex@std@@CAXPAV12@@Z(ptr) msvcp90.?_Mutex_dtor(a)_Mutex@std@@CAXPAV12@@Z @ cdecl -arch=win64 ?_Mutex_dtor(a)_Mutex@std@@CAXPEAV12@@Z(ptr) msvcp90.?_Mutex_dtor(a)_Mutex@std@@CAXPEAV12@@Z @ stub ?_Nomemory(a)std@@YAXXZ -@ stub -arch=win32 ?_Orphan_all(a)_Container_base0@std@@QAEXXZ -@ stub -arch=win64 ?_Orphan_all(a)_Container_base0@std@@QEAAXXZ +@ thiscall -arch=win32 ?_Orphan_all(a)_Container_base0@std@@QAEXXZ(ptr) Container_base0_Orphan_all +@ cdecl -arch=win64 ?_Orphan_all(a)_Container_base0@std@@QEAAXXZ(ptr) Container_base0_Orphan_all @ stub -arch=win32 ?_Orphan_all(a)_Container_base12@std@@QAEXXZ @ stub -arch=win64 ?_Orphan_all(a)_Container_base12@std@@QEAAXXZ @ thiscall -arch=win32 ?_Osfx@?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QAEXXZ(ptr) msvcp90.?_Osfx@?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QAEXXZ @@ -1202,8 +1202,8 @@ @ stub -arch=win64 ?_Segment_index_of(a)_Concurrent_vector_base_v4@details(a)Concurrency@@KA_K_K(a)Z @ cdecl -arch=win32 ?_Setgloballocale(a)locale@std@@CAXPAX(a)Z(ptr) msvcp90.?_Setgloballocale(a)locale@std@@CAXPAX(a)Z @ cdecl -arch=win64 ?_Setgloballocale(a)locale@std@@CAXPEAX(a)Z(ptr) msvcp90.?_Setgloballocale(a)locale@std@@CAXPEAX(a)Z -@ stub -arch=win32 ?_Swap_all(a)_Container_base0@std@@QAEXAAU12@@Z -@ stub -arch=win64 ?_Swap_all(a)_Container_base0@std@@QEAAXAEAU12@@Z +@ thiscall -arch=win32 ?_Swap_all(a)_Container_base0@std@@QAEXAAU12@@Z(ptr ptr) Container_base0_Swap_all +@ cdecl -arch=win64 ?_Swap_all(a)_Container_base0@std@@QEAAXAEAU12@@Z(ptr ptr) Container_base0_Swap_all @ stub -arch=win32 ?_Swap_all(a)_Container_base12@std@@QAEXAAU12@@Z @ stub -arch=win64 ?_Swap_all(a)_Container_base12@std@@QEAAXAEAU12@@Z @ extern ?_Sync(a)ios_base@std@@0_NA msvcp90.?_Sync(a)ios_base@std@@0_NA

1 0