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

Alexander Dorofeyev : ddraw: Implement FPU mode fixup in d3d7 device.
by Alexandre Julliard June 23, 2008

June 23, 2008

Module: wine Branch: master Commit: cb5e06c944251a5de16e12ecd2253c158764ee4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb5e06c944251a5de16e12ecd… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Fri Jun 20 02:49:46 2008 +0300 ddraw: Implement FPU mode fixup in d3d7 device. As documented in DirectX7 SDK, d3d7 devices set FPU mode (control word) on every call and restore it back to original state before returning, if created in DDSCL_FPUPRESERVE cooperative mode. This allows games to work with FPU in a possibly incompatible mode and avoid resetting it all the time. --- dlls/ddraw/ddraw.c | 2 - dlls/ddraw/ddraw_private.h | 3 +- dlls/ddraw/device.c | 1209 +++++++++++++++++++++++++++++++++++++++++--- dlls/ddraw/direct3d.c | 6 +- 4 files changed, 1135 insertions(+), 85 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cb5e06c944251a5de16e1…

1 0

Alexandre Julliard : winex11: Print more details on OpenGL load failure. Only print errors once.
by Alexandre Julliard June 23, 2008

June 23, 2008

Module: wine Branch: master Commit: aba003de4e923d35a570259fff66ac17618d023d URL: http://source.winehq.org/git/wine.git/?a=commit;h=aba003de4e923d35a570259ff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 23 22:56:10 2008 +0200 winex11: Print more details on OpenGL load failure. Only print errors once. --- dlls/winex11.drv/opengl.c | 256 ++++++++++++++++++++------------------------- 1 files changed, 113 insertions(+), 143 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aba003de4e923d35a5702…

1 0

Alistair Leslie-Hughes : shell32: Stop crash when an error occurs.
by Alexandre Julliard June 23, 2008

June 23, 2008

Module: wine Branch: master Commit: a850cafe6d0698676bbc8b75ac7f986e6bf7475d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a850cafe6d0698676bbc8b75a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jun 20 20:35:53 2008 +1000 shell32: Stop crash when an error occurs. --- dlls/shell32/tests/shlfolder.c | 32 ++++++++++++++++++-------------- 1 files changed, 18 insertions(+), 14 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 950f1d7..9bb7208 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -450,21 +450,25 @@ static void test_GetDisplayName(void) /* The pidl returned through the last parameter of SetNameOf is a simple one. */ hr = IShellFolder_SetNameOf(psfPersonal, NULL, pidlLast, wszDirName, SHGDN_NORMAL, &pidlNew); ok (SUCCEEDED(hr), "SetNameOf failed! hr = %08x\n", hr); - ok (((LPITEMIDLIST)((LPBYTE)pidlNew+pidlNew->mkid.cb))->mkid.cb == 0, - "pidl returned from SetNameOf should be simple!\n"); - - /* Passing an absolute path to SetNameOf fails. The HRESULT code indicates that SetNameOf - * is implemented on top of SHFileOperation in WinXP. */ - hr = IShellFolder_SetNameOf(psfPersonal, NULL, pidlNew, wszAbsoluteFilename, - SHGDN_FORPARSING, NULL); - ok (hr == HRESULT_FROM_WIN32(ERROR_CANCELLED), "SetNameOf succeeded! hr = %08x\n", hr); - - /* Rename the file back to its original name. SetNameOf ignores the fact, that the - * SHGDN flags specify an absolute path. */ - hr = IShellFolder_SetNameOf(psfPersonal, NULL, pidlNew, wszFileName, SHGDN_FORPARSING, NULL); - ok (SUCCEEDED(hr), "SetNameOf failed! hr = %08x\n", hr); + if(hr == S_OK) + { + ok (((LPITEMIDLIST)((LPBYTE)pidlNew+pidlNew->mkid.cb))->mkid.cb == 0, + "pidl returned from SetNameOf should be simple!\n"); + + /* Passing an absolute path to SetNameOf fails. The HRESULT code indicates that SetNameOf + * is implemented on top of SHFileOperation in WinXP. */ + hr = IShellFolder_SetNameOf(psfPersonal, NULL, pidlNew, wszAbsoluteFilename, + SHGDN_FORPARSING, NULL); + ok (hr == HRESULT_FROM_WIN32(ERROR_CANCELLED), "SetNameOf succeeded! hr = %08x\n", hr); + + /* Rename the file back to its original name. SetNameOf ignores the fact, that the + * SHGDN flags specify an absolute path. */ + hr = IShellFolder_SetNameOf(psfPersonal, NULL, pidlNew, wszFileName, SHGDN_FORPARSING, NULL); + ok (SUCCEEDED(hr), "SetNameOf failed! hr = %08x\n", hr); + + pILFree(pidlNew); + } - pILFree(pidlNew); IShellFolder_Release(psfPersonal); }

1 0

Alistair Leslie-Hughes : secur32: Fix crash under win98.
by Alexandre Julliard June 23, 2008

June 23, 2008

Module: wine Branch: master Commit: e53e82bf120f249f2424d161c5af6e2a2f736178 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e53e82bf120f249f2424d161c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 18 21:28:10 2008 +1000 secur32: Fix crash under win98. --- dlls/secur32/tests/schannel.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index c6d6052..b4eaf12 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -216,7 +216,8 @@ static void testAcquireSecurityContext(void) st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, NULL, NULL, NULL, NULL, &cred, NULL); ok(st == SEC_E_OK, "AcquireCredentialsHandleA failed: %08x\n", st); - pFreeCredentialsHandle(&cred); + if(st == SEC_E_OK) + pFreeCredentialsHandle(&cred); memset(&cred, 0, sizeof(cred)); st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, NULL, NULL, NULL, NULL, &cred, &exp);

1 0

Louis Lenders : d3dx9_*: Add version resources.
by Alexandre Julliard June 23, 2008

June 23, 2008

Module: wine Branch: master Commit: efb90c7fee15392c02565727a8e44c6b1bc65b7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=efb90c7fee15392c02565727a… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Thu Jun 19 08:01:49 2008 +0000 d3dx9_*: Add version resources. --- dlls/d3dx9_24/Makefile.in | 2 ++ dlls/d3dx9_24/version.rc | 26 ++++++++++++++++++++++++++ dlls/d3dx9_25/Makefile.in | 2 ++ dlls/d3dx9_25/version.rc | 26 ++++++++++++++++++++++++++ dlls/d3dx9_26/Makefile.in | 2 ++ dlls/d3dx9_26/version.rc | 26 ++++++++++++++++++++++++++ dlls/d3dx9_27/Makefile.in | 2 ++ dlls/d3dx9_27/version.rc | 26 ++++++++++++++++++++++++++ dlls/d3dx9_28/Makefile.in | 2 ++ dlls/d3dx9_28/version.rc | 26 ++++++++++++++++++++++++++ dlls/d3dx9_29/Makefile.in | 2 ++ dlls/d3dx9_29/version.rc | 26 ++++++++++++++++++++++++++ dlls/d3dx9_30/Makefile.in | 2 ++ dlls/d3dx9_30/version.rc | 26 ++++++++++++++++++++++++++ dlls/d3dx9_31/Makefile.in | 2 ++ dlls/d3dx9_31/version.rc | 26 ++++++++++++++++++++++++++ dlls/d3dx9_32/Makefile.in | 2 ++ dlls/d3dx9_32/version.rc | 26 ++++++++++++++++++++++++++ dlls/d3dx9_33/Makefile.in | 2 ++ dlls/d3dx9_33/version.rc | 26 ++++++++++++++++++++++++++ dlls/d3dx9_34/Makefile.in | 2 ++ dlls/d3dx9_34/version.rc | 26 ++++++++++++++++++++++++++ dlls/d3dx9_35/Makefile.in | 2 ++ dlls/d3dx9_35/version.rc | 26 ++++++++++++++++++++++++++ dlls/d3dx9_36/Makefile.in | 2 ++ dlls/d3dx9_36/version.rc | 26 ++++++++++++++++++++++++++ dlls/d3dx9_37/Makefile.in | 2 ++ dlls/d3dx9_37/version.rc | 26 ++++++++++++++++++++++++++ 28 files changed, 392 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=efb90c7fee15392c02565…

1 0

Jacek Caban : mshtml: Added IHTMLElement::put_onclick implementation.
by Alexandre Julliard June 23, 2008

June 23, 2008

Module: wine Branch: master Commit: 41bdff629fb6f0fa4420d1a567f26d7894cab114 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41bdff629fb6f0fa4420d1a56… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 23 09:54:51 2008 -0500 mshtml: Added IHTMLElement::put_onclick implementation. --- dlls/mshtml/htmlelem.c | 6 ++++-- dlls/mshtml/htmlevent.c | 13 +++++++++++++ dlls/mshtml/mshtml_private.h | 1 + 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index ce93399..3968156 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -443,8 +443,10 @@ static HRESULT WINAPI HTMLElement_get_onhelp(IHTMLElement *iface, VARIANT *p) static HRESULT WINAPI HTMLElement_put_onclick(IHTMLElement *iface, VARIANT v) { HTMLElement *This = HTMLELEM_THIS(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)->()\n", This); + + return set_node_event(&This->node, EVENTID_CLICK, &v); } static HRESULT WINAPI HTMLElement_get_onclick(IHTMLElement *iface, VARIANT *p) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index d155ed5..cfd6ebc 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -419,6 +419,19 @@ static HRESULT set_node_event_disp(HTMLDOMNode *node, eventid_t eid, IDispatch * return S_OK; } +HRESULT set_node_event(HTMLDOMNode *node, eventid_t eid, VARIANT *var) +{ + switch(V_VT(var)) { + case VT_DISPATCH: + return set_node_event_disp(node, eid, V_DISPATCH(var)); + + default: + FIXME("not supported vt=%d\n", V_VT(var)); + } + + return E_NOTIMPL; +} + void check_event_attr(HTMLDocument *doc, nsIDOMElement *nselem) { const PRUnichar *attr_value; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 38dc715..3842591 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -505,6 +505,7 @@ nsresult get_nsinterface(nsISupports*,REFIID,void**); void check_event_attr(HTMLDocument*,nsIDOMElement*); void release_event_target(event_target_t*); void fire_event(HTMLDocument*,eventid_t,nsIDOMNode*); +HRESULT set_node_event(HTMLDOMNode*,eventid_t,VARIANT*); eventid_t str_to_eid(LPCWSTR); void set_document_bscallback(HTMLDocument*,nsChannelBSC*);

1 0

Jacek Caban : mshtml: Added generic HTML event listener and use it for click event.
by Alexandre Julliard June 23, 2008

June 23, 2008

Module: wine Branch: master Commit: cf51da73f6cfe5bae5f042feacdb5e93b5713835 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf51da73f6cfe5bae5f042fea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 23 09:54:33 2008 -0500 mshtml: Added generic HTML event listener and use it for click event. --- dlls/mshtml/htmlevent.c | 43 ++++++++++++++++++++++++++--- dlls/mshtml/mshtml_private.h | 5 +++ dlls/mshtml/nsevents.c | 61 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 104 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 6583716..d155ed5 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -44,13 +44,29 @@ static const WCHAR onloadW[] = {'o','n','l','o','a','d',0}; typedef struct { LPCWSTR name; LPCWSTR attr_name; + DWORD flags; } event_info_t; +#define EVENT_DEFAULTLISTENER 0x0001 + static const event_info_t event_info[] = { - {clickW, onclickW}, - {loadW, onloadW} + {clickW, onclickW, EVENT_DEFAULTLISTENER}, + {loadW, onloadW, 0} }; +eventid_t str_to_eid(LPCWSTR str) +{ + int i; + + for(i=0; i < sizeof(event_info)/sizeof(event_info[0]); i++) { + if(!strcmpW(event_info[i].name, str)) + return i; + } + + ERR("unknown type %s\n", debugstr_w(str)); + return EVENTID_LAST; +} + typedef struct { const IHTMLEventObjVtbl *lpIHTMLEventObjVtbl; LONG ref; @@ -385,6 +401,24 @@ void fire_event(HTMLDocument *doc, eventid_t eid, nsIDOMNode *target) } } +static HRESULT set_node_event_disp(HTMLDOMNode *node, eventid_t eid, IDispatch *disp) +{ + if(!node->event_target) + node->event_target = heap_alloc_zero(sizeof(event_target_t)); + else if(node->event_target->event_table[eid]) + IDispatch_Release(node->event_target->event_table[eid]); + + IDispatch_AddRef(disp); + node->event_target->event_table[eid] = disp; + + if((event_info[eid].flags & EVENT_DEFAULTLISTENER) && !node->doc->nscontainer->event_vector[eid]) { + node->doc->nscontainer->event_vector[eid] = TRUE; + add_nsevent_listener(node->doc->nscontainer, event_info[eid].name); + } + + return S_OK; +} + void check_event_attr(HTMLDocument *doc, nsIDOMElement *nselem) { const PRUnichar *attr_value; @@ -410,9 +444,8 @@ void check_event_attr(HTMLDocument *doc, nsIDOMElement *nselem) disp = script_parse_event(doc, attr_value); if(disp) { node = get_node(doc, (nsIDOMNode*)nselem, TRUE); - if(!node->event_target) - node->event_target = heap_alloc_zero(sizeof(event_target_t)); - node->event_target->event_table[i] = disp; + set_node_event_disp(node, i, disp); + IDispatch_Release(disp); } } } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 2522125..38dc715 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -289,6 +289,7 @@ struct NSContainer { nsEventListener keypress_listener; nsEventListener load_listener; nsEventListener node_insert_listener; + nsEventListener htmlevent_listener; nsIWebBrowser *webbrowser; nsIWebNavigation *navigation; @@ -309,6 +310,8 @@ struct NSContainer { nsChannelBSC *bscallback; /* hack */ HWND reset_focus; /* hack */ + + BOOL event_vector[EVENTID_LAST]; }; typedef struct { @@ -496,11 +499,13 @@ nsIWritableVariant *create_nsvariant(void); void nsnode_to_nsstring(nsIDOMNode*,nsAString*); void get_editor_controller(NSContainer*); void init_nsevents(NSContainer*); +void add_nsevent_listener(NSContainer*,LPCWSTR); nsresult get_nsinterface(nsISupports*,REFIID,void**); void check_event_attr(HTMLDocument*,nsIDOMElement*); void release_event_target(event_target_t*); void fire_event(HTMLDocument*,eventid_t,nsIDOMNode*); +eventid_t str_to_eid(LPCWSTR); void set_document_bscallback(HTMLDocument*,nsChannelBSC*); void set_current_mon(HTMLDocument*,IMoniker*); diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 5b72a2d..d0f5079 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -211,6 +211,42 @@ static nsresult NSAPI handle_node_insert(nsIDOMEventListener *iface, nsIDOMEvent return NS_OK; } +static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent *event) +{ + NSContainer *This = NSEVENTLIST_THIS(iface)->This; + const PRUnichar *type; + nsIDOMEventTarget *event_target; + nsIDOMNode *nsnode; + nsAString type_str; + eventid_t eid; + nsresult nsres; + + nsAString_Init(&type_str, NULL); + nsIDOMEvent_GetType(event, &type_str); + nsAString_GetData(&type_str, &type); + eid = str_to_eid(type); + nsAString_Finish(&type_str); + + nsres = nsIDOMEvent_GetTarget(event, &event_target); + if(NS_FAILED(nsres) || !event_target) { + ERR("GetEventTarget failed: %08x\n", nsres); + return NS_OK; + } + + nsres = nsIDOMEventTarget_QueryInterface(event_target, &IID_nsIDOMNode, (void**)&nsnode); + nsIDOMEventTarget_Release(event_target); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIDOMNode: %08x\n", nsres); + return NS_OK; + } + + fire_event(This->doc, eid, nsnode); + + nsIDOMNode_Release(nsnode); + + return NS_OK; +} + #undef NSEVENTLIST_THIS #define EVENTLISTENER_VTBL(handler) \ @@ -226,6 +262,7 @@ static const nsIDOMEventListenerVtbl focus_vtbl = EVENTLISTENER_VTBL(handle_ static const nsIDOMEventListenerVtbl keypress_vtbl = EVENTLISTENER_VTBL(handle_keypress); static const nsIDOMEventListenerVtbl load_vtbl = EVENTLISTENER_VTBL(handle_load); static const nsIDOMEventListenerVtbl node_insert_vtbl = EVENTLISTENER_VTBL(handle_node_insert); +static const nsIDOMEventListenerVtbl htmlevent_vtbl = EVENTLISTENER_VTBL(handle_htmlevent); static void init_event(nsIDOMEventTarget *target, const PRUnichar *type, nsIDOMEventListener *listener, BOOL capture) @@ -248,6 +285,29 @@ static void init_listener(nsEventListener *This, NSContainer *container, This->This = container; } +void add_nsevent_listener(NSContainer *container, LPCWSTR type) +{ + nsIDOMWindow *dom_window; + nsIDOMEventTarget *target; + nsresult nsres; + + nsres = nsIWebBrowser_GetContentDOMWindow(container->webbrowser, &dom_window); + if(NS_FAILED(nsres)) { + ERR("GetContentDOMWindow failed: %08x\n", nsres); + return; + } + + nsres = nsIDOMWindow_QueryInterface(dom_window, &IID_nsIDOMEventTarget, (void**)&target); + nsIDOMWindow_Release(dom_window); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIDOMEventTarget interface: %08x\n", nsres); + return; + } + + init_event(target, type, NSEVENTLIST(&container->htmlevent_listener), TRUE); + nsIDOMEventTarget_Release(target); +} + void init_nsevents(NSContainer *This) { nsIDOMWindow *dom_window; @@ -266,6 +326,7 @@ void init_nsevents(NSContainer *This) init_listener(&This->keypress_listener, This, &keypress_vtbl); init_listener(&This->load_listener, This, &load_vtbl); init_listener(&This->node_insert_listener, This, &node_insert_vtbl); + init_listener(&This->htmlevent_listener, This, &htmlevent_vtbl); nsres = nsIWebBrowser_GetContentDOMWindow(This->webbrowser, &dom_window); if(NS_FAILED(nsres)) {

1 0

Jacek Caban : mshtml: Use heap_alloc_zero in NSContainer_Create.
by Alexandre Julliard June 23, 2008

June 23, 2008

Module: wine Branch: master Commit: 97298e66ec527260f5c85bad325b7e675c3a0e47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97298e66ec527260f5c85bad3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 23 09:54:16 2008 -0500 mshtml: Use heap_alloc_zero in NSContainer_Create. --- dlls/mshtml/nsembed.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index cec3598..73aba16 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1643,7 +1643,7 @@ NSContainer *NSContainer_Create(HTMLDocument *doc, NSContainer *parent) if(!load_gecko(FALSE)) return NULL; - ret = heap_alloc(sizeof(NSContainer)); + ret = heap_alloc_zero(sizeof(NSContainer)); ret->lpWebBrowserChromeVtbl = &nsWebBrowserChromeVtbl; ret->lpContextMenuListenerVtbl = &nsContextMenuListenerVtbl; @@ -1656,11 +1656,6 @@ NSContainer *NSContainer_Create(HTMLDocument *doc, NSContainer *parent) ret->doc = doc; ret->ref = 1; - ret->bscallback = NULL; - ret->content_listener = NULL; - ret->editor_controller = NULL; - ret->editor = NULL; - ret->reset_focus = NULL; nsres = nsIComponentManager_CreateInstanceByContractID(pCompMgr, NS_WEBBROWSER_CONTRACTID, NULL, &IID_nsIWebBrowser, (void**)&ret->webbrowser);

1 0

Jacek Caban : mshtml: Added onclick attribute support.
by Alexandre Julliard June 23, 2008

June 23, 2008

Module: wine Branch: master Commit: 01dc47c884b9461e50762fd9fd398509f34845b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01dc47c884b9461e50762fd9f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 23 09:54:00 2008 -0500 mshtml: Added onclick attribute support. --- dlls/mshtml/htmlevent.c | 4 ++++ dlls/mshtml/mshtml_private.h | 11 ++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 73c0981..6583716 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -35,6 +35,9 @@ struct event_target_t { IDispatch *event_table[EVENTID_LAST]; }; +static const WCHAR clickW[] = {'c','l','i','c','k',0}; +static const WCHAR onclickW[] = {'o','n','c','l','i','c','k',0}; + static const WCHAR loadW[] = {'l','o','a','d',0}; static const WCHAR onloadW[] = {'o','n','l','o','a','d',0}; @@ -44,6 +47,7 @@ typedef struct { } event_info_t; static const event_info_t event_info[] = { + {clickW, onclickW}, {loadW, onloadW} }; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index c42eb6a..2522125 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -98,6 +98,12 @@ typedef enum { LAST_tid } tid_t; +typedef enum { + EVENTID_CLICK, + EVENTID_LOAD, + EVENTID_LAST +} eventid_t; + typedef struct dispex_data_t dispex_data_t; typedef struct dispex_dynamic_data_t dispex_dynamic_data_t; @@ -492,11 +498,6 @@ void get_editor_controller(NSContainer*); void init_nsevents(NSContainer*); nsresult get_nsinterface(nsISupports*,REFIID,void**); -typedef enum { - EVENTID_LOAD, - EVENTID_LAST -} eventid_t; - void check_event_attr(HTMLDocument*,nsIDOMElement*); void release_event_target(event_target_t*); void fire_event(HTMLDocument*,eventid_t,nsIDOMNode*);

1 0

Jacek Caban : mshtml: Added IHTMLImgElement::put_src implementation.
by Alexandre Julliard June 23, 2008

June 23, 2008

Module: wine Branch: master Commit: 23ad09865e28cf9ffa4bc816514d4b858cf2a626 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23ad09865e28cf9ffa4bc8165… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 23 09:52:40 2008 -0500 mshtml: Added IHTMLImgElement::put_src implementation. --- dlls/mshtml/htmlimg.c | 24 ++++++++++++++++++++++-- dlls/mshtml/nsiface.idl | 33 +++++++++++++++++++++++++++++++++ dlls/mshtml/tests/dom.c | 26 +++++++++++++++++++++++++- 3 files changed, 80 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index 92647be..a2494df 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -35,6 +35,8 @@ typedef struct { HTMLElement element; const IHTMLImgElementVtbl *lpHTMLImgElementVtbl; + + nsIDOMHTMLImageElement *nsimg; } HTMLImgElement; #define HTMLIMG(x) ((IHTMLImgElement*) &(x)->lpHTMLImgElementVtbl) @@ -240,8 +242,18 @@ static HRESULT WINAPI HTMLImgElement_get_alt(IHTMLImgElement *iface, BSTR *p) static HRESULT WINAPI HTMLImgElement_put_src(IHTMLImgElement *iface, BSTR v) { HTMLImgElement *This = HTMLIMG_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString src_str; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_Init(&src_str, v); + nsres = nsIDOMHTMLImageElement_SetSrc(This->nsimg, &src_str); + nsAString_Finish(&src_str); + if(NS_FAILED(nsres)) + ERR("SetSrc failed: %08x\n", nsres); + + return NS_OK; } static HRESULT WINAPI HTMLImgElement_get_src(IHTMLImgElement *iface, BSTR *p) @@ -516,6 +528,9 @@ static void HTMLImgElement_destructor(HTMLDOMNode *iface) { HTMLImgElement *This = HTMLIMG_NODE_THIS(iface); + if(This->nsimg) + nsIDOMHTMLImageElement_Release(This->nsimg); + HTMLElement_destructor(&This->element.node); } @@ -544,10 +559,15 @@ static dispex_static_data_t HTMLImgElement_dispex = { HTMLElement *HTMLImgElement_Create(nsIDOMHTMLElement *nselem) { HTMLImgElement *ret = heap_alloc_zero(sizeof(HTMLImgElement)); + nsresult nsres; ret->lpHTMLImgElementVtbl = &HTMLImgElementVtbl; ret->element.node.vtbl = &HTMLImgElementImplVtbl; + nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLImageElement, (void**)&ret->nsimg); + if(NS_FAILED(nsres)) + ERR("Could not get nsIDOMHTMLImageElement: %08x\n", nsres); + init_dispex(&ret->element.node.dispex, (IUnknown*)HTMLIMG(ret), &HTMLImgElement_dispex); HTMLElement_Init(&ret->element); diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 62bead1..42e6eb0 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -1297,6 +1297,39 @@ interface nsIDOMHTMLScriptElement : nsIDOMHTMLElement [ object, + uuid(a6cf90ab-15b3-11d2-932e-00805f8add32), + local +] +interface nsIDOMHTMLImageElement : nsIDOMHTMLElement +{ + nsresult GetName(nsAString *aName); + nsresult SetName(const nsAString *aName); + nsresult GetAlign(nsAString *aAlign); + nsresult SetAlign(const nsAString *aAlign); + nsresult GetAlt(nsAString *aAlt); + nsresult SetAlt(const nsAString *aAlt); + nsresult GetBorder(nsAString *aBorder); + nsresult SetBorder(const nsAString *aBorder); + nsresult GetHeight(PRInt32 *aHeight); + nsresult SetHeight(PRInt32 aHeight); + nsresult GetHspace(PRInt32 *aHspace); + nsresult SetHspace(PRInt32 aHspace); + nsresult GetIsMap(PRBool *aIsMap); + nsresult SetIsMap(PRBool aIsMap); + nsresult GetLongDesc(nsAString *aLongDesc); + nsresult SetLongDesc(const nsAString *aLongDesc); + nsresult GetSrc(nsAString *aSrc); + nsresult SetSrc(const nsAString *aSrc); + nsresult GetUseMap(nsAString *aUseMap); + nsresult SetUseMap(const nsAString *aUseMap); + nsresult GetVspace(PRInt32 *aVspace); + nsresult SetVspace(PRInt32 aVspace); + nsresult GetWidth(PRInt32 *aWidth); + nsresult SetWidth(PRInt32 aWidth); +} + +[ + object, uuid(94928ab3-8b63-11d3-989d-001083010e9b), local /* FROZEN */ diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 5624020..6ff4201 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -48,7 +48,7 @@ static const char elem_test_str[] = "<table><tbody></tbody></table>" "<script id=\"sc\" type=\"text/javascript\"></script>" "<test />" - "<img /" + "<img id=\"imgid\"/>" "</body></html>"; static const char indent_test_str[] = "<html><head><title>test</title></head><body>abc<br /><a href=\"about:blank\">123</a></body></html>"; @@ -845,6 +845,23 @@ static long _get_node_type(unsigned line, IUnknown *unk) return type; } +#define test_img_set_src(u,s) _test_img_set_src(__LINE__,u,s) +static void _test_img_set_src(unsigned line, IUnknown *unk, const char *src) +{ + IHTMLImgElement *img; + BSTR tmp; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLImgElement, (void**)&img); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLImgElement: %08x\n", hres); + + tmp = a2bstr(src); + hres = IHTMLImgElement_put_src(img, tmp); + IHTMLImgElement_Release(img); + SysFreeString(tmp); + ok_(__FILE__,line) (hres == S_OK, "put_src failed: %08x\n", hres); +} + #define test_input_get_disabled(i,b) _test_input_get_disabled(__LINE__,i,b) static void _test_input_get_disabled(unsigned line, IHTMLInputElement *input, VARIANT_BOOL exb) { @@ -1759,6 +1776,7 @@ static void test_elems(IHTMLDocument2 *doc) long type; HRESULT hres; + static const WCHAR imgidW[] = {'i','m','g','i','d',0}; static const WCHAR inW[] = {'i','n',0}; static const WCHAR xW[] = {'x',0}; static const WCHAR sW[] = {'s',0}; @@ -1888,6 +1906,12 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } + elem = get_elem_by_id(doc, imgidW, TRUE); + if(elem) { + test_img_set_src((IUnknown*)elem, "about:blank"); + IHTMLElement_Release(elem); + } + hres = IHTMLDocument2_get_body(doc, &elem); ok(hres == S_OK, "get_body failed: %08x\n", hres);

1 0