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

Dan Kegel : msvcp100: Add _Container_base0::_Swap_all, _Container_base0:: _Orphan_all.
by Alexandre Julliard July 25, 2012

July 25, 2012

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

Dmitry Timoshkov : gdiplus: Handle image loading failures under some XP versions.
by Alexandre Julliard July 25, 2012

July 25, 2012

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

Dmitry Timoshkov : gdiplus: Make get_palette() usable for generating predefined palettes.
by Alexandre Julliard July 25, 2012

July 25, 2012

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: Use predefined palette if an image doesn' t provide one.
by Alexandre Julliard July 25, 2012

July 25, 2012

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

Henri Verbeet : wined3d: Pass a gl_info structure to fragment_pipeline. enable_extension().
by Alexandre Julliard July 25, 2012

July 25, 2012

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: Get rid of the GL extension function pointer typedefs.
by Alexandre Julliard July 25, 2012

July 25, 2012

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

Alexandre Julliard : wined3d: Retrieve OpenGL extension functions directly through the TEB table.
by Alexandre Julliard July 25, 2012

July 25, 2012

Module: wine Branch: master Commit: 63396e00b93ca8f05989282807f8c2bdc0c91057 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63396e00b93ca8f0598928280… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 25 19:59:13 2012 +0200 wined3d: Retrieve OpenGL extension functions directly through the TEB table. --- dlls/wined3d/directx.c | 42 +- dlls/wined3d/wined3d_gl.h | 1057 +++++++++++++++------------------------------ 2 files changed, 378 insertions(+), 721 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=63396e00b93ca8f059892…

1 0

Jacek Caban : mshtml: Moved more logic to HTMLStyle_Create.
by Alexandre Julliard July 25, 2012

July 25, 2012

Module: wine Branch: master Commit: 5b633c29b932dc48e04517965453f2ad8d60882a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b633c29b932dc48e04517965… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 25 14:46:54 2012 +0200 mshtml: Moved more logic to HTMLStyle_Create. --- dlls/mshtml/htmlelem.c | 25 +------------------------ dlls/mshtml/htmlstyle.c | 26 ++++++++++++++++++++++++-- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/mshtml_private.h | 1 - 4 files changed, 26 insertions(+), 27 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 82967d8..5c38ebb 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -446,32 +446,9 @@ static HRESULT WINAPI HTMLElement_get_style(IHTMLElement *iface, IHTMLStyle **p) TRACE("(%p)->(%p)\n", This, p); if(!This->style) { - nsIDOMElementCSSInlineStyle *nselemstyle; - nsIDOMCSSStyleDeclaration *nsstyle; - nsresult nsres; HRESULT hres; - if(!This->nselem) { - FIXME("NULL nselem\n"); - return E_NOTIMPL; - } - - nsres = nsIDOMHTMLElement_QueryInterface(This->nselem, &IID_nsIDOMElementCSSInlineStyle, - (void**)&nselemstyle); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIDOMCSSStyleDeclaration interface: %08x\n", nsres); - return E_FAIL; - } - - nsres = nsIDOMElementCSSInlineStyle_GetStyle(nselemstyle, &nsstyle); - nsIDOMElementCSSInlineStyle_Release(nselemstyle); - if(NS_FAILED(nsres)) { - ERR("GetStyle failed: %08x\n", nsres); - return E_FAIL; - } - - hres = HTMLStyle_Create(This, nsstyle, &This->style); - nsIDOMCSSStyleDeclaration_Release(nsstyle); + hres = HTMLStyle_Create(This, &This->style); if(FAILED(hres)) return hres; } diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index b9f0ddd..3d67402 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <assert.h> #include <math.h> #define COBJMACROS @@ -3039,13 +3040,34 @@ static dispex_static_data_t HTMLStyle_dispex = { HTMLStyle_iface_tids }; -HRESULT HTMLStyle_Create(HTMLElement *elem, nsIDOMCSSStyleDeclaration *nsstyle, HTMLStyle **ret) +HRESULT HTMLStyle_Create(HTMLElement *elem, HTMLStyle **ret) { + nsIDOMElementCSSInlineStyle *nselemstyle; + nsIDOMCSSStyleDeclaration *nsstyle; HTMLStyle *style; + nsresult nsres; + + if(!elem->nselem) { + FIXME("NULL nselem\n"); + return E_NOTIMPL; + } + + nsres = nsIDOMHTMLElement_QueryInterface(elem->nselem, &IID_nsIDOMElementCSSInlineStyle, + (void**)&nselemstyle); + assert(nsres == NS_OK); + + nsres = nsIDOMElementCSSInlineStyle_GetStyle(nselemstyle, &nsstyle); + nsIDOMElementCSSInlineStyle_Release(nselemstyle); + if(NS_FAILED(nsres)) { + ERR("GetStyle failed: %08x\n", nsres); + return E_FAIL; + } style = heap_alloc_zero(sizeof(HTMLStyle)); - if(!style) + if(!style) { + nsIDOMCSSStyleDeclaration_Release(nsstyle); return E_OUTOFMEMORY; + } style->IHTMLStyle_iface.lpVtbl = &HTMLStyleVtbl; style->ref = 1; diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index ce42d3e..571931b 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -106,6 +106,7 @@ typedef enum { STYLEID_Z_INDEX } styleid_t; +HRESULT HTMLStyle_Create(HTMLElement*,HTMLStyle**) DECLSPEC_HIDDEN; void HTMLStyle2_Init(HTMLStyle*) DECLSPEC_HIDDEN; void HTMLStyle3_Init(HTMLStyle*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 1f51804..abc9794 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -806,7 +806,6 @@ void set_ready_state(HTMLOuterWindow*,READYSTATE) DECLSPEC_HIDDEN; HRESULT HTMLSelectionObject_Create(HTMLDocumentNode*,nsISelection*,IHTMLSelectionObject**) DECLSPEC_HIDDEN; HRESULT HTMLTxtRange_Create(HTMLDocumentNode*,nsIDOMRange*,IHTMLTxtRange**) DECLSPEC_HIDDEN; -HRESULT HTMLStyle_Create(HTMLElement*,nsIDOMCSSStyleDeclaration*,HTMLStyle**) DECLSPEC_HIDDEN; IHTMLStyleSheet *HTMLStyleSheet_Create(nsIDOMStyleSheet*) DECLSPEC_HIDDEN; IHTMLStyleSheetsCollection *HTMLStyleSheetsCollection_Create(nsIDOMStyleSheetList*) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : wbemprox: Implement IWbemClassObject::GetMethod.
by Alexandre Julliard July 25, 2012

July 25, 2012

Module: wine Branch: master Commit: f930085904518860b54f08442581a3d6dc70989a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f930085904518860b54f08442… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 25 13:13:17 2012 +0200 wbemprox: Implement IWbemClassObject::GetMethod. --- dlls/wbemprox/class.c | 172 +++++++++++++++++++++++++++++++++++++- dlls/wbemprox/table.c | 15 ++- dlls/wbemprox/wbemprox_private.h | 14 +++ 3 files changed, 194 insertions(+), 7 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index af7d8f5..293c8c4 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -441,6 +441,163 @@ static HRESULT WINAPI class_object_InheritsFrom( return E_NOTIMPL; } +static UINT count_instances( IEnumWbemClassObject *iter ) +{ + UINT count = 0; + while (!IEnumWbemClassObject_Skip( iter, WBEM_INFINITE, 1 )) count++; + IEnumWbemClassObject_Reset( iter ); + return count; +} + +static void set_default_value( CIMTYPE type, UINT val, BYTE *ptr ) +{ + switch (type) + { + case CIM_SINT16: + *(INT16 *)ptr = val; + break; + case CIM_UINT16: + *(UINT16 *)ptr = val; + break; + case CIM_SINT32: + *(INT32 *)ptr = val; + break; + case CIM_UINT32: + *(UINT32 *)ptr = val; + break; + default: + FIXME("unhandled type %u\n", type); + break; + } +} + +HRESULT create_signature_columns_and_data( IEnumWbemClassObject *iter, UINT *num_cols, + struct column **cols, BYTE **data ) +{ + static const WCHAR parameterW[] = {'P','a','r','a','m','e','t','e','r',0}; + static const WCHAR typeW[] = {'T','y','p','e',0}; + static const WCHAR defaultvalueW[] = {'D','e','f','a','u','l','t','V','a','l','u','e',0}; + struct column *columns; + BYTE *row; + IWbemClassObject *param; + VARIANT val; + HRESULT hr = E_OUTOFMEMORY; + UINT offset = 0; + ULONG count; + int i = 0; + + count = count_instances( iter ); + if (!(columns = heap_alloc( count * sizeof(struct column) ))) return E_OUTOFMEMORY; + if (!(row = heap_alloc_zero( count * sizeof(LONGLONG) ))) goto error; + + for (;;) + { + IEnumWbemClassObject_Next( iter, WBEM_INFINITE, 1, &param, &count ); + if (!count) break; + + hr = IWbemClassObject_Get( param, parameterW, 0, &val, NULL, NULL ); + if (hr != S_OK) goto error; + columns[i].name = heap_strdupW( V_BSTR( &val ) ); + VariantClear( &val ); + + hr = IWbemClassObject_Get( param, typeW, 0, &val, NULL, NULL ); + if (hr != S_OK) goto error; + columns[i].type = V_UI4( &val ); + columns[i].vartype = 0; + + hr = IWbemClassObject_Get( param, defaultvalueW, 0, &val, NULL, NULL ); + if (hr != S_OK) goto error; + if (V_UI4( &val )) set_default_value( columns[i].type, V_UI4( &val ), row + offset ); + offset += get_type_size( columns[i].type ); + + IWbemClassObject_Release( param ); + i++; + } + *num_cols = i; + *cols = columns; + *data = row; + return S_OK; + +error: + for (; i >= 0; i--) heap_free( (WCHAR *)columns[i].name ); + heap_free( columns ); + heap_free( row ); + return hr; +} + +HRESULT create_signature_table( IEnumWbemClassObject *iter, WCHAR *name ) +{ + HRESULT hr; + struct table *table; + struct column *columns; + UINT num_cols; + BYTE *row; + + hr = create_signature_columns_and_data( iter, &num_cols, &columns, &row ); + if (hr != S_OK) return hr; + + if (!(table = create_table( name, num_cols, columns, 1, row, NULL ))) + { + free_columns( columns, num_cols ); + heap_free( row ); + return E_OUTOFMEMORY; + } + if (!add_table( table )) free_table( table ); /* already exists */ + return S_OK; +} + +WCHAR *build_signature_table_name( const WCHAR *class, const WCHAR *method, enum param_direction dir ) +{ + static const WCHAR fmtW[] = {'_','_','%','s','_','%','s','_','%','s',0}; + static const WCHAR outW[] = {'O','U','T',0}; + static const WCHAR inW[] = {'I','N',0}; + UINT len = SIZEOF(fmtW) + SIZEOF(outW) + strlenW( class ) + strlenW( method ); + WCHAR *ret; + + if (!(ret = heap_alloc( len * sizeof(WCHAR) ))) return NULL; + sprintfW( ret, fmtW, class, method, dir == PARAM_IN ? inW : outW ); + return struprW( ret ); +} + +static HRESULT create_signature( const WCHAR *class, const WCHAR *method, enum param_direction dir, + IWbemClassObject **sig ) +{ + static const WCHAR selectW[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + '_','_','P','A','R','A','M','E','T','E','R','S',' ','W','H','E','R','E',' ', + 'C','l','a','s','s','=','\'','%','s','\'',' ','A','N','D',' ', + 'M','e','t','h','o','d','=','\'','%','s','\'',' ','A','N','D',' ', + 'D','i','r','e','c','t','i','o','n','%','s',0}; + static const WCHAR geW[] = {'>','=','0',0}; + static const WCHAR leW[] = {'<','=','0',0}; + UINT len = SIZEOF(selectW) + SIZEOF(geW); + IEnumWbemClassObject *iter; + WCHAR *query, *name; + HRESULT hr; + + len += strlenW( class ) + strlenW( method ); + if (!(query = heap_alloc( len * sizeof(WCHAR) ))) return E_OUTOFMEMORY; + sprintfW( query, selectW, class, method, dir >= 0 ? geW : leW ); + + hr = exec_query( query, &iter ); + heap_free( query ); + if (hr != S_OK) return hr; + + if (!(name = build_signature_table_name( class, method, dir ))) + { + IEnumWbemClassObject_Release( iter ); + return E_OUTOFMEMORY; + } + hr = create_signature_table( iter, name ); + IEnumWbemClassObject_Release( iter ); + if (hr != S_OK) + { + heap_free( name ); + return hr; + } + return get_object( name, sig ); +} + static HRESULT WINAPI class_object_GetMethod( IWbemClassObject *iface, LPCWSTR wszName, @@ -448,8 +605,19 @@ static HRESULT WINAPI class_object_GetMethod( IWbemClassObject **ppInSignature, IWbemClassObject **ppOutSignature ) { - FIXME("%p, %s, %08x, %p, %p\n", iface, debugstr_w(wszName), lFlags, ppInSignature, ppOutSignature); - return E_NOTIMPL; + struct class_object *co = impl_from_IWbemClassObject( iface ); + struct enum_class_object *ec = impl_from_IEnumWbemClassObject( co->iter ); + struct view *view = ec->query->view; + HRESULT hr; + + TRACE("%p, %s, %08x, %p, %p\n", iface, debugstr_w(wszName), lFlags, ppInSignature, ppOutSignature); + + hr = create_signature( view->table->name, wszName, PARAM_IN, ppInSignature ); + if (hr != S_OK) return hr; + + hr = create_signature( view->table->name, wszName, PARAM_OUT, ppOutSignature ); + if (hr != S_OK) IWbemClassObject_Release( *ppInSignature ); + return hr; } static HRESULT WINAPI class_object_PutMethod( diff --git a/dlls/wbemprox/table.c b/dlls/wbemprox/table.c index d3ad06d..d94a8e8 100644 --- a/dlls/wbemprox/table.c +++ b/dlls/wbemprox/table.c @@ -44,11 +44,11 @@ HRESULT get_column_index( const struct table *table, const WCHAR *name, UINT *co return WBEM_E_INVALID_QUERY; } -static UINT get_column_size( const struct table *table, UINT column ) +UINT get_type_size( CIMTYPE type ) { - if (table->columns[column].type & CIM_FLAG_ARRAY) return sizeof(void *); + if (type & CIM_FLAG_ARRAY) return sizeof(void *); - switch (table->columns[column].type & COL_TYPE_MASK) + switch (type) { case CIM_SINT16: case CIM_UINT16: @@ -63,10 +63,15 @@ static UINT get_column_size( const struct table *table, UINT column ) case CIM_STRING: return sizeof(WCHAR *); default: - ERR("unknown column type %u\n", table->columns[column].type & COL_TYPE_MASK); + ERR("unhandled type %u\n", type); break; } - return sizeof(INT32); + return sizeof(LONGLONG); +} + +static UINT get_column_size( const struct table *table, UINT column ) +{ + return get_type_size( table->columns[column].type & COL_TYPE_MASK ); } static UINT get_column_offset( const struct table *table, UINT column ) diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 725ea8c..a5f0a42 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -24,6 +24,13 @@ struct list *table_list; #define SIZEOF(array) (sizeof(array)/sizeof((array)[0])) +enum param_direction +{ + PARAM_OUT = -1, + PARAM_INOUT = 0, + PARAM_IN = 1 +}; + #define COL_TYPE_MASK 0x0000ffff #define COL_FLAG_DYNAMIC 0x00010000 #define COL_FLAG_KEY 0x00020000 @@ -134,6 +141,7 @@ struct table *create_table( const WCHAR *, UINT, const struct column *, UINT, BOOL add_table( struct table * ) DECLSPEC_HIDDEN; void free_columns( struct column *, UINT ) DECLSPEC_HIDDEN; void free_table( struct table * ) DECLSPEC_HIDDEN; +UINT get_type_size( CIMTYPE ) DECLSPEC_HIDDEN; HRESULT get_column_index( const struct table *, const WCHAR *, UINT * ) DECLSPEC_HIDDEN; HRESULT get_value( const struct table *, UINT, UINT, LONGLONG * ) DECLSPEC_HIDDEN; BSTR get_value_bstr( const struct table *, UINT, UINT ) DECLSPEC_HIDDEN; @@ -161,6 +169,12 @@ static inline void *heap_realloc( void *mem, size_t len ) return HeapReAlloc( GetProcessHeap(), 0, mem, len ); } +static void *heap_alloc_zero( size_t len ) __WINE_ALLOC_SIZE(1); +static inline void *heap_alloc_zero( size_t len ) +{ + return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); +} + static inline BOOL heap_free( void *mem ) { return HeapFree( GetProcessHeap(), 0, mem );

1 0

Dmitry Timoshkov : gdiplus: Add 8bppGray to the list of supported formats.
by Alexandre Julliard July 25, 2012

July 25, 2012

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