June 2012 - Wine-commits - list.winehq.org

Austin English : po: Add missing url tag to nl.po.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 3a44c305a89f47754a336df45e45f1401490c605 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a44c305a89f47754a336df45… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jun 27 11:20:59 2012 -0700 po: Add missing url tag to nl.po. --- po/nl.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/nl.po b/po/nl.po index 5987d35..eb032f1 100644 --- a/po/nl.po +++ b/po/nl.po @@ -132,7 +132,7 @@ msgstr "" "en installeren.\n" "\n" "Noot: Het wordt aanbevolen om distributiepakketten te gebruiken. Zie <a " -"href=http://wiki.winehq.org/Gecko voor details." +"href=http://wiki.winehq.org/Gecko</a> voor details." #: appwiz.rc:106 appwiz.rc:121 msgid "&Install"

1 0

Dmitry Timoshkov : windowscodecs: Suppress libtiff warnings.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 6207d9642cc2586394e5ae69ebeb0e9dcd8d8c2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6207d9642cc2586394e5ae69e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 27 20:33:14 2012 +0900 windowscodecs: Suppress libtiff warnings. --- dlls/windowscodecs/tiffformat.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 5351098..64e23de 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -67,6 +67,8 @@ MAKE_FUNCPTR(TIFFReadEncodedStrip); MAKE_FUNCPTR(TIFFReadEncodedTile); MAKE_FUNCPTR(TIFFSetDirectory); MAKE_FUNCPTR(TIFFSetField); +MAKE_FUNCPTR(TIFFSetWarningHandler); +MAKE_FUNCPTR(TIFFSetWarningHandlerExt); MAKE_FUNCPTR(TIFFWriteDirectory); MAKE_FUNCPTR(TIFFWriteScanline); #undef MAKE_FUNCPTR @@ -99,6 +101,8 @@ static void *load_libtiff(void) LOAD_FUNCPTR(TIFFReadEncodedTile); LOAD_FUNCPTR(TIFFSetDirectory); LOAD_FUNCPTR(TIFFSetField); + LOAD_FUNCPTR(TIFFSetWarningHandler); + LOAD_FUNCPTR(TIFFSetWarningHandlerExt); LOAD_FUNCPTR(TIFFWriteDirectory); LOAD_FUNCPTR(TIFFWriteScanline); #undef LOAD_FUNCPTR @@ -107,6 +111,9 @@ static void *load_libtiff(void) result = libtiff_handle; + pTIFFSetWarningHandler(NULL); + pTIFFSetWarningHandlerExt(NULL); + LeaveCriticalSection(&init_tiff_cs); return result; }

1 0

Alexandre Julliard : wined3d: Always load wgl functions from opengl32.dll.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 94abcd532f1ae8e69ed8f4345d11f2ba1b3cc6d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94abcd532f1ae8e69ed8f4345… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 27 14:38:58 2012 +0200 wined3d: Always load wgl functions from opengl32.dll. --- dlls/wined3d/directx.c | 28 +++++++++++----------------- dlls/wined3d/wined3d_gl.h | 7 +++++-- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8fe7562..f576b33 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5374,18 +5374,25 @@ static BOOL InitAdapters(struct wined3d *wined3d) TRACE("Initializing adapters\n"); if(!mod_gl) { -#ifdef USE_WIN32_OPENGL -#define USE_GL_FUNC(pfn) pfn = (void*)GetProcAddress(mod_gl, #pfn); mod_gl = LoadLibraryA("opengl32.dll"); if(!mod_gl) { ERR("Can't load opengl32.dll!\n"); goto nogl_adapter; } + } + +#ifdef USE_WIN32_OPENGL + pwglGetProcAddress = (void*)GetProcAddress(mod_gl, "wglGetProcAddress"); +#define USE_GL_FUNC(pfn) pfn = (void*)GetProcAddress(mod_gl, #pfn); #else + /* To bypass the opengl32 thunks load wglGetProcAddress from gdi32 instead of opengl32 */ + pwglGetProcAddress = (void*)GetProcAddress(GetModuleHandleA("gdi32.dll"), "wglGetProcAddress"); #define USE_GL_FUNC(pfn) pfn = (void*)pwglGetProcAddress(#pfn); - /* To bypass the opengl32 thunks load wglGetProcAddress from gdi32 (glXGetProcAddress wrapper) instead of opengl32's */ - mod_gl = GetModuleHandleA("gdi32.dll"); #endif + + if(!pwglGetProcAddress) { + ERR("Unable to load wglGetProcAddress!\n"); + goto nogl_adapter; } /* Load WGL core functions from opengl32.dll */ @@ -5393,11 +5400,6 @@ static BOOL InitAdapters(struct wined3d *wined3d) WGL_FUNCS_GEN; #undef USE_WGL_FUNC - if(!pwglGetProcAddress) { - ERR("Unable to load wglGetProcAddress!\n"); - goto nogl_adapter; - } - /* Dynamically load all GL core functions */ GL_FUNCS_GEN; #undef USE_GL_FUNC @@ -5408,17 +5410,9 @@ static BOOL InitAdapters(struct wined3d *wined3d) #ifdef USE_WIN32_OPENGL wglFinish = (void*)GetProcAddress(mod_gl, "glFinish"); wglFlush = (void*)GetProcAddress(mod_gl, "glFlush"); - pwglDeleteContext = (void*)GetProcAddress(mod_gl, "wglDeleteContext"); - pwglGetCurrentContext = (void*)GetProcAddress(mod_gl, "wglGetCurrentContext"); - pwglGetCurrentDC = (void*)GetProcAddress(mod_gl, "wglGetCurrentDC"); - pwglShareLists = (void*)GetProcAddress(mod_gl, "wglShareLists"); #else wglFinish = (void*)pwglGetProcAddress("wglFinish"); wglFlush = (void*)pwglGetProcAddress("wglFlush"); - pwglDeleteContext = (void*)pwglGetProcAddress("wglDeleteContext"); - pwglGetCurrentContext = (void*)pwglGetProcAddress("wglGetCurrentContext"); - pwglGetCurrentDC = (void*)pwglGetProcAddress("wglGetCurrentDC"); - pwglShareLists = (void*)pwglGetProcAddress("wglShareLists"); #endif glEnableWINE = glEnable; diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 2ffb14b..fe156d0 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -1713,8 +1713,11 @@ BOOL (WINAPI *pwglShareLists)(HGLRC, HGLRC) DECLSPEC_HIDDEN; #define WGL_FUNCS_GEN \ USE_WGL_FUNC(wglCreateContext) \ - USE_WGL_FUNC(wglGetProcAddress) \ - USE_WGL_FUNC(wglMakeCurrent) + USE_WGL_FUNC(wglDeleteContext) \ + USE_WGL_FUNC(wglGetCurrentContext) \ + USE_WGL_FUNC(wglGetCurrentDC) \ + USE_WGL_FUNC(wglMakeCurrent) \ + USE_WGL_FUNC(wglShareLists) /* OpenGL extensions. */ enum wined3d_gl_extension

1 0

Alexandre Julliard : winex11: Add a GET_DRAWABLE escape to mirror the SET_DRAWABLE one.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 3e8b3d0f66493ea0d75d3816c50df283c98e6480 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e8b3d0f66493ea0d75d3816c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 27 13:57:26 2012 +0200 winex11: Add a GET_DRAWABLE escape to mirror the SET_DRAWABLE one. --- dlls/winex11.drv/init.c | 8 ++++++++ dlls/winex11.drv/opengl.c | 10 ++++++++++ dlls/winex11.drv/x11drv.h | 11 +++++++++++ 3 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 46204d8..cf4d10c 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -362,6 +362,14 @@ static INT X11DRV_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_d return TRUE; } break; + case X11DRV_GET_DRAWABLE: + if (out_count >= sizeof(struct x11drv_escape_get_drawable)) + { + struct x11drv_escape_get_drawable *data = out_data; + data->drawable = physDev->drawable; + return TRUE; + } + break; case X11DRV_START_EXPOSURES: wine_tsx11_lock(); XSetGraphicsExposures( gdi_display, physDev->gc, True ); diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index b49fd07..aa7faa8 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -3436,6 +3436,16 @@ static INT glxdrv_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_d dev->hdc, physdev->drawable, physdev->pixel_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->pixel_format; + data->gl_type = physdev->type; + data->gl_drawable = physdev->drawable; + data->pixmap = physdev->pixmap; + } + break; case X11DRV_FLUSH_GL_DRAWABLE: flush_gl_drawable( physdev ); return TRUE; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 1adecd8..df01379 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -289,6 +289,7 @@ extern void X11DRV_PALETTE_ComputeColorShifts(ColorShifts *shifts, unsigned long enum x11drv_escape_codes { X11DRV_SET_DRAWABLE, /* set current drawable for a DC */ + X11DRV_GET_DRAWABLE, /* get current drawable for a DC */ X11DRV_START_EXPOSURES, /* start graphics exposures */ X11DRV_END_EXPOSURES, /* end graphics exposures */ X11DRV_FLUSH_GL_DRAWABLE /* flush changes made to the gl drawable */ @@ -307,6 +308,16 @@ struct x11drv_escape_set_drawable enum dc_gl_type gl_type; /* type of GL device context */ }; +struct x11drv_escape_get_drawable +{ + enum x11drv_escape_codes code; /* escape code (X11DRV_GET_DRAWABLE) */ + Drawable drawable; /* X drawable */ + Drawable gl_drawable; /* GL drawable */ + Pixmap pixmap; /* Pixmap for a GLXPixmap gl_drawable */ + int pixel_format; /* internal GL pixel format */ + enum dc_gl_type gl_type; /* type of GL device context */ +}; + /************************************************************************** * X11 USER driver */

1 0

Alexandre Julliard : winex11: Use the GET_DRAWABLE escape to implement wglMakeCurrent.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 7f4d3022d0f5f647bd4d9e049fadd4d8c0282235 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f4d3022d0f5f647bd4d9e049… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 27 13:58:23 2012 +0200 winex11: Use the GET_DRAWABLE escape to implement wglMakeCurrent. --- dlls/winex11.drv/opengl.c | 71 +++++++++++++++++--------------------------- 1 files changed, 28 insertions(+), 43 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index aa7faa8..9ae143e 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -631,26 +631,6 @@ static int describeContext(Wine_GLContext* ctx) { return ctx_vis_id; } -static BOOL describeDrawable( struct glx_physdev *physdev ) -{ - int tmp; - WineGLPixelFormat *fmt; - int fmt_count = 0; - - fmt = ConvertPixelFormatWGLtoGLX(gdi_display, physdev->pixel_format, TRUE /* Offscreen */, &fmt_count); - if(!fmt) return FALSE; - - TRACE(" HDC %p has:\n", physdev->dev.hdc); - TRACE(" - iPixelFormat %d\n", fmt->iPixelFormat); - TRACE(" - Drawable %lx\n", physdev->drawable); - TRACE(" - FBCONFIG_ID 0x%x\n", fmt->fmt_id); - - pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_VISUAL_ID, &tmp); - TRACE(" - VISUAL_ID 0x%x\n", tmp); - - return TRUE; -} - static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, Wine_GLPBuffer* pbuf) { int nAttribs = 0; unsigned cur = 0; @@ -1584,13 +1564,13 @@ static PROC glxdrv_wglGetProcAddress(LPCSTR lpszProc) return NULL; } -static GLXPixmap get_context_pixmap( struct glx_physdev *physdev, struct wine_glcontext *ctx ) +static GLXPixmap get_context_pixmap( HDC hdc, struct wine_glcontext *ctx ) { if (!ctx->pixmap) { BITMAP bmp; - GetObjectW( GetCurrentObject( physdev->dev.hdc, OBJ_BITMAP ), sizeof(bmp), &bmp ); + GetObjectW( GetCurrentObject( hdc, OBJ_BITMAP ), sizeof(bmp), &bmp ); wine_tsx11_lock(); ctx->pixmap = XCreatePixmap( gdi_display, root_window, @@ -1610,14 +1590,13 @@ static GLXPixmap get_context_pixmap( struct glx_physdev *physdev, struct wine_gl */ static BOOL glxdrv_wglMakeCurrent(PHYSDEV dev, HGLRC hglrc) { - struct glx_physdev *physdev = get_glxdrv_dev( dev ); + HDC hdc = dev->hdc; BOOL ret; Wine_GLContext *prev_ctx = NtCurrentTeb()->glContext; Wine_GLContext *ctx = (Wine_GLContext *) hglrc; + struct x11drv_escape_get_drawable escape; - TRACE("(%p,%p)\n", dev->hdc, hglrc); - - if (!has_opengl()) return FALSE; + TRACE("(%p,%p)\n", hdc, hglrc); if (hglrc == NULL) { @@ -1627,36 +1606,42 @@ static BOOL glxdrv_wglMakeCurrent(PHYSDEV dev, HGLRC hglrc) ret = pglXMakeCurrent(gdi_display, None, NULL); wine_tsx11_unlock(); NtCurrentTeb()->glContext = NULL; + return TRUE; } - else if (!physdev->pixel_format) + + escape.code = X11DRV_GET_DRAWABLE; + if (!ExtEscape( hdc, X11DRV_ESCAPE, sizeof(escape.code), (LPCSTR)&escape.code, + sizeof(escape), (LPSTR)&escape )) + return FALSE; + + if (!escape.pixel_format) { WARN("Trying to use an invalid drawable\n"); SetLastError(ERROR_INVALID_HANDLE); return FALSE; } - else if (ctx->fmt->iPixelFormat != physdev->pixel_format) + if (ctx->fmt->iPixelFormat != escape.pixel_format) { WARN( "mismatched pixel format hdc %p %u ctx %p %u\n", - dev->hdc, physdev->pixel_format, ctx, ctx->fmt->iPixelFormat ); + hdc, escape.pixel_format, ctx, ctx->fmt->iPixelFormat ); SetLastError( ERROR_INVALID_PIXEL_FORMAT ); return FALSE; } else { - Drawable drawable = physdev->drawable; - - if (physdev->type == DC_GL_BITMAP) drawable = get_context_pixmap( physdev, ctx ); + if (escape.gl_type == DC_GL_BITMAP) escape.drawable = get_context_pixmap( hdc, ctx ); wine_tsx11_lock(); if (TRACE_ON(wgl)) { - describeDrawable( physdev ); + int vis_id; + pglXGetFBConfigAttrib(gdi_display, ctx->fmt->fbconfig, GLX_VISUAL_ID, &vis_id); describeContext(ctx); + TRACE("hdc %p drawable %lx fmt %u vis %x ctx %p\n", hdc, + escape.drawable, escape.pixel_format, vis_id, ctx->ctx); } - TRACE(" make current for drawable %lx, ctx %p\n", drawable, ctx->ctx); - - ret = pglXMakeCurrent(gdi_display, drawable, ctx->ctx); + ret = pglXMakeCurrent(gdi_display, escape.drawable, ctx->ctx); if (ret) { @@ -1665,13 +1650,13 @@ static BOOL glxdrv_wglMakeCurrent(PHYSDEV dev, HGLRC hglrc) ctx->has_been_current = TRUE; ctx->tid = GetCurrentThreadId(); - ctx->hdc = dev->hdc; - ctx->read_hdc = dev->hdc; - ctx->drawables[0] = drawable; - ctx->drawables[1] = drawable; + ctx->hdc = hdc; + ctx->read_hdc = hdc; + ctx->drawables[0] = escape.drawable; + ctx->drawables[1] = escape.drawable; ctx->refresh_drawables = FALSE; - if (physdev->type == DC_GL_BITMAP) pglDrawBuffer(GL_FRONT_LEFT); + if (escape.gl_type == DC_GL_BITMAP) pglDrawBuffer(GL_FRONT_LEFT); } else SetLastError(ERROR_INVALID_HANDLE); @@ -1720,8 +1705,8 @@ static BOOL glxdrv_wglMakeContextCurrentARB( PHYSDEV draw_dev, PHYSDEV read_dev, if (!pglXMakeContextCurrent) return FALSE; - if (draw_physdev->type == DC_GL_BITMAP) draw_drawable = get_context_pixmap( draw_physdev, ctx ); - if (read_physdev->type == DC_GL_BITMAP) read_drawable = get_context_pixmap( read_physdev, ctx ); + if (draw_physdev->type == DC_GL_BITMAP) draw_drawable = get_context_pixmap( draw_physdev->dev.hdc, ctx ); + if (read_physdev->type == DC_GL_BITMAP) read_drawable = get_context_pixmap( read_physdev->dev.hdc, ctx ); wine_tsx11_lock(); ret = pglXMakeContextCurrent(gdi_display, draw_drawable, read_drawable, ctx->ctx);

1 0

Jacek Caban : mshtml: Get rid of no longer needed unk_ref from HTMLElementCollection.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 829f24c1c74fe918a96aac9776667909c551a6e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=829f24c1c74fe918a96aac977… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 27 10:55:48 2012 +0200 mshtml: Get rid of no longer needed unk_ref from HTMLElementCollection. --- dlls/mshtml/htmldoc.c | 10 +++++----- dlls/mshtml/htmldoc3.c | 3 +-- dlls/mshtml/htmlelem.c | 3 +-- dlls/mshtml/htmlelem2.c | 3 +-- dlls/mshtml/htmlelemcol.c | 28 +++++++++++----------------- dlls/mshtml/htmltable.c | 3 +-- dlls/mshtml/htmltablerow.c | 2 +- dlls/mshtml/mshtml_private.h | 4 ++-- 8 files changed, 23 insertions(+), 33 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 19b73e5..6016630 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -213,7 +213,7 @@ static HRESULT WINAPI HTMLDocument_get_images(IHTMLDocument2 *iface, IHTMLElemen } if(nscoll) { - *p = create_collection_from_htmlcol(This->doc_node, (IUnknown*)&This->IHTMLDocument2_iface, nscoll); + *p = create_collection_from_htmlcol(This->doc_node, nscoll); nsIDOMElement_Release(nscoll); } @@ -245,7 +245,7 @@ static HRESULT WINAPI HTMLDocument_get_applets(IHTMLDocument2 *iface, IHTMLEleme } if(nscoll) { - *p = create_collection_from_htmlcol(This->doc_node, (IUnknown*)&This->IHTMLDocument2_iface, nscoll); + *p = create_collection_from_htmlcol(This->doc_node, nscoll); nsIDOMElement_Release(nscoll); } @@ -277,7 +277,7 @@ static HRESULT WINAPI HTMLDocument_get_links(IHTMLDocument2 *iface, IHTMLElement } if(nscoll) { - *p = create_collection_from_htmlcol(This->doc_node, (IUnknown*)&This->IHTMLDocument2_iface, nscoll); + *p = create_collection_from_htmlcol(This->doc_node, nscoll); nsIDOMElement_Release(nscoll); } @@ -309,7 +309,7 @@ static HRESULT WINAPI HTMLDocument_get_forms(IHTMLDocument2 *iface, IHTMLElement } if(nscoll) { - *p = create_collection_from_htmlcol(This->doc_node, (IUnknown*)&This->IHTMLDocument2_iface, nscoll); + *p = create_collection_from_htmlcol(This->doc_node, nscoll); nsIDOMElement_Release(nscoll); } @@ -341,7 +341,7 @@ static HRESULT WINAPI HTMLDocument_get_anchors(IHTMLDocument2 *iface, IHTMLEleme } if(nscoll) { - *p = create_collection_from_htmlcol(This->doc_node, (IUnknown*)&This->IHTMLDocument2_iface, nscoll); + *p = create_collection_from_htmlcol(This->doc_node, nscoll); nsIDOMElement_Release(nscoll); } diff --git a/dlls/mshtml/htmldoc3.c b/dlls/mshtml/htmldoc3.c index eb19f8c..f930bcd 100644 --- a/dlls/mshtml/htmldoc3.c +++ b/dlls/mshtml/htmldoc3.c @@ -572,8 +572,7 @@ static HRESULT WINAPI HTMLDocument3_getElementsByTagName(IHTMLDocument3 *iface, return E_FAIL; } - *pelColl = create_collection_from_nodelist(This->doc_node, - (IUnknown*)&This->IHTMLDocument3_iface, nslist); + *pelColl = create_collection_from_nodelist(This->doc_node, nslist); nsIDOMNodeList_Release(nslist); return S_OK; diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 5f59385..1556cc7 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1412,8 +1412,7 @@ static HRESULT WINAPI HTMLElement_get_children(IHTMLElement *iface, IDispatch ** return E_FAIL; } - *p = (IDispatch*)create_collection_from_nodelist(This->node.doc, - (IUnknown*)&This->IHTMLElement_iface, nsnode_list); + *p = (IDispatch*)create_collection_from_nodelist(This->node.doc, nsnode_list); nsIDOMNodeList_Release(nsnode_list); return S_OK; diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index 9362805..4550681 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -1252,8 +1252,7 @@ static HRESULT WINAPI HTMLElement2_getElementsByTagName(IHTMLElement2 *iface, BS return E_FAIL; } - *pelColl = create_collection_from_nodelist(This->node.doc, - (IUnknown*)&This->IHTMLElement_iface, nslist); + *pelColl = create_collection_from_nodelist(This->node.doc, nslist); nsIDOMNodeList_Release(nslist); return S_OK; } diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index 76da651..27811f7 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -35,7 +35,6 @@ typedef struct { DispatchEx dispex; IHTMLElementCollection IHTMLElementCollection_iface; - IUnknown *ref_unk; HTMLElement **elems; DWORD len; @@ -54,8 +53,7 @@ static inline HTMLElement *elem_from_HTMLDOMNode(HTMLDOMNode *iface) return CONTAINING_RECORD(iface, HTMLElement, node); } -static IHTMLElementCollection *HTMLElementCollection_Create(IUnknown *ref_unk, - HTMLElement **elems, DWORD len); +static IHTMLElementCollection *HTMLElementCollection_Create(HTMLElement **elems, DWORD len); static void elem_vector_add(elem_vector_t *buf, HTMLElement *elem) { @@ -141,9 +139,9 @@ static ULONG WINAPI HTMLElementCollection_Release(IHTMLElementCollection *iface) for(i=0; i < This->len; i++) node_release(&This->elems[i]->node); - IUnknown_Release(This->ref_unk); - release_dispex(&This->dispex); heap_free(This->elems); + + release_dispex(&This->dispex); heap_free(This); } @@ -331,7 +329,7 @@ static HRESULT WINAPI HTMLElementCollection_item(IHTMLElementCollection *iface, if(buf.len > 1) { elem_vector_normalize(&buf); - *pdisp = (IDispatch*)HTMLElementCollection_Create(This->ref_unk, buf.buf, buf.len); + *pdisp = (IDispatch*)HTMLElementCollection_Create(buf.buf, buf.len); }else { if(buf.len == 1) { /* Already AddRef-ed */ @@ -393,7 +391,7 @@ static HRESULT WINAPI HTMLElementCollection_tags(IHTMLElementCollection *iface, TRACE("fount %d tags\n", buf.len); - *pdisp = (IDispatch*)HTMLElementCollection_Create(This->ref_unk, buf.buf, buf.len); + *pdisp = (IDispatch*)HTMLElementCollection_Create(buf.buf, buf.len); return S_OK; } @@ -547,10 +545,10 @@ IHTMLElementCollection *create_all_collection(HTMLDOMNode *node, BOOL include_ro create_all_list(node->doc, node, &buf); elem_vector_normalize(&buf); - return HTMLElementCollection_Create((IUnknown*)&node->IHTMLDOMNode_iface, buf.buf, buf.len); + return HTMLElementCollection_Create(buf.buf, buf.len); } -IHTMLElementCollection *create_collection_from_nodelist(HTMLDocumentNode *doc, IUnknown *unk, nsIDOMNodeList *nslist) +IHTMLElementCollection *create_collection_from_nodelist(HTMLDocumentNode *doc, nsIDOMNodeList *nslist) { PRUint32 length = 0, i; HTMLDOMNode *node; @@ -582,10 +580,10 @@ IHTMLElementCollection *create_collection_from_nodelist(HTMLDocumentNode *doc, I buf.buf = NULL; } - return HTMLElementCollection_Create(unk, buf.buf, buf.len); + return HTMLElementCollection_Create(buf.buf, buf.len); } -IHTMLElementCollection *create_collection_from_htmlcol(HTMLDocumentNode *doc, IUnknown *unk, nsIDOMHTMLCollection *nscol) +IHTMLElementCollection *create_collection_from_htmlcol(HTMLDocumentNode *doc, nsIDOMHTMLCollection *nscol) { PRUint32 length = 0, i; elem_vector_t buf; @@ -617,11 +615,10 @@ IHTMLElementCollection *create_collection_from_htmlcol(HTMLDocumentNode *doc, IU return NULL; } - return HTMLElementCollection_Create(unk, buf.buf, buf.len); + return HTMLElementCollection_Create(buf.buf, buf.len); } -static IHTMLElementCollection *HTMLElementCollection_Create(IUnknown *ref_unk, - HTMLElement **elems, DWORD len) +static IHTMLElementCollection *HTMLElementCollection_Create(HTMLElement **elems, DWORD len) { HTMLElementCollection *ret = heap_alloc_zero(sizeof(HTMLElementCollection)); @@ -633,9 +630,6 @@ static IHTMLElementCollection *HTMLElementCollection_Create(IUnknown *ref_unk, init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLElementCollection_iface, &HTMLElementCollection_dispex); - IUnknown_AddRef(ref_unk); - ret->ref_unk = ref_unk; - TRACE("ret=%p len=%d\n", ret, len); return &ret->IHTMLElementCollection_iface; diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index 975e53c..79223be 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -300,8 +300,7 @@ static HRESULT WINAPI HTMLTable_get_rows(IHTMLTable *iface, IHTMLElementCollecti return E_FAIL; } - *p = create_collection_from_htmlcol(This->element.node.doc, (IUnknown*)&This->IHTMLTable_iface, - nscol); + *p = create_collection_from_htmlcol(This->element.node.doc, nscol); nsIDOMHTMLCollection_Release(nscol); return S_OK; diff --git a/dlls/mshtml/htmltablerow.c b/dlls/mshtml/htmltablerow.c index c9b21ec..db5c7f2 100644 --- a/dlls/mshtml/htmltablerow.c +++ b/dlls/mshtml/htmltablerow.c @@ -210,7 +210,7 @@ static HRESULT WINAPI HTMLTableRow_get_cells(IHTMLTableRow *iface, IHTMLElementC return E_FAIL; } - *p = create_collection_from_htmlcol(This->element.node.doc, (IUnknown*)&This->IHTMLTableRow_iface, nscol); + *p = create_collection_from_htmlcol(This->element.node.doc, nscol); nsIDOMHTMLCollection_Release(nscol); return S_OK; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 7d0fef1..f050411 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -862,8 +862,8 @@ HRESULT search_window_props(HTMLInnerWindow*,BSTR,DWORD,DISPID*) DECLSPEC_HIDDEN HRESULT wrap_iface(IUnknown*,IUnknown*,IUnknown**) DECLSPEC_HIDDEN; IHTMLElementCollection *create_all_collection(HTMLDOMNode*,BOOL) DECLSPEC_HIDDEN; -IHTMLElementCollection *create_collection_from_nodelist(HTMLDocumentNode*,IUnknown*,nsIDOMNodeList*) DECLSPEC_HIDDEN; -IHTMLElementCollection *create_collection_from_htmlcol(HTMLDocumentNode*,IUnknown*,nsIDOMHTMLCollection*) DECLSPEC_HIDDEN; +IHTMLElementCollection *create_collection_from_nodelist(HTMLDocumentNode*,nsIDOMNodeList*) DECLSPEC_HIDDEN; +IHTMLElementCollection *create_collection_from_htmlcol(HTMLDocumentNode*,nsIDOMHTMLCollection*) DECLSPEC_HIDDEN; /* commands */ typedef struct {

1 0

Jacek Caban : mshtml: Share nsform reference with nsnode.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 6ac375d3acbc9711ef1ebac14a4b8986eadbbbae URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ac375d3acbc9711ef1ebac14… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 27 10:56:00 2012 +0200 mshtml: Share nsform reference with nsnode. --- dlls/mshtml/htmlform.c | 24 +++++++----------------- 1 files changed, 7 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index be2f76c..ce931a2 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -505,16 +506,6 @@ static HRESULT HTMLFormElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) return HTMLElement_QI(&This->element.node, riid, ppv); } -static void HTMLFormElement_destructor(HTMLDOMNode *iface) -{ - HTMLFormElement *This = impl_from_HTMLDOMNode(iface); - - if(This->nsform) - nsIDOMHTMLFormElement_Release(This->nsform); - - HTMLElement_destructor(&This->element.node); -} - static HRESULT HTMLFormElement_get_dispid(HTMLDOMNode *iface, BSTR name, DWORD grfdex, DISPID *pid) { @@ -639,7 +630,7 @@ static HRESULT HTMLFormElement_invoke(HTMLDOMNode *iface, static const NodeImplVtbl HTMLFormElementImplVtbl = { HTMLFormElement_QI, - HTMLFormElement_destructor, + HTMLElement_destructor, HTMLElement_clone, HTMLElement_get_attr_col, NULL, @@ -678,14 +669,13 @@ HRESULT HTMLFormElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, ret->IHTMLFormElement_iface.lpVtbl = &HTMLFormElementVtbl; ret->element.node.vtbl = &HTMLFormElementImplVtbl; + HTMLElement_Init(&ret->element, doc, nselem, &HTMLFormElement_dispex); + nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLFormElement, (void**)&ret->nsform); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIDOMHTMLFormElement interface: %08x\n", nsres); - heap_free(ret); - return E_FAIL; - } - HTMLElement_Init(&ret->element, doc, nselem, &HTMLFormElement_dispex); + /* Share the reference with nsnode */ + assert(nsres == NS_OK && (nsIDOMNode*)ret->nsform == ret->element.node.nsnode); + nsIDOMNode_Release(ret->element.node.nsnode); *elem = &ret->element; return S_OK;

1 0

Jacek Caban : mshtml: Share nsframe and nsiframe references with nsnode.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 39005645b89ca7357c969abc270f8ecf34bbd0e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39005645b89ca7357c969abc2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 27 10:56:14 2012 +0200 mshtml: Share nsframe and nsiframe references with nsnode. --- dlls/mshtml/htmlframebase.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlframebase.c b/dlls/mshtml/htmlframebase.c index b06534e..a5344ec 100644 --- a/dlls/mshtml/htmlframebase.c +++ b/dlls/mshtml/htmlframebase.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -522,11 +523,6 @@ void HTMLFrameBase_destructor(HTMLFrameBase *This) if(This->content_window) This->content_window->frame_element = NULL; - if(This->nsframe) - nsIDOMHTMLFrameElement_Release(This->nsframe); - if(This->nsiframe) - nsIDOMHTMLIFrameElement_Release(This->nsiframe); - HTMLElement_destructor(&This->element.node); } @@ -542,9 +538,14 @@ void HTMLFrameBase_Init(HTMLFrameBase *This, HTMLDocumentNode *doc, nsIDOMHTMLEl nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLFrameElement, (void**)&This->nsframe); if(NS_FAILED(nsres)) { + This->nsframe = NULL; nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLIFrameElement, (void**)&This->nsiframe); - if(NS_FAILED(nsres)) - ERR("Could not get nsIDOMHTML[I]Frame interface\n"); - }else + assert(nsres == NS_OK && (nsIDOMNode*)This->nsiframe == This->element.node.nsnode); + }else { + assert((nsIDOMNode*)This->nsframe == This->element.node.nsnode); This->nsiframe = NULL; + } + + /* Share the reference with nsnode */ + nsIDOMNode_Release(This->element.node.nsnode); }

1 0

Jacek Caban : mshtml: Share nstable reference with nsnode.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: db244a8051419857e9ae9f4e29cfe3e4e23c532f URL: http://source.winehq.org/git/wine.git/?a=commit;h=db244a8051419857e9ae9f4e2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 27 10:56:30 2012 +0200 mshtml: Share nstable reference with nsnode. --- dlls/mshtml/htmltable.c | 25 ++++++++----------------- 1 files changed, 8 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index 79223be..c174634 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -741,19 +742,9 @@ static HRESULT HTMLTable_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) return HTMLElement_QI(&This->element.node, riid, ppv); } -static void HTMLTable_destructor(HTMLDOMNode *iface) -{ - HTMLTable *This = impl_from_HTMLDOMNode(iface); - - if(This->nstable) - nsIDOMHTMLTableElement_Release(This->nstable); - - HTMLElement_destructor(&This->element.node); -} - static const NodeImplVtbl HTMLTableImplVtbl = { HTMLTable_QI, - HTMLTable_destructor, + HTMLElement_destructor, HTMLElement_clone, HTMLElement_get_attr_col }; @@ -783,14 +774,14 @@ HRESULT HTMLTable_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, HTMLE ret->element.node.vtbl = &HTMLTableImplVtbl; ret->IHTMLTable_iface.lpVtbl = &HTMLTableVtbl; + HTMLElement_Init(&ret->element, doc, nselem, &HTMLTable_dispex); + nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLTableElement, (void**)&ret->nstable); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIDOMHTMLTableElement iface: %08x\n", nsres); - heap_free(ret); - return E_FAIL; - } - HTMLElement_Init(&ret->element, doc, nselem, &HTMLTable_dispex); + /* Share the reference with nsnode */ + assert(nsres == NS_OK && (nsIDOMNode*)ret->nstable == ret->element.node.nsnode); + nsIDOMNode_Release(ret->element.node.nsnode); + ConnectionPoint_Init(&ret->cp, &ret->element.cp_container, &DIID_HTMLTableEvents, NULL); *elem = &ret->element;

1 0

Jacek Caban : mshtml: Share nsdoc reference with nsnode.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: caada38f0484aaab18acbe128c46415803683725 URL: http://source.winehq.org/git/wine.git/?a=commit;h=caada38f0484aaab18acbe128… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 27 10:56:44 2012 +0200 mshtml: Share nsdoc reference with nsnode. --- dlls/mshtml/htmldoc.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 6016630..5e98cea 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -20,6 +20,7 @@ #include <stdarg.h> #include <stdio.h> +#include <assert.h> #define COBJMACROS @@ -2084,10 +2085,8 @@ static void HTMLDocumentNode_destructor(HTMLDOMNode *iface) while(!list_empty(&This->plugin_hosts)) detach_plugin_host(LIST_ENTRY(list_head(&This->plugin_hosts), PluginHost, entry)); - if(This->nsdoc) { + if(This->nsdoc) release_document_mutation(This); - nsIDOMHTMLDocument_Release(This->nsdoc); - } heap_free(This->event_vector); destroy_htmldoc(&This->basedoc); @@ -2236,12 +2235,15 @@ HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument *nsdoc, HTMLDocumentObj *doc_ob if(!doc_obj->basedoc.window || window == doc_obj->basedoc.window) doc->basedoc.cp_container.forward_container = &doc_obj->basedoc.cp_container; - nsIDOMHTMLDocument_AddRef(nsdoc); + HTMLDOMNode_Init(doc, &doc->node, (nsIDOMNode*)nsdoc); + + /* No AddRef, share the reference with nsnode */ + assert((nsIDOMNode*)nsdoc == doc->node.nsnode); doc->nsdoc = nsdoc; + init_document_mutation(doc); doc_init_events(doc); - HTMLDOMNode_Init(doc, &doc->node, (nsIDOMNode*)nsdoc); doc->node.vtbl = &HTMLDocumentNodeImplVtbl; doc->node.cp_container = &doc->basedoc.cp_container;

1 0