October 2012 - Wine-commits

Alexandre Julliard : winex11: Get rid of the OpenGL GDI driver.
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: 28721d69f46191e92751a619c9f39d8309f0f6bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=28721d69f46191e92751a619c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 2 22:05:57 2012 +0200 winex11: Get rid of the OpenGL GDI driver. --- dlls/winex11.drv/init.c | 21 ++++- dlls/winex11.drv/opengl.c | 216 ++------------------------------------------- dlls/winex11.drv/x11drv.h | 2 +- 3 files changed, 26 insertions(+), 213 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=28721d69f46191e92751a…

1 0

Alexandre Julliard : winex11: Allow changing the pixel format of a window from a different thread.
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: 4ac1a5ac608bad7111f7cb99170a3be99b5059f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ac1a5ac608bad7111f7cb991… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 3 11:19:10 2012 +0200 winex11: Allow changing the pixel format of a window from a different thread. --- dlls/winex11.drv/opengl.c | 47 ++++++-------------------------------------- dlls/winex11.drv/window.c | 2 - dlls/winex11.drv/x11drv.h | 2 - 3 files changed, 7 insertions(+), 44 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 3e68131..20591e2 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1062,20 +1062,6 @@ static const struct wgl_pixel_format *get_pixel_format(Display *display, int iPi return NULL; } -static int pixelformat_from_fbconfig_id(XID fbconfig_id) -{ - int i; - - if (!fbconfig_id) return 0; - - for (i = 0; i < nb_pixel_formats; i++) - if (pixel_formats[i].fmt_id == fbconfig_id) return i + 1; - - /* This will happen on hwnds without a pixel format set; it's ok */ - return 0; -} - - /* Mark any allocated context using the glx drawable 'old' to use 'new' */ static void mark_drawable_dirty(Drawable old, Drawable new) { @@ -1182,18 +1168,15 @@ static void free_gl_drawable( struct gl_drawable *gl ) /*********************************************************************** * set_win_format */ -BOOL set_win_format( HWND hwnd, XID fbconfig_id ) +static BOOL set_win_format( HWND hwnd, const struct wgl_pixel_format *format ) { HWND parent = GetAncestor( hwnd, GA_PARENT ); XSetWindowAttributes attrib; struct gl_drawable *gl, *prev; - int format; - - if (!(format = pixelformat_from_fbconfig_id( fbconfig_id ))) return FALSE; gl = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*gl) ); - gl->format = &pixel_formats[format - 1]; - gl->visual = pglXGetVisualFromFBConfig( gdi_display, gl->format->fbconfig ); + gl->format = format; + gl->visual = pglXGetVisualFromFBConfig( gdi_display, format->fbconfig ); if (!gl->visual) { HeapFree( GetProcessHeap(), 0, gl ); @@ -1289,7 +1272,7 @@ BOOL set_win_format( HWND hwnd, XID fbconfig_id ) return FALSE; } - TRACE("Created GL drawable 0x%lx, using FBConfigID 0x%lx\n", gl->drawable, fbconfig_id); + TRACE("created GL drawable %lx for win %p format %x\n", gl->drawable, hwnd, format->fmt_id ); XFlush( gdi_display ); @@ -1298,11 +1281,6 @@ BOOL set_win_format( HWND hwnd, XID fbconfig_id ) free_gl_drawable( prev ); XSaveContext( gdi_display, (XID)hwnd, gl_hwnd_context, (char *)gl ); LeaveCriticalSection( &context_section ); - - /* force DCE invalidation */ - SetWindowPos( hwnd, 0, 0, 0, 0, 0, - SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOSIZE | SWP_NOMOVE | - SWP_NOREDRAW | SWP_DEFERERASE | SWP_NOSENDCHANGING | SWP_STATECHANGED); return TRUE; } @@ -1577,12 +1555,6 @@ static BOOL glxdrv_wglSetPixelFormat( HDC hdc, int iPixelFormat, const PIXELFORM return prev == iPixelFormat; /* cannot change it if already set */ } - if(!SendMessageW(hwnd, WM_X11DRV_SET_WIN_FORMAT, fmt->fmt_id, 0)) { - ERR("Couldn't set format of the window, returning failure\n"); - return FALSE; - } - /* physDev->current_pf will be set by the DCE update */ - if (TRACE_ON(wgl)) { int gl_test = 0; @@ -1598,7 +1570,8 @@ static BOOL glxdrv_wglSetPixelFormat( HDC hdc, int iPixelFormat, const PIXELFORM TRACE(" - DRAWABLE_TYPE 0x%x\n", value); } } - return TRUE; + + return set_win_format( hwnd, fmt ); } /*********************************************************************** @@ -2879,8 +2852,7 @@ static BOOL X11DRV_wglSetPixelFormatWINE(HDC hdc, int format) return FALSE; } - return SendMessageW(hwnd, WM_X11DRV_SET_WIN_FORMAT, fmt->fmt_id, 0); - /* DC pixel format will be set by the DCE update */ + return set_win_format( hwnd, fmt ); } /** @@ -3102,11 +3074,6 @@ struct opengl_funcs *get_glx_driver( UINT version ) return NULL; } -BOOL set_win_format( HWND hwnd, XID fbconfig_id ) -{ - return FALSE; -} - BOOL has_gl_drawable( HWND hwnd ) { return FALSE; diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index ea9adae..5d7e315 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2430,8 +2430,6 @@ LRESULT CDECL X11DRV_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) { case WM_X11DRV_ACQUIRE_SELECTION: return X11DRV_AcquireClipboard( hwnd ); - case WM_X11DRV_SET_WIN_FORMAT: - return set_win_format( hwnd, (XID)wp ); case WM_X11DRV_SET_WIN_REGION: if ((data = get_win_data( hwnd ))) { diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index a13d25c..8e114a2 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -517,7 +517,6 @@ extern DWORD EVENT_x11_time_to_win32_time(Time time) DECLSPEC_HIDDEN; enum x11drv_window_messages { WM_X11DRV_ACQUIRE_SELECTION = 0x80001000, - WM_X11DRV_SET_WIN_FORMAT, WM_X11DRV_SET_WIN_REGION, WM_X11DRV_RESIZE_DESKTOP, WM_X11DRV_SET_CURSOR, @@ -568,7 +567,6 @@ extern void release_win_data( struct x11drv_win_data *data ) DECLSPEC_HIDDEN; extern Window X11DRV_get_whole_window( HWND hwnd ) DECLSPEC_HIDDEN; extern XIC X11DRV_get_ic( HWND hwnd ) DECLSPEC_HIDDEN; -extern BOOL set_win_format( HWND hwnd, XID fbconfig_id ) DECLSPEC_HIDDEN; extern BOOL has_gl_drawable( HWND hwnd ) DECLSPEC_HIDDEN; extern void sync_gl_drawable( HWND hwnd, const RECT *visible_rect, const RECT *client_rect ) DECLSPEC_HIDDEN; extern void destroy_gl_drawable( HWND hwnd ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : winex11: Copy the existing surface bits when a dirty rectangle is specified in UpdateLayeredWindow .
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: dbff4f422c943a837f0098e921f831eb4a94ac11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbff4f422c943a837f0098e92… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 3 00:08:30 2012 +0200 winex11: Copy the existing surface bits when a dirty rectangle is specified in UpdateLayeredWindow. --- dlls/winex11.drv/window.c | 27 ++++++++++++++++++--------- 1 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 5d7e315..ad18eff 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2398,17 +2398,26 @@ BOOL CDECL X11DRV_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO if (!(hdc = CreateCompatibleDC( 0 ))) goto done; SelectObject( hdc, dib ); - if (!(ret = GdiAlphaBlend( hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, - info->hdcSrc, - rect.left + (info->pptSrc ? info->pptSrc->x : 0), - rect.top + (info->pptSrc ? info->pptSrc->y : 0), - rect.right - rect.left, rect.bottom - rect.top, - (info->dwFlags & ULW_ALPHA) ? *info->pblend : blend ))) - goto done; surface->funcs->lock( surface ); - memcpy( dst_bits, src_bits, bmi->bmiHeader.biSizeImage ); - add_bounds_rect( surface->funcs->get_bounds( surface ), &rect ); + + if (info->prcDirty) + { + memcpy( src_bits, dst_bits, bmi->bmiHeader.biSizeImage ); + PatBlt( hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, BLACKNESS ); + } + ret = GdiAlphaBlend( hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, + info->hdcSrc, + rect.left + (info->pptSrc ? info->pptSrc->x : 0), + rect.top + (info->pptSrc ? info->pptSrc->y : 0), + rect.right - rect.left, rect.bottom - rect.top, + (info->dwFlags & ULW_ALPHA) ? *info->pblend : blend ); + if (ret) + { + memcpy( dst_bits, src_bits, bmi->bmiHeader.biSizeImage ); + add_bounds_rect( surface->funcs->get_bounds( surface ), &rect ); + } + surface->funcs->unlock( surface ); surface->funcs->flush( surface );

1 0

Alexandre Julliard : winex11: Fix a typo in the surface region computation with an alpha channel.
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: 6f3b097a203d9ca248732cb45eed462599ca3af1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f3b097a203d9ca248732cb45… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 3 00:09:01 2012 +0200 winex11: Fix a typo in the surface region computation with an alpha channel. --- dlls/winex11.drv/bitblt.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index ceecb0c..36e3ac9 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1676,8 +1676,8 @@ static void update_surface_region( struct x11drv_window_surface *surface ) (surface->is_argb && !(bits[x] & 0xff000000)))) x++; start = x; while (x < width && - ((bits[x] & 0xffffff) != surface->color_key || - !(surface->is_argb && !(bits[x] & 0xff000000)))) x++; + !((bits[x] & 0xffffff) == surface->color_key || + (surface->is_argb && !(bits[x] & 0xff000000)))) x++; add_row( rgn, data, surface->header.rect.left + start, y, x - start ); } }

1 0

Jacek Caban : mshtml: Moved getElementById implementation to separated function.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: 3bfbd6b619a97031ec89a919f41a2b24663650d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bfbd6b619a97031ec89a919f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 2 15:44:27 2012 +0200 mshtml: Moved getElementById implementation to separated function. --- dlls/mshtml/htmldoc3.c | 147 +++++++++++++++++++++++------------------- dlls/mshtml/htmlelem.c | 13 ++++ dlls/mshtml/mshtml_private.h | 1 + 3 files changed, 94 insertions(+), 67 deletions(-) diff --git a/dlls/mshtml/htmldoc3.c b/dlls/mshtml/htmldoc3.c index f34f0a2..8139f7f 100644 --- a/dlls/mshtml/htmldoc3.c +++ b/dlls/mshtml/htmldoc3.c @@ -20,6 +20,7 @@ #include <stdarg.h> #include <stdio.h> +#include <assert.h> #define COBJMACROS @@ -35,6 +36,79 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); +static HRESULT get_doc_elem_by_id(HTMLDocumentNode *doc, const WCHAR *id, HTMLElement **ret) +{ + nsIDOMNodeList *nsnode_list; + nsIDOMElement *nselem; + nsIDOMNode *nsnode; + nsAString id_str; + nsresult nsres; + HRESULT hres; + + if(!doc->nsdoc) { + WARN("NULL nsdoc\n"); + return E_UNEXPECTED; + } + + nsAString_InitDepend(&id_str, id); + /* get element by id attribute */ + nsres = nsIDOMHTMLDocument_GetElementById(doc->nsdoc, &id_str, &nselem); + if(FAILED(nsres)) { + ERR("GetElementById failed: %08x\n", nsres); + nsAString_Finish(&id_str); + return E_FAIL; + } + + /* get first element by name attribute */ + nsres = nsIDOMHTMLDocument_GetElementsByName(doc->nsdoc, &id_str, &nsnode_list); + nsAString_Finish(&id_str); + if(FAILED(nsres)) { + ERR("getElementsByName failed: %08x\n", nsres); + if(nselem) + nsIDOMElement_Release(nselem); + return E_FAIL; + } + + nsres = nsIDOMNodeList_Item(nsnode_list, 0, &nsnode); + nsIDOMNodeList_Release(nsnode_list); + assert(nsres == NS_OK); + + if(nsnode && nselem) { + PRUint16 pos; + + nsres = nsIDOMNode_CompareDocumentPosition(nsnode, (nsIDOMNode*)nselem, &pos); + if(NS_FAILED(nsres)) { + FIXME("CompareDocumentPosition failed: 0x%08x\n", nsres); + nsIDOMNode_Release(nsnode); + nsIDOMElement_Release(nselem); + return E_FAIL; + } + + TRACE("CompareDocumentPosition gave: 0x%x\n", pos); + if(!(pos & (DOCUMENT_POSITION_PRECEDING | DOCUMENT_POSITION_CONTAINS))) { + nsIDOMElement_Release(nselem); + nselem = NULL; + } + } + + if(nsnode) { + if(!nselem) { + nsres = nsIDOMNode_QueryInterface(nsnode, &IID_nsIDOMElement, (void**)&nselem); + assert(nsres == NS_OK); + } + nsIDOMNode_Release(nsnode); + } + + if(!nselem) { + *ret = NULL; + return S_OK; + } + + hres = get_elem(doc, nselem, ret); + nsIDOMElement_Release(nselem); + return hres; +} + static inline HTMLDocument *impl_from_IHTMLDocument3(IHTMLDocument3 *iface) { return CONTAINING_RECORD(iface, HTMLDocument, IHTMLDocument3_iface); @@ -469,80 +543,19 @@ static HRESULT WINAPI HTMLDocument3_getElementById(IHTMLDocument3 *iface, BSTR v IHTMLElement **pel) { HTMLDocument *This = impl_from_IHTMLDocument3(iface); - nsIDOMElement *nselem; - HTMLDOMNode *node; - nsIDOMNode *nsnode, *nsnode_by_id, *nsnode_by_name; - nsIDOMNodeList *nsnode_list; - nsAString id_str; - nsresult nsres; + HTMLElement *elem; HRESULT hres; TRACE("(%p)->(%s %p)\n", This, debugstr_w(v), pel); - if(!This->doc_node->nsdoc) { - WARN("NULL nsdoc\n"); - return E_UNEXPECTED; - } - - nsAString_InitDepend(&id_str, v); - /* get element by id attribute */ - nsres = nsIDOMHTMLDocument_GetElementById(This->doc_node->nsdoc, &id_str, &nselem); - if(FAILED(nsres)) { - ERR("GetElementById failed: %08x\n", nsres); - nsAString_Finish(&id_str); - return E_FAIL; - } - nsnode_by_id = (nsIDOMNode*)nselem; - - /* get first element by name attribute */ - nsres = nsIDOMHTMLDocument_GetElementsByName(This->doc_node->nsdoc, &id_str, &nsnode_list); - nsAString_Finish(&id_str); - if(FAILED(nsres)) { - ERR("getElementsByName failed: %08x\n", nsres); - if(nsnode_by_id) - nsIDOMNode_Release(nsnode_by_id); - return E_FAIL; - } - nsIDOMNodeList_Item(nsnode_list, 0, &nsnode_by_name); - nsIDOMNodeList_Release(nsnode_list); - - - if(nsnode_by_name && nsnode_by_id) { - PRUint16 pos; - - nsres = nsIDOMNode_CompareDocumentPosition(nsnode_by_name, nsnode_by_id, &pos); - if(NS_FAILED(nsres)) { - FIXME("CompareDocumentPosition failed: 0x%08x\n", nsres); - nsIDOMNode_Release(nsnode_by_name); - nsIDOMNode_Release(nsnode_by_id); - return E_FAIL; - } - - TRACE("CompareDocumentPosition gave: 0x%x\n", pos); - if(pos & (DOCUMENT_POSITION_PRECEDING | DOCUMENT_POSITION_CONTAINS)) { - nsnode = nsnode_by_id; - nsIDOMNode_Release(nsnode_by_name); - }else { - nsnode = nsnode_by_name; - nsIDOMNode_Release(nsnode_by_id); - } - }else - nsnode = nsnode_by_name ? nsnode_by_name : nsnode_by_id; - - if(nsnode) { - hres = get_node(This->doc_node, nsnode, TRUE, &node); - nsIDOMNode_Release(nsnode); - - if(SUCCEEDED(hres)) { - hres = IHTMLDOMNode_QueryInterface(&node->IHTMLDOMNode_iface, &IID_IHTMLElement, (void**)pel); - node_release(node); - } - }else { + hres = get_doc_elem_by_id(This->doc_node, v, &elem); + if(FAILED(hres) || !elem) { *pel = NULL; - hres = S_OK; + return hres; } - return hres; + *pel = &elem->IHTMLElement_iface; + return S_OK; } diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index a12b8de..aa3b68f 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1864,6 +1864,19 @@ HRESULT HTMLElement_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode, BOOL use_g return S_OK; } +HRESULT get_elem(HTMLDocumentNode *doc, nsIDOMElement *nselem, HTMLElement **ret) +{ + HTMLDOMNode *node; + HRESULT hres; + + hres = get_node(doc, (nsIDOMNode*)nselem, TRUE, &node); + if(FAILED(hres)) + return hres; + + *ret = impl_from_HTMLDOMNode(node); + return S_OK; +} + /* interface IHTMLFiltersCollection */ static HRESULT WINAPI HTMLFiltersCollection_QueryInterface(IHTMLFiltersCollection *iface, REFIID riid, void **ppv) { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index dd41224..e26b594 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -898,6 +898,7 @@ HRESULT HTMLFrameBase_QI(HTMLFrameBase*,REFIID,void**) DECLSPEC_HIDDEN; void HTMLFrameBase_destructor(HTMLFrameBase*) DECLSPEC_HIDDEN; HRESULT get_node(HTMLDocumentNode*,nsIDOMNode*,BOOL,HTMLDOMNode**) DECLSPEC_HIDDEN; +HRESULT get_elem(HTMLDocumentNode*,nsIDOMElement*,HTMLElement**) DECLSPEC_HIDDEN; HTMLElement *unsafe_impl_from_IHTMLElement(IHTMLElement*) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Defer event script evaluation.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: 60c9069f800e16006b8a9384a91aa2ab39a6180b URL: http://source.winehq.org/git/wine.git/?a=commit;h=60c9069f800e16006b8a9384a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 2 15:44:56 2012 +0200 mshtml: Defer event script evaluation. --- dlls/mshtml/script.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 54cee56..823c7b3 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -753,12 +753,27 @@ static void parse_inline_script(ScriptHost *script_host, nsIDOMHTMLScriptElement static void parse_script_elem(ScriptHost *script_host, nsIDOMHTMLScriptElement *nsscript) { + nsAString src_str, event_str; const PRUnichar *src; - nsAString src_str; nsresult nsres; - nsAString_Init(&src_str, NULL); + nsAString_Init(&event_str, NULL); + nsres = nsIDOMHTMLScriptElement_GetEvent(nsscript, &event_str); + if(NS_SUCCEEDED(nsres)) { + const PRUnichar *event; + nsAString_GetData(&event_str, &event); + if(*event) { + TRACE("deferring event %s script evaluation\n", debugstr_w(event)); + nsAString_Finish(&event_str); + return; + } + }else { + ERR("GetAttribute(event) failed: %08x\n", nsres); + } + nsAString_Finish(&event_str); + + nsAString_Init(&src_str, NULL); nsres = nsIDOMHTMLScriptElement_GetSrc(nsscript, &src_str); nsAString_GetData(&src_str, &src);

1 0

Jacek Caban : mshtml: Simplify get_node_obj.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: a420b5dad863a22320c172ba89f5670b870100d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a420b5dad863a22320c172ba8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 2 15:45:15 2012 +0200 mshtml: Simplify get_node_obj. --- dlls/mshtml/htmlnode.c | 37 ++++++++++++++++++++++++------------- 1 files changed, 24 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index b0cf4c3..91ffe6d 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -33,7 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -static HTMLDOMNode *get_node_obj(HTMLDocumentNode*,IUnknown*); +static HTMLDOMNode *get_node_obj(IHTMLDOMNode*); static HRESULT create_node(HTMLDocumentNode*,nsIDOMNode*,HTMLDOMNode**); typedef struct { @@ -503,7 +503,7 @@ static HRESULT WINAPI HTMLDOMNode_insertBefore(IHTMLDOMNode *iface, IHTMLDOMNode TRACE("(%p)->(%p %s %p)\n", This, newChild, debugstr_variant(&refChild), node); - new_child = get_node_obj(This->doc, (IUnknown*)newChild); + new_child = get_node_obj(newChild); if(!new_child) { ERR("invalid newChild\n"); return E_INVALIDARG; @@ -513,9 +513,17 @@ static HRESULT WINAPI HTMLDOMNode_insertBefore(IHTMLDOMNode *iface, IHTMLDOMNode case VT_NULL: break; case VT_DISPATCH: { + IHTMLDOMNode *ref_iface; + if(!V_DISPATCH(&refChild)) break; - ref_node = get_node_obj(This->doc, (IUnknown*)V_DISPATCH(&refChild)); + + hres = IDispatch_QueryInterface(V_DISPATCH(&refChild), &IID_IHTMLDOMNode, (void**)&ref_iface); + if(FAILED(hres)) + break; + + ref_node = get_node_obj(ref_iface); + IHTMLDOMNode_Release(ref_iface); if(!ref_node) { ERR("unvalid node\n"); hres = E_FAIL; @@ -561,7 +569,7 @@ static HRESULT WINAPI HTMLDOMNode_removeChild(IHTMLDOMNode *iface, IHTMLDOMNode TRACE("(%p)->(%p %p)\n", This, oldChild, node); - node_obj = get_node_obj(This->doc, (IUnknown*)oldChild); + node_obj = get_node_obj(oldChild); if(!node_obj) return E_FAIL; @@ -593,11 +601,11 @@ static HRESULT WINAPI HTMLDOMNode_replaceChild(IHTMLDOMNode *iface, IHTMLDOMNode TRACE("(%p)->(%p %p %p)\n", This, newChild, oldChild, node); - node_new = get_node_obj(This->doc, (IUnknown*)newChild); + node_new = get_node_obj(newChild); if(!node_new) return E_FAIL; - node_old = get_node_obj(This->doc, (IUnknown*)oldChild); + node_old = get_node_obj(oldChild); if(!node_old) { node_release(node_new); return E_FAIL; @@ -678,7 +686,7 @@ static HRESULT WINAPI HTMLDOMNode_appendChild(IHTMLDOMNode *iface, IHTMLDOMNode TRACE("(%p)->(%p %p)\n", This, newChild, node); - node_obj = get_node_obj(This->doc, (IUnknown*)newChild); + node_obj = get_node_obj(newChild); if(!node_obj) return E_FAIL; @@ -886,13 +894,16 @@ static const IHTMLDOMNodeVtbl HTMLDOMNodeVtbl = { HTMLDOMNode_get_nextSibling }; -static HTMLDOMNode *get_node_obj(HTMLDocumentNode *This, IUnknown *iface) +static HTMLDOMNode *get_node_obj(IHTMLDOMNode *iface) { - IHTMLDOMNode *node; - HRESULT hres; + HTMLDOMNode *ret; + + if(iface->lpVtbl != &HTMLDOMNodeVtbl) + return NULL; - hres = IUnknown_QueryInterface(iface, &IID_IHTMLDOMNode, (void**)&node); - return hres == S_OK && node->lpVtbl == &HTMLDOMNodeVtbl ? impl_from_IHTMLDOMNode(node) : NULL; + ret = impl_from_IHTMLDOMNode(iface); + node_addref(ret); + return ret; } static inline HTMLDOMNode *impl_from_IHTMLDOMNode2(IHTMLDOMNode2 *iface) @@ -1192,7 +1203,7 @@ HRESULT get_node(HTMLDocumentNode *This, nsIDOMNode *nsnode, BOOL create, HTMLDO assert(nsres == NS_OK); if(unk) { - *ret = get_node_obj(This, (IUnknown*)unk); + *ret = get_node_obj((IHTMLDOMNode*)unk); return NS_OK; }

1 0

Jacek Caban : mshtml: Store information if script was already parsed in script element object.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: 4503edd614da9c75644ab7c5005e0f9857aae0bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=4503edd614da9c75644ab7c50… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 2 15:45:40 2012 +0200 mshtml: Store information if script was already parsed in script element object. --- dlls/mshtml/htmlscript.c | 22 ++++++++++++++-------- dlls/mshtml/mshtml_private.h | 13 ++++++++++++- dlls/mshtml/mutation.c | 11 +++++++++-- dlls/mshtml/script.c | 36 +++++++++++++++++++----------------- 4 files changed, 54 insertions(+), 28 deletions(-) diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index 99478ea..d6241ae 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -32,14 +32,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -typedef struct { - HTMLElement element; - - IHTMLScriptElement IHTMLScriptElement_iface; - - nsIDOMHTMLScriptElement *nsscript; -} HTMLScriptElement; - static inline HTMLScriptElement *impl_from_IHTMLScriptElement(IHTMLScriptElement *iface) { return CONTAINING_RECORD(iface, HTMLScriptElement, IHTMLScriptElement_iface); @@ -327,6 +319,20 @@ static const NodeImplVtbl HTMLScriptElementImplVtbl = { HTMLScriptElement_get_readystate }; +HRESULT script_elem_from_nsscript(HTMLDocumentNode *doc, nsIDOMHTMLScriptElement *nsscript, HTMLScriptElement **ret) +{ + HTMLDOMNode *node; + HRESULT hres; + + hres = get_node(doc, (nsIDOMNode*)nsscript, TRUE, &node); + if(FAILED(hres)) + return hres; + + assert(node->vtbl == &HTMLScriptElementImplVtbl); + *ret = impl_from_HTMLDOMNode(node); + return S_OK; +} + static const tid_t HTMLScriptElement_iface_tids[] = { HTMLELEMENT_TIDS, IHTMLScriptElement_tid, diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index e26b594..9cdc410 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -741,6 +741,17 @@ void init_binding_ui(HTMLDocumentObj*) DECLSPEC_HIDDEN; void HTMLDocumentNode_SecMgr_Init(HTMLDocumentNode*) DECLSPEC_HIDDEN; +typedef struct { + HTMLElement element; + + IHTMLScriptElement IHTMLScriptElement_iface; + + nsIDOMHTMLScriptElement *nsscript; + BOOL parsed; +} HTMLScriptElement; + +HRESULT script_elem_from_nsscript(HTMLDocumentNode*,nsIDOMHTMLScriptElement*,HTMLScriptElement**) DECLSPEC_HIDDEN; + HRESULT HTMLCurrentStyle_Create(HTMLElement*,IHTMLCurrentStyle**) DECLSPEC_HIDDEN; void ConnectionPoint_Init(ConnectionPoint*,ConnectionPointContainer*,REFIID,cp_static_data_t*) DECLSPEC_HIDDEN; @@ -904,7 +915,7 @@ HTMLElement *unsafe_impl_from_IHTMLElement(IHTMLElement*) DECLSPEC_HIDDEN; void release_script_hosts(HTMLInnerWindow*) DECLSPEC_HIDDEN; void connect_scripts(HTMLInnerWindow*) DECLSPEC_HIDDEN; -void doc_insert_script(HTMLInnerWindow*,nsIDOMHTMLScriptElement*) DECLSPEC_HIDDEN; +void doc_insert_script(HTMLInnerWindow*,HTMLScriptElement*) DECLSPEC_HIDDEN; IDispatch *script_parse_event(HTMLInnerWindow*,LPCWSTR) DECLSPEC_HIDDEN; HRESULT exec_script(HTMLInnerWindow*,const WCHAR*,const WCHAR*,VARIANT*) DECLSPEC_HIDDEN; void set_script_mode(HTMLOuterWindow*,SCRIPTMODE) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 129094e..7b8bf89 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -294,8 +294,10 @@ static nsresult run_end_load(HTMLDocumentNode *This, nsISupports *arg1, nsISuppo static nsresult run_insert_script(HTMLDocumentNode *doc, nsISupports *script_iface, nsISupports *parser_iface) { nsIDOMHTMLScriptElement *nsscript; + HTMLScriptElement *script_elem; nsIParser *nsparser = NULL; nsresult nsres; + HRESULT hres; TRACE("(%p)->(%p)\n", doc, script_iface); @@ -313,17 +315,22 @@ static nsresult run_insert_script(HTMLDocumentNode *doc, nsISupports *script_ifa } } + hres = script_elem_from_nsscript(doc, nsscript, &script_elem); + nsIDOMHTMLScriptElement_Release(nsscript); + if(FAILED(hres)) + return NS_ERROR_FAILURE; + if(nsparser) nsIParser_BeginEvaluatingParserInsertedScript(nsparser); - doc_insert_script(doc->window, nsscript); + doc_insert_script(doc->window, script_elem); if(nsparser) { nsIParser_EndEvaluatingParserInsertedScript(nsparser); nsIParser_Release(nsparser); } - nsIDOMHTMLScriptElement_Release(nsscript); + IHTMLScriptElement_Release(&script_elem->IHTMLScriptElement_iface); return NS_OK; } diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 823c7b3..ceb88d7 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -731,34 +731,34 @@ static void parse_extern_script(ScriptHost *script_host, LPCWSTR src) heap_free(text); } -static void parse_inline_script(ScriptHost *script_host, nsIDOMHTMLScriptElement *nsscript) +static void parse_inline_script(ScriptHost *script_host, HTMLScriptElement *script_elem) { const PRUnichar *text; nsAString text_str; nsresult nsres; nsAString_Init(&text_str, NULL); + nsres = nsIDOMHTMLScriptElement_GetText(script_elem->nsscript, &text_str); + nsAString_GetData(&text_str, &text); - nsres = nsIDOMHTMLScriptElement_GetText(nsscript, &text_str); - - if(NS_SUCCEEDED(nsres)) { - nsAString_GetData(&text_str, &text); - parse_text(script_host, text); - }else { + if(NS_FAILED(nsres)) { ERR("GetText failed: %08x\n", nsres); + }else if(*text) { + script_elem->parsed = TRUE; + parse_text(script_host, text); } nsAString_Finish(&text_str); } -static void parse_script_elem(ScriptHost *script_host, nsIDOMHTMLScriptElement *nsscript) +static void parse_script_elem(ScriptHost *script_host, HTMLScriptElement *script_elem) { nsAString src_str, event_str; const PRUnichar *src; nsresult nsres; nsAString_Init(&event_str, NULL); - nsres = nsIDOMHTMLScriptElement_GetEvent(nsscript, &event_str); + nsres = nsIDOMHTMLScriptElement_GetEvent(script_elem->nsscript, &event_str); if(NS_SUCCEEDED(nsres)) { const PRUnichar *event; @@ -774,15 +774,17 @@ static void parse_script_elem(ScriptHost *script_host, nsIDOMHTMLScriptElement * nsAString_Finish(&event_str); nsAString_Init(&src_str, NULL); - nsres = nsIDOMHTMLScriptElement_GetSrc(nsscript, &src_str); + nsres = nsIDOMHTMLScriptElement_GetSrc(script_elem->nsscript, &src_str); nsAString_GetData(&src_str, &src); - if(NS_FAILED(nsres)) + if(NS_FAILED(nsres)) { ERR("GetSrc failed: %08x\n", nsres); - else if(*src) + }else if(*src) { + script_elem->parsed = TRUE; parse_extern_script(script_host, src); - else - parse_inline_script(script_host, nsscript); + }else { + parse_inline_script(script_host, script_elem); + } nsAString_Finish(&src_str); } @@ -887,12 +889,12 @@ static ScriptHost *get_script_host(HTMLInnerWindow *window, const GUID *guid) return create_script_host(window, guid); } -void doc_insert_script(HTMLInnerWindow *window, nsIDOMHTMLScriptElement *nsscript) +void doc_insert_script(HTMLInnerWindow *window, HTMLScriptElement *script_elem) { ScriptHost *script_host; GUID guid; - if(!get_script_guid(window, nsscript, &guid)) { + if(!get_script_guid(window, script_elem->nsscript, &guid)) { WARN("Could not find script GUID\n"); return; } @@ -908,7 +910,7 @@ void doc_insert_script(HTMLInnerWindow *window, nsIDOMHTMLScriptElement *nsscrip return; if(script_host->parse) - parse_script_elem(script_host, nsscript); + parse_script_elem(script_host, script_elem); } IDispatch *script_parse_event(HTMLInnerWindow *window, LPCWSTR text)

1 0

Jacek Caban : mshtml: Added support for script 'for' and 'event' attributes .
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: d40b1ae8dc7285eabedf9bafadd90137231be0a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d40b1ae8dc7285eabedf9bafa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 2 15:46:20 2012 +0200 mshtml: Added support for script 'for' and 'event' attributes. --- dlls/mshtml/htmldoc3.c | 2 +- dlls/mshtml/htmlevent.c | 15 +++ dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/mutation.c | 1 + dlls/mshtml/script.c | 212 ++++++++++++++++++++++++++++++++++++++++-- 6 files changed, 225 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d40b1ae8dc7285eabedf9…

1 0

Jacek Caban : mshtml: Added script 'for' and 'event' attributes tests.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: 43a178fad130a8623fa33af7699bf7ad5129829c URL: http://source.winehq.org/git/wine.git/?a=commit;h=43a178fad130a8623fa33af76… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 2 15:47:06 2012 +0200 mshtml: Added script 'for' and 'event' attributes tests. --- dlls/mshtml/tests/events.html | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/events.html b/dlls/mshtml/tests/events.html index ad9db3f..b3b6958 100644 --- a/dlls/mshtml/tests/events.html +++ b/dlls/mshtml/tests/events.html @@ -1,6 +1,8 @@ <html> <head> <script> +var testevent_divid2_called = false, cnt=0; + function ok(b,m) { return external.ok(b, m); } @@ -64,8 +66,23 @@ function ondataavailable_test() { ok(evobj.type === "dataavailable", "evobj.type = " + evobj.type); } +function test_scriptfor() { + var div = document.getElementById("divid2"); + ok("onclick" in div, "testevent not in div"); + ok(typeof(div.onclick) === "function", "typeof(div.onclick) = " + typeof(div.onclick)); + ok(testevent_divid2_called === false, "testevent_divid2_called = " + testevent_divid2_called); + div.click(); + ok(testevent_divid2_called === true, "testevent_divid2_called = " + testevent_divid2_called); + + ok(!("ontest" in div), "testevent in div"); + ok(typeof(div.ontest) === "undefined", "typeof(div.ontest) = " + typeof(div.ontest)); +} + function runTests() { try { + ok(cnt == 1, "cnt=" + cnt + " exception during loading?"); + + test_scriptfor(); ondataavailable_test(); }catch(e) { ok(false, "Got an exception: " + e.message); @@ -77,5 +94,19 @@ function runTests() { </head> <body onload="runTests()"> <div id="divid"></div> +<div id="divid2"></div> +<script event="onclick" for="divid2"> + testevent_divid2_called = true; +</script> +<script event="ontest" for="divid2"> + ok(false, "unexpected ontest"); +</script> +<script> +(function() { + var div = document.getElementById("divid2"); + ok(div.onclick === null, "div.onclick = null"); + cnt++; +})(); +</script> </body> </html>

1 0