February 2018 - Wine-commits

Józef Kucia : wined3d: Use wined3d_bit_scan() in wined3d_enable_clip_distances().
by Alexandre Julliard 06 Feb '18

06 Feb '18

Module: wine Branch: master Commit: dea7b8890cc9c7c2f2cf74a3974921927bb27bd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dea7b8890cc9c7c2f2cf74a3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 6 11:40:03 2018 +0100 wined3d: Use wined3d_bit_scan() in wined3d_enable_clip_distances(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2e12d75..81a0f4f 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2368,16 +2368,16 @@ void context_enable_clip_distances(struct wined3d_context *context, unsigned int context->clip_distance_mask = enable_mask; enable_mask &= ~current_mask; - for (i = 0; enable_mask; enable_mask >>= 1, ++i) + while (enable_mask) { - if (enable_mask & 1) - gl_info->gl_ops.gl.p_glEnable(GL_CLIP_DISTANCE0 + i); + i = wined3d_bit_scan(&enable_mask); + gl_info->gl_ops.gl.p_glEnable(GL_CLIP_DISTANCE0 + i); } disable_mask &= current_mask; - for (i = 0; disable_mask; disable_mask >>= 1, ++i) + while (disable_mask) { - if (disable_mask & 1) - gl_info->gl_ops.gl.p_glDisable(GL_CLIP_DISTANCE0 + i); + i = wined3d_bit_scan(&disable_mask); + gl_info->gl_ops.gl.p_glDisable(GL_CLIP_DISTANCE0 + i); } checkGLcall("toggle clip distances"); }

1 0

Józef Kucia : wined3d: Use wined3d_bit_scan() in context_apply_compute_state().
by Alexandre Julliard 06 Feb '18

06 Feb '18

Module: wine Branch: master Commit: 9ab04c564e1a14348a4b81c2f61744821b65e61e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ab04c564e1a14348a4b81c2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 6 11:40:04 2018 +0100 wined3d: Use wined3d_bit_scan() in context_apply_compute_state(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 81a0f4f..ccfe630 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3983,7 +3983,7 @@ void context_apply_compute_state(struct wined3d_context *context, { const struct StateEntry *state_table = context->state_table; const struct wined3d_gl_info *gl_info = context->gl_info; - unsigned int state_id, i, j; + unsigned int state_id, i; context_load_shader_resources(context, state, 1u << WINED3D_SHADER_TYPE_COMPUTE); context_load_unordered_access_resources(context, state->shader[WINED3D_SHADER_TYPE_COMPUTE], @@ -3991,11 +3991,13 @@ void context_apply_compute_state(struct wined3d_context *context, for (i = 0, state_id = STATE_COMPUTE_OFFSET; i < ARRAY_SIZE(context->dirty_compute_states); ++i) { - for (j = 0; j < sizeof(*context->dirty_compute_states) * CHAR_BIT; ++j, ++state_id) + unsigned int dirty_mask = context->dirty_compute_states[i]; + while (dirty_mask) { - if (context->dirty_compute_states[i] & (1u << j)) - state_table[state_id].apply(context, state, state_id); + unsigned int current_state_id = state_id + wined3d_bit_scan(&dirty_mask); + state_table[current_state_id].apply(context, state, current_state_id); } + state_id += sizeof(*context->dirty_compute_states) * CHAR_BIT; } memset(context->dirty_compute_states, 0, sizeof(*context->dirty_compute_states));

1 0

Jacek Caban : mshtml: Added IDOMUIEvent::detail property implementation.
by Alexandre Julliard 06 Feb '18

06 Feb '18

Module: wine Branch: master Commit: 18ae7c7deb5f45f280cc02d436bb826f2977892d URL: https://source.winehq.org/git/wine.git/?a=commit;h=18ae7c7deb5f45f280cc02d4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 6 00:09:20 2018 +0100 mshtml: Added IDOMUIEvent::detail property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index b788b2e..a855b02 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1211,8 +1211,17 @@ static HRESULT WINAPI DOMUIEvent_get_view(IDOMUIEvent *iface, IHTMLWindow2 **p) static HRESULT WINAPI DOMUIEvent_get_detail(IDOMUIEvent *iface, LONG *p) { DOMEvent *This = impl_from_IDOMUIEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + INT32 detail; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMUIEvent_GetDetail(This->ui_event, &detail); + if(NS_FAILED(nsres)) + return E_FAIL; + + *p = detail; + return S_OK; } static HRESULT WINAPI DOMUIEvent_initUIEvent(IDOMUIEvent *iface, BSTR type, VARIANT_BOOL can_bubble,

1 0

Jacek Caban : mshtml: Expose IHTMLUIEvent to scripts.
by Alexandre Julliard 06 Feb '18

06 Feb '18

Module: wine Branch: master Commit: 20159346c7403e22268be4386b7cd4e1229b482a URL: https://source.winehq.org/git/wine.git/?a=commit;h=20159346c7403e22268be438… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 6 00:09:35 2018 +0100 mshtml: Expose IHTMLUIEvent to scripts. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 17 ++++++++++++++++- dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/tests/events.js | 38 ++++++++++++++++++++++++++++++++++++-- 3 files changed, 54 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index a855b02..9ffce28 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1647,8 +1647,21 @@ static dispex_static_data_t DOMEvent_dispex = { DOMEvent_iface_tids }; +static const tid_t DOMUIEvent_iface_tids[] = { + IDOMEvent_tid, + IDOMUIEvent_tid, + 0 +}; + +static dispex_static_data_t DOMUIEvent_dispex = { + NULL, + DispDOMUIEvent_tid, + DOMUIEvent_iface_tids +}; + static const tid_t DOMMouseEvent_iface_tids[] = { IDOMEvent_tid, + IDOMUIEvent_tid, IDOMMouseEvent_tid, 0 }; @@ -1694,7 +1707,9 @@ static DOMEvent *alloc_event(nsIDOMEvent *nsevent, eventid_t event_id) - time_epoch; nsres = nsIDOMEvent_QueryInterface(nsevent, &IID_nsIDOMUIEvent, (void**)&event->ui_event); - if(NS_FAILED(nsres)) + if(NS_SUCCEEDED(nsres)) + dispex_data = &DOMUIEvent_dispex; + else event->ui_event = NULL; nsres = nsIDOMEvent_QueryInterface(nsevent, &IID_nsIDOMMouseEvent, (void**)&event->mouse_event); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 83c30e6..79d0d6a 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -82,6 +82,7 @@ typedef struct EventTarget EventTarget; XDIID(DispDOMChildrenCollection) \ XDIID(DispDOMEvent) \ XDIID(DispDOMMouseEvent) \ + XDIID(DispDOMUIEvent) \ XDIID(DispHTMLAnchorElement) \ XDIID(DispHTMLAreaElement) \ XDIID(DispHTMLAttributeCollection) \ @@ -130,6 +131,7 @@ typedef struct EventTarget EventTarget; XDIID(HTMLElementEvents2) \ XIID(IDOMEvent) \ XIID(IDOMMouseEvent) \ + XIID(IDOMUIEvent) \ XIID(IDocumentEvent) \ XIID(IDocumentSelector) \ XIID(IElementSelector) \ diff --git a/dlls/mshtml/tests/events.js b/dlls/mshtml/tests/events.js index fd7a268..7d88852 100644 --- a/dlls/mshtml/tests/events.js +++ b/dlls/mshtml/tests/events.js @@ -610,6 +610,7 @@ function test_mouse_event() { ok(e.type === "test", "type = " + e.type); ok(e.cancelable === true, "cancelable = " + e.cancelable); ok(e.bubbles === true, "bubbles = " + e.bubbles); + ok(e.detail === 1, "detail = " + e.detail); ok(e.screenX === 2, "screenX = " + e.screenX); ok(e.screenY === 3, "screenY = " + e.screenY); ok(e.clientX === 4, "clientX = " + e.clientX); @@ -624,6 +625,7 @@ function test_mouse_event() { ok(e.type === "test", "type = " + e.type); ok(e.cancelable === false, "cancelable = " + e.cancelable); ok(e.bubbles === false, "bubbles = " + e.bubbles); + ok(e.detail === 9, "detail = " + e.detail); ok(e.screenX === 8, "screenX = " + e.screenX); ok(e.screenY === 7, "screenY = " + e.screenY); ok(e.clientX === 6, "clientX = " + e.clientX); @@ -638,6 +640,7 @@ function test_mouse_event() { ok(e.type === "testevent", "type = " + e.type); ok(e.cancelable === true, "cancelable = " + e.cancelable); ok(e.bubbles === true, "bubbles = " + e.bubbles); + ok(e.detail === 9, "detail = " + e.detail); ok(e.screenX === 8, "screenX = " + e.screenX); ok(e.screenY === 7, "screenY = " + e.screenY); ok(e.clientX === 6, "clientX = " + e.clientX); @@ -648,6 +651,36 @@ function test_mouse_event() { ok(e.metaKey === true, "metaKey = " + e.metaKey); ok(e.button === 127, "button = " + e.button); + e.initUIEvent("testevent", true, true, window, 6); + ok(e.type === "testevent", "type = " + e.type); + ok(e.cancelable === true, "cancelable = " + e.cancelable); + ok(e.bubbles === true, "bubbles = " + e.bubbles); + ok(e.detail === 6, "detail = " + e.detail); + ok(e.screenX === 8, "screenX = " + e.screenX); + ok(e.screenY === 7, "screenY = " + e.screenY); + ok(e.clientX === 6, "clientX = " + e.clientX); + ok(e.clientY === 5, "clientY = " + e.clientY); + ok(e.ctrlKey === true, "ctrlKey = " + e.ctrlKey); + ok(e.altKey === true, "altKey = " + e.altKey); + ok(e.shiftKey === true, "shiftKey = " + e.shiftKey); + ok(e.metaKey === true, "metaKey = " + e.metaKey); + ok(e.button === 127, "button = " + e.button); + + next_test(); +} + +function test_ui_event() { + var e; + + e = document.createEvent("UIEvent"); + ok(e.detail === 0, "detail = " + e.detail); + + e.initUIEvent("test", true, true, window, 3); + ok(e.type === "test", "type = " + e.type); + ok(e.cancelable === true, "cancelable = " + e.cancelable); + ok(e.bubbles === true, "bubbles = " + e.bubbles); + ok(e.detail === 3, "detail = " + e.detail); + next_test(); } @@ -663,7 +696,8 @@ var tests = [ test_current_target, test_dispatch_event, test_recursive_dispatch, + test_ui_event, + test_mouse_event, test_time_stamp, - test_listener_order, - test_mouse_event + test_listener_order ];

1 0

Jacek Caban : mshtml: Added IDOMKeyboardEvent stub implementation.
by Alexandre Julliard 06 Feb '18

06 Feb '18

Module: wine Branch: master Commit: fff36a7896d92b129f526a226dab2208fd2aac8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=fff36a7896d92b129f526a22… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 6 00:09:48 2018 +0100 mshtml: Added IDOMKeyboardEvent stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 187 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/htmlevent.h | 2 + dlls/mshtml/tests/events.c | 15 ++++ 3 files changed, 204 insertions(+) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 9ffce28..a574c26 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -855,6 +855,8 @@ static HRESULT WINAPI DOMEvent_QueryInterface(IDOMEvent *iface, REFIID riid, voi *ppv = &This->IDOMUIEvent_iface; else if(This->mouse_event && IsEqualGUID(&IID_IDOMMouseEvent, riid)) *ppv = &This->IDOMMouseEvent_iface; + else if(This->keyboard_event && IsEqualGUID(&IID_IDOMKeyboardEvent, riid)) + *ppv = &This->IDOMKeyboardEvent_iface; else if(dispex_query_interface(&This->dispex, riid, ppv)) return *ppv ? S_OK : E_NOINTERFACE; else { @@ -1636,6 +1638,186 @@ static const IDOMMouseEventVtbl DOMMouseEventVtbl = { DOMMouseEvent_get_which }; +static inline DOMEvent *impl_from_IDOMKeyboardEvent(IDOMKeyboardEvent *iface) +{ + return CONTAINING_RECORD(iface, DOMEvent, IDOMKeyboardEvent_iface); +} + +static HRESULT WINAPI DOMKeyboardEvent_QueryInterface(IDOMKeyboardEvent *iface, REFIID riid, void **ppv) +{ + DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); + return IDOMEvent_QueryInterface(&This->IDOMEvent_iface, riid, ppv); +} + +static ULONG WINAPI DOMKeyboardEvent_AddRef(IDOMKeyboardEvent *iface) +{ + DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); + return IDOMEvent_AddRef(&This->IDOMEvent_iface); +} + +static ULONG WINAPI DOMKeyboardEvent_Release(IDOMKeyboardEvent *iface) +{ + DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); + return IDOMEvent_Release(&This->IDOMEvent_iface); +} + +static HRESULT WINAPI DOMKeyboardEvent_GetTypeInfoCount(IDOMKeyboardEvent *iface, UINT *pctinfo) +{ + DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); + return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI DOMKeyboardEvent_GetTypeInfo(IDOMKeyboardEvent *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); + return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI DOMKeyboardEvent_GetIDsOfNames(IDOMKeyboardEvent *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); + return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, cNames, + lcid, rgDispId); +} + +static HRESULT WINAPI DOMKeyboardEvent_Invoke(IDOMKeyboardEvent *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); + return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI DOMKeyboardEvent_get_key(IDOMKeyboardEvent *iface, BSTR *p) +{ + DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI DOMKeyboardEvent_get_location(IDOMKeyboardEvent *iface, ULONG *p) +{ + DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI DOMKeyboardEvent_get_ctrlKey(IDOMKeyboardEvent *iface, VARIANT_BOOL *p) +{ + DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI DOMKeyboardEvent_get_shiftKey(IDOMKeyboardEvent *iface, VARIANT_BOOL *p) +{ + DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI DOMKeyboardEvent_get_altKey(IDOMKeyboardEvent *iface, VARIANT_BOOL *p) +{ + DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI DOMKeyboardEvent_get_metaKey(IDOMKeyboardEvent *iface, VARIANT_BOOL *p) +{ + DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI DOMKeyboardEvent_get_repeat(IDOMKeyboardEvent *iface, VARIANT_BOOL *p) +{ + DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI DOMKeyboardEvent_getModifierState(IDOMKeyboardEvent *iface, BSTR key, + VARIANT_BOOL *state) +{ + DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_w(key), state); + return E_NOTIMPL; +} + +static HRESULT WINAPI DOMKeyboardEvent_initKeyboardEvent(IDOMKeyboardEvent *iface, BSTR type, + VARIANT_BOOL can_bubble, VARIANT_BOOL cancelable, IHTMLWindow2 *view, BSTR key, + ULONG location, BSTR modifiers_list, VARIANT_BOOL repeat, BSTR locale) +{ + DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); + FIXME("(%p)->(%s %x %x %p %s %u %s %x %s)\n", This, debugstr_w(type), can_bubble, + cancelable, view, debugstr_w(key), location, debugstr_w(modifiers_list), + repeat, debugstr_w(locale)); + return E_NOTIMPL; +} + +static HRESULT WINAPI DOMKeyboardEvent_get_keyCode(IDOMKeyboardEvent *iface, LONG *p) +{ + DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI DOMKeyboardEvent_get_charCode(IDOMKeyboardEvent *iface, LONG *p) +{ + DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI DOMKeyboardEvent_get_which(IDOMKeyboardEvent *iface, LONG *p) +{ + DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI DOMKeyboardEvent_get_char(IDOMKeyboardEvent *iface, VARIANT *p) +{ + DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI DOMKeyboardEvent_get_locale(IDOMKeyboardEvent *iface, BSTR *p) +{ + DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static const IDOMKeyboardEventVtbl DOMKeyboardEventVtbl = { + DOMKeyboardEvent_QueryInterface, + DOMKeyboardEvent_AddRef, + DOMKeyboardEvent_Release, + DOMKeyboardEvent_GetTypeInfoCount, + DOMKeyboardEvent_GetTypeInfo, + DOMKeyboardEvent_GetIDsOfNames, + DOMKeyboardEvent_Invoke, + DOMKeyboardEvent_get_key, + DOMKeyboardEvent_get_location, + DOMKeyboardEvent_get_ctrlKey, + DOMKeyboardEvent_get_shiftKey, + DOMKeyboardEvent_get_altKey, + DOMKeyboardEvent_get_metaKey, + DOMKeyboardEvent_get_repeat, + DOMKeyboardEvent_getModifierState, + DOMKeyboardEvent_initKeyboardEvent, + DOMKeyboardEvent_get_keyCode, + DOMKeyboardEvent_get_charCode, + DOMKeyboardEvent_get_which, + DOMKeyboardEvent_get_char, + DOMKeyboardEvent_get_locale +}; + static const tid_t DOMEvent_iface_tids[] = { IDOMEvent_tid, 0 @@ -1689,6 +1871,7 @@ static DOMEvent *alloc_event(nsIDOMEvent *nsevent, eventid_t event_id) event->IDOMEvent_iface.lpVtbl = &DOMEventVtbl; event->IDOMUIEvent_iface.lpVtbl = &DOMUIEventVtbl; event->IDOMMouseEvent_iface.lpVtbl = &DOMMouseEventVtbl; + event->IDOMKeyboardEvent_iface.lpVtbl = &DOMKeyboardEventVtbl; event->ref = 1; event->event_id = event_id; if(event_id != EVENTID_LAST) { @@ -1718,6 +1901,10 @@ static DOMEvent *alloc_event(nsIDOMEvent *nsevent, eventid_t event_id) else event->mouse_event = NULL; + nsres = nsIDOMEvent_QueryInterface(nsevent, &IID_nsIDOMKeyEvent, (void**)&event->keyboard_event); + if(NS_FAILED(nsres)) + event->keyboard_event = NULL; + init_dispex(&event->dispex, (IUnknown*)&event->IDOMEvent_iface, dispex_data); return event; } diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index fde9cb9..ccfa5f8 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -61,12 +61,14 @@ typedef struct { IDOMEvent IDOMEvent_iface; IDOMUIEvent IDOMUIEvent_iface; IDOMMouseEvent IDOMMouseEvent_iface; + IDOMKeyboardEvent IDOMKeyboardEvent_iface; LONG ref; nsIDOMEvent *nsevent; nsIDOMUIEvent *ui_event; nsIDOMMouseEvent *mouse_event; + nsIDOMKeyEvent *keyboard_event; eventid_t event_id; WCHAR *type; diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index d8dc8da..a219987 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -2666,6 +2666,7 @@ static void test_iframe_connections(IHTMLDocument2 *doc) static void test_create_event(IHTMLDocument2 *doc) { + IDOMKeyboardEvent *keyboard_event; IDOMMouseEvent *mouse_event; IDocumentEvent *doc_event; IEventTarget *event_target; @@ -2756,6 +2757,20 @@ static void test_create_event(IHTMLDocument2 *doc) IDOMEvent_Release(event); + str = a2bstr("KeyboardEvent"); + hres = IDocumentEvent_createEvent(doc_event, str, &event); + SysFreeString(str); + ok(hres == S_OK, "createEvent failed: %08x\n", hres); + + hres = IDOMEvent_QueryInterface(event, &IID_IDOMUIEvent, (void**)&ui_event); + ok(hres == S_OK, "QueryInterface(IID_IDOMUIEvent returned %08x\n", hres); + IDOMUIEvent_Release(ui_event); + hres = IDOMEvent_QueryInterface(event, &IID_IDOMKeyboardEvent, (void**)&keyboard_event); + ok(hres == S_OK, "QueryInterface(IID_IDOMKeyboardEvent returned %08x\n", hres); + IDOMKeyboardEvent_Release(keyboard_event); + + IDOMEvent_Release(event); + IDocumentEvent_Release(doc_event); }

1 0

Jacek Caban : mshtml: Added key and char code IDOMKeyboardEvent getters implementation.
by Alexandre Julliard 06 Feb '18

06 Feb '18

Module: wine Branch: master Commit: e9f0b4ff610b78717ea48257da070f2f97595bc8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9f0b4ff610b78717ea48257… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 6 00:10:07 2018 +0100 mshtml: Added key and char code IDOMKeyboardEvent getters implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 37 +++++++++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index a574c26..14ab00d 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1694,8 +1694,15 @@ static HRESULT WINAPI DOMKeyboardEvent_Invoke(IDOMKeyboardEvent *iface, DISPID d static HRESULT WINAPI DOMKeyboardEvent_get_key(IDOMKeyboardEvent *iface, BSTR *p) { DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString key_str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + + nsAString_Init(&key_str, NULL); + nsres = nsIDOMKeyEvent_GetKey(This->keyboard_event, &key_str); + return return_nsstr(nsres, &key_str, p); } static HRESULT WINAPI DOMKeyboardEvent_get_location(IDOMKeyboardEvent *iface, ULONG *p) @@ -1762,15 +1769,33 @@ static HRESULT WINAPI DOMKeyboardEvent_initKeyboardEvent(IDOMKeyboardEvent *ifac static HRESULT WINAPI DOMKeyboardEvent_get_keyCode(IDOMKeyboardEvent *iface, LONG *p) { DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + UINT32 r; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMKeyEvent_GetKeyCode(This->keyboard_event, &r); + if(NS_FAILED(nsres)) + return E_FAIL; + + *p = r; + return S_OK; } static HRESULT WINAPI DOMKeyboardEvent_get_charCode(IDOMKeyboardEvent *iface, LONG *p) { DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + UINT32 r; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMKeyEvent_GetKeyCode(This->keyboard_event, &r); + if(NS_FAILED(nsres)) + return E_FAIL; + + *p = r; + return S_OK; } static HRESULT WINAPI DOMKeyboardEvent_get_which(IDOMKeyboardEvent *iface, LONG *p)

1 0

Jacek Caban : mshtml: Added IDOMKeyboardEvent key state getters implementation.
by Alexandre Julliard 06 Feb '18

06 Feb '18

Module: wine Branch: master Commit: 4947c70fe27f343432ff017f21415ceb69426161 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4947c70fe27f343432ff017f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 6 00:10:19 2018 +0100 mshtml: Added IDOMKeyboardEvent key state getters implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 65 +++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 55 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 14ab00d..c11f6d1 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1715,36 +1715,81 @@ static HRESULT WINAPI DOMKeyboardEvent_get_location(IDOMKeyboardEvent *iface, UL static HRESULT WINAPI DOMKeyboardEvent_get_ctrlKey(IDOMKeyboardEvent *iface, VARIANT_BOOL *p) { DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + cpp_bool r; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMKeyEvent_GetCtrlKey(This->keyboard_event, &r); + if(NS_FAILED(nsres)) + return E_FAIL; + + *p = variant_bool(r); + return S_OK; } static HRESULT WINAPI DOMKeyboardEvent_get_shiftKey(IDOMKeyboardEvent *iface, VARIANT_BOOL *p) { DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + cpp_bool r; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMKeyEvent_GetShiftKey(This->keyboard_event, &r); + if(NS_FAILED(nsres)) + return E_FAIL; + + *p = variant_bool(r); + return S_OK; } static HRESULT WINAPI DOMKeyboardEvent_get_altKey(IDOMKeyboardEvent *iface, VARIANT_BOOL *p) { DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + cpp_bool r; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMKeyEvent_GetAltKey(This->keyboard_event, &r); + if(NS_FAILED(nsres)) + return E_FAIL; + + *p = variant_bool(r); + return S_OK; } static HRESULT WINAPI DOMKeyboardEvent_get_metaKey(IDOMKeyboardEvent *iface, VARIANT_BOOL *p) { DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + cpp_bool r; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMKeyEvent_GetMetaKey(This->keyboard_event, &r); + if(NS_FAILED(nsres)) + return E_FAIL; + + *p = variant_bool(r); + return S_OK; } static HRESULT WINAPI DOMKeyboardEvent_get_repeat(IDOMKeyboardEvent *iface, VARIANT_BOOL *p) { DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + cpp_bool r; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMKeyEvent_GetRepeat(This->keyboard_event, &r); + if(NS_FAILED(nsres)) + return E_FAIL; + + *p = variant_bool(r); + return S_OK; } static HRESULT WINAPI DOMKeyboardEvent_getModifierState(IDOMKeyboardEvent *iface, BSTR key,

1 0

Jacek Caban : mshtml: Expose IDOMKeyboardEvent to scripts.
by Alexandre Julliard 06 Feb '18

06 Feb '18

Module: wine Branch: master Commit: 169fde0d582d91eceabb4b400f9ed183149ecad3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=169fde0d582d91eceabb4b40… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 6 00:10:26 2018 +0100 mshtml: Expose IDOMKeyboardEvent to scripts. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 17 ++++++++++++++++- dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/tests/events.js | 20 ++++++++++++++++++++ 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index c11f6d1..c77f2b7 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1924,6 +1924,19 @@ static dispex_static_data_t DOMMouseEvent_dispex = { DOMMouseEvent_iface_tids }; +static const tid_t DOMKeyboardEvent_iface_tids[] = { + IDOMEvent_tid, + IDOMUIEvent_tid, + IDOMKeyboardEvent_tid, + 0 +}; + +static dispex_static_data_t DOMKeyboardEvent_dispex = { + NULL, + DispDOMKeyboardEvent_tid, + DOMKeyboardEvent_iface_tids +}; + static DOMEvent *alloc_event(nsIDOMEvent *nsevent, eventid_t event_id) { dispex_static_data_t *dispex_data = &DOMEvent_dispex; @@ -1972,7 +1985,9 @@ static DOMEvent *alloc_event(nsIDOMEvent *nsevent, eventid_t event_id) event->mouse_event = NULL; nsres = nsIDOMEvent_QueryInterface(nsevent, &IID_nsIDOMKeyEvent, (void**)&event->keyboard_event); - if(NS_FAILED(nsres)) + if(NS_SUCCEEDED(nsres)) + dispex_data = &DOMKeyboardEvent_dispex; + else event->keyboard_event = NULL; init_dispex(&event->dispex, (IUnknown*)&event->IDOMEvent_iface, dispex_data); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 79d0d6a..5ed6264 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -81,6 +81,7 @@ typedef struct EventTarget EventTarget; XDIID(DispCPlugins) \ XDIID(DispDOMChildrenCollection) \ XDIID(DispDOMEvent) \ + XDIID(DispDOMKeyboardEvent) \ XDIID(DispDOMMouseEvent) \ XDIID(DispDOMUIEvent) \ XDIID(DispHTMLAnchorElement) \ @@ -130,6 +131,7 @@ typedef struct EventTarget EventTarget; XDIID(HTMLDocumentEvents) \ XDIID(HTMLElementEvents2) \ XIID(IDOMEvent) \ + XIID(IDOMKeyboardEvent) \ XIID(IDOMMouseEvent) \ XIID(IDOMUIEvent) \ XIID(IDocumentEvent) \ diff --git a/dlls/mshtml/tests/events.js b/dlls/mshtml/tests/events.js index 7d88852..bf37b3f 100644 --- a/dlls/mshtml/tests/events.js +++ b/dlls/mshtml/tests/events.js @@ -684,6 +684,25 @@ function test_ui_event() { next_test(); } +function test_keyboard_event() { + var e; + + e = document.createEvent("KeyboardEvent"); + + e.initEvent("test", true, true); + ok(e.key === "", "key = " + e.key); + ok(e.keyCode === 0, "keyCode = " + e.keyCode); + ok(e.charCode === 0, "charCode = " + e.charCode); + ok(e.repeat === false, "repeat = " + e.repeat); + ok(e.ctrlKey === false, "ctrlKey = " + e.ctrlKey); + ok(e.altKey === false, "altKey = " + e.altKey); + ok(e.shiftKey === false, "shiftKey = " + e.shiftKey); + ok(e.metaKey === false, "metaKey = " + e.metaKey); + ok(e.detail === 0, "detail = " + e.detail); + + next_test(); +} + var tests = [ test_content_loaded, test_add_remove_listener, @@ -698,6 +717,7 @@ var tests = [ test_recursive_dispatch, test_ui_event, test_mouse_event, + test_keyboard_event, test_time_stamp, test_listener_order ];

1 0

Jacek Caban : mshtml: Use IDOMKeyboardEvent instead of nsIDOMKeyEvent in IHTMLEventObj implementation.
by Alexandre Julliard 06 Feb '18

06 Feb '18

Module: wine Branch: master Commit: b8c5f98c06abe74372f8373ff24e39872bb3fb96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8c5f98c06abe74372f8373f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 6 00:10:35 2018 +0100 mshtml: Use IDOMKeyboardEvent instead of nsIDOMKeyEvent in IHTMLEventObj implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 51 +++++++++---------------------------------------- 1 file changed, 9 insertions(+), 42 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index c77f2b7..9f115a8 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -414,16 +414,8 @@ static HRESULT WINAPI HTMLEventObj_get_altKey(IHTMLEventObj *iface, VARIANT_BOOL if(This->event && This->event->mouse_event) return IDOMMouseEvent_get_altKey(&This->event->IDOMMouseEvent_iface, p); - if(This->event) { - nsIDOMKeyEvent *key_event; - nsresult nsres; - - nsres = nsIDOMEvent_QueryInterface(This->event->nsevent, &IID_nsIDOMKeyEvent, (void**)&key_event); - if(NS_SUCCEEDED(nsres)) { - nsIDOMKeyEvent_GetAltKey(key_event, &ret); - nsIDOMKeyEvent_Release(key_event); - } - } + if(This->event && This->event->keyboard_event) + return IDOMKeyboardEvent_get_altKey(&This->event->IDOMKeyboardEvent_iface, p); *p = variant_bool(ret); return S_OK; @@ -439,16 +431,8 @@ static HRESULT WINAPI HTMLEventObj_get_ctrlKey(IHTMLEventObj *iface, VARIANT_BOO if(This->event && This->event->mouse_event) return IDOMMouseEvent_get_ctrlKey(&This->event->IDOMMouseEvent_iface, p); - if(This->event) { - nsIDOMKeyEvent *key_event; - nsresult nsres; - - nsres = nsIDOMEvent_QueryInterface(This->event->nsevent, &IID_nsIDOMKeyEvent, (void**)&key_event); - if(NS_SUCCEEDED(nsres)) { - nsIDOMKeyEvent_GetCtrlKey(key_event, &ret); - nsIDOMKeyEvent_Release(key_event); - } - } + if(This->event && This->event->keyboard_event) + return IDOMKeyboardEvent_get_ctrlKey(&This->event->IDOMKeyboardEvent_iface, p); *p = variant_bool(ret); return S_OK; @@ -464,16 +448,8 @@ static HRESULT WINAPI HTMLEventObj_get_shiftKey(IHTMLEventObj *iface, VARIANT_BO if(This->event && This->event->mouse_event) return IDOMMouseEvent_get_shiftKey(&This->event->IDOMMouseEvent_iface, p); - if(This->event) { - nsIDOMKeyEvent *key_event; - nsresult nsres; - - nsres = nsIDOMEvent_QueryInterface(This->event->nsevent, &IID_nsIDOMKeyEvent, (void**)&key_event); - if(NS_SUCCEEDED(nsres)) { - nsIDOMKeyEvent_GetShiftKey(key_event, &ret); - nsIDOMKeyEvent_Release(key_event); - } - } + if(This->event && This->event->keyboard_event) + return IDOMKeyboardEvent_get_shiftKey(&This->event->IDOMKeyboardEvent_iface, p); *p = variant_bool(ret); return S_OK; @@ -557,22 +533,13 @@ static HRESULT WINAPI HTMLEventObj_put_keyCode(IHTMLEventObj *iface, LONG v) static HRESULT WINAPI HTMLEventObj_get_keyCode(IHTMLEventObj *iface, LONG *p) { HTMLEventObj *This = impl_from_IHTMLEventObj(iface); - UINT32 key_code = 0; TRACE("(%p)->(%p)\n", This, p); - if(This->event) { - nsIDOMKeyEvent *key_event; - nsresult nsres; - - nsres = nsIDOMEvent_QueryInterface(This->event->nsevent, &IID_nsIDOMKeyEvent, (void**)&key_event); - if(NS_SUCCEEDED(nsres)) { - nsIDOMKeyEvent_GetKeyCode(key_event, &key_code); - nsIDOMKeyEvent_Release(key_event); - } - } + if(This->event && This->event->keyboard_event) + return IDOMKeyboardEvent_get_keyCode(&This->event->IDOMKeyboardEvent_iface, p); - *p = key_code; + *p = 0; return S_OK; }

1 0

Henri Verbeet : ddraw: Use wined3d_buffer_create() in d3d_execute_buffer_execute().
by Alexandre Julliard 06 Feb '18

06 Feb '18

Module: wine Branch: master Commit: a3ca7a308afc886af916e459d2a66b9936c2ee7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3ca7a308afc886af916e459… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 6 03:22:15 2018 +0330 ddraw: Use wined3d_buffer_create() in d3d_execute_buffer_execute(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/executebuffer.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index ea5a55c..6ce77e3 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -124,13 +124,19 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, if (buffer->index_size < index_count) { - struct wined3d_buffer *new_buffer; unsigned int new_size = max(buffer->index_size * 2, index_count); + struct wined3d_buffer *new_buffer; + struct wined3d_buffer_desc desc; + + desc.byte_width = new_size * sizeof(*indices); + desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY | WINED3DUSAGE_STATICDECL; + desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; + desc.access = WINED3D_RESOURCE_ACCESS_GPU; + desc.misc_flags = 0; + desc.structure_byte_stride = 0; - hr = wined3d_buffer_create_ib(device->wined3d_device, new_size * sizeof(*indices), - WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY, WINED3D_POOL_DEFAULT, - NULL, &ddraw_null_wined3d_parent_ops, &new_buffer); - if (FAILED(hr)) + if (FAILED(hr = wined3d_buffer_create(device->wined3d_device, &desc, + NULL, NULL, &ddraw_null_wined3d_parent_ops, &new_buffer))) return hr; buffer->index_size = new_size;

1 0