February 2018 - Wine-Commits

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

Feb. 6, 2018

Module: wine Branch: master Commit: 25692aefe0dfd2d09898f294f4790e6290e58c8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=25692aefe0dfd2d09898f294… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 6 01:07:22 2018 +0100 wmiutils: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmiutils/wmiutils_private.h | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/wmiutils/wmiutils_private.h b/dlls/wmiutils/wmiutils_private.h index 6782bd8..6195f21 100644 --- a/dlls/wmiutils/wmiutils_private.h +++ b/dlls/wmiutils/wmiutils_private.h @@ -16,31 +16,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wine/heap.h" #include "wine/unicode.h" HRESULT WbemPath_create(LPVOID *) DECLSPEC_HIDDEN; HRESULT WbemStatusCodeText_create(LPVOID *) DECLSPEC_HIDDEN; -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 void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline WCHAR *strdupW( const WCHAR *src ) { WCHAR *dst;

1 0

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

Feb. 6, 2018

Module: wine Branch: master Commit: 5da20294186873758badfbee0cd0238e9289c7f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5da20294186873758badfbee… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 6 01:07:19 2018 +0100 wer: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wer/main.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/dlls/wer/main.c b/dlls/wer/main.c index da44aa7..75a22a5 100644 --- a/dlls/wer/main.c +++ b/dlls/wer/main.c @@ -25,6 +25,7 @@ #include "winbase.h" #include "winreg.h" #include "werapi.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -56,20 +57,6 @@ static const WCHAR regpath_exclude[] = 'W','i','n','d','o','w','s',' ','E','r','r','o','r',' ','R','e','p','o','r','t','i','n','g','\\', 'E','x','c','l','u','d','e','d','A','p','p','l','i','c','a','t','i','o','n','s',0}; -/*********************************************************************** - * Memory allocation helper - */ - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved);

1 0

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

Feb. 6, 2018

Module: wine Branch: master Commit: 91040ba231b3c465c31c531575b1be5ba132413d URL: https://source.winehq.org/git/wine.git/?a=commit;h=91040ba231b3c465c31c5315… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 6 01:07:20 2018 +0100 winhttp: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/winhttp_private.h | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index ee41481..0eb0dea 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -23,6 +23,7 @@ # error You must include config.h to use this header #endif +#include "wine/heap.h" #include "wine/list.h" #include "wine/unicode.h" @@ -322,31 +323,11 @@ void release_host( hostdata_t *host ) DECLSPEC_HIDDEN; extern HRESULT WinHttpRequest_create( void ** ) DECLSPEC_HIDDEN; void release_typelib( void ) DECLSPEC_HIDDEN; -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 void* __WINE_ALLOC_SIZE(2) heap_realloc( LPVOID mem, SIZE_T size ) -{ - return HeapReAlloc( GetProcessHeap(), 0, mem, size ); -} - static inline void* __WINE_ALLOC_SIZE(2) heap_realloc_zero( LPVOID mem, SIZE_T size ) { return HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, mem, size ); } -static inline BOOL heap_free( LPVOID mem ) -{ - return HeapFree( GetProcessHeap(), 0, mem ); -} - static inline WCHAR *strdupW( const WCHAR *src ) { WCHAR *dst;

1 0

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

Feb. 6, 2018

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

Feb. 6, 2018

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: Added IDOMKeyboardEvent key state getters implementation.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

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 Feb. 6, 2018

Feb. 6, 2018

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

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

Feb. 6, 2018

Module: wine Branch: master Commit: 86baab093c05f91e836705bdf8ca0cd26c104cb6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86baab093c05f91e836705bd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 6 03:22:18 2018 +0330 d3d9: Use wined3d_buffer_create() in indexbuffer_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/buffer.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index 56a58bc..635483c 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -564,25 +564,25 @@ static const struct wined3d_parent_ops d3d9_indexbuffer_wined3d_parent_ops = HRESULT indexbuffer_init(struct d3d9_indexbuffer *buffer, struct d3d9_device *device, UINT size, DWORD usage, D3DFORMAT format, D3DPOOL pool) { - enum wined3d_pool wined3d_pool; - DWORD wined3d_usage; + struct wined3d_buffer_desc desc; HRESULT hr; - wined3d_pool = pool; - wined3d_usage = usage & WINED3DUSAGE_MASK; + desc.byte_width = size; + desc.usage = (usage & WINED3DUSAGE_MASK) | WINED3DUSAGE_STATICDECL; if (pool == D3DPOOL_SCRATCH) - { - wined3d_pool = WINED3D_POOL_SYSTEM_MEM; - wined3d_usage |= WINED3DUSAGE_SCRATCH; - } + desc.usage |= WINED3DUSAGE_SCRATCH; + desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; + desc.access = wined3daccess_from_d3dpool(pool); + desc.misc_flags = 0; + desc.structure_byte_stride = 0; buffer->IDirect3DIndexBuffer9_iface.lpVtbl = &d3d9_indexbuffer_vtbl; buffer->format = wined3dformat_from_d3dformat(format); d3d9_resource_init(&buffer->resource); wined3d_mutex_lock(); - hr = wined3d_buffer_create_ib(device->wined3d_device, size, wined3d_usage, wined3d_pool, - buffer, &d3d9_indexbuffer_wined3d_parent_ops, &buffer->wined3d_buffer); + hr = wined3d_buffer_create(device->wined3d_device, &desc, NULL, buffer, + &d3d9_indexbuffer_wined3d_parent_ops, &buffer->wined3d_buffer); wined3d_mutex_unlock(); if (FAILED(hr)) {

1 0

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

Feb. 6, 2018

Module: wine Branch: master Commit: aae49dc7adcdd7e7d7f4c448017618849916a409 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aae49dc7adcdd7e7d7f4c448… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 6 01:07:17 2018 +0100 wbemprox: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/wbemprox_private.h | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 15ea9c6..54b1ba3 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -17,6 +17,7 @@ */ #include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/unicode.h" @@ -227,26 +228,6 @@ HRESULT service_stop_service(IWbemClassObject *, IWbemClassObject *, IWbemClassO HRESULT security_get_sd(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT security_set_sd(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; -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 void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline WCHAR *heap_strdupW( const WCHAR *src ) { WCHAR *dst;

1 0

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

Feb. 6, 2018

Module: wine Branch: master Commit: 0c91b5ebcdd6d429c3394f97bed406bf48119302 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c91b5ebcdd6d429c3394f97… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 6 01:07:18 2018 +0100 webservices: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 1 + dlls/webservices/error.c | 1 + dlls/webservices/heap.c | 1 + dlls/webservices/listener.c | 1 + dlls/webservices/msg.c | 1 + dlls/webservices/proxy.c | 1 + dlls/webservices/reader.c | 1 + dlls/webservices/string.c | 1 + dlls/webservices/url.c | 1 + dlls/webservices/webservices_private.h | 20 -------------------- dlls/webservices/writer.c | 1 + 11 files changed, 10 insertions(+), 20 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 0765e0d..685e13d 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -25,6 +25,7 @@ #include "webservices.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/unicode.h" #include "webservices_private.h" diff --git a/dlls/webservices/error.c b/dlls/webservices/error.c index 747af2a..e4292db 100644 --- a/dlls/webservices/error.c +++ b/dlls/webservices/error.c @@ -24,6 +24,7 @@ #include "webservices.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "webservices_private.h" diff --git a/dlls/webservices/heap.c b/dlls/webservices/heap.c index 080cc0d..5e1a273 100644 --- a/dlls/webservices/heap.c +++ b/dlls/webservices/heap.c @@ -24,6 +24,7 @@ #include "webservices.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "webservices_private.h" diff --git a/dlls/webservices/listener.c b/dlls/webservices/listener.c index 41afb27..a178e27 100644 --- a/dlls/webservices/listener.c +++ b/dlls/webservices/listener.c @@ -23,6 +23,7 @@ #include "webservices.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/unicode.h" #include "webservices_private.h" diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index f4d167f..19a1076 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -25,6 +25,7 @@ #include "webservices.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/unicode.h" #include "webservices_private.h" diff --git a/dlls/webservices/proxy.c b/dlls/webservices/proxy.c index a4041fe..da30cb0 100644 --- a/dlls/webservices/proxy.c +++ b/dlls/webservices/proxy.c @@ -24,6 +24,7 @@ #include "webservices.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "webservices_private.h" diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 4c121d9..a56bb7e 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -25,6 +25,7 @@ #include "webservices.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "webservices_private.h" diff --git a/dlls/webservices/string.c b/dlls/webservices/string.c index 45a5512..18c55e3 100644 --- a/dlls/webservices/string.c +++ b/dlls/webservices/string.c @@ -24,6 +24,7 @@ #include "webservices.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "webservices_private.h" diff --git a/dlls/webservices/url.c b/dlls/webservices/url.c index e5e04e4..465857a 100644 --- a/dlls/webservices/url.c +++ b/dlls/webservices/url.c @@ -24,6 +24,7 @@ #include "webservices.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/unicode.h" #include "webservices_private.h" diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index 3f6d2f4..cce49cc 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -394,27 +394,7 @@ static inline BOOL is_valid_parent( const struct node *node ) return (node_type( node ) == WS_XML_NODE_TYPE_ELEMENT || node_type( node ) == WS_XML_NODE_TYPE_BOF); } -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 void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, size); -} - static inline void* __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, size_t size) { return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, size); } - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 75cf7b4..9cba4e6 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -28,6 +28,7 @@ #include "webservices.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/unicode.h" #include "webservices_private.h"

1 0