October 2017 - Wine-commits

Jacek Caban : mshtml/tests: Added a few more event tests.
by Alexandre Julliard 25 Oct '17

25 Oct '17

Module: wine Branch: master Commit: b96934bf4a5b35a9917e34bee4cf887101031e56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b96934bf4a5b35a9917e34bee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 25 18:13:07 2017 +0200 mshtml/tests: Added a few more event tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/events.html | 89 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/dlls/mshtml/tests/events.html b/dlls/mshtml/tests/events.html index 4172e30..f20fd3b 100644 --- a/dlls/mshtml/tests/events.html +++ b/dlls/mshtml/tests/events.html @@ -190,6 +190,92 @@ function test_event_target() { div.click(); with(todo_wine) ok(last_event_arg.srcElement === null, "srcElement != null"); + + document.body.removeChild(div); +} + +function test_attach_event() { + var calls; + + var div = document.createElement("div"); + document.body.appendChild(div); + + function listener() { + calls += "listener,"; + } + + function listener2() { + calls += "listener2,"; + } + + /* if the same listener is added twice, it will be called twice */ + div.attachEvent("onclick", listener); + div.attachEvent("onclick", listener2); + div.attachEvent("onclick", listener); + + calls = ""; + div.click(); + ok(calls === "listener,listener2,listener,", "calls = " + calls); + + /* remove listener once, it will be called once */ + div.detachEvent("onclick", listener); + + calls = ""; + div.click(); + ok(calls === "listener2,listener,", "calls = " + calls); + + div.detachEvent("onclick", listener); + div.detachEvent("onclick", listener2); + + calls = ""; + div.click(); + ok(calls === "", "calls = " + calls); + + document.body.removeChild(div); +} + +function test_listener_order() { + var div = document.createElement("div"); + document.body.appendChild(div); + + var calls; + function record_call(msg) { + return function() { calls += msg + "," }; + } + + div.attachEvent("onclick", record_call("click1")); + div.onclick = record_call("onclick"); + div.attachEvent("onclick", record_call("click2")); + div.attachEvent("onclick", record_call("click3")); + + calls = ""; + div.click(); + ok(calls === "onclick,click3,click2,click1,", "calls = " + calls); + + document.body.removeChild(div); +} + +function test_attach_in_attach() { + var calls; + + var div = document.createElement("div"); + document.body.appendChild(div); + + /* listener attached inside onevent handler will be invoked in this propagation */ + div.onclick = function () { + calls += "div.onclick,"; + div.attachEvent("onclick", function() { + calls += "div.click,"; + /* listener attached inside an other attached listener will not ve invoked */ + div.attachEvent("onclick", function () { ok(false, "unexpected call"); }); + }); + } + + calls = ""; + div.click(); + ok(calls === "div.onclick,div.click,", "calls = " + calls); + + document.body.removeChild(div); } window.onload = function() { @@ -215,6 +301,9 @@ window.onload = function() { test_string_event_handler(); test_body_events(); test_event_target(); + test_attach_event(); + test_listener_order(); + test_attach_in_attach(); }catch(e) { ok(false, "Got an exception: " + e.message); }

1 0

Jacek Caban : mshtml: Store all event listeners in a list.
by Alexandre Julliard 25 Oct '17

25 Oct '17

Module: wine Branch: master Commit: 87d4a5a29a070375fcf9b4fba9a46e8263061498 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87d4a5a29a070375fcf9b4fba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 25 18:12:56 2017 +0200 mshtml: Store all event listeners in a list. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 270 ++++++++++++++++++++++++++---------------------- 1 file changed, 147 insertions(+), 123 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=87d4a5a29a070375fcf9b…

1 0

Jacek Caban : mshtml: Store all attached listeners before calling them in call_event_handlers.
by Alexandre Julliard 25 Oct '17

25 Oct '17

Module: wine Branch: master Commit: 231d1d3c338b81f97a9165737783bf281c49fb4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=231d1d3c338b81f97a9165737… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 25 18:12:41 2017 +0200 mshtml: Store all attached listeners before calling them in call_event_handlers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 99 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 70 insertions(+), 29 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index d64238f..19a76e0 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -35,6 +35,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); +typedef enum { + LISTENER_TYPE_ONEVENT, + LISTENER_TYPE_ATTACHED +} listener_type_t; + +typedef struct { + listener_type_t type; + IDispatch *function; +} event_listener_t; + typedef struct { struct wine_rb_entry entry; eventid_t event_id; @@ -1258,14 +1268,16 @@ 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; - handler_vector_t *handler_vector = get_handler_vector(event_target, eid, FALSE); + handler_vector_t *container = get_handler_vector(event_target, eid, FALSE); const BOOL cancelable = event_info[eid].flags & EVENT_CANCELABLE; + event_listener_t *listener, listeners_buf[8], *listeners = listeners_buf; + unsigned listeners_cnt, listeners_size; ConnectionPointContainer *cp_container = NULL; const event_target_vtbl_t *vtbl; VARIANT v; HRESULT hres; - if(handler_vector && handler_vector->handler_prop) { + if(container && container->handler_prop) { DISPID named_arg = DISPID_THIS; VARIANTARG arg; DISPPARAMS dp = {&arg, &named_arg, 1, 1}; @@ -1278,7 +1290,7 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) V_VT(&v) = VT_EMPTY; TRACE("%s >>>\n", debugstr_w(event_info[eid].name)); - hres = call_disp_func(handler_vector->handler_prop, &dp, &v); + hres = call_disp_func(container->handler_prop, &dp, &v); if(hres == S_OK) { TRACE("%s <<< %s\n", debugstr_w(event_info[eid].name), debugstr_variant(&v)); @@ -1296,40 +1308,69 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) } } - if(handler_vector && handler_vector->handler_cnt) { - VARIANTARG arg; - DISPPARAMS dp = {&arg, NULL, 1, 0}; - int i; - - V_VT(&arg) = VT_DISPATCH; - V_DISPATCH(&arg) = (IDispatch*)event->event_obj; + listeners_cnt = 0; + listeners_size = sizeof(listeners_buf)/sizeof(*listeners_buf); - i = handler_vector->handler_cnt; + if(container) { + unsigned i = container->handler_cnt; while(i--) { - if(handler_vector->handlers[i]) { - V_VT(&v) = VT_EMPTY; - - TRACE("%s [%d] >>>\n", debugstr_w(event_info[eid].name), i); - hres = call_disp_func(handler_vector->handlers[i], &dp, &v); - if(hres == S_OK) { - TRACE("%s [%d] <<<\n", debugstr_w(event_info[eid].name), i); - - if(cancelable) { - if(V_VT(&v) == VT_BOOL) { - if(!V_BOOL(&v)) - IDOMEvent_preventDefault(&event->IDOMEvent_iface); - }else if(V_VT(&v) != VT_EMPTY) { - FIXME("unhandled result %s\n", debugstr_variant(&v)); - } - } - VariantClear(&v); + if(!container->handlers[i]) + continue; + + if(listeners_cnt == listeners_size) { + event_listener_t *new_listeners; + if(listeners == listeners_buf) { + new_listeners = heap_alloc(listeners_size * 2 * sizeof(*new_listeners)); + if(!new_listeners) + break; + memcpy(new_listeners, listeners, listeners_cnt * sizeof(*listeners)); }else { - WARN("%s [%d] <<< %08x\n", debugstr_w(event_info[eid].name), i, hres); + new_listeners = heap_realloc(listeners, listeners_size * 2 * sizeof(*new_listeners)); } + listeners = new_listeners; + listeners_size *= 2; } + + listeners[listeners_cnt].type = LISTENER_TYPE_ATTACHED; + IDispatch_AddRef(listeners[listeners_cnt].function = container->handlers[i]); + listeners_cnt++; } } + for(listener = listeners; listener < listeners + listeners_cnt; listener++) { + if(listener->type == LISTENER_TYPE_ATTACHED) { + VARIANTARG arg; + DISPPARAMS dp = {&arg, NULL, 1, 0}; + + V_VT(&arg) = VT_DISPATCH; + V_DISPATCH(&arg) = (IDispatch*)event->event_obj; + V_VT(&v) = VT_EMPTY; + + TRACE("%s attached >>>\n", debugstr_w(event_info[eid].name)); + hres = call_disp_func(listener->function, &dp, &v); + if(hres == S_OK) { + TRACE("%s attached <<<\n", debugstr_w(event_info[eid].name)); + + if(cancelable) { + if(V_VT(&v) == VT_BOOL) { + if(!V_BOOL(&v)) + IDOMEvent_preventDefault(&event->IDOMEvent_iface); + }else if(V_VT(&v) != VT_EMPTY) { + FIXME("unhandled result %s\n", debugstr_variant(&v)); + } + } + VariantClear(&v); + }else { + WARN("%s attached <<< %08x\n", debugstr_w(event_info[eid].name), hres); + } + } + } + + if(listeners != listeners_buf) + heap_free(listeners); + if(event->phase == DEP_CAPTURING_PHASE) + return; + if((vtbl = dispex_get_vtbl(&event_target->dispex)) && vtbl->get_cp_container) cp_container = vtbl->get_cp_container(&event_target->dispex); if(cp_container) {

1 0

Alexandre Julliard : rbtree: Clarify the loop conditions to avoid confusing older gcc.
by Alexandre Julliard 25 Oct '17

25 Oct '17

Module: wine Branch: master Commit: 5d01ebab89cee8a3499ee00729c048068d5b719d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d01ebab89cee8a3499ee0072… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 25 18:41:10 2017 +0200 rbtree: Clarify the loop conditions to avoid confusing older gcc. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/rbtree.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wine/rbtree.h b/include/wine/rbtree.h index bb4edf5..dc50b5e 100644 --- a/include/wine/rbtree.h +++ b/include/wine/rbtree.h @@ -147,7 +147,7 @@ static inline struct wine_rb_entry *wine_rb_postorder_next(struct wine_rb_entry /* iterate through the tree using a tree entry */ #define WINE_RB_FOR_EACH_ENTRY(elem, tree, type, field) \ for ((elem) = WINE_RB_ENTRY_VALUE(wine_rb_head((tree)->root), type, field); \ - &(elem)->field; \ + (elem) != WINE_RB_ENTRY_VALUE(0, type, field); \ (elem) = WINE_RB_ENTRY_VALUE(wine_rb_next(&elem->field), type, field)) /* iterate through the tree using using postorder, making it safe to free the entry */ @@ -159,7 +159,7 @@ static inline struct wine_rb_entry *wine_rb_postorder_next(struct wine_rb_entry /* iterate through the tree using a tree entry and postorder, making it safe to free the entry */ #define WINE_RB_FOR_EACH_ENTRY_DESTRUCTOR(elem, elem2, tree, type, field) \ for ((elem) = WINE_RB_ENTRY_VALUE(wine_rb_postorder_head((tree)->root), type, field); \ - &(elem)->field \ + (elem) != WINE_RB_ENTRY_VALUE(0, type, field) \ && (((elem2) = WINE_RB_ENTRY_VALUE(wine_rb_postorder_next(&(elem)->field), type, field)) || 1); \ (elem) = (elem2))

1 0

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

25 Oct '17

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

André Hentschel : loader: Build the preloader for ARM64.
by Alexandre Julliard 25 Oct '17

25 Oct '17

Module: wine Branch: master Commit: 27e92e550c2b86d5ebd4966926c1fcde03838dcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=27e92e550c2b86d5ebd496692… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Oct 20 21:14:43 2017 +0200 loader: Build the preloader for ARM64. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- loader/preloader.c | 107 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 109 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 7a7d26a..c8a508b 100755 --- a/configure +++ b/configure @@ -15627,7 +15627,7 @@ esac case $host_os in linux*) case $host_cpu in - *i[3456789]86*|x86_64*) + *i[3456789]86*|x86_64*|*aarch64*) test "$wine_binary" = wine || wine_fn_append_file CONFIGURE_TARGETS "loader/wine-preloader" WINELOADER_PROGRAMS="$WINELOADER_PROGRAMS $wine_binary-preloader" ;; diff --git a/configure.ac b/configure.ac index cff4b8f..3039c94 100644 --- a/configure.ac +++ b/configure.ac @@ -2022,7 +2022,7 @@ esac case $host_os in linux*) case $host_cpu in - *i[[3456789]]86*|x86_64*) + *i[[3456789]]86*|x86_64*|*aarch64*) test "$wine_binary" = wine || WINE_IGNORE_FILE("loader/wine-preloader") WINELOADER_PROGRAMS="$WINELOADER_PROGRAMS $wine_binary-preloader" ;; diff --git a/loader/preloader.c b/loader/preloader.c index 5e6add7..5068a60 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -455,6 +455,110 @@ SYSCALL_NOERR( wld_geteuid, 107 /* SYS_geteuid */ ); gid_t wld_getegid(void); SYSCALL_NOERR( wld_getegid, 108 /* SYS_getegid */ ); +#elif defined(__aarch64__) + +/* + * The _start function is the entry and exit point of this program + * + * It calls wld_start, passing a pointer to the args it receives + * then jumps to the address wld_start returns. + */ +void _start(void); +extern char _end[]; +__ASM_GLOBAL_FUNC(_start, + "mov x0, SP\n\t" + "sub SP, SP, #144\n\t" /* allocate some space for extra aux values */ + "str x0, [SP]\n\t" /* orig stack pointer */ + "str x30, [SP, #8]\n\t" + "mov x0, SP\n\t" /* ptr to orig stack pointer */ + "bl wld_start\n\t" + "ldr x30, [SP, #8]\n\t" + "ldr x1, [SP]\n\t" /* new stack pointer */ + "mov SP, x1\n\t" + "mov x30, x0\n\t" + "mov x0, #0\n\t" + "mov x1, #0\n\t" + "mov x2, #0\n\t" + "mov x3, #0\n\t" + "mov x4, #0\n\t" + "mov x5, #0\n\t" + "mov x6, #0\n\t" + "mov x7, #0\n\t" + "mov x8, #0\n\t" + "mov x9, #0\n\t" + "mov x10, #0\n\t" + "mov x11, #0\n\t" + "mov x12, #0\n\t" + "mov x13, #0\n\t" + "mov x14, #0\n\t" + "mov x15, #0\n\t" + "mov x16, #0\n\t" + "mov x17, #0\n\t" + "mov x18, #0\n\t" + "ret") + +#define SYSCALL_FUNC( name, nr ) \ + __ASM_GLOBAL_FUNC( name, \ + "stp x8, x9, [SP, #-16]!\n\t" \ + "mov x8, #" #nr "\n\t" \ + "svc #0\n\t" \ + "ldp x8, x9, [SP], #16\n\t" \ + "cmn x0, #1, lsl#12\n\t" \ + "cinv x0, x0, hi\n\t" \ + "b.hi 1f\n\t" \ + "ret\n\t" \ + "1: mov x0, #-1\n\t" \ + "ret" ) + +#define SYSCALL_NOERR( name, nr ) \ + __ASM_GLOBAL_FUNC( name, \ + "stp x8, x9, [SP, #-16]!\n\t" \ + "mov x8, #" #nr "\n\t" \ + "svc #0\n\t" \ + "ldp x8, x9, [SP], #16\n\t" \ + "ret" ) + +void wld_exit( int code ) __attribute__((noreturn)); +SYSCALL_NOERR( wld_exit, 93 /* SYS_exit */ ); + +ssize_t wld_read( int fd, void *buffer, size_t len ); +SYSCALL_FUNC( wld_read, 63 /* SYS_read */ ); + +ssize_t wld_write( int fd, const void *buffer, size_t len ); +SYSCALL_FUNC( wld_write, 64 /* SYS_write */ ); + +int wld_openat( int dirfd, const char *name, int flags ); +SYSCALL_FUNC( wld_openat, 56 /* SYS_openat */ ); + +int wld_open( const char *name, int flags ) +{ + return wld_openat(-100 /* AT_FDCWD */, name, flags); +} + +int wld_close( int fd ); +SYSCALL_FUNC( wld_close, 57 /* SYS_close */ ); + +void *wld_mmap( void *start, size_t len, int prot, int flags, int fd, off_t offset ); +SYSCALL_FUNC( wld_mmap, 222 /* SYS_mmap */ ); + +int wld_mprotect( const void *addr, size_t len, int prot ); +SYSCALL_FUNC( wld_mprotect, 226 /* SYS_mprotect */ ); + +int wld_prctl( int code, long arg ); +SYSCALL_FUNC( wld_prctl, 167 /* SYS_prctl */ ); + +uid_t wld_getuid(void); +SYSCALL_NOERR( wld_getuid, 174 /* SYS_getuid */ ); + +gid_t wld_getgid(void); +SYSCALL_NOERR( wld_getgid, 176 /* SYS_getgid */ ); + +uid_t wld_geteuid(void); +SYSCALL_NOERR( wld_geteuid, 175 /* SYS_geteuid */ ); + +gid_t wld_getegid(void); +SYSCALL_NOERR( wld_getegid, 177 /* SYS_getegid */ ); + #else #error preloader not implemented for this CPU #endif @@ -725,6 +829,9 @@ static void map_so_lib( const char *name, struct wld_link_map *l) #elif defined(__x86_64__) if( header->e_machine != EM_X86_64 ) fatal_error("%s: not an x86-64 ELF binary... don't know how to load it\n", name ); +#elif defined(__aarch64__) + if( header->e_machine != EM_AARCH64 ) + fatal_error("%s: not an aarchs64 ELF binary... don't know how to load it\n", name ); #endif if (header->e_phnum > sizeof(loadcmds)/sizeof(loadcmds[0]))

1 0

Zebediah Figura : mfplat/tests: Skip MFTRegister() tests if permissions are too low.
by Alexandre Julliard 25 Oct '17

25 Oct '17

Module: wine Branch: master Commit: 87b41b7369ba2fcd8bd6ad91ee06acbfdc86fc12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87b41b7369ba2fcd8bd6ad91e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 24 16:13:55 2017 -0500 mfplat/tests: Skip MFTRegister() tests if permissions are too low. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 13853c5..f85b00c 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -73,9 +73,12 @@ static void test_register(void) HRESULT ret; ret = MFTRegister(DUMMY_CLSID, MFT_CATEGORY_OTHER, name, 0, 1, input, 1, output, NULL); - ok(ret == S_OK, "Failed to register dummy filter: %x\n", ret); - if (FAILED(ret)) + if (ret == E_ACCESSDENIED) + { + win_skip("Not enough permissions to register a filter\n"); return; + } + ok(ret == S_OK, "Failed to register dummy filter: %x\n", ret); if(0) {

1 0

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

25 Oct '17

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: Store condition intermediate values in union.
by Alexandre Julliard 25 Oct '17

25 Oct '17

Module: wine Branch: master Commit: dcd92a168b349dcbb4c3f5a9e38bfe716f978911 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcd92a168b349dcbb4c3f5a9e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 24 15:02:56 2017 +0200 msi: Store condition intermediate values in union. 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 | 232 ++++++++++++++++++++++++++------------------------------ 1 file changed, 109 insertions(+), 123 deletions(-) diff --git a/dlls/msi/cond.y b/dlls/msi/cond.y index 8bdaf84..712050c 100644 --- a/dlls/msi/cond.y +++ b/dlls/msi/cond.y @@ -58,6 +58,18 @@ struct cond_str { INT len; }; +struct value { + enum value_type { + VALUE_INTEGER, + VALUE_LITERAL, + VALUE_SYMBOL + } type; + union { + INT integer; + WCHAR *string; + } u; +}; + static LPWSTR COND_GetString( COND_input *info, const struct cond_str *str ); static LPWSTR COND_GetLiteral( COND_input *info, const struct cond_str *str ); static int cond_lex( void *COND_lval, COND_input *info); @@ -70,16 +82,6 @@ static void cond_free( void *ptr ); static INT compare_int( INT a, INT operator, INT b ); static INT compare_string( LPCWSTR a, INT operator, LPCWSTR b, BOOL convert ); -static INT compare_and_free_strings( LPWSTR a, INT op, LPWSTR b, BOOL convert ) -{ - INT r; - - r = compare_string( a, op, b, convert ); - cond_free( a ); - cond_free( b ); - return r; -} - static BOOL num_from_prop( LPCWSTR p, INT *val ) { INT ret = 0, sign = 1; @@ -104,6 +106,12 @@ static BOOL num_from_prop( LPCWSTR p, INT *val ) return TRUE; } +static void value_free( struct value val ) +{ + if (val.type != VALUE_INTEGER) + cond_free( val.u.string ); +} + %} %lex-param { COND_input *info } @@ -113,8 +121,7 @@ static BOOL num_from_prop( LPCWSTR p, INT *val ) %union { struct cond_str str; - LPWSTR string; - INT value; + struct value value; LPWSTR identifier; INT operator; BOOL bool; @@ -132,8 +139,7 @@ static BOOL num_from_prop( LPCWSTR p, INT *val ) %nonassoc COND_ERROR COND_EOF %type <bool> expression boolean_term boolean_factor -%type <value> value_i -%type <string> symbol_s value_s literal +%type <value> value %type <identifier> identifier %type <operator> operator @@ -189,64 +195,50 @@ boolean_term: boolean_factor: COND_NOT boolean_factor { - $$ = $2 ? 0 : 1; - } - | value_i - { - $$ = $1 ? 1 : 0; + $$ = !$2; } - | value_s + | value { - $$ = ($1 && $1[0]) ? 1 : 0; - cond_free( $1 ); - } - | value_i operator value_i - { - $$ = compare_int( $1, $2, $3 ); - } - | symbol_s operator value_i - { - int num; - if (num_from_prop( $1, &num )) - $$ = compare_int( num, $2, $3 ); - else - $$ = ($2 == COND_NE || $2 == COND_INE ); - cond_free( $1 ); - } - | value_i operator symbol_s - { - int num; - if (num_from_prop( $3, &num )) - $$ = compare_int( $1, $2, num ); - else - $$ = ($2 == COND_NE || $2 == COND_INE ); - cond_free( $3 ); - } - | symbol_s operator symbol_s - { - $$ = compare_and_free_strings( $1, $2, $3, TRUE ); - } - | symbol_s operator literal - { - $$ = compare_and_free_strings( $1, $2, $3, TRUE ); - } - | literal operator symbol_s - { - $$ = compare_and_free_strings( $1, $2, $3, TRUE ); - } - | literal operator literal - { - $$ = compare_and_free_strings( $1, $2, $3, FALSE ); - } - | literal operator value_i - { - $$ = 0; - cond_free( $1 ); + if ($1.type == VALUE_INTEGER) + $$ = $1.u.integer ? 1 : 0; + else + $$ = $1.u.string && $1.u.string[0]; + value_free( $1 ); } - | value_i operator literal + | value operator value { - $$ = 0; - cond_free( $3 ); + if ($1.type == VALUE_INTEGER && $3.type == VALUE_INTEGER) + { + $$ = compare_int($1.u.integer, $2, $3.u.integer); + } + else if ($1.type != VALUE_INTEGER && $3.type != VALUE_INTEGER) + { + $$ = compare_string($1.u.string, $2, $3.u.string, + $1.type == VALUE_SYMBOL || $3.type == VALUE_SYMBOL); + } + else if ($1.type == VALUE_LITERAL || $3.type == VALUE_LITERAL) + { + $$ = FALSE; + } + else if ($1.type == VALUE_SYMBOL) /* symbol operator integer */ + { + int num; + if (num_from_prop( $1.u.string, &num )) + $$ = compare_int( num, $2, $3.u.integer ); + else + $$ = ($2 == COND_NE || $2 == COND_INE ); + } + else /* integer operator symbol */ + { + int num; + if (num_from_prop( $3.u.string, &num )) + $$ = compare_int( $1.u.integer, $2, num ); + else + $$ = ($2 == COND_NE || $2 == COND_INE ); + } + + value_free( $1 ); + value_free( $3 ); } | COND_LPAR expression COND_RPAR { @@ -276,35 +268,52 @@ operator: | COND_IRHS { $$ = COND_IRHS; } ; -value_s: - symbol_s - { - $$ = $1; - } - | literal - { - $$ = $1; - } - ; +value: + identifier + { + COND_input* cond = (COND_input*) info; + UINT len; -literal: - COND_LITER + $$.type = VALUE_SYMBOL; + $$.u.string = msi_dup_property( cond->package->db, $1 ); + if ($$.u.string) + { + len = (lstrlenW($$.u.string) + 1) * sizeof (WCHAR); + $$.u.string = cond_track_mem( cond, $$.u.string, len ); + } + cond_free( $1 ); + } + | COND_PERCENT identifier { COND_input* cond = (COND_input*) info; - $$ = COND_GetLiteral( cond, &$1 ); - if( !$$ ) + UINT len = GetEnvironmentVariableW( $2, NULL, 0 ); + $$.type = VALUE_SYMBOL; + $$.u.string = NULL; + if (len++) + { + $$.u.string = cond_alloc( cond, len*sizeof (WCHAR) ); + if( !$$.u.string ) + YYABORT; + GetEnvironmentVariableW( $2, $$.u.string, len ); + } + cond_free( $2 ); + } + | COND_LITER + { + COND_input* cond = (COND_input*) info; + $$.type = VALUE_LITERAL; + $$.u.string = COND_GetLiteral( cond, &$1 ); + if( !$$.u.string ) YYABORT; } - ; - -value_i: - COND_NUMBER + | COND_NUMBER { COND_input* cond = (COND_input*) info; LPWSTR szNum = COND_GetString( cond, &$1 ); if( !szNum ) YYABORT; - $$ = atoiW( szNum ); + $$.type = VALUE_INTEGER; + $$.u.integer = atoiW( szNum ); cond_free( szNum ); } | COND_DOLLARS identifier @@ -313,7 +322,8 @@ value_i: INSTALLSTATE install = INSTALLSTATE_UNKNOWN, action = INSTALLSTATE_UNKNOWN; MSI_GetComponentStateW(cond->package, $2, &install, &action ); - $$ = action; + $$.type = VALUE_INTEGER; + $$.u.integer = action; cond_free( $2 ); } | COND_QUESTION identifier @@ -321,8 +331,9 @@ value_i: COND_input* cond = (COND_input*) info; INSTALLSTATE install = INSTALLSTATE_UNKNOWN, action = INSTALLSTATE_UNKNOWN; - MSI_GetComponentStateW(cond->package, $2, &install, &action ); - $$ = install; + MSI_GetComponentStateW(cond->package, $2, &install, &action );\ + $$.type = VALUE_INTEGER; + $$.u.integer = install; cond_free( $2 ); } | COND_AMPER identifier @@ -334,10 +345,14 @@ value_i: { FIXME("condition may be evaluated incorrectly\n"); /* we should return empty string in this case */ - $$ = MSICONDITION_FALSE; + $$.type = VALUE_INTEGER; + $$.u.integer = MSICONDITION_FALSE; } else - $$ = action; + { + $$.type = VALUE_INTEGER; + $$.u.integer = action; + } cond_free( $2 ); } @@ -347,37 +362,8 @@ value_i: INSTALLSTATE install = INSTALLSTATE_UNKNOWN, action = INSTALLSTATE_UNKNOWN; MSI_GetFeatureStateW(cond->package, $2, &install, &action ); - $$ = install; - cond_free( $2 ); - } - ; - -symbol_s: - identifier - { - COND_input* cond = (COND_input*) info; - UINT len; - - $$ = msi_dup_property( cond->package->db, $1 ); - if ($$) - { - len = (lstrlenW($$) + 1) * sizeof (WCHAR); - $$ = cond_track_mem( cond, $$, len ); - } - cond_free( $1 ); - } - | COND_PERCENT identifier - { - COND_input* cond = (COND_input*) info; - UINT len = GetEnvironmentVariableW( $2, NULL, 0 ); - $$ = NULL; - if (len++) - { - $$ = cond_alloc( cond, len*sizeof (WCHAR) ); - if( !$$ ) - YYABORT; - GetEnvironmentVariableW( $2, $$, len ); - } + $$.type = VALUE_INTEGER; + $$.u.integer = install; cond_free( $2 ); } ;

1 0

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

25 Oct '17

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