July 2024 - Wine-commits - list.winehq.org

Nikolay Sivov : winhttp/tests: Add some more tests for string options in WinHttpQueryOption().
by Alexandre Julliard 16 Jul '24

16 Jul '24

Module: wine Branch: master Commit: 4a2265742a07609f1d53bccfd46d60cc6f09b07f URL: https://gitlab.winehq.org/wine/wine/-/commit/4a2265742a07609f1d53bccfd46d60… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 16 12:54:24 2024 +0200 winhttp/tests: Add some more tests for string options in WinHttpQueryOption(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/winhttp/tests/winhttp.c | 53 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index a1f8c15e356..6e814247167 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -3332,6 +3332,15 @@ static void test_redirect(int port) ok(ret, "got %lu\n", GetLastError()); ok(!wcscmp(url, expected), "expected %s got %s\n", wine_dbgstr_w(expected), wine_dbgstr_w(url)); + /* Exact buffer size match. */ + url[0] = 0; + size = (lstrlenW(expected) + 1) * sizeof(WCHAR); + ret = WinHttpQueryOption(req, WINHTTP_OPTION_URL, url, &size); + todo_wine + ok(ret, "got %lu\n", GetLastError()); + todo_wine + ok(!wcscmp(url, expected), "expected %s got %s\n", wine_dbgstr_w(expected), wine_dbgstr_w(url)); + ret = WinHttpReceiveResponse(req, NULL); ok(ret, "failed to receive response %lu\n", GetLastError()); @@ -4417,6 +4426,17 @@ static void test_credentials(void) ok(!wcscmp(buffer, proxy_userW), "unexpected result %s\n", wine_dbgstr_w(buffer)); ok(size == lstrlenW(proxy_userW) * sizeof(WCHAR), "unexpected result %lu\n", size); + /* Exact buffer size match. */ + size = (lstrlenW(proxy_userW) + 1) * sizeof(WCHAR); + buffer[0] = 0; + ret = WinHttpQueryOption(req, WINHTTP_OPTION_PROXY_USERNAME, &buffer, &size); + todo_wine + ok(ret, "failed to query proxy username %lu\n", GetLastError()); + todo_wine + ok(!wcscmp(buffer, proxy_userW), "unexpected result %s\n", wine_dbgstr_w(buffer)); + todo_wine + ok(size == lstrlenW(proxy_userW) * sizeof(WCHAR), "unexpected result %lu\n", size); + buffer[0] = 0x1; SetLastError(0xdeadbeef); ret = WinHttpQueryOption(req, WINHTTP_OPTION_PROXY_USERNAME, &buffer, &size); @@ -4463,6 +4483,17 @@ static void test_credentials(void) ok(!wcscmp(buffer, proxy_passW), "unexpected result %s\n", wine_dbgstr_w(buffer)); ok(size == lstrlenW(proxy_passW) * sizeof(WCHAR), "unexpected result %lu\n", size); + /* Exact buffer size match. */ + size = (lstrlenW(proxy_passW) + 1) * sizeof(WCHAR); + buffer[0] = 0; + ret = WinHttpQueryOption(req, WINHTTP_OPTION_PROXY_PASSWORD, &buffer, &size); + todo_wine + ok(ret, "failed to query proxy password %lu\n", GetLastError()); + todo_wine + ok(!wcscmp(buffer, proxy_passW), "unexpected result %s\n", wine_dbgstr_w(buffer)); + todo_wine + ok(size == lstrlenW(proxy_passW) * sizeof(WCHAR), "unexpected result %lu\n", size); + buffer[0] = 0x1; SetLastError(0xdeadbeef); ret = WinHttpQueryOption(req, WINHTTP_OPTION_PROXY_PASSWORD, &buffer, &size); @@ -4485,6 +4516,17 @@ static void test_credentials(void) ok(!wcscmp(buffer, userW), "unexpected result %s\n", wine_dbgstr_w(buffer)); ok(size == lstrlenW(userW) * sizeof(WCHAR), "unexpected result %lu\n", size); + /* Exact buffer size match. */ + size = (lstrlenW(userW) + 1) * sizeof(WCHAR); + buffer[0] = 0; + ret = WinHttpQueryOption(req, WINHTTP_OPTION_USERNAME, &buffer, &size); + todo_wine + ok(ret, "failed to query username %lu\n", GetLastError()); + todo_wine + ok(!wcscmp(buffer, userW), "unexpected result %s\n", wine_dbgstr_w(buffer)); + todo_wine + ok(size == lstrlenW(userW) * sizeof(WCHAR), "unexpected result %lu\n", size); + buffer[0] = 0x1; SetLastError(0xdeadbeef); ret = WinHttpQueryOption(req, WINHTTP_OPTION_USERNAME, &buffer, &size); @@ -4507,6 +4549,17 @@ static void test_credentials(void) ok(!wcscmp(buffer, passW), "unexpected result %s\n", wine_dbgstr_w(buffer)); ok(size == lstrlenW(passW) * sizeof(WCHAR), "unexpected result %lu\n", size); + /* Exact buffer size match. */ + buffer[0] = 0; + size = (lstrlenW(passW) + 1) * sizeof(WCHAR); + ret = WinHttpQueryOption(req, WINHTTP_OPTION_PASSWORD, &buffer, &size); + todo_wine + ok(ret, "failed to query password %lu\n", GetLastError()); + todo_wine + ok(!wcscmp(buffer, passW), "unexpected result %s\n", wine_dbgstr_w(buffer)); + todo_wine + ok(size == lstrlenW(passW) * sizeof(WCHAR), "unexpected result %lu\n", size); + buffer[0] = 0x1; SetLastError(0xdeadbeef); ret = WinHttpQueryOption(req, WINHTTP_OPTION_PASSWORD, &buffer, &size);

1 0

Nikolay Sivov : winhttp: Handle exact buffer length match in WinHttpQueryOption().
by Alexandre Julliard 16 Jul '24

16 Jul '24

Module: wine Branch: master Commit: 9e9b59908ef9a06c7aeecd4298761b1b45446c04 URL: https://gitlab.winehq.org/wine/wine/-/commit/9e9b59908ef9a06c7aeecd4298761b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 16 13:07:28 2024 +0200 winhttp: Handle exact buffer length match in WinHttpQueryOption(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/winhttp/session.c | 2 +- dlls/winhttp/tests/winhttp.c | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index d579d72583e..e8e286145ca 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -685,7 +685,7 @@ static BOOL return_string_option( WCHAR *buffer, const WCHAR *str, LPDWORD bufle { int len = sizeof(WCHAR); if (str) len += lstrlenW( str ) * sizeof(WCHAR); - if (buffer && *buflen > len) + if (buffer && *buflen >= len) { if (str) memcpy( buffer, str, len ); len -= sizeof(WCHAR); diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 6e814247167..2e086222aba 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -3336,9 +3336,7 @@ static void test_redirect(int port) url[0] = 0; size = (lstrlenW(expected) + 1) * sizeof(WCHAR); ret = WinHttpQueryOption(req, WINHTTP_OPTION_URL, url, &size); - todo_wine ok(ret, "got %lu\n", GetLastError()); - todo_wine ok(!wcscmp(url, expected), "expected %s got %s\n", wine_dbgstr_w(expected), wine_dbgstr_w(url)); ret = WinHttpReceiveResponse(req, NULL); @@ -4430,11 +4428,8 @@ static void test_credentials(void) size = (lstrlenW(proxy_userW) + 1) * sizeof(WCHAR); buffer[0] = 0; ret = WinHttpQueryOption(req, WINHTTP_OPTION_PROXY_USERNAME, &buffer, &size); - todo_wine ok(ret, "failed to query proxy username %lu\n", GetLastError()); - todo_wine ok(!wcscmp(buffer, proxy_userW), "unexpected result %s\n", wine_dbgstr_w(buffer)); - todo_wine ok(size == lstrlenW(proxy_userW) * sizeof(WCHAR), "unexpected result %lu\n", size); buffer[0] = 0x1; @@ -4487,11 +4482,8 @@ static void test_credentials(void) size = (lstrlenW(proxy_passW) + 1) * sizeof(WCHAR); buffer[0] = 0; ret = WinHttpQueryOption(req, WINHTTP_OPTION_PROXY_PASSWORD, &buffer, &size); - todo_wine ok(ret, "failed to query proxy password %lu\n", GetLastError()); - todo_wine ok(!wcscmp(buffer, proxy_passW), "unexpected result %s\n", wine_dbgstr_w(buffer)); - todo_wine ok(size == lstrlenW(proxy_passW) * sizeof(WCHAR), "unexpected result %lu\n", size); buffer[0] = 0x1; @@ -4520,11 +4512,8 @@ static void test_credentials(void) size = (lstrlenW(userW) + 1) * sizeof(WCHAR); buffer[0] = 0; ret = WinHttpQueryOption(req, WINHTTP_OPTION_USERNAME, &buffer, &size); - todo_wine ok(ret, "failed to query username %lu\n", GetLastError()); - todo_wine ok(!wcscmp(buffer, userW), "unexpected result %s\n", wine_dbgstr_w(buffer)); - todo_wine ok(size == lstrlenW(userW) * sizeof(WCHAR), "unexpected result %lu\n", size); buffer[0] = 0x1; @@ -4553,11 +4542,8 @@ static void test_credentials(void) buffer[0] = 0; size = (lstrlenW(passW) + 1) * sizeof(WCHAR); ret = WinHttpQueryOption(req, WINHTTP_OPTION_PASSWORD, &buffer, &size); - todo_wine ok(ret, "failed to query password %lu\n", GetLastError()); - todo_wine ok(!wcscmp(buffer, passW), "unexpected result %s\n", wine_dbgstr_w(buffer)); - todo_wine ok(size == lstrlenW(passW) * sizeof(WCHAR), "unexpected result %lu\n", size); buffer[0] = 0x1;

1 0

Jacek Caban : mshtml: Directly use dispex_prop_put and dispex_prop_get in HTMLElement implementation.
by Alexandre Julliard 16 Jul '24

16 Jul '24

Module: wine Branch: master Commit: 2261b2653a67f0220694f896d3f0f4465f6b40c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/2261b2653a67f0220694f896d3f0f4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 15 19:08:41 2024 +0200 mshtml: Directly use dispex_prop_put and dispex_prop_get in HTMLElement implementation. --- dlls/mshtml/dispex.c | 4 ++-- dlls/mshtml/htmlelem.c | 13 +++---------- dlls/mshtml/mshtml_private.h | 4 ++++ 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 72eb8db40a7..ccba451507b 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -1914,7 +1914,7 @@ static HRESULT WINAPI DispatchEx_GetDispID(IWineJSDispatchHost *iface, BSTR bstr return S_OK; } -static HRESULT dispex_prop_get(DispatchEx *dispex, DISPID id, LCID lcid, VARIANT *r, EXCEPINFO *ei, IServiceProvider *caller) +HRESULT dispex_prop_get(DispatchEx *dispex, DISPID id, LCID lcid, VARIANT *r, EXCEPINFO *ei, IServiceProvider *caller) { switch(get_dispid_type(id)) { case DISPEXPROP_CUSTOM: { @@ -1950,7 +1950,7 @@ static HRESULT dispex_prop_get(DispatchEx *dispex, DISPID id, LCID lcid, VARIANT } } -static HRESULT dispex_prop_put(DispatchEx *dispex, DISPID id, LCID lcid, VARIANT *v, EXCEPINFO *ei, IServiceProvider *caller) +HRESULT dispex_prop_put(DispatchEx *dispex, DISPID id, LCID lcid, VARIANT *v, EXCEPINFO *ei, IServiceProvider *caller) { static DISPID propput_dispid = DISPID_PROPERTYPUT; diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 470b718523b..750bc8f2428 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1161,8 +1161,6 @@ static inline WCHAR *translate_attr_name(WCHAR *attr_name, compat_mode_t compat_ static HRESULT set_elem_attr_value_by_dispid(HTMLElement *elem, DISPID dispid, VARIANT *v) { - DISPID propput_dispid = DISPID_PROPERTYPUT; - DISPPARAMS dp = {v, &propput_dispid, 1, 1}; EXCEPINFO ei; if(dispid == DISPID_IHTMLELEMENT_STYLE) { @@ -1170,8 +1168,7 @@ static HRESULT set_elem_attr_value_by_dispid(HTMLElement *elem, DISPID dispid, V return S_OK; } - return IWineJSDispatchHost_InvokeEx(&elem->node.event_target.dispex.IWineJSDispatchHost_iface, dispid, - LOCALE_SYSTEM_DEFAULT, DISPATCH_PROPERTYPUT, &dp, NULL, &ei, NULL); + return dispex_prop_put(&elem->node.event_target.dispex, dispid, LOCALE_SYSTEM_DEFAULT, v, &ei, NULL); } static HRESULT WINAPI HTMLElement_setAttribute(IHTMLElement *iface, BSTR strAttributeName, @@ -1238,11 +1235,8 @@ done: HRESULT get_elem_attr_value_by_dispid(HTMLElement *elem, DISPID dispid, VARIANT *ret) { - DISPPARAMS dispParams = {NULL, NULL, 0, 0}; EXCEPINFO excep; - - return IWineJSDispatchHost_InvokeEx(&elem->node.event_target.dispex.IWineJSDispatchHost_iface, dispid, LOCALE_SYSTEM_DEFAULT, - DISPATCH_PROPERTYGET, &dispParams, ret, &excep, NULL); + return dispex_prop_get(&elem->node.event_target.dispex, dispid, LOCALE_SYSTEM_DEFAULT, ret, &excep, NULL); } HRESULT attr_value_to_string(VARIANT *v) @@ -2483,8 +2477,7 @@ static HRESULT WINAPI HTMLElement_toString(IHTMLElement *iface, BSTR *String) if(!String) return E_INVALIDARG; - hres = IWineJSDispatchHost_InvokeEx(&This->node.event_target.dispex.IWineJSDispatchHost_iface, DISPID_VALUE, - LOCALE_SYSTEM_DEFAULT, DISPATCH_PROPERTYGET, NULL, &var, NULL, NULL); + hres = dispex_prop_get(&This->node.event_target.dispex, DISPID_VALUE, LOCALE_SYSTEM_DEFAULT, &var, NULL, NULL); if(SUCCEEDED(hres)) { assert(V_VT(&var) == VT_BSTR); *String = V_BSTR(&var); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 0bce00762b7..dffb191f13c 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -508,6 +508,10 @@ compat_mode_t dispex_compat_mode(DispatchEx*); HRESULT dispex_to_string(DispatchEx*,BSTR*); HRESULT dispex_call_builtin(DispatchEx *dispex, DISPID id, DISPPARAMS *dp, VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller); +HRESULT dispex_prop_get(DispatchEx *dispex, DISPID id, LCID lcid, VARIANT *r, EXCEPINFO *ei, + IServiceProvider *caller); +HRESULT dispex_prop_put(DispatchEx *dispex, DISPID id, LCID lcid, VARIANT *v, EXCEPINFO *ei, + IServiceProvider *caller); typedef enum { DISPEXPROP_CUSTOM,

1 0

Jacek Caban : mshtml: Factor out dispex_next_id.
by Alexandre Julliard 16 Jul '24

16 Jul '24

Module: wine Branch: master Commit: 0d7b1d9c1f4c07ae75428a66b4ebbede52620221 URL: https://gitlab.winehq.org/wine/wine/-/commit/0d7b1d9c1f4c07ae75428a66b4ebbe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 15 20:03:10 2024 +0200 mshtml: Factor out dispex_next_id. And use it in get_attr_dispid_by_relative_idx. --- dlls/mshtml/dispex.c | 45 ++++++++++++++++++++++++-------------------- dlls/mshtml/htmlelem.c | 3 +-- dlls/mshtml/mshtml_private.h | 1 + 3 files changed, 27 insertions(+), 22 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index ccba451507b..75738455d10 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -2215,41 +2215,33 @@ static HRESULT next_dynamic_id(DispatchEx *dispex, DWORD idx, DISPID *ret_id) return S_OK; } -static HRESULT WINAPI DispatchEx_GetNextDispID(IWineJSDispatchHost *iface, DWORD grfdex, DISPID id, DISPID *pid) +HRESULT dispex_next_id(DispatchEx *dispex, DISPID id, DISPID *ret) { - DispatchEx *This = impl_from_IWineJSDispatchHost(iface); func_info_t *func; HRESULT hres; - TRACE("%s (%p)->(%lx %lx %p)\n", This->info->desc->name, This, grfdex, id, pid); - - if(!ensure_real_info(This)) - return E_OUTOFMEMORY; - if(This->jsdisp) - return IWineJSDispatch_GetNextDispID(This->jsdisp, grfdex, id, pid); - if(is_dynamic_dispid(id)) { DWORD idx = id - DISPID_DYNPROP_0; - if(!get_dynamic_data(This) || This->dynamic_data->prop_cnt <= idx) + if(!get_dynamic_data(dispex) || dispex->dynamic_data->prop_cnt <= idx) return DISP_E_MEMBERNOTFOUND; - return next_dynamic_id(This, idx+1, pid); + return next_dynamic_id(dispex, idx+1, ret); } if(!is_custom_dispid(id)) { if(id == DISPID_STARTENUM) { - func = This->info->funcs; + func = dispex->info->funcs; }else { - hres = get_builtin_func(This->info, id, &func); + hres = get_builtin_func(dispex->info, id, &func); if(FAILED(hres)) return hres; func++; } - while(func < This->info->funcs + This->info->func_cnt) { + while(func < dispex->info->funcs + dispex->info->func_cnt) { if(func->func_disp_idx == -1) { - *pid = func->id; + *ret = func->id; return S_OK; } func++; @@ -2258,19 +2250,32 @@ static HRESULT WINAPI DispatchEx_GetNextDispID(IWineJSDispatchHost *iface, DWORD id = DISPID_STARTENUM; } - if(This->info->desc->vtbl->next_dispid) { - hres = This->info->desc->vtbl->next_dispid(This, id, pid); + if(dispex->info->desc->vtbl->next_dispid) { + hres = dispex->info->desc->vtbl->next_dispid(dispex, id, ret); if(hres != S_FALSE) return hres; } - if(get_dynamic_data(This) && This->dynamic_data->prop_cnt) - return next_dynamic_id(This, 0, pid); + if(get_dynamic_data(dispex) && dispex->dynamic_data->prop_cnt) + return next_dynamic_id(dispex, 0, ret); - *pid = DISPID_STARTENUM; + *ret = DISPID_STARTENUM; return S_FALSE; } +static HRESULT WINAPI DispatchEx_GetNextDispID(IWineJSDispatchHost *iface, DWORD grfdex, DISPID id, DISPID *pid) +{ + DispatchEx *This = impl_from_IWineJSDispatchHost(iface); + + TRACE("%s (%p)->(%lx %lx %p)\n", This->info->desc->name, This, grfdex, id, pid); + + if(!ensure_real_info(This)) + return E_OUTOFMEMORY; + if(This->jsdisp) + return IWineJSDispatch_GetNextDispID(This->jsdisp, grfdex, id, pid); + return dispex_next_id(This, id, pid); +} + static HRESULT WINAPI DispatchEx_GetNameSpaceParent(IWineJSDispatchHost *iface, IUnknown **ppunk) { DispatchEx *This = impl_from_IWineJSDispatchHost(iface); diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 750bc8f2428..b26b8eac40e 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -7538,7 +7538,6 @@ static HRESULT create_filters_collection(compat_mode_t compat_mode, IHTMLFilters static HRESULT get_attr_dispid_by_relative_idx(HTMLAttributeCollection *This, LONG *idx, DISPID start, DISPID *dispid) { - IWineJSDispatchHost *dispex = &This->elem->node.event_target.dispex.IWineJSDispatchHost_iface; DISPID id = start; LONG len = -1; HRESULT hres; @@ -7546,7 +7545,7 @@ static HRESULT get_attr_dispid_by_relative_idx(HTMLAttributeCollection *This, LO FIXME("filter non-enumerable attributes out\n"); while(1) { - hres = IWineJSDispatchHost_GetNextDispID(dispex, fdexEnumAll, id, &id); + hres = dispex_next_id(&This->elem->node.event_target.dispex, id, &id); if(FAILED(hres)) return hres; else if(hres == S_FALSE) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index dffb191f13c..fd1eb9f4822 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -512,6 +512,7 @@ HRESULT dispex_prop_get(DispatchEx *dispex, DISPID id, LCID lcid, VARIANT *r, EX IServiceProvider *caller); HRESULT dispex_prop_put(DispatchEx *dispex, DISPID id, LCID lcid, VARIANT *v, EXCEPINFO *ei, IServiceProvider *caller); +HRESULT dispex_next_id(DispatchEx *dispex, DISPID id, DISPID *ret); typedef enum { DISPEXPROP_CUSTOM,

1 0

Jacek Caban : mshtml: Don't use BSTR in find_dispid.
by Alexandre Julliard 16 Jul '24

16 Jul '24

Module: wine Branch: master Commit: b55711647f0f33f607472e0677e3046ae5cb584d URL: https://gitlab.winehq.org/wine/wine/-/commit/b55711647f0f33f607472e0677e304… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 15 20:59:32 2024 +0200 mshtml: Don't use BSTR in find_dispid. --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmlwindow.c | 10 +++++----- dlls/mshtml/mshtml_private.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index a5f4f558bdd..75b2b0b831d 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5389,7 +5389,7 @@ static HRESULT HTMLDocumentNode_get_dispid(DispatchEx *dispex, BSTR name, DWORD return hres; } -static HRESULT HTMLDocumentNode_find_dispid(DispatchEx *dispex, BSTR name, DWORD grfdex, DISPID *dispid) +static HRESULT HTMLDocumentNode_find_dispid(DispatchEx *dispex, const WCHAR *name, DWORD grfdex, DISPID *dispid) { HTMLDocumentNode *This = impl_from_DispatchEx(dispex); HRESULT hres = DISP_E_UNKNOWNNAME; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index af2a0e83d66..e53d9cacd42 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3309,7 +3309,7 @@ static ULONG WINAPI WindowDispEx_Release(IWineJSDispatchHost *iface) DISPEX_IDISPATCH_NOUNK_IMPL(WindowDispEx, IWineJSDispatchHost, impl_from_IWineJSDispatchHost(iface)->base.inner_window->event_target.dispex) -static global_prop_t *alloc_global_prop(HTMLInnerWindow *This, global_prop_type_t type, BSTR name) +static global_prop_t *alloc_global_prop(HTMLInnerWindow *This, global_prop_type_t type, const WCHAR *name) { if(This->global_prop_cnt == This->global_prop_size) { global_prop_t *new_props; @@ -3781,12 +3781,12 @@ static HRESULT HTMLWindow_lookup_dispid(DispatchEx *dispex, BSTR name, DWORD grf return search_window_props(This, name, grfdex, dispid); } -static HRESULT HTMLWindow_find_dispid(DispatchEx *dispex, BSTR name, DWORD grfdex, DISPID *dispid) +static HRESULT HTMLWindow_find_dispid(DispatchEx *dispex, const WCHAR *name, DWORD grfdex, DISPID *dispid) { HTMLInnerWindow *This = impl_from_DispatchEx(dispex); HTMLOuterWindow *frame; global_prop_t *prop; - IHTMLElement *elem; + HTMLElement *elem; HRESULT hres; hres = get_frame_by_name(This->base.outer_window, name, FALSE, &frame); @@ -3799,9 +3799,9 @@ static HRESULT HTMLWindow_find_dispid(DispatchEx *dispex, BSTR name, DWORD grfde return S_OK; } - hres = IHTMLDocument3_getElementById(&This->doc->IHTMLDocument3_iface, name, &elem); + hres = get_doc_elem_by_id(This->doc, name, &elem); if(SUCCEEDED(hres) && elem) { - IHTMLElement_Release(elem); + IHTMLElement_Release(&elem->IHTMLElement_iface); prop = alloc_global_prop(This, GLOBAL_ELEMENTVAR, name); if(!prop) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index fd1eb9f4822..d79c8b6a24e 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -382,7 +382,7 @@ typedef struct { 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*); + HRESULT (*find_dispid)(DispatchEx*,const WCHAR*,DWORD,DISPID*); /* Similar to get_dispid, but called before any other lookup */ HRESULT (*lookup_dispid)(DispatchEx*,BSTR,DWORD,DISPID*);

1 0

Jacek Caban : mshtml: Don't use BSTR in lookup_dispid.
by Alexandre Julliard 16 Jul '24

16 Jul '24

Module: wine Branch: master Commit: b3503369a3a44e9d51619c2f0464be19eb0ec363 URL: https://gitlab.winehq.org/wine/wine/-/commit/b3503369a3a44e9d51619c2f0464be… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 15 21:03:23 2024 +0200 mshtml: Don't use BSTR in lookup_dispid. --- dlls/mshtml/htmlscript.h | 2 +- dlls/mshtml/htmlwindow.c | 10 +++++----- dlls/mshtml/mshtml_private.h | 4 ++-- dlls/mshtml/script.c | 10 ++++++++-- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmlscript.h b/dlls/mshtml/htmlscript.h index 37a7b8d1f50..6d608d525a1 100644 --- a/dlls/mshtml/htmlscript.h +++ b/dlls/mshtml/htmlscript.h @@ -47,7 +47,7 @@ void doc_insert_script(HTMLInnerWindow*,HTMLScriptElement*,BOOL); IDispatch *script_parse_event(HTMLInnerWindow*,LPCWSTR); HRESULT exec_script(HTMLInnerWindow*,const WCHAR*,const WCHAR*,VARIANT*); void update_browser_script_mode(GeckoBrowser*,IUri*); -BOOL find_global_prop(HTMLInnerWindow*,BSTR,DWORD,ScriptHost**,DISPID*); +BOOL find_global_prop(HTMLInnerWindow*,const WCHAR*,DWORD,ScriptHost**,DISPID*); IDispatch *get_script_disp(ScriptHost*); IActiveScriptSite *get_first_script_site(HTMLInnerWindow*); void initialize_script_global(HTMLInnerWindow*); diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index e53d9cacd42..b936a9a844a 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3341,7 +3341,7 @@ static inline DWORD prop_to_dispid(HTMLInnerWindow *This, global_prop_t *prop) return MSHTML_DISPID_CUSTOM_MIN + (prop-This->global_props); } -HRESULT search_window_props(HTMLInnerWindow *This, BSTR bstrName, DWORD grfdex, DISPID *pid) +HRESULT search_window_props(HTMLInnerWindow *This, const WCHAR *name, DWORD grfdex, DISPID *pid) { DWORD i; ScriptHost *script_host; @@ -3349,16 +3349,16 @@ HRESULT search_window_props(HTMLInnerWindow *This, BSTR bstrName, DWORD grfdex, for(i=0; i < This->global_prop_cnt; i++) { /* FIXME: case sensitivity */ - if(!wcscmp(This->global_props[i].name, bstrName)) { + if(!wcscmp(This->global_props[i].name, name)) { *pid = MSHTML_DISPID_CUSTOM_MIN+i; return S_OK; } } - if(find_global_prop(This->base.inner_window, bstrName, grfdex, &script_host, &id)) { + if(find_global_prop(This->base.inner_window, name, grfdex, &script_host, &id)) { global_prop_t *prop; - prop = alloc_global_prop(This, GLOBAL_SCRIPTVAR, bstrName); + prop = alloc_global_prop(This, GLOBAL_SCRIPTVAR, name); if(!prop) return E_OUTOFMEMORY; @@ -3774,7 +3774,7 @@ 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_lookup_dispid(DispatchEx *dispex, BSTR name, DWORD grfdex, DISPID *dispid) +static HRESULT HTMLWindow_lookup_dispid(DispatchEx *dispex, const WCHAR *name, DWORD grfdex, DISPID *dispid) { HTMLInnerWindow *This = impl_from_DispatchEx(dispex); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index d79c8b6a24e..620b4986dc6 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -385,7 +385,7 @@ typedef struct { HRESULT (*find_dispid)(DispatchEx*,const WCHAR*,DWORD,DISPID*); /* Similar to get_dispid, but called before any other lookup */ - HRESULT (*lookup_dispid)(DispatchEx*,BSTR,DWORD,DISPID*); + HRESULT (*lookup_dispid)(DispatchEx*,const WCHAR*,DWORD,DISPID*); /* These are called when the object implements GetMemberName, InvokeEx, DeleteMemberByDispID and GetNextDispID for custom props */ HRESULT (*get_name)(DispatchEx*,DISPID,BSTR*); @@ -1277,7 +1277,7 @@ HRESULT get_document_node(nsIDOMDocument*,HTMLDocumentNode**); HTMLElement *unsafe_impl_from_IHTMLElement(IHTMLElement*); -HRESULT search_window_props(HTMLInnerWindow*,BSTR,DWORD,DISPID*); +HRESULT search_window_props(HTMLInnerWindow*,const WCHAR*,DWORD,DISPID*); HRESULT get_frame_by_name(HTMLOuterWindow*,const WCHAR*,BOOL,HTMLOuterWindow**); HRESULT get_doc_elem_by_id(HTMLDocumentNode*,const WCHAR*,HTMLElement**); HTMLOuterWindow *get_target_window(HTMLOuterWindow*,nsAString*,BOOL*); diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 6a542defa8c..295c8a0dc15 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -1770,13 +1770,17 @@ void bind_event_scripts(HTMLDocumentNode *doc) nsIDOMNodeList_Release(node_list); } -BOOL find_global_prop(HTMLInnerWindow *window, BSTR name, DWORD flags, ScriptHost **ret_host, DISPID *ret_id) +BOOL find_global_prop(HTMLInnerWindow *window, const WCHAR *name, DWORD flags, ScriptHost **ret_host, DISPID *ret_id) { IDispatchEx *dispex; IDispatch *disp; ScriptHost *iter; + BSTR str; HRESULT hres; + if(!(str = SysAllocString(name))) + return E_OUTOFMEMORY; + LIST_FOR_EACH_ENTRY(iter, &window->script_hosts, ScriptHost, entry) { disp = get_script_disp(iter); if(!disp) @@ -1784,7 +1788,7 @@ BOOL find_global_prop(HTMLInnerWindow *window, BSTR name, DWORD flags, ScriptHos hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); if(SUCCEEDED(hres)) { - hres = IDispatchEx_GetDispID(dispex, name, flags & (~fdexNameEnsure), ret_id); + hres = IDispatchEx_GetDispID(dispex, str, flags & (~fdexNameEnsure), ret_id); IDispatchEx_Release(dispex); }else { FIXME("No IDispatchEx\n"); @@ -1793,11 +1797,13 @@ BOOL find_global_prop(HTMLInnerWindow *window, BSTR name, DWORD flags, ScriptHos IDispatch_Release(disp); if(SUCCEEDED(hres)) { + SysFreeString(str); *ret_host = iter; return TRUE; } } + SysFreeString(str); return FALSE; }

1 0

Jacek Caban : mshtml: Don't use BSTR in get_dispid.
by Alexandre Julliard 16 Jul '24

16 Jul '24

Module: wine Branch: master Commit: d7870118a53a82fa8c5e135f952f58e36fb3edc1 URL: https://gitlab.winehq.org/wine/wine/-/commit/d7870118a53a82fa8c5e135f952f58… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 15 21:12:31 2024 +0200 mshtml: Don't use BSTR in get_dispid. --- dlls/mshtml/dispex.c | 8 +++----- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmlelem.c | 16 ++++++++-------- dlls/mshtml/htmlelemcol.c | 4 ++-- dlls/mshtml/htmlform.c | 2 +- dlls/mshtml/htmlframe.c | 4 ++-- dlls/mshtml/htmlnode.c | 4 ++-- dlls/mshtml/htmlobject.c | 2 +- dlls/mshtml/htmlselect.c | 2 +- dlls/mshtml/htmlstorage.c | 2 +- dlls/mshtml/htmlstyle.c | 2 +- dlls/mshtml/htmlstyle.h | 2 +- dlls/mshtml/htmlstylesheet.c | 8 ++++---- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/pluginhost.c | 4 ++-- dlls/mshtml/pluginhost.h | 2 +- 16 files changed, 32 insertions(+), 34 deletions(-)

1 0

Jacek Caban : mshtml: Factor out dispex_get_id.
by Alexandre Julliard 16 Jul '24

16 Jul '24

Module: wine Branch: master Commit: 3274d9593a64509d05d9bb389a3fc34108915b32 URL: https://gitlab.winehq.org/wine/wine/-/commit/3274d9593a64509d05d9bb389a3fc3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 15 21:30:23 2024 +0200 mshtml: Factor out dispex_get_id. And use it in HTMLElement implementation. --- dlls/mshtml/dispex.c | 43 ++++++++++++++++++++++++------------------- dlls/mshtml/htmlelem.c | 28 +++++++++++----------------- dlls/mshtml/mshtml_private.h | 1 + 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 5ebd1fa52e8..97f50a8810b 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -1877,43 +1877,48 @@ static HRESULT WINAPI DispatchEx_Invoke(IWineJSDispatchHost *iface, DISPID dispI pVarResult, pExcepInfo, NULL); } -static HRESULT WINAPI DispatchEx_GetDispID(IWineJSDispatchHost *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) +HRESULT dispex_get_id(DispatchEx *dispex, const WCHAR *name, DWORD flags, DISPID *pid) { - DispatchEx *This = impl_from_IWineJSDispatchHost(iface); dynamic_prop_t *dprop = NULL; HRESULT hres; - TRACE("%s (%p)->(%s %lx %p)\n", This->info->desc->name, This, debugstr_w(bstrName), grfdex, pid); - - if(grfdex & ~(fdexNameCaseSensitive|fdexNameCaseInsensitive|fdexNameEnsure|fdexNameImplicit|FDEX_VERSION_MASK)) - FIXME("Unsupported grfdex %lx\n", grfdex); - - if(!ensure_real_info(This)) - return E_OUTOFMEMORY; - if(This->jsdisp) - return IWineJSDispatch_GetDispID(This->jsdisp, bstrName, grfdex, pid); - - hres = get_builtin_id(This, bstrName, grfdex, pid); + hres = get_builtin_id(dispex, name, flags, pid); if(hres != DISP_E_UNKNOWNNAME) return hres; - hres = get_dynamic_prop(This, bstrName, grfdex & ~fdexNameEnsure, &dprop); + hres = get_dynamic_prop(dispex, name, flags & ~fdexNameEnsure, &dprop); if(FAILED(hres)) { - if(This->info->desc->vtbl->find_dispid) { - hres = This->info->desc->vtbl->find_dispid(This, bstrName, grfdex, pid); + if(dispex->info->desc->vtbl->find_dispid) { + hres = dispex->info->desc->vtbl->find_dispid(dispex, name, flags, pid); if(SUCCEEDED(hres)) return hres; } - if(grfdex & fdexNameEnsure) - hres = alloc_dynamic_prop(This, bstrName, dprop, &dprop); + if(flags & fdexNameEnsure) + hres = alloc_dynamic_prop(dispex, name, dprop, &dprop); if(FAILED(hres)) return hres; } - *pid = DISPID_DYNPROP_0 + (dprop - This->dynamic_data->props); + *pid = DISPID_DYNPROP_0 + (dprop - dispex->dynamic_data->props); return S_OK; } +static HRESULT WINAPI DispatchEx_GetDispID(IWineJSDispatchHost *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) +{ + DispatchEx *This = impl_from_IWineJSDispatchHost(iface); + + TRACE("%s (%p)->(%s %lx %p)\n", This->info->desc->name, This, debugstr_w(bstrName), grfdex, pid); + + if(grfdex & ~(fdexNameCaseSensitive|fdexNameCaseInsensitive|fdexNameEnsure|fdexNameImplicit|FDEX_VERSION_MASK)) + FIXME("Unsupported grfdex %lx\n", grfdex); + + if(!ensure_real_info(This)) + return E_OUTOFMEMORY; + if(This->jsdisp) + return IWineJSDispatch_GetDispID(This->jsdisp, bstrName, grfdex, pid); + return dispex_get_id(This, bstrName, grfdex, pid); +} + HRESULT dispex_prop_get(DispatchEx *dispex, DISPID id, LCID lcid, VARIANT *r, EXCEPINFO *ei, IServiceProvider *caller) { switch(get_dispid_type(id)) { diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 0b08b0e4995..3e45ab5cb0e 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1149,14 +1149,11 @@ static dispex_static_data_t HTMLRectCollection_dispex = { DISPEX_IDISPATCH_IMPL(HTMLElement, IHTMLElement, impl_from_IHTMLElement(iface)->node.event_target.dispex) -static inline WCHAR *translate_attr_name(WCHAR *attr_name, compat_mode_t compat_mode) +static inline const WCHAR *translate_attr_name(const WCHAR *attr_name, compat_mode_t compat_mode) { - static WCHAR classNameW[] = L"className"; - WCHAR *ret = attr_name; - if(compat_mode >= COMPAT_MODE_IE8 && !wcsicmp(attr_name, L"class")) - ret = classNameW; - return ret; + return L"className"; + return attr_name; } static HRESULT set_elem_attr_value_by_dispid(HTMLElement *elem, DISPID dispid, VARIANT *v) @@ -1186,7 +1183,7 @@ static HRESULT WINAPI HTMLElement_setAttribute(IHTMLElement *iface, BSTR strAttr TRACE("(%p)->(%s %s %08lx)\n", This, debugstr_w(strAttributeName), debugstr_variant(&AttributeValue), lFlags); if(compat_mode < COMPAT_MODE_IE9 || !This->dom_element) { - hres = IWineJSDispatchHost_GetDispID(&This->node.event_target.dispex.IWineJSDispatchHost_iface, translate_attr_name(strAttributeName, compat_mode), + hres = dispex_get_id(&This->node.event_target.dispex, translate_attr_name(strAttributeName, compat_mode), (lFlags&ATTRFLAG_CASESENSITIVE ? fdexNameCaseSensitive : fdexNameCaseInsensitive) | fdexNameEnsure, &dispid); if(FAILED(hres)) return hres; @@ -1282,8 +1279,8 @@ static HRESULT WINAPI HTMLElement_getAttribute(IHTMLElement *iface, BSTR strAttr FIXME("Unsupported flags %lx\n", lFlags); if(compat_mode < COMPAT_MODE_IE9 || !This->dom_element) { - hres = IWineJSDispatchHost_GetDispID(&This->node.event_target.dispex.IWineJSDispatchHost_iface, translate_attr_name(strAttributeName, compat_mode), - lFlags&ATTRFLAG_CASESENSITIVE ? fdexNameCaseSensitive : fdexNameCaseInsensitive, &dispid); + hres = dispex_get_id(&This->node.event_target.dispex, translate_attr_name(strAttributeName, compat_mode), + lFlags & ATTRFLAG_CASESENSITIVE ? fdexNameCaseSensitive : fdexNameCaseInsensitive, &dispid); if(FAILED(hres)) { V_VT(AttributeValue) = VT_NULL; return (hres == DISP_E_UNKNOWNNAME) ? S_OK : hres; @@ -1330,8 +1327,8 @@ static HRESULT WINAPI HTMLElement_removeAttribute(IHTMLElement *iface, BSTR strA TRACE("(%p)->(%s %lx %p)\n", This, debugstr_w(strAttributeName), lFlags, pfSuccess); if(compat_mode < COMPAT_MODE_IE9 || !This->dom_element) { - hres = IWineJSDispatchHost_GetDispID(&This->node.event_target.dispex.IWineJSDispatchHost_iface, translate_attr_name(strAttributeName, compat_mode), - lFlags&ATTRFLAG_CASESENSITIVE ? fdexNameCaseSensitive : fdexNameCaseInsensitive, &id); + hres = dispex_get_id(&This->node.event_target.dispex, translate_attr_name(strAttributeName, compat_mode), + lFlags & ATTRFLAG_CASESENSITIVE ? fdexNameCaseSensitive : fdexNameCaseInsensitive, &id); if(hres == DISP_E_UNKNOWNNAME) { *pfSuccess = VARIANT_FALSE; return S_OK; @@ -4423,8 +4420,7 @@ static HRESULT WINAPI HTMLElement4_setAttributeNode(IHTMLElement4 *iface, IHTMLD return E_INVALIDARG; } - hres = IWineJSDispatchHost_GetDispID(&This->node.event_target.dispex.IWineJSDispatchHost_iface, - attr->name, fdexNameCaseInsensitive|fdexNameEnsure, &dispid); + hres = dispex_get_id(&This->node.event_target.dispex, attr->name, fdexNameCaseInsensitive | fdexNameEnsure, &dispid); if(FAILED(hres)) return hres; @@ -6393,7 +6389,7 @@ HRESULT HTMLElement_populate_props(DispatchEx *dispex) continue; } - hres = IWineJSDispatchHost_GetDispID(&dispex->IWineJSDispatchHost_iface, name, fdexNameCaseInsensitive, &id); + hres = dispex_get_id(dispex, name, fdexNameCaseInsensitive, &id); if(hres != DISP_E_UNKNOWNNAME) { nsIDOMAttr_Release(attr); SysFreeString(name); @@ -7586,9 +7582,7 @@ static inline HRESULT get_attr_dispid_by_name(HTMLAttributeCollection *This, con } } - hres = IWineJSDispatchHost_GetDispID(&This->elem->node.event_target.dispex.IWineJSDispatchHost_iface, - (BSTR)name, fdexNameCaseInsensitive, id); - return hres; + return dispex_get_id(&This->elem->node.event_target.dispex, name, fdexNameCaseInsensitive, id); } static inline HRESULT get_domattr(HTMLAttributeCollection *This, DISPID id, LONG *list_pos, HTMLDOMAttribute **attr) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 0f986afbb57..38cf4e06282 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -512,6 +512,7 @@ HRESULT dispex_prop_get(DispatchEx *dispex, DISPID id, LCID lcid, VARIANT *r, EX IServiceProvider *caller); HRESULT dispex_prop_put(DispatchEx *dispex, DISPID id, LCID lcid, VARIANT *v, EXCEPINFO *ei, IServiceProvider *caller); +HRESULT dispex_get_id(DispatchEx *dispex, const WCHAR *name, DWORD flags, DISPID *pid); HRESULT dispex_next_id(DispatchEx *dispex, DISPID id, DISPID *ret); typedef enum {

1 0

Jacek Caban : mshtml: Use dispex_prop_put in HTMLDOMAttribute_put_nodeValue.
by Alexandre Julliard 16 Jul '24

16 Jul '24

Module: wine Branch: master Commit: 578dd9378d20d318e6dd4377b23c1dc293a6a296 URL: https://gitlab.winehq.org/wine/wine/-/commit/578dd9378d20d318e6dd4377b23c1d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 15 21:34:47 2024 +0200 mshtml: Use dispex_prop_put in HTMLDOMAttribute_put_nodeValue. --- dlls/mshtml/htmlattr.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index 4f58926d237..829c3ffa842 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -61,10 +61,7 @@ static HRESULT WINAPI HTMLDOMAttribute_get_nodeName(IHTMLDOMAttribute *iface, BS static HRESULT WINAPI HTMLDOMAttribute_put_nodeValue(IHTMLDOMAttribute *iface, VARIANT v) { HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute(iface); - DISPID dispidNamed = DISPID_PROPERTYPUT; - DISPPARAMS dp = {&v, &dispidNamed, 1, 1}; EXCEPINFO ei; - VARIANT ret; TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); @@ -72,9 +69,7 @@ static HRESULT WINAPI HTMLDOMAttribute_put_nodeValue(IHTMLDOMAttribute *iface, V return VariantCopy(&This->value, &v); memset(&ei, 0, sizeof(ei)); - - return IWineJSDispatchHost_InvokeEx(&This->elem->node.event_target.dispex.IWineJSDispatchHost_iface, This->dispid, LOCALE_SYSTEM_DEFAULT, - DISPATCH_PROPERTYPUT, &dp, &ret, &ei, NULL); + return dispex_prop_put(&This->elem->node.event_target.dispex, This->dispid, LOCALE_SYSTEM_DEFAULT, &v, &ei, NULL); } static HRESULT WINAPI HTMLDOMAttribute_get_nodeValue(IHTMLDOMAttribute *iface, VARIANT *p)

1 0

Jacek Caban : mshtml: Factor out dispex_prop_name.
by Alexandre Julliard 16 Jul '24

16 Jul '24

Module: wine Branch: master Commit: 7084abaff68dd2a5e3b04a4ed981968202fe5d65 URL: https://gitlab.winehq.org/wine/wine/-/commit/7084abaff68dd2a5e3b04a4ed98196… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 15 21:39:16 2024 +0200 mshtml: Factor out dispex_prop_name. And use it in HTMLDOMAttribute implementation. --- dlls/mshtml/dispex.c | 42 +++++++++++++++++++++--------------------- dlls/mshtml/htmlattr.c | 4 ++-- dlls/mshtml/mshtml_private.h | 1 + 3 files changed, 24 insertions(+), 23 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 97f50a8810b..54e54cfdc96 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -2163,46 +2163,46 @@ static HRESULT WINAPI DispatchEx_GetMemberProperties(IWineJSDispatchHost *iface, return E_NOTIMPL; } -static HRESULT WINAPI DispatchEx_GetMemberName(IWineJSDispatchHost *iface, DISPID id, BSTR *pbstrName) +HRESULT dispex_prop_name(DispatchEx *dispex, DISPID id, BSTR *ret) { - DispatchEx *This = impl_from_IWineJSDispatchHost(iface); func_info_t *func; HRESULT hres; - TRACE("%s (%p)->(%lx %p)\n", This->info->desc->name, This, id, pbstrName); - - if(!ensure_real_info(This)) - return E_OUTOFMEMORY; - if(This->jsdisp) - return IWineJSDispatch_GetMemberName(This->jsdisp, id, pbstrName); - if(is_custom_dispid(id)) { - if(This->info->desc->vtbl->get_name) - return This->info->desc->vtbl->get_name(This, id, pbstrName); + if(dispex->info->desc->vtbl->get_name) + return dispex->info->desc->vtbl->get_name(dispex, id, ret); return DISP_E_MEMBERNOTFOUND; } if(is_dynamic_dispid(id)) { DWORD idx = id - DISPID_DYNPROP_0; - if(!get_dynamic_data(This) || This->dynamic_data->prop_cnt <= idx) + if(!get_dynamic_data(dispex) || dispex->dynamic_data->prop_cnt <= idx) return DISP_E_MEMBERNOTFOUND; - *pbstrName = SysAllocString(This->dynamic_data->props[idx].name); - if(!*pbstrName) - return E_OUTOFMEMORY; - - return S_OK; + *ret = SysAllocString(dispex->dynamic_data->props[idx].name); + return *ret ? S_OK : E_OUTOFMEMORY; } - hres = get_builtin_func(This->info, id, &func); + hres = get_builtin_func(dispex->info, id, &func); if(FAILED(hres)) return hres; - *pbstrName = SysAllocString(func->name); - if(!*pbstrName) + *ret = SysAllocString(func->name); + return *ret ? S_OK : E_OUTOFMEMORY; +} + +static HRESULT WINAPI DispatchEx_GetMemberName(IWineJSDispatchHost *iface, DISPID id, BSTR *pbstrName) +{ + DispatchEx *This = impl_from_IWineJSDispatchHost(iface); + + TRACE("%s (%p)->(%lx %p)\n", This->info->desc->name, This, id, pbstrName); + + if(!ensure_real_info(This)) return E_OUTOFMEMORY; - return S_OK; + if(This->jsdisp) + return IWineJSDispatch_GetMemberName(This->jsdisp, id, pbstrName); + return dispex_prop_name(This, id, pbstrName); } static HRESULT next_dynamic_id(DispatchEx *dispex, DWORD idx, DISPID *ret_id) diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index 829c3ffa842..31837f06284 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -55,7 +55,7 @@ static HRESULT WINAPI HTMLDOMAttribute_get_nodeName(IHTMLDOMAttribute *iface, BS return *p ? S_OK : E_OUTOFMEMORY; } - return IWineJSDispatchHost_GetMemberName(&This->elem->node.event_target.dispex.IWineJSDispatchHost_iface, This->dispid, p); + return dispex_prop_name(&This->elem->node.event_target.dispex, This->dispid, p); } static HRESULT WINAPI HTMLDOMAttribute_put_nodeValue(IHTMLDOMAttribute *iface, VARIANT v) @@ -105,7 +105,7 @@ static HRESULT WINAPI HTMLDOMAttribute_get_specified(IHTMLDOMAttribute *iface, V return S_OK; } - hres = IWineJSDispatchHost_GetMemberName(&This->elem->node.event_target.dispex.IWineJSDispatchHost_iface, This->dispid, &name); + hres = dispex_prop_name(&This->elem->node.event_target.dispex, This->dispid, &name); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 38cf4e06282..a7a6a2ed0a2 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -514,6 +514,7 @@ HRESULT dispex_prop_put(DispatchEx *dispex, DISPID id, LCID lcid, VARIANT *v, EX IServiceProvider *caller); HRESULT dispex_get_id(DispatchEx *dispex, const WCHAR *name, DWORD flags, DISPID *pid); HRESULT dispex_next_id(DispatchEx *dispex, DISPID id, DISPID *ret); +HRESULT dispex_prop_name(DispatchEx *dispex, DISPID id, BSTR *ret); typedef enum { DISPEXPROP_CUSTOM,

1 0