wine-commits November 2021

wine-commits@winehq.org

2 participants
951 discussions

Alex Henrie : include: Add featurestagingapi.h.
by Alexandre Julliard 25 Nov '21

25 Nov '21

Module: wine Branch: master Commit: 35d6f414add91a35fa69f63f83c4b97c2cad0b80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=35d6f414add91a35fa69f63f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Nov 21 22:02:55 2021 -0700 include: Add featurestagingapi.h. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/featurestagingapi.h | 49 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 756e25dcc82..acb55b37f6c 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -302,6 +302,7 @@ SOURCES = \ exposeenums2managed.h \ fci.h \ fdi.h \ + featurestagingapi.h \ fileapi.h \ filter.idl \ fltdefs.h \ diff --git a/include/featurestagingapi.h b/include/featurestagingapi.h new file mode 100644 index 00000000000..9a9237eb13c --- /dev/null +++ b/include/featurestagingapi.h @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2021 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _FEATURESTAGINGAPI_H_ +#define _FEATURESTAGINGAPI_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +DECLARE_HANDLE(FEATURE_STATE_CHANGE_SUBSCRIPTION); + +typedef void WINAPI FEATURE_STATE_CHANGE_CALLBACK(void*); + +typedef enum FEATURE_CHANGE_TIME +{ + FEATURE_CHANGE_TIME_READ, + FEATURE_CHANGE_TIME_MODULE_RELOAD, + FEATURE_CHANGE_TIME_SESSION, + FEATURE_CHANGE_TIME_REBOOT +} FEATURE_CHANGE_TIME; + +typedef enum FEATURE_ENABLED_STATE +{ + FEATURE_ENABLED_STATE_DEFAULT, + FEATURE_ENABLED_STATE_DISABLED, + FEATURE_ENABLED_STATE_ENABLED +} FEATURE_ENABLED_STATE; + +#ifdef __cplusplus +} +#endif + +#endif

1 0

Jactry Zeng : comsvcs: Stub ISharedPropertyGroupManager interface.
by Alexandre Julliard 25 Nov '21

25 Nov '21

Module: wine Branch: master Commit: 5d4022a85f632609a309b120ad6b71907c4e1f34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d4022a85f632609a309b120… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Thu Nov 25 00:20:45 2021 -0600 comsvcs: Stub ISharedPropertyGroupManager interface. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comsvcs/Makefile.in | 3 +- dlls/comsvcs/comsvcs_private.h | 34 +++++++++ dlls/comsvcs/main.c | 25 ++++--- dlls/comsvcs/property.c | 166 +++++++++++++++++++++++++++++++++++++++++ dlls/comsvcs/tests/Makefile.in | 3 +- dlls/comsvcs/tests/property.c | 115 ++++++++++++++++++++++++++++ 6 files changed, 335 insertions(+), 11 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5d4022a85f632609a309…

1 0

Jactry Zeng : include: Add ISharedPropertyGroupManager interface.
by Alexandre Julliard 25 Nov '21

25 Nov '21

Module: wine Branch: master Commit: bfd2c040142f6d4aed97e3f94a1144f060659186 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfd2c040142f6d4aed97e3f9… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Thu Nov 25 00:20:44 2021 -0600 include: Add ISharedPropertyGroupManager interface. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/comsvcs.idl | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/include/comsvcs.idl b/include/comsvcs.idl index d64af1f5a85..902c78b05c8 100644 --- a/include/comsvcs.idl +++ b/include/comsvcs.idl @@ -37,6 +37,8 @@ typedef DWORD_PTR TRANSID; ] library COMSVCSLib { + importlib("stdole2.tlb"); + [ object, hidden, @@ -96,4 +98,65 @@ library COMSVCSLib { [default] interface IDispenserManager; }; + + [ + object, + hidden, + local, + uuid(2a005c01-a5de-11cf-9e66-00aa00a3f464), + pointer_default(unique) + ] + interface ISharedProperty : IDispatch + { + [id(DISPID_VALUE), propget] HRESULT Value([out, retval] VARIANT *value); + [id(DISPID_VALUE), propput] HRESULT Value([in] VARIANT value); + } + + [ + object, + hidden, + local, + uuid(2a005c07-a5de-11cf-9e66-00aa00a3f464), + pointer_default(unique) + ] + interface ISharedPropertyGroup : IDispatch + { + [id(0x00000001)] + HRESULT CreatePropertyByPosition([in] int index, [out] VARIANT_BOOL *exists, [out, retval] ISharedProperty **property); + [id(0x00000002), propget] + HRESULT PropertyByPosition([in] int index, [out, retval] ISharedProperty **property); + [id(0x00000003)] + HRESULT CreateProperty([in] BSTR name, [out] VARIANT_BOOL *exists, [out, retval] ISharedProperty **property); + [id(0x00000004), propget] + HRESULT Property([in] BSTR name, [out, retval] ISharedProperty **property); + } + + [ + object, + hidden, + local, + uuid(2a005c0d-a5de-11cf-9e66-00aa00a3f464), + pointer_default(unique) + ] + interface ISharedPropertyGroupManager : IDispatch + { + [id(0x00000001)] + HRESULT CreatePropertyGroup([in] BSTR name, [in, out] LONG *isolation, [in, out] LONG *release, + [out] VARIANT_BOOL *exists, [out, retval] ISharedPropertyGroup **group); + [id(0x00000002), propget] + HRESULT Group([in] BSTR name, [out, retval] ISharedPropertyGroup **group); + [id(DISPID_NEWENUM), propget] + HRESULT _NewEnum([out, retval] IUnknown **retval); + } + + [ + uuid(2a005c11-a5de-11cf-9e66-00aa00a3f464), + progid("MTxSpm.SharedPropertyGroupManager.1"), + vi_progid("MTxSpm.SharedPropertyGroupManager"), + threading(both) + ] + coclass SharedPropertyGroupManager + { + [default] interface ISharedPropertyGroupManager; + } }

1 0

Jinoh Kang : server: Implement the \??\GLOBALROOT symbolic link.
by Alexandre Julliard 25 Nov '21

25 Nov '21

Module: wine Branch: master Commit: 3b375843165c731448cbb141a3a38ff52c3d01bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b375843165c731448cbb141… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Thu Nov 25 01:29:29 2021 +0900 server: Implement the \??\GLOBALROOT symbolic link. \??\GLOBALROOT is a well-known NT symbolic link that allows applications to access the NT object manager's root namespace via Win32 APIs. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++ server/directory.c | 3 +++ server/object.h | 2 ++ server/symlink.c | 13 ++++++++++++ 4 files changed, 77 insertions(+) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 77eb58a23b5..250984ebdda 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -2388,6 +2388,64 @@ static void test_get_next_thread(void) CloseHandle(thread); } +static void test_globalroot(void) +{ + NTSTATUS status; + IO_STATUS_BLOCK iosb; + UNICODE_STRING str; + OBJECT_ATTRIBUTES attr; + HANDLE h; + WCHAR buffer[256]; + ULONG len, full_len, i; + static const struct { const WCHAR *name, *target; } symlinks[] = { + { L"\\??\\GLOBALROOT", L"" }, + { L"\\??\\GLOBALROOT\\??\\GLOBALROOT", L"" }, + { L"\\??\\GLOBALROOT\\??\\GLOBALROOT\\??\\GLOBALROOT", L"" }, + { L"\\??\\GLOBALROOT\\DosDevices", L"\\??" }, + { L"\\??\\GLOBALROOT\\BaseNamedObjects\\Global", NULL }, + }; + + for (i = 0; i < ARRAY_SIZE(symlinks); i++) + { + pRtlInitUnicodeString(&str, symlinks[i].name); + InitializeObjectAttributes(&attr, &str, 0, 0, NULL); + status = pNtOpenSymbolicLinkObject( &h, SYMBOLIC_LINK_QUERY, &attr ); + ok(status == STATUS_SUCCESS, "NtOpenSymbolicLinkObject failed %08x\n", status); + + str.Buffer = buffer; + str.MaximumLength = sizeof(buffer); + len = 0xdeadbeef; + memset( buffer, 0xaa, sizeof(buffer) ); + status = pNtQuerySymbolicLinkObject( h, &str, &len); + ok( status == STATUS_SUCCESS, "NtQuerySymbolicLinkObject failed %08x\n", status ); + full_len = str.Length + sizeof(WCHAR); + ok( len == full_len, "bad length %u (expected %u)\n", len, full_len ); + ok( buffer[len / sizeof(WCHAR) - 1] == 0, "no terminating null\n" ); + + if (symlinks[i].target) + { + ok( compare_unicode_string( &str, symlinks[i].target ), + "symlink %s: target expected %s, got %s\n", + debugstr_w( symlinks[i].name ), + debugstr_w( symlinks[i].target ), + debugstr_w( str.Buffer ) ); + } + + pNtClose(h); + } + + pRtlInitUnicodeString(&str, L"\\??\\GLOBALROOT\\Device\\Null"); + InitializeObjectAttributes(&attr, &str, OBJ_CASE_INSENSITIVE, 0, NULL); + status = pNtOpenFile(&h, GENERIC_READ | GENERIC_WRITE, &attr, &iosb, + FILE_SHARE_READ | FILE_SHARE_WRITE, 0); + ok(status == STATUS_SUCCESS, + "expected STATUS_SUCCESS, got %08x\n", status); + + test_object_type(h, L"File"); + + pNtClose(h); +} + START_TEST(om) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -2446,4 +2504,5 @@ START_TEST(om) test_duplicate_object(); test_object_types(); test_get_next_thread(); + test_globalroot(); } diff --git a/server/directory.c b/server/directory.c index 70a34d3f1bb..2cd61be0838 100644 --- a/server/directory.c +++ b/server/directory.c @@ -378,6 +378,7 @@ void init_directories( struct fd *intl_fd ) /* symlinks */ static const WCHAR link_dosdevW[] = {'D','o','s','D','e','v','i','c','e','s'}; + static const WCHAR link_globalrootW[] = {'G','L','O','B','A','L','R','O','O','T'}; static const WCHAR link_globalW[] = {'G','l','o','b','a','l'}; static const WCHAR link_nulW[] = {'N','U','L'}; static const WCHAR link_pipeW[] = {'P','I','P','E'}; @@ -392,6 +393,7 @@ void init_directories( struct fd *intl_fd ) static const WCHAR link_consoleW[] = {'\\','D','e','v','i','c','e','\\','C','o','n','D','r','v', '\\','C','o','n','s','o','l','e'}; static const struct unicode_str link_dosdev_str = {link_dosdevW, sizeof(link_dosdevW)}; + static const struct unicode_str link_globalroot_str = {link_globalrootW, sizeof(link_globalrootW)}; static const struct unicode_str link_global_str = {link_globalW, sizeof(link_globalW)}; static const struct unicode_str link_nul_str = {link_nulW, sizeof(link_nulW)}; static const struct unicode_str link_pipe_str = {link_pipeW, sizeof(link_pipeW)}; @@ -470,6 +472,7 @@ void init_directories( struct fd *intl_fd ) /* symlinks */ release_object( create_obj_symlink( &root_directory->obj, &link_dosdev_str, OBJ_PERMANENT, &dir_global->obj, NULL )); + release_object( create_root_symlink( &dir_global->obj, &link_globalroot_str, OBJ_PERMANENT, NULL )); release_object( create_obj_symlink( &dir_global->obj, &link_global_str, OBJ_PERMANENT, &dir_global->obj, NULL )); release_object( create_obj_symlink( &dir_global->obj, &link_nul_str, OBJ_PERMANENT, null_device, NULL )); release_object( create_obj_symlink( &dir_global->obj, &link_pipe_str, OBJ_PERMANENT, named_pipe_device, NULL )); diff --git a/server/object.h b/server/object.h index 97d6c0e91f8..f156f1d2f13 100644 --- a/server/object.h +++ b/server/object.h @@ -279,6 +279,8 @@ extern void init_directories( struct fd *intl_fd ); /* symbolic link functions */ +extern struct object *create_root_symlink( struct object *root, const struct unicode_str *name, + unsigned int attr, const struct security_descriptor *sd ); extern struct object *create_obj_symlink( struct object *root, const struct unicode_str *name, unsigned int attr, struct object *target, const struct security_descriptor *sd ); diff --git a/server/symlink.c b/server/symlink.c index fa97d9155fa..27d48e2f994 100644 --- a/server/symlink.c +++ b/server/symlink.c @@ -110,6 +110,8 @@ static struct object *symlink_lookup_name( struct object *obj, struct unicode_st if (!name->len && (attr & OBJ_OPENLINK)) return NULL; if (obj == root) return NULL; + if (!symlink->len) return get_root_directory(); + target_str.str = symlink->target; target_str.len = symlink->len; if ((target = lookup_named_object( NULL, &target_str, attr, &name_left ))) @@ -131,6 +133,17 @@ static void symlink_destroy( struct object *obj ) free( symlink->target ); } +struct object *create_root_symlink( struct object *root, const struct unicode_str *name, + unsigned int attr, const struct security_descriptor *sd ) +{ + struct symlink *symlink; + + if (!(symlink = create_named_object( root, &symlink_ops, name, attr, sd ))) return NULL; + symlink->target = NULL; + symlink->len = 0; + return &symlink->obj; +} + struct object *create_symlink( struct object *root, const struct unicode_str *name, unsigned int attr, const struct unicode_str *target, const struct security_descriptor *sd )

1 0

Jinoh Kang : ntdll: Save/restore FPU context in arm64 signal handlers.
by Alexandre Julliard 25 Nov '21

25 Nov '21

Module: wine Branch: master Commit: 9f0df41a6cc594c2cbffe2205e3d969d62bc5b85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f0df41a6cc594c2cbffe220… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Wed Nov 24 17:33:12 2021 +0900 ntdll: Save/restore FPU context in arm64 signal handlers. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51996 Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm64.c | 115 +++++++++++++++++++++++------------------ 1 file changed, 65 insertions(+), 50 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index a52e9bccc49..680a14223c6 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -84,7 +84,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(seh); # define FP_sig(context) REGn_sig(29, context) /* Frame pointer */ # define LR_sig(context) REGn_sig(30, context) /* Link Register */ -static struct _aarch64_ctx *get_extended_sigcontext( ucontext_t *sigcontext, unsigned int magic ) +static struct _aarch64_ctx *get_extended_sigcontext( const ucontext_t *sigcontext, unsigned int magic ) { struct _aarch64_ctx *ctx = (struct _aarch64_ctx *)sigcontext->uc_mcontext.__reserved; while ((char *)ctx < (char *)(&sigcontext->uc_mcontext + 1) && ctx->magic && ctx->size) @@ -95,7 +95,7 @@ static struct _aarch64_ctx *get_extended_sigcontext( ucontext_t *sigcontext, uns return NULL; } -static struct fpsimd_context *get_fpsimd_context( ucontext_t *sigcontext ) +static struct fpsimd_context *get_fpsimd_context( const ucontext_t *sigcontext ) { return (struct fpsimd_context *)get_extended_sigcontext( sigcontext, FPSIMD_MAGIC ); } @@ -324,50 +324,12 @@ NTSTATUS CDECL unwind_builtin_dll( ULONG type, DISPATCHER_CONTEXT *dispatch, CON } -/*********************************************************************** - * save_context - * - * Set the register values from a sigcontext. - */ -static void save_context( CONTEXT *context, const ucontext_t *sigcontext ) -{ - DWORD i; - - context->ContextFlags = (CONTEXT_FULL & ~CONTEXT_FLOATING_POINT) | - CONTEXT_ARM64; - context->u.s.Fp = FP_sig(sigcontext); /* Frame pointer */ - context->u.s.Lr = LR_sig(sigcontext); /* Link register */ - context->Sp = SP_sig(sigcontext); /* Stack pointer */ - context->Pc = PC_sig(sigcontext); /* Program Counter */ - context->Cpsr = PSTATE_sig(sigcontext); /* Current State Register */ - for (i = 0; i <= 28; i++) context->u.X[i] = REGn_sig( i, sigcontext ); -} - - -/*********************************************************************** - * restore_context - * - * Build a sigcontext from the register values. - */ -static void restore_context( const CONTEXT *context, ucontext_t *sigcontext ) -{ - DWORD i; - - FP_sig(sigcontext) = context->u.s.Fp; /* Frame pointer */ - LR_sig(sigcontext) = context->u.s.Lr; /* Link register */ - SP_sig(sigcontext) = context->Sp; /* Stack pointer */ - PC_sig(sigcontext) = context->Pc; /* Program Counter */ - PSTATE_sig(sigcontext) = context->Cpsr; /* Current State Register */ - for (i = 0; i <= 28; i++) REGn_sig( i, sigcontext ) = context->u.X[i]; -} - - /*********************************************************************** * save_fpu * * Set the FPU context from a sigcontext. */ -static void save_fpu( CONTEXT *context, ucontext_t *sigcontext ) +static void save_fpu( CONTEXT *context, const ucontext_t *sigcontext ) { #ifdef linux struct fpsimd_context *fp = get_fpsimd_context( sigcontext ); @@ -391,23 +353,62 @@ static void save_fpu( CONTEXT *context, ucontext_t *sigcontext ) * * Restore the FPU context to a sigcontext. */ -static void restore_fpu( struct syscall_frame *frame, ucontext_t *sigcontext ) +static void restore_fpu( const CONTEXT *context, ucontext_t *sigcontext ) { #ifdef linux struct fpsimd_context *fp = get_fpsimd_context( sigcontext ); if (!fp) return; - fp->fpcr = frame->fpcr; - fp->fpsr = frame->fpsr; - memcpy( fp->vregs, frame->v, sizeof(fp->vregs) ); + fp->fpcr = context->Fpcr; + fp->fpsr = context->Fpsr; + memcpy( fp->vregs, context->V, sizeof(fp->vregs) ); #elif defined(__APPLE__) - sigcontext->uc_mcontext->__ns.__fpcr = frame->fpcr; - sigcontext->uc_mcontext->__ns.__fpsr = frame->fpsr; - memcpy( sigcontext->uc_mcontext->__ns.__v, frame->v, sizeof(frame->v) ); + sigcontext->uc_mcontext->__ns.__fpcr = context->Fpcr; + sigcontext->uc_mcontext->__ns.__fpsr = context->Fpsr; + memcpy( sigcontext->uc_mcontext->__ns.__v, context->V, sizeof(context->v) ); #endif } +/*********************************************************************** + * save_context + * + * Set the register values from a sigcontext. + */ +static void save_context( CONTEXT *context, const ucontext_t *sigcontext ) +{ + DWORD i; + + context->ContextFlags = CONTEXT_FULL; + context->u.s.Fp = FP_sig(sigcontext); /* Frame pointer */ + context->u.s.Lr = LR_sig(sigcontext); /* Link register */ + context->Sp = SP_sig(sigcontext); /* Stack pointer */ + context->Pc = PC_sig(sigcontext); /* Program Counter */ + context->Cpsr = PSTATE_sig(sigcontext); /* Current State Register */ + for (i = 0; i <= 28; i++) context->u.X[i] = REGn_sig( i, sigcontext ); + save_fpu( context, sigcontext ); +} + + +/*********************************************************************** + * restore_context + * + * Build a sigcontext from the register values. + */ +static void restore_context( const CONTEXT *context, ucontext_t *sigcontext ) +{ + DWORD i; + + FP_sig(sigcontext) = context->u.s.Fp; /* Frame pointer */ + LR_sig(sigcontext) = context->u.s.Lr; /* Link register */ + SP_sig(sigcontext) = context->Sp; /* Stack pointer */ + PC_sig(sigcontext) = context->Pc; /* Program Counter */ + PSTATE_sig(sigcontext) = context->Cpsr; /* Current State Register */ + for (i = 0; i <= 28; i++) REGn_sig( i, sigcontext ) = context->u.X[i]; + restore_fpu( context, sigcontext ); +} + + /*********************************************************************** * signal_set_full_context */ @@ -632,7 +633,6 @@ static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) rec->ExceptionAddress = (void *)PC_sig(sigcontext); save_context( &context, sigcontext ); - save_fpu( &context, sigcontext ); status = send_debug_event( rec, &context, TRUE ); if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED) @@ -1056,7 +1056,22 @@ static void usr2_handler( int signal, siginfo_t *siginfo, void *sigcontext ) PC_sig(context) = frame->pc; PSTATE_sig(context) = frame->cpsr; for (i = 0; i <= 28; i++) REGn_sig( i, context ) = frame->x[i]; - restore_fpu( frame, context ); + +#ifdef linux + { + struct fpsimd_context *fp = get_fpsimd_context( sigcontext ); + if (fp) + { + fp->fpcr = frame->fpcr; + fp->fpsr = frame->fpsr; + memcpy( fp->vregs, frame->v, sizeof(fp->vregs) ); + } + } +#elif defined(__APPLE__) + sigcontext->uc_mcontext->__ns.__fpcr = frame->fpcr; + sigcontext->uc_mcontext->__ns.__fpsr = frame->fpsr; + memcpy( sigcontext->uc_mcontext->__ns.__v, frame->v, sizeof(frame->v) ); +#endif }

1 0

Paul Gofman : ntdll: Fix context arch flag cleanup for AMD64 in context_from_server().
by Alexandre Julliard 25 Nov '21

25 Nov '21

Module: wine Branch: master Commit: 6747ecdefdc2565c3fb4732170883c3fe01a0a06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6747ecdefdc2565c3fb47321… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Nov 24 18:06:39 2021 +0300 ntdll: Fix context arch flag cleanup for AMD64 in context_from_server(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/thread.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 38a03bd4b60..00261edb593 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -755,7 +755,7 @@ static NTSTATUS context_from_server( void *dst, const context_t *from, USHORT ma { AMD64_CONTEXT *to = dst; - to_flags = to->ContextFlags & ~CONTEXT_i386; + to_flags = to->ContextFlags & ~CONTEXT_AMD64; if ((from->flags & SERVER_CTX_CONTROL) && (to_flags & CONTEXT_AMD64_CONTROL)) { to->ContextFlags |= CONTEXT_AMD64_CONTROL; @@ -830,7 +830,7 @@ static NTSTATUS context_from_server( void *dst, const context_t *from, USHORT ma { AMD64_CONTEXT *to = dst; - to_flags = to->ContextFlags & ~CONTEXT_i386; + to_flags = to->ContextFlags & ~CONTEXT_AMD64; if ((from->flags & SERVER_CTX_CONTROL) && (to_flags & CONTEXT_AMD64_CONTROL)) { to->ContextFlags |= CONTEXT_AMD64_CONTROL;

1 0

Gabriel Ivăncescu : mshtml: Handle VT_DISPATCH in variant_to_nsstr.
by Alexandre Julliard 25 Nov '21

25 Nov '21

Module: wine Branch: master Commit: f1958583acfc61a0a8ba977fb29ed008b8dbeae8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1958583acfc61a0a8ba977f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Nov 25 21:01:48 2021 +0100 mshtml: Handle VT_DISPATCH in variant_to_nsstr. Some javascript libraries such as prototype.js use this (by setting to an array) to examine setAttribute quirks. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsembed.c | 3 +- dlls/mshtml/tests/documentmode.js | 77 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 4224d6a2ac4..25ad92d5ddf 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1013,7 +1013,8 @@ HRESULT variant_to_nsstr(VARIANT *v, BOOL hex_int, nsAString *nsstr) nsAString_Init(nsstr, buf); break; - case VT_R8: { + case VT_R8: + case VT_DISPATCH: { VARIANT strv; HRESULT hres; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 041025c8032..08fcde4ff75 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -1088,6 +1088,72 @@ sync_test("elem_attr", function() { r = elem.getAttribute("className"); ok(r === "cls3", "className attr = " + r); + var arr = [3]; + elem.setAttribute("testattr", arr); + r = elem.getAttribute("testattr"); + ok(r === (v < 8 ? arr : "3"), "testattr = " + r); + todo_wine_if(v === 8). + ok(elem.testattr === (v < 9 ? arr : undefined), "elem.testattr = " + elem.testattr); + r = elem.removeAttribute("testattr"); + ok(r === (v < 9 ? true : undefined), "testattr removeAttribute returned " + r); + ok(elem.testattr === undefined, "removed testattr = " + elem.testattr); + + arr[0] = 9; + elem.setAttribute("testattr", "string"); + elem.testattr = arr; + r = elem.getAttribute("testattr"); + todo_wine_if(v === 8). + ok(r === (v < 8 ? arr : (v < 9 ? "9" : "string")), "testattr = " + r); + ok(elem.testattr === arr, "elem.testattr = " + elem.testattr); + arr[0] = 3; + r = elem.getAttribute("testattr"); + todo_wine_if(v === 8). + ok(r === (v < 8 ? arr : (v < 9 ? "3" : "string")), "testattr = " + r); + ok(elem.testattr === arr, "elem.testattr = " + elem.testattr); + r = elem.removeAttribute("testattr"); + ok(r === (v < 9 ? true : undefined), "testattr removeAttribute returned " + r); + todo_wine_if(v === 8). + ok(elem.testattr === (v < 9 ? undefined : arr), "removed testattr = " + elem.testattr); + + arr.toString = function() { return 42; } + elem.testattr = arr; + r = elem.getAttribute("testattr"); + todo_wine_if(v === 8). + ok(r === (v < 8 ? arr : (v < 9 ? "42" : null)), "testattr with custom toString = " + r); + elem.setAttribute("testattr", arr); + r = elem.getAttribute("testattr"); + ok(r === (v < 8 ? arr : "42"), "testattr after setAttribute with custom toString = " + r); + ok(elem.testattr === arr, "elem.testattr after setAttribute with custom toString = " + elem.testattr); + r = elem.removeAttribute("testattr"); + ok(r === (v < 9 ? true : undefined), "testattr removeAttribute with custom toString returned " + r); + todo_wine_if(v === 8). + ok(elem.testattr === (v < 9 ? undefined : arr), "removed testattr with custom toString = " + elem.testattr); + + arr.valueOf = function() { return "arrval"; } + elem.testattr = arr; + r = elem.getAttribute("testattr"); + todo_wine_if(v === 8). + ok(r === (v < 8 ? arr : (v < 9 ? "arrval" : null)), "testattr with custom valueOf = " + r); + elem.setAttribute("testattr", arr); + r = elem.getAttribute("testattr"); + todo_wine_if(v >= 10). + ok(r === (v < 8 ? arr : (v < 10 ? "arrval" : "42")), "testattr after setAttribute with custom valueOf = " + r); + ok(elem.testattr === arr, "elem.testattr after setAttribute with custom valueOf = " + elem.testattr); + r = elem.removeAttribute("testattr"); + ok(r === (v < 9 ? true : undefined), "testattr removeAttribute with custom valueOf returned " + r); + todo_wine_if(v === 8). + ok(elem.testattr === (v < 9 ? undefined : arr), "removed testattr with custom valueOf = " + elem.testattr); + delete arr.valueOf; + delete arr.toString; + + elem.setAttribute("id", arr); + r = elem.getAttribute("id"); + todo_wine_if(v >= 8 && v < 10). + ok(r === (v < 8 || v >= 10 ? "3" : "[object]"), "id = " + r); + r = elem.removeAttribute("id"); + ok(r === (v < 9 ? true : undefined), "id removeAttribute returned " + r); + ok(elem.id === "", "removed id = " + elem.id); + var func = function() { }; elem.onclick = func; ok(elem.onclick === func, "onclick = " + elem.onclick); @@ -1136,6 +1202,17 @@ sync_test("elem_attr", function() { todo_wine_if(v >= 8). ok(elem.onclick === null, "removed onclick = " + elem.onclick); + elem.setAttribute("ondblclick", arr); + r = elem.getAttribute("ondblclick"); + todo_wine_if(v >= 8 && v < 10). + ok(r === (v < 8 ? arr : (v < 10 ? "[object]" : "3")), "ondblclick = " + r); + r = elem.removeAttribute("ondblclick"); + ok(r === (v < 8 ? false : (v < 9 ? true : undefined)), "ondblclick removeAttribute returned " + r); + r = Object.prototype.toString.call(elem.ondblclick); + todo_wine_if(v >= 9). + ok(r === (v < 8 ? "[object Array]" : (v < 9 ? "[object Object]" : (v < 11 ? "[object Null]" : "[object Function]"))), + "removed ondblclick Object.toString returned " + r); + elem.setAttribute("ondblclick", "string"); r = elem.getAttribute("ondblclick"); ok(r === "string", "ondblclick string = " + r);

1 0

Gabriel Ivăncescu : jscript: Replace the value_prop in builtin_info with a call method.
by Alexandre Julliard 25 Nov '21

25 Nov '21

Module: wine Branch: master Commit: ce1b3f5f1d8a83d819b24a49ebb4f6a86bf7cdc0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce1b3f5f1d8a83d819b24a49… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Nov 25 21:01:37 2021 +0100 jscript: Replace the value_prop in builtin_info with a call method. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/array.c | 15 +++------------ dlls/jscript/bool.c | 4 ++-- dlls/jscript/date.c | 13 +++---------- dlls/jscript/dispex.c | 6 +++--- dlls/jscript/enumerator.c | 6 +++--- dlls/jscript/error.c | 4 ++-- dlls/jscript/function.c | 6 +++--- dlls/jscript/global.c | 2 +- dlls/jscript/jscript.c | 2 +- dlls/jscript/jscript.h | 3 +-- dlls/jscript/json.c | 2 +- dlls/jscript/jsregexp.c | 6 +++--- dlls/jscript/math.c | 2 +- dlls/jscript/number.c | 14 ++------------ dlls/jscript/object.c | 20 +++----------------- dlls/jscript/set.c | 8 ++++---- dlls/jscript/string.c | 16 +++------------- dlls/jscript/vbarray.c | 2 +- 18 files changed, 40 insertions(+), 91 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ce1b3f5f1d8a83d819b2…

1 0

Gabriel Ivăncescu : jscript: Get rid of the value_prop from jsdisp props.
by Alexandre Julliard 25 Nov '21

25 Nov '21

Module: wine Branch: master Commit: adad45504938b2b94d6d742fb63ae00433667e28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=adad45504938b2b94d6d742f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Nov 25 21:01:28 2021 +0100 jscript: Get rid of the value_prop from jsdisp props. The mapping between DISPID and index into props has to be adjusted since the value_prop (props[0]) is now gone. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 89 +++++++++++++++++++++++++-------------------------- 1 file changed, 43 insertions(+), 46 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index a00e36b9654..555dd1335b3 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -80,16 +80,19 @@ static void fix_protref_prop(jsdisp_t *jsdisp, dispex_prop_t *prop) static inline DISPID prop_to_id(jsdisp_t *This, dispex_prop_t *prop) { - return prop - This->props; + /* don't overlap with DISPID_VALUE */ + return prop - This->props + 1; } static inline dispex_prop_t *get_prop(jsdisp_t *This, DISPID id) { - if(id < 0 || id >= This->prop_cnt) + DWORD idx = id - 1; + + if(idx >= This->prop_cnt) return NULL; - fix_protref_prop(This, &This->props[id]); + fix_protref_prop(This, &This->props[idx]); - return This->props[id].type == PROP_DELETED ? NULL : &This->props[id]; + return This->props[idx].type == PROP_DELETED ? NULL : &This->props[idx]; } static inline BOOL is_function_prop(dispex_prop_t *prop) @@ -189,7 +192,7 @@ static inline HRESULT resize_props(jsdisp_t *This) This->props[i].bucket_next = ~0; } - for(i=1; i<This->prop_cnt; i++) { + for(i=0; i<This->prop_cnt; i++) { props = This->props+i; bucket = get_props_idx(This, props->hash); @@ -547,26 +550,22 @@ static HRESULT invoke_prop_func(jsdisp_t *This, IDispatch *jsthis, dispex_prop_t switch(prop->type) { case PROP_BUILTIN: { + vdisp_t vthis; + if(flags == DISPATCH_CONSTRUCT && (prop->flags & PROPF_METHOD)) { WARN("%s is not a constructor\n", debugstr_w(prop->name)); return E_INVALIDARG; } - if(prop->name || This->builtin_info->class != JSCLASS_FUNCTION) { - vdisp_t vthis; + if(This->builtin_info->class != JSCLASS_FUNCTION && prop->u.p->invoke != JSGlobal_eval) + flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK; + if(jsthis) + set_disp(&vthis, jsthis); + else + set_jsdisp(&vthis, This); + hres = prop->u.p->invoke(This->ctx, &vthis, flags, argc, argv, r); + vdisp_release(&vthis); - if(This->builtin_info->class != JSCLASS_FUNCTION && prop->u.p->invoke != JSGlobal_eval) - flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK; - if(jsthis) - set_disp(&vthis, jsthis); - else - set_jsdisp(&vthis, This); - hres = prop->u.p->invoke(This->ctx, &vthis, flags, argc, argv, r); - vdisp_release(&vthis); - }else { - /* Function object calls are special case */ - hres = Function_invoke(This, jsthis, flags, argc, argv, r); - } return hres; } case PROP_PROTREF: @@ -629,8 +628,6 @@ static HRESULT fill_protrefs(jsdisp_t *This) fill_protrefs(This->prototype); for(iter = This->prototype->props; iter < This->prototype->props+This->prototype->prop_cnt; iter++) { - if(!iter->name) - continue; hres = find_prop_name(This, iter->hash, iter->name, &prop); if(FAILED(hres)) return hres; @@ -1422,7 +1419,7 @@ static HRESULT WINAPI DispatchEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, LC for (prop = This->props, end = prop + This->prop_cnt; prop != end; prop++) { - if (!prop->name || prop->type != PROP_JSVAL || !(prop->flags & PROPF_ENUMERABLE)) + if (prop->type != PROP_JSVAL || !(prop->flags & PROPF_ENUMERABLE)) continue; /* If two identifiers differ only by case, the TypeInfo fails */ @@ -1477,7 +1474,7 @@ static HRESULT WINAPI DispatchEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, LC typevar = typeinfo->vars; for (prop = This->props; prop != end; prop++) { - if (!prop->name || prop->type != PROP_JSVAL || !(prop->flags & PROPF_ENUMERABLE)) + if (prop->type != PROP_JSVAL || !(prop->flags & PROPF_ENUMERABLE)) continue; if (is_function_prop(prop)) @@ -1572,12 +1569,10 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc V_VT(pvarRes) = VT_EMPTY; prop = get_prop(This, id); - if(!prop || prop->type == PROP_DELETED) { + if(!prop && id != DISPID_VALUE) { TRACE("invalid id\n"); return DISP_E_MEMBERNOTFOUND; } - if(id == DISPID_VALUE && wFlags & (DISPATCH_PROPERTYGET | DISPATCH_PROPERTYPUT)) - prop = NULL; enter_script(This->ctx, &ei); @@ -1594,7 +1589,11 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc if(FAILED(hres)) break; - hres = invoke_prop_func(This, get_this(pdp), prop, wFlags, argc, argv, pvarRes ? &r : NULL, pspCaller); + if(prop) + hres = invoke_prop_func(This, get_this(pdp), prop, wFlags, argc, argv, pvarRes ? &r : NULL, pspCaller); + else + hres = jsdisp_call_value(This, get_this(pdp), wFlags, argc, argv, pvarRes ? &r : NULL); + if(argv != buf) heap_free(argv); if(SUCCEEDED(hres) && pvarRes) { @@ -1738,7 +1737,7 @@ static HRESULT WINAPI DispatchEx_GetMemberName(IDispatchEx *iface, DISPID id, BS TRACE("(%p)->(%x %p)\n", This, id, pbstrName); prop = get_prop(This, id); - if(!prop || !prop->name || prop->type == PROP_DELETED) + if(!prop) return DISP_E_MEMBERNOTFOUND; *pbstrName = SysAllocString(prop->name); @@ -1751,11 +1750,12 @@ static HRESULT WINAPI DispatchEx_GetMemberName(IDispatchEx *iface, DISPID id, BS static HRESULT WINAPI DispatchEx_GetNextDispID(IDispatchEx *iface, DWORD grfdex, DISPID id, DISPID *pid) { jsdisp_t *This = impl_from_IDispatchEx(iface); - HRESULT hres; + HRESULT hres = S_FALSE; TRACE("(%p)->(%x %x %p)\n", This, grfdex, id, pid); - hres = jsdisp_next_prop(This, id, JSDISP_ENUM_ALL, pid); + if(id != DISPID_VALUE) + hres = jsdisp_next_prop(This, id, JSDISP_ENUM_ALL, pid); if(hres == S_FALSE) *pid = DISPID_STARTENUM; return hres; @@ -1807,6 +1807,7 @@ HRESULT init_dispex(jsdisp_t *dispex, script_ctx_t *ctx, const builtin_info_t *b dispex->ref = 1; dispex->builtin_info = builtin_info; dispex->extensible = TRUE; + dispex->prop_cnt = 0; dispex->props = heap_alloc_zero(sizeof(dispex_prop_t)*(dispex->buf_size=4)); if(!dispex->props) @@ -1821,14 +1822,6 @@ HRESULT init_dispex(jsdisp_t *dispex, script_ctx_t *ctx, const builtin_info_t *b if(prototype) jsdisp_addref(prototype); - dispex->prop_cnt = 1; - if(builtin_info->value_prop.invoke || builtin_info->value_prop.getter) { - dispex->props[0].type = PROP_BUILTIN; - dispex->props[0].u.p = &builtin_info->value_prop; - }else { - dispex->props[0].type = PROP_DELETED; - } - script_addref(ctx); dispex->ctx = ctx; @@ -2446,19 +2439,23 @@ HRESULT disp_delete(IDispatch *disp, DISPID id, BOOL *ret) HRESULT jsdisp_next_prop(jsdisp_t *obj, DISPID id, enum jsdisp_enum_type enum_type, DISPID *ret) { dispex_prop_t *iter; + DWORD idx = id; HRESULT hres; - if(id == DISPID_STARTENUM && enum_type == JSDISP_ENUM_ALL) { - hres = fill_protrefs(obj); - if(FAILED(hres)) - return hres; + if(id == DISPID_STARTENUM) { + if (enum_type == JSDISP_ENUM_ALL) { + hres = fill_protrefs(obj); + if(FAILED(hres)) + return hres; + } + idx = 0; } - if(id + 1 < 0 || id+1 >= obj->prop_cnt) + if(idx >= obj->prop_cnt) return S_FALSE; - for(iter = &obj->props[id + 1]; iter < obj->props + obj->prop_cnt; iter++) { - if(!iter->name || iter->type == PROP_DELETED) + for(iter = &obj->props[idx]; iter < obj->props + obj->prop_cnt; iter++) { + if(iter->type == PROP_DELETED) continue; if(enum_type != JSDISP_ENUM_ALL && iter->type == PROP_PROTREF) continue; @@ -2765,7 +2762,7 @@ HRESULT jsdisp_get_prop_name(jsdisp_t *obj, DISPID id, jsstr_t **r) { dispex_prop_t *prop = get_prop(obj, id); - if(!prop || !prop->name || prop->type == PROP_DELETED) + if(!prop) return DISP_E_MEMBERNOTFOUND; *r = jsstr_alloc(prop->name);

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 25 Nov '21

25 Nov '21

Module: wine Branch: master Commit: c479cc30d88f3467aeb832a7b310342c92999830 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c479cc30d88f3467aeb832a7… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Thu Nov 25 20:31:25 2021 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/po/lt.po b/po/lt.po index 7877ceacc02..f89589f8edd 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-11-10 08:49+0200\n" +"PO-Revision-Date: 2021-11-25 20:31+0200\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -13223,13 +13223,11 @@ msgstr "" #: programs/chcp.com/chcp.rc:28 msgid "Active code page: %1!u!\n" -msgstr "" +msgstr "Aktyvi kodų lentelė: %1!u!\n" #: programs/chcp.com/chcp.rc:29 -#, fuzzy -#| msgid "Invalid message.\n" msgid "Invalid code page\n" -msgstr "Neteisingas pranešimas.\n" +msgstr "Neteisinga kodų lentelė\n" #: programs/chcp.com/chcp.rc:33 msgid "" @@ -13242,6 +13240,14 @@ msgid "" " Type CHCP without a number to display the active console code page.\n" "\n" msgstr "" +"CHCP [skaičius]\n" +"\n" +" Nustato ar parodo aktyvią pulto kodų lentelę.\n" +"\n" +" skaičius Pulto kodų lentelė aktyvavimui.\n" +"\n" +" Įveskite CHCP be skaičiaus aktyviai pulto kodų lentelei parodyti.\n" +"\n" #: programs/clock/clock.rc:32 msgid "Ana&log"

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
96
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 November 2021