February 2018 - Wine-Commits

Michael Stefaniuc : wininet: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: a6a059f8024116076982d704bff994378099a2d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6a059f8024116076982d704… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 6 01:07:21 2018 +0100 wininet: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.h | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 4cd1856..498a79b 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -24,6 +24,7 @@ #define _WINE_INTERNET_H_ #include "wine/unicode.h" +#include "wine/heap.h" #include "wine/list.h" #include <time.h> @@ -89,31 +90,11 @@ typedef struct BOOL is_valid_netconn(netconn_t *) DECLSPEC_HIDDEN; void close_netconn(netconn_t *) DECLSPEC_HIDDEN; -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); -} - -static inline void * __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t len) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, len); -} - static inline void * __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, size_t len) { return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len); } -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline LPWSTR heap_strdupW(LPCWSTR str) { LPWSTR ret = NULL;

1 0

Nikolay Sivov : comctl32: Introduce Button control.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 5d10abde503fc4a952c114c658fed74f97bff090 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d10abde503fc4a952c114c6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 6 08:50:21 2018 +0300 comctl32: Introduce Button control. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/Makefile.in | 1 + dlls/comctl32/button.c | 1153 ++++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/comctl32.h | 1 + dlls/comctl32/commctrl.c | 2 + dlls/comctl32/tests/button.c | 18 +- dlls/comctl32/tests/misc.c | 3 +- dlls/user32/class.c | 1 - 7 files changed, 1164 insertions(+), 15 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5d10abde503fc4a952c1…

1 0

Nikolay Sivov : comctl32/monthcal: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 26cce5550c5afe7c5139f4719c834293c383148c URL: https://source.winehq.org/git/wine.git/?a=commit;h=26cce5550c5afe7c5139f471… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 6 08:50:24 2018 +0300 comctl32/monthcal: Use the global HeapAlloc() wrappers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/monthcal.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index b94345c..9d00094 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -56,6 +56,7 @@ #include "vssym32.h" #include "wine/unicode.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(monthcal); @@ -1966,7 +1967,7 @@ static void MONTHCAL_NotifyDayState(MONTHCAL_INFO *infoPtr) nmds.nmhdr.idFrom = GetWindowLongPtrW(infoPtr->hwndSelf, GWLP_ID); nmds.nmhdr.code = MCN_GETDAYSTATE; nmds.cDayState = MONTHCAL_GetMonthRange(infoPtr, GMR_DAYSTATE, 0); - nmds.prgDayState = state = Alloc(nmds.cDayState * sizeof(MONTHDAYSTATE)); + nmds.prgDayState = state = heap_alloc_zero(nmds.cDayState * sizeof(MONTHDAYSTATE)); MONTHCAL_GetMinDate(infoPtr, &nmds.stStart); nmds.stStart.wDay = 1; @@ -1975,7 +1976,7 @@ static void MONTHCAL_NotifyDayState(MONTHCAL_INFO *infoPtr) memcpy(infoPtr->monthdayState, nmds.prgDayState, MONTHCAL_GetMonthRange(infoPtr, GMR_DAYSTATE, 0)*sizeof(MONTHDAYSTATE)); - Free(state); + heap_free(state); } /* no valid range check performed */ @@ -2615,9 +2616,9 @@ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr) { infoPtr->dim.cx = x; infoPtr->dim.cy = y; - infoPtr->calendars = ReAlloc(infoPtr->calendars, MONTHCAL_GetCalCount(infoPtr)*sizeof(CALENDAR_INFO)); + infoPtr->calendars = heap_realloc(infoPtr->calendars, MONTHCAL_GetCalCount(infoPtr)*sizeof(CALENDAR_INFO)); - infoPtr->monthdayState = ReAlloc(infoPtr->monthdayState, + infoPtr->monthdayState = heap_realloc(infoPtr->monthdayState, MONTHCAL_GetMonthRange(infoPtr, GMR_DAYSTATE, 0)*sizeof(MONTHDAYSTATE)); MONTHCAL_NotifyDayState(infoPtr); @@ -2773,7 +2774,7 @@ MONTHCAL_Create(HWND hwnd, LPCREATESTRUCTW lpcs) MONTHCAL_INFO *infoPtr; /* allocate memory for info structure */ - infoPtr = Alloc(sizeof(MONTHCAL_INFO)); + infoPtr = heap_alloc_zero(sizeof(*infoPtr)); SetWindowLongPtrW(hwnd, 0, (DWORD_PTR)infoPtr); if (infoPtr == NULL) { @@ -2785,9 +2786,9 @@ MONTHCAL_Create(HWND hwnd, LPCREATESTRUCTW lpcs) infoPtr->hwndNotify = lpcs->hwndParent; infoPtr->dwStyle = GetWindowLongW(hwnd, GWL_STYLE); infoPtr->dim.cx = infoPtr->dim.cy = 1; - infoPtr->calendars = Alloc(sizeof(CALENDAR_INFO)); + infoPtr->calendars = heap_alloc_zero(sizeof(CALENDAR_INFO)); if (!infoPtr->calendars) goto fail; - infoPtr->monthdayState = Alloc(3*sizeof(MONTHDAYSTATE)); + infoPtr->monthdayState = heap_alloc_zero(3 * sizeof(MONTHDAYSTATE)); if (!infoPtr->monthdayState) goto fail; /* initialize info structure */ @@ -2828,9 +2829,9 @@ MONTHCAL_Create(HWND hwnd, LPCREATESTRUCTW lpcs) return 0; fail: - Free(infoPtr->monthdayState); - Free(infoPtr->calendars); - Free(infoPtr); + heap_free(infoPtr->monthdayState); + heap_free(infoPtr->calendars); + heap_free(infoPtr); return 0; } @@ -2840,8 +2841,8 @@ MONTHCAL_Destroy(MONTHCAL_INFO *infoPtr) INT i; /* free month calendar info data */ - Free(infoPtr->monthdayState); - Free(infoPtr->calendars); + heap_free(infoPtr->monthdayState); + heap_free(infoPtr->calendars); SetWindowLongPtrW(infoPtr->hwndSelf, 0, 0); CloseThemeData (GetWindowTheme (infoPtr->hwndSelf)); @@ -2849,7 +2850,7 @@ MONTHCAL_Destroy(MONTHCAL_INFO *infoPtr) for (i = 0; i < BrushLast; i++) DeleteObject(infoPtr->brushes[i]); for (i = 0; i < PenLast; i++) DeleteObject(infoPtr->pens[i]); - Free(infoPtr); + heap_free(infoPtr); return 0; }

1 0

Jacek Caban : mshtml: Expose IHTMLUIEvent to scripts.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

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

Michael Stefaniuc : usp10: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: b21eb6733fab6d777886a8e0271cecb8a5a9fbdc URL: https://source.winehq.org/git/wine.git/?a=commit;h=b21eb6733fab6d777886a8e0… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 6 01:07:15 2018 +0100 usp10: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/bidi.c | 1 + dlls/usp10/breaking.c | 1 + dlls/usp10/indic.c | 1 + dlls/usp10/opentype.c | 1 + dlls/usp10/shape.c | 1 + dlls/usp10/usp10.c | 1 + dlls/usp10/usp10_internal.h | 15 --------------- 7 files changed, 6 insertions(+), 15 deletions(-) diff --git a/dlls/usp10/bidi.c b/dlls/usp10/bidi.c index 5941ef8..d94dc7b 100644 --- a/dlls/usp10/bidi.c +++ b/dlls/usp10/bidi.c @@ -52,6 +52,7 @@ #include "usp10.h" #include "wine/unicode.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "usp10_internal.h" diff --git a/dlls/usp10/breaking.c b/dlls/usp10/breaking.c index f5e40ac..9b12d9e 100644 --- a/dlls/usp10/breaking.c +++ b/dlls/usp10/breaking.c @@ -32,6 +32,7 @@ #include "winternl.h" #include "wine/debug.h" +#include "wine/heap.h" #include "usp10_internal.h" WINE_DEFAULT_DEBUG_CHANNEL(uniscribe); diff --git a/dlls/usp10/indic.c b/dlls/usp10/indic.c index c9b0810..5a228e8 100644 --- a/dlls/usp10/indic.c +++ b/dlls/usp10/indic.c @@ -32,6 +32,7 @@ #include "winternl.h" #include "wine/debug.h" +#include "wine/heap.h" #include "usp10_internal.h" WINE_DEFAULT_DEBUG_CHANNEL(uniscribe); diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 1fd9c4d..2d708a8 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -32,6 +32,7 @@ #include "usp10_internal.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(uniscribe); diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index b75be60..ca084e7 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -32,6 +32,7 @@ #include "usp10_internal.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(uniscribe); diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 17f60a1..5f50332 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -39,6 +39,7 @@ #include "usp10_internal.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(uniscribe); diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 832d894..eae0255 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -219,21 +219,6 @@ typedef struct { enum {lex_Halant, lex_Composed_Vowel, lex_Matra_post, lex_Matra_pre, lex_Matra_above, lex_Matra_below, lex_ZWJ, lex_ZWNJ, lex_NBSP, lex_Modifier, lex_Vowel, lex_Consonant, lex_Generic, lex_Ra, lex_Vedic, lex_Anudatta, lex_Nukta}; -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline BOOL is_consonant( int type ) { return (type == lex_Ra || type == lex_Consonant);

1 0

Henri Verbeet : d3d8: Use wined3d_buffer_create() in d3d8_device_prepare_index_buffer().
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 112579f4ba8e81e5983f01c898a82dc77c7b9ce0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=112579f4ba8e81e5983f01c8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 6 03:22:17 2018 +0330 d3d8: Use wined3d_buffer_create() in d3d8_device_prepare_index_buffer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 7faf8e7..590ab45 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2196,15 +2196,22 @@ static HRESULT d3d8_device_prepare_index_buffer(struct d3d8_device *device, UINT if (device->index_buffer_size < min_size || !device->index_buffer) { UINT size = max(device->index_buffer_size * 2, min_size); + struct wined3d_buffer_desc desc; struct wined3d_buffer *buffer; TRACE("Growing index buffer to %u bytes\n", size); - hr = wined3d_buffer_create_ib(device->wined3d_device, size, WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY, - WINED3D_POOL_DEFAULT, NULL, &d3d8_null_wined3d_parent_ops, &buffer); - if (FAILED(hr)) + desc.byte_width = size; + 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; + + if (FAILED(hr = wined3d_buffer_create(device->wined3d_device, &desc, + NULL, NULL, &d3d8_null_wined3d_parent_ops, &buffer))) { - ERR("(%p) wined3d_buffer_create_ib failed with hr = %08x\n", device, hr); + ERR("Failed to create index buffer, hr %#x.\n", hr); return hr; }

1 0

Jacek Caban : mshtml: Added key and char code IDOMKeyboardEvent getters implementation.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

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 IDOMUIEvent::initUIEvent implementation.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: f5a0252670e3d1687f2fafa5a3a6fd450b4e14c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5a0252670e3d1687f2fafa5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 6 00:09:09 2018 +0100 mshtml: Added IDOMUIEvent::initUIEvent implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 88b9e85..b788b2e 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1219,8 +1219,31 @@ static HRESULT WINAPI DOMUIEvent_initUIEvent(IDOMUIEvent *iface, BSTR type, VARI VARIANT_BOOL cancelable, IHTMLWindow2 *view, LONG detail) { DOMEvent *This = impl_from_IDOMUIEvent(iface); - FIXME("(%p)->(%s %x %x %p %x)\n", This, debugstr_w(type), can_bubble, cancelable, view, detail); - return E_NOTIMPL; + nsAString type_str; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%s %x %x %p %x)\n", This, debugstr_w(type), can_bubble, cancelable, view, detail); + + if(This->target) { + TRACE("called on already dispatched event\n"); + return S_OK; + } + + hres = IDOMEvent_initEvent(&This->IDOMEvent_iface, type, can_bubble, cancelable); + if(FAILED(hres)) + return hres; + + nsAString_InitDepend(&type_str, type); + nsres = nsIDOMUIEvent_InitUIEvent(This->ui_event, &type_str, can_bubble, cancelable, + NULL /* FIXME */, detail); + nsAString_Finish(&type_str); + if(NS_FAILED(nsres)) { + FIXME("InitUIEvent failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static const IDOMUIEventVtbl DOMUIEventVtbl = {

1 0

Jacek Caban : mshtml: Added IDOMUIEvent stub implementation.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 28e2f7a85ecd2f5a9ab418feda918fbc53aa9a11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=28e2f7a85ecd2f5a9ab418fe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 6 00:08:46 2018 +0100 mshtml: Added IDOMUIEvent stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 99 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/htmlevent.h | 2 + dlls/mshtml/tests/events.c | 19 +++++++++ 3 files changed, 120 insertions(+) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 633c1f9..6c51819 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -861,6 +861,8 @@ static HRESULT WINAPI DOMEvent_QueryInterface(IDOMEvent *iface, REFIID riid, voi *ppv = &This->IDOMEvent_iface; else if(IsEqualGUID(&IID_IDOMEvent, riid)) *ppv = &This->IDOMEvent_iface; + else if(This->ui_event && IsEqualGUID(&IID_IDOMUIEvent, riid)) + *ppv = &This->IDOMUIEvent_iface; else if(This->mouse_event && IsEqualGUID(&IID_IDOMMouseEvent, riid)) *ppv = &This->IDOMMouseEvent_iface; else if(dispex_query_interface(&This->dispex, riid, ppv)) @@ -893,6 +895,10 @@ static ULONG WINAPI DOMEvent_Release(IDOMEvent *iface) TRACE("(%p) ref=%u\n", This, ref); if(!ref) { + if(This->ui_event) + nsIDOMUIEvent_Release(This->ui_event); + if(This->mouse_event) + nsIDOMMouseEvent_Release(This->mouse_event); if(This->target) IDispatchEx_Release(&This->target->dispex.IDispatchEx_iface); nsIDOMEvent_Release(This->nsevent); @@ -1152,6 +1158,94 @@ static const IDOMEventVtbl DOMEventVtbl = { DOMEvent_get_srcElement }; +static inline DOMEvent *impl_from_IDOMUIEvent(IDOMUIEvent *iface) +{ + return CONTAINING_RECORD(iface, DOMEvent, IDOMUIEvent_iface); +} + +static HRESULT WINAPI DOMUIEvent_QueryInterface(IDOMUIEvent *iface, REFIID riid, void **ppv) +{ + DOMEvent *This = impl_from_IDOMUIEvent(iface); + return IDOMEvent_QueryInterface(&This->IDOMEvent_iface, riid, ppv); +} + +static ULONG WINAPI DOMUIEvent_AddRef(IDOMUIEvent *iface) +{ + DOMEvent *This = impl_from_IDOMUIEvent(iface); + return IDOMEvent_AddRef(&This->IDOMEvent_iface); +} + +static ULONG WINAPI DOMUIEvent_Release(IDOMUIEvent *iface) +{ + DOMEvent *This = impl_from_IDOMUIEvent(iface); + return IDOMEvent_Release(&This->IDOMEvent_iface); +} + +static HRESULT WINAPI DOMUIEvent_GetTypeInfoCount(IDOMUIEvent *iface, UINT *pctinfo) +{ + DOMEvent *This = impl_from_IDOMUIEvent(iface); + return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI DOMUIEvent_GetTypeInfo(IDOMUIEvent *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + DOMEvent *This = impl_from_IDOMUIEvent(iface); + return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI DOMUIEvent_GetIDsOfNames(IDOMUIEvent *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + DOMEvent *This = impl_from_IDOMUIEvent(iface); + return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, cNames, + lcid, rgDispId); +} + +static HRESULT WINAPI DOMUIEvent_Invoke(IDOMUIEvent *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + DOMEvent *This = impl_from_IDOMUIEvent(iface); + return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI DOMUIEvent_get_view(IDOMUIEvent *iface, IHTMLWindow2 **p) +{ + DOMEvent *This = impl_from_IDOMUIEvent(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +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; +} + +static HRESULT WINAPI DOMUIEvent_initUIEvent(IDOMUIEvent *iface, BSTR type, VARIANT_BOOL can_bubble, + VARIANT_BOOL cancelable, IHTMLWindow2 *view, LONG detail) +{ + DOMEvent *This = impl_from_IDOMUIEvent(iface); + FIXME("(%p)->(%s %x %x %p %x)\n", This, debugstr_w(type), can_bubble, cancelable, view, detail); + return E_NOTIMPL; +} + +static const IDOMUIEventVtbl DOMUIEventVtbl = { + DOMUIEvent_QueryInterface, + DOMUIEvent_AddRef, + DOMUIEvent_Release, + DOMUIEvent_GetTypeInfoCount, + DOMUIEvent_GetTypeInfo, + DOMUIEvent_GetIDsOfNames, + DOMUIEvent_Invoke, + DOMUIEvent_get_view, + DOMUIEvent_get_detail, + DOMUIEvent_initUIEvent +}; + static inline DOMEvent *impl_from_IDOMMouseEvent(IDOMMouseEvent *iface) { return CONTAINING_RECORD(iface, DOMEvent, IDOMMouseEvent_iface); @@ -1558,6 +1652,7 @@ static DOMEvent *alloc_event(nsIDOMEvent *nsevent, eventid_t event_id) return NULL; event->IDOMEvent_iface.lpVtbl = &DOMEventVtbl; + event->IDOMUIEvent_iface.lpVtbl = &DOMUIEventVtbl; event->IDOMMouseEvent_iface.lpVtbl = &DOMMouseEventVtbl; event->ref = 1; event->event_id = event_id; @@ -1576,6 +1671,10 @@ static DOMEvent *alloc_event(nsIDOMEvent *nsevent, eventid_t event_id) event->time_stamp = (((ULONGLONG)time.dwHighDateTime<<32) + time.dwLowDateTime) / 10000 - time_epoch; + nsres = nsIDOMEvent_QueryInterface(nsevent, &IID_nsIDOMUIEvent, (void**)&event->ui_event); + if(NS_FAILED(nsres)) + event->ui_event = NULL; + nsres = nsIDOMEvent_QueryInterface(nsevent, &IID_nsIDOMMouseEvent, (void**)&event->mouse_event); if(NS_SUCCEEDED(nsres)) dispex_data = &DOMMouseEvent_dispex; diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index d1b8470..fde9cb9 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -59,11 +59,13 @@ typedef enum { typedef struct { DispatchEx dispex; IDOMEvent IDOMEvent_iface; + IDOMUIEvent IDOMUIEvent_iface; IDOMMouseEvent IDOMMouseEvent_iface; LONG ref; nsIDOMEvent *nsevent; + nsIDOMUIEvent *ui_event; nsIDOMMouseEvent *mouse_event; eventid_t event_id; diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index ef9b102..d8dc8da 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -2669,6 +2669,7 @@ static void test_create_event(IHTMLDocument2 *doc) IDOMMouseEvent *mouse_event; IDocumentEvent *doc_event; IEventTarget *event_target; + IDOMUIEvent *ui_event; IHTMLElement *elem; IDOMEvent *event; VARIANT_BOOL b; @@ -2721,6 +2722,8 @@ static void test_create_event(IHTMLDocument2 *doc) IEventTarget_Release(event_target); + hres = IDOMEvent_QueryInterface(event, &IID_IDOMUIEvent, (void**)&ui_event); + ok(hres == E_NOINTERFACE, "QueryInterface(IID_IDOMUIEvent returned %08x\n", hres); hres = IDOMEvent_QueryInterface(event, &IID_IDOMMouseEvent, (void**)&mouse_event); ok(hres == E_NOINTERFACE, "QueryInterface(IID_IDOMMouseEvent returned %08x\n", hres); @@ -2731,12 +2734,28 @@ static void test_create_event(IHTMLDocument2 *doc) 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_IDOMMouseEvent, (void**)&mouse_event); ok(hres == S_OK, "QueryInterface(IID_IDOMMouseEvent returned %08x\n", hres); IDOMMouseEvent_Release(mouse_event); IDOMEvent_Release(event); + str = a2bstr("UIEvent"); + 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_IDOMMouseEvent, (void**)&mouse_event); + ok(hres == E_NOINTERFACE, "QueryInterface(IID_IDOMMouseEvent returned %08x\n", hres); + + IDOMEvent_Release(event); + IDocumentEvent_Release(doc_event); }

1 0

Jacek Caban : mshtml: Use nsIDOMUIEvent stored in DOMEvent in IHTMLEventObj::get_[xy] implementation.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 90bccb498af821597e52f49e244eb565e68b808e URL: https://source.winehq.org/git/wine.git/?a=commit;h=90bccb498af821597e52f49e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 6 00:09:01 2018 +0100 mshtml: Use nsIDOMUIEvent stored in DOMEvent in IHTMLEventObj::get_[xy] implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 6c51819..88b9e85 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -635,17 +635,12 @@ static HRESULT WINAPI HTMLEventObj_get_x(IHTMLEventObj *iface, LONG *p) TRACE("(%p)->(%p)\n", This, p); - if(This->event) { - nsIDOMUIEvent *ui_event; + if(This->event && This->event->ui_event) { nsresult nsres; - nsres = nsIDOMEvent_QueryInterface(This->event->nsevent, &IID_nsIDOMUIEvent, (void**)&ui_event); - if(NS_SUCCEEDED(nsres)) { - /* NOTE: pageX is not exactly right here. */ - nsres = nsIDOMUIEvent_GetPageX(ui_event, &x); - assert(nsres == NS_OK); - nsIDOMUIEvent_Release(ui_event); - } + /* NOTE: pageX is not exactly right here. */ + nsres = nsIDOMUIEvent_GetPageX(This->event->ui_event, &x); + assert(nsres == NS_OK); } *p = x; @@ -659,17 +654,12 @@ static HRESULT WINAPI HTMLEventObj_get_y(IHTMLEventObj *iface, LONG *p) TRACE("(%p)->(%p)\n", This, p); - if(This->event) { - nsIDOMUIEvent *ui_event; + if(This->event && This->event->ui_event) { nsresult nsres; - nsres = nsIDOMEvent_QueryInterface(This->event->nsevent, &IID_nsIDOMUIEvent, (void**)&ui_event); - if(NS_SUCCEEDED(nsres)) { - /* NOTE: pageY is not exactly right here. */ - nsres = nsIDOMUIEvent_GetPageY(ui_event, &y); - assert(nsres == NS_OK); - nsIDOMUIEvent_Release(ui_event); - } + /* NOTE: pageY is not exactly right here. */ + nsres = nsIDOMUIEvent_GetPageY(This->event->ui_event, &y); + assert(nsres == NS_OK); } *p = y;

1 0