December 2017 - Wine-Commits

Nikolay Sivov : user32/tests: Added some tests for WM_GETTEXTLENGTH/ WM_GETTEXT after EM_GETHANDLE was used.
by Alexandre Julliard Dec. 4, 2017

Dec. 4, 2017

Module: wine Branch: master Commit: 71eac4a70b56ce5a8b20a0e10bacc7dcf7638627 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71eac4a70b56ce5a8b20a0e10… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 4 21:31:35 2017 +0300 user32/tests: Added some tests for WM_GETTEXTLENGTH/WM_GETTEXT after EM_GETHANDLE was used. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/edit.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 0926a58..783ced6 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -2735,6 +2735,7 @@ static void test_EM_GETHANDLE(void) { static const char str0[] = "untouched"; static const char str1[] = "1111+1111+1111#"; + static const char str1_1[] = "2111+1111+1111#"; static const char str2[] = "2222-2222-2222-2222#"; static const char str3[] = "3333*3333*3333*3333*3333#"; CHAR current[42]; @@ -2783,6 +2784,33 @@ static void test_EM_GETHANDLE(void) "got %d and \"%s\" (expected %d and \"%s\")\n", len, buffer, lstrlenA(str1), str1); LocalUnlock(hmem); + /* See if WM_GETTEXTLENGTH/WM_GETTEXT still work. */ + len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); +todo_wine + ok(len == lstrlenA(str1), "Unexpected text length %d.\n", len); + + lstrcpyA(current, str0); + r = SendMessageA(hEdit, WM_GETTEXT, sizeof(current), (LPARAM)current); +todo_wine + ok((r == lstrlenA(str1)) && !lstrcmpA(current, str1), + "Unexpected retval %d and text \"%s\" (expected %d and \"%s\")\n", r, current, lstrlenA(str1), str1); + + /* Application altered buffer contents, see if WM_GETTEXTLENGTH/WM_GETTEXT pick that up. */ + buffer = LocalLock(hmem); + ok(buffer != NULL, "got %p (expected != NULL)\n", buffer); + buffer[0] = '2'; + LocalUnlock(hmem); + + len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); +todo_wine + ok(len == lstrlenA(str1), "Unexpected text length %d.\n", len); + + lstrcpyA(current, str0); + r = SendMessageA(hEdit, WM_GETTEXT, sizeof(current), (LPARAM)current); +todo_wine + ok((r == lstrlenA(str1_1)) && !lstrcmpA(current, str1_1), + "Unexpected retval %d and text \"%s\" (expected %d and \"%s\")\n", r, current, lstrlenA(str1_1), str1_1); + /* use LocalAlloc first to get a different handle */ halloc = LocalAlloc(LMEM_MOVEABLE, 42); ok(halloc != NULL, "got %p (expected != NULL)\n", halloc);

1 0

Fabian Maurer : wined3d: Unbind currently bound FBOs before dispatching compute shaders.
by Alexandre Julliard Dec. 4, 2017

Dec. 4, 2017

Module: wine Branch: master Commit: 0d45106054b8fedd8b05bada8e0e589c11bf6375 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d45106054b8fedd8b05bada8… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Dec 4 17:30:24 2017 +0330 wined3d: Unbind currently bound FBOs before dispatching compute shaders. Many thanks to Matias N. Goldberg and Philip Rebohle for investigating and solving the bug! Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 8af9e4b..23f63aa 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4013,6 +4013,16 @@ void context_apply_compute_state(struct wined3d_context *context, context->update_unordered_access_view_bindings = 1; } + /* Updates to currently bound render targets aren't necessarily coherent + * between the graphics and compute pipelines. Unbind any currently bound + * FBO here to ensure preceding updates to its attachments by the graphics + * pipeline are visible to the compute pipeline. + * + * Without this, the bloom effect in Nier:Automata is too bright on the + * Mesa radeonsi driver, and presumably on other Mesa based drivers. */ + context_bind_fbo(context, GL_FRAMEBUFFER, 0); + context_invalidate_state(context, STATE_FRAMEBUFFER); + context->last_was_blit = FALSE; }

1 0

Fabian Maurer : msvcrt: Don' t crash if _vsnwprintf gets NULL as format string and add test.
by Alexandre Julliard Dec. 4, 2017

Dec. 4, 2017

Module: wine Branch: master Commit: 058be4304eb0c0e5f264e166b68991808a21001a URL: http://source.winehq.org/git/wine.git/?a=commit;h=058be4304eb0c0e5f264e166b… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Fri Dec 1 18:19:31 2017 +0100 msvcrt: Don't crash if _vsnwprintf gets NULL as format string and add test. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr90/tests/msvcr90.c | 31 +++++++++++++++++++++++++++++++ dlls/msvcrt/printf.h | 3 +++ 2 files changed, 34 insertions(+) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 0975d00..85dd80b 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -133,6 +133,7 @@ static char* (__cdecl *p_setlocale)(int, const char*); static int (__cdecl *p__fpieee_flt)(ULONG, EXCEPTION_POINTERS*, int (__cdecl *handler)(_FPIEEE_RECORD*)); static int (__cdecl *p__memicmp)(const char*, const char*, size_t); static int (__cdecl *p__memicmp_l)(const char*, const char*, size_t, _locale_t); +static int (__cdecl *p__vsnwprintf)(wchar_t *buffer,size_t count, const wchar_t *format, __ms_va_list valist); /* make sure we use the correct errno */ #undef errno @@ -401,6 +402,7 @@ static BOOL init(void) SET(p__fpieee_flt, "_fpieee_flt"); SET(p__memicmp, "_memicmp"); SET(p__memicmp_l, "_memicmp_l"); + SET(p__vsnwprintf, "_vsnwprintf"); if (sizeof(void *) == 8) { @@ -1864,6 +1866,34 @@ static void test__memicmp_l(void) ok(ret == -1, "got %d\n", ret); } +static int WINAPIV _vsnwprintf_wrapper(wchar_t *str, size_t len, const wchar_t *format, ...) +{ + int ret; + __ms_va_list valist; + __ms_va_start(valist, format); + ret = p__vsnwprintf(str, len, format, valist); + __ms_va_end(valist); + return ret; +} + +void test__vsnwprintf(void) +{ + int ret; + WCHAR str[2] = {0}; + + _invalid_parameter_handler old_handler = p_set_invalid_parameter_handler(test_invalid_parameter_handler); + + SET_EXPECT(invalid_parameter_handler); + errno = 0xdeadbeef; + str[0] = 'x'; + ret = _vsnwprintf_wrapper(str, 0, NULL); + ok(ret == -1, "got %d, expected -1\n", ret); + ok(str[0] == 'x', "Expected string to be unchanged.\n"); + CHECK_CALLED(invalid_parameter_handler, EINVAL); + + ok(p_set_invalid_parameter_handler(old_handler) == test_invalid_parameter_handler, "Cannot reset invalid parameter handler\n"); +} + START_TEST(msvcr90) { if(!init()) @@ -1897,6 +1927,7 @@ START_TEST(msvcr90) test__mbstok_s(); test__memicmp(); test__memicmp_l(); + test__vsnwprintf(); #ifdef __i386__ test__fpieee_flt(); #endif diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 4ba02ba..ee8120e 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -376,6 +376,9 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API TRACE("Format is: %s\n", FUNC_NAME(debugstr)(fmt)); + if (!MSVCRT_CHECK_PMT(fmt != NULL)) + return -1; + if(!locale) locinfo = get_locinfo(); else

1 0

Alexandre Julliard : ntdll: Start process execution directly at the kernel32 process entry point.
by Alexandre Julliard Dec. 4, 2017

Dec. 4, 2017

Module: wine Branch: master Commit: 23ec3ce2a3edc046872709733940dc51e77e0e91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23ec3ce2a3edc046872709733… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 4 13:13:05 2017 +0100 ntdll: Start process execution directly at the kernel32 process entry point. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 39 +++++++++++++++++++++++++++++++-------- dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/signal_arm.c | 12 +++++++----- dlls/ntdll/signal_arm64.c | 16 +++++++++------- dlls/ntdll/signal_i386.c | 35 ++--------------------------------- dlls/ntdll/signal_powerpc.c | 16 +++++++++------- dlls/ntdll/signal_x86_64.c | 23 ++--------------------- dlls/ntdll/thread.c | 2 +- 8 files changed, 62 insertions(+), 83 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=23ec3ce2a3edc04687270…

1 0

Austin English : iexplore: Move WineHQ URLs to https.
by Alexandre Julliard Dec. 4, 2017

Dec. 4, 2017

Module: wine Branch: master Commit: 956a65347bf8aed0c1121e2d49bcd7eddf9db26b URL: http://source.winehq.org/git/wine.git/?a=commit;h=956a65347bf8aed0c1121e2d4… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Nov 30 12:57:08 2017 -0600 iexplore: Move WineHQ URLs to https. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/iexplore/iexplore.inf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/iexplore/iexplore.inf b/programs/iexplore/iexplore.inf index 1886352..68c17e3 100644 --- a/programs/iexplore/iexplore.inf +++ b/programs/iexplore/iexplore.inf @@ -26,11 +26,11 @@ HKCR,"CLSID\%CLSID_InternetExplorerManager%\LocalServer32",,,"""%16422%\Internet [Settings.Reg] -HKCU,"Software\Microsoft\Internet Explorer\Main","Start Page",2,"http://www.winehq.org" -HKCU,"Software\Microsoft\Internet Explorer\Main","Search Page",2,"http://www.google.com" +HKCU,"Software\Microsoft\Internet Explorer\Main","Start Page",2,"https://www.winehq.org" +HKCU,"Software\Microsoft\Internet Explorer\Main","Search Page",2,"https://www.google.com" HKCU,"Software\Microsoft\Internet Explorer\Settings","Text Color",2,"0,0,0" HKCR,"Applications\iexplore.exe\shell\open\command",,2,"""%16422%\Internet Explorer\iexplore.exe"" %1" -HKLM,"Software\Microsoft\Internet Explorer\Main","Default_Page_URL",2,"http://www.winehq.org" +HKLM,"Software\Microsoft\Internet Explorer\Main","Default_Page_URL",2,"https://www.winehq.org" HKLM,"Software\Microsoft\Windows\CurrentVersion\App Paths\iexplore.exe",,,"%16422%\Internet Explorer\iexplore.exe" HKLM,"Software\Microsoft\Windows\CurrentVersion\App Paths\iexplore.exe","Path",,"%16422%\Internet Explorer;"

1 0

Lauri Kenttä : readme: Update Swedish translation.
by Alexandre Julliard Dec. 4, 2017

Dec. 4, 2017

Module: wine Branch: master Commit: 4dad26920a0e50137c80e6157ec9ad5da9c5ab56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dad26920a0e50137c80e6157… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Mon Dec 4 18:37:47 2017 +0200 readme: Update Swedish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- documentation/README.sv | 42 +++++++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/documentation/README.sv b/documentation/README.sv index eb7260e..b68e699 100644 --- a/documentation/README.sv +++ b/documentation/README.sv @@ -4,7 +4,7 @@ Wine är ett program som gör det möjligt att köra Windows-program (inkluderat DOS, Windows 3.x, Win32 och Win64) i Unix. Det består av en programstartare som startar och kör Windows-programfiler, samt ett bibliotek (kallat Winelib) som implementerar Windows API-anrop med hjälp -av deras Unix- eller X11-motsvarigheter. Biblioteket kan också användas +av motsvarande Unix-, X11- eller Mac-anrop. Biblioteket kan också användas till att porta Windows-kod till vanliga Unix-program. Wine är fri programvara, utgett under villkoren i GNU LGPL; se @@ -18,8 +18,16 @@ Kör följande kommandon i rotkatalogen för Wines källkod: ./configure make +Efteråt antingen installera Wine: + +make install + +Eller kör Wine direkt från dess rotkatalog: + +./wine notepad + Kör program med "wine [val] program". Se resten av denna fil, -Wines man-sidor samt sist men inte minst http://www.winehq.org/ för mer +Wines man-sidor samt sist men inte minst https://www.winehq.org/ för mer information och tips om hur problem kan lösas. @@ -39,7 +47,7 @@ stöder kerneltrådar kommer eventuellt att stödjas i framtiden. Information för FreeBSD: Wine kommer i regel inte att fungera på FreeBSD-versioner äldre än 8.0. - Se http://wiki.freebsd.org/Wine för mer information. + Se https://wiki.freebsd.org/Wine för mer information. Information för Solaris: Wine måste antagligen byggas med GNU toolchain (gcc, gas etc.). @@ -71,14 +79,10 @@ Grundläggande krav: Valfria stödbibliotek: configure-skriptet visar varningar när valfria bibliotek inte hittats. - Se http://wiki.winehq.org/Recommended_Packages för information om - vilka paket du bör installera. + Se https://wiki.winehq.org/Recommended_Packages för information om vilka + paket du bör installera. På 64-bitars system måste du säkerställa att du + installerar 32-bitars versionerna av dessa bibliotek. - På 64 bit-system måste du säkerställa att 32 bit-versionerna av - ovannämnda bibliotek installerats; se http://wiki.winehq.org/WineOn64bit - för närmare detaljer. Om du vill ha ett sant 64-bit Wine (eller en mixad - 32- och 64-bit Wine-installation), se http://wiki.winehq.org/Wine64 för - detaljer. 4. KOMPILERING @@ -96,6 +100,7 @@ Kör './configure --help' för att se inställningar och val vid kompilering. För mer information se https://wiki.winehq.org/Building_Wine + 5. INSTALLATION När Wine är byggt kan du köra "make install" för att installera det; @@ -105,7 +110,7 @@ Glöm inte att först avinstallera gamla Wine-versioner. Pröva antingen "dpkg -r wine", "rpm -e wine" eller "make uninstall" före installationen. När Wine är installerat kan du använda inställningsprogrammet "winecfg". -Se hjälpavdelningen på http://www.winehq.org/ för tips om inställningar. +Se hjälpavdelningen på https://www.winehq.org/ för tips om inställningar. 6. KÖRNING AV PROGRAM @@ -132,18 +137,18 @@ rapporterar ett fel. 7. MER INFORMATION Internet: Mycket information om Wine finns samlat på WineHQ på - http://www.winehq.org/ : diverse guider, en programdatabas samt + https://www.winehq.org/ : diverse guider, en programdatabas samt felspårning. Detta är antagligen det bästa stället att börja. -Frågor: Frågor och svar om Wine finns samlade på http://www.winehq.org/FAQ +Frågor: Frågor och svar om Wine finns samlade på https://www.winehq.org/FAQ -Wiki: Wines Wiki finns på http://wiki.winehq.org +Wiki: Wines Wiki finns på https://wiki.winehq.org E-postlistor: Det finns flera e-postlistor för Wine-användare och -utvecklare; se - http://www.winehq.org/forums för mer information. + https://www.winehq.org/forums för mer information. -Fel: Rapportera fel till Wines Bugzilla på http://bugs.winehq.org +Fel: Rapportera fel till Wines Bugzilla på https://bugs.winehq.org Sök i Bugzilla-databasen för att se om problemet redan finns rapporterat innan du sänder en felrapport. @@ -151,7 +156,7 @@ IRC: Hjälp finns tillgänglig online på kanalen #WineHQ på irc.freenode.net. Git: Wines nuvarande utvecklingsversion finns tillgänglig genom Git. - Gå till http://www.winehq.org/git för mer information. + Gå till https://www.winehq.org/git för mer information. Om du lägger till något eller fixar ett fel, är det bra om du sänder en patch (förslagsvis med git-format-patch) till listan wine-devel(a)winehq.org @@ -165,3 +170,6 @@ julliard(a)winehq.org Översatt till svenska av Anders Jonsson anders.jonsson(a)norsjonet.se +och +Lauri Kenttä +lauri.kentta(a)gmail.com

1 0

Jacek Caban : mshtml: Added IDOMEvent::dispatchEvent implementation.
by Alexandre Julliard Dec. 4, 2017

Dec. 4, 2017

Module: wine Branch: master Commit: d6d23a5339ff5aca147e98e73b46b09fce5b6856 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6d23a5339ff5aca147e98e73… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 4 18:02:01 2017 +0100 mshtml: Added IDOMEvent::dispatchEvent implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 46 ++++++++++++++++++++++++++++++++++------------ dlls/mshtml/tests/events.c | 11 +++++++++++ 2 files changed, 45 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index aed6111..7a01ba5 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -56,6 +56,7 @@ typedef struct { typedef enum { DISPATCH_BOTH, + DISPATCH_STANDARD, DISPATCH_LEGACY } dispatch_mode_t; @@ -896,6 +897,13 @@ static inline DOMEvent *impl_from_IDOMEvent(IDOMEvent *iface) return CONTAINING_RECORD(iface, DOMEvent, IDOMEvent_iface); } +static const IDOMEventVtbl DOMEventVtbl; + +static inline DOMEvent *unsafe_impl_from_IDOMEvent(IDOMEvent *iface) +{ + return iface && iface->lpVtbl == &DOMEventVtbl ? impl_from_IDOMEvent(iface) : NULL; +} + static HRESULT WINAPI DOMEvent_QueryInterface(IDOMEvent *iface, REFIID riid, void **ppv) { DOMEvent *This = impl_from_IDOMEvent(iface); @@ -1434,7 +1442,7 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event, disp continue; break; case LISTENER_TYPE_ATTACHED: - if(event->phase == DEP_CAPTURING_PHASE) + if(event->phase == DEP_CAPTURING_PHASE || dispatch_mode == DISPATCH_STANDARD) continue; break; } @@ -1570,8 +1578,8 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event, disp event->current_target = NULL; } -static void dispatch_event_object(EventTarget *event_target, DOMEvent *event, - dispatch_mode_t dispatch_mode) +static HRESULT dispatch_event_object(EventTarget *event_target, DOMEvent *event, + dispatch_mode_t dispatch_mode, VARIANT_BOOL *r) { EventTarget *target_chain_buf[8], **target_chain = target_chain_buf; unsigned chain_cnt, chain_buf_size, i; @@ -1583,14 +1591,14 @@ static void dispatch_event_object(EventTarget *event_target, DOMEvent *event, TRACE("(%p) %s\n", event_target, debugstr_w(event->type)); - if(event->event_id == EVENTID_LAST) { - FIXME("Unsupported on unknown events\n"); - return; + if(!event->type) { + FIXME("Uninitialized event.\n"); + return E_FAIL; } if(event->current_target) { FIXME("event is being dispatched.\n"); - return; + return E_FAIL; } iter = event_target; @@ -1654,6 +1662,9 @@ static void dispatch_event_object(EventTarget *event_target, DOMEvent *event, call_event_handlers(target_chain[i], event, dispatch_mode); } + if(r) + *r = variant_bool(!event->prevent_default); + if(target_vtbl && target_vtbl->set_current_event) { prev_event = target_vtbl->set_current_event(&event_target->dispex, prev_event); if(prev_event) @@ -1675,6 +1686,7 @@ static void dispatch_event_object(EventTarget *event_target, DOMEvent *event, } } + event->prevent_default = FALSE; if(event_obj_ref) { event->event_obj = NULL; IHTMLEventObj_Release(&event_obj_ref->IHTMLEventObj_iface); @@ -1684,11 +1696,13 @@ static void dispatch_event_object(EventTarget *event_target, DOMEvent *event, IDispatchEx_Release(&target_chain[i]->dispex.IDispatchEx_iface); if(target_chain != target_chain_buf) heap_free(target_chain); + + return S_OK; } void dispatch_event(EventTarget *event_target, DOMEvent *event) { - dispatch_event_object(event_target, event, DISPATCH_BOTH); + dispatch_event_object(event_target, event, DISPATCH_BOTH, NULL); } HRESULT fire_event(HTMLDOMNode *node, const WCHAR *event_name, VARIANT *event_var, VARIANT_BOOL *cancelled) @@ -1738,7 +1752,7 @@ HRESULT fire_event(HTMLDOMNode *node, const WCHAR *event_name, VARIANT *event_va if(SUCCEEDED(hres)) { event_obj->event->event_obj = &event_obj->IHTMLEventObj_iface; - dispatch_event_object(&node->event_target, event_obj->event, DISPATCH_LEGACY); + dispatch_event_object(&node->event_target, event_obj->event, DISPATCH_LEGACY, NULL); event_obj->event->event_obj = NULL; } @@ -2220,11 +2234,19 @@ static HRESULT WINAPI EventTarget_removeEventListener(IEventTarget *iface, BSTR return S_OK; } -static HRESULT WINAPI EventTarget_dispatchEvent(IEventTarget *iface, IDOMEvent *event, VARIANT_BOOL *result) +static HRESULT WINAPI EventTarget_dispatchEvent(IEventTarget *iface, IDOMEvent *event_iface, VARIANT_BOOL *result) { EventTarget *This = impl_from_IEventTarget(iface); - FIXME("(%p)->(%p %p)\n", This, event, result); - return E_NOTIMPL; + DOMEvent *event = unsafe_impl_from_IDOMEvent(event_iface); + + TRACE("(%p)->(%p %p)\n", This, event, result); + + if(!event) { + WARN("Invalid event\n"); + return E_INVALIDARG; + } + + return dispatch_event_object(This, event, DISPATCH_STANDARD, result); } HRESULT IEventTarget_addEventListener_hook(DispatchEx *dispex, LCID lcid, WORD flags, diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index a943e41..28aa93c 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -2667,6 +2667,8 @@ static void test_iframe_connections(IHTMLDocument2 *doc) static void test_create_event(IHTMLDocument2 *doc) { IDocumentEvent *doc_event; + IEventTarget *event_target; + IHTMLElement *elem; IDOMEvent *event; VARIANT_BOOL b; USHORT phase; @@ -2709,6 +2711,15 @@ static void test_create_event(IHTMLDocument2 *doc) ok(hres == S_OK, "get_cancelable failed: %08x\n", hres); ok(!b, "cancelable = %x\n", b); + elem = doc_get_body(doc); + hres = IHTMLElement_QueryInterface(elem, &IID_IEventTarget, (void**)&event_target); + IHTMLElement_Release(elem); + + hres = IEventTarget_dispatchEvent(event_target, NULL, &b); + ok(hres == E_INVALIDARG, "dispatchEvent failed: %08x\n", hres); + + IEventTarget_Release(event_target); + IDOMEvent_Release(event); IDocumentEvent_Release(doc_event);

1 0

Jacek Caban : mshtml: Don't store dispatch mode in DOMEvent object.
by Alexandre Julliard Dec. 4, 2017

Dec. 4, 2017

Module: wine Branch: master Commit: 986f701cd4c09329786177cd7d493403889f1450 URL: http://source.winehq.org/git/wine.git/?a=commit;h=986f701cd4c09329786177cd7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 4 18:01:43 2017 +0100 mshtml: Don't store dispatch mode in DOMEvent object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 33 +++++++++++++++++++++------------ dlls/mshtml/htmlevent.h | 1 - 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 3d68555..aed6111 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -54,6 +54,11 @@ typedef struct { WCHAR type[1]; } listener_container_t; +typedef enum { + DISPATCH_BOTH, + DISPATCH_LEGACY +} dispatch_mode_t; + static const WCHAR abortW[] = {'a','b','o','r','t',0}; static const WCHAR beforeactivateW[] = {'b','e','f','o','r','e','a','c','t','i','v','a','t','e',0}; static const WCHAR beforeunloadW[] = {'b','e','f','o','r','e','u','n','l','o','a','d',0}; @@ -1362,7 +1367,7 @@ static BOOL is_cp_event(cp_static_data_t *data, DISPID dispid) return FALSE; } -static void call_event_handlers(EventTarget *event_target, DOMEvent *event) +static void call_event_handlers(EventTarget *event_target, DOMEvent *event, dispatch_mode_t dispatch_mode) { const listener_container_t *container = get_listener_container(event_target, event->type, FALSE); const BOOL use_quirks = use_event_quirks(event_target); @@ -1421,13 +1426,13 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) continue; break; case LISTENER_TYPE_CAPTURE: - if(event->phase == DEP_BUBBLING_PHASE || event->in_fire_event) + if(event->phase == DEP_BUBBLING_PHASE || dispatch_mode == DISPATCH_LEGACY) continue; break; case LISTENER_TYPE_BUBBLE: - if(event->in_fire_event) + if(event->phase == DEP_CAPTURING_PHASE || dispatch_mode == DISPATCH_LEGACY) continue; - /* fallthrough */ + break; case LISTENER_TYPE_ATTACHED: if(event->phase == DEP_CAPTURING_PHASE) continue; @@ -1463,7 +1468,7 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) V_VT(args) = VT_DISPATCH; V_DISPATCH(args) = (IDispatch*)&event_target->dispex.IDispatchEx_iface; V_VT(args+1) = VT_DISPATCH; - V_DISPATCH(args+1) = event->in_fire_event + V_DISPATCH(args+1) = dispatch_mode == DISPATCH_LEGACY ? (IDispatch*)event->event_obj : (IDispatch*)&event->IDOMEvent_iface; V_VT(&v) = VT_EMPTY; @@ -1565,7 +1570,8 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) event->current_target = NULL; } -void dispatch_event(EventTarget *event_target, DOMEvent *event) +static void dispatch_event_object(EventTarget *event_target, DOMEvent *event, + dispatch_mode_t dispatch_mode) { EventTarget *target_chain_buf[8], **target_chain = target_chain_buf; unsigned chain_cnt, chain_buf_size, i; @@ -1635,17 +1641,17 @@ void dispatch_event(EventTarget *event_target, DOMEvent *event) event->phase = DEP_CAPTURING_PHASE; i = chain_cnt-1; while(!event->stop_propagation && i) - call_event_handlers(target_chain[i--], event); + call_event_handlers(target_chain[i--], event, dispatch_mode); if(!event->stop_propagation) { event->phase = DEP_AT_TARGET; - call_event_handlers(target_chain[0], event); + call_event_handlers(target_chain[0], event, dispatch_mode); } 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); + call_event_handlers(target_chain[i], event, dispatch_mode); } if(target_vtbl && target_vtbl->set_current_event) { @@ -1680,6 +1686,11 @@ void dispatch_event(EventTarget *event_target, DOMEvent *event) heap_free(target_chain); } +void dispatch_event(EventTarget *event_target, DOMEvent *event) +{ + dispatch_event_object(event_target, event, DISPATCH_BOTH); +} + HRESULT fire_event(HTMLDOMNode *node, const WCHAR *event_name, VARIANT *event_var, VARIANT_BOOL *cancelled) { HTMLEventObj *event_obj = NULL; @@ -1727,9 +1738,7 @@ HRESULT fire_event(HTMLDOMNode *node, const WCHAR *event_name, VARIANT *event_va if(SUCCEEDED(hres)) { event_obj->event->event_obj = &event_obj->IHTMLEventObj_iface; - event_obj->event->in_fire_event++; - dispatch_event(&node->event_target, event_obj->event); - event_obj->event->in_fire_event--; + dispatch_event_object(&node->event_target, event_obj->event, DISPATCH_LEGACY); event_obj->event->event_obj = NULL; } diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index f99c893..3775e44 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -75,7 +75,6 @@ typedef struct { IHTMLEventObj *event_obj; BOOL no_event_obj; - unsigned in_fire_event; } DOMEvent; void check_event_attr(HTMLDocumentNode*,nsIDOMHTMLElement*) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Don't call preventDefault in stopPropagation.
by Alexandre Julliard Dec. 4, 2017

Dec. 4, 2017

Module: wine Branch: master Commit: f0b3fe8f836317dd073444570f185b4aedd2739b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0b3fe8f836317dd073444570… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 4 18:01:31 2017 +0100 mshtml: Don't call preventDefault in stopPropagation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index fba04b5..3d68555 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1117,7 +1117,6 @@ static HRESULT WINAPI DOMEvent_stopPropagation(IDOMEvent *iface) This->stop_propagation = TRUE; nsIDOMEvent_StopPropagation(This->nsevent); - IDOMEvent_preventDefault(&This->IDOMEvent_iface); return S_OK; }

1 0

Jacek Caban : mshtml: Added IDOMEvent::initEvent implementation.
by Alexandre Julliard Dec. 4, 2017

Dec. 4, 2017

Module: wine Branch: master Commit: 30e2762b823c802f0c2e20fbbd2539b5a96d0c5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=30e2762b823c802f0c2e20fbb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 4 18:01:23 2017 +0100 mshtml: Added IDOMEvent::initEvent implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 33 ++++++++++++++++++++++++++++++--- dlls/mshtml/mshtml_private.h | 4 ++++ dlls/mshtml/nsembed.c | 1 - 3 files changed, 34 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index c06d062..fba04b5 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -218,7 +218,6 @@ static eventid_t str_to_eid(const WCHAR *str) return i; } - ERR("unknown type %s\n", debugstr_w(str)); return EVENTID_LAST; } @@ -1062,11 +1061,39 @@ static HRESULT WINAPI DOMEvent_get_type(IDOMEvent *iface, BSTR *p) return S_OK; } +#ifdef __i386__ +#define nsIDOMEvent_InitEvent(_this,type,bubbles,cancelable) \ + ((void (WINAPI*)(void*,nsIDOMEvent*,const nsAString*,cpp_bool,cpp_bool)) \ + &call_thiscall_func)((_this)->lpVtbl->InitEvent,_this,type,bubbles,cancelable) + +#endif + static HRESULT WINAPI DOMEvent_initEvent(IDOMEvent *iface, BSTR type, VARIANT_BOOL can_bubble, VARIANT_BOOL cancelable) { DOMEvent *This = impl_from_IDOMEvent(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + nsAString nsstr; + + TRACE("(%p)->(%s %x %x)\n", This, debugstr_w(type), can_bubble, cancelable); + + if(This->target) { + TRACE("called on already dispatched event\n"); + return S_OK; + } + + heap_free(This->type); + This->type = heap_strdupW(type); + if(!This->type) + return E_OUTOFMEMORY; + This->event_id = str_to_eid(type); + + This->bubbles = !!can_bubble; + This->cancelable = !!cancelable; + + nsAString_InitDepend(&nsstr, type); + nsIDOMEvent_InitEvent(This->nsevent, &nsstr, This->bubbles, This->cancelable); + nsAString_Finish(&nsstr); + + return S_OK; } static HRESULT WINAPI DOMEvent_preventDefault(IDOMEvent *iface) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index f55f064..2387372 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1341,6 +1341,10 @@ static inline VARIANT_BOOL variant_bool(BOOL b) return b ? VARIANT_TRUE : VARIANT_FALSE; } +#ifdef __i386__ +extern void *call_thiscall_func; +#endif + UINT cp_from_charset_string(BSTR) DECLSPEC_HIDDEN; BSTR charset_string_from_cp(UINT) DECLSPEC_HIDDEN; HDC get_display_dc(void) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 4db61dc..8782ece 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -2200,7 +2200,6 @@ void NSContainer_Release(NSContainer *This) * This will be removed after the next Gecko update, that will change calling convention on Gecko side. */ #ifdef __i386__ -extern void *call_thiscall_func; __ASM_GLOBAL_FUNC(call_thiscall_func, "popl %eax\n\t" "popl %edx\n\t"

1 0