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

Hans Leidekker : wbemprox: Implement Win32_OperatingSystem.OperatingSystemSKU.
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: 5b2113de2d62a22828d793a3fd82741c8f181c70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b2113de2d62a22828d793a3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 25 10:06:05 2019 +0100 wbemprox: Implement Win32_OperatingSystem.OperatingSystemSKU. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46895 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 11 +++++++++++ dlls/wbemprox/tests/query.c | 13 +++++++++++++ 2 files changed, 24 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index fc04f3f..d4c2630 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -314,6 +314,8 @@ static const WCHAR prop_numlogicalprocessorsW[] = {'N','u','m','b','e','r','O','f','L','o','g','i','c','a','l','P','r','o','c','e','s','s','o','r','s',0}; static const WCHAR prop_numprocessorsW[] = {'N','u','m','b','e','r','O','f','P','r','o','c','e','s','s','o','r','s',0}; +static const WCHAR prop_operatingsystemskuW[] = + {'O','p','e','r','a','t','i','n','g','S','y','s','t','e','m','S','K','U',0}; static const WCHAR prop_osarchitectureW[] = {'O','S','A','r','c','h','i','t','e','c','t','u','r','e',0}; static const WCHAR prop_oslanguageW[] = @@ -588,6 +590,7 @@ static const struct column col_os[] = { prop_localdatetimeW, CIM_DATETIME|COL_FLAG_DYNAMIC }, { prop_localeW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_operatingsystemskuW, CIM_UINT32, VT_I4 }, { prop_osarchitectureW, CIM_STRING }, { prop_oslanguageW, CIM_UINT32, VT_I4 }, { prop_osproductsuiteW, CIM_UINT32, VT_I4 }, @@ -1015,6 +1018,7 @@ struct record_operatingsystem const WCHAR *localdatetime; const WCHAR *locale; const WCHAR *name; + UINT32 operatingsystemsku; const WCHAR *osarchitecture; UINT32 oslanguage; UINT32 osproductsuite; @@ -3197,6 +3201,12 @@ static WCHAR *get_osversion( OSVERSIONINFOEXW *ver ) if (ret) sprintfW( ret, fmtW, ver->dwMajorVersion, ver->dwMinorVersion, ver->dwBuildNumber ); return ret; } +static DWORD get_operatingsystemsku(void) +{ + DWORD ret = PRODUCT_UNDEFINED; + GetProductInfo( 6, 0, 0, 0, &ret ); + return ret; +} static enum fill_status fill_os( struct table *table, const struct expr *cond ) { @@ -3222,6 +3232,7 @@ static enum fill_status fill_os( struct table *table, const struct expr *cond ) rec->localdatetime = get_localdatetime(); rec->locale = get_locale(); rec->name = get_osname( rec->caption ); + rec->operatingsystemsku = get_operatingsystemsku(); rec->osarchitecture = get_osarchitecture(); rec->oslanguage = GetSystemDefaultLangID(); rec->osproductsuite = 2461140; /* Windows XP Professional */ diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index b622ac2..510e7aa 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1234,6 +1234,7 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) static const WCHAR csdversionW[] = {'C','S','D','V','e','r','s','i','o','n',0}; static const WCHAR freephysicalmemoryW[] = {'F','r','e','e','P','h','y','s','i','c','a','l','M','e','m','o','r','y',0}; static const WCHAR nameW[] = {'N','a','m','e',0}; + static const WCHAR operatingsystemskuW[] = {'O','p','e','r','a','t','i','n','g','S','y','s','t','e','m','S','K','U',0}; static const WCHAR osproductsuiteW[] = {'O','S','P','r','o','d','u','c','t','S','u','i','t','e',0}; static const WCHAR ostypeW[] = {'O','S','T','y','p','e',0}; static const WCHAR suitemaskW[] = {'S','u','i','t','e','M','a','s','k',0}; @@ -1315,6 +1316,18 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) type = 0xdeadbeef; VariantInit( &val ); + hr = IWbemClassObject_Get( obj, operatingsystemskuW, 0, &val, &type, NULL ); + ok( hr == S_OK || broken(hr == WBEM_E_NOT_FOUND) /* winxp */, "failed to get operatingsystemsku %08x\n", hr ); + if (hr == S_OK) + { + ok( V_VT( &val ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_UINT32, "unexpected type 0x%x\n", type ); + trace( "operatingsystemsku: %08x\n", V_I4( &val ) ); + VariantClear( &val ); + } + + type = 0xdeadbeef; + VariantInit( &val ); hr = IWbemClassObject_Get( obj, osproductsuiteW, 0, &val, &type, NULL ); ok( hr == S_OK, "failed to get osproductsuite %08x\n", hr ); ok( V_VT( &val ) == VT_I4 || broken(V_VT( &val ) == VT_NULL) /* winxp */, "unexpected variant type 0x%x\n", V_VT( &val ) );

1 0

Zebediah Figura : wined3d: Clean up lights in wined3d_stateblock_cleanup() .
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: cc5c9e8dff4840769a6cddda890cbfdd666bf830 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc5c9e8dff4840769a6cddda… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 24 11:32:43 2019 -0500 wined3d: Clean up lights in wined3d_stateblock_cleanup(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46829 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/stateblock.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index ee552c1..38f124c 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -523,6 +523,7 @@ void state_unbind_resources(struct wined3d_state *state) void wined3d_stateblock_state_cleanup(struct wined3d_stateblock_state *state) { + struct wined3d_light_info *light, *cursor; struct wined3d_vertex_declaration *decl; struct wined3d_texture *texture; struct wined3d_buffer *buffer; @@ -570,6 +571,15 @@ void wined3d_stateblock_state_cleanup(struct wined3d_stateblock_state *state) wined3d_texture_decref(texture); } } + + for (i = 0; i < LIGHTMAP_SIZE; ++i) + { + LIST_FOR_EACH_ENTRY_SAFE(light, cursor, &state->light_state.light_map[i], struct wined3d_light_info, entry) + { + list_remove(&light->entry); + heap_free(light); + } + } } void state_cleanup(struct wined3d_state *state)

1 0

Stefan Dösinger : wined3d: Adjust video memory when resizing swapchain buffers.
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: 9e20eda421a961e765ef4de17532477f14428101 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e20eda421a961e765ef4de1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 25 11:11:58 2019 +0300 wined3d: Adjust video memory when resizing swapchain buffers. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 55c9543..9494920 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1531,6 +1531,7 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT const struct wined3d_d3d_info *d3d_info; const struct wined3d_gl_info *gl_info; const struct wined3d_format *format; + const struct wined3d *d3d; struct wined3d_device *device; unsigned int resource_size; DWORD valid_location = 0; @@ -1541,6 +1542,7 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT texture, width, height, debug_d3dformat(format_id), multisample_type, multisample_quality, mem, pitch); device = texture->resource.device; + d3d = device->wined3d; gl_info = &device->adapter->gl_info; d3d_info = &device->adapter->d3d_info; format = wined3d_get_format(device->adapter, format_id, texture->resource.bind_flags); @@ -1608,6 +1610,8 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT texture->resource.multisample_quality = multisample_quality; texture->resource.width = width; texture->resource.height = height; + if (!(texture->resource.access & WINED3D_RESOURCE_ACCESS_CPU) && d3d->flags & WINED3D_VIDMEM_ACCOUNTING) + adapter_adjust_memory(device->adapter, (INT64)texture->slice_pitch - texture->resource.size); texture->resource.size = texture->slice_pitch; sub_resource->size = texture->slice_pitch; sub_resource->locations = WINED3D_LOCATION_DISCARDED;

1 0

Jacek Caban : mshtml: Introduce new CSSStyle type as a base for different style object implementations.
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: 66e918fc0769505ef4289e64653e5b720b960fb2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66e918fc0769505ef4289e64… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 25 15:12:04 2019 +0100 mshtml: Introduce new CSSStyle type as a base for different style object implementations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 40 ++++++++++++++++++++-------------------- dlls/mshtml/htmlstyle.h | 6 +++++- 2 files changed, 25 insertions(+), 21 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 76fbe11..ccaadcc 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -986,7 +986,7 @@ static inline HRESULT set_style_property(HTMLStyle *style, styleid_t sid, const } if(!*iter) { WARN("invalid value %s\n", debugstr_w(value)); - set_nsstyle_property(style->nsstyle, sid, emptyW); + set_nsstyle_property(style->css_style.nsstyle, sid, emptyW); return E_INVALIDARG; } } @@ -997,7 +997,7 @@ static inline HRESULT set_style_property(HTMLStyle *style, styleid_t sid, const val = fix_url_value(value); } - hres = set_nsstyle_property(style->nsstyle, sid, val ? val : value); + hres = set_nsstyle_property(style->css_style.nsstyle, sid, val ? val : value); heap_free(val); return hres; } @@ -1147,12 +1147,12 @@ HRESULT get_nsstyle_property_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t s static inline HRESULT get_style_property(HTMLStyle *This, styleid_t sid, BSTR *p) { - return get_nsstyle_property(This->nsstyle, sid, dispex_compat_mode(&This->dispex), p); + return get_nsstyle_property(This->css_style.nsstyle, sid, dispex_compat_mode(&This->dispex), p); } static inline HRESULT get_style_property_var(HTMLStyle *This, styleid_t sid, VARIANT *v) { - return get_nsstyle_property_var(This->nsstyle, sid, dispex_compat_mode(&This->dispex), v); + return get_nsstyle_property_var(This->css_style.nsstyle, sid, dispex_compat_mode(&This->dispex), v); } static HRESULT check_style_attr_value(HTMLStyle *This, styleid_t sid, LPCWSTR exval, VARIANT_BOOL *p) @@ -1162,7 +1162,7 @@ static HRESULT check_style_attr_value(HTMLStyle *This, styleid_t sid, LPCWSTR ex nsAString_Init(&str_value, NULL); - get_nsstyle_attr_nsval(This->nsstyle, sid, &str_value); + get_nsstyle_attr_nsval(This->css_style.nsstyle, sid, &str_value); nsAString_GetData(&str_value, &value); *p = variant_bool(!strcmpW(value, exval)); @@ -1204,7 +1204,7 @@ static HRESULT get_nsstyle_pos(HTMLStyle *This, styleid_t sid, float *p) nsAString_Init(&str_value, NULL); - hres = get_nsstyle_attr_nsval(This->nsstyle, sid, &str_value); + hres = get_nsstyle_attr_nsval(This->css_style.nsstyle, sid, &str_value); if(hres == S_OK) { WCHAR *ptr; @@ -1240,7 +1240,7 @@ static HRESULT get_nsstyle_pixel_val(HTMLStyle *This, styleid_t sid, LONG *p) nsAString_Init(&str_value, NULL); - hres = get_nsstyle_attr_nsval(This->nsstyle, sid, &str_value); + hres = get_nsstyle_attr_nsval(This->css_style.nsstyle, sid, &str_value); if(hres == S_OK) { WCHAR *ptr = NULL; const PRUnichar *value; @@ -1332,8 +1332,8 @@ static ULONG WINAPI HTMLStyle_Release(IHTMLStyle *iface) if(!ref) { assert(!This->elem); - if(This->nsstyle) - nsIDOMCSSStyleDeclaration_Release(This->nsstyle); + if(This->css_style.nsstyle) + nsIDOMCSSStyleDeclaration_Release(This->css_style.nsstyle); release_dispex(&This->dispex); heap_free(This); } @@ -1622,7 +1622,7 @@ static HRESULT WINAPI HTMLStyle_put_backgroundPositionX(IHTMLStyle *iface, VARIA val_len = val ? strlenW(val) : 0; nsAString_Init(&pos_str, NULL); - hres = get_nsstyle_attr_nsval(This->nsstyle, STYLEID_BACKGROUND_POSITION, &pos_str); + hres = get_nsstyle_attr_nsval(This->css_style.nsstyle, STYLEID_BACKGROUND_POSITION, &pos_str); if(SUCCEEDED(hres)) { const PRUnichar *pos, *posy; DWORD posy_len; @@ -1668,7 +1668,7 @@ static HRESULT WINAPI HTMLStyle_get_backgroundPositionX(IHTMLStyle *iface, VARIA TRACE("(%p)->(%p)\n", This, p); nsAString_Init(&pos_str, NULL); - hres = get_nsstyle_attr_nsval(This->nsstyle, STYLEID_BACKGROUND_POSITION, &pos_str); + hres = get_nsstyle_attr_nsval(This->css_style.nsstyle, STYLEID_BACKGROUND_POSITION, &pos_str); if(SUCCEEDED(hres)) { const PRUnichar *pos, *space; @@ -1715,7 +1715,7 @@ static HRESULT WINAPI HTMLStyle_put_backgroundPositionY(IHTMLStyle *iface, VARIA val_len = val ? strlenW(val) : 0; nsAString_Init(&pos_str, NULL); - hres = get_nsstyle_attr_nsval(This->nsstyle, STYLEID_BACKGROUND_POSITION, &pos_str); + hres = get_nsstyle_attr_nsval(This->css_style.nsstyle, STYLEID_BACKGROUND_POSITION, &pos_str); if(SUCCEEDED(hres)) { const PRUnichar *pos, *space; DWORD posx_len; @@ -1764,7 +1764,7 @@ static HRESULT WINAPI HTMLStyle_get_backgroundPositionY(IHTMLStyle *iface, VARIA TRACE("(%p)->(%p)\n", This, p); nsAString_Init(&pos_str, NULL); - hres = get_nsstyle_attr_nsval(This->nsstyle, STYLEID_BACKGROUND_POSITION, &pos_str); + hres = get_nsstyle_attr_nsval(This->css_style.nsstyle, STYLEID_BACKGROUND_POSITION, &pos_str); if(SUCCEEDED(hres)) { const PRUnichar *pos, *posy; @@ -3093,7 +3093,7 @@ static void set_opacity(HTMLStyle *This, const WCHAR *val) nsAString_InitDepend(&val_str, val); nsAString_InitDepend(&empty_str, emptyW); - nsres = nsIDOMCSSStyleDeclaration_SetProperty(This->nsstyle, &name_str, &val_str, &empty_str); + nsres = nsIDOMCSSStyleDeclaration_SetProperty(This->css_style.nsstyle, &name_str, &val_str, &empty_str); if(NS_FAILED(nsres)) ERR("SetProperty failed: %08x\n", nsres); @@ -3356,7 +3356,7 @@ static HRESULT WINAPI HTMLStyle_removeAttribute(IHTMLStyle *iface, BSTR strAttri nsAString_InitDepend(&name_str, style_entry->name); nsAString_Init(&ret_str, NULL); - nsres = nsIDOMCSSStyleDeclaration_RemoveProperty(This->nsstyle, &name_str, &ret_str); + nsres = nsIDOMCSSStyleDeclaration_RemoveProperty(This->css_style.nsstyle, &name_str, &ret_str); if(NS_SUCCEEDED(nsres)) { const PRUnichar *ret; nsAString_GetData(&ret_str, &ret); @@ -5189,7 +5189,7 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_removeProperty(IHTMLCSSStyleDeclar style_entry = lookup_style_tbl(bstrPropertyName); nsAString_InitDepend(&name_str, style_entry ? style_entry->name : bstrPropertyName); nsAString_Init(&ret_str, NULL); - nsres = nsIDOMCSSStyleDeclaration_RemoveProperty(This->nsstyle, &name_str, &ret_str); + nsres = nsIDOMCSSStyleDeclaration_RemoveProperty(This->css_style.nsstyle, &name_str, &ret_str); nsAString_Finish(&name_str); return return_nsstr(nsres, &ret_str, pbstrPropertyValue); } @@ -5223,7 +5223,7 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_setProperty(IHTMLCSSStyleDeclarati nsAString_InitDepend(&name_str, style_entry ? style_entry->name : name); nsAString_InitDepend(&value_str, val); - nsres = nsIDOMCSSStyleDeclaration_SetProperty(This->nsstyle, &name_str, &value_str, &priority_str); + nsres = nsIDOMCSSStyleDeclaration_SetProperty(This->css_style.nsstyle, &name_str, &value_str, &priority_str); nsAString_Finish(&name_str); nsAString_Finish(&value_str); nsAString_Finish(&priority_str); @@ -6231,7 +6231,7 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_put_cssText(IHTMLCSSStyleDeclarati TRACE("(%p)->(%s)\n", This, debugstr_w(v)); nsAString_InitDepend(&text_str, v); - nsres = nsIDOMCSSStyleDeclaration_SetCssText(This->nsstyle, &text_str); + nsres = nsIDOMCSSStyleDeclaration_SetCssText(This->css_style.nsstyle, &text_str); nsAString_Finish(&text_str); if(NS_FAILED(nsres)) { FIXME("SetCssStyle failed: %08x\n", nsres); @@ -6251,7 +6251,7 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_get_cssText(IHTMLCSSStyleDeclarati /* NOTE: Quicks mode should use different formatting (uppercase, no ';' at the end of rule). */ nsAString_Init(&text_str, NULL); - nsres = nsIDOMCSSStyleDeclaration_GetCssText(This->nsstyle, &text_str); + nsres = nsIDOMCSSStyleDeclaration_GetCssText(This->css_style.nsstyle, &text_str); return return_nsstr(nsres, &text_str, p); } @@ -10205,7 +10205,7 @@ HRESULT HTMLStyle_Create(HTMLElement *elem, HTMLStyle **ret) style->IHTMLCSSStyleDeclaration2_iface.lpVtbl = &HTMLCSSStyleDeclaration2Vtbl; style->ref = 1; - style->nsstyle = nsstyle; + style->css_style.nsstyle = nsstyle; style->elem = elem; nsIDOMCSSStyleDeclaration_AddRef(nsstyle); diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 9908fc9..08c75ca 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -16,8 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +typedef struct { + nsIDOMCSSStyleDeclaration *nsstyle; +} CSSStyle; + struct HTMLStyle { DispatchEx dispex; + CSSStyle css_style; IHTMLStyle IHTMLStyle_iface; IHTMLStyle2 IHTMLStyle2_iface; IHTMLStyle3 IHTMLStyle3_iface; @@ -29,7 +34,6 @@ struct HTMLStyle { LONG ref; - nsIDOMCSSStyleDeclaration *nsstyle; HTMLElement *elem; };

1 0

Jacek Caban : mshtml: Move style DispatchEx to CSSStyle.
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: 0a073a2cbea37ebdbf0b7db3103c915dafafa58e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a073a2cbea37ebdbf0b7db3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 25 15:12:28 2019 +0100 mshtml: Move style DispatchEx to CSSStyle. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 90 ++++++++++++++++++++++++------------------------- dlls/mshtml/htmlstyle.h | 2 +- 2 files changed, 46 insertions(+), 46 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0a073a2cbea37ebdbf0b…

1 0

Jacek Caban : mshtml: Forward HTMLStyle IUnknown calls to IHTMLCSSStyleDeclaration implementation.
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: 0097dd1c6de8965d294c4d2d538aea189a9a3192 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0097dd1c6de8965d294c4d2d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 25 15:13:30 2019 +0100 mshtml: Forward HTMLStyle IUnknown calls to IHTMLCSSStyleDeclaration implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 103 ++++++++++++++++++++++++------------------------ 1 file changed, 51 insertions(+), 52 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 2637145..b5e918b 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -1280,65 +1280,19 @@ static inline HTMLStyle *impl_from_IHTMLStyle(IHTMLStyle *iface) static HRESULT WINAPI HTMLStyle_QueryInterface(IHTMLStyle *iface, REFIID riid, void **ppv) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - - TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); - - if(IsEqualGUID(&IID_IUnknown, riid)) { - *ppv = &This->IHTMLStyle_iface; - }else if(IsEqualGUID(&IID_IHTMLCSSStyleDeclaration, riid)) { - *ppv = &This->IHTMLCSSStyleDeclaration_iface; - }else if(IsEqualGUID(&IID_IHTMLCSSStyleDeclaration2, riid)) { - *ppv = &This->IHTMLCSSStyleDeclaration2_iface; - }else if(IsEqualGUID(&IID_IHTMLStyle, riid)) { - *ppv = &This->IHTMLStyle_iface; - }else if(IsEqualGUID(&IID_IHTMLStyle2, riid)) { - *ppv = &This->IHTMLStyle2_iface; - }else if(IsEqualGUID(&IID_IHTMLStyle3, riid)) { - *ppv = &This->IHTMLStyle3_iface; - }else if(IsEqualGUID(&IID_IHTMLStyle4, riid)) { - *ppv = &This->IHTMLStyle4_iface; - }else if(IsEqualGUID(&IID_IHTMLStyle5, riid)) { - *ppv = &This->IHTMLStyle5_iface; - }else if(IsEqualGUID(&IID_IHTMLStyle6, riid)) { - *ppv = &This->IHTMLStyle6_iface; - }else if(dispex_query_interface(&This->css_style.dispex, riid, ppv)) { - return *ppv ? S_OK : E_NOINTERFACE; - }else { - *ppv = NULL; - WARN("unsupported iface %s\n", debugstr_mshtml_guid(riid)); - return E_NOINTERFACE; - } - - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; + return IHTMLCSSStyleDeclaration_QueryInterface(&This->IHTMLCSSStyleDeclaration_iface, riid, ppv); } static ULONG WINAPI HTMLStyle_AddRef(IHTMLStyle *iface) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - LONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p) ref=%d\n", This, ref); - - return ref; + return IHTMLCSSStyleDeclaration_AddRef(&This->IHTMLCSSStyleDeclaration_iface); } static ULONG WINAPI HTMLStyle_Release(IHTMLStyle *iface) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - LONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p) ref=%d\n", This, ref); - - if(!ref) { - assert(!This->elem); - if(This->css_style.nsstyle) - nsIDOMCSSStyleDeclaration_Release(This->css_style.nsstyle); - release_dispex(&This->css_style.dispex); - heap_free(This); - } - - return ref; + return IHTMLCSSStyleDeclaration_Release(&This->IHTMLCSSStyleDeclaration_iface); } static HRESULT WINAPI HTMLStyle_GetTypeInfoCount(IHTMLStyle *iface, UINT *pctinfo) @@ -5098,19 +5052,64 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_QueryInterface(IHTMLCSSStyleDeclar REFIID riid, void **ppv) { HTMLStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); - return IHTMLStyle_QueryInterface(&This->IHTMLStyle_iface, riid, ppv); + + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + + if(IsEqualGUID(&IID_IUnknown, riid)) { + *ppv = &This->IHTMLStyle_iface; + }else if(IsEqualGUID(&IID_IHTMLCSSStyleDeclaration, riid)) { + *ppv = &This->IHTMLCSSStyleDeclaration_iface; + }else if(IsEqualGUID(&IID_IHTMLCSSStyleDeclaration2, riid)) { + *ppv = &This->IHTMLCSSStyleDeclaration2_iface; + }else if(IsEqualGUID(&IID_IHTMLStyle, riid)) { + *ppv = &This->IHTMLStyle_iface; + }else if(IsEqualGUID(&IID_IHTMLStyle2, riid)) { + *ppv = &This->IHTMLStyle2_iface; + }else if(IsEqualGUID(&IID_IHTMLStyle3, riid)) { + *ppv = &This->IHTMLStyle3_iface; + }else if(IsEqualGUID(&IID_IHTMLStyle4, riid)) { + *ppv = &This->IHTMLStyle4_iface; + }else if(IsEqualGUID(&IID_IHTMLStyle5, riid)) { + *ppv = &This->IHTMLStyle5_iface; + }else if(IsEqualGUID(&IID_IHTMLStyle6, riid)) { + *ppv = &This->IHTMLStyle6_iface; + }else if(dispex_query_interface(&This->css_style.dispex, riid, ppv)) { + return *ppv ? S_OK : E_NOINTERFACE; + }else { + *ppv = NULL; + WARN("unsupported iface %s\n", debugstr_mshtml_guid(riid)); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } static ULONG WINAPI HTMLCSSStyleDeclaration_AddRef(IHTMLCSSStyleDeclaration *iface) { HTMLStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); - return IHTMLStyle_AddRef(&This->IHTMLStyle_iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; } static ULONG WINAPI HTMLCSSStyleDeclaration_Release(IHTMLCSSStyleDeclaration *iface) { HTMLStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); - return IHTMLStyle_Release(&This->IHTMLStyle_iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) { + if(This->css_style.nsstyle) + nsIDOMCSSStyleDeclaration_Release(This->css_style.nsstyle); + release_dispex(&This->css_style.dispex); + heap_free(This); + } + + return ref; } static HRESULT WINAPI HTMLCSSStyleDeclaration_GetTypeInfoCount(IHTMLCSSStyleDeclaration *iface,

1 0

Jacek Caban : mshtml: Pass style as CSSStyle to set_style_property.
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: 989df1851dc7f23a706ab5442bf39d914b253c35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=989df1851dc7f23a706ab544… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 25 15:13:39 2019 +0100 mshtml: Pass style as CSSStyle to set_style_property. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 226 ++++++++++++++++++++++++------------------------ 1 file changed, 113 insertions(+), 113 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=989df1851dc7f23a706a…

1 0

Jacek Caban : mshtml: Pass style as CSSStyle to set_style_property_var.
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: bff44d514ccb5c2336abb6937d40c1e9eca2d84e URL: https://source.winehq.org/git/wine.git/?a=commit;h=bff44d514ccb5c2336abb693… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 25 15:13:49 2019 +0100 mshtml: Pass style as CSSStyle to set_style_property_var. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 156 ++++++++++++++++++++++++------------------------ 1 file changed, 78 insertions(+), 78 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bff44d514ccb5c2336ab…

1 0

Jacek Caban : mshtml: Pass style as CSSStyle to get_style_property.
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: 4709d9c553172394bb81b504c1f8f1fb2e334b24 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4709d9c553172394bb81b504… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 25 15:13:56 2019 +0100 mshtml: Pass style as CSSStyle to get_style_property. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 202 ++++++++++++++++++++++++------------------------ 1 file changed, 101 insertions(+), 101 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4709d9c553172394bb81…

1 0

Jacek Caban : mshtml: Pass style as CSSStyle to get_style_property_var.
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: 153f666b64487044768d425f8e78a1ef281246b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=153f666b64487044768d425f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 25 15:14:13 2019 +0100 mshtml: Pass style as CSSStyle to get_style_property_var. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 146 ++++++++++++++++++++++++------------------------ 1 file changed, 73 insertions(+), 73 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=153f666b64487044768d…

1 0