September 2012 - Wine-commits

Alexandre Julliard : user32: Refresh the frame when the style bits of a layered window are changed.
by Alexandre Julliard 13 Sep '12

13 Sep '12

Module: wine Branch: master Commit: b0fce2a02b5b3b5dda61b6fe1a653b2fe994de0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0fce2a02b5b3b5dda61b6fe1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 13 13:50:34 2012 +0200 user32: Refresh the frame when the style bits of a layered window are changed. --- dlls/user32/defwnd.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 0ac308c..af566bf 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -719,6 +719,16 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa SendMessageW( GetParent(hwnd), msg, wParam, lParam ); break; + case WM_STYLECHANGED: + if (wParam == GWL_STYLE && (GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_LAYERED)) + { + STYLESTRUCT *style = (STYLESTRUCT *)lParam; + if ((style->styleOld ^ style->styleNew) & (WS_CAPTION|WS_THICKFRAME|WS_VSCROLL|WS_HSCROLL)) + SetWindowPos( hwnd, 0, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOZORDER | + SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE ); + } + break; + case WM_APPCOMMAND: { HWND parent = GetParent(hwnd);

1 0

Alexandre Julliard : user32/tests: Add some tests for UpdateLayeredWindow.
by Alexandre Julliard 13 Sep '12

13 Sep '12

Module: wine Branch: master Commit: b9fa73a798a6f8735a91d993b1eea58defbf76fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9fa73a798a6f8735a91d993b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 13 13:50:57 2012 +0200 user32/tests: Add some tests for UpdateLayeredWindow. --- dlls/user32/tests/msg.c | 128 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 128 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 11830ad..0b63799 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -1721,6 +1721,7 @@ static BOOL (WINAPI *pTrackMouseEvent)(TRACKMOUSEEVENT*); static BOOL (WINAPI *pUnhookWinEvent)(HWINEVENTHOOK); static BOOL (WINAPI *pGetMonitorInfoA)(HMONITOR,LPMONITORINFO); static HMONITOR (WINAPI *pMonitorFromPoint)(POINT,DWORD); +static BOOL (WINAPI *pUpdateLayeredWindow)(HWND,HDC,POINT*,SIZE*,HDC,POINT*,COLORREF,BLENDFUNCTION*,DWORD); /* kernel32 functions */ static BOOL (WINAPI *pGetCPInfoExA)(UINT, DWORD, LPCPINFOEXA); @@ -1744,6 +1745,7 @@ static void init_procs(void) GET_PROC(user32, UnhookWinEvent) GET_PROC(user32, GetMonitorInfoA) GET_PROC(user32, MonitorFromPoint) + GET_PROC(user32, UpdateLayeredWindow) GET_PROC(kernel32, GetCPInfoExA) @@ -13772,6 +13774,131 @@ todo_wine CloseHandle(hthread); } +static const struct message WmSetLayeredStyle[] = { + { WM_STYLECHANGING, sent }, + { WM_STYLECHANGED, sent }, + { WM_GETTEXT, sent|defwinproc|optional }, + { 0 } +}; + +static const struct message WmSetLayeredStyle2[] = { + { WM_STYLECHANGING, sent }, + { WM_STYLECHANGED, sent }, + { WM_WINDOWPOSCHANGING, sent|optional|wparam|defwinproc, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_NCCALCSIZE, sent|optional|wparam|defwinproc, 1 }, + { WM_WINDOWPOSCHANGED, sent|optional|wparam|defwinproc, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, + { WM_MOVE, sent|optional|defwinproc|wparam, 0 }, + { WM_SIZE, sent|optional|defwinproc|wparam, SIZE_RESTORED }, + { 0 } +}; + +static void test_layered_window(void) +{ + HWND hwnd; + HDC hdc; + HBITMAP bmp; + BOOL ret; + SIZE size; + POINT pos, src; + RECT rect, client; + + if (!pUpdateLayeredWindow) + { + win_skip( "UpdateLayeredWindow not supported\n" ); + return; + } + + hdc = CreateCompatibleDC( 0 ); + bmp = CreateCompatibleBitmap( hdc, 300, 300 ); + SelectObject( hdc, bmp ); + + hwnd = CreateWindowExA(0, "TestWindowClass", NULL, WS_CAPTION | WS_THICKFRAME | WS_SYSMENU, + 100, 100, 300, 300, 0, 0, 0, NULL); + ok( hwnd != 0, "failed to create window\n" ); + ShowWindow( hwnd, SW_SHOWNORMAL ); + UpdateWindow( hwnd ); + flush_events(); + flush_sequence(); + + GetWindowRect( hwnd, &rect ); + GetClientRect( hwnd, &client ); + ok( client.right < rect.right - rect.left, "wrong client area\n" ); + ok( client.bottom < rect.bottom - rect.top, "wrong client area\n" ); + + src.x = src.y = 0; + pos.x = pos.y = 300; + size.cx = size.cy = 250; + ret = pUpdateLayeredWindow( hwnd, 0, &pos, &size, hdc, &src, 0, NULL, ULW_OPAQUE ); + ok( !ret, "UpdateLayeredWindow should fail on non-layered window\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + SetWindowLong( hwnd, GWL_EXSTYLE, GetWindowLong(hwnd, GWL_EXSTYLE) | WS_EX_LAYERED ); + ok_sequence( WmSetLayeredStyle, "WmSetLayeredStyle", FALSE ); + + ret = pUpdateLayeredWindow( hwnd, 0, &pos, &size, hdc, &src, 0, NULL, ULW_OPAQUE ); + ok( ret, "UpdateLayeredWindow failed err %u\n", GetLastError() ); + ok_sequence( WmEmptySeq, "UpdateLayeredWindow", FALSE ); + GetWindowRect( hwnd, &rect ); + ok( rect.left == 300 && rect.top == 300 && rect.right == 550 && rect.bottom == 550, + "wrong window rect %d,%d,%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + GetClientRect( hwnd, &rect ); + ok( rect.right == client.right - 50 && rect.bottom == client.bottom - 50, + "wrong client rect %d,%d,%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + + size.cx = 150; + pos.y = 200; + ret = pUpdateLayeredWindow( hwnd, 0, &pos, &size, hdc, &src, 0, NULL, ULW_OPAQUE ); + ok( ret, "UpdateLayeredWindow failed err %u\n", GetLastError() ); + ok_sequence( WmEmptySeq, "UpdateLayeredWindow", FALSE ); + GetWindowRect( hwnd, &rect ); + ok( rect.left == 300 && rect.top == 200 && rect.right == 450 && rect.bottom == 450, + "wrong window rect %d,%d,%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + GetClientRect( hwnd, &rect ); + ok( rect.right == client.right - 150 && rect.bottom == client.bottom - 50, + "wrong client rect %d,%d,%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + + SetWindowLong( hwnd, GWL_STYLE, + GetWindowLong(hwnd, GWL_STYLE) & ~(WS_CAPTION | WS_THICKFRAME | WS_SYSMENU) ); + ok_sequence( WmSetLayeredStyle2, "WmSetLayeredStyle2", FALSE ); + + size.cx = 200; + pos.x = 200; + ret = pUpdateLayeredWindow( hwnd, 0, &pos, &size, hdc, &src, 0, NULL, ULW_OPAQUE ); + ok( ret, "UpdateLayeredWindow failed err %u\n", GetLastError() ); + ok_sequence( WmEmptySeq, "UpdateLayeredWindow", FALSE ); + GetWindowRect( hwnd, &rect ); + ok( rect.left == 200 && rect.top == 200 && rect.right == 400 && rect.bottom == 450, + "wrong window rect %d,%d,%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + GetClientRect( hwnd, &rect ); + ok( (rect.right == 200 && rect.bottom == 250) || + broken(rect.right == client.right - 100 && rect.bottom == client.bottom - 50), + "wrong client rect %d,%d,%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + + size.cx = 0; + ret = pUpdateLayeredWindow( hwnd, 0, &pos, &size, hdc, &src, 0, NULL, ULW_OPAQUE ); + ok( !ret, "UpdateLayeredWindow should fail on non-layered window\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER || broken(ERROR_MR_MID_NOT_FOUND) /* win7 */, + "wrong error %u\n", GetLastError() ); + size.cx = 1; + size.cy = -1; + ret = pUpdateLayeredWindow( hwnd, 0, &pos, &size, hdc, &src, 0, NULL, ULW_OPAQUE ); + ok( !ret, "UpdateLayeredWindow should fail on non-layered window\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetWindowLong( hwnd, GWL_EXSTYLE, GetWindowLong(hwnd, GWL_EXSTYLE) & ~WS_EX_LAYERED ); + ok_sequence( WmSetLayeredStyle, "WmSetLayeredStyle", FALSE ); + GetWindowRect( hwnd, &rect ); + ok( rect.left == 200 && rect.top == 200 && rect.right == 400 && rect.bottom == 450, + "wrong window rect %d,%d,%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + GetClientRect( hwnd, &rect ); + ok( (rect.right == 200 && rect.bottom == 250) || + broken(rect.right == client.right - 100 && rect.bottom == client.bottom - 50), + "wrong client rect %d,%d,%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + + DestroyWindow( hwnd ); + DeleteDC( hdc ); + DeleteObject( bmp ); +} + START_TEST(msg) { char **test_argv; @@ -13884,6 +14011,7 @@ START_TEST(msg) test_clipboard_viewers(); test_keyflags(); test_hotkey(); + test_layered_window(); /* keep it the last test, under Windows it tends to break the tests * which rely on active/foreground windows being correct. */

1 0

Jacek Caban : mshtml: Added HTMLElement::ondataavailable implementation.
by Alexandre Julliard 13 Sep '12

13 Sep '12

Module: wine Branch: master Commit: 74453fb0fd685c2cb288ab601050a675b3714765 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74453fb0fd685c2cb288ab601… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 13 12:27:43 2012 +0200 mshtml: Added HTMLElement::ondataavailable implementation. --- dlls/mshtml/htmlelem.c | 12 ++++++++---- dlls/mshtml/htmlevent.c | 5 +++++ dlls/mshtml/htmlevent.h | 1 + 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index e44f97d..a12b8de 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1358,15 +1358,19 @@ static HRESULT WINAPI HTMLElement_get_ondatasetchanged(IHTMLElement *iface, VARI static HRESULT WINAPI HTMLElement_put_ondataavailable(IHTMLElement *iface, VARIANT v) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + FIXME("(%p)->(%s) semi-stub\n", This, debugstr_variant(&v)); + + return set_node_event(&This->node, EVENTID_DATAAVAILABLE, &v); } static HRESULT WINAPI HTMLElement_get_ondataavailable(IHTMLElement *iface, VARIANT *p) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_node_event(&This->node, EVENTID_DATAAVAILABLE, p); } static HRESULT WINAPI HTMLElement_put_ondatasetcomplete(IHTMLElement *iface, VARIANT v) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index f9f21df..333a26e 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -59,6 +59,9 @@ static const WCHAR onclickW[] = {'o','n','c','l','i','c','k',0}; static const WCHAR contextmenuW[] = {'c','o','n','t','e','x','t','m','e','n','u',0}; static const WCHAR oncontextmenuW[] = {'o','n','c','o','n','t','e','x','t','m','e','n','u',0}; +static const WCHAR dataavailableW[] = {'d','a','t','a','a','v','a','i','l','a','b','l','e',0}; +static const WCHAR ondataavailableW[] = {'o','n','d','a','t','a','a','v','a','i','l','a','b','l','e',0}; + static const WCHAR dblclickW[] = {'d','b','l','c','l','i','c','k',0}; static const WCHAR ondblclickW[] = {'o','n','d','b','l','c','l','i','c','k',0}; @@ -166,6 +169,8 @@ static const event_info_t event_info[] = { EVENT_DEFAULTLISTENER|EVENT_BUBBLE|EVENT_CANCELABLE|EVENT_HASDEFAULTHANDLERS}, {contextmenuW, oncontextmenuW, EVENTT_MOUSE, DISPID_EVMETH_ONCONTEXTMENU, EVENT_BUBBLE|EVENT_CANCELABLE}, + {dataavailableW, ondataavailableW, EVENTT_NONE, DISPID_EVMETH_ONDATAAVAILABLE, + EVENT_BUBBLE}, {dblclickW, ondblclickW, EVENTT_MOUSE, DISPID_EVMETH_ONDBLCLICK, EVENT_DEFAULTLISTENER|EVENT_BUBBLE|EVENT_CANCELABLE}, {dragW, ondragW, EVENTT_MOUSE, DISPID_EVMETH_ONDRAG, diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 983d128..f781e5c 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -22,6 +22,7 @@ typedef enum { EVENTID_CHANGE, EVENTID_CLICK, EVENTID_CONTEXTMENU, + EVENTID_DATAAVAILABLE, EVENTID_DBLCLICK, EVENTID_DRAG, EVENTID_DRAGSTART,

1 0

Jacek Caban : mshtml: Added IHTMLDocument4:: createEventObject implementation.
by Alexandre Julliard 13 Sep '12

13 Sep '12

Module: wine Branch: master Commit: fffb717b1be3049425ce34adb6ee746ff384bfa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fffb717b1be3049425ce34adb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 13 12:27:56 2012 +0200 mshtml: Added IHTMLDocument4::createEventObject implementation. --- dlls/mshtml/htmldoc3.c | 11 +++++++++-- dlls/mshtml/htmlevent.c | 29 ++++++++++++++++++++++++++--- dlls/mshtml/htmlevent.h | 1 + 3 files changed, 36 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmldoc3.c b/dlls/mshtml/htmldoc3.c index 5241325..6256450 100644 --- a/dlls/mshtml/htmldoc3.c +++ b/dlls/mshtml/htmldoc3.c @@ -762,8 +762,15 @@ static HRESULT WINAPI HTMLDocument4_createEventObject(IHTMLDocument4 *iface, VARIANT *pvarEventObject, IHTMLEventObj **ppEventObj) { HTMLDocument *This = impl_from_IHTMLDocument4(iface); - FIXME("(%p)->(%p %p)\n", This, pvarEventObject, ppEventObj); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(pvarEventObject), ppEventObj); + + if(pvarEventObject && V_VT(pvarEventObject) != VT_ERROR && V_VT(pvarEventObject) != VT_EMPTY) { + FIXME("unsupported pvarEventObject %s\n", debugstr_variant(pvarEventObject)); + return E_NOTIMPL; + } + + return create_event_obj(ppEventObj); } static HRESULT WINAPI HTMLDocument4_fireEvent(IHTMLDocument4 *iface, BSTR bstrEventName, diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 333a26e..eecff1c 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -364,6 +364,11 @@ static HRESULT WINAPI HTMLEventObj_get_srcElement(IHTMLEventObj *iface, IHTMLEle TRACE("(%p)->(%p)\n", This, p); + if(!This->target) { + *p = NULL; + return S_OK; + } + return IHTMLDOMNode_QueryInterface(&This->target->IHTMLDOMNode_iface, &IID_IHTMLElement, (void**)p); } @@ -581,6 +586,11 @@ static HRESULT WINAPI HTMLEventObj_get_type(IHTMLEventObj *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); + if(!This->type) { + *p = NULL; + return S_OK; + } + *p = SysAllocString(This->type->name); return *p ? S_OK : E_OUTOFMEMORY; } @@ -800,12 +810,12 @@ static HTMLEventObj *create_event(HTMLDOMNode *target, eventid_t eid, nsIDOMEven ret->IHTMLEventObj_iface.lpVtbl = &HTMLEventObjVtbl; ret->ref = 1; - ret->type = event_info+eid; + ret->type = eid != EVENTID_LAST ? event_info+eid : NULL; ret->nsevent = nsevent; if(nsevent) { nsIDOMEvent_AddRef(nsevent); - }else if(event_types[event_info[eid].type]) { + }else if(eid != EVENTID_LAST && event_types[event_info[eid].type]) { nsAString type_str; nsresult nsres; @@ -820,13 +830,26 @@ static HTMLEventObj *create_event(HTMLDOMNode *target, eventid_t eid, nsIDOMEven } ret->target = target; - IHTMLDOMNode_AddRef(&target->IHTMLDOMNode_iface); + if(target) + IHTMLDOMNode_AddRef(&target->IHTMLDOMNode_iface); init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLEventObj_iface, &HTMLEventObj_dispex); return ret; } +HRESULT create_event_obj(IHTMLEventObj **ret) +{ + HTMLEventObj *event; + + event = create_event(NULL, EVENTID_LAST, NULL); + if(!event) + return E_OUTOFMEMORY; + + *ret = &event->IHTMLEventObj_iface; + return S_OK; +} + static HRESULT call_disp_func(IDispatch *disp, DISPPARAMS *dp, VARIANT *retv) { IDispatchEx *dispex; diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index f781e5c..2917dee 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -60,6 +60,7 @@ HRESULT call_fire_event(HTMLDOMNode*,eventid_t) DECLSPEC_HIDDEN; void update_cp_events(HTMLInnerWindow*,event_target_t**,cp_static_data_t*,nsIDOMNode*) DECLSPEC_HIDDEN; HRESULT doc_init_events(HTMLDocumentNode*) DECLSPEC_HIDDEN; void detach_events(HTMLDocumentNode *doc) DECLSPEC_HIDDEN; +HRESULT create_event_obj(IHTMLEventObj**) DECLSPEC_HIDDEN; void init_nsevents(HTMLDocumentNode*) DECLSPEC_HIDDEN; void release_nsevents(HTMLDocumentNode*) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Added support for event object in HTMLElement:: fireEvent.
by Alexandre Julliard 13 Sep '12

13 Sep '12

Module: wine Branch: master Commit: 3de3d07054d586d60be9d36f6c5725c3f28134fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3de3d07054d586d60be9d36f6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 13 12:28:09 2012 +0200 mshtml: Added support for event object in HTMLElement::fireEvent. --- dlls/mshtml/htmlevent.c | 134 +++++++++++++++++++++++++++++++++------------- 1 files changed, 96 insertions(+), 38 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index eecff1c..6f1260a 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -788,6 +788,11 @@ static const IHTMLEventObjVtbl HTMLEventObjVtbl = { HTMLEventObj_get_srcFilter }; +static inline HTMLEventObj *unsafe_impl_from_IHTMLEventObj(IHTMLEventObj *iface) +{ + return iface->lpVtbl == &HTMLEventObjVtbl ? impl_from_IHTMLEventObj(iface) : NULL; +} + static const tid_t HTMLEventObj_iface_tids[] = { IHTMLEventObj_tid, 0 @@ -800,7 +805,7 @@ static dispex_static_data_t HTMLEventObj_dispex = { HTMLEventObj_iface_tids }; -static HTMLEventObj *create_event(HTMLDOMNode *target, eventid_t eid, nsIDOMEvent *nsevent) +static HTMLEventObj *create_event(void) { HTMLEventObj *ret; @@ -810,39 +815,43 @@ static HTMLEventObj *create_event(HTMLDOMNode *target, eventid_t eid, nsIDOMEven ret->IHTMLEventObj_iface.lpVtbl = &HTMLEventObjVtbl; ret->ref = 1; - ret->type = eid != EVENTID_LAST ? event_info+eid : NULL; - ret->nsevent = nsevent; + init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLEventObj_iface, &HTMLEventObj_dispex); + + return ret; +} + +static HRESULT set_event_info(HTMLEventObj *event, HTMLDOMNode *target, eventid_t eid, nsIDOMEvent *nsevent) +{ + event->type = event_info+eid; + event->nsevent = nsevent; + if(nsevent) { nsIDOMEvent_AddRef(nsevent); - }else if(eid != EVENTID_LAST && event_types[event_info[eid].type]) { + }else if(event_types[event_info[eid].type]) { nsAString type_str; nsresult nsres; nsAString_InitDepend(&type_str, event_types[event_info[eid].type]); - nsres = nsIDOMHTMLDocument_CreateEvent(target->doc->nsdoc, &type_str, &ret->nsevent); + nsres = nsIDOMHTMLDocument_CreateEvent(target->doc->nsdoc, &type_str, &event->nsevent); nsAString_Finish(&type_str); if(NS_FAILED(nsres)) { ERR("Could not create event: %08x\n", nsres); - IHTMLEventObj_Release(&ret->IHTMLEventObj_iface); - return NULL; + return E_FAIL; } } - ret->target = target; + event->target = target; if(target) IHTMLDOMNode_AddRef(&target->IHTMLDOMNode_iface); - - init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLEventObj_iface, &HTMLEventObj_dispex); - - return ret; + return S_OK; } HRESULT create_event_obj(IHTMLEventObj **ret) { HTMLEventObj *event; - event = create_event(NULL, EVENTID_LAST, NULL); + event = create_event(); if(!event) return E_OUTOFMEMORY; @@ -1021,9 +1030,8 @@ static void call_event_handlers(HTMLDocumentNode *doc, HTMLEventObj *event_obj, } } -void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, nsIDOMNode *target, nsIDOMEvent *nsevent) +static void fire_event_obj(HTMLDocumentNode *doc, eventid_t eid, HTMLEventObj *event_obj, nsIDOMNode *target) { - HTMLEventObj *event_obj = NULL; IHTMLEventObj *prev_event; nsIDOMNode *parent, *nsnode; BOOL prevent_default = FALSE; @@ -1037,17 +1045,7 @@ void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, nsIDOMNode window = doc->window; prev_event = window->event; - if(set_event) { - hres = get_node(doc, target, TRUE, &node); - if(FAILED(hres)) - return; - - event_obj = create_event(node, eid, nsevent); - node_release(node); - window->event = &event_obj->IHTMLEventObj_iface; - }else { - window->event = NULL; - } + window->event = &event_obj->IHTMLEventObj_iface; nsIDOMNode_GetNodeType(target, &node_type); nsnode = target; @@ -1111,8 +1109,6 @@ void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, nsIDOMNode if(event_obj && event_obj->prevent_default) prevent_default = TRUE; window->event = prev_event; - if(event_obj) - IHTMLEventObj_Release(&event_obj->IHTMLEventObj_iface); if(!prevent_default && (event_info[eid].flags & EVENT_HASDEFAULTHANDLERS)) { nsIDOMNode_AddRef(target); @@ -1125,7 +1121,7 @@ void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, nsIDOMNode if(node) { if(node->vtbl->handle_event) - hres = node->vtbl->handle_event(node, eid, nsevent, &prevent_default); + hres = node->vtbl->handle_event(node, eid, event_obj ? event_obj->nsevent : NULL, &prevent_default); node_release(node); if(FAILED(hres) || prevent_default || (event_obj && event_obj->cancel_bubble)) break; @@ -1143,15 +1139,46 @@ void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, nsIDOMNode nsIDOMNode_Release(nsnode); } - if(prevent_default && nsevent) { + if(prevent_default && event_obj && event_obj->nsevent) { TRACE("calling PreventDefault\n"); - nsIDOMEvent_PreventDefault(nsevent); + nsIDOMEvent_PreventDefault(event_obj->nsevent); } } -HRESULT dispatch_event(HTMLDOMNode *node, const WCHAR *event_name, VARIANT *event_obj, VARIANT_BOOL *cancelled) +void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, nsIDOMNode *target, nsIDOMEvent *nsevent) { + HTMLEventObj *event_obj = NULL; + HTMLDOMNode *node; + HRESULT hres; + + if(set_event) { + hres = get_node(doc, target, TRUE, &node); + if(FAILED(hres)) + return; + + event_obj = create_event(); + node_release(node); + if(!event_obj) + return; + + hres = set_event_info(event_obj, node, eid, nsevent); + if(FAILED(hres)) { + IHTMLEventObj_Release(&event_obj->IHTMLEventObj_iface); + return; + } + } + + fire_event_obj(doc, eid, event_obj, target); + + if(event_obj) + IHTMLEventObj_Release(&event_obj->IHTMLEventObj_iface); +} + +HRESULT dispatch_event(HTMLDOMNode *node, const WCHAR *event_name, VARIANT *event_var, VARIANT_BOOL *cancelled) +{ + HTMLEventObj *event_obj = NULL; eventid_t eid; + HRESULT hres; eid = attr_to_eid(event_name); if(eid == EVENTID_LAST) { @@ -1159,15 +1186,46 @@ HRESULT dispatch_event(HTMLDOMNode *node, const WCHAR *event_name, VARIANT *even return E_INVALIDARG; } - if(event_obj && V_VT(event_obj) != VT_EMPTY && V_VT(event_obj) != VT_ERROR) - FIXME("event_obj not implemented\n"); + if(event_var && V_VT(event_var) != VT_EMPTY && V_VT(event_var) != VT_ERROR) { + if(V_VT(event_var) != VT_DISPATCH) { + FIXME("event_var %s not supported\n", debugstr_variant(event_var)); + return E_NOTIMPL; + } - if(!(event_info[eid].flags & EVENT_DEFAULTLISTENER)) { - FIXME("not EVENT_DEFAULTEVENTHANDLER\n"); - return E_NOTIMPL; + if(V_DISPATCH(event_var)) { + IHTMLEventObj *event_iface; + + hres = IDispatch_QueryInterface(V_DISPATCH(event_var), &IID_IHTMLEventObj, (void**)&event_iface); + if(FAILED(hres)) { + FIXME("No IHTMLEventObj iface\n"); + return hres; + } + + event_obj = unsafe_impl_from_IHTMLEventObj(event_iface); + if(!event_obj) { + ERR("Not our IHTMLEventObj?\n"); + IHTMLEventObj_Release(event_iface); + return E_FAIL; + } + } } - fire_event(node->doc, eid, TRUE, node->nsnode, NULL); + if(event_obj) { + hres = set_event_info(event_obj, node, eid, NULL); + if(SUCCEEDED(hres)) + fire_event_obj(node->doc, eid, event_obj, node->nsnode); + + IHTMLEventObj_Release(&event_obj->IHTMLEventObj_iface); + if(FAILED(hres)) + return hres; + }else { + if(!(event_info[eid].flags & EVENT_DEFAULTLISTENER)) { + FIXME("not EVENT_DEFAULTEVENTHANDLER\n"); + return E_NOTIMPL; + } + + fire_event(node->doc, eid, TRUE, node->nsnode, NULL); + } *cancelled = VARIANT_TRUE; /* FIXME */ return S_OK;

1 0

Jacek Caban : mshtml: Added more events tests.
by Alexandre Julliard 13 Sep '12

13 Sep '12

Module: wine Branch: master Commit: fae1fff830f4ba4fda0d400ce59ad58382f8cc3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fae1fff830f4ba4fda0d400ce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 13 12:29:05 2012 +0200 mshtml: Added more events tests. --- dlls/mshtml/tests/events.html | 52 +++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/rsrc.rc | 3 ++ dlls/mshtml/tests/script.c | 1 + 3 files changed, 56 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/events.html b/dlls/mshtml/tests/events.html new file mode 100644 index 0000000..fbac741 --- /dev/null +++ b/dlls/mshtml/tests/events.html @@ -0,0 +1,52 @@ +<html> +<head> +<script> +function ok(b,m) { + return external.ok(b, m); +} + +function ondataavailable_test() { + var evobj, div, b = false; + + div = document.getElementById("divid"); + + function ondataavailableHandler() { + b = true; + ok(window.event === evobj, "window.event != evobj"); + + ok(evobj.srcElement === div, "evobj.srcElement = " + evobj.srcElement); + ok(evobj.fromElement === null, "evobj.srcElement = " + evobj.fromElement); + ok(evobj.toElement === null, "evobj.srcElement = " + evobj.toElement); + ok(evobj.type === "dataavailable", "evobj.type = " + evobj.type); + } + + div.attachEvent("ondataavailable", ondataavailableHandler); + + evobj = document.createEventObject(); + ok(evobj.srcElement === null, "evobj.srcElement = " + evobj.srcElement); + ok(evobj.fromElement === null, "evobj.srcElement = " + evobj.fromElement); + ok(evobj.toElement === null, "evobj.srcElement = " + evobj.toElement); + ok(evobj.type === "", "evobj.type = " + evobj.type); + + div.fireEvent("ondataavailable", evobj); + ok(b, "ondataavailable handler not called?"); + + ok(evobj.srcElement === div, "evobj.srcElement = " + evobj.srcElement); + ok(evobj.type === "dataavailable", "evobj.type = " + evobj.type); +} + +function runTests() { + try { + ondataavailable_test(); + }catch(e) { + ok(false, "Got an exception: " + e.message); + } + + external.reportSuccess(); +} +</script> +</head> +<body onload="runTests()"> +<div id="divid"></div> +</body> +</html> diff --git a/dlls/mshtml/tests/rsrc.rc b/dlls/mshtml/tests/rsrc.rc index fb74c45..52b4534 100644 --- a/dlls/mshtml/tests/rsrc.rc +++ b/dlls/mshtml/tests/rsrc.rc @@ -24,3 +24,6 @@ jstest.html HTML "jstest.html" /* @makedep: vbtest.html */ vbtest.html HTML "vbtest.html" + +/* @makedep: events.html */ +events.html HTML "events.html" diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index b5bd91b..59d03dd 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -2745,6 +2745,7 @@ static void run_js_tests(void) run_js_script("jstest.html"); run_js_script("exectest.html"); run_js_script("vbtest.html"); + run_js_script("events.html"); } static BOOL init_registry(BOOL init)

1 0

Jacek Caban : mshtml: Added IHTMLDocument4::fireEvent implementation.
by Alexandre Julliard 13 Sep '12

13 Sep '12

Module: wine Branch: master Commit: 05dc7eac8d21297f6eed0508a9e38b9d990a50ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=05dc7eac8d21297f6eed0508a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 13 12:29:17 2012 +0200 mshtml: Added IHTMLDocument4::fireEvent implementation. --- dlls/mshtml/htmldoc3.c | 6 ++++-- dlls/mshtml/htmlevent.c | 11 ++++------- dlls/mshtml/tests/events.html | 29 +++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/htmldoc3.c b/dlls/mshtml/htmldoc3.c index 6256450..f34f0a2 100644 --- a/dlls/mshtml/htmldoc3.c +++ b/dlls/mshtml/htmldoc3.c @@ -777,8 +777,10 @@ static HRESULT WINAPI HTMLDocument4_fireEvent(IHTMLDocument4 *iface, BSTR bstrEv VARIANT *pvarEventObject, VARIANT_BOOL *pfCanceled) { HTMLDocument *This = impl_from_IHTMLDocument4(iface); - FIXME("(%p)->(%s %p %p)\n", This, debugstr_w(bstrEventName), pvarEventObject, pfCanceled); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p %p)\n", This, debugstr_w(bstrEventName), pvarEventObject, pfCanceled); + + return dispatch_event(&This->doc_node->node, bstrEventName, pvarEventObject, pfCanceled); } static HRESULT WINAPI HTMLDocument4_createRenderStyle(IHTMLDocument4 *iface, BSTR v, diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 6f1260a..12ff2ff 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -364,13 +364,10 @@ static HRESULT WINAPI HTMLEventObj_get_srcElement(IHTMLEventObj *iface, IHTMLEle TRACE("(%p)->(%p)\n", This, p); - if(!This->target) { - *p = NULL; - return S_OK; - } - - return IHTMLDOMNode_QueryInterface(&This->target->IHTMLDOMNode_iface, &IID_IHTMLElement, - (void**)p); + *p = NULL; + if(This->target) + IHTMLDOMNode_QueryInterface(&This->target->IHTMLDOMNode_iface, &IID_IHTMLElement, (void**)p); + return S_OK; } static HRESULT WINAPI HTMLEventObj_get_altKey(IHTMLEventObj *iface, VARIANT_BOOL *p) diff --git a/dlls/mshtml/tests/events.html b/dlls/mshtml/tests/events.html index fbac741..ad9db3f 100644 --- a/dlls/mshtml/tests/events.html +++ b/dlls/mshtml/tests/events.html @@ -20,6 +20,16 @@ function ondataavailable_test() { ok(evobj.type === "dataavailable", "evobj.type = " + evobj.type); } + function ondataavailableDocHandler() { + b = true; + ok(window.event === evobj, "window.event != evobj"); + + ok(evobj.srcElement === null, "evobj.srcElement = " + evobj.srcElement); + ok(evobj.fromElement === null, "evobj.srcElement = " + evobj.fromElement); + ok(evobj.toElement === null, "evobj.srcElement = " + evobj.toElement); + ok(evobj.type === "dataavailable", "evobj.type = " + evobj.type); + } + div.attachEvent("ondataavailable", ondataavailableHandler); evobj = document.createEventObject(); @@ -33,6 +43,25 @@ function ondataavailable_test() { ok(evobj.srcElement === div, "evobj.srcElement = " + evobj.srcElement); ok(evobj.type === "dataavailable", "evobj.type = " + evobj.type); + + div.detachEvent("ondataavailable", ondataavailableHandler); + + b = false; + div.fireEvent("ondataavailable", evobj); + ok(!b, "ondataavailable handler called?"); + + ok(evobj.srcElement === div, "evobj.srcElement = " + evobj.srcElement); + ok(evobj.type === "dataavailable", "evobj.type = " + evobj.type); + + document.attachEvent("ondataavailable", ondataavailableDocHandler); + + evobj = document.createEventObject(); + + document.fireEvent("ondataavailable", evobj); + ok(b, "ondataavailable handler not called?"); + + ok(evobj.srcElement === null, "evobj.srcElement = " + evobj.srcElement); + ok(evobj.type === "dataavailable", "evobj.type = " + evobj.type); } function runTests() {

1 0

Jacek Caban : mshtml: Try using IWinInetHttpInfo if OnResponse was not called.
by Alexandre Julliard 13 Sep '12

13 Sep '12

Module: wine Branch: master Commit: a9829338694b27c893109070d0be8f4462a58961 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9829338694b27c893109070d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 13 12:29:30 2012 +0200 mshtml: Try using IWinInetHttpInfo if OnResponse was not called. --- dlls/mshtml/binding.h | 1 + dlls/mshtml/navigate.c | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index eef6053..0053e75 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -87,6 +87,7 @@ struct nsChannelBSC { nsISupports *nscontext; BOOL is_js; BOOL is_doc_channel; + BOOL response_processed; nsProtocolStream *nsstream; }; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 1046356..4bed605 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -754,6 +754,33 @@ static HRESULT process_response_headers(nsChannelBSC *This, const WCHAR *headers return S_OK; } +static void query_http_info(nsChannelBSC *This, IWinInetHttpInfo *wininet_info) +{ + const WCHAR *ptr; + DWORD len = 0; + WCHAR *buf; + + IWinInetHttpInfo_QueryInfo(wininet_info, HTTP_QUERY_RAW_HEADERS_CRLF, NULL, &len, NULL, NULL); + if(!len) + return; + + buf = heap_alloc(len); + if(!buf) + return; + + IWinInetHttpInfo_QueryInfo(wininet_info, HTTP_QUERY_RAW_HEADERS_CRLF, buf, &len, NULL, NULL); + if(!len) + return; + + ptr = strchrW(buf, '\r'); + if(ptr && ptr[1] == '\n') { + ptr += 2; + process_response_headers(This, ptr); + } + + heap_free(buf); +} + HRESULT start_binding(HTMLInnerWindow *inner_window, BSCallback *bscallback, IBindCtx *bctx) { IStream *str = NULL; @@ -1111,6 +1138,19 @@ static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream) nsresult nsres; HRESULT hres; + if(!This->response_processed) { + IWinInetHttpInfo *wininet_info; + + This->response_processed = TRUE; + if(This->bsc.binding) { + hres = IBinding_QueryInterface(This->bsc.binding, &IID_IWinInetHttpInfo, (void**)&wininet_info); + if(SUCCEEDED(hres)) { + query_http_info(This, wininet_info); + IWinInetHttpInfo_Release(wininet_info); + } + } + } + if(!This->nslistener) { BYTE buf[1024]; @@ -1601,6 +1641,7 @@ static HRESULT nsChannelBSC_on_response(BSCallback *bsc, DWORD response_code, nsChannelBSC *This = nsChannelBSC_from_BSCallback(bsc); HRESULT hres; + This->response_processed = TRUE; This->nschannel->response_status = response_code; if(response_headers) {

1 0

Piotr Caban : msvcrt: Fixed RTTI base pointer calculation if signature==0.
by Alexandre Julliard 13 Sep '12

13 Sep '12

Module: wine Branch: master Commit: f4e323baa47ca43bdc0d05406346536b29dca940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4e323baa47ca43bdc0d05406… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Sep 13 13:29:29 2012 +0200 msvcrt: Fixed RTTI base pointer calculation if signature==0. --- dlls/msvcrt/cpp.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index f8e0387..8a8af42 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -87,7 +87,7 @@ static void dump_obj_locator( const rtti_object_locator *ptr ) static void dump_obj_locator( const rtti_object_locator *ptr ) { int i; - char *base = ptr->signature == 0 ? (char*)GetModuleHandleW(NULL) : (char*)ptr - ptr->object_locator; + char *base = ptr->signature == 0 ? (char*)RtlPcToFileHeader((void*)ptr, (void**)&base) : (char*)ptr - ptr->object_locator; const rtti_object_hierarchy *h = (const rtti_object_hierarchy*)(base + ptr->type_hierarchy); const type_info *type_descriptor = (const type_info*)(base + ptr->type_descriptor); @@ -887,7 +887,7 @@ const type_info* CDECL MSVCRT___RTtypeid(void *cppobj) char *base; if(obj_locator->signature == 0) - base = (char*)GetModuleHandleW(NULL); + base = (char*)RtlPcToFileHeader((void*)obj_locator, (void**)&base); else base = (char*)obj_locator - obj_locator->object_locator; @@ -1015,7 +1015,7 @@ void* CDECL MSVCRT___RTDynamicCast(void *cppobj, int unknown, if (TRACE_ON(msvcrt)) dump_obj_locator(obj_locator); if(obj_locator->signature == 0) - base = (char*)GetModuleHandleW(NULL); + base = (char*)RtlPcToFileHeader((void*)obj_locator, (void**)&base); else base = (char*)obj_locator - obj_locator->object_locator;

1 0

Michael Stefaniuc : ntdll: IOCTL_DISK_GET_MEDIA_TYPES is the same as IOCTL_STORAGE_GET_MEDIA_TYPES.
by Alexandre Julliard 13 Sep '12

13 Sep '12

Module: wine Branch: master Commit: 3fa6bd0cedb06fdfa0c8aa843c456335dd56fc68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fa6bd0cedb06fdfa0c8aa843… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Sep 12 22:22:28 2012 +0200 ntdll: IOCTL_DISK_GET_MEDIA_TYPES is the same as IOCTL_STORAGE_GET_MEDIA_TYPES. --- dlls/ntdll/cdrom.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index ea7f01a..9137bb3 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -175,6 +175,7 @@ X(IOCTL_CDROM_SEEK_AUDIO_MSF) X(IOCTL_CDROM_SET_VOLUME) X(IOCTL_CDROM_STOP_AUDIO) X(IOCTL_CDROM_TRACK_ISRC) +X(IOCTL_DISK_GET_MEDIA_TYPES) X(IOCTL_DISK_MEDIA_REMOVAL) X(IOCTL_DVD_END_SESSION) X(IOCTL_DVD_GET_REGION) @@ -2907,6 +2908,7 @@ NTSTATUS CDROM_DeviceIoControl(HANDLE hDevice, else status = CDROM_ControlEjection(fd, lpInBuffer); break; + case IOCTL_DISK_GET_MEDIA_TYPES: case IOCTL_STORAGE_GET_MEDIA_TYPES: case IOCTL_STORAGE_GET_MEDIA_TYPES_EX: sz = sizeof(GET_MEDIA_TYPES);

1 0