wine-commits July 2012

wine-commits@winehq.org

2 participants
712 discussions

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: 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

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

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: 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

Alexandre Julliard : wined3d: Retrieve OpenGL extension functions directly through the TEB table.
by Alexandre Julliard 25 Jul '12

25 Jul '12

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: Added runtimeStyle tests.
by Alexandre Julliard 25 Jul '12

25 Jul '12

Module: wine Branch: master Commit: 140cd1b9145f3de57c329422b14c976e0ebbf9bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=140cd1b9145f3de57c329422b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 25 15:16:29 2012 +0200 mshtml: Added runtimeStyle tests. --- dlls/mshtml/tests/style.c | 113 +++++++++++++++++++++++++++++++++------------ 1 files changed, 84 insertions(+), 29 deletions(-) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 262c4d1..b44950c 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -255,6 +255,33 @@ static void _test_style_remove_attribute(unsigned line, IHTMLStyle *style, const ok_(__FILE__,line)(b == exb, "removeAttribute returned %x, expected %x\n", b, exb); } +#define set_text_decoration(a,b) _set_text_decoration(__LINE__,a,b) +static void _set_text_decoration(unsigned line, IHTMLStyle *style, const char *v) +{ + BSTR str; + HRESULT hres; + + str = a2bstr(v); + hres = IHTMLStyle_put_textDecoration(style, str); + ok_(__FILE__,line)(hres == S_OK, "put_textDecoration failed: %08x\n", hres); + SysFreeString(str); +} + +#define test_text_decoration(a,b) _test_text_decoration(__LINE__,a,b) +static void _test_text_decoration(unsigned line, IHTMLStyle *style, const char *exdec) +{ + BSTR str; + HRESULT hres; + + hres = IHTMLStyle_get_textDecoration(style, &str); + ok_(__FILE__,line)(hres == S_OK, "get_textDecoration failed: %08x\n", hres); + if(exdec) + ok_(__FILE__,line)(!strcmp_wa(str, exdec), "textDecoration = %s, expected %s\n", wine_dbgstr_w(str), exdec); + else + ok_(__FILE__,line)(!str, "textDecoration = %s, expected NULL\n", wine_dbgstr_w(str)); + SysFreeString(str); +} + static void test_set_csstext(IHTMLStyle *style) { VARIANT v; @@ -738,35 +765,15 @@ static void test_body_style(IHTMLStyle *style) ok(hres == E_INVALIDARG, "put_textDecoration failed: %08x\n", hres); SysFreeString(str); - str = a2bstr("none"); - hres = IHTMLStyle_put_textDecoration(style, str); - ok(hres == S_OK, "put_textDecoration failed: %08x\n", hres); - SysFreeString(str); - - str = a2bstr("underline"); - hres = IHTMLStyle_put_textDecoration(style, str); - ok(hres == S_OK, "put_textDecoration failed: %08x\n", hres); - SysFreeString(str); - - str = a2bstr("overline"); - hres = IHTMLStyle_put_textDecoration(style, str); - ok(hres == S_OK, "put_textDecoration failed: %08x\n", hres); - SysFreeString(str); - - str = a2bstr("line-through"); - hres = IHTMLStyle_put_textDecoration(style, str); - ok(hres == S_OK, "put_textDecoration failed: %08x\n", hres); - SysFreeString(str); - - str = a2bstr("blink"); - hres = IHTMLStyle_put_textDecoration(style, str); - ok(hres == S_OK, "put_textDecoration failed: %08x\n", hres); - SysFreeString(str); - - hres = IHTMLStyle_get_textDecoration(style, &str); - ok(hres == S_OK, "get_textDecoration failed: %08x\n", hres); - ok(!strcmp_wa(str, "blink"), "str != blink\n"); - SysFreeString(str); + set_text_decoration(style, "none"); + test_text_decoration(style, "none"); + set_text_decoration(style, "underline"); + set_text_decoration(style, "overline"); + set_text_decoration(style, "line-through"); + set_text_decoration(style, "blink"); + set_text_decoration(style, "overline"); + set_text_decoration(style, "blink"); + test_text_decoration(style, "blink"); hres = IHTMLStyle_put_textDecoration(style, sDefault); ok(hres == S_OK, "put_textDecoration failed: %08x\n", hres); @@ -2335,6 +2342,53 @@ static void basic_style_test(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } +static const char runtimestyle_test_str[] = + "<html><head><style>body {text-decoration: auto}</style></head><body></body></html>"; + +static void runtimestyle_test(IHTMLDocument2 *doc) +{ + IHTMLStyle *style, *runtime_style; + IHTMLElement2 *elem2; + IHTMLElement *elem; + BSTR str; + HRESULT hres; + + hres = IHTMLDocument2_get_body(doc, &elem); + ok(hres == S_OK, "get_body failed: %08x\n", hres); + + elem2 = get_elem2_iface((IUnknown*)elem); + + hres = IHTMLElement2_get_runtimeStyle(elem2, &runtime_style); + ok(hres == S_OK, "get_runtimeStyle failed: %08x\n", hres); + + hres = IHTMLElement_get_style(elem, &style); + ok(hres == S_OK, "get_style failed: %08x\n", hres); + + test_text_decoration(style, NULL); + test_text_decoration(runtime_style, NULL); + set_text_decoration(style, "underline"); + test_text_decoration(style, "underline"); + + hres = IHTMLStyle_get_textDecoration(style, &str); + ok(hres == S_OK, "get_textDecoration failed: %08x\n", hres); + ok(broken(!str) || !strcmp_wa(str, "underline"), "textDecoration = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + set_text_decoration(runtime_style, "blink"); + test_text_decoration(runtime_style, "blink"); + + hres = IHTMLStyle_get_textDecoration(style, &str); + ok(hres == S_OK, "get_textDecoration failed: %08x\n", hres); + todo_wine + ok(!strcmp_wa(str, "underline"), "textDecoration = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + IHTMLStyle_Release(runtime_style); + IHTMLStyle_Release(style); + IHTMLElement2_Release(elem2); + IHTMLElement_Release(elem); +} + static IHTMLDocument2 *notif_doc; static BOOL doc_complete; @@ -2495,6 +2549,7 @@ START_TEST(style) CoInitialize(NULL); run_test(basic_test_str, basic_style_test); + run_test(runtimestyle_test_str, runtimestyle_test); CoUninitialize(); }

1 0

Jacek Caban : mshtml: Added IHTMLElement2:: get_runtimeStyle hackish implementation.
by Alexandre Julliard 25 Jul '12

25 Jul '12

Module: wine Branch: master Commit: 9ccc5f487b844b55bf714c22e74f84babf21c752 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ccc5f487b844b55bf714c22e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 25 14:47:13 2012 +0200 mshtml: Added IHTMLElement2::get_runtimeStyle hackish implementation. --- dlls/mshtml/htmlelem.c | 4 ++++ dlls/mshtml/htmlelem2.c | 20 ++++++++++++++++++-- dlls/mshtml/htmlstyle.c | 1 + dlls/mshtml/mshtml_private.h | 1 + 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 5c38ebb..02551db 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1563,6 +1563,10 @@ void HTMLElement_destructor(HTMLDOMNode *iface) This->style->elem = NULL; IHTMLStyle_Release(&This->style->IHTMLStyle_iface); } + if(This->runtime_style) { + This->runtime_style->elem = NULL; + IHTMLStyle_Release(&This->runtime_style->IHTMLStyle_iface); + } if(This->attrs) { HTMLDOMAttribute *attr; diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index 4550681..e2e5c13 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -30,6 +30,7 @@ #include "mshtml_private.h" #include "htmlevent.h" +#include "htmlstyle.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); @@ -1188,8 +1189,23 @@ static HRESULT WINAPI HTMLElement2_removeBehavior(IHTMLElement2 *iface, LONG coo static HRESULT WINAPI HTMLElement2_get_runtimeStyle(IHTMLElement2 *iface, IHTMLStyle **p) { HTMLElement *This = impl_from_IHTMLElement2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + FIXME("(%p)->(%p): hack\n", This, p); + + /* We can't implement correct behavior on top of Gecko (although we could + try a bit harder). Making runtimeStyle behave like regular style is + enough for most use cases. */ + if(!This->runtime_style) { + HRESULT hres; + + hres = HTMLStyle_Create(This, &This->runtime_style); + if(FAILED(hres)) + return hres; + } + + *p = &This->runtime_style->IHTMLStyle_iface; + IHTMLStyle_AddRef(*p); + return S_OK; } static HRESULT WINAPI HTMLElement2_get_behaviorUrns(IHTMLElement2 *iface, IDispatch **p) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 3d67402..1e068b1 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -721,6 +721,7 @@ static ULONG WINAPI HTMLStyle_Release(IHTMLStyle *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) { + assert(!This->elem); if(This->nsstyle) nsIDOMCSSStyleDeclaration_Release(This->nsstyle); release_dispex(&This->dispex); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index abc9794..91cbbfe 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -634,6 +634,7 @@ typedef struct { nsIDOMHTMLElement *nselem; HTMLStyle *style; + HTMLStyle *runtime_style; HTMLAttributeCollection *attrs; WCHAR *filter; } HTMLElement;

1 0

Jacek Caban : mshtml: Moved more logic to HTMLStyle_Create.
by Alexandre Julliard 25 Jul '12

25 Jul '12

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 25 Jul '12

25 Jul '12

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

← Newer
1
...
9
10
11
12
13
14
15
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2012