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

Jacek Caban : mshtml: Return referenced instances from node constructors.
by Alexandre Julliard June 26, 2012

June 26, 2012

Module: wine Branch: master Commit: a8d0efc7d6ff001b671e379c6c312257261a4b0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8d0efc7d6ff001b671e379c6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 26 12:33:35 2012 +0200 mshtml: Return referenced instances from node constructors. --- dlls/mshtml/htmldoc.c | 2 -- dlls/mshtml/htmldoc3.c | 1 - dlls/mshtml/htmldoc5.c | 1 - dlls/mshtml/htmlelem.c | 1 - dlls/mshtml/htmlimg.c | 1 + dlls/mshtml/htmlnode.c | 20 ++++++-------------- dlls/mshtml/htmltextnode.c | 8 +------- 7 files changed, 8 insertions(+), 26 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index ede856b..19b73e5 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1037,7 +1037,6 @@ static HRESULT WINAPI HTMLDocument_createElement(IHTMLDocument2 *iface, BSTR eTa return hres; *newElem = &elem->IHTMLElement_iface; - IHTMLElement_AddRef(&elem->IHTMLElement_iface); return S_OK; } @@ -2262,7 +2261,6 @@ HRESULT create_document_fragment(nsIDOMNode *nsnode, HTMLDocumentNode *doc_node, doc_frag->node.vtbl = &HTMLDocumentFragmentImplVtbl; doc_frag->node.cp_container = &doc_frag->basedoc.cp_container; - htmldoc_addref(&doc_frag->basedoc); *ret = doc_frag; return S_OK; } diff --git a/dlls/mshtml/htmldoc3.c b/dlls/mshtml/htmldoc3.c index 3e7c7b7..eb19f8c 100644 --- a/dlls/mshtml/htmldoc3.c +++ b/dlls/mshtml/htmldoc3.c @@ -135,7 +135,6 @@ static HRESULT WINAPI HTMLDocument3_createTextNode(IHTMLDocument3 *iface, BSTR t return hres; *newTextNode = &node->IHTMLDOMNode_iface; - IHTMLDOMNode_AddRef(&node->IHTMLDOMNode_iface); return S_OK; } diff --git a/dlls/mshtml/htmldoc5.c b/dlls/mshtml/htmldoc5.c index 587d75b..2377b7a 100644 --- a/dlls/mshtml/htmldoc5.c +++ b/dlls/mshtml/htmldoc5.c @@ -155,7 +155,6 @@ static HRESULT WINAPI HTMLDocument5_createComment(IHTMLDocument5 *iface, BSTR bs return hres; *ppRetNode = &elem->node.IHTMLDOMNode_iface; - IHTMLDOMNode_AddRef(&elem->node.IHTMLDOMNode_iface); return S_OK; } diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index b0e589e..10d5108 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1618,7 +1618,6 @@ HRESULT HTMLElement_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HTMLDOMNode ** } } - IHTMLElement_AddRef(&new_elem->IHTMLElement_iface); *ret = &new_elem->node; return S_OK; } diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index adb40d5..5d1c665 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -841,6 +841,7 @@ static HRESULT WINAPI HTMLImageElementFactory_create(IHTMLImageElementFactory *i hres = IHTMLElement_QueryInterface(&elem->IHTMLElement_iface, &IID_IHTMLImgElement, (void**)&img); + IHTMLElement_Release(&elem->IHTMLElement_iface); if(FAILED(hres)) { ERR("IHTMLElement_QueryInterface failed: 0x%08x\n", hres); return hres; diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 9574fcb..5124c1c 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1007,14 +1007,7 @@ void HTMLDOMNode_destructor(HTMLDOMNode *This) static HRESULT HTMLDOMNode_clone(HTMLDOMNode *This, nsIDOMNode *nsnode, HTMLDOMNode **ret) { - HRESULT hres; - - hres = create_node(This->doc, nsnode, ret); - if(FAILED(hres)) - return hres; - - IHTMLDOMNode_AddRef(&(*ret)->IHTMLDOMNode_iface); - return S_OK; + return create_node(This->doc, nsnode, ret); } static const NodeImplVtbl HTMLDOMNodeImplVtbl = { @@ -1027,9 +1020,12 @@ void HTMLDOMNode_Init(HTMLDocumentNode *doc, HTMLDOMNode *node, nsIDOMNode *nsno { node->IHTMLDOMNode_iface.lpVtbl = &HTMLDOMNodeVtbl; node->IHTMLDOMNode2_iface.lpVtbl = &HTMLDOMNode2Vtbl; - node->ref = 1; + node->ref = 2; node->doc = doc; + if(&doc->node != node) + node->ref++; /* one extra for list entry reference */ + if(nsnode) nsIDOMNode_AddRef(nsnode); node->nsnode = nsnode; @@ -1096,7 +1092,6 @@ static HRESULT create_node(HTMLDocumentNode *doc, nsIDOMNode *nsnode, HTMLDOMNod HRESULT get_node(HTMLDocumentNode *This, nsIDOMNode *nsnode, BOOL create, HTMLDOMNode **ret) { HTMLDOMNode *iter = This->nodes; - HRESULT hres; while(iter) { if(iter->nsnode == nsnode) @@ -1111,10 +1106,7 @@ HRESULT get_node(HTMLDocumentNode *This, nsIDOMNode *nsnode, BOOL create, HTMLDO return S_OK; } - hres = create_node(This, nsnode, ret); - if(SUCCEEDED(hres)) - IHTMLDOMNode_AddRef(&(*ret)->IHTMLDOMNode_iface); - return hres; + return create_node(This, nsnode, ret); } /* diff --git a/dlls/mshtml/htmltextnode.c b/dlls/mshtml/htmltextnode.c index 58422de..7663810 100644 --- a/dlls/mshtml/htmltextnode.c +++ b/dlls/mshtml/htmltextnode.c @@ -191,14 +191,8 @@ static void HTMLDOMTextNode_destructor(HTMLDOMNode *iface) static HRESULT HTMLDOMTextNode_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HTMLDOMNode **ret) { HTMLDOMTextNode *This = impl_from_HTMLDOMNode(iface); - HRESULT hres; - hres = HTMLDOMTextNode_Create(This->node.doc, nsnode, ret); - if(FAILED(hres)) - return hres; - - IHTMLDOMNode_AddRef(&(*ret)->IHTMLDOMNode_iface); - return S_OK; + return HTMLDOMTextNode_Create(This->node.doc, nsnode, ret); } static const NodeImplVtbl HTMLDOMTextNodeImplVtbl = {

1 0

Jacek Caban : mshtml: Share nsIDOMText reference with nsIDOMNode.
by Alexandre Julliard June 26, 2012

June 26, 2012

Module: wine Branch: master Commit: cf35bbd2618d8e664d1e16dcf2e8825be060c514 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf35bbd2618d8e664d1e16dcf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 26 12:34:06 2012 +0200 mshtml: Share nsIDOMText reference with nsIDOMNode. --- dlls/mshtml/htmltextnode.c | 27 +++++++++------------------ 1 files changed, 9 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/htmltextnode.c b/dlls/mshtml/htmltextnode.c index 7663810..1be260f 100644 --- a/dlls/mshtml/htmltextnode.c +++ b/dlls/mshtml/htmltextnode.c @@ -18,6 +18,7 @@ #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -178,16 +179,6 @@ static HRESULT HTMLDOMTextNode_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) return S_OK; } -static void HTMLDOMTextNode_destructor(HTMLDOMNode *iface) -{ - HTMLDOMTextNode *This = impl_from_HTMLDOMNode(iface); - - if(This->nstext) - IHTMLDOMTextNode_Release(This->nstext); - - HTMLDOMNode_destructor(&This->node); -} - static HRESULT HTMLDOMTextNode_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HTMLDOMNode **ret) { HTMLDOMTextNode *This = impl_from_HTMLDOMNode(iface); @@ -197,7 +188,7 @@ static HRESULT HTMLDOMTextNode_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HTM static const NodeImplVtbl HTMLDOMTextNodeImplVtbl = { HTMLDOMTextNode_QI, - HTMLDOMTextNode_destructor, + HTMLDOMNode_destructor, HTMLDOMTextNode_clone }; @@ -226,17 +217,17 @@ HRESULT HTMLDOMTextNode_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode, HTMLDO ret->node.vtbl = &HTMLDOMTextNodeImplVtbl; ret->IHTMLDOMTextNode_iface.lpVtbl = &HTMLDOMTextNodeVtbl; - nsres = nsIDOMNode_QueryInterface(nsnode, &IID_nsIDOMText, (void**)&ret->nstext); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIDOMText iface: %08x\n", nsres); - heap_free(ret); - return E_FAIL; - } - init_dispex(&ret->node.dispex, (IUnknown*)&ret->IHTMLDOMTextNode_iface, &HTMLDOMTextNode_dispex); + HTMLDOMNode_Init(doc, &ret->node, nsnode); + nsres = nsIDOMNode_QueryInterface(nsnode, &IID_nsIDOMText, (void**)&ret->nstext); + assert(nsres == NS_OK && (nsIDOMNode*)ret->nstext == ret->node.nsnode); + + /* Share reference with nsnode */ + nsIDOMNode_Release(ret->node.nsnode); + *node = &ret->node; return S_OK; }

1 0

Jacek Caban : mshtml: Call HTMLDOMNode_Init directly in HTMLCommentElement_Create.
by Alexandre Julliard June 26, 2012

June 26, 2012

Module: wine Branch: master Commit: 8c396ed437eb907a2251d5120e50243f3e6c72de URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c396ed437eb907a2251d5120… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 26 12:34:21 2012 +0200 mshtml: Call HTMLDOMNode_Init directly in HTMLCommentElement_Create. --- dlls/mshtml/htmlcomment.c | 4 +--- dlls/mshtml/htmlelem.c | 3 ++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlcomment.c b/dlls/mshtml/htmlcomment.c index 525f0db..d552b30 100644 --- a/dlls/mshtml/htmlcomment.c +++ b/dlls/mshtml/htmlcomment.c @@ -200,9 +200,7 @@ HRESULT HTMLCommentElement_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode, HTM ret->IHTMLCommentElement_iface.lpVtbl = &HTMLCommentElementVtbl; HTMLElement_Init(&ret->element, doc, NULL, &HTMLCommentElement_dispex); - - nsIDOMNode_AddRef(nsnode); - ret->element.node.nsnode = nsnode; + HTMLDOMNode_Init(doc, &ret->element.node, nsnode); *elem = &ret->element; return S_OK; diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 10d5108..7ab1856 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1776,7 +1776,8 @@ void HTMLElement_Init(HTMLElement *This, HTMLDocumentNode *doc, nsIDOMHTMLElemen nsIDOMHTMLElement_AddRef(nselem); This->nselem = nselem; - HTMLDOMNode_Init(doc, &This->node, (nsIDOMNode*)nselem); + if(nselem) + HTMLDOMNode_Init(doc, &This->node, (nsIDOMNode*)nselem); ConnectionPointContainer_Init(&This->cp_container, (IUnknown*)&This->IHTMLElement_iface); }

1 0

Alexandre Julliard : opengl32: Add a helper function to correctly compare extension strings.
by Alexandre Julliard June 26, 2012

June 26, 2012

Module: wine Branch: master Commit: b349aa676facb465c127ad33623c06038b4f666b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b349aa676facb465c127ad336… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 26 16:12:06 2012 +0200 opengl32: Add a helper function to correctly compare extension strings. --- dlls/opengl32/wgl.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index eca42e2..6d94716 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -393,6 +393,20 @@ int WINAPI wglGetLayerPaletteEntries(HDC hdc, return 0; } +/* check if the extension is present in the list */ +static BOOL has_extension( const char *list, const char *ext ) +{ + size_t len = strlen( ext ); + + while (list) + { + while (*list == ' ') list++; + if (!strncmp( list, ext, len ) && (!list[len] || list[len] == ' ')) return TRUE; + list = strchr( list, ' ' ); + } + return FALSE; +} + static int compar(const void *elt_a, const void *elt_b) { return strcmp(((const OpenGL_extension *) elt_a)->name, ((const OpenGL_extension *) elt_b)->name); @@ -417,7 +431,7 @@ static BOOL is_extension_supported(const char* extension) * if the OpenGL extension required for the function we are looking up is supported. */ /* Check if the extension is part of the GL extension string to see if it is supported. */ - if(strstr(gl_ext_string, extension) != NULL) + if (has_extension(gl_ext_string, extension)) return TRUE; /* In general an OpenGL function starts as an ARB/EXT extension and at some stage @@ -1028,7 +1042,7 @@ const GLubyte * WINAPI wine_glGetString( GLenum name ) TRACE("- %s:", ThisExtn); /* test if supported API is disabled by config */ - if (!internal_gl_disabled_extensions || !strstr(internal_gl_disabled_extensions, ThisExtn)) { + if (!has_extension(internal_gl_disabled_extensions, ThisExtn)) { strcat(internal_gl_extensions, " "); strcat(internal_gl_extensions, ThisExtn); TRACE(" active\n");

1 0

Jacek Caban : mshtml: Use inner window as script global object.
by Alexandre Julliard June 26, 2012

June 26, 2012

Module: wine Branch: master Commit: d9efd6a44d709884d5666eca18539cde84893921 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9efd6a44d709884d5666eca1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 26 12:33:48 2012 +0200 mshtml: Use inner window as script global object. --- dlls/mshtml/script.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 099266e..458499e 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -316,11 +316,11 @@ static HRESULT WINAPI ActiveScriptSite_GetItemInfo(IActiveScriptSite *iface, LPC if(strcmpW(pstrName, windowW)) return DISP_E_MEMBERNOTFOUND; - if(!This->window || !This->window->base.outer_window) + if(!This->window) return E_FAIL; /* FIXME: Return proxy object */ - *ppiunkItem = (IUnknown*)&This->window->base.outer_window->base.IHTMLWindow2_iface; + *ppiunkItem = (IUnknown*)&This->window->base.IHTMLWindow2_iface; IUnknown_AddRef(*ppiunkItem); return S_OK;

1 0

Jacek Caban : mshtml: Moved screen property to HTMLInnerWindow.
by Alexandre Julliard June 26, 2012

June 26, 2012

Module: wine Branch: master Commit: 4647fe0f231d57cc056b3dc61c2bf21c314059f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4647fe0f231d57cc056b3dc61… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 26 12:32:40 2012 +0200 mshtml: Moved screen property to HTMLInnerWindow. --- dlls/mshtml/htmlwindow.c | 8 ++++---- dlls/mshtml/mshtml_private.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 5852a26..2c355a9 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -197,9 +197,6 @@ static void release_outer_window(HTMLOuterWindow *This) IHTMLLocation_Release(&This->location->IHTMLLocation_iface); } - if(This->screen) - IHTMLScreen_Release(This->screen); - This->window_ref->window = NULL; windowref_release(This->window_ref); @@ -233,6 +230,9 @@ static void release_inner_window(HTMLInnerWindow *This) IHTMLOptionElementFactory_Release(&This->option_factory->IHTMLOptionElementFactory_iface); } + if(This->screen) + IHTMLScreen_Release(This->screen); + heap_free(This); } @@ -1068,7 +1068,7 @@ static HRESULT WINAPI HTMLWindow2_showHelp(IHTMLWindow2 *iface, BSTR helpURL, VA static HRESULT WINAPI HTMLWindow2_get_screen(IHTMLWindow2 *iface, IHTMLScreen **p) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - HTMLOuterWindow *window = This->outer_window; + HTMLInnerWindow *window = This->inner_window; TRACE("(%p)->(%p)\n", This, p); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index d9f0639..401e5cb 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -336,7 +336,6 @@ struct HTMLOuterWindow { IInternetSecurityManager *secmgr; HTMLLocation *location; - IHTMLScreen *screen; IOmHistory *history; struct list children; @@ -356,6 +355,7 @@ struct HTMLInnerWindow { HTMLImageElementFactory *image_factory; HTMLOptionElementFactory *option_factory; + IHTMLScreen *screen; global_prop_t *global_props; DWORD global_prop_cnt;

1 0

Alexandre Julliard : opengl32: Generate an entry point for glDebugEntry.
by Alexandre Julliard June 26, 2012

June 26, 2012

Module: wine Branch: master Commit: b6a7a3fe238f45895bfb1190d3bd18f590dabcdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6a7a3fe238f45895bfb1190d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 26 15:15:36 2012 +0200 opengl32: Generate an entry point for glDebugEntry. --- dlls/opengl32/make_opengl | 4 +++- dlls/opengl32/opengl32.spec | 2 +- dlls/opengl32/wgl.c | 8 ++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 09f38cb..f31f921 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -235,6 +235,7 @@ sub GenerateThunk($$$$$) my $trace_call_arg = ""; my $trace_arg = ""; + return "" if $func_ref->[0] eq "glDebugEntry"; return "" if $func_ref->[0] eq "glGetString"; return "" if $func_ref->[0] eq "glGetIntegerv"; return "" if $func_ref->[0] eq "glFinish"; @@ -409,7 +410,8 @@ $pseudo_to_opengl{"UInt64EXT"} = "UINT64"; # [ "GLfloat", "ymove" ], # [ "GLubyte *", "bitmap"] ] ]; # -my %norm_functions = (); +my %norm_functions = ( "glDebugEntry" => [ "glDebugEntry", "GLint", [[ "GLint", "unknown1" ], + [ "GLint", "unknown2" ]] ] ); # # This stores various extensions NOT part of the GL extension registry but still diff --git a/dlls/opengl32/opengl32.spec b/dlls/opengl32/opengl32.spec index b0853a9..6ada793 100644 --- a/dlls/opengl32/opengl32.spec +++ b/dlls/opengl32/opengl32.spec @@ -56,7 +56,7 @@ @ stdcall glCopyTexSubImage1D( long long long long long long ) wine_glCopyTexSubImage1D @ stdcall glCopyTexSubImage2D( long long long long long long long long ) wine_glCopyTexSubImage2D @ stdcall glCullFace( long ) wine_glCullFace -@ stub glDebugEntry +@ stdcall glDebugEntry( long long ) wine_glDebugEntry @ stdcall glDeleteLists( long long ) wine_glDeleteLists @ stdcall glDeleteTextures( long ptr ) wine_glDeleteTextures @ stdcall glDepthFunc( long ) wine_glDepthFunc diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index f3b4405..5a8df35 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -980,6 +980,14 @@ BOOL WINAPI wglUseFontOutlinesW(HDC hdc, } /*********************************************************************** + * glDebugEntry (OPENGL32.@) + */ +GLint WINAPI wine_glDebugEntry( GLint unknown1, GLint unknown2 ) +{ + return 0; +} + +/*********************************************************************** * glFinish (OPENGL32.@) */ void WINAPI wine_glFinish( void )

1 0

Jacek Caban : mshtml: Moved history property to HTMLInnerWindow.
by Alexandre Julliard June 26, 2012

June 26, 2012

Module: wine Branch: master Commit: d31176ec03684970feb6d24945f0a028fee41ddf URL: http://source.winehq.org/git/wine.git/?a=commit;h=d31176ec03684970feb6d2494… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 26 12:32:53 2012 +0200 mshtml: Moved history property to HTMLInnerWindow. --- dlls/mshtml/htmlwindow.c | 4 +++- dlls/mshtml/mshtml_private.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 2c355a9..651aa75 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -232,6 +232,8 @@ static void release_inner_window(HTMLInnerWindow *This) if(This->screen) IHTMLScreen_Release(This->screen); + if(This->history) + IOmHistory_Release(This->history); heap_free(This); } @@ -684,7 +686,7 @@ static HRESULT WINAPI HTMLWindow2_get_location(IHTMLWindow2 *iface, IHTMLLocatio static HRESULT WINAPI HTMLWindow2_get_history(IHTMLWindow2 *iface, IOmHistory **p) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - HTMLOuterWindow *window = This->outer_window; + HTMLInnerWindow *window = This->inner_window; TRACE("(%p)->(%p)\n", This, p); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 401e5cb..d8d67f7 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -336,7 +336,6 @@ struct HTMLOuterWindow { IInternetSecurityManager *secmgr; HTMLLocation *location; - IOmHistory *history; struct list children; struct list sibling_entry; @@ -356,6 +355,7 @@ struct HTMLInnerWindow { HTMLImageElementFactory *image_factory; HTMLOptionElementFactory *option_factory; IHTMLScreen *screen; + IOmHistory *history; global_prop_t *global_props; DWORD global_prop_cnt;

1 0

Jacek Caban : mshtml: Share nsanchor reference with nsnode.
by Alexandre Julliard June 26, 2012

June 26, 2012

Module: wine Branch: master Commit: a384fbee2040df3d5ca25aaf10940d48d4d4163f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a384fbee2040df3d5ca25aaf1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 26 12:34:48 2012 +0200 mshtml: Share nsanchor reference with nsnode. --- dlls/mshtml/htmlanchor.c | 23 ++++++----------------- 1 files changed, 6 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index cf289cd..6e0fc71 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -615,16 +615,6 @@ static HRESULT HTMLAnchorElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) return HTMLElement_QI(&This->element.node, riid, ppv); } -static void HTMLAnchorElement_destructor(HTMLDOMNode *iface) -{ - HTMLAnchorElement *This = impl_from_HTMLDOMNode(iface); - - if(This->nsanchor) - nsIDOMHTMLAnchorElement_Release(This->nsanchor); - - HTMLElement_destructor(&This->element.node); -} - static HRESULT HTMLAnchorElement_handle_event(HTMLDOMNode *iface, eventid_t eid, nsIDOMEvent *event, BOOL *prevent_default) { HTMLAnchorElement *This = impl_from_HTMLDOMNode(iface); @@ -662,7 +652,7 @@ static HRESULT HTMLAnchorElement_handle_event(HTMLDOMNode *iface, eventid_t eid, static const NodeImplVtbl HTMLAnchorElementImplVtbl = { HTMLAnchorElement_QI, - HTMLAnchorElement_destructor, + HTMLElement_destructor, HTMLElement_clone, HTMLElement_get_attr_col, NULL, @@ -697,14 +687,13 @@ HRESULT HTMLAnchorElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nsele ret->IHTMLAnchorElement_iface.lpVtbl = &HTMLAnchorElementVtbl; ret->element.node.vtbl = &HTMLAnchorElementImplVtbl; + HTMLElement_Init(&ret->element, doc, nselem, &HTMLAnchorElement_dispex); + nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLAnchorElement, (void**)&ret->nsanchor); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIDOMHTMLAnchorElement iface: %08x\n", nsres); - heap_free(ret); - return E_FAIL; - } - HTMLElement_Init(&ret->element, doc, nselem, &HTMLAnchorElement_dispex); + /* Shere the reference with nsnode */ + assert(nsres == NS_OK && (nsIDOMNode*)ret->nsanchor == ret->element.node.nsnode); + nsIDOMNode_Release(ret->element.node.nsnode); *elem = &ret->element; return S_OK;

1 0

Francois Gouget : msvcp90: Add a space between the spec entry name the implementation function.
by Alexandre Julliard June 26, 2012

June 26, 2012

Module: wine Branch: master Commit: 6bacd9559f08b53c3dea6b3b51f0fdeb1ac9b5fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bacd9559f08b53c3dea6b3b5… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 26 12:32:44 2012 +0200 msvcp90: Add a space between the spec entry name the implementation function. --- dlls/msvcp90/msvcp90.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index e2d31d7..4f6faca 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -1591,7 +1591,7 @@ @ thiscall -arch=win32 ??6?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV01(a)N@Z(ptr double) basic_ostream_char_print_double @ cdecl -arch=win64 ??6?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV01(a)N@Z(ptr double) basic_ostream_char_print_double @ thiscall -arch=win32 ??6?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV01(a)O@Z(ptr double) basic_ostream_char_print_ldouble -@ cdecl -arch=win64 ??6?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV01(a)O@Z(ptr double)basic_ostream_char_print_ldouble +@ cdecl -arch=win64 ??6?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV01(a)O@Z(ptr double) basic_ostream_char_print_ldouble @ thiscall -arch=win32 ??6?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV01(a)P6AAAV01@AAV01@@Z(a)Z(ptr ptr) basic_ostream_char_print_func @ cdecl -arch=win64 ??6?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV01(a)P6AAEAV01@AEAV01@@Z(a)Z(ptr ptr) basic_ostream_char_print_func @ thiscall -arch=win32 ??6?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV01(a)P6AAAV?$basic_ios(a)DU?$char_traits(a)D@std@@@1(a)AAV21@@Z(a)Z(ptr ptr) basic_ostream_char_print_func_basic_ios

1 0