September 2009 - Wine-commits

Nikolay Sivov : comctl32/header: Implement HDF_FIXEDWIDTH format flag.
by Alexandre Julliard 08 Sep '09

08 Sep '09

Module: wine Branch: master Commit: a4c22a142c2b305a02806b788f56aed219b07588 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4c22a142c2b305a02806b788… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Sep 6 02:24:26 2009 +0400 comctl32/header: Implement HDF_FIXEDWIDTH format flag. --- dlls/comctl32/header.c | 44 ++++++++++++++-------- dlls/comctl32/tests/header.c | 83 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 109 insertions(+), 18 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 7c8f161..15586c1 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -624,6 +624,13 @@ HEADER_InternalHitTest (const HEADER_INFO *infoPtr, const POINT *lpPt, UINT *pFl rcTest = rect; rcTest.right = rcTest.left + DIVIDER_WIDTH; if (PtInRect (&rcTest, *lpPt)) { + if (infoPtr->items[HEADER_PrevItem(infoPtr, iCount)].fmt & HDF_FIXEDWIDTH) + { + *pFlags |= HHT_ONHEADER; + *pItem = iCount; + TRACE("ON HEADER %d\n", *pItem); + return; + } if (bNoWidth) { *pFlags |= HHT_ONDIVOPEN; *pItem = HEADER_PrevItem(infoPtr, iCount); @@ -640,7 +647,9 @@ HEADER_InternalHitTest (const HEADER_INFO *infoPtr, const POINT *lpPt, UINT *pFl } rcTest = rect; rcTest.left = rcTest.right - DIVIDER_WIDTH; - if (PtInRect (&rcTest, *lpPt)) { + if (!(infoPtr->items[iCount].fmt & HDF_FIXEDWIDTH) && + PtInRect (&rcTest, *lpPt)) + { *pFlags |= HHT_ONDIVIDER; *pItem = iCount; TRACE("ON DIVIDER %d\n", *pItem); @@ -655,21 +664,24 @@ HEADER_InternalHitTest (const HEADER_INFO *infoPtr, const POINT *lpPt, UINT *pFl } /* check for last divider part (on nowhere) */ - rect = infoPtr->items[infoPtr->uNumItem-1].rect; - rect.left = rect.right; - rect.right += DIVIDER_WIDTH; - if (PtInRect (&rect, *lpPt)) { - if (bNoWidth) { - *pFlags |= HHT_ONDIVOPEN; - *pItem = infoPtr->uNumItem - 1; - TRACE("ON DIVOPEN %d\n", *pItem); - return; - } - else { - *pFlags |= HHT_ONDIVIDER; - *pItem = infoPtr->uNumItem-1; - TRACE("ON DIVIDER %d\n", *pItem); - return; + if (!(infoPtr->items[infoPtr->uNumItem-1].fmt & HDF_FIXEDWIDTH)) + { + rect = infoPtr->items[infoPtr->uNumItem-1].rect; + rect.left = rect.right; + rect.right += DIVIDER_WIDTH; + if (PtInRect (&rect, *lpPt)) { + if (bNoWidth) { + *pFlags |= HHT_ONDIVOPEN; + *pItem = infoPtr->uNumItem - 1; + TRACE("ON DIVOPEN %d\n", *pItem); + return; + } + else { + *pFlags |= HHT_ONDIVIDER; + *pItem = infoPtr->uNumItem-1; + TRACE("ON DIVIDER %d\n", *pItem); + return; + } } } diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index 611433e..3088a00 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -24,6 +24,7 @@ #include <assert.h> #include "wine/test.h" +#include "v6util.h" #include "msg.h" typedef struct tagEXPECTEDNOTIFY @@ -1083,7 +1084,6 @@ static void test_hdm_bitmapmarginMessages(HWND hParent) static void test_hdm_index_messages(HWND hParent) { - HWND hChild; int retVal; int loopcnt; @@ -1196,6 +1196,74 @@ static void test_hdm_index_messages(HWND hParent) DestroyWindow(hChild); } +static void test_hdf_fixedwidth(HWND hParent) +{ + HWND hChild; + HDITEM hdItem; + DWORD ret; + RECT rect; + HDHITTESTINFO ht; + + hChild = create_custom_header_control(hParent, FALSE); + + hdItem.mask = HDI_WIDTH | HDI_FORMAT; + hdItem.fmt = HDF_FIXEDWIDTH; + hdItem.cxy = 80; + + ret = SendMessage(hChild, HDM_INSERTITEM, 0, (LPARAM)&hdItem); + expect(0, ret); + + /* try to change width */ + rect.right = rect.bottom = 0; + SendMessage(hChild, HDM_GETITEMRECT, 0, (LPARAM)&rect); + ok(rect.right != 0, "Expected not zero width\n"); + ok(rect.bottom != 0, "Expected not zero height\n"); + + SendMessage(hChild, WM_LBUTTONDOWN, 0, MAKELPARAM(rect.right, rect.bottom / 2)); + SendMessage(hChild, WM_MOUSEMOVE, 0, MAKELPARAM(rect.right + 20, rect.bottom / 2)); + SendMessage(hChild, WM_LBUTTONUP, 0, MAKELPARAM(rect.right + 20, rect.bottom / 2)); + + SendMessage(hChild, HDM_GETITEMRECT, 0, (LPARAM)&rect); + + if (hdItem.cxy != rect.right) + { + win_skip("HDF_FIXEDWIDTH format not supported\n"); + DestroyWindow(hChild); + return; + } + + /* try to adjust with message */ + hdItem.mask = HDI_WIDTH; + hdItem.cxy = 90; + + ret = SendMessage(hChild, HDM_SETITEM, 0, (LPARAM)&hdItem); + expect(TRUE, ret); + + rect.right = 0; + SendMessage(hChild, HDM_GETITEMRECT, 0, (LPARAM)&rect); + expect(90, rect.right); + + /* hittesting doesn't report ondivider flag for HDF_FIXEDWIDTH */ + ht.pt.x = rect.right - 1; + ht.pt.y = rect.bottom / 2; + SendMessage(hChild, HDM_HITTEST, 0, (LPARAM)&ht); + expect(HHT_ONHEADER, ht.flags); + + /* try to adjust with message */ + hdItem.mask = HDI_FORMAT; + hdItem.fmt = 0; + + ret = SendMessage(hChild, HDM_SETITEM, 0, (LPARAM)&hdItem); + expect(TRUE, ret); + + ht.pt.x = 90; + ht.pt.y = rect.bottom / 2; + SendMessage(hChild, HDM_HITTEST, 0, (LPARAM)&ht); + expect(HHT_ONDIVIDER, ht.flags); + + DestroyWindow(hChild); +} + #define TEST_NMCUSTOMDRAW(draw_stage, item_spec, lparam, _left, _top, _right, _bottom) \ ok(nm->dwDrawStage == draw_stage, "Invalid dwDrawStage %d vs %d\n", draw_stage, nm->dwDrawStage); \ if (item_spec != -1) \ @@ -1558,6 +1626,7 @@ static int init(void) START_TEST(header) { HWND parent_hwnd; + ULONG_PTR ctx_cookie; if (!init()) return; @@ -1583,6 +1652,16 @@ START_TEST(header) test_hdm_unicodeformatMessages(parent_hwnd); test_hdm_bitmapmarginMessages(parent_hwnd); - DestroyWindow(parent_hwnd); + if (!load_v6_module(&ctx_cookie)) + { + DestroyWindow(parent_hwnd); + return; + } + + /* comctl32 version 6 tests start here */ + test_hdf_fixedwidth(parent_hwnd); + unload_v6_module(ctx_cookie); + + DestroyWindow(parent_hwnd); }

1 0

Nikolay Sivov : comctl32/listview: Implement LVS_EX_TRANSPARENTBKGND style.
by Alexandre Julliard 08 Sep '09

08 Sep '09

Module: wine Branch: master Commit: 5e1f5ebf6cac4b38f2c0cb6c93f472e1203e291b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e1f5ebf6cac4b38f2c0cb6c9… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Sep 5 16:48:15 2009 +0400 comctl32/listview: Implement LVS_EX_TRANSPARENTBKGND style. --- dlls/comctl32/listview.c | 16 ++++++++++++- dlls/comctl32/tests/listview.c | 50 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index afe7116..dd42104 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -7299,7 +7299,10 @@ static BOOL LISTVIEW_SetBkColor(LISTVIEW_INFO *infoPtr, COLORREF clrBk) if (clrBk == CLR_NONE) infoPtr->hBkBrush = (HBRUSH)GetClassLongPtrW(infoPtr->hwndSelf, GCLP_HBRBACKGROUND); else + { infoPtr->hBkBrush = CreateSolidBrush(clrBk); + infoPtr->dwLvExStyle &= ~LVS_EX_TRANSPARENTBKGND; + } LISTVIEW_InvalidateList(infoPtr); } @@ -7785,6 +7788,11 @@ static DWORD LISTVIEW_SetExtendedListViewStyle(LISTVIEW_INFO *infoPtr, DWORD dwM LISTVIEW_UpdateSize(infoPtr); } + if((infoPtr->dwLvExStyle ^ dwOldExStyle) & LVS_EX_TRANSPARENTBKGND) + { + if (infoPtr->dwLvExStyle & LVS_EX_TRANSPARENTBKGND) + LISTVIEW_SetBkColor(infoPtr, CLR_NONE); + } LISTVIEW_InvalidateList(infoPtr); return dwOldExStyle; @@ -8800,7 +8808,13 @@ static inline BOOL LISTVIEW_EraseBkgnd(const LISTVIEW_INFO *infoPtr, HDC hdc) if (!GetClipBox(hdc, &rc)) return FALSE; if (infoPtr->clrBk == CLR_NONE) - return SendMessageW(infoPtr->hwndNotify, WM_ERASEBKGND, (WPARAM)hdc, 0); + { + if (infoPtr->dwLvExStyle & LVS_EX_TRANSPARENTBKGND) + return SendMessageW(infoPtr->hwndNotify, WM_PRINTCLIENT, + (WPARAM)hdc, PRF_ERASEBKGND); + else + return SendMessageW(infoPtr->hwndNotify, WM_ERASEBKGND, (WPARAM)hdc, 0); + } /* for double buffered controls we need to do this during refresh */ if (infoPtr->dwLvExStyle & LVS_EX_DOUBLEBUFFER) return FALSE; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 244f3a5..5b39176 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -265,6 +265,11 @@ static const struct message setredraw_seq[] = { { 0 } }; +static const struct message lvs_ex_transparentbkgnd_seq[] = { + { WM_PRINTCLIENT, sent|lparam, 0, PRF_ERASEBKGND }, + { 0 } +}; + struct subclass_info { WNDPROC oldproc; @@ -3950,6 +3955,50 @@ static void test_scrollnotify(void) DestroyWindow(hwnd); } +static void test_LVS_EX_TRANSPARENTBKGND(void) +{ + HWND hwnd; + DWORD ret; + HDC hdc; + + hwnd = create_listview_control(0); + + ret = SendMessage(hwnd, LVM_SETBKCOLOR, 0, RGB(0, 0, 0)); + expect(TRUE, ret); + + SendMessage(hwnd, LVM_SETEXTENDEDLISTVIEWSTYLE, LVS_EX_TRANSPARENTBKGND, + LVS_EX_TRANSPARENTBKGND); + + ret = SendMessage(hwnd, LVM_GETBKCOLOR, 0, 0); + if (ret != CLR_NONE) + { + win_skip("LVS_EX_TRANSPARENTBKGND unsupported\n"); + DestroyWindow(hwnd); + return; + } + + /* try to set some back color and check this style bit */ + ret = SendMessage(hwnd, LVM_SETBKCOLOR, 0, RGB(0, 0, 0)); + expect(TRUE, ret); + ret = SendMessage(hwnd, LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); + ok(!(ret & LVS_EX_TRANSPARENTBKGND), "Expected LVS_EX_TRANSPARENTBKGND to unset\n"); + + /* now test what this style actually does */ + SendMessage(hwnd, LVM_SETEXTENDEDLISTVIEWSTYLE, LVS_EX_TRANSPARENTBKGND, + LVS_EX_TRANSPARENTBKGND); + + hdc = GetWindowDC(hwndparent); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + SendMessageA(hwnd, WM_ERASEBKGND, (WPARAM)hdc, 0); + ok_sequence(sequences, PARENT_SEQ_INDEX, lvs_ex_transparentbkgnd_seq, + "LVS_EX_TRANSPARENTBKGND parent", FALSE); + + ReleaseDC(hwndparent, hdc); + + DestroyWindow(hwnd); +} + START_TEST(listview) { HMODULE hComctl32; @@ -4032,6 +4081,7 @@ START_TEST(listview) test_canceleditlabel(); test_mapidindex(); test_scrollnotify(); + test_LVS_EX_TRANSPARENTBKGND(); unload_v6_module(ctx_cookie);

1 0

Jacek Caban : mshtml: Added HTML events test.
by Alexandre Julliard 08 Sep '09

08 Sep '09

Module: wine Branch: master Commit: d66b02b7b87eb0f75e23c204106a07171468bbf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d66b02b7b87eb0f75e23c2041… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 6 19:06:38 2009 +0200 mshtml: Added HTML events test. --- dlls/mshtml/tests/Makefile.in | 1 + dlls/mshtml/tests/events.c | 1557 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1558 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d66b02b7b87eb0f75e23c…

1 0

Jacek Caban : mshtml: Added IHTMLElement2::attachEvent implementation.
by Alexandre Julliard 08 Sep '09

08 Sep '09

Module: wine Branch: master Commit: 724fde7e9189a85ab677a4fbfbb1acc0ce461ab7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=724fde7e9189a85ab677a4fbf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 6 19:06:10 2009 +0200 mshtml: Added IHTMLElement2::attachEvent implementation. --- dlls/mshtml/htmlelem2.c | 6 ++- dlls/mshtml/htmlevent.c | 71 +++++++++++++++++++++++++++++++++++++++++++++-- dlls/mshtml/htmlevent.h | 1 + 3 files changed, 73 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index 4d6de2c..542baa7 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -605,8 +605,10 @@ static HRESULT WINAPI HTMLElement2_attachEvent(IHTMLElement2 *iface, BSTR event, IDispatch *pDisp, VARIANT_BOOL *pfResult) { HTMLElement *This = HTMLELEM2_THIS(iface); - FIXME("(%p)->(%s %p %p)\n", This, debugstr_w(event), pDisp, pfResult); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p %p)\n", This, debugstr_w(event), pDisp, pfResult); + + return attach_event(&This->node.event_target, This->node.doc, event, pDisp, pfResult); } static HRESULT WINAPI HTMLElement2_detachEvent(IHTMLElement2 *iface, BSTR event, IDispatch *pDisp) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index d732b86..4bde49a 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -127,6 +127,18 @@ eventid_t str_to_eid(LPCWSTR str) return EVENTID_LAST; } +static eventid_t attr_to_eid(LPCWSTR str) +{ + int i; + + for(i=0; i < sizeof(event_info)/sizeof(event_info[0]); i++) { + if(!strcmpW(event_info[i].attr_name, str)) + return i; + } + + return EVENTID_LAST; +} + typedef struct { DispatchEx dispex; const IHTMLEventObjVtbl *lpIHTMLEventObjVtbl; @@ -670,10 +682,11 @@ static IHTMLEventObj *create_event(HTMLDOMNode *target, eventid_t eid, nsIDOMEve return HTMLEVENTOBJ(ret); } -static void call_event_handlers(HTMLDocument *doc, event_target_t *event_target, +static void call_event_handlers(HTMLDocument *doc, IHTMLEventObj *event_obj, event_target_t *event_target, eventid_t eid, IDispatch *this_obj) { handler_vector_t *handler_vector; + DWORD i; HRESULT hres; if(!event_target || !(handler_vector = event_target->event_table[eid])) @@ -694,6 +707,25 @@ static void call_event_handlers(HTMLDocument *doc, event_target_t *event_target, else WARN("%s <<< %08x\n", debugstr_w(event_info[eid].name), hres); } + + if(handler_vector->handler_cnt) { + VARIANTARG arg; + DISPPARAMS dp = {&arg, NULL, 1, 0}; + + V_VT(&arg) = VT_DISPATCH; + V_DISPATCH(&arg) = (IDispatch*)event_obj; + + for(i=0; i < handler_vector->handler_cnt; i++) { + if(handler_vector->handlers[i]) { + TRACE("%s [%d] >>>\n", debugstr_w(event_info[eid].name), i); + hres = call_disp_func(handler_vector->handlers[i], &dp); + if(hres == S_OK) + TRACE("%s [%d] <<<\n", debugstr_w(event_info[eid].name), i); + else + WARN("%s [%d] <<< %08x\n", debugstr_w(event_info[eid].name), i, hres); + } + } + } } void fire_event(HTMLDocument *doc, eventid_t eid, nsIDOMNode *target, nsIDOMEvent *nsevent) @@ -718,7 +750,7 @@ void fire_event(HTMLDocument *doc, eventid_t eid, nsIDOMNode *target, nsIDOMEven node = get_node(doc, nsnode, FALSE); if(node) - call_event_handlers(doc, node->event_target, eid, (IDispatch*)HTMLDOMNODE(node)); + call_event_handlers(doc, event_obj, node->event_target, eid, (IDispatch*)HTMLDOMNODE(node)); if(!(event_info[eid].flags & EVENT_BUBBLE)) break; @@ -738,7 +770,7 @@ void fire_event(HTMLDocument *doc, eventid_t eid, nsIDOMNode *target, nsIDOMEven nsIDOMNode_Release(nsnode); if(event_info[eid].flags & EVENT_BUBBLE) - call_event_handlers(doc, doc->event_target, eid, (IDispatch*)HTMLDOC(doc)); + call_event_handlers(doc, event_obj, doc->event_target, eid, (IDispatch*)HTMLDOC(doc)); IHTMLEventObj_Release(event_obj); doc->window->event = prev_event; @@ -841,6 +873,39 @@ HRESULT get_event_handler(event_target_t **event_target, eventid_t eid, VARIANT return S_OK; } +HRESULT attach_event(event_target_t **event_target_ptr, HTMLDocument *doc, BSTR name, IDispatch *disp, VARIANT_BOOL *res) +{ + event_target_t *event_target; + eventid_t eid; + DWORD i = 0; + + eid = attr_to_eid(name); + if(eid == EVENTID_LAST) { + WARN("Unknown event\n"); + *res = VARIANT_TRUE; + return S_OK; + } + + event_target = get_event_target(event_target_ptr); + if(!event_target) + return E_OUTOFMEMORY; + + if(event_target->event_table[eid]) { + while(i < event_target->event_table[eid]->handler_cnt && event_target->event_table[eid]->handlers[i]) + i++; + if(i == event_target->event_table[eid]->handler_cnt && !alloc_handler_vector(event_target, eid, i+1)) + return E_OUTOFMEMORY; + }else if(!alloc_handler_vector(event_target, eid, i+1)) { + return E_OUTOFMEMORY; + } + + IDispatch_AddRef(disp); + event_target->event_table[eid]->handlers[i] = disp; + + *res = VARIANT_TRUE; + return S_OK; +} + void check_event_attr(HTMLDocument *doc, nsIDOMElement *nselem) { const PRUnichar *attr_value; diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 8ca4a96..3ea3d9d 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -41,6 +41,7 @@ void release_event_target(event_target_t*); void fire_event(HTMLDocument*,eventid_t,nsIDOMNode*,nsIDOMEvent*); HRESULT set_event_handler(event_target_t**,HTMLDocument*,eventid_t,VARIANT*); HRESULT get_event_handler(event_target_t**,eventid_t,VARIANT*); +HRESULT attach_event(event_target_t**,HTMLDocument*,BSTR,IDispatch*,VARIANT_BOOL*); static inline HRESULT set_node_event(HTMLDOMNode *node, eventid_t eid, VARIANT *var) {

1 0

Jacek Caban : mshtml: Store event handlers in vector structure.
by Alexandre Julliard 08 Sep '09

08 Sep '09

Module: wine Branch: master Commit: 86410d4a0ced55725a774ccac02f2f323144b9f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86410d4a0ced55725a774ccac… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 6 19:05:40 2009 +0200 mshtml: Store event handlers in vector structure. --- dlls/mshtml/htmlevent.c | 84 ++++++++++++++++++++++++++++++++--------- dlls/mshtml/mshtml_private.h | 5 ++ 2 files changed, 70 insertions(+), 19 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 6f3c606..d732b86 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1,5 +1,5 @@ /* - * Copyright 2008 Jacek Caban for CodeWeavers + * Copyright 2008-2009 Jacek Caban for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -32,8 +32,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); +typedef struct { + IDispatch *handler_prop; + DWORD handler_cnt; + IDispatch *handlers[0]; +} handler_vector_t; + struct event_target_t { - IDispatch *event_table[EVENTID_LAST]; + handler_vector_t *event_table[EVENTID_LAST]; }; static const WCHAR blurW[] = {'b','l','u','r',0}; @@ -667,12 +673,13 @@ static IHTMLEventObj *create_event(HTMLDOMNode *target, eventid_t eid, nsIDOMEve static void call_event_handlers(HTMLDocument *doc, event_target_t *event_target, eventid_t eid, IDispatch *this_obj) { + handler_vector_t *handler_vector; HRESULT hres; - if(!event_target || !event_target->event_table[eid]) + if(!event_target || !(handler_vector = event_target->event_table[eid])) return; - if(event_target->event_table[eid]) { + if(handler_vector->handler_prop) { DISPID named_arg = DISPID_THIS; VARIANTARG arg; DISPPARAMS dp = {&arg, &named_arg, 1, 1}; @@ -681,7 +688,7 @@ static void call_event_handlers(HTMLDocument *doc, event_target_t *event_target, V_DISPATCH(&arg) = this_obj; TRACE("%s >>>\n", debugstr_w(event_info[eid].name)); - hres = call_disp_func(event_target->event_table[eid], &dp); + hres = call_disp_func(handler_vector->handler_prop, &dp); if(hres == S_OK) TRACE("%s <<<\n", debugstr_w(event_info[eid].name)); else @@ -737,14 +744,49 @@ void fire_event(HTMLDocument *doc, eventid_t eid, nsIDOMNode *target, nsIDOMEven doc->window->event = prev_event; } -static HRESULT set_event_handler_disp(event_target_t **event_target, HTMLDocument *doc, eventid_t eid, IDispatch *disp) +static inline event_target_t *get_event_target(event_target_t **event_target_ptr) +{ + if(!*event_target_ptr) + *event_target_ptr = heap_alloc_zero(sizeof(event_target_t)); + return *event_target_ptr; +} + +static BOOL alloc_handler_vector(event_target_t *event_target, eventid_t eid, int cnt) { - if(!*event_target) - *event_target = heap_alloc_zero(sizeof(event_target_t)); - else if((*event_target)->event_table[eid]) - IDispatch_Release((*event_target)->event_table[eid]); + handler_vector_t *new_vector, *handler_vector = event_target->event_table[eid]; + + if(handler_vector) { + if(cnt <= handler_vector->handler_cnt) + return TRUE; + + new_vector = heap_realloc_zero(handler_vector, sizeof(handler_vector_t) + sizeof(IDispatch*)*cnt); + }else { + new_vector = heap_alloc_zero(sizeof(handler_vector_t) + sizeof(IDispatch*)*cnt); + } + + if(!new_vector) + return FALSE; - (*event_target)->event_table[eid] = disp; + new_vector->handler_cnt = cnt; + event_target->event_table[eid] = new_vector; + return TRUE; +} + +static HRESULT set_event_handler_disp(event_target_t **event_target_ptr, HTMLDocument *doc, eventid_t eid, IDispatch *disp) +{ + event_target_t *event_target; + + event_target = get_event_target(event_target_ptr); + if(!event_target) + return E_OUTOFMEMORY; + + if(!alloc_handler_vector(event_target, eid, 0)) + return E_OUTOFMEMORY; + + if(event_target->event_table[eid]->handler_prop) + 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); @@ -769,9 +811,9 @@ HRESULT set_event_handler(event_target_t **event_target, HTMLDocument *doc, even { switch(V_VT(var)) { case VT_NULL: - if(*event_target && (*event_target)->event_table[eid]) { - IDispatch_Release((*event_target)->event_table[eid]); - (*event_target)->event_table[eid] = 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; @@ -788,9 +830,9 @@ HRESULT set_event_handler(event_target_t **event_target, HTMLDocument *doc, even HRESULT get_event_handler(event_target_t **event_target, eventid_t eid, VARIANT *var) { - if(*event_target && (*event_target)->event_table[eid]) { + if(*event_target && (*event_target)->event_table[eid] && (*event_target)->event_table[eid]->handler_prop) { V_VT(var) = VT_DISPATCH; - V_DISPATCH(var) = (*event_target)->event_table[eid]; + V_DISPATCH(var) = (*event_target)->event_table[eid]->handler_prop; IDispatch_AddRef(V_DISPATCH(var)); }else { V_VT(var) = VT_NULL; @@ -836,11 +878,15 @@ void check_event_attr(HTMLDocument *doc, nsIDOMElement *nselem) void release_event_target(event_target_t *event_target) { - int i; + int i, j; for(i=0; i < EVENTID_LAST; i++) { - if(event_target->event_table[i]) - IDispatch_Release(event_target->event_table[i]); + if(event_target->event_table[i]) { + if(event_target->event_table[i]->handler_prop) + IDispatch_Release(event_target->event_table[i]->handler_prop); + for(j=0; j < event_target->event_table[i]->handler_cnt; j++) + IDispatch_Release(event_target->event_table[i]->handlers[j]); + } } heap_free(event_target); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index e98666b..d2b0ef8 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -721,6 +721,11 @@ static inline void * __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t len) return HeapReAlloc(GetProcessHeap(), 0, mem, len); } +static inline void * __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, size_t len) +{ + return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len); +} + static inline BOOL heap_free(void *mem) { return HeapFree(GetProcessHeap(), 0, mem);

1 0

Jacek Caban : mshtml: Added IHTMLDocument2::onclick property implementation .
by Alexandre Julliard 08 Sep '09

08 Sep '09

Module: wine Branch: master Commit: c0de3b79246cc025f23166283bdc539e782e9b84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0de3b79246cc025f23166283… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 6 19:00:02 2009 +0200 mshtml: Added IHTMLDocument2::onclick property implementation. --- dlls/mshtml/htmldoc.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index d5b6cbe..34d5636 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1138,15 +1138,19 @@ static HRESULT WINAPI HTMLDocument_get_onhelp(IHTMLDocument2 *iface, VARIANT *p) static HRESULT WINAPI HTMLDocument_put_onclick(IHTMLDocument2 *iface, VARIANT v) { HTMLDocument *This = HTMLDOC_THIS(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_doc_event(This, EVENTID_CLICK, &v); } static HRESULT WINAPI HTMLDocument_get_onclick(IHTMLDocument2 *iface, VARIANT *p) { HTMLDocument *This = HTMLDOC_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_doc_event(This, EVENTID_CLICK, p); } static HRESULT WINAPI HTMLDocument_put_ondblclick(IHTMLDocument2 *iface, VARIANT v)

1 0

Jacek Caban : mshtml: Improve IHTMLEventObj getter stubs.
by Alexandre Julliard 08 Sep '09

08 Sep '09

Module: wine Branch: master Commit: 6fae33de2a98c141b55da0caa2c2a00d4d5d9fed URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fae33de2a98c141b55da0caa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 6 18:58:26 2009 +0200 mshtml: Improve IHTMLEventObj getter stubs. --- dlls/mshtml/htmlevent.c | 55 +++++++++++++++++++++++++++++++++++++--------- 1 files changed, 44 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 0ba0a07..6f3c606 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -332,8 +332,11 @@ static HRESULT WINAPI HTMLEventObj_put_returnValue(IHTMLEventObj *iface, VARIANT static HRESULT WINAPI HTMLEventObj_get_returnValue(IHTMLEventObj *iface, VARIANT *p) { HTMLEventObj *This = HTMLEVENTOBJ_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + V_VT(p) = VT_EMPTY; + return S_OK; } static HRESULT WINAPI HTMLEventObj_put_cancelBubble(IHTMLEventObj *iface, VARIANT_BOOL v) @@ -346,22 +349,31 @@ static HRESULT WINAPI HTMLEventObj_put_cancelBubble(IHTMLEventObj *iface, VARIAN static HRESULT WINAPI HTMLEventObj_get_cancelBubble(IHTMLEventObj *iface, VARIANT_BOOL *p) { HTMLEventObj *This = HTMLEVENTOBJ_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + *p = VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI HTMLEventObj_get_fromElement(IHTMLEventObj *iface, IHTMLElement **p) { HTMLEventObj *This = HTMLEVENTOBJ_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + *p = NULL; + return S_OK; } static HRESULT WINAPI HTMLEventObj_get_toElement(IHTMLEventObj *iface, IHTMLElement **p) { HTMLEventObj *This = HTMLEVENTOBJ_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + *p = NULL; + return S_OK; } static HRESULT WINAPI HTMLEventObj_put_keyCode(IHTMLEventObj *iface, LONG v) @@ -428,29 +440,41 @@ static HRESULT WINAPI HTMLEventObj_get_type(IHTMLEventObj *iface, BSTR *p) static HRESULT WINAPI HTMLEventObj_get_qualifier(IHTMLEventObj *iface, BSTR *p) { HTMLEventObj *This = HTMLEVENTOBJ_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + *p = NULL; + return S_OK; } static HRESULT WINAPI HTMLEventObj_get_reason(IHTMLEventObj *iface, LONG *p) { HTMLEventObj *This = HTMLEVENTOBJ_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + *p = 0; + return S_OK; } static HRESULT WINAPI HTMLEventObj_get_x(IHTMLEventObj *iface, LONG *p) { HTMLEventObj *This = HTMLEVENTOBJ_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + *p = -1; + return S_OK; } static HRESULT WINAPI HTMLEventObj_get_y(IHTMLEventObj *iface, LONG *p) { HTMLEventObj *This = HTMLEVENTOBJ_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + *p = -1; + return S_OK; } static HRESULT WINAPI HTMLEventObj_get_clientX(IHTMLEventObj *iface, LONG *p) @@ -500,15 +524,21 @@ static HRESULT WINAPI HTMLEventObj_get_clientY(IHTMLEventObj *iface, LONG *p) static HRESULT WINAPI HTMLEventObj_get_offsetX(IHTMLEventObj *iface, LONG *p) { HTMLEventObj *This = HTMLEVENTOBJ_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + *p = 0; + return S_OK; } static HRESULT WINAPI HTMLEventObj_get_offsetY(IHTMLEventObj *iface, LONG *p) { HTMLEventObj *This = HTMLEVENTOBJ_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + *p = 0; + return S_OK; } static HRESULT WINAPI HTMLEventObj_get_screenX(IHTMLEventObj *iface, LONG *p) @@ -558,8 +588,11 @@ static HRESULT WINAPI HTMLEventObj_get_screenY(IHTMLEventObj *iface, LONG *p) static HRESULT WINAPI HTMLEventObj_get_srcFilter(IHTMLEventObj *iface, IDispatch **p) { HTMLEventObj *This = HTMLEVENTOBJ_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + *p = NULL; + return S_OK; } #undef HTMLEVENTOBJ_THIS

1 0

Jacek Caban : mshtml: Added IHTMLEventObj::get_screen[XY] implementation.
by Alexandre Julliard 08 Sep '09

08 Sep '09

Module: wine Branch: master Commit: ecaab0fcaee6d830bed98ff2ba5f10abc3e5482a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecaab0fcaee6d830bed98ff2b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 6 18:57:02 2009 +0200 mshtml: Added IHTMLEventObj::get_screen[XY] implementation. --- dlls/mshtml/htmlevent.c | 38 ++++++++++++++++++++++++++++++++++---- 1 files changed, 34 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 8479015..0ba0a07 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -514,15 +514,45 @@ static HRESULT WINAPI HTMLEventObj_get_offsetY(IHTMLEventObj *iface, LONG *p) static HRESULT WINAPI HTMLEventObj_get_screenX(IHTMLEventObj *iface, LONG *p) { HTMLEventObj *This = HTMLEVENTOBJ_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + PRInt32 x = 0; + + TRACE("(%p)->(%p)\n", This, p); + + if(This->nsevent) { + nsIDOMMouseEvent *mouse_event; + nsresult nsres; + + nsres = nsIDOMEvent_QueryInterface(This->nsevent, &IID_nsIDOMMouseEvent, (void**)&mouse_event); + if(NS_SUCCEEDED(nsres)) { + nsIDOMMouseEvent_GetScreenX(mouse_event, &x); + nsIDOMMouseEvent_Release(mouse_event); + } + } + + *p = x; + return S_OK; } static HRESULT WINAPI HTMLEventObj_get_screenY(IHTMLEventObj *iface, LONG *p) { HTMLEventObj *This = HTMLEVENTOBJ_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + PRInt32 y = 0; + + TRACE("(%p)->(%p)\n", This, p); + + if(This->nsevent) { + nsIDOMMouseEvent *mouse_event; + nsresult nsres; + + nsres = nsIDOMEvent_QueryInterface(This->nsevent, &IID_nsIDOMMouseEvent, (void**)&mouse_event); + if(NS_SUCCEEDED(nsres)) { + nsIDOMMouseEvent_GetScreenY(mouse_event, &y); + nsIDOMMouseEvent_Release(mouse_event); + } + } + + *p = y; + return S_OK; } static HRESULT WINAPI HTMLEventObj_get_srcFilter(IHTMLEventObj *iface, IDispatch **p)

1 0

Jacek Caban : mshtml: Added IHTMLEventObj::get_client[XY] implementation.
by Alexandre Julliard 08 Sep '09

08 Sep '09

Module: wine Branch: master Commit: be5e018b6e092a0994152e26d8dd49c45cf1ae84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be5e018b6e092a0994152e26d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 6 18:56:46 2009 +0200 mshtml: Added IHTMLEventObj::get_client[XY] implementation. --- dlls/mshtml/htmlevent.c | 38 ++++++++++++++++++++++++++++++++++---- 1 files changed, 34 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 6ef1d2f..8479015 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -456,15 +456,45 @@ static HRESULT WINAPI HTMLEventObj_get_y(IHTMLEventObj *iface, LONG *p) static HRESULT WINAPI HTMLEventObj_get_clientX(IHTMLEventObj *iface, LONG *p) { HTMLEventObj *This = HTMLEVENTOBJ_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + PRInt32 x = 0; + + TRACE("(%p)->(%p)\n", This, p); + + if(This->nsevent) { + nsIDOMMouseEvent *mouse_event; + nsresult nsres; + + nsres = nsIDOMEvent_QueryInterface(This->nsevent, &IID_nsIDOMMouseEvent, (void**)&mouse_event); + if(NS_SUCCEEDED(nsres)) { + nsIDOMMouseEvent_GetClientX(mouse_event, &x); + nsIDOMMouseEvent_Release(mouse_event); + } + } + + *p = x; + return S_OK; } static HRESULT WINAPI HTMLEventObj_get_clientY(IHTMLEventObj *iface, LONG *p) { HTMLEventObj *This = HTMLEVENTOBJ_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + PRInt32 y = 0; + + TRACE("(%p)->(%p)\n", This, p); + + if(This->nsevent) { + nsIDOMMouseEvent *mouse_event; + nsresult nsres; + + nsres = nsIDOMEvent_QueryInterface(This->nsevent, &IID_nsIDOMMouseEvent, (void**)&mouse_event); + if(NS_SUCCEEDED(nsres)) { + nsIDOMMouseEvent_GetClientY(mouse_event, &y); + nsIDOMMouseEvent_Release(mouse_event); + } + } + + *p = y; + return S_OK; } static HRESULT WINAPI HTMLEventObj_get_offsetX(IHTMLEventObj *iface, LONG *p)

1 0

Jacek Caban : mshtml: Added IHTMLEventObj::get_button implementation.
by Alexandre Julliard 08 Sep '09

08 Sep '09

Module: wine Branch: master Commit: 3ffef98dca4b2150b6d8238991149fc83146dc83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ffef98dca4b2150b6d823899… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 6 18:56:28 2009 +0200 mshtml: Added IHTMLEventObj::get_button implementation. --- dlls/mshtml/htmlevent.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 96be69e..6ef1d2f 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -396,8 +396,23 @@ static HRESULT WINAPI HTMLEventObj_get_keyCode(IHTMLEventObj *iface, LONG *p) static HRESULT WINAPI HTMLEventObj_get_button(IHTMLEventObj *iface, LONG *p) { HTMLEventObj *This = HTMLEVENTOBJ_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + PRUint16 button = 0; + + TRACE("(%p)->(%p)\n", This, p); + + if(This->nsevent) { + nsIDOMMouseEvent *mouse_event; + nsresult nsres; + + nsres = nsIDOMEvent_QueryInterface(This->nsevent, &IID_nsIDOMMouseEvent, (void**)&mouse_event); + if(NS_SUCCEEDED(nsres)) { + nsIDOMMouseEvent_GetButton(mouse_event, &button); + nsIDOMMouseEvent_Release(mouse_event); + } + } + + *p = button; + return S_OK; } static HRESULT WINAPI HTMLEventObj_get_type(IHTMLEventObj *iface, BSTR *p)

1 0