October 2012 - Wine-Commits

Alexandre Julliard : winex11: Move the FLUSH_GL_DRAWABLE implementation to the main ExtEscape routine.
by Alexandre Julliard Oct. 3, 2012

Oct. 3, 2012

Module: wine Branch: master Commit: 05fe1e4e35de8864839310813fa4267cdf78ba84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05fe1e4e35de8864839310813… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 2 21:56:43 2012 +0200 winex11: Move the FLUSH_GL_DRAWABLE implementation to the main ExtEscape routine. --- dlls/winex11.drv/init.c | 18 ++++++++++ dlls/winex11.drv/opengl.c | 82 +-------------------------------------------- 2 files changed, 19 insertions(+), 81 deletions(-) diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index d6b45d8..12cff17 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -351,6 +351,24 @@ static INT X11DRV_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_d return TRUE; } break; + case X11DRV_FLUSH_GL_DRAWABLE: + if (in_count >= sizeof(struct x11drv_escape_flush_gl_drawable)) + { + const struct x11drv_escape_flush_gl_drawable *data = in_data; + RECT rect = physDev->dc_rect; + + OffsetRect( &rect, -physDev->dc_rect.left, -physDev->dc_rect.top ); + /* The GL drawable may be lagged behind if we don't flush first, so + * flush the display make sure we copy up-to-date data */ + XFlush( gdi_display ); + XSetFunction( gdi_display, physDev->gc, GXcopy ); + XCopyArea( gdi_display, data->gl_drawable, physDev->drawable, physDev->gc, + 0, 0, rect.right, rect.bottom, + physDev->dc_rect.left, physDev->dc_rect.top ); + add_device_bounds( physDev, &rect ); + return TRUE; + } + break; case X11DRV_START_EXPOSURES: XSetGraphicsExposures( gdi_display, physDev->gc, True ); physDev->exposures = 0; diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index d8a3322..4b6cb1f 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1816,25 +1816,6 @@ static BOOL glxdrv_wglShareLists(struct wgl_context *org, struct wgl_context *de return FALSE; } -static void flush_gl_drawable( struct glx_physdev *physdev, Drawable src ) -{ - RECT rect; - int w = physdev->x11dev->dc_rect.right - physdev->x11dev->dc_rect.left; - int h = physdev->x11dev->dc_rect.bottom - physdev->x11dev->dc_rect.top; - - if (w <= 0 || h <= 0) return; - - /* The GL drawable may be lagged behind if we don't flush first, so - * flush the display make sure we copy up-to-date data */ - XFlush(gdi_display); - XSetFunction(gdi_display, physdev->x11dev->gc, GXcopy); - XCopyArea(gdi_display, src, physdev->x11dev->drawable, physdev->x11dev->gc, 0, 0, w, h, - physdev->x11dev->dc_rect.left, physdev->x11dev->dc_rect.top); - SetRect( &rect, 0, 0, w, h ); - add_device_bounds( physdev->x11dev, &rect ); -} - - static void wglFinish(void) { struct x11drv_escape_flush_gl_drawable escape; @@ -3143,67 +3124,6 @@ static BOOL glxdrv_DeleteDC( PHYSDEV dev ) } /********************************************************************** - * glxdrv_ExtEscape - */ -static INT glxdrv_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_data, - INT out_count, LPVOID out_data ) -{ - struct glx_physdev *physdev = get_glxdrv_dev( dev ); - - dev = GET_NEXT_PHYSDEV( dev, pExtEscape ); - - if (escape == X11DRV_ESCAPE && in_data && in_count >= sizeof(enum x11drv_escape_codes)) - { - switch (*(const enum x11drv_escape_codes *)in_data) - { - case X11DRV_SET_DRAWABLE: - if (in_count >= sizeof(struct x11drv_escape_set_drawable)) - { - struct gl_drawable *gl; - const struct x11drv_escape_set_drawable *data = in_data; - - if ((gl = get_gl_drawable( data->hwnd, dev->hdc ))) - { - physdev->format = gl->format; - physdev->type = gl->type; - physdev->drawable = gl->drawable; - physdev->pixmap = gl->pixmap; - release_gl_drawable( gl ); - } - else - { - physdev->format = NULL; - physdev->type = DC_GL_NONE; - physdev->drawable = 0; - physdev->pixmap = 0; - } - TRACE( "SET_DRAWABLE hdc %p drawable %lx pf %p type %u\n", - dev->hdc, physdev->drawable, physdev->format, physdev->type ); - } - break; - case X11DRV_GET_DRAWABLE: - if (out_count >= sizeof(struct x11drv_escape_get_drawable)) - { - struct x11drv_escape_get_drawable *data = out_data; - data->pixel_format = physdev->format ? physdev->format - pixel_formats + 1 : 0; - data->gl_drawable = physdev->drawable; - } - break; - case X11DRV_FLUSH_GL_DRAWABLE: - if (in_count >= sizeof(struct x11drv_escape_flush_gl_drawable)) - { - const struct x11drv_escape_flush_gl_drawable *data = in_data; - flush_gl_drawable( physdev, data->gl_drawable ); - } - return TRUE; - default: - break; - } - } - return dev->funcs->pExtEscape( dev, escape, in_count, in_data, out_count, out_data ); -} - -/********************************************************************** * glxdrv_wine_get_wgl_driver */ static struct opengl_funcs * glxdrv_wine_get_wgl_driver( PHYSDEV dev, UINT version ) @@ -3245,7 +3165,7 @@ static const struct gdi_dc_funcs glxdrv_funcs = NULL, /* pEnumICMProfiles */ NULL, /* pExcludeClipRect */ NULL, /* pExtDeviceMode */ - glxdrv_ExtEscape, /* pExtEscape */ + NULL, /* pExtEscape */ NULL, /* pExtFloodFill */ NULL, /* pExtSelectClipRgn */ NULL, /* pExtTextOut */

1 0

Alexandre Julliard : winex11: Pass the source drawable to the FLUSH_GL_DRAWABLE escape.
by Alexandre Julliard Oct. 3, 2012

Oct. 3, 2012

Module: wine Branch: master Commit: d8de77f01e8894a0af422f9f926e5ca683403dd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8de77f01e8894a0af422f9f9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 2 21:50:54 2012 +0200 winex11: Pass the source drawable to the FLUSH_GL_DRAWABLE escape. --- dlls/winex11.drv/opengl.c | 91 +++++++++++++++++++++++++++++--------------- dlls/winex11.drv/x11drv.h | 6 +++ 2 files changed, 66 insertions(+), 31 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 96954cc..d8a3322 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1107,7 +1107,6 @@ static void mark_drawable_dirty(Drawable old, Drawable new) /* Given the current context, make sure its drawable is sync'd */ static inline void sync_context(struct wgl_context *context) { - EnterCriticalSection( &context_section ); if (context->refresh_drawables) { if (glxRequireVersion(3)) pglXMakeContextCurrent(gdi_display, context->drawables[0], @@ -1116,7 +1115,6 @@ static inline void sync_context(struct wgl_context *context) pglXMakeCurrent(gdi_display, context->drawables[0], context->ctx); context->refresh_drawables = FALSE; } - LeaveCriticalSection( &context_section ); } static struct gl_drawable *get_gl_drawable( HWND hwnd, HDC hdc ) @@ -1818,53 +1816,73 @@ static BOOL glxdrv_wglShareLists(struct wgl_context *org, struct wgl_context *de return FALSE; } -static void flush_gl_drawable( struct glx_physdev *physdev ) +static void flush_gl_drawable( struct glx_physdev *physdev, Drawable src ) { RECT rect; int w = physdev->x11dev->dc_rect.right - physdev->x11dev->dc_rect.left; int h = physdev->x11dev->dc_rect.bottom - physdev->x11dev->dc_rect.top; - Drawable src = physdev->drawable; if (w <= 0 || h <= 0) return; - switch (physdev->type) - { - case DC_GL_PIXMAP_WIN: - src = physdev->pixmap; - /* fall through */ - case DC_GL_CHILD_WIN: - /* The GL drawable may be lagged behind if we don't flush first, so - * flush the display make sure we copy up-to-date data */ - XFlush(gdi_display); - XSetFunction(gdi_display, physdev->x11dev->gc, GXcopy); - XCopyArea(gdi_display, src, physdev->x11dev->drawable, physdev->x11dev->gc, 0, 0, w, h, - physdev->x11dev->dc_rect.left, physdev->x11dev->dc_rect.top); - SetRect( &rect, 0, 0, w, h ); - add_device_bounds( physdev->x11dev, &rect ); - default: - break; - } + /* The GL drawable may be lagged behind if we don't flush first, so + * flush the display make sure we copy up-to-date data */ + XFlush(gdi_display); + XSetFunction(gdi_display, physdev->x11dev->gc, GXcopy); + XCopyArea(gdi_display, src, physdev->x11dev->drawable, physdev->x11dev->gc, 0, 0, w, h, + physdev->x11dev->dc_rect.left, physdev->x11dev->dc_rect.top); + SetRect( &rect, 0, 0, w, h ); + add_device_bounds( physdev->x11dev, &rect ); } static void wglFinish(void) { + struct x11drv_escape_flush_gl_drawable escape; + struct gl_drawable *gl; struct wgl_context *ctx = NtCurrentTeb()->glContext; - enum x11drv_escape_codes code = X11DRV_FLUSH_GL_DRAWABLE; - sync_context(ctx); + escape.code = X11DRV_FLUSH_GL_DRAWABLE; + escape.gl_drawable = 0; + + if ((gl = get_gl_drawable( WindowFromDC( ctx->hdc ), 0 ))) + { + switch (gl->type) + { + case DC_GL_PIXMAP_WIN: escape.gl_drawable = gl->pixmap; break; + case DC_GL_CHILD_WIN: escape.gl_drawable = gl->drawable; break; + default: break; + } + sync_context(ctx); + release_gl_drawable( gl ); + } + pglFinish(); - ExtEscape( ctx->hdc, X11DRV_ESCAPE, sizeof(code), (LPSTR)&code, 0, NULL ); + if (escape.gl_drawable) ExtEscape( ctx->hdc, X11DRV_ESCAPE, sizeof(escape), (LPSTR)&escape, 0, NULL ); } static void wglFlush(void) { + struct x11drv_escape_flush_gl_drawable escape; + struct gl_drawable *gl; struct wgl_context *ctx = NtCurrentTeb()->glContext; - enum x11drv_escape_codes code = X11DRV_FLUSH_GL_DRAWABLE; - sync_context(ctx); + escape.code = X11DRV_FLUSH_GL_DRAWABLE; + escape.gl_drawable = 0; + + if ((gl = get_gl_drawable( WindowFromDC( ctx->hdc ), 0 ))) + { + switch (gl->type) + { + case DC_GL_PIXMAP_WIN: escape.gl_drawable = gl->pixmap; break; + case DC_GL_CHILD_WIN: escape.gl_drawable = gl->drawable; break; + default: break; + } + sync_context(ctx); + release_gl_drawable( gl ); + } + pglFlush(); - ExtEscape( ctx->hdc, X11DRV_ESCAPE, sizeof(code), (LPSTR)&code, 0, NULL ); + if (escape.gl_drawable) ExtEscape( ctx->hdc, X11DRV_ESCAPE, sizeof(escape), (LPSTR)&escape, 0, NULL ); } /*********************************************************************** @@ -3034,12 +3052,15 @@ static void X11DRV_WineGL_LoadExtensions(void) */ static BOOL glxdrv_wglSwapBuffers( HDC hdc ) { - enum x11drv_escape_codes code = X11DRV_FLUSH_GL_DRAWABLE; + struct x11drv_escape_flush_gl_drawable escape; struct gl_drawable *gl; struct wgl_context *ctx = NtCurrentTeb()->glContext; TRACE("(%p)\n", hdc); + escape.code = X11DRV_FLUSH_GL_DRAWABLE; + escape.gl_drawable = 0; + if (!(gl = get_gl_drawable( WindowFromDC( hdc ), hdc ))) { SetLastError( ERROR_INVALID_HANDLE ); @@ -3050,6 +3071,7 @@ static BOOL glxdrv_wglSwapBuffers( HDC hdc ) { case DC_GL_PIXMAP_WIN: if (ctx) sync_context( ctx ); + escape.gl_drawable = gl->pixmap; if (pglXCopySubBufferMESA) { /* (glX)SwapBuffers has an implicit glFlush effect, however * GLX_MESA_copy_sub_buffer doesn't. Make sure GL is flushed before @@ -3059,6 +3081,10 @@ static BOOL glxdrv_wglSwapBuffers( HDC hdc ) gl->rect.right - gl->rect.left, gl->rect.bottom - gl->rect.top ); break; } + pglXSwapBuffers(gdi_display, gl->drawable); + break; + case DC_GL_CHILD_WIN: + escape.gl_drawable = gl->drawable; /* fall through */ default: pglXSwapBuffers(gdi_display, gl->drawable); @@ -3067,8 +3093,7 @@ static BOOL glxdrv_wglSwapBuffers( HDC hdc ) release_gl_drawable( gl ); - ExtEscape( hdc, X11DRV_ESCAPE, sizeof(code), (LPSTR)&code, 0, NULL ); - + if (escape.gl_drawable) ExtEscape( ctx->hdc, X11DRV_ESCAPE, sizeof(escape), (LPSTR)&escape, 0, NULL ); return TRUE; } @@ -3165,7 +3190,11 @@ static INT glxdrv_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_d } break; case X11DRV_FLUSH_GL_DRAWABLE: - flush_gl_drawable( physdev ); + if (in_count >= sizeof(struct x11drv_escape_flush_gl_drawable)) + { + const struct x11drv_escape_flush_gl_drawable *data = in_data; + flush_gl_drawable( physdev, data->gl_drawable ); + } return TRUE; default: break; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 7d6ee68..1f286da 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -291,6 +291,12 @@ struct x11drv_escape_get_drawable int pixel_format; /* internal GL pixel format */ }; +struct x11drv_escape_flush_gl_drawable +{ + enum x11drv_escape_codes code; /* escape code (X11DRV_FLUSH_GL_DRAWABLE) */ + Drawable gl_drawable; /* GL drawable */ +}; + /************************************************************************** * X11 USER driver */

1 0

Alexandre Julliard : winex11: Allow changing the pixel format of a window from a different thread.
by Alexandre Julliard Oct. 3, 2012

Oct. 3, 2012

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: Get rid of the OpenGL GDI driver.
by Alexandre Julliard Oct. 3, 2012

Oct. 3, 2012

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

Jacek Caban : mshtml: Simplify get_node_obj.
by Alexandre Julliard Oct. 2, 2012

Oct. 2, 2012

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: Defer event script evaluation.
by Alexandre Julliard Oct. 2, 2012

Oct. 2, 2012

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

Alistair Leslie-Hughes : scrrun: Correct Invoke parameter.
by Alexandre Julliard Oct. 2, 2012

Oct. 2, 2012

Module: wine Branch: master Commit: ea151639737f08ca76bcec0ae174296cacdc572c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea151639737f08ca76bcec0ae… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Sep 21 10:53:51 2012 +1000 scrrun: Correct Invoke parameter. --- dlls/scrrun/dictionary.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/scrrun/dictionary.c b/dlls/scrrun/dictionary.c index 7664af8..b75d23c 100644 --- a/dlls/scrrun/dictionary.c +++ b/dlls/scrrun/dictionary.c @@ -153,7 +153,7 @@ static HRESULT WINAPI dictionary_Invoke(IDictionary *iface, DISPID dispIdMember, hr = get_typeinfo(IDictionary_tid, &typeinfo); if(SUCCEEDED(hr)) { - hr = ITypeInfo_Invoke(typeinfo, &iface, dispIdMember, wFlags, + hr = ITypeInfo_Invoke(typeinfo, &This->IDictionary_iface, dispIdMember, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); ITypeInfo_Release(typeinfo); }

1 0

Alexandre Julliard : user32: Don' t redraw anything when WS_VISIBLE is toggled manually.
by Alexandre Julliard Oct. 2, 2012

Oct. 2, 2012

Module: wine Branch: master Commit: b30e84d58012a9a1ead70a8e32739765c31f2468 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b30e84d58012a9a1ead70a8e3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 2 19:52:31 2012 +0200 user32: Don't redraw anything when WS_VISIBLE is toggled manually. --- dlls/user32/win.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 023af02..0f487f7 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -769,7 +769,7 @@ ULONG WIN_SetStyle( HWND hwnd, ULONG set_bits, ULONG clear_bits ) RECT window_rect, client_rect; WIN_GetRectangles( hwnd, COORDS_PARENT, &window_rect, &client_rect ); set_window_pos( hwnd, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | - SWP_NOZORDER | SWP_NOACTIVATE | SWP_SHOWWINDOW, + SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW | SWP_SHOWWINDOW, &window_rect, &client_rect, NULL ); } @@ -2492,7 +2492,7 @@ LONG_PTR WIN_SetWindowLong( HWND hwnd, INT offset, UINT size, LONG_PTR newval, B RECT window_rect, client_rect; WIN_GetRectangles( hwnd, COORDS_PARENT, &window_rect, &client_rect ); set_window_pos( hwnd, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | - SWP_NOZORDER | SWP_NOACTIVATE | SWP_SHOWWINDOW, + SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW | SWP_SHOWWINDOW, &window_rect, &client_rect, NULL ); } SendMessageW( hwnd, WM_STYLECHANGED, offset, (LPARAM)&style );

1 0

Jacek Caban : mshtml: Moved getElementById implementation to separated function.
by Alexandre Julliard Oct. 2, 2012

Oct. 2, 2012

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: Added script 'for' and 'event' attributes tests.
by Alexandre Julliard Oct. 2, 2012

Oct. 2, 2012

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