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

Jacek Caban : mshtml: Access document object via browser object in update_window_doc.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: aa96a8de36d9f4c82c13f0756c931b15a49acde4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa96a8de36d9f4c82c13f075… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 14 14:13:29 2019 +0100 mshtml: Access document object via browser object in update_window_doc. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index dc3f24a..fd18ce0 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3672,10 +3672,11 @@ HRESULT update_window_doc(HTMLInnerWindow *window) outer_window->base.inner_window = window; outer_window->pending_window = NULL; - if(outer_window->doc_obj->basedoc.window == outer_window || !outer_window->doc_obj->basedoc.window) { - if(outer_window->doc_obj->basedoc.doc_node) - htmldoc_release(&outer_window->doc_obj->basedoc.doc_node->basedoc); - outer_window->doc_obj->basedoc.doc_node = window->doc; + if(is_main_content_window(outer_window) || !outer_window->browser->content_window) { + HTMLDocumentObj *doc_obj = outer_window->browser->doc; + if(doc_obj->basedoc.doc_node) + htmldoc_release(&doc_obj->basedoc.doc_node->basedoc); + doc_obj->basedoc.doc_node = window->doc; htmldoc_addref(&window->doc->basedoc); }

1 0

Jacek Caban : mshtml: Access document object via browser object in IBindCallbackRedirect:: Redirect.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: 70a964d4f9e194cddb44c10f3791c69b13a59346 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70a964d4f9e194cddb44c10f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 14 14:13:36 2019 +0100 mshtml: Access document object via browser object in IBindCallbackRedirect::Redirect. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/navigate.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 4715cbc..49549b9 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -590,22 +590,22 @@ static ULONG WINAPI BindCallbackRedirect_Release(IBindCallbackRedirect *iface) static HRESULT WINAPI BindCallbackRedirect_Redirect(IBindCallbackRedirect *iface, const WCHAR *url, VARIANT_BOOL *vbCancel) { BSCallback *This = impl_from_IBindCallbackRedirect(iface); - HTMLDocumentObj *doc_obj; + GeckoBrowser *browser; BOOL cancel = FALSE; BSTR frame_name = NULL; HRESULT hres = S_OK; TRACE("(%p)->(%s %p)\n", This, debugstr_w(url), vbCancel); - if(This->window && This->window->base.outer_window && (doc_obj = This->window->base.outer_window->doc_obj) - && doc_obj->doc_object_service) { - if(This->window->base.outer_window != doc_obj->basedoc.window) { + if(This->window && This->window->base.outer_window && (browser = This->window->base.outer_window->browser) + && browser->doc->doc_object_service) { + if(is_main_content_window(This->window->base.outer_window)) { hres = IHTMLWindow2_get_name(&This->window->base.IHTMLWindow2_iface, &frame_name); if(FAILED(hres)) return hres; } - hres = IDocObjectService_FireBeforeNavigate2(doc_obj->doc_object_service, NULL, url, 0x40, + hres = IDocObjectService_FireBeforeNavigate2(browser->doc->doc_object_service, NULL, url, 0x40, frame_name, NULL, 0, NULL, TRUE, &cancel); SysFreeString(frame_name); }

1 0

Jacek Caban : mshtml: Access document object via browser object in nsChannelBSC_init_bindinfo.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: 225b2f67b11c6c6d21fb954f7cfe921d6b2d2fa6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=225b2f67b11c6c6d21fb954f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 14 14:13:45 2019 +0100 mshtml: Access document object via browser object in nsChannelBSC_init_bindinfo. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/navigate.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 49549b9..05b8ec0 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1320,12 +1320,12 @@ static HRESULT nsChannelBSC_init_bindinfo(BSCallback *bsc) { nsChannelBSC *This = nsChannelBSC_from_BSCallback(bsc); nsChannel *nschannel = This->nschannel; - HTMLDocumentObj *doc_obj; + GeckoBrowser *browser; HRESULT hres; if(This->is_doc_channel && This->bsc.window && This->bsc.window->base.outer_window - && (doc_obj = This->bsc.window->base.outer_window->doc_obj)) { - if(doc_obj->hostinfo.dwFlags & DOCHOSTUIFLAG_ENABLE_REDIRECT_NOTIFICATION) + && (browser = This->bsc.window->base.outer_window->browser)) { + if(browser->doc->hostinfo.dwFlags & DOCHOSTUIFLAG_ENABLE_REDIRECT_NOTIFICATION) This->bsc.bindinfo_options |= BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS; }

1 0

Jacek Caban : mshtml: Access document object via browser object in handle_navigation_error and handle_extern_mime_navigation.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: 5ba17254916a891cc0b33a5cd4bdf25afcd0c847 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ba17254916a891cc0b33a5c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 14 14:13:54 2019 +0100 mshtml: Access document object via browser object in handle_navigation_error and handle_extern_mime_navigation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/navigate.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 05b8ec0..be83c81 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1394,13 +1394,13 @@ static void handle_navigation_error(nsChannelBSC *This, DWORD result) BSTR unk; HRESULT hres; - if(!This->is_doc_channel || !This->bsc.window) + if(!This->is_doc_channel || !This->bsc.window || !This->bsc.window->base.outer_window + || !This->bsc.window->base.outer_window->browser) return; outer_window = This->bsc.window->base.outer_window; - - doc = outer_window->doc_obj; - if(!doc || !doc->doc_object_service || !doc->client) + doc = outer_window->browser->doc; + if(!doc->doc_object_service || !doc->client) return; hres = IDocObjectService_IsErrorUrl(doc->doc_object_service, @@ -1590,10 +1590,10 @@ static void handle_extern_mime_navigation(nsChannelBSC *This) VARIANT flags; HRESULT hres; - if(!This->bsc.window || !This->bsc.window->base.outer_window || !This->bsc.window->base.outer_window->doc_obj) + if(!This->bsc.window || !This->bsc.window->base.outer_window || !This->bsc.window->base.outer_window->browser) return; - doc_obj = This->bsc.window->base.outer_window->doc_obj; + doc_obj = This->bsc.window->base.outer_window->browser->doc; hres = IOleClientSite_QueryInterface(doc_obj->client, &IID_IOleCommandTarget, (void**)&cmdtrg); if(SUCCEEDED(hres)) {

1 0

Jacek Caban : mshtml: Access document object via browser object in navigate_javascript_proc and navigate_fragment.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: 54323080d7b75290aa56624325d7524b0d153a42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54323080d7b75290aa566243… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 14 14:14:00 2019 +0100 mshtml: Access document object via browser object in navigate_javascript_proc and navigate_fragment. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/navigate.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index be83c81..3792fd8 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -2002,7 +2002,7 @@ static void navigate_javascript_proc(task_t *_task) return; } - set_download_state(window->doc_obj, 1); + set_download_state(window->browser->doc, 1); V_VT(&v) = VT_EMPTY; hres = exec_script(window->base.inner_window, code, jscriptW, &v); @@ -2012,10 +2012,10 @@ static void navigate_javascript_proc(task_t *_task) VariantClear(&v); } - if(window->doc_obj->view_sink) - IAdviseSink_OnViewChange(window->doc_obj->view_sink, DVASPECT_CONTENT, -1); + if(window->browser->doc->view_sink) + IAdviseSink_OnViewChange(window->browser->doc->view_sink, DVASPECT_CONTENT, -1); - set_download_state(window->doc_obj, 0); + set_download_state(window->browser->doc, 0); } static void navigate_javascript_task_destr(task_t *_task) @@ -2118,9 +2118,9 @@ static HRESULT navigate_fragment(HTMLOuterWindow *window, IUri *uri) SysFreeString(frag); - if(window->doc_obj->doc_object_service) { - IDocObjectService_FireNavigateComplete2(window->doc_obj->doc_object_service, &window->base.IHTMLWindow2_iface, 0x10); - IDocObjectService_FireDocumentComplete(window->doc_obj->doc_object_service, &window->base.IHTMLWindow2_iface, 0); + if(window->browser->doc->doc_object_service) { + IDocObjectService_FireNavigateComplete2(window->browser->doc->doc_object_service, &window->base.IHTMLWindow2_iface, 0x10); + IDocObjectService_FireDocumentComplete(window->browser->doc->doc_object_service, &window->base.IHTMLWindow2_iface, 0); }

1 0

Jacek Caban : mshtml: Access document object via browser object in super_navigate.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: 26d3e0c5dbb1d2343a86bfd980313e5873635d25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=26d3e0c5dbb1d2343a86bfd9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 14 14:14:08 2019 +0100 mshtml: Access document object via browser object in super_navigate. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/navigate.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 3792fd8..19dda29 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -2139,10 +2139,10 @@ HRESULT super_navigate(HTMLOuterWindow *window, IUri *uri, DWORD flags, const WC if(!uri_nofrag) return E_FAIL; - if(window->doc_obj->client && !(flags & BINDING_REFRESH)) { + if(window->browser->doc->client && !(flags & BINDING_REFRESH)) { IOleCommandTarget *cmdtrg; - hres = IOleClientSite_QueryInterface(window->doc_obj->client, &IID_IOleCommandTarget, (void**)&cmdtrg); + hres = IOleClientSite_QueryInterface(window->browser->doc->client, &IID_IOleCommandTarget, (void**)&cmdtrg); if(SUCCEEDED(hres)) { VARIANT in, out; BSTR url_str; @@ -2187,7 +2187,7 @@ HRESULT super_navigate(HTMLOuterWindow *window, IUri *uri, DWORD flags, const WC return hres; } - prepare_for_binding(&window->doc_obj->basedoc, mon, flags); + prepare_for_binding(&window->browser->doc->basedoc, mon, flags); hres = IUri_GetScheme(uri, &scheme); if(SUCCEEDED(hres) && scheme == URL_SCHEME_JAVASCRIPT) { @@ -2203,7 +2203,7 @@ HRESULT super_navigate(HTMLOuterWindow *window, IUri *uri, DWORD flags, const WC /* Why silently? */ window->readystate = READYSTATE_COMPLETE; if(!(flags & BINDING_FROMHIST)) - call_docview_84(window->doc_obj); + call_docview_84(window->browser->doc); IUri_AddRef(uri); task->window = window; @@ -2228,7 +2228,7 @@ HRESULT super_navigate(HTMLOuterWindow *window, IUri *uri, DWORD flags, const WC /* Silently and repeated when real loading starts? */ window->readystate = READYSTATE_LOADING; if(!(flags & (BINDING_FROMHIST|BINDING_REFRESH))) - call_docview_84(window->doc_obj); + call_docview_84(window->browser->doc); task->window = window; task->bscallback = bsc;

1 0

Jacek Caban : mshtml: Access document object via browser object in navigate_new_window.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: da055b64569632d16749066496c479d72eee67dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=da055b64569632d167490664… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 14 14:14:15 2019 +0100 mshtml: Access document object via browser object in navigate_new_window. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/navigate.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 19dda29..81c9db5 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -2253,8 +2253,11 @@ HRESULT navigate_new_window(HTMLOuterWindow *window, IUri *uri, const WCHAR *nam nsChannelBSC *bsc; HRESULT hres; - if (window->doc_obj->client) { - hres = do_query_service((IUnknown*)window->doc_obj->client, &SID_SNewWindowManager, + if(!window->browser) + return E_UNEXPECTED; + + if (window->browser->doc->client) { + hres = do_query_service((IUnknown*)window->browser->doc->client, &SID_SNewWindowManager, &IID_INewWindowManager, (void**)&new_window_mgr); if (FAILED(hres)) { FIXME("No INewWindowManager\n"); @@ -2272,8 +2275,8 @@ HRESULT navigate_new_window(HTMLOuterWindow *window, IUri *uri, const WCHAR *nam } hres = INewWindowManager_EvaluateNewWindow(new_window_mgr, display_uri, name, context_url, - NULL, FALSE, window->doc_obj->has_popup ? 0 : NWMF_FIRST, 0); - window->doc_obj->has_popup = TRUE; + NULL, FALSE, window->browser->doc->has_popup ? 0 : NWMF_FIRST, 0); + window->browser->doc->has_popup = TRUE; SysFreeString(display_uri); SysFreeString(context_url); INewWindowManager_Release(new_window_mgr);

1 0

Jacek Caban : mshtml: Access document object via browser object in navigate_uri.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: 2a6cb251f9ccd52ec5b9cc0d818b40124265178b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a6cb251f9ccd52ec5b9cc0d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 14 14:14:26 2019 +0100 mshtml: Access document object via browser object in navigate_uri. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/navigate.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 81c9db5..6fe3fc8 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -2404,7 +2404,10 @@ static HRESULT navigate_uri(HTMLOuterWindow *window, IUri *uri, const WCHAR *dis TRACE("%s\n", debugstr_w(display_uri)); - if(window->doc_obj && window->doc_obj->webbrowser) { + if(!window->browser) + return E_UNEXPECTED; + + if(window->browser->doc->webbrowser) { DWORD post_data_len = request_data ? request_data->post_data_len : 0; void *post_data = post_data_len ? request_data->post_data : NULL; const WCHAR *headers = request_data ? request_data->headers : NULL; @@ -2413,13 +2416,13 @@ static HRESULT navigate_uri(HTMLOuterWindow *window, IUri *uri, const WCHAR *dis BSTR frame_name = NULL; BOOL cancel = FALSE; - if(window != window->doc_obj->basedoc.window) { + if(!is_main_content_window(window)) { hres = IHTMLWindow2_get_name(&window->base.IHTMLWindow2_iface, &frame_name); if(FAILED(hres)) return hres; } - hres = IDocObjectService_FireBeforeNavigate2(window->doc_obj->doc_object_service, NULL, display_uri, 0x40, + hres = IDocObjectService_FireBeforeNavigate2(window->browser->doc->doc_object_service, NULL, display_uri, 0x40, frame_name, post_data, post_data_len ? post_data_len+1 : 0, headers, TRUE, &cancel); SysFreeString(frame_name); if(SUCCEEDED(hres) && cancel) { @@ -2428,11 +2431,11 @@ static HRESULT navigate_uri(HTMLOuterWindow *window, IUri *uri, const WCHAR *dis } } - if(window == window->doc_obj->basedoc.window) + if(is_main_content_window(window)) return super_navigate(window, uri, flags, headers, post_data, post_data_len); } - if(window->doc_obj && window == window->doc_obj->basedoc.window) { + if(is_main_content_window(window)) { BOOL cancel; hres = hlink_frame_navigate(&window->base.inner_window->doc->basedoc, display_uri, NULL, 0, &cancel); @@ -2478,10 +2481,10 @@ static HRESULT translate_uri(HTMLOuterWindow *window, IUri *orig_uri, BSTR *ret_ if(FAILED(hres)) return hres; - if(window->doc_obj && window->doc_obj->hostui) { + if(window->browser->doc->hostui) { OLECHAR *translated_url = NULL; - hres = IDocHostUIHandler_TranslateUrl(window->doc_obj->hostui, 0, display_uri, + hres = IDocHostUIHandler_TranslateUrl(window->browser->doc->hostui, 0, display_uri, &translated_url); if(hres == S_OK && translated_url) { TRACE("%08x %s -> %s\n", hres, debugstr_w(display_uri), debugstr_w(translated_url));

1 0

Jacek Caban : mshtml: Get rid of no longer needed HTMLOuterWindow doc_obj pointer.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: 120bf0eba9c50708b80f6ee7529d5e0e041483fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=120bf0eba9c50708b80f6ee7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 14 14:14:38 2019 +0100 mshtml: Get rid of no longer needed HTMLOuterWindow doc_obj pointer. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 6 +----- dlls/mshtml/htmlwindow.c | 2 -- dlls/mshtml/mshtml_private.h | 1 - 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index d5e2a70..013fffb 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5321,10 +5321,8 @@ static ULONG WINAPI HTMLDocumentObj_Release(IUnknown *iface) This->basedoc.doc_node->basedoc.doc_obj = NULL; htmldoc_release(&This->basedoc.doc_node->basedoc); } - if(This->basedoc.window) { - This->basedoc.window->doc_obj = NULL; + if(This->basedoc.window) IHTMLWindow2_Release(&This->basedoc.window->base.IHTMLWindow2_iface); - } if(This->advise_holder) IOleAdviseHolder_Release(This->advise_holder); @@ -5498,8 +5496,6 @@ static HRESULT create_document_object(BOOL is_mhtml, IUnknown *outer, REFIID rii doc->basedoc.window = doc->nscontainer->content_window; IHTMLWindow2_AddRef(&doc->basedoc.window->base.IHTMLWindow2_iface); - doc->basedoc.window->doc_obj = doc; - if(!doc->basedoc.doc_node && doc->basedoc.window->base.inner_window->doc) { doc->basedoc.doc_node = doc->basedoc.window->base.inner_window->doc; htmldoc_addref(&doc->basedoc.doc_node->basedoc); diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index fd18ce0..92b0537 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3567,8 +3567,6 @@ HRESULT create_outer_window(GeckoBrowser *browser, mozIDOMWindowProxy *mozwindow window->base.outer_window = window; window->base.inner_window = NULL; - - window->doc_obj = browser->doc; window->browser = browser; list_add_head(&browser->outer_windows, &window->browser_entry); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 966da77..f2939da 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -475,7 +475,6 @@ struct HTMLOuterWindow { LONG task_magic; - HTMLDocumentObj *doc_obj; nsIDOMWindow *nswindow; mozIDOMWindowProxy *window_proxy; HTMLOuterWindow *parent;

1 0

Jacek Caban : jscript: Add Array.prototype.map implementation.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: 60816b9f8adf1b70c1d1427440c4a9888caf33c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60816b9f8adf1b70c1d14274… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 14 14:30:57 2019 +0100 jscript: Add Array.prototype.map implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/array.c | 63 +++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/documentmode.js | 1 + dlls/mshtml/tests/es5.js | 45 ++++++++++++++++++++++++++++ 3 files changed, 109 insertions(+) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 28289cb..a7b1f02 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -49,6 +49,7 @@ static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0}; static const WCHAR toLocaleStringW[] = {'t','o','L','o','c','a','l','e','S','t','r','i','n','g',0}; static const WCHAR unshiftW[] = {'u','n','s','h','i','f','t',0}; static const WCHAR indexOfW[] = {'i','n','d','e','x','O','f',0}; +static const WCHAR mapW[] = {'m','a','p',0}; static const WCHAR default_separatorW[] = {',',0}; @@ -1044,6 +1045,67 @@ static HRESULT Array_indexOf(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsi return S_OK; } +static HRESULT Array_map(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) +{ + IDispatch *context_this = NULL, *callback; + jsval_t callback_args[3], mapped_value; + jsdisp_t *jsthis, *array; + DWORD length, k; + HRESULT hres; + + TRACE("\n"); + + hres = get_length(ctx, vthis, &jsthis, &length); + if(FAILED(hres)) { + FIXME("Could not get length\n"); + return hres; + } + + /* Fixme check IsCallable */ + if(!argc || !is_object_instance(argv[0]) || !get_object(argv[0])) { + FIXME("Invalid arg %s\n", debugstr_jsval(argc ? argv[0] : jsval_undefined())); + return E_INVALIDARG; + } + callback = get_object(argv[0]); + + if(argc > 1) { + if(!is_object_instance(argv[1]) || !get_object(argv[1])) { + FIXME("Unsupported context this %s\n", debugstr_jsval(argv[1])); + return E_NOTIMPL; + } + context_this = get_object(argv[1]); + } + + hres = create_array(ctx, length, &array); + if(FAILED(hres)) + return hres; + + for(k = 0; k < length; k++) { + hres = jsdisp_get_idx(jsthis, k, &callback_args[0]); + if(hres == DISP_E_UNKNOWNNAME) + continue; + if(FAILED(hres)) + break; + + callback_args[1] = jsval_number(k); + callback_args[2] = jsval_obj(jsthis); + hres = disp_call_value(ctx, callback, context_this, DISPATCH_METHOD, 3, callback_args, &mapped_value); + jsval_release(callback_args[0]); + if(FAILED(hres)) + break; + + hres = jsdisp_propput_idx(array, k, mapped_value); + if(FAILED(hres)) + break; + } + + if(SUCCEEDED(hres) && r) + *r = jsval_obj(array); + else + jsdisp_release(array); + return hres; +} + /* ECMA-262 3rd Edition 15.4.4.13 */ static HRESULT Array_unshift(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) @@ -1146,6 +1208,7 @@ static const builtin_prop_t Array_props[] = { {indexOfW, Array_indexOf, PROPF_METHOD|PROPF_ES5|1}, {joinW, Array_join, PROPF_METHOD|1}, {lengthW, NULL,0, Array_get_length, Array_set_length}, + {mapW, Array_map, PROPF_METHOD|PROPF_ES5|1}, {popW, Array_pop, PROPF_METHOD}, {pushW, Array_push, PROPF_METHOD|1}, {reverseW, Array_reverse, PROPF_METHOD}, diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 1e8fabd..1cbf13e 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -190,6 +190,7 @@ function test_javascript() { test_exposed("forEach", Array.prototype, v >= 9); test_exposed("indexOf", Array.prototype, v >= 9); test_exposed("trim", String.prototype, v >= 9); + test_exposed("map", Array.prototype, v >= 9); /* FIXME: IE8 implements weird semi-functional property descriptors. */ if(v != 8) { diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 69fe0fe..6cfee81 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -130,6 +130,50 @@ function test_isArray() { next_test(); } +function test_array_map() { + var calls, m, arr, ctx; + + /* basic map call with context */ + calls = ""; + arr = [1,2,3]; + ctx = {}; + m = arr.map(function(x, i, a) { + ok(this === ctx, "this != ctx"); + ok(i === x - 1, "i = " + i); + ok(a === arr, "a != arr"); + calls += x + ","; + return x * 2; + }, ctx); + ok(calls === "1,2,3,", "calls = " + calls); + ok(m.join() === "2,4,6", "m = " + m); + + /* non-array object as this argument */ + calls = ""; + arr = { 1: "one", 2: "two", 3: "three", length: 3 }; + m = Array.prototype.map.call(arr, function(x, i) { + calls += i + ":" + x + ","; + return x + "!"; + }); + ok(calls === "1:one,2:two,", "calls = " + calls); + ok(m.join() === ",one!,two!", "m = " + m); + ok(!("0" in m), "0 is in m"); + + /* mutate array in callback */ + calls = ""; + arr = [1,2,3]; + m = Array.prototype.map.call(arr, function(x, i) { + calls += i + ":" + x + ","; + for(var j = i; j < arr.length; j++) + arr[j]++; + arr.push(i * i); + return x - 1; + }); + ok(calls === "0:1,1:3,2:5,", "calls = " + calls); + ok(m.join() === "0,2,4", "m = " + m); + + next_test(); +} + function test_identifier_keywords() { var o = { if: 1, @@ -625,6 +669,7 @@ var tests = [ test_indexOf, test_array_forEach, test_isArray, + test_array_map, test_identifier_keywords, test_getOwnPropertyDescriptor, test_defineProperty,

1 0