wine-commits January 2010

wine-commits@winehq.org

3 participants
615 discussions

Vincent Povirk : gdiplus: Add traces to unimplemented functions in graphics .c.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: 2005fe9881e7f83a131a74f6f66bd567d09dcf62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2005fe9881e7f83a131a74f6f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 18 16:04:20 2009 -0600 gdiplus: Add traces to unimplemented functions in graphics.c. --- dlls/gdiplus/graphics.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index a4f1158..67b0ff9 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1201,6 +1201,8 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromEmf(HENHMETAFILE hemf, BOOL delete, { static int calls; + TRACE("(%p,%i,%p)\n", hemf, delete, metafile); + if(!hemf || !metafile) return InvalidParameter; @@ -3064,6 +3066,8 @@ GpStatus WINGDIPAPI GdipFlush(GpGraphics *graphics, GpFlushIntention intention) { static int calls; + TRACE("(%p,%u)\n", graphics, intention); + if(!graphics) return InvalidParameter; @@ -3161,14 +3165,14 @@ GpStatus WINGDIPAPI GdipGetInterpolationMode(GpGraphics *graphics, GpStatus WINGDIPAPI GdipGetNearestColor(GpGraphics *graphics, ARGB* argb) { + FIXME("(%p, %p): stub\n", graphics, argb); + if(!graphics || !argb) return InvalidParameter; if(graphics->busy) return ObjectBusy; - FIXME("(%p, %p): stub\n", graphics, argb); - return NotImplemented; } @@ -3455,12 +3459,12 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, GDIPCONST RectF* layoutRect, GDIPCONST GpStringFormat *stringFormat, INT regionCount, GpRegion** regions) { - if (!(graphics && string && font && layoutRect && stringFormat && regions)) - return InvalidParameter; - FIXME("stub: %p %s %d %p %p %p %d %p\n", graphics, debugstr_w(string), length, font, layoutRect, stringFormat, regionCount, regions); + if (!(graphics && string && font && layoutRect && stringFormat && regions)) + return InvalidParameter; + return NotImplemented; } @@ -4013,6 +4017,8 @@ GpStatus WINGDIPAPI GdipSetMetafileDownLevelRasterizationLimit(GpMetafile *metaf { static int calls; + TRACE("(%p,%u)\n", metafile, limitDpi); + if(!(calls++)) FIXME("not implemented\n");

1 0

Vincent Povirk : gdiplus: Add traces to unimplemented functions in customlinecap.c.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: e1f55929da7346a9c958c5de6d628b6e9a316f2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1f55929da7346a9c958c5de6… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 18 15:59:06 2009 -0600 gdiplus: Add traces to unimplemented functions in customlinecap.c. --- dlls/gdiplus/customlinecap.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/customlinecap.c b/dlls/gdiplus/customlinecap.c index e8ad968..00c228b 100644 --- a/dlls/gdiplus/customlinecap.c +++ b/dlls/gdiplus/customlinecap.c @@ -157,6 +157,8 @@ GpStatus WINGDIPAPI GdipSetCustomLineCapStrokeCaps(GpCustomLineCap* custom, { static int calls; + TRACE("(%p,%u,%u)\n", custom, start, end); + if(!custom) return InvalidParameter; @@ -171,6 +173,8 @@ GpStatus WINGDIPAPI GdipSetCustomLineCapBaseCap(GpCustomLineCap* custom, { static int calls; + TRACE("(%p,%u)\n", custom, base); + if(!(calls++)) FIXME("not implemented\n"); @@ -195,6 +199,8 @@ GpStatus WINGDIPAPI GdipSetCustomLineCapBaseInset(GpCustomLineCap* custom, { static int calls; + TRACE("(%p,%0.2f)\n", custom, inset); + if(!(calls++)) FIXME("not implemented\n"); @@ -220,6 +226,8 @@ GpStatus WINGDIPAPI GdipSetCustomLineCapWidthScale(GpCustomLineCap* custom, { static int calls; + TRACE("(%p,%0.2f)\n", custom, width); + if(!(calls++)) FIXME("not implemented\n"); @@ -243,6 +251,8 @@ GpStatus WINGDIPAPI GdipCreateAdjustableArrowCap(REAL height, REAL width, BOOL f { static int calls; + TRACE("(%0.2f,%0.2f,%i,%p)\n", height, width, fill, cap); + if(!(calls++)) FIXME("not implemented\n"); @@ -253,6 +263,8 @@ GpStatus WINGDIPAPI GdipGetAdjustableArrowCapFillState(GpAdjustableArrowCap* cap { static int calls; + TRACE("(%p,%p)\n", cap, fill); + if(!(calls++)) FIXME("not implemented\n"); @@ -263,6 +275,8 @@ GpStatus WINGDIPAPI GdipGetAdjustableArrowCapHeight(GpAdjustableArrowCap* cap, R { static int calls; + TRACE("(%p,%p)\n", cap, height); + if(!(calls++)) FIXME("not implemented\n"); @@ -273,6 +287,8 @@ GpStatus WINGDIPAPI GdipGetAdjustableArrowCapMiddleInset(GpAdjustableArrowCap* c { static int calls; + TRACE("(%p,%p)\n", cap, middle); + if(!(calls++)) FIXME("not implemented\n"); @@ -283,6 +299,8 @@ GpStatus WINGDIPAPI GdipGetAdjustableArrowCapWidth(GpAdjustableArrowCap* cap, RE { static int calls; + TRACE("(%p,%p)\n", cap, width); + if(!(calls++)) FIXME("not implemented\n"); @@ -293,6 +311,8 @@ GpStatus WINGDIPAPI GdipSetAdjustableArrowCapFillState(GpAdjustableArrowCap* cap { static int calls; + TRACE("(%p,%i)\n", cap, fill); + if(!(calls++)) FIXME("not implemented\n"); @@ -303,6 +323,8 @@ GpStatus WINGDIPAPI GdipSetAdjustableArrowCapHeight(GpAdjustableArrowCap* cap, R { static int calls; + TRACE("(%p,%0.2f)\n", cap, height); + if(!(calls++)) FIXME("not implemented\n"); @@ -313,6 +335,8 @@ GpStatus WINGDIPAPI GdipSetAdjustableArrowCapMiddleInset(GpAdjustableArrowCap* c { static int calls; + TRACE("(%p,%0.2f)\n", cap, middle); + if(!(calls++)) FIXME("not implemented\n"); @@ -323,6 +347,8 @@ GpStatus WINGDIPAPI GdipSetAdjustableArrowCapWidth(GpAdjustableArrowCap* cap, RE { static int calls; + TRACE("(%p,%0.2f)\n", cap, width); + if(!(calls++)) FIXME("not implemented\n");

1 0

Nikolay Sivov : comctl32/comboex: Fix a leak for text string stored for edit item.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: acec38873f13abb19febbee2717272a6ff63ec79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acec38873f13abb19febbee27… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Jan 1 17:40:50 2010 +0300 comctl32/comboex: Fix a leak for text string stored for edit item. --- dlls/comctl32/comboex.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index e1d2cd4..4b5e079 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -1583,6 +1583,7 @@ static LRESULT COMBOEX_Destroy (COMBOEX_INFO *infoPtr) if (infoPtr->hwndEdit) RemoveWindowSubclass(infoPtr->hwndEdit, COMBOEX_EditWndProc, EDIT_SUBCLASSID); + COMBOEX_FreeText (infoPtr->edit); Free (infoPtr->edit); infoPtr->edit = 0;

1 0

Christian Costa : d3drm: Add some definitions.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: 3ac5064ba797e683312ce6f7c4ab41edbb95f98b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ac5064ba797e683312ce6f7c… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Fri Jan 1 12:55:04 2010 +0100 d3drm: Add some definitions. --- include/d3drm.h | 134 ++++++++++++++++++++++++++++++++++++++++++++++++++++ include/d3drmdef.h | 53 ++++++++++++++++++++- include/d3drmobj.h | 18 +++++++ 3 files changed, 203 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3ac5064ba797e683312ce…

1 0

Jacek Caban : mshtml: Store body event target in HTMLDocumentNode.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: e4a936a2d2f81d027945c787861e786578300928 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4a936a2d2f81d027945c7878… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 4 00:39:31 2010 +0100 mshtml: Store body event target in HTMLDocumentNode. --- dlls/mshtml/htmlbody.c | 4 ++-- dlls/mshtml/htmldoc.c | 2 ++ dlls/mshtml/htmlevent.c | 2 +- dlls/mshtml/htmlevent.h | 10 ---------- dlls/mshtml/htmlwindow.c | 29 ++++++++++++++++++++++++++--- dlls/mshtml/mshtml_private.h | 2 +- 6 files changed, 32 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 1aa7313..7f22a4e 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -783,8 +783,8 @@ static event_target_t **HTMLBodyElement_get_event_target(HTMLDOMNode *iface) { HTMLBodyElement *This = HTMLBODY_NODE_THIS(iface); - return This->textcont.element.node.doc && This->textcont.element.node.doc->basedoc.window - ? &This->textcont.element.node.doc->basedoc.window->event_target + return This->textcont.element.node.doc + ? &This->textcont.element.node.doc->body_event_target : &This->textcont.element.node.event_target; } diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 54d3ca3..ac67a84 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1842,6 +1842,8 @@ static void HTMLDocumentNode_destructor(HTMLDOMNode *iface) { HTMLDocumentNode *This = HTMLDOCNODE_NODE_THIS(iface); + if(This->body_event_target) + release_event_target(This->body_event_target); if(This->nsevent_listener) release_nsevents(This); if(This->catmgr) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 2e2f1c9..d04b2e6 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -934,7 +934,7 @@ void fire_event(HTMLDocumentNode *doc, eventid_t eid, nsIDOMNode *target, nsIDOM } } - call_event_handlers(doc, event_obj, doc->basedoc.doc_node->node.event_target, &doc->basedoc.cp_container, eid, + call_event_handlers(doc, event_obj, doc->node.event_target, &doc->basedoc.cp_container, eid, (IDispatch*)HTMLDOC(&doc->basedoc)); break; diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index a0fb198..1a8572f 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -74,13 +74,3 @@ static inline HRESULT get_doc_event(HTMLDocument *doc, eventid_t eid, VARIANT *v { return get_node_event(&doc->doc_node->node, eid, var); } - -static inline HRESULT set_window_event(HTMLWindow *window, eventid_t eid, VARIANT *var) -{ - return set_event_handler(&window->event_target, window->doc, eid, var); -} - -static inline HRESULT get_window_event(HTMLWindow *window, eventid_t eid, VARIANT *var) -{ - return get_event_handler(&window->event_target, eid, var); -} diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 6db3148..4a2babe 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -117,6 +117,26 @@ static HRESULT get_location(HTMLWindow *This, HTMLLocation **ret) return S_OK; } +static inline HRESULT set_window_event(HTMLWindow *window, eventid_t eid, VARIANT *var) +{ + if(!window->doc) { + FIXME("No document\n"); + return E_FAIL; + } + + return set_event_handler(&window->doc->body_event_target, window->doc, eid, var); +} + +static inline HRESULT get_window_event(HTMLWindow *window, eventid_t eid, VARIANT *var) +{ + if(!window->doc) { + FIXME("No document\n"); + return E_FAIL; + } + + return get_event_handler(&window->doc->body_event_target, eid, var); +} + #define HTMLWINDOW2_THIS(iface) DEFINE_THIS(HTMLWindow, HTMLWindow2, iface) static HRESULT WINAPI HTMLWindow2_QueryInterface(IHTMLWindow2 *iface, REFIID riid, void **ppv) @@ -206,8 +226,6 @@ static ULONG WINAPI HTMLWindow2_Release(IHTMLWindow2 *iface) if(This->screen) IHTMLScreen_Release(This->screen); - if(This->event_target) - release_event_target(This->event_target); for(i=0; i < This->global_prop_cnt; i++) heap_free(This->global_props[i].name); @@ -1391,7 +1409,12 @@ static HRESULT WINAPI HTMLWindow3_attachEvent(IHTMLWindow3 *iface, BSTR event, I TRACE("(%p)->(%s %p %p)\n", This, debugstr_w(event), pDisp, pfResult); - return attach_event(&This->event_target, &This->doc_obj->basedoc, event, pDisp, pfResult); + if(!This->doc) { + FIXME("No document\n"); + return E_FAIL; + } + + return attach_event(&This->doc->body_event_target, &This->doc->basedoc, event, pDisp, pfResult); } static HRESULT WINAPI HTMLWindow3_detachEvent(IHTMLWindow3 *iface, BSTR event, IDispatch *pDisp) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 491bc2a..68b3393 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -242,7 +242,6 @@ struct HTMLWindow { IMoniker *mon; LPOLESTR url; - event_target_t *event_target; IHTMLEventObj *event; SCRIPTMODE scriptmode; @@ -531,6 +530,7 @@ struct HTMLDocumentNode { nsIDOMHTMLDocument *nsdoc; HTMLDOMNode *nodes; BOOL content_ready; + event_target_t *body_event_target; IInternetSecurityManager *secmgr; ICatInformation *catmgr;

1 0

Jacek Caban : mshtml: Use nsIDocShell to load a page in set_moniker.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: 2e6353d4bc6ffbac0d226d1f932c586c4dda9d9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e6353d4bc6ffbac0d226d1f9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 4 00:38:57 2010 +0100 mshtml: Use nsIDocShell to load a page in set_moniker. --- dlls/mshtml/mshtml_private.h | 3 +- dlls/mshtml/navigate.c | 59 ++++++++++++++++++++++------------------- dlls/mshtml/nsembed.c | 23 +--------------- dlls/mshtml/nsiface.idl | 6 +++- dlls/mshtml/nsio.c | 48 +++++++++++++++++++++++++++------- dlls/mshtml/persist.c | 33 ++++++++++------------- 6 files changed, 92 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2e6353d4bc6ffbac0d226…

1 0

Jacek Caban : mshtml: Don' t try to wrap necko channel in nsChannel implementation.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: d60ebb308f408157b9219b091f5e592eeb6a5991 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d60ebb308f408157b9219b091… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 4 00:38:20 2010 +0100 mshtml: Don't try to wrap necko channel in nsChannel implementation. --- dlls/mshtml/mshtml_private.h | 1 - dlls/mshtml/nsio.c | 124 +++++------------------------------------- 2 files changed, 14 insertions(+), 111 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d60ebb308f408157b9219…

1 0

Jacek Caban : mshtml: Make sure that event listeners of connection point are set.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: 8c5baf3a09b2047e98010e138d34fa9bb183ed0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c5baf3a09b2047e98010e138… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 4 00:37:47 2010 +0100 mshtml: Make sure that event listeners of connection point are set. --- dlls/mshtml/conpoint.c | 3 ++ dlls/mshtml/htmldoc.c | 12 +++++++++- dlls/mshtml/htmlevent.c | 50 ++++++++++++++++++++++++++--------------- dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/mshtml_private.h | 3 +- 5 files changed, 49 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/conpoint.c b/dlls/mshtml/conpoint.c index 3d78827..da775ad 100644 --- a/dlls/mshtml/conpoint.c +++ b/dlls/mshtml/conpoint.c @@ -159,6 +159,9 @@ static HRESULT WINAPI ConnectionPoint_Advise(IConnectionPoint *iface, IUnknown * This->sinks[i].unk = sink; *pdwCookie = i+1; + if(!i && This->data && This->data->on_advise) + This->data->on_advise(This->container->outer, This->data); + return S_OK; } diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 732fd52..54d3ca3 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1466,6 +1466,16 @@ static const IHTMLDocument2Vtbl HTMLDocumentVtbl = { HTMLDocument_createStyleSheet }; +static void HTMLDocument_on_advise(IUnknown *iface, cp_static_data_t *cp) +{ + HTMLDocument *This = HTMLDOC_THIS(iface); + + if(This->window) + update_cp_events(This->window, cp); +} + +#undef HTMLDOC_THIS + #define SUPPINFO_THIS(iface) DEFINE_THIS(HTMLDocument, SupportErrorInfo, iface) static HRESULT WINAPI SupportErrorInfo_QueryInterface(ISupportErrorInfo *iface, REFIID riid, void **ppv) @@ -1772,7 +1782,7 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) return TRUE; } -static cp_static_data_t HTMLDocumentEvents_data = { HTMLDocumentEvents_tid }; +static cp_static_data_t HTMLDocumentEvents_data = { HTMLDocumentEvents_tid, HTMLDocument_on_advise }; static void init_doc(HTMLDocument *doc, IUnknown *unk_impl, IDispatchEx *dispex) { diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 9b01f26..2e2f1c9 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -782,13 +782,11 @@ static HRESULT call_cp_func(IDispatch *disp, DISPID dispid) return hres; } -static BOOL is_cp_event(ConnectionPoint *cp, DISPID dispid) +static BOOL is_cp_event(cp_static_data_t *data, DISPID dispid) { - cp_static_data_t *data; int min, max, i; HRESULT hres; - data = cp->data; if(!data) return FALSE; @@ -866,7 +864,7 @@ static void call_event_handlers(HTMLDocumentNode *doc, IHTMLEventObj *event_obj, cp_container = cp_container->forward_container; for(cp = cp_container->cp_list; cp; cp = cp->next) { - if(cp->sinks_size && is_cp_event(cp, event_info[eid].dispid)) { + if(cp->sinks_size && is_cp_event(cp->data, event_info[eid].dispid)) { for(i=0; i < cp->sinks_size; i++) { TRACE("cp %s [%d] >>>\n", debugstr_w(event_info[eid].name), i); hres = call_cp_func(cp->sinks[i].disp, event_info[eid].dispid); @@ -1019,6 +1017,25 @@ static BOOL alloc_handler_vector(event_target_t *event_target, eventid_t eid, in return TRUE; } +static HRESULT ensure_nsevent_handler(HTMLDocumentNode *doc, eventid_t eid) +{ + if(!doc->nsdoc || !(event_info[eid].flags & EVENT_DEFAULTLISTENER)) + return S_OK; + + if(!doc->event_vector) { + doc->event_vector = heap_alloc_zero(EVENTID_LAST*sizeof(BOOL)); + if(!doc->event_vector) + return E_OUTOFMEMORY; + } + + if(!doc->event_vector[eid]) { + doc->event_vector[eid] = TRUE; + add_nsevent_listener(doc, event_info[eid].name); + } + + return S_OK; +} + static HRESULT set_event_handler_disp(event_target_t **event_target_ptr, HTMLDocumentNode *doc, eventid_t eid, IDispatch *disp) { @@ -1039,20 +1056,7 @@ static HRESULT set_event_handler_disp(event_target_t **event_target_ptr, HTMLDoc return S_OK; IDispatch_AddRef(disp); - if(doc->nsdoc && (event_info[eid].flags & EVENT_DEFAULTLISTENER)) { - if(!doc->event_vector) { - doc->event_vector = heap_alloc_zero(EVENTID_LAST*sizeof(BOOL)); - if(!doc->event_vector) - return E_OUTOFMEMORY; - } - - if(!doc->event_vector[eid]) { - doc->event_vector[eid] = TRUE; - add_nsevent_listener(doc, event_info[eid].name); - } - } - - return S_OK; + return ensure_nsevent_handler(doc, eid); } HRESULT set_event_handler(event_target_t **event_target, HTMLDocumentNode *doc, eventid_t eid, VARIANT *var) @@ -1123,6 +1127,16 @@ HRESULT attach_event(event_target_t **event_target_ptr, HTMLDocument *doc, BSTR return S_OK; } +void update_cp_events(HTMLWindow *window, cp_static_data_t *cp) +{ + int i; + + for(i=0; i < EVENTID_LAST; i++) { + if((event_info[i].flags & EVENT_DEFAULTLISTENER) && is_cp_event(cp, event_info[i].dispid)) + ensure_nsevent_handler(window->doc, i); + } +} + void check_event_attr(HTMLDocumentNode *doc, nsIDOMElement *nselem) { const PRUnichar *attr_value; diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 5de023d..a0fb198 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -48,6 +48,7 @@ HRESULT get_event_handler(event_target_t**,eventid_t,VARIANT*); HRESULT attach_event(event_target_t**,HTMLDocument*,BSTR,IDispatch*,VARIANT_BOOL*); HRESULT dispatch_event(HTMLDOMNode*,const WCHAR*,VARIANT*,VARIANT_BOOL*); HRESULT call_event(HTMLDOMNode*,eventid_t); +void update_cp_events(HTMLWindow*,cp_static_data_t*); static inline event_target_t **get_node_event_target(HTMLDOMNode *node) { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 2df6a45..81cb3c8 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -269,8 +269,9 @@ typedef enum { EDITMODE } USERMODE; -typedef struct { +typedef struct _cp_static_data_t { tid_t tid; + void (*on_advise)(IUnknown*,struct _cp_static_data_t*); DWORD id_cnt; DISPID *ids; } cp_static_data_t;

1 0

Jacek Caban : mshtml: Store ConnectionPointContainer pointer in ConnectionPoint.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: b0bb5e6a787f30ed1fa51a61d564f0efb5d4b7d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0bb5e6a787f30ed1fa51a61d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 4 00:37:09 2010 +0100 mshtml: Store ConnectionPointContainer pointer in ConnectionPoint. --- dlls/mshtml/conpoint.c | 8 ++++---- dlls/mshtml/mshtml_private.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/conpoint.c b/dlls/mshtml/conpoint.c index 0f49601..3d78827 100644 --- a/dlls/mshtml/conpoint.c +++ b/dlls/mshtml/conpoint.c @@ -89,13 +89,13 @@ static HRESULT WINAPI ConnectionPoint_QueryInterface(IConnectionPoint *iface, static ULONG WINAPI ConnectionPoint_AddRef(IConnectionPoint *iface) { ConnectionPoint *This = CONPOINT_THIS(iface); - return IConnectionPointContainer_AddRef(This->container); + return IConnectionPointContainer_AddRef(CONPTCONT(This->container)); } static ULONG WINAPI ConnectionPoint_Release(IConnectionPoint *iface) { ConnectionPoint *This = CONPOINT_THIS(iface); - return IConnectionPointContainer_Release(This->container); + return IConnectionPointContainer_Release(CONPTCONT(This->container)); } static HRESULT WINAPI ConnectionPoint_GetConnectionInterface(IConnectionPoint *iface, IID *pIID) @@ -121,7 +121,7 @@ static HRESULT WINAPI ConnectionPoint_GetConnectionPointContainer(IConnectionPoi if(!ppCPC) return E_POINTER; - *ppCPC = This->container; + *ppCPC = CONPTCONT(This->container); IConnectionPointContainer_AddRef(*ppCPC); return S_OK; } @@ -201,7 +201,7 @@ static const IConnectionPointVtbl ConnectionPointVtbl = void ConnectionPoint_Init(ConnectionPoint *cp, ConnectionPointContainer *container, REFIID riid, cp_static_data_t *data) { cp->lpConnectionPointVtbl = &ConnectionPointVtbl; - cp->container = CONPTCONT(container); + cp->container = container; cp->sinks = NULL; cp->sinks_size = 0; cp->iid = riid; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index fcdb916..2df6a45 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -286,7 +286,7 @@ typedef struct ConnectionPointContainer { struct ConnectionPoint { const IConnectionPointVtbl *lpConnectionPointVtbl; - IConnectionPointContainer *container; + ConnectionPointContainer *container; union { IUnknown *unk;

1 0

Henri Verbeet : wined3d: Handle source and destination rectangles in IWineD3DSwapChainImpl_Present( ).
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: ce2c3ea6c74f7c28f0ec55e097d582b68c080d19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce2c3ea6c74f7c28f0ec55e09… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 3 21:18:26 2010 +0100 wined3d: Handle source and destination rectangles in IWineD3DSwapChainImpl_Present(). --- dlls/wined3d/swapchain.c | 63 +++++++++++++++++++++++++++------------------- 1 files changed, 37 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index c6b0b01..6493704 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -213,6 +213,7 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface; struct wined3d_context *context; RECT src_rect, dst_rect; + BOOL render_to_fbo; unsigned int sync; int retval; @@ -271,8 +272,6 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO IWineD3DSurface_BltFast(This->backBuffer[0], 0, 0, This->device->logo_surface, NULL, WINEDDBLTFAST_SRCCOLORKEY); } - if (pSourceRect || pDestRect) FIXME("Unhandled present rects %s/%s\n", wine_dbgstr_rect(pSourceRect), wine_dbgstr_rect(pDestRect)); - /* TODO: If only source rect or dest rect are supplied then clip the window to match */ TRACE("presetting HDC %p\n", This->context[0]->hdc); /* Don't call checkGLcall, as glGetError is not applicable here */ @@ -280,6 +279,36 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO IWineD3DSwapChain_SetDestWindowOverride(iface, hDestWindowOverride); } + render_to_fbo = This->render_to_fbo; + + if (pSourceRect) + { + src_rect = *pSourceRect; + if (!render_to_fbo && (src_rect.left || src_rect.top + || src_rect.right != This->presentParms.BackBufferWidth + || src_rect.bottom != This->presentParms.BackBufferHeight)) + { + render_to_fbo = TRUE; + } + } + else + { + src_rect.left = 0; + src_rect.top = 0; + src_rect.right = This->presentParms.BackBufferWidth; + src_rect.bottom = This->presentParms.BackBufferHeight; + } + + if (pDestRect) dst_rect = *pDestRect; + else GetClientRect(This->win_handle, &dst_rect); + + if (!render_to_fbo && (dst_rect.left || dst_rect.top + || dst_rect.right != This->presentParms.BackBufferWidth + || dst_rect.bottom != This->presentParms.BackBufferHeight)) + { + render_to_fbo = TRUE; + } + /* Rendering to a window of different size, presenting partial rectangles, * or rendering to a different window needs help from FBO_blit or a textured * draw. Render the swapchain to a FBO in the future. @@ -287,25 +316,14 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO * Note that FBO_blit from the backbuffer to the frontbuffer cannot solve * all these issues - this fails if the window is smaller than the backbuffer. */ - if(This->presentParms.Windowed && !This->render_to_fbo && - wined3d_settings.offscreen_rendering_mode == ORM_FBO) + if (!This->render_to_fbo && render_to_fbo && wined3d_settings.offscreen_rendering_mode == ORM_FBO) { - RECT window_size; - GetClientRect(This->win_handle, &window_size); - if(window_size.bottom != This->presentParms.BackBufferHeight || - window_size.right != This->presentParms.BackBufferWidth) - { - TRACE("Window size changed from %ux%u to %ux%u, switching to render-to-fbo mode\n", - This->presentParms.BackBufferWidth, This->presentParms.BackBufferHeight, - window_size.right, window_size.bottom); - - IWineD3DSurface_LoadLocation(This->backBuffer[0], SFLAG_INTEXTURE, NULL); - IWineD3DSurface_ModifyLocation(This->backBuffer[0], SFLAG_INDRAWABLE, FALSE); - This->render_to_fbo = TRUE; + IWineD3DSurface_LoadLocation(This->backBuffer[0], SFLAG_INTEXTURE, NULL); + IWineD3DSurface_ModifyLocation(This->backBuffer[0], SFLAG_INDRAWABLE, FALSE); + This->render_to_fbo = TRUE; - /* Force the context manager to update the render target configuration next draw */ - context->current_rt = NULL; - } + /* Force the context manager to update the render target configuration next draw. */ + context->current_rt = NULL; } if(This->render_to_fbo) @@ -322,13 +340,6 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO FIXME("Render-to-fbo with WINED3DSWAPEFFECT_FLIP\n"); } - src_rect.left = 0; - src_rect.top = 0; - src_rect.right = This->presentParms.BackBufferWidth; - src_rect.bottom = This->presentParms.BackBufferHeight; - - GetClientRect(This->win_handle, &dst_rect); - swapchain_blit(This, context, &src_rect, &dst_rect); }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2010