system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-03 01:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

mshtml: Use DispatchEx vtbl for elements as window property lookups.

Browse source
This commit is contained in:
Jacek Caban 2024-05-29 23:45:53 +02:00 committed by Alexandre Julliard
parent 16271ac208
commit 3108a405e3
3 changed files with 43 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
dlls/mshtml/dispex.c
View file

@ -1691,6 +1691,11 @@ static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DW
hres = get_dynamic_prop(This, bstrName, grfdex & ~fdexNameEnsure, &dprop);
if(FAILED(hres)) {
if(This->info->desc->vtbl->find_dispid) {
hres = This->info->desc->vtbl->find_dispid(This, bstrName, grfdex, pid);
if(SUCCEEDED(hres))
return hres;
}
if(grfdex & fdexNameEnsure)
hres = alloc_dynamic_prop(This, bstrName, dprop, &dprop);
if(FAILED(hres))

66
dlls/mshtml/htmlwindow.c
View file

@ -3700,9 +3700,6 @@ static HRESULT WINAPI WindowDispEx_GetDispID(IDispatchEx *iface, BSTR bstrName,
{
HTMLWindow *This = impl_from_IDispatchEx(iface);
HTMLInnerWindow *window = This->inner_window;
HTMLOuterWindow *frame;
global_prop_t *prop;
IHTMLElement *elem;
HRESULT hres;
TRACE("(%p)->(%s %lx %p)\n", This, debugstr_w(bstrName), grfdex, pid);
@ -3711,34 +3708,7 @@ static HRESULT WINAPI WindowDispEx_GetDispID(IDispatchEx *iface, BSTR bstrName,
if(hres != DISP_E_UNKNOWNNAME)
return hres;
hres = IDispatchEx_GetDispID(&window->base.inner_window->event_target.dispex.IDispatchEx_iface, bstrName, grfdex, pid);
if(hres != DISP_E_UNKNOWNNAME)
return hres;
hres = get_frame_by_name(This->outer_window, bstrName, FALSE, &frame);
if(SUCCEEDED(hres) && frame) {
prop = alloc_global_prop(window, GLOBAL_FRAMEVAR, bstrName);
if(!prop)
return E_OUTOFMEMORY;
*pid = prop_to_dispid(window, prop);
return S_OK;
}
hres = IHTMLDocument3_getElementById(&window->base.inner_window->doc->IHTMLDocument3_iface,
bstrName, &elem);
if(SUCCEEDED(hres) && elem) {
IHTMLElement_Release(elem);
prop = alloc_global_prop(window, GLOBAL_ELEMENTVAR, bstrName);
if(!prop)
return E_OUTOFMEMORY;
*pid = prop_to_dispid(window, prop);
return S_OK;
}
return DISP_E_UNKNOWNNAME;
return IDispatchEx_GetDispID(&window->base.inner_window->event_target.dispex.IDispatchEx_iface, bstrName, grfdex, pid);
}
static HRESULT WINAPI WindowDispEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp,
@ -4099,6 +4069,39 @@ static HRESULT HTMLWindow_get_name(DispatchEx *dispex, DISPID id, BSTR *name)
return (*name = SysAllocString(This->global_props[idx].name)) ? S_OK : E_OUTOFMEMORY;
}
static HRESULT HTMLWindow_find_dispid(DispatchEx *dispex, BSTR name, DWORD grfdex, DISPID *dispid)
{
HTMLInnerWindow *This = impl_from_DispatchEx(dispex);
HTMLOuterWindow *frame;
global_prop_t *prop;
IHTMLElement *elem;
HRESULT hres;
hres = get_frame_by_name(This->base.outer_window, name, FALSE, &frame);
if(SUCCEEDED(hres) && frame) {
prop = alloc_global_prop(This, GLOBAL_FRAMEVAR, name);
if(!prop)
return E_OUTOFMEMORY;
*dispid = prop_to_dispid(This, prop);
return S_OK;
}
hres = IHTMLDocument3_getElementById(&This->doc->IHTMLDocument3_iface, name, &elem);
if(SUCCEEDED(hres) && elem) {
IHTMLElement_Release(elem);
prop = alloc_global_prop(This, GLOBAL_ELEMENTVAR, name);
if(!prop)
return E_OUTOFMEMORY;
*dispid = prop_to_dispid(This, prop);
return S_OK;
}
return DISP_E_UNKNOWNNAME;
}
static HRESULT HTMLWindow_invoke(DispatchEx *dispex, DISPID id, LCID lcid, WORD flags, DISPPARAMS *params,
VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller)
{
@ -4398,6 +4401,7 @@ static const event_target_vtbl_t HTMLWindow_event_target_vtbl = {
.unlink = HTMLWindow_unlink,
.last_release = HTMLWindow_last_release,
.get_name = HTMLWindow_get_name,
.find_dispid = HTMLWindow_find_dispid,
.invoke = HTMLWindow_invoke,
.next_dispid = HTMLWindow_next_dispid,
.get_compat_mode = HTMLWindow_get_compat_mode,

3
dlls/mshtml/mshtml_private.h
View file

@ -371,6 +371,9 @@ typedef struct {
/* Used when the object has custom props, and this returns DISPIDs for them */
HRESULT (*get_dispid)(DispatchEx*,BSTR,DWORD,DISPID*);
/* Similar to get_dispid, but called only when a dynamic property can't be found */
HRESULT (*find_dispid)(DispatchEx*,BSTR,DWORD,DISPID*);
/* These are called when the object implements GetMemberName, InvokeEx, DeleteMemberByDispID and GetNextDispID for custom props */
HRESULT (*get_name)(DispatchEx*,DISPID,BSTR*);
HRESULT (*invoke)(DispatchEx*,DISPID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,IServiceProvider*);