May 2015 - Wine-Commits - list.winehq.org

Ken Thomases : configure: Add a check for sys/vnode.h.
by Alexandre Julliard May 21, 2015

May 21, 2015

Module: wine Branch: master Commit: 4655924568291481ebbf18a177f3fa852d5448e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4655924568291481ebbf18a17… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed May 20 14:59:23 2015 -0500 configure: Add a check for sys/vnode.h. --- configure | 1 + configure.ac | 1 + include/config.h.in | 3 +++ 3 files changed, 5 insertions(+) diff --git a/configure b/configure index fff8e9b..ec6bd6f 100755 --- a/configure +++ b/configure @@ -6706,6 +6706,7 @@ for ac_header in \ sys/user.h \ sys/utsname.h \ sys/vm86.h \ + sys/vnode.h \ sys/wait.h \ syscall.h \ termios.h \ diff --git a/configure.ac b/configure.ac index fcf825e..1133499 100644 --- a/configure.ac +++ b/configure.ac @@ -506,6 +506,7 @@ AC_CHECK_HEADERS(\ sys/user.h \ sys/utsname.h \ sys/vm86.h \ + sys/vnode.h \ sys/wait.h \ syscall.h \ termios.h \ diff --git a/include/config.h.in b/include/config.h.in index 4d7c7ac..bcc6eb9 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1122,6 +1122,9 @@ /* Define to 1 if you have the <sys/vm86.h> header file. */ #undef HAVE_SYS_VM86_H +/* Define to 1 if you have the <sys/vnode.h> header file. */ +#undef HAVE_SYS_VNODE_H + /* Define to 1 if you have the <sys/wait.h> header file. */ #undef HAVE_SYS_WAIT_H

1 0

Sebastian Lackner : advapi32: Forward ImpersonateAnonymousToken to ntdll.
by Alexandre Julliard May 21, 2015

May 21, 2015

Module: wine Branch: master Commit: e24eb501d3880c59ce0495cc5ef60b2f1db83017 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e24eb501d3880c59ce0495cc5… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu May 21 06:43:29 2015 +0200 advapi32: Forward ImpersonateAnonymousToken to ntdll. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/security.c | 9 +++++++++ .../api-ms-win-security-base-l1-1-0.spec | 2 +- .../api-ms-win-security-base-l1-2-0.spec | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index e885684..4600142 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -376,7 +376,7 @@ @ stub I_ScSetServiceBitsA # @ stub I_ScSetServiceBitsW # @ stub IdentifyCodeAuthzLevelW -# @ stub ImpersonateAnonymousToken +@ stdcall ImpersonateAnonymousToken(long) @ stdcall ImpersonateLoggedOnUser(long) @ stdcall ImpersonateNamedPipeClient(long) @ stdcall ImpersonateSelf(long) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index d27b2e7..028dcc6 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2501,6 +2501,15 @@ BOOL WINAPI ImpersonateLoggedOnUser(HANDLE hToken) } /****************************************************************************** + * ImpersonateAnonymousToken [ADVAPI32.@] + */ +BOOL WINAPI ImpersonateAnonymousToken( HANDLE thread ) +{ + TRACE("(%p)\n", thread); + return set_ntstatus( NtImpersonateAnonymousToken( thread ) ); +} + +/****************************************************************************** * AccessCheck [ADVAPI32.@] */ BOOL WINAPI diff --git a/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec b/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec index 548ae83..4277706 100644 --- a/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec +++ b/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec @@ -58,7 +58,7 @@ @ stdcall GetSidSubAuthorityCount(ptr) advapi32.GetSidSubAuthorityCount @ stdcall GetTokenInformation(long long ptr long ptr) advapi32.GetTokenInformation @ stub GetWindowsAccountDomainSid -@ stub ImpersonateAnonymousToken +@ stdcall ImpersonateAnonymousToken(long) advapi32.ImpersonateAnonymousToken @ stdcall ImpersonateLoggedOnUser(long) advapi32.ImpersonateLoggedOnUser @ stdcall ImpersonateSelf(long) advapi32.ImpersonateSelf @ stdcall InitializeAcl(ptr long long) advapi32.InitializeAcl diff --git a/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec b/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec index d268183..3adef23 100644 --- a/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec +++ b/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec @@ -64,7 +64,7 @@ @ stdcall GetSidSubAuthorityCount(ptr) advapi32.GetSidSubAuthorityCount @ stdcall GetTokenInformation(long long ptr long ptr) advapi32.GetTokenInformation @ stub GetWindowsAccountDomainSid -@ stub ImpersonateAnonymousToken +@ stdcall ImpersonateAnonymousToken(long) advapi32.ImpersonateAnonymousToken @ stdcall ImpersonateLoggedOnUser(long) advapi32.ImpersonateLoggedOnUser @ stdcall ImpersonateSelf(long) advapi32.ImpersonateSelf @ stdcall InitializeAcl(ptr long long) advapi32.InitializeAcl

1 0

Sebastian Lackner : ntdll: Add stub for NtImpersonateAnonymousToken.
by Alexandre Julliard May 21, 2015

May 21, 2015

Module: wine Branch: master Commit: 39abfc4d749b88c045487f463ef4b12199a6e6e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39abfc4d749b88c045487f463… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu May 21 06:42:16 2015 +0200 ntdll: Add stub for NtImpersonateAnonymousToken. --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/sec.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index e87b2c7..6d86157 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -182,7 +182,7 @@ @ stub NtGetPlugPlayEvent @ stdcall NtGetTickCount() @ stdcall NtGetWriteWatch(long long ptr long ptr ptr ptr) -@ stub NtImpersonateAnonymousToken +@ stdcall NtImpersonateAnonymousToken(long) @ stub NtImpersonateClientOfPort @ stub NtImpersonateThread @ stub NtInitializeRegistry diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index 0917780..360a579 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -1523,6 +1523,16 @@ RtlImpersonateSelf(SECURITY_IMPERSONATION_LEVEL ImpersonationLevel) } /****************************************************************************** + * NtImpersonateAnonymousToken [NTDLL.@] + */ +NTSTATUS WINAPI +NtImpersonateAnonymousToken(HANDLE thread) +{ + FIXME("(%p): stub\n", thread); + return STATUS_NOT_IMPLEMENTED; +} + +/****************************************************************************** * NtAccessCheck [NTDLL.@] * ZwAccessCheck [NTDLL.@] *

1 0

Nikolay Sivov : msctfp: Added proxy/stub dll for msctf.idl interfaces.
by Alexandre Julliard May 21, 2015

May 21, 2015

Module: wine Branch: master Commit: 5d0806d29dbb8505868cb25a3813c96d8092507b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d0806d29dbb8505868cb25a3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 20 12:51:47 2015 +0300 msctfp: Added proxy/stub dll for msctf.idl interfaces. --- configure | 2 ++ configure.ac | 1 + dlls/msctfp/Makefile.in | 6 ++++++ dlls/msctfp/msctfp.idl | 27 +++++++++++++++++++++++++++ dlls/msctfp/msctfp.spec | 5 +++++ 5 files changed, 41 insertions(+) diff --git a/configure b/configure index ec6bd6f..de5f942 100755 --- a/configure +++ b/configure @@ -1130,6 +1130,7 @@ enable_mscat32 enable_mscms enable_mscoree enable_msctf +enable_msctfp enable_msdaps enable_msdmo enable_msftedit @@ -17378,6 +17379,7 @@ wine_fn_config_dll mscoree enable_mscoree clean wine_fn_config_test dlls/mscoree/tests mscoree_test wine_fn_config_dll msctf enable_msctf clean wine_fn_config_test dlls/msctf/tests msctf_test +wine_fn_config_dll msctfp enable_msctfp clean wine_fn_config_dll msdaps enable_msdaps clean wine_fn_config_dll msdmo enable_msdmo implib wine_fn_config_test dlls/msdmo/tests msdmo_test diff --git a/configure.ac b/configure.ac index 1133499..7a48000 100644 --- a/configure.ac +++ b/configure.ac @@ -3068,6 +3068,7 @@ WINE_CONFIG_DLL(mscoree,,[clean]) WINE_CONFIG_TEST(dlls/mscoree/tests) WINE_CONFIG_DLL(msctf,,[clean]) WINE_CONFIG_TEST(dlls/msctf/tests) +WINE_CONFIG_DLL(msctfp,,[clean]) WINE_CONFIG_DLL(msdaps,,[clean]) WINE_CONFIG_DLL(msdmo,,[implib]) WINE_CONFIG_TEST(dlls/msdmo/tests) diff --git a/dlls/msctfp/Makefile.in b/dlls/msctfp/Makefile.in new file mode 100644 index 0000000..9ff3c3d --- /dev/null +++ b/dlls/msctfp/Makefile.in @@ -0,0 +1,6 @@ +MODULE = msctfp.dll +IMPORTS = rpcrt4 ole32 oleaut32 + +IDL_SRCS = msctfp.idl + +dlldata_EXTRADEFS = -DWINE_REGISTER_DLL diff --git a/dlls/msctfp/msctfp.idl b/dlls/msctfp/msctfp.idl new file mode 100644 index 0000000..c1d7ec0 --- /dev/null +++ b/dlls/msctfp/msctfp.idl @@ -0,0 +1,27 @@ +/* + * Copyright 2015 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep ident proxy register + +#include "msctf.idl" + +[ + threading(both), + uuid(b5f8fb3b-393f-4f7c-84cb-504924c2705a) /* ITfMSAAControl */ +] +coclass PSFactoryBuffer { interface IFactoryBuffer; } diff --git a/dlls/msctfp/msctfp.spec b/dlls/msctfp/msctfp.spec new file mode 100644 index 0000000..7c7a65b --- /dev/null +++ b/dlls/msctfp/msctfp.spec @@ -0,0 +1,5 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() +@ stdcall -private GetProxyDllInfo(ptr ptr)

1 0

Ken Thomases : ntdll: Increase name buffer size in read_directory_getattrlist() for UTF-8 encoding.
by Alexandre Julliard May 21, 2015

May 21, 2015

Module: wine Branch: master Commit: f6926b35153888f85453856f3d3e74ac62ba3e70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6926b35153888f85453856f3… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed May 20 14:58:52 2015 -0500 ntdll: Increase name buffer size in read_directory_getattrlist() for UTF-8 encoding. The docs for getattrlist() say that ATTR_CMN_NAME can return up to NAME_MAX + 1 Unicode characters (code points) encoded in UTF-8, which means it can be up to NAME_MAX * 3 + 1 bytes. --- dlls/ntdll/directory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 455fbc6..0e5af8a 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2144,7 +2144,7 @@ static int read_directory_getattrlist( int fd, IO_STATUS_BLOCK *io, void *buffer { u_int32_t length; struct attrreference name_reference; - char name[NAME_MAX + 1]; + char name[NAME_MAX * 3 + 1]; } attrlist_buffer; TRACE("looking up file %s\n", debugstr_us( mask ));

1 0

Ken Thomases : ntdll: Fix read_directory_getattrlist() to get the name of a symlink rather than its target, but still detect if the symlink is broken.
by Alexandre Julliard May 21, 2015

May 21, 2015

Module: wine Branch: master Commit: bb89f10e5ed690abd191941a6ba5ecadb7d70c12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb89f10e5ed690abd191941a6… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed May 20 14:59:39 2015 -0500 ntdll: Fix read_directory_getattrlist() to get the name of a symlink rather than its target, but still detect if the symlink is broken. --- dlls/ntdll/directory.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 267f019..1a8d9cc 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -47,6 +47,9 @@ #ifdef HAVE_SYS_ATTR_H #include <sys/attr.h> #endif +#ifdef HAVE_SYS_VNODE_H +#include <sys/vnode.h> +#endif #ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> #endif @@ -2140,12 +2143,15 @@ static int read_directory_getattrlist( int fd, IO_STATUS_BLOCK *io, void *buffer int unix_len, ret, used_default; char *unix_name; struct attrlist attrlist; +#include "pshpack4.h" struct { u_int32_t length; struct attrreference name_reference; + fsobj_type_t type; char name[NAME_MAX * 3 + 1]; } attrlist_buffer; +#include "poppack.h" TRACE("looking up file %s\n", debugstr_us( mask )); @@ -2173,8 +2179,16 @@ static int read_directory_getattrlist( int fd, IO_STATUS_BLOCK *io, void *buffer memset( &attrlist, 0, sizeof(attrlist) ); attrlist.bitmapcount = ATTR_BIT_MAP_COUNT; - attrlist.commonattr = ATTR_CMN_NAME; - ret = getattrlist( unix_name, &attrlist, &attrlist_buffer, sizeof(attrlist_buffer), 0 ); + attrlist.commonattr = ATTR_CMN_NAME | ATTR_CMN_OBJTYPE; + ret = getattrlist( unix_name, &attrlist, &attrlist_buffer, sizeof(attrlist_buffer), FSOPT_NOFOLLOW ); + /* If unix_name named a symlink, the above may have succeeded even if the symlink is broken. + Check that with another call without FSOPT_NOFOLLOW. We don't ask for any attributes. */ + if (!ret && attrlist_buffer.type == VLNK) + { + u_int32_t dummy; + attrlist.commonattr = 0; + ret = getattrlist( unix_name, &attrlist, &dummy, sizeof(dummy), 0 ); + } if (!ret) { union file_directory_info *info = append_entry( buffer, io, length, attrlist_buffer.name, NULL, NULL, class );

1 0

Jacek Caban : mshtml: Use bind_event in set_event_handler.
by Alexandre Julliard May 21, 2015

May 21, 2015

Module: wine Branch: master Commit: c1079f2571702d3bac57e0bf2c83535e971b3e82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1079f2571702d3bac57e0bf2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 20 19:47:11 2015 +0200 mshtml: Use bind_event in set_event_handler. --- dlls/mshtml/htmlevent.c | 13 +++++++------ dlls/mshtml/htmlevent.h | 4 ++-- dlls/mshtml/htmlwindow.c | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 4bc9847..ef6929c 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1399,7 +1399,7 @@ static void remove_event_handler(EventTarget *event_target, eventid_t eid) } } -static HRESULT set_event_handler_disp(EventTarget *event_target, HTMLDocumentNode *doc, eventid_t eid, IDispatch *disp) +static HRESULT set_event_handler_disp(EventTarget *event_target, eventid_t eid, IDispatch *disp) { event_target_t *data; @@ -1417,10 +1417,11 @@ static HRESULT set_event_handler_disp(EventTarget *event_target, HTMLDocumentNod data->event_table[eid]->handler_prop = disp; IDispatch_AddRef(disp); - return ensure_doc_nsevent_handler(doc, eid); + bind_event(event_target, eid); + return S_OK; } -HRESULT set_event_handler(EventTarget *event_target, HTMLDocumentNode *doc, eventid_t eid, VARIANT *var) +HRESULT set_event_handler(EventTarget *event_target, eventid_t eid, VARIANT *var) { switch(V_VT(var)) { case VT_NULL: @@ -1428,7 +1429,7 @@ HRESULT set_event_handler(EventTarget *event_target, HTMLDocumentNode *doc, even return S_OK; case VT_DISPATCH: - return set_event_handler_disp(event_target, doc, eid, V_DISPATCH(var)); + return set_event_handler_disp(event_target, eid, V_DISPATCH(var)); case VT_BSTR: { VARIANT *v; @@ -1562,7 +1563,7 @@ void bind_target_event(HTMLDocumentNode *doc, EventTarget *event_target, const W return; } - set_event_handler_disp(event_target, doc, eid, disp); + set_event_handler_disp(event_target, eid, disp); } void update_doc_cp_events(HTMLDocumentNode *doc, cp_static_data_t *cp) @@ -1597,7 +1598,7 @@ void check_event_attr(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem) if(disp) { hres = get_node(doc, (nsIDOMNode*)nselem, TRUE, &node); if(SUCCEEDED(hres)) { - set_event_handler_disp(&node->event_target, node->doc, i, disp); + set_event_handler_disp(&node->event_target, i, disp); node_release(node); } IDispatch_Release(disp); diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 3946243..4579617f 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -54,7 +54,7 @@ eventid_t str_to_eid(LPCWSTR) DECLSPEC_HIDDEN; void check_event_attr(HTMLDocumentNode*,nsIDOMHTMLElement*) DECLSPEC_HIDDEN; void release_event_target(event_target_t*) DECLSPEC_HIDDEN; void fire_event(HTMLDocumentNode*,eventid_t,BOOL,nsIDOMNode*,nsIDOMEvent*,IDispatch*) DECLSPEC_HIDDEN; -HRESULT set_event_handler(EventTarget*,HTMLDocumentNode*,eventid_t,VARIANT*) DECLSPEC_HIDDEN; +HRESULT set_event_handler(EventTarget*,eventid_t,VARIANT*) DECLSPEC_HIDDEN; HRESULT get_event_handler(EventTarget*,eventid_t,VARIANT*) DECLSPEC_HIDDEN; HRESULT attach_event(EventTarget*,BSTR,IDispatch*,VARIANT_BOOL*) DECLSPEC_HIDDEN; HRESULT detach_event(EventTarget*,BSTR,IDispatch*) DECLSPEC_HIDDEN; @@ -74,7 +74,7 @@ void detach_nsevent(HTMLDocumentNode*,const WCHAR*) DECLSPEC_HIDDEN; static inline HRESULT set_node_event(HTMLDOMNode *node, eventid_t eid, VARIANT *var) { - return set_event_handler(&node->event_target, node->doc, eid, var); + return set_event_handler(&node->event_target, eid, var); } static inline HRESULT get_node_event(HTMLDOMNode *node, eventid_t eid, VARIANT *var) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 9f9e341..618648e 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -95,7 +95,7 @@ static inline HRESULT set_window_event(HTMLWindow *window, eventid_t eid, VARIAN return E_FAIL; } - return set_event_handler(&window->inner_window->event_target, window->inner_window->doc, eid, var); + return set_event_handler(&window->inner_window->event_target, eid, var); } static inline HRESULT get_window_event(HTMLWindow *window, eventid_t eid, VARIANT *var)

1 0

Jacek Caban : mshtml: Get rid of no longer needed detach_event argument.
by Alexandre Julliard May 21, 2015

May 21, 2015

Module: wine Branch: master Commit: 7950f780df32d44bce7f04cba290cea247714b66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7950f780df32d44bce7f04cba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 20 19:47:00 2015 +0200 mshtml: Get rid of no longer needed detach_event argument. --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/htmlevent.c | 2 +- dlls/mshtml/htmlevent.h | 2 +- dlls/mshtml/htmlwindow.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 203cc51..2b660df 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2042,7 +2042,7 @@ static HRESULT WINAPI HTMLDocument3_detachEvent(IHTMLDocument3 *iface, BSTR even TRACE("(%p)->(%s %p)\n", This, debugstr_w(event), pDisp); - return detach_event(&This->doc_node->node.event_target, This, event, pDisp); + return detach_event(&This->doc_node->node.event_target, event, pDisp); } static HRESULT WINAPI HTMLDocument3_put_onrowsdelete(IHTMLDocument3 *iface, VARIANT v) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 4277890..ae2eeee 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -2575,7 +2575,7 @@ static HRESULT WINAPI HTMLElement2_detachEvent(IHTMLElement2 *iface, BSTR event, TRACE("(%p)->(%s %p)\n", This, debugstr_w(event), pDisp); - return detach_event(&This->node.event_target, &This->node.doc->basedoc, event, pDisp); + return detach_event(&This->node.event_target, event, pDisp); } static HRESULT WINAPI HTMLElement2_get_readyState(IHTMLElement2 *iface, VARIANT *p) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index d359e4a..4bc9847 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1520,7 +1520,7 @@ HRESULT attach_event(EventTarget *event_target, BSTR name, IDispatch *disp, VARI return S_OK; } -HRESULT detach_event(EventTarget *event_target, HTMLDocument *doc, BSTR name, IDispatch *disp) +HRESULT detach_event(EventTarget *event_target, BSTR name, IDispatch *disp) { event_target_t *data; eventid_t eid; diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index e10a87d..3946243 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -57,7 +57,7 @@ void fire_event(HTMLDocumentNode*,eventid_t,BOOL,nsIDOMNode*,nsIDOMEvent*,IDispa HRESULT set_event_handler(EventTarget*,HTMLDocumentNode*,eventid_t,VARIANT*) DECLSPEC_HIDDEN; HRESULT get_event_handler(EventTarget*,eventid_t,VARIANT*) DECLSPEC_HIDDEN; HRESULT attach_event(EventTarget*,BSTR,IDispatch*,VARIANT_BOOL*) DECLSPEC_HIDDEN; -HRESULT detach_event(EventTarget*,HTMLDocument*,BSTR,IDispatch*) DECLSPEC_HIDDEN; +HRESULT detach_event(EventTarget*,BSTR,IDispatch*) DECLSPEC_HIDDEN; HRESULT dispatch_event(HTMLDOMNode*,const WCHAR*,VARIANT*,VARIANT_BOOL*) DECLSPEC_HIDDEN; HRESULT call_fire_event(HTMLDOMNode*,eventid_t) DECLSPEC_HIDDEN; void update_doc_cp_events(HTMLDocumentNode*,cp_static_data_t*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index d38e704..9f9e341 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1669,7 +1669,7 @@ static HRESULT WINAPI HTMLWindow3_detachEvent(IHTMLWindow3 *iface, BSTR event, I return E_FAIL; } - return detach_event(&window->event_target, &window->doc->basedoc, event, pDisp); + return detach_event(&window->event_target, event, pDisp); } static HRESULT window_set_timer(HTMLInnerWindow *This, VARIANT *expr, LONG msec, VARIANT *language,

1 0

Jacek Caban : mshtml: Use vtbl for binding to event in attach_event.
by Alexandre Julliard May 21, 2015

May 21, 2015

Module: wine Branch: master Commit: 189cb568eecddbd83e8d2a5e33292fa43be5b7da URL: http://source.winehq.org/git/wine.git/?a=commit;h=189cb568eecddbd83e8d2a5e3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 20 19:46:53 2015 +0200 mshtml: Use vtbl for binding to event in attach_event. --- dlls/mshtml/htmldoc.c | 11 +++++++++-- dlls/mshtml/htmlelem.c | 11 +++++++++-- dlls/mshtml/htmlevent.c | 22 +++++++++++++++------- dlls/mshtml/htmlevent.h | 3 ++- dlls/mshtml/htmlwindow.c | 11 +++++++++-- dlls/mshtml/mshtml_private.h | 1 + 6 files changed, 45 insertions(+), 14 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index e377d55..203cc51 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2032,7 +2032,7 @@ static HRESULT WINAPI HTMLDocument3_attachEvent(IHTMLDocument3 *iface, BSTR even TRACE("(%p)->(%s %p %p)\n", This, debugstr_w(event), pDisp, pfResult); - return attach_event(&This->doc_node->node.event_target, This, event, pDisp, pfResult); + return attach_event(&This->doc_node->node.event_target, event, pDisp, pfResult); } static HRESULT WINAPI HTMLDocument3_detachEvent(IHTMLDocument3 *iface, BSTR event, @@ -4571,12 +4571,19 @@ static HRESULT HTMLDocumentNode_invoke(DispatchEx *dispex, DISPID id, LCID lcid, return S_OK; } +static void HTMLDocumentNode_bind_event(DispatchEx *dispex, int eid) +{ + HTMLDocumentNode *This = impl_from_DispatchEx(dispex); + ensure_doc_nsevent_handler(This, eid); +} static const dispex_static_data_vtbl_t HTMLDocumentNode_dispex_vtbl = { NULL, NULL, HTMLDocumentNode_invoke, - NULL + NULL, + NULL, + HTMLDocumentNode_bind_event }; static const NodeImplVtbl HTMLDocumentFragmentImplVtbl = { diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index d2ae0be..4277890 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -2566,7 +2566,7 @@ static HRESULT WINAPI HTMLElement2_attachEvent(IHTMLElement2 *iface, BSTR event, TRACE("(%p)->(%s %p %p)\n", This, debugstr_w(event), pDisp, pfResult); - return attach_event(&This->node.event_target, &This->node.doc->basedoc, event, pDisp, pfResult); + return attach_event(&This->node.event_target, event, pDisp, pfResult); } static HRESULT WINAPI HTMLElement2_detachEvent(IHTMLElement2 *iface, BSTR event, IDispatch *pDisp) @@ -3996,6 +3996,12 @@ static event_target_t **HTMLElement_get_event_target_ptr(DispatchEx *dispex) : &This->node.event_target.ptr; } +static void HTMLElement_bind_event(DispatchEx *dispex, int eid) +{ + HTMLElement *This = impl_from_DispatchEx(dispex); + This->node.doc->node.event_target.dispex.data->vtbl->bind_event(&This->node.doc->node.event_target.dispex, eid); +} + static const tid_t HTMLElement_iface_tids[] = { HTMLELEMENT_TIDS, 0 @@ -4006,7 +4012,8 @@ static dispex_static_data_vtbl_t HTMLElement_dispex_vtbl = { HTMLElement_get_dispid, HTMLElement_invoke, HTMLElement_populate_props, - HTMLElement_get_event_target_ptr + HTMLElement_get_event_target_ptr, + HTMLElement_bind_event }; static dispex_static_data_t HTMLElement_dispex = { diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 897350f..d359e4a 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1336,7 +1336,7 @@ static BOOL alloc_handler_vector(event_target_t *event_target, eventid_t eid, in return TRUE; } -static HRESULT ensure_nsevent_handler(HTMLDocumentNode *doc, eventid_t eid) +HRESULT ensure_doc_nsevent_handler(HTMLDocumentNode *doc, eventid_t eid) { nsIDOMNode *nsnode = NULL; @@ -1374,6 +1374,13 @@ void detach_events(HTMLDocumentNode *doc) release_nsevents(doc); } +static void bind_event(EventTarget *event_target, eventid_t eid) +{ + if(event_target->dispex.data->vtbl->bind_event) + event_target->dispex.data->vtbl->bind_event(&event_target->dispex, eid); + else + FIXME("Unsupported event binding on target %p\n", event_target); +} static void remove_event_handler(EventTarget *event_target, eventid_t eid) { @@ -1410,7 +1417,7 @@ static HRESULT set_event_handler_disp(EventTarget *event_target, HTMLDocumentNod data->event_table[eid]->handler_prop = disp; IDispatch_AddRef(disp); - return ensure_nsevent_handler(doc, eid); + return ensure_doc_nsevent_handler(doc, eid); } HRESULT set_event_handler(EventTarget *event_target, HTMLDocumentNode *doc, eventid_t eid, VARIANT *var) @@ -1478,8 +1485,7 @@ HRESULT get_event_handler(EventTarget *event_target, eventid_t eid, VARIANT *var return S_OK; } -HRESULT attach_event(EventTarget *event_target, HTMLDocument *doc, BSTR name, - IDispatch *disp, VARIANT_BOOL *res) +HRESULT attach_event(EventTarget *event_target, BSTR name, IDispatch *disp, VARIANT_BOOL *res) { event_target_t *data; eventid_t eid; @@ -1508,8 +1514,10 @@ HRESULT attach_event(EventTarget *event_target, HTMLDocument *doc, BSTR name, IDispatch_AddRef(disp); data->event_table[eid]->handlers[i] = disp; + bind_event(event_target, eid); + *res = VARIANT_TRUE; - return ensure_nsevent_handler(doc->doc_node, eid); + return S_OK; } HRESULT detach_event(EventTarget *event_target, HTMLDocument *doc, BSTR name, IDispatch *disp) @@ -1563,7 +1571,7 @@ void update_doc_cp_events(HTMLDocumentNode *doc, cp_static_data_t *cp) for(i=0; i < EVENTID_LAST; i++) { if((event_info[i].flags & EVENT_DEFAULTLISTENER) && is_cp_event(cp, event_info[i].dispid)) - ensure_nsevent_handler(doc, i); + ensure_doc_nsevent_handler(doc, i); } } @@ -1612,7 +1620,7 @@ HRESULT doc_init_events(HTMLDocumentNode *doc) for(i=0; i < EVENTID_LAST; i++) { if(event_info[i].flags & EVENT_HASDEFAULTHANDLERS) { - hres = ensure_nsevent_handler(doc, i); + hres = ensure_doc_nsevent_handler(doc, i); if(FAILED(hres)) return hres; } diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 62e808f..e10a87d 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -56,7 +56,7 @@ void release_event_target(event_target_t*) DECLSPEC_HIDDEN; void fire_event(HTMLDocumentNode*,eventid_t,BOOL,nsIDOMNode*,nsIDOMEvent*,IDispatch*) DECLSPEC_HIDDEN; HRESULT set_event_handler(EventTarget*,HTMLDocumentNode*,eventid_t,VARIANT*) DECLSPEC_HIDDEN; HRESULT get_event_handler(EventTarget*,eventid_t,VARIANT*) DECLSPEC_HIDDEN; -HRESULT attach_event(EventTarget*,HTMLDocument*,BSTR,IDispatch*,VARIANT_BOOL*) DECLSPEC_HIDDEN; +HRESULT attach_event(EventTarget*,BSTR,IDispatch*,VARIANT_BOOL*) DECLSPEC_HIDDEN; HRESULT detach_event(EventTarget*,HTMLDocument*,BSTR,IDispatch*) DECLSPEC_HIDDEN; HRESULT dispatch_event(HTMLDOMNode*,const WCHAR*,VARIANT*,VARIANT_BOOL*) DECLSPEC_HIDDEN; HRESULT call_fire_event(HTMLDOMNode*,eventid_t) DECLSPEC_HIDDEN; @@ -65,6 +65,7 @@ HRESULT doc_init_events(HTMLDocumentNode*) DECLSPEC_HIDDEN; void detach_events(HTMLDocumentNode *doc) DECLSPEC_HIDDEN; HRESULT create_event_obj(IHTMLEventObj**) DECLSPEC_HIDDEN; void bind_target_event(HTMLDocumentNode*,EventTarget*,const WCHAR*,IDispatch*) DECLSPEC_HIDDEN; +HRESULT ensure_doc_nsevent_handler(HTMLDocumentNode*,eventid_t) DECLSPEC_HIDDEN; void init_nsevents(HTMLDocumentNode*) DECLSPEC_HIDDEN; void release_nsevents(HTMLDocumentNode*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 01ce10e..d38e704 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1654,7 +1654,7 @@ static HRESULT WINAPI HTMLWindow3_attachEvent(IHTMLWindow3 *iface, BSTR event, I return E_FAIL; } - return attach_event(&window->event_target, &window->doc->basedoc, event, pDisp, pfResult); + return attach_event(&window->event_target, event, pDisp, pfResult); } static HRESULT WINAPI HTMLWindow3_detachEvent(IHTMLWindow3 *iface, BSTR event, IDispatch *pDisp) @@ -2854,12 +2854,19 @@ static event_target_t **HTMLWindow_get_event_target_ptr(DispatchEx *dispex) return &This->doc->body_event_target; } +static void HTMLWindow_bind_event(DispatchEx *dispex, int eid) +{ + HTMLInnerWindow *This = impl_from_DispatchEx(dispex); + This->doc->node.event_target.dispex.data->vtbl->bind_event(&This->doc->node.event_target.dispex, eid); +} + static const dispex_static_data_vtbl_t HTMLWindow_dispex_vtbl = { NULL, NULL, HTMLWindow_invoke, NULL, - HTMLWindow_get_event_target_ptr + HTMLWindow_get_event_target_ptr, + HTMLWindow_bind_event }; static const tid_t HTMLWindow_iface_tids[] = { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 7d743b6..28e728e 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -232,6 +232,7 @@ typedef struct { HRESULT (*populate_props)(DispatchEx*); /* We abuse this vtbl for EventTarget functions to avoid separated vtbl. */ event_target_t **(*get_event_target_ptr)(DispatchEx*); + void (*bind_event)(DispatchEx*,int); } dispex_static_data_vtbl_t; typedef struct {

1 0

André Hentschel : kernel32/tests: Add ARM and ARM64 arch strings.
by Alexandre Julliard May 20, 2015

May 20, 2015

Module: wine Branch: master Commit: 1e8759805e3c5dfe00a31bb5f13f1c1da28d2826 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e8759805e3c5dfe00a31bb5f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed May 20 14:31:48 2015 +0200 kernel32/tests: Add ARM and ARM64 arch strings. --- dlls/kernel32/tests/actctx.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 7512aed..fcce93b 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -59,6 +59,10 @@ static const char* strw(LPCWSTR x) #define ARCH "x86" #elif defined __x86_64__ #define ARCH "amd64" +#elif defined __arm__ +#define ARCH "arm" +#elif defined __aarch64__ +#define ARCH "arm64" #else #define ARCH "none" #endif

1 0