wine-commits April 2012

wine-commits@winehq.org

2 participants
718 discussions

Jacek Caban : mshtml: Return self as a parent of global top window.
by Alexandre Julliard 11 Apr '12

11 Apr '12

Module: wine Branch: master Commit: 325f8c8172dbcdf1d510ae9760e5645ea4d6243e URL: http://source.winehq.org/git/wine.git/?a=commit;h=325f8c8172dbcdf1d510ae976… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 11 11:03:43 2012 +0200 mshtml: Return self as a parent of global top window. --- dlls/mshtml/htmlwindow.c | 10 +++++----- dlls/mshtml/tests/dom.c | 11 +++++++++-- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 4242a77..5f68e6d 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -779,14 +779,14 @@ static HRESULT WINAPI HTMLWindow2_get_name(IHTMLWindow2 *iface, BSTR *p) static HRESULT WINAPI HTMLWindow2_get_parent(IHTMLWindow2 *iface, IHTMLWindow2 **p) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); + TRACE("(%p)->(%p)\n", This, p); - if(This->parent) { - *p = &This->parent->IHTMLWindow2_iface; - IHTMLWindow2_AddRef(*p); - }else - *p = NULL; + if(!This->parent) + return IHTMLWindow2_get_self(&This->IHTMLWindow2_iface, p); + *p = &This->parent->IHTMLWindow2_iface; + IHTMLWindow2_AddRef(*p); return S_OK; } diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index b951724..4176394 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4479,7 +4479,7 @@ static void test_body_funs(IHTMLBodyElement *body) static void test_window(IHTMLDocument2 *doc) { - IHTMLWindow2 *window, *window2, *self; + IHTMLWindow2 *window, *window2, *self, *parent; IHTMLDocument2 *doc2 = NULL; IDispatch *disp; IUnknown *unk; @@ -4528,7 +4528,6 @@ static void test_window(IHTMLDocument2 *doc) ok(self == window2, "self != window2\n"); IHTMLWindow2_Release(window2); - IHTMLWindow2_Release(self); disp = NULL; hres = IHTMLDocument2_get_Script(doc, &disp); @@ -4551,6 +4550,14 @@ static void test_window(IHTMLDocument2 *doc) ok(hres == S_OK, "get_opener failed: %08x\n", hres); ok(V_VT(&v) == VT_EMPTY, "V_VT(opener) = %d\n", V_VT(&v)); + parent = NULL; + hres = IHTMLWindow2_get_parent(window, &parent); + ok(hres == S_OK, "get_parent failed: %08x\n", hres); + ok(parent != NULL, "parent == NULL\n"); + ok(parent == self, "parent != window\n"); + IHTMLWindow2_Release(parent); + IHTMLWindow2_Release(self); + test_window_name(window, NULL); set_window_name(window, "test"); test_window_length(window, 0);

1 0

Lucas Zawacki : dinput: Don't trace DIEFFECT members if they don' t contain valid data.
by Alexandre Julliard 11 Apr '12

11 Apr '12

Module: wine Branch: master Commit: 706d9df8d95a8fff59c4f776ab803c6a1e738d1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=706d9df8d95a8fff59c4f776a… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Tue Apr 10 21:57:58 2012 -0300 dinput: Don't trace DIEFFECT members if they don't contain valid data. --- dlls/dinput/effect_linuxinput.c | 42 +++++++++++++++++++++++++------------- 1 files changed, 27 insertions(+), 15 deletions(-) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index ca43b17..0fb183f 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -173,7 +173,7 @@ static void _dump_DICUSTOMFORCE(LPCDICUSTOMFORCE frc) } } -static void _dump_DIEFFECT(LPCDIEFFECT eff, REFGUID guid) +static void _dump_DIEFFECT(LPCDIEFFECT eff, REFGUID guid, DWORD dwFlags) { unsigned int i; DWORD type = _typeFromGUID(guid); @@ -188,26 +188,38 @@ static void _dump_DIEFFECT(LPCDIEFFECT eff, REFGUID guid) _dump_DIEFFECT_flags(eff->dwFlags); TRACE(" - dwDuration: %d\n", eff->dwDuration); TRACE(" - dwGain: %d\n", eff->dwGain); + if (eff->dwGain > 10000) - WARN("dwGain is out of range (>10,000)\n"); + WARN("dwGain is out of range (>10,000)\n"); + TRACE(" - dwTriggerButton: %d\n", eff->dwTriggerButton); TRACE(" - dwTriggerRepeatInterval: %d\n", eff->dwTriggerRepeatInterval); - TRACE(" - cAxes: %d\n", eff->cAxes); - TRACE(" - rgdwAxes: %p\n", eff->rgdwAxes); - if (TRACE_ON(dinput) && eff->rgdwAxes) { - TRACE(" "); - for (i = 0; i < eff->cAxes; ++i) - TRACE("%d ", eff->rgdwAxes[i]); - TRACE("\n"); - } TRACE(" - rglDirection: %p\n", eff->rglDirection); - TRACE(" - lpEnvelope: %p\n", eff->lpEnvelope); TRACE(" - cbTypeSpecificParams: %d\n", eff->cbTypeSpecificParams); TRACE(" - lpvTypeSpecificParams: %p\n", eff->lpvTypeSpecificParams); + + /* Only trace some members if dwFlags indicates they have data */ + if (dwFlags & DIEP_AXES) { + TRACE(" - cAxes: %d\n", eff->cAxes); + TRACE(" - rgdwAxes: %p\n", eff->rgdwAxes); + + if (TRACE_ON(dinput) && eff->rgdwAxes) { + TRACE(" "); + for (i = 0; i < eff->cAxes; ++i) + TRACE("%d ", eff->rgdwAxes[i]); + TRACE("\n"); + } + } + + if (dwFlags & DIEP_ENVELOPE) { + TRACE(" - lpEnvelope: %p\n", eff->lpEnvelope); + if (eff->lpEnvelope != NULL) + _dump_DIENVELOPE(eff->lpEnvelope); + } + if (eff->dwSize > sizeof(DIEFFECT_DX5)) - TRACE(" - dwStartDelay: %d\n", eff->dwStartDelay); - if (eff->lpEnvelope != NULL) - _dump_DIENVELOPE(eff->lpEnvelope); + TRACE(" - dwStartDelay: %d\n", eff->dwStartDelay); + if (type == DIEFT_CONSTANTFORCE) { if (eff->cbTypeSpecificParams != sizeof(DICONSTANTFORCE)) { WARN("Effect claims to be a constant force but the type-specific params are the wrong size!\n"); @@ -539,7 +551,7 @@ static HRESULT WINAPI LinuxInputEffectImpl_SetParameters( TRACE("(this=%p,%p,%d)\n", This, peff, dwFlags); - _dump_DIEFFECT(peff, &This->guid); + _dump_DIEFFECT(peff, &This->guid, dwFlags); if ((dwFlags & ~DIEP_NORESTART & ~DIEP_NODOWNLOAD & ~DIEP_START) == 0) { /* set everything */

1 0

Christian Costa : d3drm: Display filename when loading data from a file.
by Alexandre Julliard 11 Apr '12

11 Apr '12

Module: wine Branch: master Commit: cde9a571c9f40926e947b59a491babcf57ec44c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cde9a571c9f40926e947b59a4… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Apr 10 22:09:17 2012 +0200 d3drm: Display filename when loading data from a file. --- dlls/d3drm/d3drm.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index c067c27..7d92858 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1277,6 +1277,7 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3* iface, LPVOID ObjSourc else if (LOFlags == D3DRMLOAD_FROMFILE) { load_options = DXFILELOAD_FROMFILE; + TRACE("Loading from file %s\n", debugstr_a(ObjSource)); } else {

1 0

Henri Verbeet : d3dx9: Don' t return a pointer to the implementation in ID3DXEffectPoolImpl_QueryInterface ().
by Alexandre Julliard 11 Apr '12

11 Apr '12

Module: wine Branch: master Commit: 6e05c1415409d2daf12306de7150358ca1121f08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e05c1415409d2daf12306de7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 10 22:06:23 2012 +0200 d3dx9: Don't return a pointer to the implementation in ID3DXEffectPoolImpl_QueryInterface(). --- dlls/d3dx9_36/effect.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index fa28ae0..0a07ddf 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -5917,15 +5917,13 @@ static inline struct ID3DXEffectPoolImpl *impl_from_ID3DXEffectPool(ID3DXEffectP /*** IUnknown methods ***/ static HRESULT WINAPI ID3DXEffectPoolImpl_QueryInterface(ID3DXEffectPool *iface, REFIID riid, void **object) { - struct ID3DXEffectPoolImpl *This = impl_from_ID3DXEffectPool(iface); - - TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), object); + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), object); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ID3DXEffectPool)) { - This->ID3DXEffectPool_iface.lpVtbl->AddRef(iface); - *object = This; + iface->lpVtbl->AddRef(iface); + *object = iface; return S_OK; }

1 0

Henri Verbeet : d3dx9: Don' t return a pointer to the implementation in ID3DXFontImpl_QueryInterface().
by Alexandre Julliard 11 Apr '12

11 Apr '12

Module: wine Branch: master Commit: 74c2ddc908dd862800644463edaf0028e9425ba0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74c2ddc908dd862800644463e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 10 22:06:22 2012 +0200 d3dx9: Don't return a pointer to the implementation in ID3DXFontImpl_QueryInterface(). --- dlls/d3dx9_36/font.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index a27f80a..1904c68 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -43,17 +43,21 @@ static inline ID3DXFontImpl *impl_from_ID3DXFont(ID3DXFont *iface) return CONTAINING_RECORD(iface, ID3DXFontImpl, ID3DXFont_iface); } -static HRESULT WINAPI ID3DXFontImpl_QueryInterface(ID3DXFont *iface, REFIID riid, void **object) +static HRESULT WINAPI ID3DXFontImpl_QueryInterface(ID3DXFont *iface, REFIID riid, void **out) { - ID3DXFontImpl *This=impl_from_ID3DXFont(iface); + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); - TRACE("(%p): QueryInterface from %s\n", This, debugstr_guid(riid)); - if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ID3DXFont)) { + if (IsEqualGUID(riid, &IID_ID3DXFont) + || IsEqualGUID(riid, &IID_IUnknown)) + { IUnknown_AddRef(iface); - *object=This; + *out = iface; return S_OK; } - WARN("(%p)->(%s, %p): not found\n", iface, debugstr_guid(riid), *object); + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *out = NULL; return E_NOINTERFACE; }

1 0

Henri Verbeet : ddraw: Get rid of IDirect3DExecuteBufferImpl.
by Alexandre Julliard 11 Apr '12

11 Apr '12

Module: wine Branch: master Commit: 4d1a659c3adaeaa37f89b11a7d8907f7502464af URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d1a659c3adaeaa37f89b11a7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 10 22:06:21 2012 +0200 ddraw: Get rid of IDirect3DExecuteBufferImpl. --- dlls/ddraw/ddraw_private.h | 9 +- dlls/ddraw/device.c | 8 +- dlls/ddraw/executebuffer.c | 201 +++++++++++++++++++------------------------ 3 files changed, 97 insertions(+), 121 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4d1a659c3adaeaa37f89b…

1 0

Henri Verbeet : d3d9: COM cleanup for the IDirect3DSwapChain9 interface.
by Alexandre Julliard 11 Apr '12

11 Apr '12

Module: wine Branch: master Commit: 53b3f9d40e548270f61096c3c742bcaf050bb0aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=53b3f9d40e548270f61096c3c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 10 22:06:20 2012 +0200 d3d9: COM cleanup for the IDirect3DSwapChain9 interface. This is mostly based on the COM cleanup scripts by Michael Stefaniuc. --- dlls/d3d9/d3d9_private.h | 2 +- dlls/d3d9/device.c | 4 +- dlls/d3d9/swapchain.c | 95 ++++++++++++++++++++++++++------------------- 3 files changed, 58 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=53b3f9d40e548270f6109…

1 0

Henri Verbeet : d3d9: Introduce a separate function for swapchain creation.
by Alexandre Julliard 11 Apr '12

11 Apr '12

Module: wine Branch: master Commit: 8b95d8d2e3f3faba7c928386b173825bb77bc364 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b95d8d2e3f3faba7c928386b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 10 22:06:19 2012 +0200 d3d9: Introduce a separate function for swapchain creation. --- dlls/d3d9/d3d9_private.h | 4 ++-- dlls/d3d9/device.c | 30 +++++++----------------------- dlls/d3d9/swapchain.c | 27 ++++++++++++++++++++++++++- 3 files changed, 35 insertions(+), 26 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 7d1821c..f0262f5 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -211,8 +211,8 @@ typedef struct IDirect3DSwapChain9Impl IDirect3DDevice9Ex *parentDevice; } IDirect3DSwapChain9Impl; -HRESULT swapchain_init(IDirect3DSwapChain9Impl *swapchain, IDirect3DDevice9Impl *device, - D3DPRESENT_PARAMETERS *present_parameters) DECLSPEC_HIDDEN; +HRESULT d3d9_swapchain_create(IDirect3DDevice9Impl *device, D3DPRESENT_PARAMETERS *present_parameters, + IDirect3DSwapChain9Impl **swapchain) DECLSPEC_HIDDEN; /* ----------------- */ /* IDirect3DSurface9 */ diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index bec3c4b..f828d26 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -443,32 +443,17 @@ static BOOL WINAPI IDirect3DDevice9Impl_ShowCursor(IDirect3DDevice9Ex *iface, BO static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_CreateAdditionalSwapChain(IDirect3DDevice9Ex *iface, D3DPRESENT_PARAMETERS *present_parameters, IDirect3DSwapChain9 **swapchain) { - IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); + IDirect3DDevice9Impl *device = impl_from_IDirect3DDevice9Ex(iface); IDirect3DSwapChain9Impl *object; HRESULT hr; TRACE("iface %p, present_parameters %p, swapchain %p.\n", iface, present_parameters, swapchain); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) - { - ERR("Failed to allocate swapchain memory.\n"); - return E_OUTOFMEMORY; - } + if (SUCCEEDED(hr = d3d9_swapchain_create(device, present_parameters, &object))) + *swapchain = (IDirect3DSwapChain9 *)object; - hr = swapchain_init(object, This, present_parameters); - if (FAILED(hr)) - { - WARN("Failed to initialize swapchain, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); - return hr; - } - - TRACE("Created swapchain %p.\n", object); - *swapchain = (IDirect3DSwapChain9 *)object; - - return D3D_OK; + return hr; } static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_GetSwapChain(IDirect3DDevice9Ex *iface, @@ -3291,7 +3276,7 @@ static HRESULT CDECL device_parent_create_swapchain(struct wined3d_device_parent { struct IDirect3DDevice9Impl *device = device_from_device_parent(device_parent); D3DPRESENT_PARAMETERS local_parameters; - IDirect3DSwapChain9 *d3d_swapchain; + IDirect3DSwapChain9Impl *d3d_swapchain; HRESULT hr; TRACE("device_parent %p, desc %p, swapchain %p\n", device_parent, desc, swapchain); @@ -3312,8 +3297,7 @@ static HRESULT CDECL device_parent_create_swapchain(struct wined3d_device_parent local_parameters.FullScreen_RefreshRateInHz = desc->refresh_rate; local_parameters.PresentationInterval = desc->swap_interval; - hr = IDirect3DDevice9Impl_CreateAdditionalSwapChain(&device->IDirect3DDevice9Ex_iface, - &local_parameters, &d3d_swapchain); + hr = d3d9_swapchain_create(device, &local_parameters, &d3d_swapchain); if (FAILED(hr)) { WARN("Failed to create swapchain, hr %#x.\n", hr); @@ -3321,7 +3305,7 @@ static HRESULT CDECL device_parent_create_swapchain(struct wined3d_device_parent return hr; } - *swapchain = ((IDirect3DSwapChain9Impl *)d3d_swapchain)->wined3d_swapchain; + *swapchain = d3d_swapchain->wined3d_swapchain; wined3d_swapchain_incref(*swapchain); IDirect3DSwapChain9_Release((IDirect3DSwapChain9 *)d3d_swapchain); diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index 7a13848..8cbecdd 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -237,7 +237,7 @@ static const struct wined3d_parent_ops d3d9_swapchain_wined3d_parent_ops = d3d9_swapchain_wined3d_object_released, }; -HRESULT swapchain_init(IDirect3DSwapChain9Impl *swapchain, IDirect3DDevice9Impl *device, +static HRESULT swapchain_init(IDirect3DSwapChain9Impl *swapchain, IDirect3DDevice9Impl *device, D3DPRESENT_PARAMETERS *present_parameters) { struct wined3d_swapchain_desc desc; @@ -294,3 +294,28 @@ HRESULT swapchain_init(IDirect3DSwapChain9Impl *swapchain, IDirect3DDevice9Impl return D3D_OK; } + +HRESULT d3d9_swapchain_create(IDirect3DDevice9Impl *device, D3DPRESENT_PARAMETERS *present_parameters, + IDirect3DSwapChain9Impl **swapchain) +{ + IDirect3DSwapChain9Impl *object; + HRESULT hr; + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + { + ERR("Failed to allocate swapchain memory.\n"); + return E_OUTOFMEMORY; + } + + if (FAILED(hr = swapchain_init(object, device, present_parameters))) + { + WARN("Failed to initialize swapchain, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created swapchain %p.\n", object); + *swapchain = object; + + return D3D_OK; +}

1 0

Dmitry Timoshkov : gdi32: Add a test for bitmap fonts selected for not existing font sizes.
by Alexandre Julliard 10 Apr '12

10 Apr '12

Module: wine Branch: master Commit: 31f6f48bfd7a82d7229cdd7dff812272c27ae812 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31f6f48bfd7a82d7229cdd7df… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 10 22:54:37 2012 +0900 gdi32: Add a test for bitmap fonts selected for not existing font sizes. --- dlls/gdi32/tests/font.c | 141 +++++++++++++++++++++++++++++++++++++++------- 1 files changed, 119 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=31f6f48bfd7a82d7229cd…

1 0

Jacek Caban : mshtml: Added IHTMLElement2::blur implementation.
by Alexandre Julliard 10 Apr '12

10 Apr '12

Module: wine Branch: master Commit: 77cdf22f8f58d0d60a44b24eb0b302bdd963d43a URL: http://source.winehq.org/git/wine.git/?a=commit;h=77cdf22f8f58d0d60a44b24eb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 10 12:53:24 2012 +0200 mshtml: Added IHTMLElement2::blur implementation. --- dlls/mshtml/htmlelem2.c | 13 +++++++++++-- dlls/mshtml/tests/events.c | 23 +++++++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index 7deda19..2538b55 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -776,8 +776,17 @@ static HRESULT WINAPI HTMLElement2_get_onresize(IHTMLElement2 *iface, VARIANT *p static HRESULT WINAPI HTMLElement2_blur(IHTMLElement2 *iface) { HTMLElement *This = impl_from_IHTMLElement2(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + nsresult nsres; + + TRACE("(%p)\n", This); + + nsres = nsIDOMHTMLElement_Blur(This->nselem); + if(NS_FAILED(nsres)) { + ERR("Blur failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLElement2_addFilter(IHTMLElement2 *iface, IUnknown *pUnk) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 82f22f4..d1f4e9b 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -74,6 +74,7 @@ DEFINE_EXPECT(iframedoc_onreadystatechange); DEFINE_EXPECT(img_onload); DEFINE_EXPECT(img_onerror); DEFINE_EXPECT(input_onfocus); +DEFINE_EXPECT(input_onblur); DEFINE_EXPECT(form_onsubmit); DEFINE_EXPECT(form_onclick); DEFINE_EXPECT(submit_onclick); @@ -950,6 +951,17 @@ static HRESULT WINAPI input_onfocus(IDispatchEx *iface, DISPID id, LCID lcid, WO EVENT_HANDLER_FUNC_OBJ(input_onfocus); +static HRESULT WINAPI input_onblur(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) +{ + CHECK_EXPECT(input_onblur); + test_event_args(&DIID_DispHTMLInputElement, id, wFlags, pdp, pvarRes, pei, pspCaller); + test_event_src("INPUT"); + return S_OK; +} + +EVENT_HANDLER_FUNC_OBJ(input_onblur); + static HRESULT WINAPI form_onsubmit(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { @@ -1768,6 +1780,17 @@ static void test_focus(IHTMLDocument2 *doc) CHECK_CALLED(input_onfocus); ok(hres == S_OK, "focus failed: %08x\n", hres); + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = (IDispatch*)&input_onblur_obj; + hres = IHTMLElement2_put_onblur(elem2, v); + ok(hres == S_OK, "put_onblur failed: %08x\n", hres); + + SET_EXPECT(input_onblur); + hres = IHTMLElement2_blur(elem2); + pump_msgs(NULL); + CHECK_CALLED(input_onblur); + ok(hres == S_OK, "blur failed: %08x\n", hres); + if(!winetest_interactive) ShowWindow(container_hwnd, SW_HIDE);

1 0

← Newer
1
...
44
45
46
47
48
49
50
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2012