February 2018 - Wine-Commits

Nikolay Sivov : comctl32/button: Use the global memory allocation helpers.
by Alexandre Julliard Feb. 13, 2018

Feb. 13, 2018

Module: wine Branch: master Commit: 9d897b73a877e5eaae26df87930c951ff8273c14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d897b73a877e5eaae26df87… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 13 16:19:58 2018 +0300 comctl32/button: Use the global memory allocation helpers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index dccddf9..7184d19 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -67,6 +67,7 @@ #include "uxtheme.h" #include "vssym32.h" #include "wine/debug.h" +#include "wine/heap.h" #include "comctl32.h" @@ -224,7 +225,7 @@ static inline void paint_button( HWND hwnd, LONG style, UINT action ) static inline WCHAR *get_button_text( HWND hwnd ) { INT len = GetWindowTextLengthW( hwnd ); - WCHAR *buffer = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ); + WCHAR *buffer = heap_alloc( (len + 1) * sizeof(WCHAR) ); if (buffer) GetWindowTextW( hwnd, buffer, len + 1 ); return buffer; @@ -732,14 +733,14 @@ static UINT BUTTON_CalcLabelRect(HWND hwnd, HDC hdc, RECT *rc) if (!(text = get_button_text( hwnd ))) goto empty_rect; if (!text[0]) { - HeapFree( GetProcessHeap(), 0, text ); + heap_free( text ); goto empty_rect; } if ((hFont = get_button_font( hwnd ))) hPrevFont = SelectObject( hdc, hFont ); DrawTextW(hdc, text, -1, &r, dtStyle | DT_CALCRECT); if (hPrevFont) SelectObject( hdc, hPrevFont ); - HeapFree( GetProcessHeap(), 0, text ); + heap_free( text ); break; } @@ -873,7 +874,7 @@ static void BUTTON_DrawLabel(HWND hwnd, HDC hdc, UINT dtFlags, const RECT *rc) DrawStateW(hdc, hbr, lpOutputProc, lp, wp, rc->left, rc->top, rc->right - rc->left, rc->bottom - rc->top, flags); - HeapFree( GetProcessHeap(), 0, text ); + heap_free( text ); } /********************************************************************** @@ -1278,7 +1279,7 @@ static void PB_ThemedPaint(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawSta if (text) { DrawThemeText(theme, hDC, BP_PUSHBUTTON, state, text, lstrlenW(text), dtFlags, 0, &textRect); - HeapFree(GetProcessHeap(), 0, text); + heap_free(text); } if (focused) @@ -1378,7 +1379,7 @@ static void CB_ThemedPaint(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawSta DrawFocusRect( hDC, &focusRect ); } - HeapFree(GetProcessHeap(), 0, text); + heap_free(text); } if (created_font) DeleteObject(font); @@ -1438,7 +1439,7 @@ static void GB_ThemedPaint(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawSta { InflateRect(&textRect, -2, 0); DrawThemeText(theme, hDC, BP_GROUPBOX, state, text, lstrlenW(text), 0, 0, &textRect); - HeapFree(GetProcessHeap(), 0, text); + heap_free(text); } if (created_font) DeleteObject(font);

1 0

Michael Müller : include: Add run level information enum and structure to winnt.h.
by Alexandre Julliard Feb. 13, 2018

Feb. 13, 2018

Module: wine Branch: master Commit: 0a7d627ca3d4bb864a33d093edceea08ffbce05d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a7d627ca3d4bb864a33d093… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Feb 13 02:58:12 2018 +0000 include: Add run level information enum and structure to winnt.h. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 04f00a6..855d2a8 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -5763,16 +5763,33 @@ typedef struct _ACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION { } ACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION, *PACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION; #endif +typedef enum { + ACTCTX_RUN_LEVEL_UNSPECIFIED = 0, + ACTCTX_RUN_LEVEL_AS_INVOKER, + ACTCTX_RUN_LEVEL_HIGHEST_AVAILABLE, + ACTCTX_RUN_LEVEL_REQUIRE_ADMIN, + ACTCTX_RUN_LEVEL_NUMBERS +} ACTCTX_REQUESTED_RUN_LEVEL; + +typedef struct _ACTIVATION_CONTEXT_RUN_LEVEL_INFORMATION { + DWORD ulFlags; + ACTCTX_REQUESTED_RUN_LEVEL RunLevel; + DWORD UiAccess; +} ACTIVATION_CONTEXT_RUN_LEVEL_INFORMATION, *PACTIVATION_CONTEXT_RUN_LEVEL_INFORMATION; + +typedef const struct _ACTIVATION_CONTEXT_RUN_LEVEL_INFORMATION *PCACTIVATION_CONTEXT_RUN_LEVEL_INFORMATION; + typedef enum _ACTIVATION_CONTEXT_INFO_CLASS { ActivationContextBasicInformation = 1, ActivationContextDetailedInformation = 2, AssemblyDetailedInformationInActivationContext = 3, FileInformationInAssemblyOfAssemblyInActivationContext = 4, + RunlevelInformationInActivationContext = 5, CompatibilityInformationInActivationContext = 6, + ActivationContextManifestResourceName = 7, MaxActivationContextInfoClass, - - AssemblyDetailedInformationInActivationContxt = 3, - FileInformationInAssemblyOfAssemblyInActivationContxt = 4 + AssemblyDetailedInformationInActivationContxt = AssemblyDetailedInformationInActivationContext, + FileInformationInAssemblyOfAssemblyInActivationContxt = FileInformationInAssemblyOfAssemblyInActivationContext } ACTIVATION_CONTEXT_INFO_CLASS; #define ACTIVATION_CONTEXT_PATH_TYPE_NONE 1

1 0

Józef Kucia : wined3d: Avoid raw blits when resolving multisample textures.
by Alexandre Julliard Feb. 13, 2018

Feb. 13, 2018

Module: wine Branch: master Commit: 53ddba5305b9eb4280214227d8a23703cef77f66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53ddba5305b9eb4280214227… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 12 18:46:18 2018 +0100 wined3d: Avoid raw blits when resolving multisample textures. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index df0481f..00bc4e4 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3778,7 +3778,7 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst DWORD src_ds_flags, dst_ds_flags; struct wined3d_context *context; enum wined3d_blit_op blit_op; - BOOL scale, convert; + BOOL scale, convert, resolve; static const DWORD simple_blit = WINED3D_BLT_SRC_CKEY | WINED3D_BLT_SRC_CKEY_OVERRIDE @@ -3844,6 +3844,7 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst scale = src_rect->right - src_rect->left != dst_rect->right - dst_rect->left || src_rect->bottom - src_rect->top != dst_rect->bottom - dst_rect->top; convert = src_texture->resource.format->id != dst_texture->resource.format->id; + resolve = src_texture->resource.multisample_type != dst_texture->resource.multisample_type; dst_ds_flags = dst_texture->resource.format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); @@ -3954,7 +3955,7 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst return WINED3D_OK; } - else if ((flags & WINED3D_BLT_RAW) || (!scale && !convert)) + else if ((flags & WINED3D_BLT_RAW) || (!scale && !convert && !resolve)) { blit_op = WINED3D_BLIT_OP_RAW_BLIT; }

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_ResolveSubresource().
by Alexandre Julliard Feb. 13, 2018

Feb. 13, 2018

Module: wine Branch: master Commit: 410ffa37f2418a96988ac4f76b39b9a6424630be URL: https://source.winehq.org/git/wine.git/?a=commit;h=410ffa37f2418a96988ac4f7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 12 18:46:20 2018 +0100 d3d11: Implement d3d11_immediate_context_ResolveSubresource(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 21 +++++++++++++++++---- dlls/d3d11/tests/d3d11.c | 3 --- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index f9db15f..5873be6 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1179,10 +1179,23 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ResolveSubresource(ID3D11D ID3D11Resource *src_resource, UINT src_subresource_idx, DXGI_FORMAT format) { - FIXME("iface %p, dst_resource %p, dst_subresource_idx %u, src_resource %p, src_subresource_idx %u, " - "format %s stub!\n", - iface, dst_resource, dst_subresource_idx, src_resource, src_subresource_idx, - debug_dxgi_format(format)); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct wined3d_resource *wined3d_dst_resource, *wined3d_src_resource; + enum wined3d_format_id wined3d_format; + + TRACE("iface %p, dst_resource %p, dst_subresource_idx %u, " + "src_resource %p, src_subresource_idx %u, format %s.\n", + iface, dst_resource, dst_subresource_idx, + src_resource, src_subresource_idx, debug_dxgi_format(format)); + + wined3d_dst_resource = wined3d_resource_from_d3d11_resource(dst_resource); + wined3d_src_resource = wined3d_resource_from_d3d11_resource(src_resource); + wined3d_format = wined3dformat_from_dxgi_format(format); + wined3d_mutex_lock(); + wined3d_device_resolve_sub_resource(device->wined3d_device, + wined3d_dst_resource, dst_subresource_idx, + wined3d_src_resource, src_subresource_idx, wined3d_format); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_ExecuteCommandList(ID3D11DeviceContext *iface, diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 93184ad..e0769a7 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -24999,13 +24999,10 @@ static void test_alpha_to_coverage(void) get_texture_readback(readback_texture, 0, &rb); SetRect(&rect, 0, 0, 200, 200); - todo_wine check_readback_data_color(&rb, &rect, expected_color, 1); SetRect(&rect, 200, 0, 640, 200); - todo_wine check_readback_data_color(&rb, &rect, 0xffffffff, 1); SetRect(&rect, 0, 200, 640, 480); - todo_wine check_readback_data_color(&rb, &rect, 0xffffffff, 1); release_resource_readback(&rb); }

1 0

Henri Verbeet : d3d9: Set WINED3D_RESOURCE_ACCESS_MAP on 2D textures.
by Alexandre Julliard Feb. 13, 2018

Feb. 13, 2018

Module: wine Branch: master Commit: 5ceaf934de5e9241e8466a074ac3cab3aaad6dae URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ceaf934de5e9241e8466a07… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 13 13:20:44 2018 +0330 d3d9: Set WINED3D_RESOURCE_ACCESS_MAP on 2D textures. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 2 +- dlls/d3d9/texture.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 3bd23b6..c955764 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1273,7 +1273,7 @@ static HRESULT d3d9_device_create_surface(struct d3d9_device *device, UINT width desc.usage = usage & WINED3DUSAGE_MASK; if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; - desc.access = wined3daccess_from_d3dpool(pool); + desc.access = wined3daccess_from_d3dpool(pool) | WINED3D_RESOURCE_ACCESS_MAP; desc.width = width; desc.height = height; desc.depth = 1; diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 6b7a30c..5abf2d0 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1222,7 +1222,7 @@ HRESULT texture_init(struct d3d9_texture *texture, struct d3d9_device *device, desc.usage |= WINED3DUSAGE_TEXTURE; if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; - desc.access = wined3daccess_from_d3dpool(pool); + desc.access = wined3daccess_from_d3dpool(pool) | WINED3D_RESOURCE_ACCESS_MAP; desc.width = width; desc.height = height; desc.depth = 1; @@ -1277,7 +1277,7 @@ HRESULT cubetexture_init(struct d3d9_texture *texture, struct d3d9_device *devic desc.usage |= WINED3DUSAGE_LEGACY_CUBEMAP | WINED3DUSAGE_TEXTURE; if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; - desc.access = wined3daccess_from_d3dpool(pool); + desc.access = wined3daccess_from_d3dpool(pool) | WINED3D_RESOURCE_ACCESS_MAP; desc.width = edge_length; desc.height = edge_length; desc.depth = 1;

1 0

Nikolay Sivov : comctl32/combo: Merge theming logic.
by Alexandre Julliard Feb. 13, 2018

Feb. 13, 2018

Module: wine Branch: master Commit: 694602eab1dc2236dc91d93f6d7328699f0cede7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=694602eab1dc2236dc91d93f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 13 10:56:37 2018 +0300 comctl32/combo: Merge theming logic. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/Makefile.in | 1 - dlls/comctl32/combo.c | 173 +++++++++++++++++------- dlls/comctl32/theme_combo.c | 319 -------------------------------------------- dlls/comctl32/theming.c | 5 - 4 files changed, 126 insertions(+), 372 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=694602eab1dc2236dc91…

1 0

Jacek Caban : mshtml: Handle non-HTML element in IHTMLSelectElement: add implementation.
by Alexandre Julliard Feb. 13, 2018

Feb. 13, 2018

Module: wine Branch: master Commit: a4ad2cf82505c1458419103b66cfd02d41f7ccf3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4ad2cf82505c1458419103b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 12 23:28:26 2018 +0100 mshtml: Handle non-HTML element in IHTMLSelectElement:add implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlselect.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 5a116a7..8f33941 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -425,6 +425,11 @@ static HRESULT WINAPI HTMLSelectElement_add(IHTMLSelectElement *iface, IHTMLElem return E_INVALIDARG; } + if(!element_obj->html_element) { + FIXME("Not HTML element\n"); + return E_NOTIMPL; + } + nsvariant = create_nsvariant(); if(!nsvariant) return E_FAIL; @@ -444,7 +449,7 @@ static HRESULT WINAPI HTMLSelectElement_add(IHTMLSelectElement *iface, IHTMLElem } if(NS_SUCCEEDED(nsres)) - nsres = nsIDOMHTMLSelectElement_Add(This->nsselect, element_obj->nselem, (nsIVariant*)nsvariant); + nsres = nsIDOMHTMLSelectElement_Add(This->nsselect, element_obj->html_element, (nsIVariant*)nsvariant); nsIWritableVariant_Release(nsvariant); if(NS_FAILED(nsres)) { ERR("Add failed: %08x\n", nsres);

1 0

Jacek Caban : mshtml: Use nsIDOMElement instead of nsIDOMHTMLElement where possible.
by Alexandre Julliard Feb. 13, 2018

Feb. 13, 2018

Module: wine Branch: master Commit: fba6da7982c3ef21fe6c717b9f2963829c4f9f7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=fba6da7982c3ef21fe6c717b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 12 23:28:15 2018 +0100 mshtml: Use nsIDOMElement instead of nsIDOMHTMLElement where possible. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlattr.c | 4 ++-- dlls/mshtml/htmlcurstyle.c | 2 +- dlls/mshtml/htmlelemcol.c | 6 +++--- dlls/mshtml/htmlinput.c | 2 +- dlls/mshtml/htmloption.c | 6 +++--- dlls/mshtml/htmlscript.c | 2 +- dlls/mshtml/htmlstyle.c | 6 +++--- dlls/mshtml/script.c | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index e3a16df..61c6455 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -183,7 +183,7 @@ static HRESULT WINAPI HTMLDOMAttribute_get_specified(IHTMLDOMAttribute *iface, V TRACE("(%p)->(%p)\n", This, p); - if(!This->elem || !This->elem->nselem) { + if(!This->elem || !This->elem->dom_element) { FIXME("NULL This->elem\n"); return E_UNEXPECTED; } @@ -199,7 +199,7 @@ static HRESULT WINAPI HTMLDOMAttribute_get_specified(IHTMLDOMAttribute *iface, V /* FIXME: This is not exactly right, we have some attributes that don't map directly to Gecko attributes. */ nsAString_InitDepend(&nsname, name); - nsres = nsIDOMHTMLElement_GetAttributeNode(This->elem->nselem, &nsname, &nsattr); + nsres = nsIDOMElement_GetAttributeNode(This->elem->dom_element, &nsname, &nsattr); nsAString_Finish(&nsname); SysFreeString(name); if(NS_FAILED(nsres)) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index a7daf4b..898fdd8 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -1345,7 +1345,7 @@ HRESULT HTMLCurrentStyle_Create(HTMLElement *elem, IHTMLCurrentStyle **p) assert(nsres == NS_OK); nsAString_Init(&nsempty_str, NULL); - nsres = nsIDOMWindow_GetComputedStyle(nswindow, (nsIDOMElement*)elem->nselem, &nsempty_str, &nsstyle); + nsres = nsIDOMWindow_GetComputedStyle(nswindow, elem->dom_element, &nsempty_str, &nsstyle); nsAString_Finish(&nsempty_str); nsIDOMWindow_Release(nswindow); if(NS_FAILED(nsres)) { diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index a851220..226cfe4 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -377,7 +377,7 @@ static BOOL is_elem_name(HTMLElement *elem, LPCWSTR name) static const PRUnichar nameW[] = {'n','a','m','e',0}; - if(!elem->nselem) + if(!elem->dom_element) return FALSE; nsAString_Init(&nsstr, NULL); @@ -507,10 +507,10 @@ static HRESULT WINAPI HTMLElementCollection_tags(IHTMLElementCollection *iface, nsAString_Init(&tag_str, NULL); for(i=0; i<This->len; i++) { - if(!This->elems[i]->nselem) + if(!This->elems[i]->dom_element) continue; - nsIDOMHTMLElement_GetTagName(This->elems[i]->nselem, &tag_str); + nsIDOMElement_GetTagName(This->elems[i]->dom_element, &tag_str); nsAString_GetData(&tag_str, &tag); if(CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, tag, -1, diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 03b0aae..ad8663c 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1590,7 +1590,7 @@ static HRESULT WINAPI HTMLLabelElement_put_htmlFor(IHTMLLabelElement *iface, BST nsAString_InitDepend(&for_str, forW); nsAString_InitDepend(&val_str, v); - nsres = nsIDOMHTMLElement_SetAttribute(This->element.nselem, &for_str, &val_str); + nsres = nsIDOMElement_SetAttribute(This->element.dom_element, &for_str, &val_str); nsAString_Finish(&for_str); nsAString_Finish(&val_str); if(NS_FAILED(nsres)) { diff --git a/dlls/mshtml/htmloption.c b/dlls/mshtml/htmloption.c index 43661b7..8210969 100644 --- a/dlls/mshtml/htmloption.c +++ b/dlls/mshtml/htmloption.c @@ -260,11 +260,11 @@ static HRESULT WINAPI HTMLOptionElement_put_text(IHTMLOptionElement *iface, BSTR while(1) { nsIDOMNode *child; - nsres = nsIDOMHTMLElement_GetFirstChild(This->element.nselem, &child); + nsres = nsIDOMElement_GetFirstChild(This->element.dom_element, &child); if(NS_FAILED(nsres) || !child) break; - nsres = nsIDOMHTMLElement_RemoveChild(This->element.nselem, child, &tmp); + nsres = nsIDOMElement_RemoveChild(This->element.dom_element, child, &tmp); nsIDOMNode_Release(child); if(NS_SUCCEEDED(nsres)) { nsIDOMNode_Release(tmp); @@ -282,7 +282,7 @@ static HRESULT WINAPI HTMLOptionElement_put_text(IHTMLOptionElement *iface, BSTR return E_FAIL; } - nsres = nsIDOMHTMLElement_AppendChild(This->element.nselem, (nsIDOMNode*)text_node, &tmp); + nsres = nsIDOMElement_AppendChild(This->element.dom_element, (nsIDOMNode*)text_node, &tmp); if(NS_SUCCEEDED(nsres)) nsIDOMNode_Release(tmp); else diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index c755add..c449d3f 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -200,7 +200,7 @@ static HRESULT WINAPI HTMLScriptElement_put_text(IHTMLScriptElement *iface, BSTR return E_FAIL; } - nsres = nsIDOMHTMLElement_GetParentNode(This->element.nselem, &parent); + nsres = nsIDOMElement_GetParentNode(This->element.dom_element, &parent); if(NS_FAILED(nsres) || !parent) { TRACE("No parent, not executing\n"); This->parse_on_bind = TRUE; diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index fcec264..b99ea08 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -4701,12 +4701,12 @@ static HRESULT get_style_from_elem(HTMLElement *elem, nsIDOMCSSStyleDeclaration nsIDOMElementCSSInlineStyle *nselemstyle; nsresult nsres; - if(!elem->nselem) { - FIXME("NULL nselem\n"); + if(!elem->dom_element) { + FIXME("comment element\n"); return E_NOTIMPL; } - nsres = nsIDOMHTMLElement_QueryInterface(elem->nselem, &IID_nsIDOMElementCSSInlineStyle, + nsres = nsIDOMElement_QueryInterface(elem->dom_element, &IID_nsIDOMElementCSSInlineStyle, (void**)&nselemstyle); assert(nsres == NS_OK); diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 72747af..0cd3162 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -905,7 +905,7 @@ static void script_file_available(ScriptBSC *bsc) return; } - nsres = nsIDOMHTMLElement_GetParentNode(script_elem->element.nselem, &parent); + nsres = nsIDOMElement_GetParentNode(script_elem->element.dom_element, &parent); if(NS_FAILED(nsres) || !parent) { TRACE("No parent, not executing\n"); script_elem->parse_on_bind = TRUE;

1 0

Jacek Caban : mshtml: Handle non-HTML elements in HTMLElement implementation.
by Alexandre Julliard Feb. 13, 2018

Feb. 13, 2018

Module: wine Branch: master Commit: a219fd31d665b28e2472c3c0d8bcc0f55b0fcbd8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a219fd31d665b28e2472c3c0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 12 23:27:56 2018 +0100 mshtml: Handle non-HTML elements in HTMLElement implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 133 +++++++++++++++++++++++++++++++++++-------------- 1 file changed, 95 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a219fd31d665b28e2472…

1 0

Jacek Caban : mshtml: Use nsIDOMElement instead of nsIDOMHTMLElement where possible in HTMLElement implementation.
by Alexandre Julliard Feb. 13, 2018

Feb. 13, 2018

Module: wine Branch: master Commit: 240fd267d9e139bbbd76781b96abc4d498ea6783 URL: https://source.winehq.org/git/wine.git/?a=commit;h=240fd267d9e139bbbd76781b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 12 23:27:34 2018 +0100 mshtml: Use nsIDOMElement instead of nsIDOMHTMLElement where possible in HTMLElement implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 140 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 93 insertions(+), 47 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=240fd267d9e139bbbd76…

1 0

Jacek Caban : mshtml: Added support for non-HTML elements.
by Alexandre Julliard Feb. 13, 2018

Feb. 13, 2018

Module: wine Branch: master Commit: b947229fa92e53aa7fa2f6c9b57cdfdd868164cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=b947229fa92e53aa7fa2f6c9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 12 23:29:04 2018 +0100 mshtml: Added support for non-HTML elements. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 27 ++++++++++++++------------- dlls/mshtml/mshtml_private.h | 5 ++--- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index cc6f542..06e91bc 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -5570,7 +5570,6 @@ void HTMLElement_Init(HTMLElement *This, HTMLDocumentNode *doc, nsIDOMElement *n assert((nsIDOMNode*)html_element == This->node.nsnode); nsIDOMHTMLElement_Release(html_element); } - This->nselem = This->html_element; } ConnectionPointContainer_Init(&This->cp_container, (IUnknown*)&This->IHTMLElement_iface, This->node.vtbl->cpc_entries); @@ -5578,24 +5577,26 @@ void HTMLElement_Init(HTMLElement *This, HTMLDocumentNode *doc, nsIDOMElement *n HRESULT HTMLElement_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode, BOOL use_generic, HTMLElement **ret) { - nsIDOMHTMLElement *nselem; - nsAString class_name_str; - const PRUnichar *class_name; + nsIDOMElement *nselem; + nsAString tag_name_str; + const PRUnichar *tag_name; const tag_desc_t *tag; HTMLElement *elem; nsresult nsres; HRESULT hres; - nsres = nsIDOMNode_QueryInterface(nsnode, &IID_nsIDOMHTMLElement, (void**)&nselem); - if(NS_FAILED(nsres)) + nsres = nsIDOMNode_QueryInterface(nsnode, &IID_nsIDOMElement, (void**)&nselem); + if(NS_FAILED(nsres)) { + ERR("no nsIDOMElement iface\n"); return E_FAIL; + } - nsAString_Init(&class_name_str, NULL); - nsIDOMHTMLElement_GetTagName(nselem, &class_name_str); + nsAString_Init(&tag_name_str, NULL); + nsIDOMElement_GetTagName(nselem, &tag_name_str); - nsAString_GetData(&class_name_str, &class_name); + nsAString_GetData(&tag_name_str, &tag_name); - tag = get_tag_desc(class_name); + tag = get_tag_desc(tag_name); if(tag) { hres = tag->constructor(doc, (nsIDOMElement*)nselem, &elem); }else if(use_generic) { @@ -5611,10 +5612,10 @@ HRESULT HTMLElement_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode, BOOL use_g } } - TRACE("%s ret %p\n", debugstr_w(class_name), elem); + TRACE("%s ret %p\n", debugstr_w(tag_name), elem); - nsIDOMHTMLElement_Release(nselem); - nsAString_Finish(&class_name_str); + nsIDOMElement_Release(nselem); + nsAString_Finish(&tag_name_str); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index a0d9221..de200cf 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -779,9 +779,8 @@ typedef struct { IElementTraversal IElementTraversal_iface; IProvideMultipleClassInfo IProvideMultipleClassInfo_iface; - nsIDOMHTMLElement *nselem; - nsIDOMElement *dom_element; - nsIDOMHTMLElement *html_element; + nsIDOMElement *dom_element; /* NULL for legacy comments represented as HTML elements */ + nsIDOMHTMLElement *html_element; /* NULL for non-HTML elements (like SVG elements) */ HTMLStyle *style; HTMLStyle *runtime_style; HTMLAttributeCollection *attrs;

1 0

Daniel Lehman : include: Add some math function declarations.
by Alexandre Julliard Feb. 13, 2018

Feb. 13, 2018

Module: wine Branch: master Commit: fbfcb57c17d2a49beb9d4cf0523d01cb826cf60e URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbfcb57c17d2a49beb9d4cf0… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Aug 30 13:48:42 2016 -0700 include: Add some math function declarations. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/math.h | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h index 5b42b4d..c2e61b7 100644 --- a/include/msvcrt/math.h +++ b/include/msvcrt/math.h @@ -55,6 +55,9 @@ double __cdecl asin(double); double __cdecl acos(double); double __cdecl atan(double); double __cdecl atan2(double, double); +double __cdecl asinh(double); +double __cdecl acosh(double); +double __cdecl atanh(double); double __cdecl exp(double); double __cdecl log(double); double __cdecl log10(double); @@ -107,6 +110,9 @@ float __cdecl asinf(float); float __cdecl acosf(float); float __cdecl atanf(float); float __cdecl atan2f(float, float); +float __cdecl asinhf(float); +float __cdecl acoshf(float); +float __cdecl atanhf(float); float __cdecl expf(float); float __cdecl logf(float); float __cdecl log10f(float); @@ -132,6 +138,9 @@ float __cdecl fmodf(float, float); #define acosf(x) ((float)acos((double)(x))) #define atanf(x) ((float)atan((double)(x))) #define atan2f(x,y) ((float)atan2((double)(x), (double)(y))) +#define asinhf(x) ((float)asinh((double)(x))) +#define acoshf(x) ((float)acosh((double)(x))) +#define atanhf(x) ((float)atanh((double)(x))) #define expf(x) ((float)exp((double)(x))) #define logf(x) ((float)log((double)(x))) #define log10f(x) ((float)log10((double)(x))) @@ -174,6 +183,12 @@ static const union { #define FP_SUBNORMAL -2 #define FP_ZERO 0 +short __cdecl _dclass(double); +#define isfinite(x) (_dclass((double)(x)) <= FP_ZERO) +#define isinf(x) (_dclass((double)(x)) == FP_INFINITE) +#define isnan(x) (_dclass((double)(x)) == FP_NAN) +#define isnormal(x) (_dclass((double)(x)) == FP_NORMAL) + #ifdef __cplusplus } #endif @@ -206,7 +221,7 @@ static inline double jn( int n, double x ) { return _jn( n, x ); } static inline double y0( double x ) { return _y0( x ); } static inline double y1( double x ) { return _y1( x ); } static inline double yn( int n, double x ) { return _yn( n, x ); } -static inline double cabs(struct _complex z) { return _cabs( z ); } +static inline double cabs( struct _complex z ) { return _cabs( z ); } static inline float hypotf( float x, float y ) { return _hypotf( x, y ); }

1 0

Henri Verbeet : d3d9: Set WINED3D_RESOURCE_ACCESS_MAP on buffers.
by Alexandre Julliard Feb. 13, 2018

Feb. 13, 2018

Module: wine Branch: master Commit: 29d824d151723c76eb381aef4e5855c6fa936c8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=29d824d151723c76eb381aef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 13 13:20:43 2018 +0330 d3d9: Set WINED3D_RESOURCE_ACCESS_MAP on buffers. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/buffer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index 30e86f8..b6897d0 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -290,7 +290,7 @@ HRESULT vertexbuffer_init(struct d3d9_vertexbuffer *buffer, struct d3d9_device * desc.byte_width = size; desc.usage = usage & WINED3DUSAGE_MASK; desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; - desc.access = wined3daccess_from_d3dpool(pool); + desc.access = wined3daccess_from_d3dpool(pool) | WINED3D_RESOURCE_ACCESS_MAP; desc.misc_flags = 0; desc.structure_byte_stride = 0; @@ -576,7 +576,7 @@ HRESULT indexbuffer_init(struct d3d9_indexbuffer *buffer, struct d3d9_device *de if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; - desc.access = wined3daccess_from_d3dpool(pool); + desc.access = wined3daccess_from_d3dpool(pool) | WINED3D_RESOURCE_ACCESS_MAP; desc.misc_flags = 0; desc.structure_byte_stride = 0;

1 0

Józef Kucia : wined3d: Query supported sample counts for multisample textures.
by Alexandre Julliard Feb. 13, 2018

Feb. 13, 2018

Module: wine Branch: master Commit: ae5d802bda0edc9b1cc1f3410f8d376c4dd072e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae5d802bda0edc9b1cc1f341… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 12 18:46:22 2018 +0100 wined3d: Query supported sample counts for multisample textures. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index c4d6e65..6f7740d 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2805,6 +2805,7 @@ static void query_internal_format(struct wined3d_adapter *adapter, { GLint count, multisample_types[MAX_MULTISAMPLE_TYPES]; unsigned int i, max_log2; + GLenum target; if (gl_info->supported[ARB_INTERNALFORMAT_QUERY2]) { @@ -2877,17 +2878,17 @@ static void query_internal_format(struct wined3d_adapter *adapter, { if (gl_info->supported[ARB_INTERNALFORMAT_QUERY]) { + target = gl_info->supported[ARB_TEXTURE_MULTISAMPLE] ? GL_TEXTURE_2D_MULTISAMPLE : GL_RENDERBUFFER; count = 0; - GL_EXTCALL(glGetInternalformativ(GL_RENDERBUFFER, format->glInternal, + GL_EXTCALL(glGetInternalformativ(target, format->glInternal, GL_NUM_SAMPLE_COUNTS, 1, &count)); - checkGLcall("glGetInternalformativ(GL_NUM_SAMPLE_COUNTS)"); count = min(count, MAX_MULTISAMPLE_TYPES); - GL_EXTCALL(glGetInternalformativ(GL_RENDERBUFFER, format->glInternal, + GL_EXTCALL(glGetInternalformativ(target, format->glInternal, GL_SAMPLES, count, multisample_types)); - checkGLcall("glGetInternalformativ(GL_SAMPLES)"); + checkGLcall("query sample counts"); for (i = 0; i < count; ++i) { - if (multisample_types[i] > sizeof(format->multisample_types) * 8) + if (multisample_types[i] > sizeof(format->multisample_types) * CHAR_BIT) continue; format->multisample_types |= 1u << (multisample_types[i] - 1); } @@ -2895,7 +2896,7 @@ static void query_internal_format(struct wined3d_adapter *adapter, else { max_log2 = wined3d_log2i(min(gl_info->limits.samples, - sizeof(format->multisample_types) * 8)); + sizeof(format->multisample_types) * CHAR_BIT)); for (i = 1; i <= max_log2; ++i) format->multisample_types |= 1u << ((1u << i) - 1); }

1 0

Józef Kucia : wined3d: Implement multisample resolve for typed resources.
by Alexandre Julliard Feb. 13, 2018

Feb. 13, 2018

Module: wine Branch: master Commit: 2f42f5c911a0dff865a41af4ad78d2fc5244d1ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f42f5c911a0dff865a41af4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 12 18:46:19 2018 +0100 wined3d: Implement multisample resolve for typed resources. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 72 +++++++++++++++++++++++++++++++++++++---------- dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 4 +++ 3 files changed, 62 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7881bca..3961f55 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1926,27 +1926,23 @@ void CDECL wined3d_device_get_viewport(const struct wined3d_device *device, stru *viewport = device->state.viewport; } -static void resolve_depth_buffer(struct wined3d_state *state) +static void resolve_depth_buffer(struct wined3d_device *device) { - struct wined3d_texture *dst_texture = state->textures[0]; + const struct wined3d_state *state = &device->state; struct wined3d_rendertarget_view *src_view; - RECT src_rect, dst_rect; + struct wined3d_resource *dst_resource; + struct wined3d_texture *dst_texture; - if (!dst_texture || !(dst_texture->resource.format_flags & WINED3DFMT_FLAG_DEPTH)) + if (!(dst_texture = state->textures[0])) return; - - if (!(src_view = state->fb->depth_stencil)) + dst_resource = &dst_texture->resource; + if (!(dst_resource->format_flags & WINED3DFMT_FLAG_DEPTH)) return; - if (src_view->resource->type == WINED3D_RTYPE_BUFFER) - { - FIXME("Not supported on buffer resources.\n"); + if (!(src_view = state->fb->depth_stencil)) return; - } - SetRect(&dst_rect, 0, 0, dst_texture->resource.width, dst_texture->resource.height); - SetRect(&src_rect, 0, 0, src_view->width, src_view->height); - wined3d_texture_blt(dst_texture, 0, &dst_rect, texture_from_resource(src_view->resource), - src_view->sub_resource_idx, &src_rect, 0, NULL, WINED3D_TEXF_POINT); + wined3d_device_resolve_sub_resource(device, dst_resource, 0, + src_view->resource, src_view->sub_resource_idx, dst_resource->format->id); } void CDECL wined3d_device_set_blend_state(struct wined3d_device *device, struct wined3d_blend_state *blend_state) @@ -2033,7 +2029,7 @@ void CDECL wined3d_device_set_render_state(struct wined3d_device *device, if (state == WINED3D_RS_POINTSIZE && value == WINED3D_RESZ_CODE) { TRACE("RESZ multisampled depth buffer resolve triggered.\n"); - resolve_depth_buffer(&device->state); + resolve_depth_buffer(device); } } @@ -4305,6 +4301,52 @@ void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, str wined3d_cs_emit_update_sub_resource(device->cs, resource, sub_resource_idx, box, data, row_pitch, depth_pitch); } +void CDECL wined3d_device_resolve_sub_resource(struct wined3d_device *device, + struct wined3d_resource *dst_resource, unsigned int dst_sub_resource_idx, + struct wined3d_resource *src_resource, unsigned int src_sub_resource_idx, + enum wined3d_format_id format_id) +{ + struct wined3d_texture *dst_texture, *src_texture; + unsigned int dst_level, src_level; + RECT dst_rect, src_rect; + + TRACE("device %p, dst_resource %p, dst_sub_resource_idx %u, " + "src_resource %p, src_sub_resource_idx %u, format %s.\n", + device, dst_resource, dst_sub_resource_idx, + src_resource, src_sub_resource_idx, debug_d3dformat(format_id)); + + if (wined3d_format_is_typeless(dst_resource->format) + || wined3d_format_is_typeless(src_resource->format)) + { + FIXME("Unhandled multisample resolve, dst_format %s, src_format %s, format %s.\n", + debug_d3dformat(dst_resource->format->id), debug_d3dformat(src_resource->format->id), + debug_d3dformat(format_id)); + return; + } + if (dst_resource->type != WINED3D_RTYPE_TEXTURE_2D) + { + WARN("Invalid destination resource type %s.\n", debug_d3dresourcetype(dst_resource->type)); + return; + } + if (src_resource->type != WINED3D_RTYPE_TEXTURE_2D) + { + WARN("Invalid source resource type %s.\n", debug_d3dresourcetype(src_resource->type)); + return; + } + + dst_texture = texture_from_resource(dst_resource); + src_texture = texture_from_resource(src_resource); + + dst_level = dst_sub_resource_idx % dst_texture->level_count; + SetRect(&dst_rect, 0, 0, wined3d_texture_get_level_width(dst_texture, dst_level), + wined3d_texture_get_level_height(dst_texture, dst_level)); + src_level = src_sub_resource_idx % src_texture->level_count; + SetRect(&src_rect, 0, 0, wined3d_texture_get_level_width(src_texture, src_level), + wined3d_texture_get_level_height(src_texture, src_level)); + wined3d_texture_blt(dst_texture, dst_sub_resource_idx, &dst_rect, + src_texture, src_sub_resource_idx, &src_rect, 0, NULL, WINED3D_TEXF_POINT); +} + HRESULT CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *device, struct wined3d_rendertarget_view *view, const RECT *rect, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 7c1b5e3..035746d 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -129,6 +129,7 @@ @ cdecl wined3d_device_process_vertices(ptr long long long ptr ptr long long) @ cdecl wined3d_device_release_focus_window(ptr) @ cdecl wined3d_device_reset(ptr ptr ptr ptr long) +@ cdecl wined3d_device_resolve_sub_resource(ptr ptr long ptr long long) @ cdecl wined3d_device_restore_fullscreen_window(ptr ptr ptr) @ cdecl wined3d_device_set_base_vertex_index(ptr long) @ cdecl wined3d_device_set_blend_state(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 9d551d8..ed7445e 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2342,6 +2342,10 @@ void __cdecl wined3d_device_release_focus_window(struct wined3d_device *device); HRESULT __cdecl wined3d_device_reset(struct wined3d_device *device, const struct wined3d_swapchain_desc *swapchain_desc, const struct wined3d_display_mode *mode, wined3d_device_reset_cb callback, BOOL reset_state); +void __cdecl wined3d_device_resolve_sub_resource(struct wined3d_device *device, + struct wined3d_resource *dst_resource, unsigned int dst_sub_resource_idx, + struct wined3d_resource *src_resource, unsigned int src_sub_resource_idx, + enum wined3d_format_id format_id); void __cdecl wined3d_device_restore_fullscreen_window(struct wined3d_device *device, HWND window, const RECT *window_rect); void __cdecl wined3d_device_set_base_vertex_index(struct wined3d_device *device, INT base_index);

1 0

Hermes Belusca-Maito : shlwapi: Make SHCreateWorkerWindowA/ W 64-bit compatible.
by Alexandre Julliard Feb. 13, 2018

Feb. 13, 2018

Module: wine Branch: master Commit: 2c163225730e880a1506cb8c02b296cee47c6c89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c163225730e880a1506cb8c… Author: Hermes Belusca-Maito <hermes.belusca(a)sfr.fr> Date: Mon Feb 12 23:33:58 2018 +0100 shlwapi: Make SHCreateWorkerWindowA/W 64-bit compatible. Signed-off-by: Hermes Belusca-Maito <hermes.belusca(a)sfr.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/ordinal.c | 24 +++++++++++------------- dlls/shlwapi/shlwapi.spec | 4 ++-- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 334607e..903df91 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -2575,14 +2575,14 @@ HRESULT WINAPI IUnknown_GetSite(LPUNKNOWN lpUnknown, REFIID iid, PVOID *lppSite) * Success: The window handle of the newly created window. * Failure: 0. */ -HWND WINAPI SHCreateWorkerWindowA(LONG wndProc, HWND hWndParent, DWORD dwExStyle, +HWND WINAPI SHCreateWorkerWindowA(WNDPROC wndProc, HWND hWndParent, DWORD dwExStyle, DWORD dwStyle, HMENU hMenu, LONG_PTR wnd_extra) { static const char szClass[] = "WorkerA"; WNDCLASSA wc; HWND hWnd; - TRACE("(0x%08x, %p, 0x%08x, 0x%08x, %p, 0x%08lx)\n", + TRACE("(%p, %p, 0x%08x, 0x%08x, %p, 0x%08lx)\n", wndProc, hWndParent, dwExStyle, dwStyle, hMenu, wnd_extra); /* Create Window class */ @@ -2604,8 +2604,7 @@ HWND WINAPI SHCreateWorkerWindowA(LONG wndProc, HWND hWndParent, DWORD dwExStyle if (hWnd) { SetWindowLongPtrW(hWnd, 0, wnd_extra); - - if (wndProc) SetWindowLongPtrA(hWnd, GWLP_WNDPROC, wndProc); + if (wndProc) SetWindowLongPtrA(hWnd, GWLP_WNDPROC, (LONG_PTR)wndProc); } return hWnd; @@ -2864,28 +2863,28 @@ DWORD WINAPI WhichPlatform(void) * * Unicode version of SHCreateWorkerWindowA. */ -HWND WINAPI SHCreateWorkerWindowW(LONG wndProc, HWND hWndParent, DWORD dwExStyle, - DWORD dwStyle, HMENU hMenu, LONG msg_result) +HWND WINAPI SHCreateWorkerWindowW(WNDPROC wndProc, HWND hWndParent, DWORD dwExStyle, + DWORD dwStyle, HMENU hMenu, LONG_PTR wnd_extra) { static const WCHAR szClass[] = { 'W', 'o', 'r', 'k', 'e', 'r', 'W', 0 }; WNDCLASSW wc; HWND hWnd; - TRACE("(0x%08x, %p, 0x%08x, 0x%08x, %p, 0x%08x)\n", - wndProc, hWndParent, dwExStyle, dwStyle, hMenu, msg_result); + TRACE("(%p, %p, 0x%08x, 0x%08x, %p, 0x%08lx)\n", + wndProc, hWndParent, dwExStyle, dwStyle, hMenu, wnd_extra); /* If our OS is natively ANSI, use the ANSI version */ if (GetVersion() & 0x80000000) /* not NT */ { TRACE("fallback to ANSI, ver 0x%08x\n", GetVersion()); - return SHCreateWorkerWindowA(wndProc, hWndParent, dwExStyle, dwStyle, hMenu, msg_result); + return SHCreateWorkerWindowA(wndProc, hWndParent, dwExStyle, dwStyle, hMenu, wnd_extra); } /* Create Window class */ wc.style = 0; wc.lpfnWndProc = DefWindowProcW; wc.cbClsExtra = 0; - wc.cbWndExtra = 4; + wc.cbWndExtra = sizeof(LONG_PTR); wc.hInstance = shlwapi_hInstance; wc.hIcon = NULL; wc.hCursor = LoadCursorW(NULL, (LPWSTR)IDC_ARROW); @@ -2899,9 +2898,8 @@ HWND WINAPI SHCreateWorkerWindowW(LONG wndProc, HWND hWndParent, DWORD dwExStyle hWndParent, hMenu, shlwapi_hInstance, 0); if (hWnd) { - SetWindowLongPtrW(hWnd, DWLP_MSGRESULT, msg_result); - - if (wndProc) SetWindowLongPtrW(hWnd, GWLP_WNDPROC, wndProc); + SetWindowLongPtrW(hWnd, 0, wnd_extra); + if (wndProc) SetWindowLongPtrW(hWnd, GWLP_WNDPROC, (LONG_PTR)wndProc); } return hWnd; diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 6b6ead2..134bb47 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -254,7 +254,7 @@ 254 stub -noname StopWatchExW 255 stub -noname EventTraceHandler 256 stdcall -ordinal IUnknown_GetSite(ptr ptr ptr) -257 stdcall -noname SHCreateWorkerWindowA(long ptr long long ptr long) +257 stdcall -noname SHCreateWorkerWindowA(ptr ptr long long ptr long) 258 stub -noname SHRegisterWaitForSingleObject 259 stub -noname SHUnregisterWait 260 stdcall -noname SHQueueUserWorkItem(long long long long long long long) @@ -275,7 +275,7 @@ 275 stub -noname RegisterGlobalHotkeyA 276 stdcall -ordinal WhichPlatform() 277 stub -noname SHDialogBox -278 stdcall -noname SHCreateWorkerWindowW(long long long long long long) +278 stdcall -noname SHCreateWorkerWindowW(ptr ptr long long ptr long) 279 stdcall -noname SHInvokeDefaultCommand(ptr ptr ptr) 280 stdcall -ordinal SHRegGetIntW(ptr wstr long) 281 stdcall -noname SHPackDispParamsV(ptr ptr long ptr)

1 0

Nikolay Sivov : comctl32: Introduce ComboBox control.
by Alexandre Julliard Feb. 13, 2018

Feb. 13, 2018

Module: wine Branch: master Commit: c9e98034b37f44d505ba406f94031d02e226a176 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9e98034b37f44d505ba406f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 13 10:56:36 2018 +0300 comctl32: Introduce ComboBox control. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/Makefile.in | 1 + dlls/comctl32/combo.c | 2116 ++++++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/comctl32.h | 1 + dlls/comctl32/commctrl.c | 2 + dlls/comctl32/tests/misc.c | 1 + dlls/user32/class.c | 1 - 6 files changed, 2121 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c9e98034b37f44d505ba…

1 0

Jacek Caban : mshtml: Use get_elem helper in IHTMLDocument2:: get_body implementation.
by Alexandre Julliard Feb. 13, 2018

Feb. 13, 2018

Module: wine Branch: master Commit: 06d54a6eb3fc7f7375983fbd4cc88e537abbeec9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06d54a6eb3fc7f7375983fbd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 12 23:27:02 2018 +0100 mshtml: Use get_elem helper in IHTMLDocument2::get_body implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 5e3ed75..174ef20 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -261,7 +261,7 @@ static HRESULT WINAPI HTMLDocument_get_body(IHTMLDocument2 *iface, IHTMLElement { HTMLDocument *This = impl_from_IHTMLDocument2(iface); nsIDOMHTMLElement *nsbody = NULL; - HTMLDOMNode *node; + HTMLElement *element; HRESULT hres; TRACE("(%p)->(%p)\n", This, p); @@ -281,14 +281,13 @@ static HRESULT WINAPI HTMLDocument_get_body(IHTMLDocument2 *iface, IHTMLElement return S_OK; } - hres = get_node(This->doc_node, (nsIDOMNode*)nsbody, TRUE, &node); + hres = get_elem(This->doc_node, (nsIDOMElement*)nsbody, &element); nsIDOMHTMLElement_Release(nsbody); if(FAILED(hres)) return hres; - hres = IHTMLDOMNode_QueryInterface(&node->IHTMLDOMNode_iface, &IID_IHTMLElement, (void**)p); - node_release(node); - return hres; + *p = &element->IHTMLElement_iface; + return S_OK; } static HRESULT WINAPI HTMLDocument_get_activeElement(IHTMLDocument2 *iface, IHTMLElement **p)

1 0

Anton Romanov : wmp: Implement IConnectionPoint[Container] and add _WMPOCXEvents.
by Alexandre Julliard Feb. 13, 2018

Feb. 13, 2018

Module: wine Branch: master Commit: 9445c6b6598f5465ccf7026819f10f5f36f12e39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9445c6b6598f5465ccf70268… Author: Anton Romanov <theli.ua(a)gmail.com> Date: Mon Feb 12 13:26:08 2018 -0800 wmp: Implement IConnectionPoint[Container] and add _WMPOCXEvents. Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/Makefile.in | 3 +- dlls/wmp/events.c | 402 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wmp/oleobj.c | 52 +------ dlls/wmp/tests/oleobj.c | 70 ++++++++- dlls/wmp/wmp_private.h | 16 ++ 5 files changed, 491 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9445c6b6598f5465ccf7…

1 0

Henri Verbeet : d3d11: Set WINED3D_RESOURCE_ACCESS_MAP on 2D textures.
by Alexandre Julliard Feb. 13, 2018

Feb. 13, 2018

Module: wine Branch: master Commit: 469dd87899d71d3e8bb7a1abb282c36f939d1e40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=469dd87899d71d3e8bb7a1ab… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 13 13:20:45 2018 +0330 d3d11: Set WINED3D_RESOURCE_ACCESS_MAP on 2D textures. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/texture.c | 2 +- dlls/wined3d/texture.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 39d71cd..4315284 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -517,7 +517,7 @@ HRESULT d3d_texture2d_create(struct d3d_device *device, const D3D11_TEXTURE2D_DE wined3d_desc.multisample_type = desc->SampleDesc.Count > 1 ? desc->SampleDesc.Count : WINED3D_MULTISAMPLE_NONE; wined3d_desc.multisample_quality = desc->SampleDesc.Quality; wined3d_desc.usage = wined3d_usage_from_d3d11(desc->BindFlags, desc->Usage); - wined3d_desc.access = WINED3D_RESOURCE_ACCESS_GPU; + wined3d_desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP; wined3d_desc.width = desc->Width; wined3d_desc.height = desc->Height; wined3d_desc.depth = 1; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 750101f..3806103 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1901,8 +1901,7 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour if (!(resource->access & WINED3D_RESOURCE_ACCESS_MAP)) { WARN("Trying to map unmappable texture.\n"); - if (resource->type != WINED3D_RTYPE_TEXTURE_2D) - return WINED3DERR_INVALIDCALL; + return WINED3DERR_INVALIDCALL; } if (texture->flags & WINED3D_TEXTURE_DC_IN_USE)

1 0

Henri Verbeet : ddraw: Use the global memory allocation helpers.
by Alexandre Julliard Feb. 13, 2018

Feb. 13, 2018

Module: wine Branch: master Commit: 9cc7c6e99f30cf7eb16f3f6b4a94ff1c9113af1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9cc7c6e99f30cf7eb16f3f6b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 13 13:20:47 2018 +0330 ddraw: Use the global memory allocation helpers. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/clipper.c | 2 +- dlls/ddraw/ddraw.c | 53 ++++++++++++++----------------- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/device.c | 27 +++++++--------- dlls/ddraw/executebuffer.c | 7 ++--- dlls/ddraw/light.c | 2 +- dlls/ddraw/main.c | 22 ++++++------- dlls/ddraw/material.c | 5 ++- dlls/ddraw/palette.c | 2 +- dlls/ddraw/surface.c | 78 +++++++++++++++++++++++----------------------- dlls/ddraw/vertexbuffer.c | 7 ++--- dlls/ddraw/viewport.c | 2 +- 12 files changed, 98 insertions(+), 110 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9cc7c6e99f30cf7eb16f…

1 0

Henri Verbeet : include: Add d3d11.1 and d3d11.2 constants to d3d11.idl.
by Alexandre Julliard Feb. 13, 2018

Feb. 13, 2018

Module: wine Branch: master Commit: 529168ecf7e538ae23ccb037f99dffec66470350 URL: https://source.winehq.org/git/wine.git/?a=commit;h=529168ecf7e538ae23ccb037… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 13 13:20:46 2018 +0330 include: Add d3d11.1 and d3d11.2 constants to d3d11.idl. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d11.idl | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/d3d11.idl b/include/d3d11.idl index a7b9812..8de2056 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -260,6 +260,16 @@ cpp_quote("struct CD3D11_DEFAULT {};") cpp_quote("extern const DECLSPEC_SELECTANY CD3D11_DEFAULT D3D11_DEFAULT;") cpp_quote("#endif") +cpp_quote("#ifndef _D3D11_1_CONSTANTS") +cpp_quote("#define _D3D11_1_CONSTANTS") +const UINT D3D11_1_UAV_SLOT_COUNT = 64; +cpp_quote("#endif") + +cpp_quote("#ifndef _D3D11_2_CONSTANTS") +cpp_quote("#define _D3D11_2_CONSTANTS") +const UINT D3D11_2_TILED_RESOURCE_TILE_SIZE_IN_BYTES = 0x10000; +cpp_quote("#endif") + typedef enum D3D11_BLEND { D3D11_BLEND_ZERO = 1,

1 0

Józef Kucia : d3d11: Implement d3d10_device_ResolveSubresource().
by Alexandre Julliard Feb. 13, 2018

Feb. 13, 2018

Module: wine Branch: master Commit: b6573e9f0334c28e3b46ed40970c1ebfd4e96561 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6573e9f0334c28e3b46ed40… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 12 18:46:21 2018 +0100 d3d11: Implement d3d10_device_ResolveSubresource(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 5873be6..f65c994 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -4252,10 +4252,23 @@ static void STDMETHODCALLTYPE d3d10_device_ResolveSubresource(ID3D10Device1 *ifa ID3D10Resource *dst_resource, UINT dst_subresource_idx, ID3D10Resource *src_resource, UINT src_subresource_idx, DXGI_FORMAT format) { - FIXME("iface %p, dst_resource %p, dst_subresource_idx %u, " - "src_resource %p, src_subresource_idx %u, format %s stub!\n", + struct wined3d_resource *wined3d_dst_resource, *wined3d_src_resource; + struct d3d_device *device = impl_from_ID3D10Device(iface); + enum wined3d_format_id wined3d_format; + + TRACE("iface %p, dst_resource %p, dst_subresource_idx %u, " + "src_resource %p, src_subresource_idx %u, format %s.\n", iface, dst_resource, dst_subresource_idx, src_resource, src_subresource_idx, debug_dxgi_format(format)); + + wined3d_dst_resource = wined3d_resource_from_d3d10_resource(dst_resource); + wined3d_src_resource = wined3d_resource_from_d3d10_resource(src_resource); + wined3d_format = wined3dformat_from_dxgi_format(format); + wined3d_mutex_lock(); + wined3d_device_resolve_sub_resource(device->wined3d_device, + wined3d_dst_resource, dst_subresource_idx, + wined3d_src_resource, src_subresource_idx, wined3d_format); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d10_device_VSGetConstantBuffers(ID3D10Device1 *iface,

1 0

Jacek Caban : mshtml: Added SVG elements tests.
by Alexandre Julliard Feb. 13, 2018

Feb. 13, 2018

Module: wine Branch: master Commit: 886dfed9bae0b98edb094ce052b5fec00eccc8ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=886dfed9bae0b98edb094ce0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 12 23:29:16 2018 +0100 mshtml: Added SVG elements tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/dom.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index f9d2690..efdd856 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -152,7 +152,9 @@ typedef enum { ET_LINK, ET_LABEL, ET_BUTTON, - ET_AREA + ET_AREA, + ET_SVG, + ET_CIRCLE } elem_type_t; static const IID * const none_iids[] = { @@ -520,7 +522,9 @@ static const elem_type_info_t elem_type_infos[] = { {"LINK", link_iids, &DIID_DispHTMLLinkElement, &CLSID_HTMLLinkElement}, {"LABEL", label_iids, &DIID_DispHTMLLabelElement, &CLSID_HTMLLabelElement}, {"BUTTON", button_iids, &DIID_DispHTMLButtonElement, &CLSID_HTMLButtonElement}, - {"AREA", area_iids, &DIID_DispHTMLAreaElement, &CLSID_HTMLAreaElement} + {"AREA", area_iids, &DIID_DispHTMLAreaElement, &CLSID_HTMLAreaElement}, + {"svg", elem_iids, NULL}, + {"circle", elem_iids, NULL} }; static int strcmp_wa(LPCWSTR strw, const char *stra) @@ -9415,6 +9419,35 @@ static void test_form_element(IHTMLDocument2 *doc, IHTMLElement *parent) IHTMLElement_Release(elem); } +static void test_svg_element(IHTMLDocument2 *doc, IHTMLElement *parent) +{ + IHTMLDOMNode *svg_node, *circle_node; + + test_elem_set_innerhtml((IUnknown*)parent, + "<svg width=\"100\" height=\"100\" id=\"svgid\">" + "<circle cx=\"50\" cy=\"50\" r=\"40\" fill=\"black\" />" + "</svg>"); + svg_node = get_first_child((IUnknown*)parent); + if(compat_mode < COMPAT_IE9) { + todo_wine + ok(!svg_node, "svg_node != NULL\n"); + if(svg_node) + IHTMLDOMNode_Release(svg_node); + return; + } + ok(svg_node != NULL, "svg_node = NULL\n"); + test_elem_type((IUnknown*)svg_node, ET_SVG); + + circle_node = get_first_child((IUnknown*)svg_node); + ok(circle_node != NULL, "circle_node = NULL\n"); + if(!circle_node) + return; + test_elem_type((IUnknown*)circle_node, ET_CIRCLE); + + IHTMLDOMNode_Release(circle_node); + IHTMLDOMNode_Release(svg_node); +}; + static void test_dom_elements(IHTMLDocument2 *doc) { IHTMLElement *body, *div; @@ -9425,6 +9458,7 @@ static void test_dom_elements(IHTMLDocument2 *doc) test_textarea_element(doc, div); test_form_element(doc, div); + test_svg_element(doc, div); IHTMLElement_Release(body); IHTMLElement_Release(div);

1 0

Jacek Caban : mshtml: Pass Gecko element as nsIDOMElement to check_event_attr.
by Alexandre Julliard Feb. 13, 2018

Feb. 13, 2018

Module: wine Branch: master Commit: 0666c6c2fd544008171c717ca84f311f3aa12edf URL: https://source.winehq.org/git/wine.git/?a=commit;h=0666c6c2fd544008171c717c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 12 23:26:52 2018 +0100 mshtml: Pass Gecko element as nsIDOMElement to check_event_attr. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 6 +++--- dlls/mshtml/htmlevent.h | 2 +- dlls/mshtml/mutation.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 69c9444..d91de28 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2781,7 +2781,7 @@ void update_doc_cp_events(HTMLDocumentNode *doc, cp_static_data_t *cp) } } -void check_event_attr(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem) +void check_event_attr(HTMLDocumentNode *doc, nsIDOMElement *nselem) { nsIDOMMozNamedAttrMap *attr_map; const PRUnichar *name, *value; @@ -2795,11 +2795,11 @@ void check_event_attr(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem) nsresult nsres; HRESULT hres; - nsres = nsIDOMHTMLElement_HasAttributes(nselem, &has_attrs); + nsres = nsIDOMElement_HasAttributes(nselem, &has_attrs); if(NS_FAILED(nsres) || !has_attrs) return; - nsres = nsIDOMHTMLElement_GetAttributes(nselem, &attr_map); + nsres = nsIDOMElement_GetAttributes(nselem, &attr_map); if(NS_FAILED(nsres)) return; diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index ccfa5f8..e78c78c 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -85,7 +85,7 @@ typedef struct { BOOL no_event_obj; } DOMEvent; -void check_event_attr(HTMLDocumentNode*,nsIDOMHTMLElement*) DECLSPEC_HIDDEN; +void check_event_attr(HTMLDocumentNode*,nsIDOMElement*) DECLSPEC_HIDDEN; void release_event_target(EventTarget*) DECLSPEC_HIDDEN; HRESULT set_event_handler(EventTarget*,eventid_t,VARIANT*) DECLSPEC_HIDDEN; HRESULT get_event_handler(EventTarget*,eventid_t,VARIANT*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 3c2ca08..6983da6 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -742,7 +742,7 @@ static void NSAPI nsDocumentObserver_BindToDocument(nsIDocumentObserver *iface, nsIDOMHTMLFrameElement *nsframe; nsIDOMHTMLScriptElement *nsscript; nsIDOMHTMLMetaElement *nsmeta; - nsIDOMHTMLElement *nselem; + nsIDOMElement *nselem; nsIDOMComment *nscomment; nsresult nsres; @@ -768,12 +768,12 @@ static void NSAPI nsDocumentObserver_BindToDocument(nsIDocumentObserver *iface, } } - nsres = nsIContent_QueryInterface(aContent, &IID_nsIDOMHTMLElement, (void**)&nselem); + nsres = nsIContent_QueryInterface(aContent, &IID_nsIDOMElement, (void**)&nselem); if(NS_FAILED(nsres)) return; check_event_attr(This, nselem); - nsIDOMHTMLElement_Release(nselem); + nsIDOMElement_Release(nselem); nsres = nsIContent_QueryInterface(aContent, &IID_nsIDOMHTMLIFrameElement, (void**)&nsiframe); if(NS_SUCCEEDED(nsres)) {

1 0