July 2016 - Wine-Commits - list.winehq.org

Jacek Caban : mshtml: Store compatibility mode provided by meta element.
by Alexandre Julliard July 6, 2016

July 6, 2016

Module: wine Branch: master Commit: bda4b35aa39c9b67374aca38744ad2cd7aee36a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bda4b35aa39c9b67374aca387… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 5 22:47:00 2016 +0200 mshtml: Store compatibility mode provided by meta element. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/mshtml_private.h | 13 ++++++ dlls/mshtml/mutation.c | 94 +++++++++++++++++++++++++++++++++++++++++--- dlls/mshtml/nsiface.idl | 17 ++++++++ 3 files changed, 118 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index d2191e3..89344ed 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -229,6 +229,18 @@ TID_LIST LAST_tid } tid_t; +typedef enum { + COMPAT_MODE_QUIRKS, + COMPAT_MODE_IE7, + COMPAT_MODE_IE8, + COMPAT_MODE_IE9, + COMPAT_MODE_IE10, + COMPAT_MODE_IE11 +} compat_mode_t; + +#define COMPAT_MODE_CNT (COMPAT_MODE_IE11+1) +#define COMPAT_MODE_NONE COMPAT_MODE_QUIRKS + typedef struct dispex_data_t dispex_data_t; typedef struct dispex_dynamic_data_t dispex_dynamic_data_t; @@ -775,6 +787,7 @@ struct HTMLDocumentNode { LONG ref; + compat_mode_t document_mode; HTMLInnerWindow *window; nsIDOMHTMLDocument *nsdoc; diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index adde295..dd3d119 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -361,6 +361,79 @@ static nsresult run_insert_script(HTMLDocumentNode *doc, nsISupports *script_ifa return NS_OK; } +static void set_document_mode(HTMLDocumentNode *doc, compat_mode_t document_mode) +{ + TRACE("%p: %d\n", doc, document_mode); + doc->document_mode = document_mode; +} + +static BOOL parse_ua_compatible(const WCHAR *p, compat_mode_t *r) +{ + int v = 0; + + if(p[0] != 'I' || p[1] != 'E' || p[2] != '=') + return FALSE; + + p += 3; + while('0' <= *p && *p <= '9') + v = v*10 + *(p++)-'0'; + if(*p || !v) + return FALSE; + + switch(v){ + case 7: + *r = COMPAT_MODE_IE7; + break; + case 8: + *r = COMPAT_MODE_IE8; + break; + case 9: + *r = COMPAT_MODE_IE9; + break; + case 10: + *r = COMPAT_MODE_IE10; + break; + default: + *r = v < 7 ? COMPAT_MODE_QUIRKS : COMPAT_MODE_IE11; + } + + return TRUE; +} + +static void process_meta_element(HTMLDocumentNode *doc, nsIDOMHTMLMetaElement *meta_element) +{ + nsAString http_equiv_str, content_str; + nsresult nsres; + + static const WCHAR x_ua_compatibleW[] = {'x','-','u','a','-','c','o','m','p','a','t','i','b','l','e',0}; + + nsAString_Init(&http_equiv_str, NULL); + nsAString_Init(&content_str, NULL); + nsres = nsIDOMHTMLMetaElement_GetHttpEquiv(meta_element, &http_equiv_str); + if(NS_SUCCEEDED(nsres)) + nsres = nsIDOMHTMLMetaElement_GetContent(meta_element, &content_str); + + if(NS_SUCCEEDED(nsres)) { + const PRUnichar *http_equiv, *content; + + nsAString_GetData(&http_equiv_str, &http_equiv); + nsAString_GetData(&content_str, &content); + + TRACE("%s: %s\n", debugstr_w(http_equiv), debugstr_w(content)); + + if(!strcmpiW(http_equiv, x_ua_compatibleW)) { + compat_mode_t document_mode; + if(parse_ua_compatible(content, &document_mode)) + set_document_mode(doc, document_mode); + else + FIXME("Unsupported document mode %s\n", debugstr_w(content)); + } + } + + nsAString_Finish(&http_equiv_str); + nsAString_Finish(&content_str); +} + typedef struct nsRunnable nsRunnable; typedef nsresult (*runnable_proc_t)(HTMLDocumentNode*,nsISupports*,nsISupports*); @@ -640,18 +713,13 @@ static void NSAPI nsDocumentObserver_BindToDocument(nsIDocumentObserver *iface, nsIDOMHTMLIFrameElement *nsiframe; nsIDOMHTMLFrameElement *nsframe; nsIDOMHTMLScriptElement *nsscript; + nsIDOMHTMLMetaElement *nsmeta; nsIDOMHTMLElement *nselem; nsIDOMComment *nscomment; nsresult nsres; TRACE("(%p)->(%p %p)\n", This, aDocument, aContent); - nsres = nsIContent_QueryInterface(aContent, &IID_nsIDOMHTMLElement, (void**)&nselem); - if(NS_SUCCEEDED(nsres)) { - check_event_attr(This, nselem); - nsIDOMHTMLElement_Release(nselem); - } - nsres = nsIContent_QueryInterface(aContent, &IID_nsIDOMComment, (void**)&nscomment); if(NS_SUCCEEDED(nsres)) { TRACE("comment node\n"); @@ -661,6 +729,13 @@ static void NSAPI nsDocumentObserver_BindToDocument(nsIDocumentObserver *iface, return; } + nsres = nsIContent_QueryInterface(aContent, &IID_nsIDOMHTMLElement, (void**)&nselem); + if(NS_FAILED(nsres)) + return; + + check_event_attr(This, nselem); + nsIDOMHTMLElement_Release(nselem); + nsres = nsIContent_QueryInterface(aContent, &IID_nsIDOMHTMLIFrameElement, (void**)&nsiframe); if(NS_SUCCEEDED(nsres)) { TRACE("iframe node\n"); @@ -695,6 +770,13 @@ static void NSAPI nsDocumentObserver_BindToDocument(nsIDocumentObserver *iface, add_script_runner(This, run_insert_script, (nsISupports*)nsscript, NULL); IHTMLScriptElement_Release(&script_elem->IHTMLScriptElement_iface); + return; + } + + nsres = nsIContent_QueryInterface(aContent, &IID_nsIDOMHTMLMetaElement, (void**)&nsmeta); + if(NS_SUCCEEDED(nsres)) { + process_meta_element(This, nsmeta); + nsIDOMHTMLMetaElement_Release(nsmeta); } } diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 7d9fbe8..1b6104a 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -1146,6 +1146,23 @@ interface nsIDOMHTMLHeadElement : nsISupports [ object, + uuid(2a3f789e-0667-464f-a8d7-6f58513443d9), + local +] +interface nsIDOMHTMLMetaElement : nsISupports +{ + nsresult GetContent(nsAString *aContent); + nsresult SetContent(const nsAString *aContent); + nsresult GetHttpEquiv(nsAString *aHttpEquiv); + nsresult SetHttpEquiv(const nsAString *aHttpEquiv); + nsresult GetName(nsAString *aName); + nsresult SetName(const nsAString *aName); + nsresult GetScheme(nsAString *aScheme); + nsresult SetScheme(const nsAString *aScheme); +} + +[ + object, uuid(4109a2d2-e7af-445d-bb72-c7c9b875f35e), local ]

1 0

Jacek Caban : mshtml: Get rid of no longer needed get_dispex_data function.
by Alexandre Julliard July 6, 2016

July 6, 2016

Module: wine Branch: master Commit: fc42ccc3610e7f845ffb7ecee8cb9ebcdb0eae4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc42ccc3610e7f845ffb7ecee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 5 22:46:46 2016 +0200 mshtml: Get rid of no longer needed get_dispex_data function. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 50 ++++++++++---------------------------------------- 1 file changed, 10 insertions(+), 40 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 4994eca..9a2cebd 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -469,11 +469,6 @@ HRESULT get_dispids(tid_t tid, DWORD *ret_size, DISPID **ret) return S_OK; } -static dispex_data_t *get_dispex_data(DispatchEx *This) -{ - return This->info; -} - static inline BOOL is_custom_dispid(DISPID id) { return MSHTML_DISPID_CUSTOM_MIN <= id && id <= MSHTML_DISPID_CUSTOM_MAX; @@ -895,25 +890,20 @@ static HRESULT get_builtin_func(dispex_data_t *data, DISPID id, func_info_t **re static HRESULT get_builtin_id(DispatchEx *This, BSTR name, DWORD grfdex, DISPID *ret) { - dispex_data_t *data; int min, max, n, c; - data = get_dispex_data(This); - if(!data) - return E_FAIL; - min = 0; - max = data->func_cnt-1; + max = This->info->func_cnt-1; while(min <= max) { n = (min+max)/2; - c = strcmpiW(data->name_table[n]->name, name); + c = strcmpiW(This->info->name_table[n]->name, name); if(!c) { - if((grfdex & fdexNameCaseSensitive) && strcmpW(data->name_table[n]->name, name)) + if((grfdex & fdexNameCaseSensitive) && strcmpW(This->info->name_table[n]->name, name)) break; - *ret = data->name_table[n]->id; + *ret = This->info->name_table[n]->id; return S_OK; } @@ -1213,15 +1203,10 @@ static HRESULT function_invoke(DispatchEx *This, func_info_t *func, WORD flags, static HRESULT invoke_builtin_prop(DispatchEx *This, DISPID id, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) { - dispex_data_t *data; func_info_t *func; HRESULT hres; - data = get_dispex_data(This); - if(!data) - return E_FAIL; - - hres = get_builtin_func(data, id, &func); + hres = get_builtin_func(This->info, id, &func); if(id == DISPID_VALUE && hres == DISP_E_UNKNOWNNAME) return dispex_value(This, lcid, flags, dp, res, ei, caller); if(FAILED(hres)) @@ -1289,15 +1274,10 @@ HRESULT remove_attribute(DispatchEx *This, DISPID id, VARIANT_BOOL *success) case DISPEXPROP_BUILTIN: { VARIANT var; DISPPARAMS dp = {&var,NULL,1,0}; - dispex_data_t *data; func_info_t *func; HRESULT hres; - data = get_dispex_data(This); - if(!data) - return E_FAIL; - - hres = get_builtin_func(data, id, &func); + hres = get_builtin_func(This->info, id, &func); if(FAILED(hres)) return hres; @@ -1561,7 +1541,6 @@ static HRESULT WINAPI DispatchEx_GetMemberProperties(IDispatchEx *iface, DISPID static HRESULT WINAPI DispatchEx_GetMemberName(IDispatchEx *iface, DISPID id, BSTR *pbstrName) { DispatchEx *This = impl_from_IDispatchEx(iface); - dispex_data_t *data; func_info_t *func; HRESULT hres; @@ -1580,11 +1559,7 @@ static HRESULT WINAPI DispatchEx_GetMemberName(IDispatchEx *iface, DISPID id, BS return S_OK; } - data = get_dispex_data(This); - if(!data) - return E_FAIL; - - hres = get_builtin_func(data, id, &func); + hres = get_builtin_func(This->info, id, &func); if(FAILED(hres)) return hres; @@ -1611,7 +1586,6 @@ static HRESULT next_dynamic_id(DispatchEx *dispex, DWORD idx, DISPID *ret_id) static HRESULT WINAPI DispatchEx_GetNextDispID(IDispatchEx *iface, DWORD grfdex, DISPID id, DISPID *pid) { DispatchEx *This = impl_from_IDispatchEx(iface); - dispex_data_t *data; func_info_t *func; HRESULT hres; @@ -1626,20 +1600,16 @@ static HRESULT WINAPI DispatchEx_GetNextDispID(IDispatchEx *iface, DWORD grfdex, return next_dynamic_id(This, idx+1, pid); } - data = get_dispex_data(This); - if(!data) - return E_FAIL; - if(id == DISPID_STARTENUM) { - func = data->funcs; + func = This->info->funcs; }else { - hres = get_builtin_func(data, id, &func); + hres = get_builtin_func(This->info, id, &func); if(FAILED(hres)) return hres; func++; } - while(func < data->funcs+data->func_cnt) { + while(func < This->info->funcs + This->info->func_cnt) { /* FIXME: Skip hidden properties */ if(func->func_disp_idx == -1) { *pid = func->id;

1 0

Jacek Caban : mshtml: Store dispex_data_t pointer instead of dispex_static_data_t in DispatchEx.
by Alexandre Julliard July 6, 2016

July 6, 2016

Module: wine Branch: master Commit: 13c3ae6d9387df1e7de6100d18b47df96fcf3bac URL: http://source.winehq.org/git/wine.git/?a=commit;h=13c3ae6d9387df1e7de6100d1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 5 22:46:33 2016 +0200 mshtml: Store dispex_data_t pointer instead of dispex_static_data_t in DispatchEx. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 35 +++++++++++++++++++---------------- dlls/mshtml/mshtml_private.h | 2 +- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 7af2854..4994eca 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -61,6 +61,8 @@ typedef struct { } func_info_t; struct dispex_data_t { + const dispex_static_data_t *desc; + DWORD func_cnt; DWORD func_size; func_info_t *funcs; @@ -372,6 +374,7 @@ static dispex_data_t *preprocess_dispex_data(const dispex_static_data_t *desc) ERR("Out of memory\n"); return NULL; } + data->desc = desc; data->func_cnt = 0; data->func_disp_cnt = 0; data->func_size = 16; @@ -468,7 +471,7 @@ HRESULT get_dispids(tid_t tid, DWORD *ret_size, DISPID **ret) static dispex_data_t *get_dispex_data(DispatchEx *This) { - return This->data->data; + return This->info; } static inline BOOL is_custom_dispid(DISPID id) @@ -510,8 +513,8 @@ static inline dispex_dynamic_data_t *get_dynamic_data(DispatchEx *This) if(!This->dynamic_data) return NULL; - if(This->data->vtbl && This->data->vtbl->populate_props) - This->data->vtbl->populate_props(This); + if(This->info->desc->vtbl && This->info->desc->vtbl->populate_props) + This->info->desc->vtbl->populate_props(This); return This->dynamic_data; } @@ -601,8 +604,8 @@ HRESULT dispex_get_dynid(DispatchEx *This, const WCHAR *name, DISPID *id) static HRESULT dispex_value(DispatchEx *This, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) { - if(This->data->vtbl && This->data->vtbl->value) - return This->data->vtbl->value(This, lcid, flags, params, res, ei, caller); + if(This->info->desc->vtbl && This->info->desc->vtbl->value) + return This->info->desc->vtbl->value(This, lcid, flags, params, res, ei, caller); switch(flags) { case DISPATCH_PROPERTYGET: @@ -845,7 +848,7 @@ static HRESULT get_func_obj_entry(DispatchEx *This, func_info_t *func, func_obj_ return E_OUTOFMEMORY; if(!dynamic_data->func_disps) { - dynamic_data->func_disps = heap_alloc_zero(This->data->data->func_disp_cnt * sizeof(*dynamic_data->func_disps)); + dynamic_data->func_disps = heap_alloc_zero(This->info->func_disp_cnt * sizeof(*dynamic_data->func_disps)); if(!dynamic_data->func_disps) return E_OUTOFMEMORY; } @@ -920,10 +923,10 @@ static HRESULT get_builtin_id(DispatchEx *This, BSTR name, DWORD grfdex, DISPID min = n+1; } - if(This->data->vtbl && This->data->vtbl->get_dispid) { + if(This->info->desc->vtbl && This->info->desc->vtbl->get_dispid) { HRESULT hres; - hres = This->data->vtbl->get_dispid(This, name, grfdex, ret); + hres = This->info->desc->vtbl->get_dispid(This, name, grfdex, ret); if(hres != DISP_E_UNKNOWNNAME) return hres; } @@ -1381,7 +1384,7 @@ static HRESULT WINAPI DispatchEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - hres = get_typeinfo(This->data->disp_tid, ppTInfo); + hres = get_typeinfo(This->info->desc->disp_tid, ppTInfo); if(FAILED(hres)) return hres; @@ -1458,9 +1461,9 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc switch(get_dispid_type(id)) { case DISPEXPROP_CUSTOM: - if(!This->data->vtbl || !This->data->vtbl->invoke) + if(!This->info->desc->vtbl || !This->info->desc->vtbl->invoke) return DISP_E_UNKNOWNNAME; - return This->data->vtbl->invoke(This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); + return This->info->desc->vtbl->invoke(This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); case DISPEXPROP_DYNAMIC: { DWORD idx = id - DISPID_DYNPROP_0; @@ -1511,8 +1514,8 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc case DISPEXPROP_BUILTIN: if(wFlags == DISPATCH_CONSTRUCT) { if(id == DISPID_VALUE) { - if(This->data->vtbl && This->data->vtbl->value) { - return This->data->vtbl->value(This, lcid, wFlags, pdp, pvarRes, pei, pspCaller); + if(This->info->desc->vtbl && This->info->desc->vtbl->value) { + return This->info->desc->vtbl->value(This, lcid, wFlags, pdp, pvarRes, pei, pspCaller); } FIXME("DISPATCH_CONSTRUCT flag but missing value function\n"); return E_FAIL; @@ -1729,7 +1732,7 @@ void dispex_unlink(DispatchEx *This) const dispex_static_data_vtbl_t *dispex_get_vtbl(DispatchEx *dispex) { - return dispex->data->vtbl; + return dispex->info->desc->vtbl; } void release_dispex(DispatchEx *This) @@ -1749,7 +1752,7 @@ void release_dispex(DispatchEx *This) if(This->dynamic_data->func_disps) { func_obj_entry_t *iter; - for(iter = This->dynamic_data->func_disps; iter < This->dynamic_data->func_disps+This->data->data->func_disp_cnt; iter++) { + for(iter = This->dynamic_data->func_disps; iter < This->dynamic_data->func_disps + This->info->func_disp_cnt; iter++) { if(iter->func_obj) { iter->func_obj->obj = NULL; IDispatchEx_Release(&iter->func_obj->dispex.IDispatchEx_iface); @@ -1774,6 +1777,6 @@ void init_dispex(DispatchEx *dispex, IUnknown *outer, dispex_static_data_t *data dispex->IDispatchEx_iface.lpVtbl = &DispatchExVtbl; dispex->outer = outer; - dispex->data = data; + dispex->info = data->data; dispex->dynamic_data = NULL; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 0e75c2f..d2191e3 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -261,7 +261,7 @@ struct DispatchEx { IUnknown *outer; - dispex_static_data_t *data; + dispex_data_t *info; dispex_dynamic_data_t *dynamic_data; };

1 0

Jacek Caban : mshtml: Added a helper to get vtbl from DispatchEx and use it to access vtbl outside dispex.c.
by Alexandre Julliard July 6, 2016

July 6, 2016

Module: wine Branch: master Commit: dba85f124b10c883b111231e891af9c510fac143 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dba85f124b10c883b111231e8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 5 22:46:01 2016 +0200 mshtml: Added a helper to get vtbl from DispatchEx and use it to access vtbl outside dispex.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 5 +++++ dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/htmlevent.c | 10 ++++++---- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/mshtml_private.h | 1 + 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 4ab2944..7c40d47 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -1736,6 +1736,11 @@ void dispex_unlink(DispatchEx *This) } } +const dispex_static_data_vtbl_t *dispex_get_vtbl(DispatchEx *dispex) +{ + return dispex->data->vtbl; +} + void release_dispex(DispatchEx *This) { dynamic_prop_t *prop; diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 05ed66b..5fdbab0 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -5093,7 +5093,7 @@ static void HTMLElement_bind_event(DispatchEx *dispex, int eid) add_nsevent_listener(This->node.doc, This->node.nsnode, loadW); return; default: - This->node.doc->node.event_target.dispex.data->vtbl->bind_event(&This->node.doc->node.event_target.dispex, eid); + dispex_get_vtbl(&This->node.doc->node.event_target.dispex)->bind_event(&This->node.doc->node.event_target.dispex, eid); } } diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 4bf168f..c2eeb7d 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -901,10 +901,11 @@ HRESULT create_event_obj(IHTMLEventObj **ret) static inline event_target_t *get_event_target_data(EventTarget *event_target, BOOL alloc) { + const dispex_static_data_vtbl_t *vtbl = dispex_get_vtbl(&event_target->dispex); event_target_t **ptr; - ptr = event_target->dispex.data->vtbl && event_target->dispex.data->vtbl->get_event_target_ptr - ? event_target->dispex.data->vtbl->get_event_target_ptr(&event_target->dispex) + ptr = vtbl && vtbl->get_event_target_ptr + ? vtbl->get_event_target_ptr(&event_target->dispex) : &event_target->ptr; if(*ptr || !alloc) return *ptr; @@ -1394,8 +1395,9 @@ void detach_events(HTMLDocumentNode *doc) /* Caller should ensure that it's called only once for given event in the target. */ static void bind_event(EventTarget *event_target, eventid_t eid) { - if(event_target->dispex.data->vtbl->bind_event) - event_target->dispex.data->vtbl->bind_event(&event_target->dispex, eid); + const dispex_static_data_vtbl_t *vtbl = dispex_get_vtbl(&event_target->dispex); + if(vtbl->bind_event) + vtbl->bind_event(&event_target->dispex, eid); else FIXME("Unsupported event binding on target %p\n", event_target); } diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 7484681..b75c9ba 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2933,7 +2933,7 @@ static event_target_t **HTMLWindow_get_event_target_ptr(DispatchEx *dispex) static void HTMLWindow_bind_event(DispatchEx *dispex, int eid) { HTMLInnerWindow *This = impl_from_DispatchEx(dispex); - This->doc->node.event_target.dispex.data->vtbl->bind_event(&This->doc->node.event_target.dispex, eid); + dispex_get_vtbl(&This->doc->node.event_target.dispex)->bind_event(&This->doc->node.event_target.dispex, eid); } static const dispex_static_data_vtbl_t HTMLWindow_dispex_vtbl = { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index f6cf1a0..0e75c2f 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -303,6 +303,7 @@ void dispex_traverse(DispatchEx*,nsCycleCollectionTraversalCallback*) DECLSPEC_H void dispex_unlink(DispatchEx*) DECLSPEC_HIDDEN; void release_typelib(void) DECLSPEC_HIDDEN; HRESULT get_htmldoc_classinfo(ITypeInfo **typeinfo) DECLSPEC_HIDDEN; +const dispex_static_data_vtbl_t *dispex_get_vtbl(DispatchEx*) DECLSPEC_HIDDEN; typedef enum { DISPEXPROP_CUSTOM,

1 0

Jacek Caban : mshtml: Moved dispex_data_t pointer to the end of dispex_static_data_t struct.
by Alexandre Julliard July 6, 2016

July 6, 2016

1 0

Jacek Caban : mshtml: Rewrite navigation tests using new HTTP emulation framework.
by Alexandre Julliard July 6, 2016

July 6, 2016

Module: wine Branch: master Commit: 00f74afeefcf5ca64ce5303e3d62956bf64326da URL: http://source.winehq.org/git/wine.git/?a=commit;h=00f74afeefcf5ca64ce5303e3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 5 22:45:32 2016 +0200 mshtml: Rewrite navigation tests using new HTTP emulation framework. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/navigation.js | 103 ++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/rsrc.rc | 4 +- dlls/mshtml/tests/script.c | 4 +- 3 files changed, 107 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/tests/navigation.js b/dlls/mshtml/tests/navigation.js new file mode 100644 index 0000000..63f3d57 --- /dev/null +++ b/dlls/mshtml/tests/navigation.js @@ -0,0 +1,103 @@ +/* + * Copyright 2016 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +function nav_parent_test() { + external.trace("Running _parent navigation tests..."); + + var iframe = document.getElementById("testframe"); + var subframe = iframe.contentWindow.document.createElement("iframe"); + + subframe.onload = function() { + var doc = subframe.contentWindow.document; + doc.body.innerHTML = '<a href="http://winetest.org/blank2.html" id="aid" target="_parent">test</a>'; + doc.getElementById("aid").click(); + } + + iframe.onload = function() { + iframe.onload = null; + var href = iframe.contentWindow.location.href; + ok(/.*blank2.html/.test(href), "Unexpected href " + href); + next_test(); + } + + iframe.contentWindow.document.body.appendChild(subframe); + subframe.src = "blank.html"; +} + +function window_navigate_test() { + external.trace("Running window.navigate() tests..."); + + var iframe = document.getElementById("testframe"); + + iframe.onload = function() { + iframe.onload = null; + var href = iframe.contentWindow.location.href; + ok(href === "about:blank", "Unexpected href " + href); + next_test(); + } + + iframe.contentWindow.navigate("about:blank"); +} + +function window_open_self_test() { + external.trace("Running window.open(_self) tests..."); + + var iframe = document.getElementById("testframe"); + var iframe_window = iframe.contentWindow; + + iframe.onload = function() { + iframe.onload = null; + var href = iframe.contentWindow.location.href; + ok(/.*blank.html\?window_open_self/.test(href), "Unexpected href " + href); + ok(iframe.contentWindow === iframe_window, "iframe.contentWindow !== iframe_window"); + next_test(); + } + + iframe_window.open("blank.html?window_open_self", "_self"); +} + +function detached_src_test() { + var iframe = document.createElement("iframe"); + var onload_called = false; + + iframe.onload = function() { + onload_called = true; + next_test(); + } + + iframe.src = "blank.html"; + document.body.appendChild(iframe); + ok(onload_called === false, "called onload too early?"); +} + +function init_test_iframe() { + var iframe = document.createElement("iframe"); + + iframe.onload = next_test; + iframe.id = "testframe"; + iframe.src = "about:blank"; + document.body.appendChild(iframe); +} + +var tests = [ + init_test_iframe, + nav_parent_test, + window_navigate_test, + window_open_self_test, + detached_src_test +]; diff --git a/dlls/mshtml/tests/rsrc.rc b/dlls/mshtml/tests/rsrc.rc index 1660dd6..a9ab563 100644 --- a/dlls/mshtml/tests/rsrc.rc +++ b/dlls/mshtml/tests/rsrc.rc @@ -34,8 +34,8 @@ events.html HTML "events.html" /* @makedep: externscr.js */ externscr.js HTML "externscr.js" -/* @makedep: nav_test.html */ -nav_test.html HTML "nav_test.html" +/* @makedep: navigation.js */ +navigation.js HTML "navigation.js" /* @makedep: xhr.js */ xhr.js HTML "xhr.js" diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 57681c6..eadf737 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -3315,11 +3315,11 @@ static void run_js_tests(void) return; } - run_js_script("nav_test.html"); - init_protocol_handler(); run_script_as_http_with_mode("xhr.js", NULL, "11"); + run_script_as_http_with_mode("navigation.js", NULL, NULL); + run_script_as_http_with_mode("navigation.js", NULL, "11"); } static BOOL init_registry(BOOL init)

1 0

Jacek Caban : mshtml: Added scripted XHR tests with emulated HTTP connection.
by Alexandre Julliard July 6, 2016

July 6, 2016

Module: wine Branch: master Commit: 2ad4e9f422f6d7e0a0cf710199f681b709ddf895 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ad4e9f422f6d7e0a0cf71019… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 5 22:45:17 2016 +0200 mshtml: Added scripted XHR tests with emulated HTTP connection. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/rsrc.rc | 6 + dlls/mshtml/tests/script.c | 465 ++++++++++++++++++++++++++++++++++++++++-- dlls/mshtml/tests/winetest.js | 49 +++++ dlls/mshtml/tests/xhr.js | 37 ++++ 4 files changed, 535 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2ad4e9f422f6d7e0a0cf7…

1 0

Piotr Caban : msvcrt: Improve x86_64 nested exceptions handling.
by Alexandre Julliard July 6, 2016

July 6, 2016

Module: wine Branch: master Commit: d9bacd98d8d23aefdd22755dc1ac4e3c67002921 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9bacd98d8d23aefdd22755dc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 5 14:28:45 2016 +0200 msvcrt: Improve x86_64 nested exceptions handling. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_x86_64.c | 48 ++++++++++++++++++++++++++++++++------------- 1 file changed, 34 insertions(+), 14 deletions(-) diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index 0379d30..d6d4b04 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -339,6 +339,7 @@ static inline void find_catch_block(EXCEPTION_RECORD *rec, ULONG64 frame, ULONG64 exc_base = (rec->NumberParameters == 4 ? rec->ExceptionInformation[3] : 0); int trylevel = ip_to_state(rva_to_ptr(descr->ipmap, dispatch->ImageBase), descr->ipmap_count, dispatch->ControlPc-dispatch->ImageBase); + const tryblock_info *in_catch; EXCEPTION_RECORD catch_record; CONTEXT context; UINT i, j; @@ -374,24 +375,38 @@ static inline void find_catch_block(EXCEPTION_RECORD *rec, ULONG64 frame, } } + for (i=descr->tryblock_count; i>0; i--) + { + in_catch = rva_to_ptr(descr->tryblock, dispatch->ImageBase); + in_catch = &in_catch[i-1]; + + if (trylevel>in_catch->end_level && trylevel<=in_catch->catch_level) + break; + } + if (!i) + in_catch = NULL; + unwind_help = rva_to_ptr(descr->unwind_help, orig_frame); - unwind_help[0] = trylevel; - TRACE("current trylevel: %d, last catch block: %d\n", trylevel, unwind_help[1]); + if (trylevel > unwind_help[1]) + unwind_help[0] = unwind_help[1] = trylevel; + else + trylevel = unwind_help[1]; + TRACE("current trylevel: %d\n", trylevel); for (i=0; i<descr->tryblock_count; i++) { const tryblock_info *tryblock = rva_to_ptr(descr->tryblock, dispatch->ImageBase); tryblock = &tryblock[i]; - if (unwind_help[1] != -1) - { - if (unwind_help[1] < tryblock->start_level) continue; - if (unwind_help[1] > tryblock->end_level) continue; - } - if (trylevel < tryblock->start_level) continue; if (trylevel > tryblock->end_level) continue; + if (in_catch) + { + if(tryblock->start_level <= in_catch->end_level) continue; + if(tryblock->end_level > in_catch->catch_level) continue; + } + /* got a try block */ for (j=0; j<tryblock->catchblock_count; j++) { @@ -419,8 +434,6 @@ static inline void find_catch_block(EXCEPTION_RECORD *rec, ULONG64 frame, TRACE("found catch(...) block\n"); } - unwind_help[1] = tryblock->end_level+1; - /* unwind stack and call catch */ memset(&catch_record, 0, sizeof(catch_record)); catch_record.ExceptionCode = STATUS_UNWIND_CONSOLIDATE; @@ -433,7 +446,7 @@ static inline void find_catch_block(EXCEPTION_RECORD *rec, ULONG64 frame, catch_record.ExceptionInformation[4] = (ULONG_PTR)rec; catch_record.ExceptionInformation[5] = (ULONG_PTR)rva_to_ptr(catchblock->handler, dispatch->ImageBase); - RtlUnwindEx((void*)orig_frame, 0, &catch_record, NULL, &context, NULL); + RtlUnwindEx((void*)frame, (void*)dispatch->ControlPc, &catch_record, NULL, &context, NULL); } } @@ -460,15 +473,22 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, ULONG64 orig_frame = rec->ExceptionInformation[1]; const cxx_function_descr *descr = (void*)rec->ExceptionInformation[2]; int end_level = rec->ExceptionInformation[3]; + EXCEPTION_RECORD *new_rec = (void*)rec->ExceptionInformation[4]; + thread_data_t *data = msvcrt_get_thread_data(); frame_info *cur; cxx_local_unwind(orig_frame, dispatch, descr, end_level); /* FIXME: we should only unregister frames registered by call_catch_block here */ - for (cur = msvcrt_get_thread_data()->frame_info_head; cur; cur = cur->next) + for (cur = data->frame_info_head; cur; cur = cur->next) { - if ((ULONG64)cur > frame) - __CxxUnregisterExceptionObject((cxx_frame_info*)cur, FALSE); + if ((ULONG64)cur <= frame) + { + __CxxUnregisterExceptionObject((cxx_frame_info*)cur, + new_rec->ExceptionCode == CXX_EXCEPTION && + data->exc_record->ExceptionCode == CXX_EXCEPTION && + new_rec->ExceptionInformation[1] == data->exc_record->ExceptionInformation[1]); + } } return ExceptionContinueSearch; }

1 0

Piotr Caban : ntdll: Add RtlRestoreContext implementation.
by Alexandre Julliard July 6, 2016

July 6, 2016

Module: wine Branch: master Commit: 4c50ef699564f7d7ab5ab78e082af6da4ab62b80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c50ef699564f7d7ab5ab78e0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 5 16:24:33 2016 +0200 ntdll: Add RtlRestoreContext implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/signal_x86_64.c | 72 ++++++++++++++++++++++++--------------------- 3 files changed, 41 insertions(+), 34 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 0fc4dcb..3874b3e 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1293,7 +1293,7 @@ @ stdcall RtlMoveMemory(ptr ptr long) ntdll.RtlMoveMemory @ stdcall -arch=x86_64,arm RtlPcToFileHeader(ptr ptr) ntdll.RtlPcToFileHeader @ stdcall -arch=arm -register RtlRaiseException(ptr) ntdll.RtlRaiseException -# @ stub -arch=x86_64 RtlRestoreContext +@ stdcall -arch=x86_64 RtlRestoreContext(ptr ptr) ntdll.RtlRestoreContext @ stdcall RtlUnwind(ptr ptr ptr long) ntdll.RtlUnwind @ stdcall -arch=x86_64 RtlUnwindEx(long long ptr long ptr) ntdll.RtlUnwindEx @ stdcall -arch=x86_64 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) ntdll.RtlVirtualUnwind diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 4737b06..34b4b4a 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -838,6 +838,7 @@ @ stdcall RtlRemoveVectoredContinueHandler(ptr) @ stdcall RtlRemoveVectoredExceptionHandler(ptr) @ stub RtlResetRtlTranslations +@ stdcall -arch=x86_64 RtlRestoreContext(ptr ptr) @ stdcall RtlRestoreLastWin32Error(long) RtlSetLastWin32Error @ stub RtlRevertMemoryStream @ stub RtlRunDecodeUnicodeString diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index ca3e6ca..1db3a23 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -3437,6 +3437,44 @@ __ASM_GLOBAL_FUNC( call_consolidate_callback, __ASM_CFI(".cfi_same_value %rbp\n\t") "ret") +/******************************************************************* + * RtlRestoreContext (NTDLL.@) + */ +void WINAPI RtlRestoreContext( CONTEXT *context, EXCEPTION_RECORD *rec ) +{ + if (rec && rec->ExceptionCode == STATUS_LONGJUMP && rec->NumberParameters >= 1) + { + struct MSVCRT_JUMP_BUFFER *jmp = (struct MSVCRT_JUMP_BUFFER *)rec->ExceptionInformation[0]; + context->Rbx = jmp->Rbx; + context->Rsp = jmp->Rsp; + context->Rbp = jmp->Rbp; + context->Rsi = jmp->Rsi; + context->Rdi = jmp->Rdi; + context->R12 = jmp->R12; + context->R13 = jmp->R13; + context->R14 = jmp->R14; + context->R15 = jmp->R15; + context->u.s.Xmm6 = jmp->Xmm6; + context->u.s.Xmm7 = jmp->Xmm7; + context->u.s.Xmm8 = jmp->Xmm8; + context->u.s.Xmm9 = jmp->Xmm9; + context->u.s.Xmm10 = jmp->Xmm10; + context->u.s.Xmm11 = jmp->Xmm11; + context->u.s.Xmm12 = jmp->Xmm12; + context->u.s.Xmm13 = jmp->Xmm13; + context->u.s.Xmm14 = jmp->Xmm14; + context->u.s.Xmm15 = jmp->Xmm15; + } + else if (rec && rec->ExceptionCode == STATUS_UNWIND_CONSOLIDATE && rec->NumberParameters >= 1) + { + PVOID (CALLBACK *consolidate)(EXCEPTION_RECORD *) = (void *)rec->ExceptionInformation[0]; + TRACE( "calling consolidate callback %p (rec=%p)\n", consolidate, rec ); + context->Rip = (ULONG64)call_consolidate_callback( context, consolidate, rec ); + } + TRACE( "returning to %lx stack %lx\n", context->Rip, context->Rsp ); + set_cpu_context( context ); +} + /******************************************************************* * RtlUnwindEx (NTDLL.@) @@ -3597,41 +3635,9 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec *context = new_context; } - if (rec->ExceptionCode == STATUS_LONGJUMP && rec->NumberParameters >= 1) - { - struct MSVCRT_JUMP_BUFFER *jmp = (struct MSVCRT_JUMP_BUFFER *)rec->ExceptionInformation[0]; - context->Rbx = jmp->Rbx; - context->Rsp = jmp->Rsp; - context->Rbp = jmp->Rbp; - context->Rsi = jmp->Rsi; - context->Rdi = jmp->Rdi; - context->R12 = jmp->R12; - context->R13 = jmp->R13; - context->R14 = jmp->R14; - context->R15 = jmp->R15; - context->Rip = jmp->Rip; - context->u.s.Xmm6 = jmp->Xmm6; - context->u.s.Xmm7 = jmp->Xmm7; - context->u.s.Xmm8 = jmp->Xmm8; - context->u.s.Xmm9 = jmp->Xmm9; - context->u.s.Xmm10 = jmp->Xmm10; - context->u.s.Xmm11 = jmp->Xmm11; - context->u.s.Xmm12 = jmp->Xmm12; - context->u.s.Xmm13 = jmp->Xmm13; - context->u.s.Xmm14 = jmp->Xmm14; - context->u.s.Xmm15 = jmp->Xmm15; - } - else if (rec->ExceptionCode == STATUS_UNWIND_CONSOLIDATE && rec->NumberParameters >= 1) - { - PVOID (CALLBACK *consolidate)(EXCEPTION_RECORD *) = (void *)rec->ExceptionInformation[0]; - TRACE( "calling consolidate callback %p (rec=%p)\n", consolidate, rec ); - target_ip = call_consolidate_callback( context, consolidate, rec ); - TRACE( "-> target=%p\n", target_ip ); - } context->Rax = (ULONG64)retval; context->Rip = (ULONG64)target_ip; - TRACE( "returning to %lx stack %lx\n", context->Rip, context->Rsp ); - set_cpu_context( context ); + RtlRestoreContext(context, rec); }

1 0

Jacek Caban : mshtml: Added IHTMLDocument6:: get_documentMode implementation.
by Alexandre Julliard July 6, 2016

July 6, 2016

Module: wine Branch: master Commit: 6e2ebcd167d4aaa154425f47c5bb614021ab2b18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e2ebcd167d4aaa154425f47c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 5 22:47:14 2016 +0200 mshtml: Added IHTMLDocument6::get_documentMode implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 281c267..1c665b7 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -3053,12 +3053,31 @@ static HRESULT WINAPI HTMLDocument6_get_compatible(IHTMLDocument6 *iface, return E_NOTIMPL; } -static HRESULT WINAPI HTMLDocument6_get_documentMode(IHTMLDocument6 *iface, - VARIANT *p) +static HRESULT WINAPI HTMLDocument6_get_documentMode(IHTMLDocument6 *iface, VARIANT *p) { HTMLDocument *This = impl_from_IHTMLDocument6(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + static const int docmode_values[] = { + 5, /* DOCMODE_QUIRKS */ + 7, /* DOCMODE_IE7 */ + 8, /* DOCMODE_IE8 */ + 9, /* DOCMODE_IE8 */ + 10, /* DOCMODE_IE10 */ + 11 /* DOCMODE_IE11 */ + }; + + TRACE("(%p)->(%p)\n", This, p); + + if(!This->doc_node) { + FIXME("NULL doc_node\n"); + return E_UNEXPECTED; + } + + assert(This->doc_node->document_mode < sizeof(docmode_values)/sizeof(*docmode_values)); + + V_VT(p) = VT_I4; + V_I4(p) = docmode_values[This->doc_node->document_mode]; + return S_OK; } static HRESULT WINAPI HTMLDocument6_get_onstorage(IHTMLDocument6 *iface,

1 0