December 2017 - Wine-Commits

Alexandre Julliard : ntdll: Run the entire thread initialization code on the thread stack on x86-64.
by Alexandre Julliard Dec. 1, 2017

Dec. 1, 2017

Module: wine Branch: master Commit: 32c2cfb861098f21accccc2ebab6a05947c4c603 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32c2cfb861098f21accccc2eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 1 19:20:22 2017 +0100 ntdll: Run the entire thread initialization code on the thread stack on x86-64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 167 ++++++++++++++++++++++++--------------------- 1 file changed, 88 insertions(+), 79 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 22f6ed8..3994569 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -3053,15 +3053,6 @@ static void *mac_thread_gsbase(void) #endif -/*********************************************************************** - * start_process - */ -static void CDECL start_process( LPTHREAD_START_ROUTINE entry, PEB *peb ) -{ - call_thread_entry_point( kernel32_start_process, entry ); -} - - /********************************************************************** * signal_init_thread */ @@ -3144,70 +3135,6 @@ void signal_init_process(void) } -struct startup_info -{ - LPTHREAD_START_ROUTINE entry; - void *arg; -}; - -static void thread_startup( void *param ) -{ - struct startup_info *info = param; - call_thread_entry_point( info->entry, info->arg ); -} - - -/*********************************************************************** - * signal_start_thread - */ -void signal_start_thread( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend ) -{ - CONTEXT context = { 0 }; - struct startup_info info = { entry, arg }; - - /* build the initial context */ - context.ContextFlags = CONTEXT_FULL; - __asm__( "movw %%cs,%0" : "=m" (context.SegCs) ); - __asm__( "movw %%ss,%0" : "=m" (context.SegSs) ); - __asm__( "fxsave %0" : "=m" (context.u.FltSave) ); - context.Rcx = (ULONG_PTR)entry; - context.Rdx = (ULONG_PTR)arg; - context.Rsp = (ULONG_PTR)NtCurrentTeb()->Tib.StackBase - 0x28; - context.Rip = (ULONG_PTR)call_thread_entry_point; - - if (suspend) wait_suspend( &context ); - - wine_call_on_stack( attach_dlls, (void *)1, NtCurrentTeb()->Tib.StackBase ); - TRACE_(relay)( "\1Starting thread proc %p (arg=%p)\n", entry, arg ); - wine_switch_to_stack( thread_startup, &info, NtCurrentTeb()->Tib.StackBase ); -} - - -/********************************************************************** - * signal_start_process - */ -void signal_start_process( LPTHREAD_START_ROUTINE entry, BOOL suspend ) -{ - CONTEXT context = { 0 }; - - /* build the initial context */ - context.ContextFlags = CONTEXT_FULL; - __asm__( "movw %%cs,%0" : "=m" (context.SegCs) ); - __asm__( "movw %%ss,%0" : "=m" (context.SegSs) ); - __asm__( "fxsave %0" : "=m" (context.u.FltSave) ); - context.Rcx = (ULONG_PTR)entry; - context.Rdx = (ULONG_PTR)NtCurrentTeb()->Peb; - context.Rsp = (ULONG_PTR)NtCurrentTeb()->Tib.StackBase - 0x28; - context.Rip = (ULONG_PTR)start_process; - - if (suspend) wait_suspend( &context ); - - wine_call_on_stack( attach_dlls, (void *)1, (char *)NtCurrentTeb()->Tib.StackBase - page_size ); - virtual_clear_thread_stack(); - set_cpu_context( &context ); -} - - /********************************************************************** * RtlAddFunctionTable (NTDLL.@) */ @@ -4130,11 +4057,11 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, /*********************************************************************** * call_thread_func */ -void DECLSPEC_HIDDEN call_thread_func( LPTHREAD_START_ROUTINE entry, void *arg, void *frame ) +static void WINAPI call_thread_func( LPTHREAD_START_ROUTINE entry, void *arg ) { - amd64_thread_data()->exit_frame = frame; __TRY { + TRACE_(relay)( "\1Starting thread proc %p (arg=%p)\n", entry, arg ); RtlExitUserThread( entry( arg )); } __EXCEPT(unhandled_exception_filter) @@ -4145,8 +4072,28 @@ void DECLSPEC_HIDDEN call_thread_func( LPTHREAD_START_ROUTINE entry, void *arg, abort(); /* should not be reached */ } -extern void DECLSPEC_NORETURN call_thread_entry_point( LPTHREAD_START_ROUTINE entry, void *arg ); -__ASM_GLOBAL_FUNC( call_thread_entry_point, + +/*********************************************************************** + * call_process_func + */ +static void WINAPI call_process_func( LPTHREAD_START_ROUTINE entry, void *arg ) +{ + __TRY + { + RtlExitUserThread( kernel32_start_process( entry )); + } + __EXCEPT(unhandled_exception_filter) + { + NtTerminateThread( GetCurrentThread(), GetExceptionCode() ); + } + __ENDTRY + abort(); /* should not be reached */ +} + + +extern void DECLSPEC_NORETURN start_thread( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend, + void *relay, void *stack, void **exit_frame ); +__ASM_GLOBAL_FUNC( start_thread, "subq $56,%rsp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 56\n\t") "movq %rbp,48(%rsp)\n\t" @@ -4161,8 +4108,24 @@ __ASM_GLOBAL_FUNC( call_thread_entry_point, __ASM_CFI(".cfi_rel_offset %r14,16\n\t") "movq %r15,8(%rsp)\n\t" __ASM_CFI(".cfi_rel_offset %r15,8\n\t") - "movq %rsp,%rdx\n\t" - "call " __ASM_NAME("call_thread_func") ); + /* store exit frame */ + "movq %rsp,(%r9)\n\t" + /* build initial context on thread stack */ + "leaq -0x500(%r8),%r10\n\t" /* sizeof(context) + 0x30 for function params */ + "movq $0x001000b,0x30(%r10)\n\t" /* context->ContextFlags = CONTEXT_FULL */ + "movw %cs,0x38(%r10)\n\t" /* context->SegCs */ + "movw %ss,0x42(%r10)\n\t" /* context->SegSs */ + "movq %rdi,0x80(%r10)\n\t" /* context->Rcx = entry */ + "movq %rsi,0x88(%r10)\n\t" /* context->Rdx = arg */ + "leaq -0x28(%r8),%rax\n\t" + "movq %rax,0x98(%r10)\n\t" /* context->Rsp */ + "movq %rcx,0xf8(%r10)\n\t" /* context->Rip = relay */ + "fxsave 0x100(%r10)\n\t" /* context->FtlSave */ + /* switch to thread stack and call thread_startup() */ + "movq %r10,%rsp\n\t" + "movq %r10,%rdi\n\t" /* context */ + "movq %rdx,%rsi\n\t" /* suspend */ + "call " __ASM_NAME("thread_startup") ) extern void DECLSPEC_NORETURN call_thread_exit_func( int status, void (*func)(int), void *frame ); __ASM_GLOBAL_FUNC( call_thread_exit_func, @@ -4176,6 +4139,52 @@ __ASM_GLOBAL_FUNC( call_thread_exit_func, __ASM_CFI(".cfi_rel_offset %r15,8\n\t") "call *%rsi" ); + +/*********************************************************************** + * thread_startup + */ +void DECLSPEC_HIDDEN thread_startup( CONTEXT *context, BOOL suspend ) +{ + if (suspend) wait_suspend( context ); + attach_dlls( context ); + virtual_clear_thread_stack(); + set_cpu_context( context ); +} + + +/*********************************************************************** + * signal_start_thread + * + * Thread startup sequence: + * signal_start_thread() + * -> start_thread() + * -> thread_startup() + * -> call_thread_func() + */ +void signal_start_thread( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend ) +{ + start_thread( entry, arg, suspend, call_thread_func, + NtCurrentTeb()->Tib.StackBase, &amd64_thread_data()->exit_frame ); +} + + +/********************************************************************** + * signal_start_process + * + * Process startup sequence: + * signal_start_process() + * -> start_thread() + * -> thread_startup() + * -> call_process_func() + * -> kernel32_start_process() + */ +void signal_start_process( LPTHREAD_START_ROUTINE entry, BOOL suspend ) +{ + start_thread( entry, NtCurrentTeb()->Peb, suspend, call_process_func, + NtCurrentTeb()->Tib.StackBase, &amd64_thread_data()->exit_frame ); +} + + /*********************************************************************** * RtlExitUserThread (NTDLL.@) */

1 0

Alexandre Julliard : ntdll: Run the entire thread initialization code on the thread stack on i386.
by Alexandre Julliard Dec. 1, 2017

Dec. 1, 2017

Module: wine Branch: master Commit: a89fdd58ecbd2d1e40ef2d9e00ead0d707601637 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a89fdd58ecbd2d1e40ef2d9e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 1 19:18:44 2017 +0100 ntdll: Run the entire thread initialization code on the thread stack on i386. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 210 +++++++++++++++++++++++++++-------------------- 1 file changed, 123 insertions(+), 87 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a89fdd58ecbd2d1e40ef2…

1 0

Zebediah Figura : shell32/tests: Simplify existing tests and add more tests for Progman DDE.
by Alexandre Julliard Dec. 1, 2017

Dec. 1, 2017

Module: wine Branch: master Commit: 8b2f58634378a2d74a5d68d689c95dd8925d84ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b2f58634378a2d74a5d68d68… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Dec 1 10:08:14 2017 -0600 shell32/tests: Simplify existing tests and add more tests for Progman DDE. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/progman_dde.c | 249 ++++++++++++++++++++------------------- 1 file changed, 126 insertions(+), 123 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8b2f58634378a2d74a5d6…

1 0

Jacek Caban : mshtml: Added IDOMEvent::get_cancelable implementation.
by Alexandre Julliard Dec. 1, 2017

Dec. 1, 2017

Module: wine Branch: master Commit: a27ad40e317aafc9ad62f8b4c05dcbb0c094b36e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a27ad40e317aafc9ad62f8b4c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 1 17:02:31 2017 +0100 mshtml: Added IDOMEvent::get_cancelable implementation. 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/htmlevent.h | 1 + dlls/mshtml/tests/events.c | 5 +++++ 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index ddce8b3..a4fa956 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -986,8 +986,11 @@ static HRESULT WINAPI DOMEvent_get_bubbles(IDOMEvent *iface, VARIANT_BOOL *p) static HRESULT WINAPI DOMEvent_get_cancelable(IDOMEvent *iface, VARIANT_BOOL *p) { DOMEvent *This = impl_from_IDOMEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + *p = variant_bool(This->cancelable); + return S_OK; } static HRESULT WINAPI DOMEvent_get_currentTarget(IDOMEvent *iface, IEventTarget **p) @@ -1168,6 +1171,7 @@ static DOMEvent *alloc_event(nsIDOMEvent *nsevent, eventid_t event_id) return NULL; } event->bubbles = (event_info[event_id].flags & EVENT_BUBBLES) != 0; + event->cancelable = (event_info[event_id].flags & EVENT_CANCELABLE) != 0; } nsIDOMEvent_AddRef(event->nsevent = nsevent); return event; @@ -1322,7 +1326,6 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) { const eventid_t eid = event->event_id; const listener_container_t *container = get_listener_container(event_target, event->type, FALSE); - const BOOL cancelable = event_info[eid].flags & EVENT_CANCELABLE; const BOOL use_quirks = use_event_quirks(event_target); event_listener_t *listener, listeners_buf[8], *listeners = listeners_buf; unsigned listeners_cnt, listeners_size; @@ -1348,7 +1351,7 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) if(hres == S_OK) { TRACE("%s <<< %s\n", debugstr_w(event->type), debugstr_variant(&v)); - if(cancelable) { + if(event->cancelable) { if(V_VT(&v) == VT_BOOL) { if(!V_BOOL(&v)) IDOMEvent_preventDefault(&event->IDOMEvent_iface); @@ -1428,7 +1431,7 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) TRACE("%s <<< %s\n", debugstr_w(event->type), debugstr_variant(&v)); - if(cancelable) { + if(event->cancelable) { if(V_VT(&v) == VT_BOOL) { if(!V_BOOL(&v)) IDOMEvent_preventDefault(&event->IDOMEvent_iface); @@ -1453,7 +1456,7 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) if(hres == S_OK) { TRACE("%s attached <<<\n", debugstr_w(event->type)); - if(cancelable) { + if(event->cancelable) { if(V_VT(&v) == VT_BOOL) { if(!V_BOOL(&v)) IDOMEvent_preventDefault(&event->IDOMEvent_iface); @@ -1500,7 +1503,7 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) if(hres == S_OK) { TRACE("cp %s [%u] <<<\n", debugstr_w(event->type), i); - if(cancelable) { + if(event->cancelable) { if(V_VT(&v) == VT_BOOL) { if(!V_BOOL(&v)) IDOMEvent_preventDefault(&event->IDOMEvent_iface); diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 4f106d2..38499d3 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -67,6 +67,7 @@ typedef struct { WCHAR *type; EventTarget *target; BOOL bubbles; + BOOL cancelable; BOOL prevent_default; BOOL stop_propagation; DOM_EVENT_PHASE phase; diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 864d7d4..a943e41 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -2704,6 +2704,11 @@ static void test_create_event(IHTMLDocument2 *doc) ok(hres == S_OK, "get_bubbles failed: %08x\n", hres); ok(!b, "bubbles = %x\n", b); + b = 0xdead; + hres = IDOMEvent_get_cancelable(event, &b); + ok(hres == S_OK, "get_cancelable failed: %08x\n", hres); + ok(!b, "cancelable = %x\n", b); + IDOMEvent_Release(event); IDocumentEvent_Release(doc_event);

1 0

Jacek Caban : mshtml: Added IDOMEvent::get_currentTarget implementation.
by Alexandre Julliard Dec. 1, 2017

Dec. 1, 2017

Module: wine Branch: master Commit: 49abeb63cb88ea2efa6ad599047745bd8794f03c URL: http://source.winehq.org/git/wine.git/?a=commit;h=49abeb63cb88ea2efa6ad5990… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 1 17:02:59 2017 +0100 mshtml: Added IDOMEvent::get_currentTarget implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 32 +++++++++++++++++++++++--------- dlls/mshtml/htmlevent.h | 1 + 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 85f8fe7..0d45b0b 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -996,8 +996,14 @@ static HRESULT WINAPI DOMEvent_get_cancelable(IDOMEvent *iface, VARIANT_BOOL *p) static HRESULT WINAPI DOMEvent_get_currentTarget(IDOMEvent *iface, IEventTarget **p) { DOMEvent *This = impl_from_IDOMEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + if(This->current_target) + IEventTarget_AddRef(*p = &This->current_target->IEventTarget_iface); + else + *p = NULL; + return S_OK; } static HRESULT WINAPI DOMEvent_get_defaultPrevented(IDOMEvent *iface, VARIANT_BOOL *p) @@ -1326,7 +1332,6 @@ static BOOL is_cp_event(cp_static_data_t *data, DISPID dispid) static void call_event_handlers(EventTarget *event_target, DOMEvent *event) { - const eventid_t eid = event->event_id; const listener_container_t *container = get_listener_container(event_target, event->type, FALSE); const BOOL use_quirks = use_event_quirks(event_target); event_listener_t *listener, listeners_buf[8], *listeners = listeners_buf; @@ -1336,6 +1341,9 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) VARIANT v; HRESULT hres; + assert(!event->current_target); + event->current_target = event_target; + if(use_quirks && container && !list_empty(&container->listeners) && event->phase != DEP_CAPTURING_PHASE) { listener = LIST_ENTRY(list_tail(&container->listeners), event_listener_t, entry); @@ -1477,10 +1485,9 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) IDispatch_Release(listener->function); if(listeners != listeners_buf) heap_free(listeners); - if(event->phase == DEP_CAPTURING_PHASE) - return; - if(event_info[eid].dispid && (vtbl = dispex_get_vtbl(&event_target->dispex)) + if(event->phase != DEP_CAPTURING_PHASE && event->event_id != EVENTID_LAST + && event_info[event->event_id].dispid && (vtbl = dispex_get_vtbl(&event_target->dispex)) && vtbl->get_cp_container) cp_container = vtbl->get_cp_container(&event_target->dispex); if(cp_container) { @@ -1490,7 +1497,7 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) for(j=0; cp_container->cp_entries[j].riid; j++) { cp = cp_container->cps + j; - if(!cp->sinks_size || !is_cp_event(cp->data, event_info[eid].dispid)) + if(!cp->sinks_size || !is_cp_event(cp->data, event_info[event->event_id].dispid)) continue; for(i=0; i < cp->sinks_size; i++) { @@ -1500,7 +1507,7 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) V_VT(&v) = VT_EMPTY; TRACE("cp %s [%u] >>>\n", debugstr_w(event->type), i); - hres = call_cp_func(cp->sinks[i].disp, event_info[eid].dispid, + hres = call_cp_func(cp->sinks[i].disp, event_info[event->event_id].dispid, cp->data->pass_event_arg ? event->event_obj : NULL, &v); if(hres == S_OK) { TRACE("cp %s [%u] <<<\n", debugstr_w(event->type), i); @@ -1522,6 +1529,8 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) } IConnectionPointContainer_Release(&cp_container->IConnectionPointContainer_iface); } + + event->current_target = NULL; } void dispatch_event(EventTarget *event_target, DOMEvent *event) @@ -1534,12 +1543,17 @@ void dispatch_event(EventTarget *event_target, DOMEvent *event) EventTarget *iter; HRESULT hres; + TRACE("(%p) %s\n", event_target, debugstr_w(event->type)); + if(event->event_id == EVENTID_LAST) { FIXME("Unsupported on unknown events\n"); return; } - TRACE("(%p) %s\n", event_target, debugstr_w(event->type)); + if(event->current_target) { + FIXME("event is being dispatched.\n"); + return; + } iter = event_target; IDispatchEx_AddRef(&event_target->dispex.IDispatchEx_iface); diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 38499d3..f99c893 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -66,6 +66,7 @@ typedef struct { eventid_t event_id; WCHAR *type; EventTarget *target; + EventTarget *current_target; BOOL bubbles; BOOL cancelable; BOOL prevent_default;

1 0

Zebediah Figura : kernel32: Fix a couple internal uses of ANSI functions.
by Alexandre Julliard Dec. 1, 2017

Dec. 1, 2017

Module: wine Branch: master Commit: 47e9e911acd2d0883ac1ccfc0a153db09ad78b41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47e9e911acd2d0883ac1ccfc0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Dec 1 12:18:55 2017 -0600 kernel32: Fix a couple internal uses of ANSI functions. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/file.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 3e93b0d..4766830 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -74,6 +74,7 @@ static const UINT max_entry_size = offsetof( FILE_BOTH_DIRECTORY_INFORMATION, Fi static BOOL oem_file_apis; static const WCHAR wildcardsW[] = { '*','?',0 }; +static const WCHAR krnl386W[] = {'k','r','n','l','3','8','6','.','e','x','e','1','6',0}; /*********************************************************************** * create_file_OF @@ -1587,7 +1588,7 @@ HANDLE WINAPI CreateFileW( LPCWSTR filename, DWORD access, DWORD sharing, if (vxd_name && vxd_name[0]) { static HANDLE (*vxd_open)(LPCWSTR,DWORD,SECURITY_ATTRIBUTES*); - if (!vxd_open) vxd_open = (void *)GetProcAddress( GetModuleHandleA("krnl386.exe16"), + if (!vxd_open) vxd_open = (void *)GetProcAddress( GetModuleHandleW(krnl386W), "__wine_vxd_open" ); if (vxd_open && (ret = vxd_open( vxd_name, access, sa ))) goto done; } @@ -2613,7 +2614,7 @@ BOOL WINAPI DeviceIoControl(HANDLE hDevice, DWORD dwIoControlCode, static DeviceIoProc (*vxd_get_proc)(HANDLE); DeviceIoProc proc = NULL; - if (!vxd_get_proc) vxd_get_proc = (void *)GetProcAddress( GetModuleHandleA("krnl386.exe16"), + if (!vxd_get_proc) vxd_get_proc = (void *)GetProcAddress( GetModuleHandleW(krnl386W), "__wine_vxd_get_proc" ); if (vxd_get_proc) proc = vxd_get_proc( hDevice ); if (proc) return proc( dwIoControlCode, lpvInBuffer, cbInBuffer,

1 0

Jacek Caban : mshtml: Added IDOMEvent::get_target implementation.
by Alexandre Julliard Dec. 1, 2017

Dec. 1, 2017

Module: wine Branch: master Commit: 7076fc13400cf5607613d6735994bb187dbda1b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7076fc13400cf5607613d6735… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 1 17:03:06 2017 +0100 mshtml: Added IDOMEvent::get_target implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 0d45b0b..c06d062 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1029,8 +1029,14 @@ static HRESULT WINAPI DOMEvent_get_eventPhase(IDOMEvent *iface, USHORT *p) static HRESULT WINAPI DOMEvent_get_target(IDOMEvent *iface, IEventTarget **p) { DOMEvent *This = impl_from_IDOMEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + if(This->target) + IEventTarget_AddRef(*p = &This->target->IEventTarget_iface); + else + *p = NULL; + return S_OK; } static HRESULT WINAPI DOMEvent_get_timeStamp(IDOMEvent *iface, ULONGLONG *p)

1 0

Jacek Caban : mshtml: Ignore preventDefault calls for non-cancelable events.
by Alexandre Julliard Dec. 1, 2017

Dec. 1, 2017

Module: wine Branch: master Commit: 8600c2a57394b4d71e465e192b3621154b07c5ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=8600c2a57394b4d71e465e192… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 1 17:02:40 2017 +0100 mshtml: Ignore preventDefault calls for non-cancelable events. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index a4fa956..01d9753 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1063,8 +1063,10 @@ static HRESULT WINAPI DOMEvent_preventDefault(IDOMEvent *iface) TRACE("(%p)\n", This); - This->prevent_default = TRUE; - nsIDOMEvent_PreventDefault(This->nsevent); + if(This->current_target && This->cancelable) { + This->prevent_default = TRUE; + nsIDOMEvent_PreventDefault(This->nsevent); + } return S_OK; }

1 0

Zebediah Figura : shell32: Implement the DeleteItem() command for Progman DDE.
by Alexandre Julliard Dec. 1, 2017

Dec. 1, 2017

Module: wine Branch: master Commit: 64c456af77f0584fb93da773cacdf083a3b89f9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=64c456af77f0584fb93da773c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Dec 1 10:08:13 2017 -0600 shell32: Implement the DeleteItem() command for Progman DDE. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/dde.c | 20 ++++++++++++++++++++ dlls/shell32/tests/progman_dde.c | 4 ---- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/dde.c b/dlls/shell32/dde.c index 412c047..7505c2c 100644 --- a/dlls/shell32/dde.c +++ b/dlls/shell32/dde.c @@ -126,6 +126,7 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) static const WCHAR delete_groupW[] = {'D','e','l','e','t','e','G','r','o','u','p',0}; static const WCHAR show_groupW[] = {'S','h','o','w','G','r','o','u','p',0}; static const WCHAR add_itemW[] = {'A','d','d','I','t','e','m',0}; + static const WCHAR delete_itemW[] = {'D','e','l','e','t','e','I','t','e','m',0}; static const WCHAR dotexeW[] = {'.','e','x','e',0}; static const WCHAR dotlnkW[] = {'.','l','n','k',0}; @@ -254,6 +255,25 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) if (FAILED(hres)) return DDE_FNOTPROCESSED; } + else if (!strcmpiW(command, delete_itemW)) + { + WCHAR *name; + BOOL ret; + + if (argc < 1) return DDE_FNOTPROCESSED; + + name = HeapAlloc(GetProcessHeap(), 0, (strlenW(last_group) + 1 + strlenW(argv[0]) + 5) * sizeof(*name)); + lstrcpyW(name, last_group); + lstrcatW(name, slashW); + lstrcatW(name, argv[0]); + lstrcatW(name, dotlnkW); + + ret = DeleteFileW(name); + + HeapFree(GetProcessHeap(), 0, name); + + if (!ret) return DDE_FNOTPROCESSED; + } else { FIXME("unhandled command %s\n", debugstr_w(command)); diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index 544df97..3f88205 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -296,10 +296,8 @@ static void test_progman_dde(DWORD instance, HCONV hConv) ok(check_exists("Group1/f2g1Name.lnk"), "link not created\n"); error = dde_execute(instance, hConv, "[DeleteItem(f2g1Name)]"); - todo_wine { ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); ok(!check_exists("Group1/f2g1Name.lnk"), "link should not exist\n"); - } sprintf(itemtext, "[AddItem(%s,f3g1Name)]", f3g1); error = dde_execute(instance, hConv, itemtext); @@ -322,10 +320,8 @@ static void test_progman_dde(DWORD instance, HCONV hConv) ok(error == DMLERR_NOTPROCESSED, "expected DMLERR_NOTPROCESSED, got %u\n", error); error = dde_execute(instance, hConv, "[DeleteItem(f3g1Name)]"); - todo_wine { ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); ok(!check_exists("Group1/f3g1Name.lnk"), "link should not exist\n"); - } error = dde_execute(instance, hConv, "[ShowGroup(Startup, 0)]"); ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error);

1 0

Jacek Caban : mshtml: Added IDOMEvent::get_bubbles implementation.
by Alexandre Julliard Dec. 1, 2017

Dec. 1, 2017

Module: wine Branch: master Commit: 4678a85966f3326459da6bfe559eac24f70043a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4678a85966f3326459da6bfe5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 1 17:02:22 2017 +0100 mshtml: Added IDOMEvent::get_bubbles implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 14 ++++++++------ dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/tests/events.c | 6 ++++++ 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 940fccc..ddce8b3 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -976,8 +976,11 @@ static HRESULT WINAPI DOMEvent_Invoke(IDOMEvent *iface, DISPID dispIdMember, static HRESULT WINAPI DOMEvent_get_bubbles(IDOMEvent *iface, VARIANT_BOOL *p) { DOMEvent *This = impl_from_IDOMEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + *p = variant_bool(This->bubbles); + return S_OK; } static HRESULT WINAPI DOMEvent_get_cancelable(IDOMEvent *iface, VARIANT_BOOL *p) @@ -1164,6 +1167,7 @@ static DOMEvent *alloc_event(nsIDOMEvent *nsevent, eventid_t event_id) IDOMEvent_Release(&event->IDOMEvent_iface); return NULL; } + event->bubbles = (event_info[event_id].flags & EVENT_BUBBLES) != 0; } nsIDOMEvent_AddRef(event->nsevent = nsevent); return event; @@ -1523,7 +1527,6 @@ void dispatch_event(EventTarget *event_target, DOMEvent *event) HTMLEventObj *event_obj_ref = NULL; IHTMLEventObj *prev_event = NULL; EventTarget *iter; - DWORD event_flags; HRESULT hres; if(event->event_id == EVENTID_LAST) { @@ -1533,7 +1536,6 @@ void dispatch_event(EventTarget *event_target, DOMEvent *event) TRACE("(%p) %s\n", event_target, debugstr_w(event->type)); - event_flags = event_info[event->event_id].flags; iter = event_target; IDispatchEx_AddRef(&event_target->dispex.IDispatchEx_iface); @@ -1587,7 +1589,7 @@ void dispatch_event(EventTarget *event_target, DOMEvent *event) call_event_handlers(target_chain[0], event); } - if(event_flags & EVENT_BUBBLES) { + if(event->bubbles) { event->phase = DEP_BUBBLING_PHASE; for(i = 1; !event->stop_propagation && i < chain_cnt; i++) call_event_handlers(target_chain[i], event); @@ -1599,7 +1601,7 @@ void dispatch_event(EventTarget *event_target, DOMEvent *event) IHTMLEventObj_Release(prev_event); } - if(event_flags & EVENT_HASDEFAULTHANDLERS) { + if(event->event_id != EVENTID_LAST && (event_info[event->event_id].flags & EVENT_HASDEFAULTHANDLERS)) { for(i = 0; !event->prevent_default && i < chain_cnt; i++) { BOOL prevent_default = FALSE; vtbl = dispex_get_vtbl(&target_chain[i]->dispex); diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 33eea21..4f106d2 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -66,6 +66,7 @@ typedef struct { eventid_t event_id; WCHAR *type; EventTarget *target; + BOOL bubbles; BOOL prevent_default; BOOL stop_propagation; DOM_EVENT_PHASE phase; diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 7719dc1..864d7d4 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -2668,6 +2668,7 @@ static void test_create_event(IHTMLDocument2 *doc) { IDocumentEvent *doc_event; IDOMEvent *event; + VARIANT_BOOL b; USHORT phase; BSTR str; HRESULT hres; @@ -2698,6 +2699,11 @@ static void test_create_event(IHTMLDocument2 *doc) ok(hres == S_OK, "get_type failed: %08x\n", hres); ok(!str, "type = %s\n", wine_dbgstr_w(str)); + b = 0xdead; + hres = IDOMEvent_get_bubbles(event, &b); + ok(hres == S_OK, "get_bubbles failed: %08x\n", hres); + ok(!b, "bubbles = %x\n", b); + IDOMEvent_Release(event); IDocumentEvent_Release(doc_event);

1 0