February 2018 - Wine-Commits

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