wine-commits March 2018

wine-commits@winehq.org

2 participants
785 discussions

Alexandre Julliard : ntdll: Check the namespace in RtlQueryActivationContextApplicationSettings.
by Alexandre Julliard 27 Mar '18

27 Mar '18

Module: wine Branch: master Commit: e46259fb823f55aa331381fe56916d20049d52f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e46259fb823f55aa331381fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 27 12:10:53 2018 +0200 ntdll: Check the namespace in RtlQueryActivationContextApplicationSettings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 832d3d8..7e3aec4 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -486,6 +486,7 @@ struct entity { WCHAR *name; WCHAR *value; + WCHAR *ns; } settings; } u; }; @@ -954,6 +955,7 @@ static void free_entity_array(struct entity_array *array) case ACTIVATION_CONTEXT_SECTION_APPLICATION_SETTINGS: RtlFreeHeap(GetProcessHeap(), 0, entity->u.settings.name); RtlFreeHeap(GetProcessHeap(), 0, entity->u.settings.value); + RtlFreeHeap(GetProcessHeap(), 0, entity->u.settings.ns); break; default: FIXME("Unknown entity kind %d\n", entity->kind); @@ -2441,6 +2443,7 @@ static void parse_settings_elem( xmlbuf_t *xmlbuf, struct assembly *assembly, st } entity->u.settings.name = xmlstrdupW( &parent->name ); entity->u.settings.value = xmlstrdupW( &content ); + entity->u.settings.ns = xmlstrdupW( &parent->ns ); while (next_xml_elem(xmlbuf, &elem, parent)) { @@ -4891,7 +4894,7 @@ static NTSTATUS find_guid(ACTIVATION_CONTEXT* actctx, ULONG section_kind, return STATUS_SUCCESS; } -static const WCHAR *find_app_settings( ACTIVATION_CONTEXT *actctx, const WCHAR *settings ) +static const WCHAR *find_app_settings( ACTIVATION_CONTEXT *actctx, const WCHAR *settings, const WCHAR *ns ) { unsigned int i, j; @@ -4902,7 +4905,8 @@ static const WCHAR *find_app_settings( ACTIVATION_CONTEXT *actctx, const WCHAR * { struct entity *entity = &assembly->entities.base[j]; if (entity->kind == ACTIVATION_CONTEXT_SECTION_APPLICATION_SETTINGS && - !strcmpW( entity->u.settings.name, settings )) + !strcmpW( entity->u.settings.name, settings ) && + !strcmpW( entity->u.settings.ns, ns )) return entity->u.settings.value; } } @@ -5551,7 +5555,6 @@ NTSTATUS WINAPI RtlQueryActivationContextApplicationSettings( DWORD flags, HANDL const WCHAR *settings, WCHAR *buffer, SIZE_T size, SIZE_T *written ) { - static const WCHAR namespaceW[] = {'h','t','t','p',':','/','/','s','c','h','e','m','a','s','.','m','i','c','r','o','s','o','f','t','.','c','o','m','/','S','M','I','/','2','0',0}; ACTIVATION_CONTEXT *actctx = check_actctx( handle ); const WCHAR *res; @@ -5561,16 +5564,20 @@ NTSTATUS WINAPI RtlQueryActivationContextApplicationSettings( DWORD flags, HANDL return STATUS_INVALID_PARAMETER; } - if (ns && strncmpW( ns, namespaceW, strlenW(namespaceW) )) + if (ns) { - WARN( "unknown namespace %s\n", debugstr_w(ns) ); - return STATUS_INVALID_PARAMETER; + if (strcmpW( ns, windowsSettings2005NSW ) && + strcmpW( ns, windowsSettings2011NSW ) && + strcmpW( ns, windowsSettings2016NSW ) && + strcmpW( ns, windowsSettings2017NSW )) + return STATUS_INVALID_PARAMETER; } + else ns = windowsSettings2005NSW; if (!handle) handle = process_actctx; if (!(actctx = check_actctx( handle ))) return STATUS_INVALID_PARAMETER; - if (!(res = find_app_settings( actctx, settings ))) return STATUS_SXS_KEY_NOT_FOUND; + if (!(res = find_app_settings( actctx, settings, ns ))) return STATUS_SXS_KEY_NOT_FOUND; if (written) *written = strlenW(res) + 1; if (size < strlenW(res)) return STATUS_BUFFER_TOO_SMALL;

1 0

Alexandre Julliard : ntdll: Add support for XML namespaces in manifest parser.
by Alexandre Julliard 27 Mar '18

27 Mar '18

Module: wine Branch: master Commit: ab3debb2b000c428758867f35c568b5f3b813b41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab3debb2b000c428758867f3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 27 12:10:53 2018 +0200 ntdll: Add support for XML namespaces in manifest parser. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 211 ++++++++++++++++++++++++++++++++++------------------ 1 file changed, 140 insertions(+), 71 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ab3debb2b000c4287588…

1 0

Alexandre Julliard : ntdll: Store the namespace separately from the XML element name.
by Alexandre Julliard 27 Mar '18

27 Mar '18

Module: wine Branch: master Commit: 1aaaecba46525b7834f965f700ddd3caa7dedbfb URL: https://source.winehq.org/git/wine.git/?a=commit;h=1aaaecba46525b7834f965f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 26 21:02:07 2018 +0200 ntdll: Store the namespace separately from the XML element name. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 66 ++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 48 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 75e2e52..bae615b 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -102,6 +102,7 @@ typedef struct struct xml_elem { xmlstr_t name; + xmlstr_t ns; }; struct xml_attr @@ -561,6 +562,8 @@ struct actctx_loader unsigned int allocated_dependencies; }; +static const xmlstr_t empty_xmlstr; + static const WCHAR asmv1W[] = {'a','s','m','v','1',':',0}; static const WCHAR asmv2W[] = {'a','s','m','v','2',':',0}; static const WCHAR asmv3W[] = {'a','s','m','v','3',':',0}; @@ -746,13 +749,19 @@ static BOOL xml_attr_cmp( const struct xml_attr *attr, const WCHAR *str ) return xmlstr_cmp( &attr->name, str ); } -static inline BOOL xml_elem_cmp(const struct xml_elem *elem, const WCHAR *str, const WCHAR *namespace) +static BOOL xml_name_cmp( const struct xml_elem *elem1, const struct xml_elem *elem2 ) { - UINT len = strlenW( namespace ); + return (elem1->name.len == elem2->name.len && + elem1->ns.len == elem2->ns.len && + !strncmpW( elem1->name.ptr, elem2->name.ptr, elem1->name.len ) && + !strncmpW( elem1->ns.ptr, elem2->ns.ptr, elem1->ns.len )); +} - if (!strncmpW(elem->name.ptr, str, elem->name.len) && !str[elem->name.len]) return TRUE; - return (elem->name.len > len && !strncmpW(elem->name.ptr, namespace, len) && - !strncmpW(elem->name.ptr + len, str, elem->name.len - len) && !str[elem->name.len - len]); +static inline BOOL xml_elem_cmp(const struct xml_elem *elem, const WCHAR *str, const WCHAR *namespace) +{ + return (!strncmpW(elem->name.ptr, str, elem->name.len) && !str[elem->name.len] && + (!elem->ns.len || + (!strncmpW(elem->ns.ptr, namespace, elem->ns.len) && namespace[elem->ns.len] == ':'))); } static inline BOOL isxmlspace( WCHAR ch ) @@ -767,7 +776,8 @@ static inline const char* debugstr_xmlstr(const xmlstr_t* str) static inline const char *debugstr_xml_elem( const struct xml_elem *elem ) { - return wine_dbg_sprintf( "%s", debugstr_wn( elem->name.ptr, elem->name.len )); + return wine_dbg_sprintf( "%s ns %s", debugstr_wn( elem->name.ptr, elem->name.len ), + debugstr_wn( elem->ns.ptr, elem->ns.len )); } static inline const char *debugstr_xml_attr( const struct xml_attr *attr ) @@ -1232,6 +1242,26 @@ static BOOL next_xml_attr(xmlbuf_t *xmlbuf, struct xml_attr *attr, BOOL *end) return set_error( xmlbuf ); } +static void read_xml_elem( xmlbuf_t *xmlbuf, struct xml_elem *elem ) +{ + const WCHAR* ptr = xmlbuf->ptr; + + elem->ns = empty_xmlstr; + elem->name.ptr = ptr; + while (ptr < xmlbuf->end && !isxmlspace(*ptr) && *ptr != '>' && *ptr != '/') + { + if (*ptr == ':') + { + elem->ns.ptr = elem->name.ptr; + elem->ns.len = ptr - elem->ns.ptr; + elem->name.ptr = ptr + 1; + } + ptr++; + } + elem->name.len = ptr - elem->name.ptr; + xmlbuf->ptr = ptr; +} + static BOOL next_xml_elem( xmlbuf_t *xmlbuf, struct xml_elem *elem, const struct xml_elem *parent ) { const WCHAR* ptr; @@ -1263,23 +1293,23 @@ static BOOL next_xml_elem( xmlbuf_t *xmlbuf, struct xml_elem *elem, const struct } xmlbuf->ptr = ptr; - while (ptr < xmlbuf->end && !isxmlspace(*ptr) && *ptr != '>' && (*ptr != '/' || ptr == xmlbuf->ptr)) - ptr++; - /* check for element terminating the parent element */ - if (*xmlbuf->ptr == '/' && - ptr - xmlbuf->ptr == parent->name.len + 1 && - !strncmpW( xmlbuf->ptr + 1, parent->name.ptr, parent->name.len )) + if (ptr < xmlbuf->end && *ptr == '/') { - while (ptr < xmlbuf->end && isxmlspace(*ptr)) ptr++; - if (ptr == xmlbuf->end || *ptr != '>') return set_error( xmlbuf ); - xmlbuf->ptr = ptr + 1; + xmlbuf->ptr++; + read_xml_elem( xmlbuf, elem ); + if (!xml_name_cmp( elem, parent )) + { + ERR( "wrong closing element %s for %s\n", + debugstr_xmlstr(&elem->name), debugstr_xmlstr(&parent->name )); + return set_error( xmlbuf ); + } + while (xmlbuf->ptr < xmlbuf->end && isxmlspace(*xmlbuf->ptr)) xmlbuf->ptr++; + if (xmlbuf->ptr == xmlbuf->end || *xmlbuf->ptr++ != '>') return set_error( xmlbuf ); return FALSE; } - elem->name.ptr = xmlbuf->ptr; - elem->name.len = ptr - xmlbuf->ptr; - xmlbuf->ptr = ptr; + read_xml_elem( xmlbuf, elem ); if (xmlbuf->ptr != xmlbuf->end) return TRUE; return set_error( xmlbuf );

1 0

Alexandre Julliard : ntdll: Check for closing element directly in next_xml_elem().
by Alexandre Julliard 27 Mar '18

27 Mar '18

Module: wine Branch: master Commit: 7a349d8d87b89c3ba0c1d478682539f1aca63a5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a349d8d87b89c3ba0c1d478… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 26 19:39:26 2018 +0200 ntdll: Check for closing element directly in next_xml_elem(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 426 +++++++++++++++++++--------------------------------- 1 file changed, 156 insertions(+), 270 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7a349d8d87b89c3ba0c1…

1 0

Alexandre Julliard : ntdll: Propagate the error through the XML buffer in manifest parser.
by Alexandre Julliard 27 Mar '18

27 Mar '18

Module: wine Branch: master Commit: 7b871727e5cbb8581167acbaae2f4e34dc4ee59e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b871727e5cbb8581167acba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 26 17:36:35 2018 +0200 ntdll: Propagate the error through the XML buffer in manifest parser. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 682 +++++++++++++++++++++++++--------------------------- 1 file changed, 331 insertions(+), 351 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7b871727e5cbb8581167…

1 0

Alexandre Julliard : ntdll: Add separate types for XML elements and attributes in manifest parser.
by Alexandre Julliard 27 Mar '18

27 Mar '18

Module: wine Branch: master Commit: 8cf404ddd24965a4f90fd27f315febaed39f9606 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8cf404ddd24965a4f90fd27f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 26 15:55:12 2018 +0200 ntdll: Add separate types for XML elements and attributes in manifest parser. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 565 ++++++++++++++++++++++++++++------------------------ 1 file changed, 300 insertions(+), 265 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8cf404ddd24965a4f90f…

1 0

Alistair Leslie-Hughes : ntoskrnl.exe: Implement _chkstk.
by Alexandre Julliard 27 Mar '18

27 Mar '18

Module: wine Branch: master Commit: 075cbd34747390720e4b28be6b105b1a026c2844 URL: https://source.winehq.org/git/wine.git/?a=commit;h=075cbd34747390720e4b28be… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Mar 26 22:58:55 2018 +0000 ntoskrnl.exe: Implement _chkstk. These are just copied from ntdll. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 30 ++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 ++ 2 files changed, 32 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index d8277a9..e3d72ba 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3373,3 +3373,33 @@ INT __cdecl NTOSKRNL_wcsncmp( LPCWSTR str1, LPCWSTR str2, INT n ) { return strncmpW( str1, str2, n ); } + + +#ifdef __x86_64__ +/************************************************************************** + * __chkstk (NTOSKRNL.@) + * + * Supposed to touch all the stack pages, but we shouldn't need that. + */ +__ASM_GLOBAL_FUNC( __chkstk, "ret" ); + +#elif defined(__i386__) +/************************************************************************** + * _chkstk (NTOSKRNL.@) + */ +__ASM_STDCALL_FUNC( _chkstk, 0, + "negl %eax\n\t" + "addl %esp,%eax\n\t" + "xchgl %esp,%eax\n\t" + "movl 0(%eax),%eax\n\t" /* copy return address from old location */ + "movl %eax,0(%esp)\n\t" + "ret" ) +#elif defined(__arm__) +/************************************************************************** + * __chkstk (NTDLL.@) + * + * Incoming r4 contains words to allocate, converting to bytes then return + */ +__ASM_GLOBAL_FUNC( __chkstk, "lsl r4, r4, #2\n\t" + "bx lr" ) +#endif diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index dca1404..26afa6f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1401,6 +1401,7 @@ @ stdcall -private ZwWaitForSingleObject(long long ptr) NtWaitForSingleObject @ stdcall -private ZwWriteFile(long long ptr ptr ptr ptr long ptr ptr) NtWriteFile @ stdcall -private ZwYieldExecution() NtYieldExecution +@ stdcall -private -arch=arm,x86_64 -norelay __chkstk() @ cdecl -private -arch=i386 _CIcos() msvcrt._CIcos @ cdecl -private -arch=i386 _CIsin() msvcrt._CIsin @ cdecl -private -arch=i386 _CIsqrt() msvcrt._CIsqrt @@ -1416,6 +1417,7 @@ @ stub _aulldvrm @ stdcall -private -arch=i386 -ret64 _aullrem(int64 int64) @ stdcall -private -arch=i386 -ret64 _aullshr(int64 long) +@ stdcall -private -arch=i386 -norelay _chkstk() @ cdecl -private -arch=i386 _except_handler2(ptr ptr ptr ptr) msvcrt._except_handler2 @ cdecl -private -arch=i386 _except_handler3(ptr ptr ptr ptr) msvcrt._except_handler3 @ cdecl -private -arch=i386 _global_unwind2(ptr) msvcrt._global_unwind2

1 0

Zebediah Figura : ntdll/tests: Test DEP exceptions on x86-64.
by Alexandre Julliard 27 Mar '18

27 Mar '18

Module: wine Branch: master Commit: f63474b6d582113db838f73d406b4a90e2526088 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f63474b6d582113db838f73d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 26 18:57:33 2018 -0500 ntdll/tests: Test DEP exceptions on x86-64. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 54 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 46e2a30..b3592e6 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -2426,6 +2426,59 @@ static void test_prot_fault(void) } } +static LONG CALLBACK dpe_handler(EXCEPTION_POINTERS *info) +{ + EXCEPTION_RECORD *rec = info->ExceptionRecord; + DWORD old_prot; + + trace("vect. handler %08x addr:%p\n", rec->ExceptionCode, rec->ExceptionAddress); + + got_exception++; + + ok(rec->ExceptionCode == EXCEPTION_ACCESS_VIOLATION, + "got %#x\n", rec->ExceptionCode); + ok(rec->NumberParameters == 2, "got %u params\n", rec->NumberParameters); + ok(rec->ExceptionInformation[0] == EXCEPTION_EXECUTE_FAULT, + "got %#lx\n", rec->ExceptionInformation[0]); + ok((void *)rec->ExceptionInformation[1] == code_mem, + "got %p\n", (void *)rec->ExceptionInformation[1]); + + VirtualProtect(code_mem, 1, PAGE_EXECUTE_READWRITE, &old_prot); + + return EXCEPTION_CONTINUE_EXECUTION; +} + +static void test_dpe_exceptions(void) +{ + static const BYTE ret[] = {0xc3}; + DWORD (CDECL *func)(void) = code_mem; + DWORD old_prot; + void *handler; + + memcpy(code_mem, ret, sizeof(ret)); + + handler = pRtlAddVectoredExceptionHandler(TRUE, &dpe_handler); + ok(!!handler, "RtlAddVectoredExceptionHandler failed\n"); + + VirtualProtect(code_mem, 1, PAGE_NOACCESS, &old_prot); + + got_exception = 0; + func(); + ok(got_exception == 1, "got %u exceptions\n", got_exception); + + VirtualProtect(code_mem, 1, old_prot, &old_prot); + + VirtualProtect(code_mem, 1, PAGE_READWRITE, &old_prot); + + got_exception = 0; + func(); + ok(got_exception == 1, "got %u exceptions\n", got_exception); + + VirtualProtect(code_mem, 1, old_prot, &old_prot); + + pRtlRemoveVectoredExceptionHandler(handler); +} + #endif /* __x86_64__ */ #if defined(__i386__) || defined(__x86_64__) @@ -3021,6 +3074,7 @@ START_TEST(exception) test___C_specific_handler(); test_restore_context(); test_prot_fault(); + test_dpe_exceptions(); if (pRtlAddFunctionTable && pRtlDeleteFunctionTable && pRtlInstallFunctionTableCallback && pRtlLookupFunctionEntry) test_dynamic_unwind();

1 0

Sebastian Lackner : ntdll: Set proper ExceptionInformation[0] for x86_64 exceptions.
by Alexandre Julliard 27 Mar '18

27 Mar '18

Module: wine Branch: master Commit: 19a3bb27256611bea77aba70fc7561eba48b7325 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19a3bb27256611bea77aba70… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Mar 26 18:57:32 2018 -0500 ntdll: Set proper ExceptionInformation[0] for x86_64 exceptions. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index efbcc6e..952b1a4 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2884,7 +2884,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) case TRAP_x86_PAGEFLT: /* Page fault */ rec->ExceptionCode = EXCEPTION_ACCESS_VIOLATION; rec->NumberParameters = 2; - rec->ExceptionInformation[0] = (ERROR_sig(ucontext) & 2) != 0; + rec->ExceptionInformation[0] = (ERROR_sig(ucontext) >> 1) & 0x09; rec->ExceptionInformation[1] = (ULONG_PTR)siginfo->si_addr; break; case TRAP_x86_ALIGNFLT: /* Alignment check exception */

1 0

Francois Gouget : testbot/web: Tweak VMsList::OnItemAction() to save the Item directly.
by Alexandre Julliard 27 Mar '18

27 Mar '18

Module: tools Branch: master Commit: 0343615675704471f9745b5a123c953b72319e64 URL: https://source.winehq.org/git/tools.git/?a=commit;h=0343615675704471f9745b5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 27 03:45:37 2018 +0200 testbot/web: Tweak VMsList::OnItemAction() to save the Item directly. OnItemAction() is called on each selected Item and should only operate on the specified Item rather than blindly saving all the Items in the Collection. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/admin/VMsList.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/admin/VMsList.pl b/testbot/web/admin/VMsList.pl index 652fc8e..500442b 100644 --- a/testbot/web/admin/VMsList.pl +++ b/testbot/web/admin/VMsList.pl @@ -58,7 +58,7 @@ sub OnItemAction($$$$) if ($Action eq "Delete") { $Item->Role("deleted"); - my ($ErrKey, $ErrProperty, $ErrMessage) = $self->{Collection}->Save(); + my ($ErrProperty, $ErrMessage) = $Item->Save(); return ! defined($ErrMessage); }

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2018