March 2010 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Fire readystatechange event on document nodes.
by Alexandre Julliard 18 Mar '10

18 Mar '10

Module: wine Branch: master Commit: 8629433f5fe8f0e097bec0e916efc262690d403d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8629433f5fe8f0e097bec0e91… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 18 01:04:45 2010 +0100 mshtml: Fire readystatechange event on document nodes. --- dlls/mshtml/htmlevent.c | 13 +++++++---- dlls/mshtml/htmlevent.h | 2 +- dlls/mshtml/nsevents.c | 4 +- dlls/mshtml/persist.c | 6 ++++- dlls/mshtml/tests/events.c | 48 +++++++++++++++++++++++++++++++++++++++++-- 5 files changed, 61 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 54429c3..263026d 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -882,7 +882,7 @@ static void call_event_handlers(HTMLDocumentNode *doc, IHTMLEventObj *event_obj, } } -void fire_event(HTMLDocumentNode *doc, eventid_t eid, nsIDOMNode *target, nsIDOMEvent *nsevent) +void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, nsIDOMNode *target, nsIDOMEvent *nsevent) { IHTMLEventObj *prev_event, *event_obj = NULL; nsIDOMNode *parent, *nsnode; @@ -892,7 +892,9 @@ void fire_event(HTMLDocumentNode *doc, eventid_t eid, nsIDOMNode *target, nsIDOM TRACE("(%p) %s\n", doc, debugstr_w(event_info[eid].name)); prev_event = doc->basedoc.window->event; - event_obj = doc->basedoc.window->event = create_event(get_node(doc, target, TRUE), eid, nsevent); + if(set_event) + event_obj = create_event(get_node(doc, target, TRUE), eid, nsevent); + doc->basedoc.window->event = event_obj; nsIDOMNode_GetNodeType(target, &node_type); nsnode = target; @@ -949,7 +951,8 @@ void fire_event(HTMLDocumentNode *doc, eventid_t eid, nsIDOMNode *target, nsIDOM if(nsnode) nsIDOMNode_Release(nsnode); - IHTMLEventObj_Release(event_obj); + if(event_obj) + IHTMLEventObj_Release(event_obj); doc->basedoc.window->event = prev_event; } @@ -971,7 +974,7 @@ HRESULT dispatch_event(HTMLDOMNode *node, const WCHAR *event_name, VARIANT *even return E_NOTIMPL; } - fire_event(node->doc, eid, node->nsnode, NULL); + fire_event(node->doc, eid, TRUE, node->nsnode, NULL); *cancelled = VARIANT_TRUE; /* FIXME */ return S_OK; @@ -989,7 +992,7 @@ HRESULT call_event(HTMLDOMNode *node, eventid_t eid) return hres; } - fire_event(node->doc, eid, node->nsnode, NULL); + fire_event(node->doc, eid, TRUE, node->nsnode, NULL); return S_OK; } diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 96ff4cd..9d0e544 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -42,7 +42,7 @@ typedef enum { eventid_t str_to_eid(LPCWSTR); void check_event_attr(HTMLDocumentNode*,nsIDOMElement*); void release_event_target(event_target_t*); -void fire_event(HTMLDocumentNode*,eventid_t,nsIDOMNode*,nsIDOMEvent*); +void fire_event(HTMLDocumentNode*,eventid_t,BOOL,nsIDOMNode*,nsIDOMEvent*); HRESULT set_event_handler(event_target_t**,HTMLDocumentNode*,eventid_t,VARIANT*); HRESULT get_event_handler(event_target_t**,eventid_t,VARIANT*); HRESULT attach_event(event_target_t**,HTMLDocument*,BSTR,IDispatch*,VARIANT_BOOL*); diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 0f5b864..ce622d2 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -254,7 +254,7 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event nsIDOMHTMLDocument_GetBody(doc->nsdoc, &nsbody); if(nsbody) { - fire_event(doc, EVENTID_LOAD, (nsIDOMNode*)nsbody, event); + fire_event(doc, EVENTID_LOAD, TRUE, (nsIDOMNode*)nsbody, event); nsIDOMHTMLElement_Release(nsbody); } @@ -290,7 +290,7 @@ static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent * return NS_OK; } - fire_event(doc, eid, nsnode, event); + fire_event(doc, eid, TRUE, nsnode, event); nsIDOMNode_Release(nsnode); diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 6aca13f..44ccd0f 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -283,11 +283,15 @@ HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, nsChannel void set_ready_state(HTMLWindow *window, READYSTATE readystate) { window->readystate = readystate; + if(window->doc_obj && window->doc_obj->basedoc.window == window) call_property_onchanged(&window->doc_obj->basedoc.cp_propnotif, DISPID_READYSTATE); + + fire_event(window->doc, EVENTID_READYSTATECHANGE, FALSE, window->doc->node.nsnode, NULL); + if(window->frame_element) fire_event(window->frame_element->element.node.doc, EVENTID_READYSTATECHANGE, - window->frame_element->element.node.nsnode, NULL); + TRUE, window->frame_element->element.node.nsnode, NULL); } static HRESULT get_doc_string(HTMLDocumentNode *This, char **str) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index d2d1db7..55171be 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -67,6 +67,7 @@ DEFINE_EXPECT(div_onclick_disp); DEFINE_EXPECT(iframe_onreadystatechange_loading); DEFINE_EXPECT(iframe_onreadystatechange_interactive); DEFINE_EXPECT(iframe_onreadystatechange_complete); +DEFINE_EXPECT(iframedoc_onreadystatechange); static HWND container_hwnd = NULL; static IHTMLWindow2 *window; @@ -879,14 +880,35 @@ static HRESULT WINAPI body_onclick(IDispatchEx *iface, DISPID id, LCID lcid, WOR EVENT_HANDLER_FUNC_OBJ(body_onclick); +static HRESULT WINAPI iframedoc_onreadystatechange(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) +{ + IHTMLEventObj *event = NULL; + HRESULT hres; + + CHECK_EXPECT2(iframedoc_onreadystatechange); + test_event_args(&DIID_DispHTMLDocument, id, wFlags, pdp, pvarRes, pei, pspCaller); + + event = (void*)0xdeadbeef; + hres = IHTMLWindow2_get_event(window, &event); + ok(hres == S_OK, "get_event failed: %08x\n", hres); + ok(!event, "event = %p\n", event); + + return S_OK; +} + +EVENT_HANDLER_FUNC_OBJ(iframedoc_onreadystatechange); + static HRESULT WINAPI iframe_onreadystatechange(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { + IHTMLWindow2 *iframe_window; + IHTMLDocument2 *iframe_doc; IHTMLFrameBase2 *iframe; IHTMLElement2 *elem2; IHTMLElement *elem; VARIANT v; - BSTR str; + BSTR str, str2; HRESULT hres; test_event_args(&DIID_DispHTMLIFrame, id, wFlags, pdp, pvarRes, pei, pspCaller); @@ -913,15 +935,33 @@ static HRESULT WINAPI iframe_onreadystatechange(IDispatchEx *iface, DISPID id, L ok(!lstrcmpW(str, V_BSTR(&v)), "ready states differ\n"); VariantClear(&v); - if(!strcmp_wa(str, "loading")) + hres = IHTMLFrameBase2_get_contentWindow(iframe, &iframe_window); + ok(hres == S_OK, "get_contentDocument failed: %08x\n", hres); + + hres = IHTMLWindow2_get_document(iframe_window, &iframe_doc); + IHTMLWindow2_Release(iframe_window); + ok(hres == S_OK, "get_document failed: %08x\n", hres); + + hres = IHTMLDocument2_get_readyState(iframe_doc, &str2); + ok(!lstrcmpW(str, str2), "unexpected document readyState %s\n", wine_dbgstr_w(str2)); + SysFreeString(str2); + + if(!strcmp_wa(str, "loading")) { CHECK_EXPECT(iframe_onreadystatechange_loading); - else if(!strcmp_wa(str, "interactive")) + + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = (IDispatch*)&iframedoc_onreadystatechange_obj; + hres = IHTMLDocument2_put_onreadystatechange(iframe_doc, v); + ok(hres == S_OK, "put_onreadystatechange: %08x\n", hres); + }else if(!strcmp_wa(str, "interactive")) CHECK_EXPECT(iframe_onreadystatechange_interactive); else if(!strcmp_wa(str, "complete")) CHECK_EXPECT(iframe_onreadystatechange_complete); else ok(0, "unexpected state %s\n", wine_dbgstr_w(str)); + IHTMLDocument2_Release(iframe_doc); + IHTMLFrameBase2_Release(iframe); return S_OK; } @@ -1307,10 +1347,12 @@ static void test_onreadystatechange(IHTMLDocument2 *doc) ok(hres == S_OK, "put_src failed: %08x\n", hres); SET_EXPECT(iframe_onreadystatechange_loading); + SET_EXPECT(iframedoc_onreadystatechange); SET_EXPECT(iframe_onreadystatechange_interactive); SET_EXPECT(iframe_onreadystatechange_complete); pump_msgs(&called_iframe_onreadystatechange_complete); CHECK_CALLED(iframe_onreadystatechange_loading); + CHECK_CALLED(iframedoc_onreadystatechange); CHECK_CALLED(iframe_onreadystatechange_interactive); CHECK_CALLED(iframe_onreadystatechange_complete);

1 0

Jacek Caban : mshtml: Moved removing event target to separated function.
by Alexandre Julliard 18 Mar '10

18 Mar '10

Module: wine Branch: master Commit: da01d8acaf5d955a055d7ea78220cfa8d747ef70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da01d8acaf5d955a055d7ea78… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 18 01:05:10 2010 +0100 mshtml: Moved removing event target to separated function. --- dlls/mshtml/htmlevent.c | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 263026d..25dad79 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1043,11 +1043,24 @@ static HRESULT ensure_nsevent_handler(HTMLDocumentNode *doc, eventid_t eid) return S_OK; } +static HRESULT remove_event_handler(event_target_t **event_target, eventid_t eid) +{ + if(*event_target && (*event_target)->event_table[eid]->handler_prop) { + IDispatch_Release((*event_target)->event_table[eid]->handler_prop); + (*event_target)->event_table[eid]->handler_prop = NULL; + } + + return S_OK; +} + static HRESULT set_event_handler_disp(event_target_t **event_target_ptr, HTMLDocumentNode *doc, eventid_t eid, IDispatch *disp) { event_target_t *event_target; + if(!disp) + return remove_event_handler(event_target_ptr, eid); + event_target = get_event_target(event_target_ptr); if(!event_target) return E_OUTOFMEMORY; @@ -1059,8 +1072,6 @@ static HRESULT set_event_handler_disp(event_target_t **event_target_ptr, HTMLDoc IDispatch_Release(event_target->event_table[eid]->handler_prop); event_target->event_table[eid]->handler_prop = disp; - if(!disp) - return S_OK; IDispatch_AddRef(disp); return ensure_nsevent_handler(doc, eid); @@ -1070,11 +1081,7 @@ HRESULT set_event_handler(event_target_t **event_target, HTMLDocumentNode *doc, { switch(V_VT(var)) { case VT_NULL: - if(*event_target && (*event_target)->event_table[eid] && (*event_target)->event_table[eid]->handler_prop) { - IDispatch_Release((*event_target)->event_table[eid]->handler_prop); - (*event_target)->event_table[eid]->handler_prop = NULL; - } - break; + return remove_event_handler(event_target, eid); case VT_DISPATCH: return set_event_handler_disp(event_target, doc, eid, V_DISPATCH(var));

1 0

Jacek Caban : mshtml: Added support for load event on all nodes.
by Alexandre Julliard 18 Mar '10

18 Mar '10

Module: wine Branch: master Commit: df0a35e3d32d7f3621d7ffcf00810015c461fe65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df0a35e3d32d7f3621d7ffcf0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 18 01:05:38 2010 +0100 mshtml: Added support for load event on all nodes. --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmldoc3.c | 2 +- dlls/mshtml/htmlelem2.c | 2 +- dlls/mshtml/htmlevent.c | 64 +++++++++++++++++++++++++++++++++-------- dlls/mshtml/htmlevent.h | 8 ++-- dlls/mshtml/htmlwindow.c | 4 +- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/nsevents.c | 9 ++++- 8 files changed, 68 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=df0a35e3d32d7f3621d7f…

1 0

Piotr Caban : oleaut32: Improve ITypeInfo2 GetTypeAttr implementation.
by Alexandre Julliard 18 Mar '10

18 Mar '10

Module: wine Branch: master Commit: 45306f8671c3d8f12c2f2bfcfb9096bc4426878a URL: http://source.winehq.org/git/wine.git/?a=commit;h=45306f8671c3d8f12c2f2bfcf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 17 22:04:53 2010 +0100 oleaut32: Improve ITypeInfo2 GetTypeAttr implementation. --- dlls/oleaut32/tests/typelib.c | 2 +- dlls/oleaut32/typelib2.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 797ac02..6e44f58 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1386,7 +1386,7 @@ static void test_CreateTypeLib(void) { ok(hres == S_OK, "got %08x\n", hres); ok(typeattr->cbSizeInstance == 4, "cbSizeInstance = %d\n", typeattr->cbSizeInstance); ok(typeattr->typekind == 4, "typekind = %d\n", typeattr->typekind); - todo_wine ok(typeattr->cFuncs == 8, "cFuncs = %d\n", typeattr->cFuncs); + ok(typeattr->cFuncs == 8, "cFuncs = %d\n", typeattr->cFuncs); ok(typeattr->cVars == 0, "cVars = %d\n", typeattr->cVars); ok(typeattr->cImplTypes == 1, "cImplTypes = %d\n", typeattr->cImplTypes); ok(typeattr->cbSizeVft == 28, "cbSizeVft = %d\n", typeattr->cbSizeVft); diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 08b8684..a6e12cd 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -2919,6 +2919,8 @@ static HRESULT WINAPI ITypeInfo2_fnGetTypeAttr( (*ppTypeAttr)->cbSizeInstance = This->typeinfo->size; (*ppTypeAttr)->typekind = This->typekind; (*ppTypeAttr)->cFuncs = This->typeinfo->cElement&0xffff; + if(This->typeinfo->flags&TYPEFLAG_FDUAL && This->typekind==TKIND_DISPATCH) + (*ppTypeAttr)->cFuncs += 7; (*ppTypeAttr)->cVars = This->typeinfo->cElement>>16; (*ppTypeAttr)->cImplTypes = This->typeinfo->cImplTypes; (*ppTypeAttr)->cbSizeVft = This->typekind==TKIND_DISPATCH ? 28 : This->typeinfo->cbSizeVft;

1 0

Piotr Caban : oleaut32/tests: Make tests working on older systems, prevent crash on some wine boxes.
by Alexandre Julliard 18 Mar '10

18 Mar '10

Module: wine Branch: master Commit: cca98c460dfcebb56043335c07dfbe7ef22dc8df URL: http://source.winehq.org/git/wine.git/?a=commit;h=cca98c460dfcebb56043335c0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 17 22:05:20 2010 +0100 oleaut32/tests: Make tests working on older systems, prevent crash on some wine boxes. --- dlls/oleaut32/tests/typelib.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 6e44f58..8a8766a 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1076,6 +1076,10 @@ static void test_CreateTypeLib(void) { hres = ICreateTypeInfo_AddRefTypeInfo(createti, unknown, &hreftype); ok(hres == S_OK, "got %08x\n", hres); + if(hres != S_OK) { + skip("Skipping some tests\n"); + return; + } hres = ICreateTypeInfo_AddImplType(createti, 1, hreftype); ok(hres == TYPE_E_ELEMENTNOTFOUND, "got %08x\n", hres); @@ -1434,18 +1438,18 @@ static void test_CreateTypeLib(void) { hres = ICreateTypeLib2_SaveAllChanges(createtl); ok(hres == S_OK, "got %08x\n", hres); - hres = LoadTypeLibEx(filenameW, REGKIND_NONE, &tl); - ok(hres == S_OK, "got %08x\n", hres); - ok(ITypeInfo_Release(interface2)==0, "Object should be freed\n"); ok(ITypeInfo_Release(interface1)==0, "Object should be freed\n"); ok(ITypeInfo_Release(dual)==0, "Object should be freed\n"); ok(ICreateTypeLib2_Release(createtl)==0, "Object should be freed\n"); + ok(ITypeInfo_Release(dispatch)==0, "Object should be freed\n"); ok(ITypeInfo_Release(unknown)==0, "Object should be freed\n"); + ok(ITypeLib_Release(stdole)==0, "Object should be freed\n"); + hres = LoadTypeLibEx(filenameW, REGKIND_NONE, &tl); + ok(hres == S_OK, "got %08x\n", hres); ok(ITypeLib_Release(tl)==0, "Object should be freed\n"); - ok(ITypeLib_Release(stdole)==0, "Object should be freed\n"); DeleteFileA(filename); }

1 0

Piotr Caban : oleaut32: Fix ITypeInfo GetImplTypeFlags for dispinterfaces.
by Alexandre Julliard 18 Mar '10

18 Mar '10

Module: wine Branch: master Commit: d2319ae841dadf086d86819410e4b0085f167f55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2319ae841dadf086d8681941… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 17 22:05:36 2010 +0100 oleaut32: Fix ITypeInfo GetImplTypeFlags for dispinterfaces. --- dlls/oleaut32/typelib.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 08a39b9..b09f7ab 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5581,6 +5581,11 @@ static HRESULT WINAPI ITypeInfo_fnGetImplTypeFlags( ITypeInfo2 *iface, return S_OK; } *pImplTypeFlags=0; + + if(This->TypeAttr.typekind==TKIND_DISPATCH && !index) + return S_OK; + + WARN("ImplType %d not found\n", index); return TYPE_E_ELEMENTNOTFOUND; }

1 0

Piotr Caban : oleaut32: Improve ICreateTypeInfo2 AddImplType implementation .
by Alexandre Julliard 18 Mar '10

18 Mar '10

Module: wine Branch: master Commit: 15956152e559d8db116eb9e4f14679d1c84853c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15956152e559d8db116eb9e4f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 17 22:05:53 2010 +0100 oleaut32: Improve ICreateTypeInfo2 AddImplType implementation. --- dlls/oleaut32/typelib2.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index a6e12cd..71d725c 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -1853,6 +1853,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddImplType( ref->flags = 0; ref->oCustData = -1; ref->onext = -1; + This->typeinfo->cImplTypes++; } else if (This->typekind == TKIND_INTERFACE) { if (This->typeinfo->cImplTypes && index==1) return TYPE_E_BADMODULEKIND; @@ -1860,14 +1861,18 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddImplType( if( index != 0) return TYPE_E_ELEMENTNOTFOUND; This->typeinfo->datatype1 = hRefType; + This->typeinfo->cImplTypes = 1; } else if (This->typekind == TKIND_DISPATCH) { - FIXME("dispatch case unhandled.\n"); + if(index != 0) return TYPE_E_ELEMENTNOTFOUND; + + /* FIXME: Check if referenced typeinfo is IDispatch */ + This->typeinfo->flags |= TYPEFLAG_FDISPATCHABLE; + This->typeinfo->cImplTypes = 1; } else { FIXME("AddImplType unsupported on typekind %d\n", This->typekind); return E_OUTOFMEMORY; } - This->typeinfo->cImplTypes++; return S_OK; }

1 0

Piotr Caban : oleaut32: Improve ITypeInfo2 GetRefTypeOfImplType implementation.
by Alexandre Julliard 18 Mar '10

18 Mar '10

Module: wine Branch: master Commit: 926d3a88e7b5f9878bb8af35a3317a807721621b URL: http://source.winehq.org/git/wine.git/?a=commit;h=926d3a88e7b5f9878bb8af35a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 17 22:06:11 2010 +0100 oleaut32: Improve ITypeInfo2 GetRefTypeOfImplType implementation. --- dlls/oleaut32/typelib2.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 71d725c..8816e9d 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -3016,17 +3016,18 @@ static HRESULT WINAPI ITypeInfo2_fnGetRefTypeOfImplType( if(!pRefType) return E_INVALIDARG; - if(index == -1) { - if((This->typeinfo->typekind&0xf)==TKIND_DISPATCH - && (This->typeinfo->flags&TYPEFLAG_FDUAL)) { + if(This->typeinfo->flags&TYPEFLAG_FDUAL) { + if(index == -1) { *pRefType = -2; return S_OK; } - return TYPE_E_ELEMENTNOTFOUND; + if(This->typekind == TKIND_DISPATCH) + return ITypeInfo2_GetRefTypeOfImplType((ITypeInfo2*)&This->dual->lpVtblTypeInfo2, + index, pRefType); } - if(index >= This->typeinfo->cImplTypes) + if(index>=This->typeinfo->cImplTypes) return TYPE_E_ELEMENTNOTFOUND; if(This->typekind == TKIND_INTERFACE) {

1 0

Nikolay Sivov : urlmon: Add stub IUriBuilder interface.
by Alexandre Julliard 18 Mar '10

18 Mar '10

Module: wine Branch: master Commit: 1ad867467e3c094765bfe41b1ae7c9af08391453 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ad867467e3c094765bfe41b1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 18 01:19:02 2010 +0300 urlmon: Add stub IUriBuilder interface. --- dlls/urlmon/uri.c | 278 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/urlmon/urlmon.spec | 1 + include/urlmon.idl | 100 +++++++++++++++++ 3 files changed, 378 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1ad867467e3c094765bfe…

1 0

Henri Verbeet : ddraw: Acquire/ release the focus window from the correct location.
by Alexandre Julliard 18 Mar '10

18 Mar '10

Module: wine Branch: master Commit: 914c8cb8ea1e5cbcfa18558961185dd94313b26d URL: http://source.winehq.org/git/wine.git/?a=commit;h=914c8cb8ea1e5cbcfa1855896… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 17 21:59:49 2010 +0100 ddraw: Acquire/release the focus window from the correct location. --- dlls/d3d8/device.c | 16 ++++++++++++++++ dlls/d3d9/device.c | 15 +++++++++++++++ dlls/ddraw/ddraw.c | 9 +++++++++ dlls/ddraw/tests/d3d.c | 6 +++--- dlls/wined3d/device.c | 42 ++++++++++++++++++++++++++---------------- include/wine/wined3d.idl | 5 +++++ 6 files changed, 74 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=914c8cb8ea1e5cbcfa185…

1 0