October 2017 - Wine-Commits

Huw Davies : strmbase: Remove unnecessary WS_ICONIC.
by Alexandre Julliard Oct. 31, 2017

Oct. 31, 2017

Module: wine Branch: master Commit: 9ca53840789da6381d9a1ca178879209c5ff660b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ca53840789da6381d9a1ca17… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 30 10:29:12 2017 +0000 strmbase: Remove unnecessary WS_ICONIC. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index b4b5aab..b08608e 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -295,7 +295,7 @@ HRESULT WINAPI BaseControlWindowImpl_put_WindowStyle(IVideoWindow *iface, LONG W TRACE("(%p/%p)->(%x -> %x)\n", This, iface, old, WindowStyle); - if (WindowStyle & (WS_DISABLED|WS_HSCROLL|WS_ICONIC|WS_MAXIMIZE|WS_MINIMIZE|WS_VSCROLL)) + if (WindowStyle & (WS_DISABLED|WS_HSCROLL|WS_MAXIMIZE|WS_MINIMIZE|WS_VSCROLL)) return E_INVALIDARG; SetWindowLongW(This->baseWindow.hWnd, GWL_STYLE, WindowStyle);

1 0

Zebediah Figura : version: Use the string value length when converting strings.
by Alexandre Julliard Oct. 31, 2017

Oct. 31, 2017

Module: wine Branch: master Commit: bec279d8c1d571e0fe9f03e3215f489b60a71af9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bec279d8c1d571e0fe9f03e32… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Oct 29 21:15:01 2017 +0100 version: Use the string value length when converting strings. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/version/version.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/version/version.c b/dlls/version/version.c index ed060c8..13436ca 100644 --- a/dlls/version/version.c +++ b/dlls/version/version.c @@ -1010,6 +1010,7 @@ BOOL WINAPI VerQueryValueA( LPCVOID pBlock, LPCSTR lpSubBlock, BOOL ret, isText; INT len; LPWSTR lpSubBlockW; + UINT value_len; len = MultiByteToWideChar(CP_ACP, 0, lpSubBlock, -1, NULL, 0); lpSubBlockW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); @@ -1019,7 +1020,8 @@ BOOL WINAPI VerQueryValueA( LPCVOID pBlock, LPCSTR lpSubBlock, MultiByteToWideChar(CP_ACP, 0, lpSubBlock, -1, lpSubBlockW, len); - ret = VersionInfo32_QueryValue(pBlock, lpSubBlockW, lplpBuffer, puLen, &isText); + ret = VersionInfo32_QueryValue(pBlock, lpSubBlockW, lplpBuffer, &value_len, &isText); + if (puLen) *puLen = value_len; HeapFree(GetProcessHeap(), 0, lpSubBlockW); @@ -1030,8 +1032,7 @@ BOOL WINAPI VerQueryValueA( LPCVOID pBlock, LPCSTR lpSubBlock, */ LPSTR lpBufferA = (LPSTR)pBlock + info->wLength + 4; DWORD pos = (LPCSTR)*lplpBuffer - (LPCSTR)pBlock; - - len = WideCharToMultiByte(CP_ACP, 0, *lplpBuffer, -1, + len = WideCharToMultiByte(CP_ACP, 0, *lplpBuffer, value_len, lpBufferA + pos, info->wLength - pos, NULL, NULL); *lplpBuffer = lpBufferA + pos; if (puLen) *puLen = len;

1 0

Alistair Leslie-Hughes : midimap: Check each Midi Output for a Midi Through synthesizer.
by Alexandre Julliard Oct. 31, 2017

Oct. 31, 2017

Module: wine Branch: master Commit: efe0a09fb57567b79a8e0f2b170499241c9aab65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efe0a09fb57567b79a8e0f2b1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 26 01:26:18 2017 +0000 midimap: Check each Midi Output for a Midi Through synthesizer. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/midimap/midimap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/midimap/midimap.c b/dlls/midimap/midimap.c index f36b252..16707bb 100644 --- a/dlls/midimap/midimap.c +++ b/dlls/midimap/midimap.c @@ -574,7 +574,7 @@ static LRESULT MIDIMAP_drvOpen(void) midiOutPorts[dev].lpbPatch = NULL; for (i = 0; i < 16; i++) midiOutPorts[dev].aChn[i] = i; - if (strncmpW(midiOutPorts[0].name, throughportW, strlenW(throughportW)) != 0) + if (strncmpW(midiOutPorts[dev].name, throughportW, strlenW(throughportW)) != 0) found_valid_port = TRUE; } else

1 0

Michael Stefaniuc : wmvcore: Print the debug string and not the pointer to it.
by Alexandre Julliard Oct. 31, 2017

Oct. 31, 2017

Module: wine Branch: master Commit: 81c38c87852ff8d2302fb747eabbdfb3320796ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=81c38c87852ff8d2302fb747e… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 25 23:06:40 2017 +0200 wmvcore: Print the debug string and not the pointer to it. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/wmvcore_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index be07909..ae8b486 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -1490,7 +1490,7 @@ static HRESULT WINAPI headerinfo_AddScript(IWMHeaderInfo3 *iface, LPCWSTR_WMSDK_ LPCWSTR_WMSDK_TYPE_SAFE command, QWORD script_time) { WMReader *This = impl_from_IWMHeaderInfo3(iface); - FIXME("%p, %s, %p, %s\n", This, debugstr_w(type), debugstr_w(command), wine_dbgstr_longlong(script_time)); + FIXME("%p, %s, %s, %s\n", This, debugstr_w(type), debugstr_w(command), wine_dbgstr_longlong(script_time)); return E_NOTIMPL; }

1 0

Jacek Caban : mshtml: Added IDOMEvent::removeEventListener implementation.
by Alexandre Julliard Oct. 25, 2017

Oct. 25, 2017

Module: wine Branch: master Commit: 8e32ee6aad43a9dfc7c7f7f05b14795c0fdb0560 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e32ee6aad43a9dfc7c7f7f05… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 25 18:13:42 2017 +0200 mshtml: Added IDOMEvent::removeEventListener implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 3334324..778b692 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2125,8 +2125,18 @@ static HRESULT WINAPI EventTarget_removeEventListener(IEventTarget *iface, BSTR IDispatch *listener, VARIANT_BOOL capture) { EventTarget *This = impl_from_IEventTarget(iface); - FIXME("(%p)->(%s %p %x)\n", This, debugstr_w(type), listener, capture); - return E_NOTIMPL; + eventid_t eid; + + TRACE("(%p)->(%s %p %x)\n", This, debugstr_w(type), listener, capture); + + eid = str_to_eid(type); + if(eid == EVENTID_LAST) { + FIXME("Unsupported on event %s\n", debugstr_w(type)); + return E_NOTIMPL; + } + + remove_event_listener(This, eid, capture ? LISTENER_TYPE_CAPTURE : LISTENER_TYPE_BUBBLE, listener); + return S_OK; } static HRESULT WINAPI EventTarget_dispatchEvent(IEventTarget *iface, IDOMEvent *event, VARIANT_BOOL *result)

1 0

Jacek Caban : mshtml: Added IDOMEvent::addEventListener implementation.
by Alexandre Julliard Oct. 25, 2017

Oct. 25, 2017

Module: wine Branch: master Commit: da8c7dde864d3c1a6f7a2d87fc0d7d6d29539c15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da8c7dde864d3c1a6f7a2d87f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 25 18:13:35 2017 +0200 mshtml: Added IDOMEvent::addEventListener implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 46 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 43 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 88282c0..3334324 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -36,6 +36,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef enum { + LISTENER_TYPE_CAPTURE, + LISTENER_TYPE_BUBBLE, LISTENER_TYPE_ONEVENT, LISTENER_TYPE_ATTACHED } listener_type_t; @@ -1344,6 +1346,14 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) if(use_quirks || event->phase == DEP_CAPTURING_PHASE) continue; break; + case LISTENER_TYPE_CAPTURE: + if(event->phase == DEP_BUBBLING_PHASE || event->in_fire_event) + continue; + break; + case LISTENER_TYPE_BUBBLE: + if(event->in_fire_event) + continue; + /* fallthrough */ case LISTENER_TYPE_ATTACHED: if(event->phase == DEP_CAPTURING_PHASE) continue; @@ -2074,11 +2084,41 @@ static HRESULT WINAPI EventTarget_Invoke(IEventTarget *iface, DISPID dispIdMembe } static HRESULT WINAPI EventTarget_addEventListener(IEventTarget *iface, BSTR type, - IDispatch *listener, VARIANT_BOOL capture) + IDispatch *function, VARIANT_BOOL capture) { EventTarget *This = impl_from_IEventTarget(iface); - FIXME("(%p)->(%s %p %x)\n", This, debugstr_w(type), listener, capture); - return E_NOTIMPL; + listener_type_t listener_type = capture ? LISTENER_TYPE_CAPTURE : LISTENER_TYPE_BUBBLE; + listener_container_t *container; + event_listener_t *listener; + eventid_t eid; + + TRACE("(%p)->(%s %p %x)\n", This, debugstr_w(type), function, capture); + + eid = str_to_eid(type); + if(eid == EVENTID_LAST) { + FIXME("Unsupported on event %s\n", debugstr_w(type)); + return E_NOTIMPL; + } + + + container = get_listener_container(This, eid, TRUE); + if(!container) + return E_OUTOFMEMORY; + + /* check for duplicates */ + LIST_FOR_EACH_ENTRY(listener, &container->listeners, event_listener_t, entry) { + if(listener->type == listener_type && listener->function == function) + return S_OK; + } + + listener = heap_alloc(sizeof(*listener)); + if(!listener) + return E_OUTOFMEMORY; + + listener->type = listener_type; + IDispatch_AddRef(listener->function = function); + list_add_tail(&container->listeners, &listener->entry); + return S_OK; } static HRESULT WINAPI EventTarget_removeEventListener(IEventTarget *iface, BSTR type,

1 0

André Hentschel : loader: Don' t warn for limited user address space on ARM64.
by Alexandre Julliard Oct. 25, 2017

Oct. 25, 2017

Module: wine Branch: master Commit: 0ad8bb4ecf2f538cef14f2427670148668f0ee0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ad8bb4ecf2f538cef14f2427… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Oct 20 21:14:52 2017 +0200 loader: Don't warn for limited user address space on ARM64. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/preloader.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/loader/preloader.c b/loader/preloader.c index 5068a60..6cb8e15 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -1326,7 +1326,11 @@ void* wld_start( void **stack ) MAP_FIXED | MAP_PRIVATE | MAP_ANON | MAP_NORESERVE, -1, 0 ) == (void *)-1) { /* don't warn for low 64k */ - if (preload_info[i].addr >= (void *)0x10000) + if (preload_info[i].addr >= (void *)0x10000 +#ifdef __aarch64__ + && preload_info[i].addr < (void *)0x7fffffffff /* ARM64 address space might end here*/ +#endif + ) wld_printf( "preloader: Warning: failed to reserve range %p-%p\n", preload_info[i].addr, (char *)preload_info[i].addr + preload_info[i].size ); remove_preload_range( i );

1 0

Piotr Caban : msi: Add error handling when retriving component/ feature state/action in condition.
by Alexandre Julliard Oct. 25, 2017

Oct. 25, 2017

Module: wine Branch: master Commit: 9ce8592b0680e31c2bb4bd723421ff20c4f3719c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ce8592b0680e31c2bb4bd723… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 24 15:03:00 2017 +0200 msi: Add error handling when retriving component/feature state/action in condition. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/cond.y | 46 ++++++++++++++++++++++++++++++++-------------- dlls/msi/tests/package.c | 8 +++++++- 2 files changed, 39 insertions(+), 15 deletions(-) diff --git a/dlls/msi/cond.y b/dlls/msi/cond.y index 712050c..6ee6ab9 100644 --- a/dlls/msi/cond.y +++ b/dlls/msi/cond.y @@ -321,9 +321,16 @@ value: COND_input* cond = (COND_input*) info; INSTALLSTATE install = INSTALLSTATE_UNKNOWN, action = INSTALLSTATE_UNKNOWN; - MSI_GetComponentStateW(cond->package, $2, &install, &action ); - $$.type = VALUE_INTEGER; - $$.u.integer = action; + if(MSI_GetComponentStateW(cond->package, $2, &install, &action ) != ERROR_SUCCESS) + { + $$.type = VALUE_LITERAL; + $$.u.string = NULL; + } + else + { + $$.type = VALUE_INTEGER; + $$.u.integer = action; + } cond_free( $2 ); } | COND_QUESTION identifier @@ -331,9 +338,16 @@ value: COND_input* cond = (COND_input*) info; INSTALLSTATE install = INSTALLSTATE_UNKNOWN, action = INSTALLSTATE_UNKNOWN; - MSI_GetComponentStateW(cond->package, $2, &install, &action );\ - $$.type = VALUE_INTEGER; - $$.u.integer = install; + if(MSI_GetComponentStateW(cond->package, $2, &install, &action ) != ERROR_SUCCESS) + { + $$.type = VALUE_LITERAL; + $$.u.string = NULL; + } + else + { + $$.type = VALUE_INTEGER; + $$.u.integer = install; + } cond_free( $2 ); } | COND_AMPER identifier @@ -343,17 +357,14 @@ value: if (MSI_GetFeatureStateW(cond->package, $2, &install, &action ) != ERROR_SUCCESS) { - FIXME("condition may be evaluated incorrectly\n"); - /* we should return empty string in this case */ - $$.type = VALUE_INTEGER; - $$.u.integer = MSICONDITION_FALSE; + $$.type = VALUE_LITERAL; + $$.u.string = NULL; } else { $$.type = VALUE_INTEGER; $$.u.integer = action; } - cond_free( $2 ); } | COND_EXCLAM identifier @@ -361,9 +372,16 @@ value: COND_input* cond = (COND_input*) info; INSTALLSTATE install = INSTALLSTATE_UNKNOWN, action = INSTALLSTATE_UNKNOWN; - MSI_GetFeatureStateW(cond->package, $2, &install, &action ); - $$.type = VALUE_INTEGER; - $$.u.integer = install; + if(MSI_GetFeatureStateW(cond->package, $2, &install, &action ) != ERROR_SUCCESS) + { + $$.type = VALUE_LITERAL; + $$.u.string = NULL; + } + else + { + $$.type = VALUE_INTEGER; + $$.u.integer = install; + } cond_free( $2 ); } ; diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 3120252..002e692 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -2070,7 +2070,13 @@ static void test_condition(void) r = MsiEvaluateConditionA(hpkg, "&nofeature"); ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); r = MsiEvaluateConditionA(hpkg, "&nofeature=\"\""); - todo_wine ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + r = MsiEvaluateConditionA(hpkg, "!nofeature=\"\""); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + MsiEvaluateConditionA(hpkg, "$nocomponent=\"\""); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + MsiEvaluateConditionA(hpkg, "?nocomponent=\"\""); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); MsiSetPropertyA(hpkg, "A", "2"); MsiSetPropertyA(hpkg, "X", "50");

1 0

Piotr Caban : msi: Define special types for condition operators, identifiers and expressions.
by Alexandre Julliard Oct. 25, 2017

Oct. 25, 2017

Module: wine Branch: master Commit: c8d32b69ec467d649ad86b50b14a8cf245630f25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8d32b69ec467d649ad86b50b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 24 15:01:26 2017 +0200 msi: Define special types for condition operators, identifiers and expressions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/cond.y | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/msi/cond.y b/dlls/msi/cond.y index 8b63a50..8bdaf84 100644 --- a/dlls/msi/cond.y +++ b/dlls/msi/cond.y @@ -115,6 +115,9 @@ static BOOL num_from_prop( LPCWSTR p, INT *val ) struct cond_str str; LPWSTR string; INT value; + LPWSTR identifier; + INT operator; + BOOL bool; } %token COND_SPACE COND_EOF @@ -128,9 +131,11 @@ static BOOL num_from_prop( LPCWSTR p, INT *val ) %nonassoc COND_ERROR COND_EOF -%type <value> expression boolean_term boolean_factor -%type <value> value_i operator -%type <string> identifier symbol_s value_s literal +%type <bool> expression boolean_term boolean_factor +%type <value> value_i +%type <string> symbol_s value_s literal +%type <identifier> identifier +%type <operator> operator %%

1 0

Jacek Caban : mshtml: Don't set no_event_obj for XHR events.
by Alexandre Julliard Oct. 25, 2017

Oct. 25, 2017

Module: wine Branch: master Commit: 17d43ef54e4eaaa549fba0b8aed4a816b42c7154 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17d43ef54e4eaaa549fba0b8a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 25 18:14:12 2017 +0200 mshtml: Don't set no_event_obj for XHR events. It's no longer needed. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/xmlhttprequest.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index a107fa2..bbe2833 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -194,7 +194,6 @@ static nsresult NSAPI XMLHttpReqEventListener_HandleEvent(nsIDOMEventListener *i hres = create_event_from_nsevent(nsevent, &event); if(SUCCEEDED(hres) ){ - event->no_event_obj = TRUE; dispatch_event(&This->xhr->event_target, event); IDOMEvent_Release(&event->IDOMEvent_iface); }

1 0