November 2022 - Wine-commits

Alex Henrie : include: Add sdkddkver.h.
by Alexandre Julliard 07 Nov '22

07 Nov '22

Module: wine Branch: master Commit: bae772695e055ab1e3260eeddb06104448165f39 URL: https://gitlab.winehq.org/wine/wine/-/commit/bae772695e055ab1e3260eeddb0610… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Nov 6 20:20:03 2022 -0700 include: Add sdkddkver.h. Needed to compile Tera Term. --- include/Makefile.in | 1 + include/sdkddkver.h | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++ include/windows.h | 1 + 3 files changed, 84 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 6083fd2754d..0fc34cbdf7c 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -666,6 +666,7 @@ SOURCES = \ schemadef.h \ schnlsp.h \ sddl.h \ + sdkddkver.h \ secext.h \ security.h \ sensapi.h \ diff --git a/include/sdkddkver.h b/include/sdkddkver.h new file mode 100644 index 00000000000..baffe7a4a28 --- /dev/null +++ b/include/sdkddkver.h @@ -0,0 +1,82 @@ +/* + * Copyright 2022 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 _INC_SDKDDKVER +#define _INC_SDKDDKVER + +#define NTDDI_WIN2K 0x05000000 +#define NTDDI_WIN2KSP1 0x05000100 +#define NTDDI_WIN2KSP2 0x05000200 +#define NTDDI_WIN2KSP3 0x05000300 +#define NTDDI_WIN2KSP4 0x05000400 + +#define NTDDI_WINXP 0x05010000 +#define NTDDI_WINXPSP1 0x05010100 +#define NTDDI_WINXPSP2 0x05010200 +#define NTDDI_WINXPSP3 0x05010300 +#define NTDDI_WINXPSP4 0x05010400 + +#define NTDDI_WS03 0x05020000 +#define NTDDI_WS03SP1 0x05020100 +#define NTDDI_WS03SP2 0x05020200 +#define NTDDI_WS03SP3 0x05020300 +#define NTDDI_WS03SP4 0x05020400 + +#define NTDDI_LONGHORN 0x06000000 +#define NTDDI_VISTA 0x06000000 +#define NTDDI_WIN6 0x06000000 +#define NTDDI_VISTASP1 0x06000100 +#define NTDDI_WIN6SP1 0x06000100 +#define NTDDI_WS08 0x06000100 +#define NTDDI_VISTASP2 0x06000200 +#define NTDDI_WIN6SP2 0x06000200 +#define NTDDI_WS08SP2 0x06000200 +#define NTDDI_VISTASP3 0x06000300 +#define NTDDI_WIN6SP3 0x06000300 +#define NTDDI_WS08SP3 0x06000300 +#define NTDDI_VISTASP4 0x06000400 +#define NTDDI_WIN6SP4 0x06000400 +#define NTDDI_WS08SP4 0x06000400 + +#define NTDDI_WIN7 0x06010000 + +#define NTDDI_WIN8 0x06020000 + +#define NTDDI_WINBLUE 0x06030000 + +#define NTDDI_WINTHRESHOLD 0x0A000000 +#define NTDDI_WIN10 0x0A000000 +#define NTDDI_WIN10_TH2 0x0A000001 +#define NTDDI_WIN10_RS1 0x0A000002 +#define NTDDI_WIN10_RS2 0x0A000003 +#define NTDDI_WIN10_RS3 0x0A000004 +#define NTDDI_WIN10_RS4 0x0A000005 +#define NTDDI_WIN10_RS5 0x0A000006 +#define NTDDI_WIN10_19H1 0x0A000007 +#define NTDDI_WIN10_VB 0x0A000008 +#define NTDDI_WIN10_MN 0x0A000009 +#define NTDDI_WIN10_FE 0x0A00000A + +#define NTDDI_VERSION_FROM_WIN32_WINNT2(ver) ver##0000 +#define NTDDI_VERSION_FROM_WIN32_WINNT(ver) NTDDI_VERSION_FROM_WIN32_WINNT2(ver) + +#if !defined(NTDDI_VERSION) && defined(_WIN32_WINNT) +#define NTDDI_VERSION NTDDI_VERSION_FROM_WIN32_WINNT(_WIN32_WINNT) +#endif + +#endif /* _INC_SDKDDKVER */ diff --git a/include/windows.h b/include/windows.h index 47f13e395d2..19e1fd4fc49 100644 --- a/include/windows.h +++ b/include/windows.h @@ -33,6 +33,7 @@ /* All the basic includes */ #include <excpt.h> +#include <sdkddkver.h> #include <stdarg.h> #include <windef.h> #include <winbase.h>

1 0

Alexandre Julliard : msvcrt: Use WINAPIV calling convention for variadic functions.
by Alexandre Julliard 07 Nov '22

07 Nov '22

Module: wine Branch: master Commit: 89cad8c4b77c85bdfdc006ccfe02584b5043aba7 URL: https://gitlab.winehq.org/wine/wine/-/commit/89cad8c4b77c85bdfdc006ccfe0258… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 4 11:36:29 2022 +0100 msvcrt: Use WINAPIV calling convention for variadic functions. --- dlls/msvcr80/tests/msvcr80.c | 2 +- dlls/msvcr90/tests/msvcr90.c | 2 +- dlls/msvcrt/file.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr80/tests/msvcr80.c b/dlls/msvcr80/tests/msvcr80.c index 81f05a472e7..a2a3734f6c0 100644 --- a/dlls/msvcr80/tests/msvcr80.c +++ b/dlls/msvcr80/tests/msvcr80.c @@ -57,7 +57,7 @@ typedef struct static ioinfo **__pioinfo; -static int (__cdecl *p__open)(const char *, int, ...); +static int (WINAPIV *p__open)(const char *, int, ...); static int (__cdecl *p__close)(int); static intptr_t (__cdecl *p__get_osfhandle)(int); static int (__cdecl *p_strcmp)(const char *, const char *); diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index cf73097b818..0d28df217ab 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -111,7 +111,7 @@ static int (__cdecl *p_controlfp_s)(unsigned int *, unsigned int, unsigned int); static int (__cdecl *p_tmpfile_s)(FILE**); static int (__cdecl *p_atoflt)(_CRT_FLOAT *, char *); static unsigned int (__cdecl *p_set_abort_behavior)(unsigned int, unsigned int); -static int (__cdecl *p__open)(const char *, int, ...); +static int (WINAPIV *p__open)(const char *, int, ...); static int (__cdecl *p__close)(int); static intptr_t (__cdecl *p__get_osfhandle)(int); static int (__cdecl *p_sopen_s)(int*, const char*, int, int, int); diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 0874d52fbc4..4a8c3510bd7 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -5594,7 +5594,7 @@ int WINAPIV fprintf_s(FILE* file, const char *format, ...) /********************************************************************* * _fprintf_l (MSVCRT.@) */ -int CDECL _fprintf_l(FILE* file, const char *format, _locale_t locale, ...) +int WINAPIV _fprintf_l(FILE* file, const char *format, _locale_t locale, ...) { va_list valist; int res; @@ -5608,7 +5608,7 @@ int CDECL _fprintf_l(FILE* file, const char *format, _locale_t locale, ...) /********************************************************************* * _fprintf_p (MSVCRT.@) */ -int CDECL _fprintf_p(FILE* file, const char *format, ...) +int WINAPIV _fprintf_p(FILE* file, const char *format, ...) { va_list valist; int res; @@ -5621,7 +5621,7 @@ int CDECL _fprintf_p(FILE* file, const char *format, ...) /********************************************************************* * _fprintf_p_l (MSVCRT.@) */ -int CDECL _fprintf_p_l(FILE* file, const char *format, _locale_t locale, ...) +int WINAPIV _fprintf_p_l(FILE* file, const char *format, _locale_t locale, ...) { va_list valist; int res; @@ -5634,7 +5634,7 @@ int CDECL _fprintf_p_l(FILE* file, const char *format, _locale_t locale, ...) /********************************************************************* * _fprintf_s_l (MSVCRT.@) */ -int CDECL _fprintf_s_l(FILE* file, const char *format, _locale_t locale, ...) +int WINAPIV _fprintf_s_l(FILE* file, const char *format, _locale_t locale, ...) { va_list valist; int res;

1 0

Alexandre Julliard : xml2: Use WINAPIV calling convention for variadic functions.
by Alexandre Julliard 07 Nov '22

07 Nov '22

Module: wine Branch: master Commit: e742eeb6c37031ec4911c1749f4c12717b8fb9b2 URL: https://gitlab.winehq.org/wine/wine/-/commit/e742eeb6c37031ec4911c1749f4c12… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 4 21:17:42 2022 +0100 xml2: Use WINAPIV calling convention for variadic functions. --- libs/xml2/globals.c | 2 +- libs/xml2/include/libxml/xmlerror.h | 2 +- libs/xml2/include/libxml/xmlexports.h | 2 +- libs/xml2/include/libxml/xmlstring.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/xml2/globals.c b/libs/xml2/globals.c index 4d28fed8156..6d8e75175a6 100644 --- a/libs/xml2/globals.c +++ b/libs/xml2/globals.c @@ -827,7 +827,7 @@ int xmlThrDefDoValidityCheckingDefaultValue(int v) { } #undef xmlGenericError -xmlGenericErrorFunc * +xmlGenericErrorFunc * XMLCALL __xmlGenericError(void) { if (IS_MAIN_THREAD) return (&xmlGenericError); diff --git a/libs/xml2/include/libxml/xmlerror.h b/libs/xml2/include/libxml/xmlerror.h index ee95be9c9c2..97e463f0040 100644 --- a/libs/xml2/include/libxml/xmlerror.h +++ b/libs/xml2/include/libxml/xmlerror.h @@ -916,7 +916,7 @@ XMLPUBFUN int XMLCALL /* * Internal callback reporting routine */ -XMLPUBFUN void XMLCALL +XMLPUBFUN void XMLCDECL __xmlRaiseError (xmlStructuredErrorFunc schannel, xmlGenericErrorFunc channel, void *data, diff --git a/libs/xml2/include/libxml/xmlexports.h b/libs/xml2/include/libxml/xmlexports.h index 1fd7c5c5bf7..c81043cd26f 100644 --- a/libs/xml2/include/libxml/xmlexports.h +++ b/libs/xml2/include/libxml/xmlexports.h @@ -26,7 +26,7 @@ #else #define XMLCALL __cdecl #endif -#define XMLCDECL __cdecl +#define XMLCDECL WINAPIV /** DOC_ENABLE */ #else /* not Windows */ diff --git a/libs/xml2/include/libxml/xmlstring.h b/libs/xml2/include/libxml/xmlstring.h index 2d0b2d1668e..338c3845fae 100644 --- a/libs/xml2/include/libxml/xmlstring.h +++ b/libs/xml2/include/libxml/xmlstring.h @@ -94,7 +94,7 @@ XMLPUBFUN xmlChar * XMLCALL xmlStrncatNew (const xmlChar *str1, const xmlChar *str2, int len); -XMLPUBFUN int XMLCALL +XMLPUBFUN int XMLCDECL xmlStrPrintf (xmlChar *buf, int len, const char *msg,

1 0

Martin Storsjö : ntdll: Add ARM EHABI unwind instructions in assembly functions.
by Alexandre Julliard 07 Nov '22

07 Nov '22

Module: wine Branch: master Commit: f760976803346fb2308d4c3c9e6f8ad360e62dfd URL: https://gitlab.winehq.org/wine/wine/-/commit/f760976803346fb2308d4c3c9e6f8a… Author: Martin Storsjö <martin(a)martin.st> Date: Thu Oct 20 13:44:24 2022 +0300 ntdll: Add ARM EHABI unwind instructions in assembly functions. On most ELF platforms on ARM, ARM EHABI is the unwind info format normally used, instead of DWARF like on most other platforms. Currently, when unwinding through ELF objects with libunwind, the libraries don't have any .eh_frame section mapped at runtime (since DWARF isn't used for unwinding). Instead, what happens is that libunwind ends up loading .debug_frame from the libraries on disk instead. Therefore, currently, ELF unwinding relies on the .so files not being stripped. This patch adds the necessary EHABI unwinding instructions in the assembly functions that currently have DWARF CFI instructions. EHABI isn't signaled via any specific preprocessor macro, but is signaled by the absence of other unwind mechanisms (such as __ARM_DWARF_EH__ and __SEH__, or maybe SjLj). Mark the asm functions in the preloaders as .cantunwind, to avoid undefined references to __aeabi_unwind_cpp_pr* functions. Also mark other assembly functions as .cantunwind; for signal_exit_thread this is essential if the function is marked with .fnstart/.fnend - otherwise exiting threads does hang. (pthread_exit internally calls _Unwind_ForcedUnwind, which would hang if signal_exit_thread had .fnstart without any matching unwind info). This would, in principle, allow unwinding through these functions with libunwind, for versions of libunwind that can parse the EHABI unwind info - see e.g. https://github.com/libunwind/libunwind/commit/4d779f55c0d0a3814453517e54cd0…. (This commit isn't yet in any current release AFAIK). Unwinding with EHABI via libunwind would require a few tweaks to the libunwind interface usage in unix/signal_arm.c though, since e.g. the unw_get_proc_info call fails if there's no .eh_frame or .debug_frame available. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- dlls/ntdll/signal_arm.c | 15 +++++++++++++++ dlls/ntdll/unix/signal_arm.c | 10 ++++++++++ include/wine/asm.h | 8 +++++++- loader/preloader.c | 3 +++ 4 files changed, 35 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index c3674487277..0952be6ba33 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -1129,6 +1129,18 @@ __ASM_GLOBAL_FUNC( call_consolidate_callback, __ASM_CFI(".cfi_escape 0x10,0x8e,0x02,0x03,0x7d,0xc0,0x01\n\t") /* DW_CFA_expression: D14 DW_OP_breg13 + 192 */ __ASM_CFI(".cfi_escape 0x10,0x8f,0x02,0x03,0x7d,0xc8,0x01\n\t") /* DW_CFA_expression: D15 DW_OP_breg13 + 200 */ #endif + /* These EHABI opcodes are to be read bottom up - they + * restore relevant registers from the CONTEXT. */ + __ASM_EHABI(".save {sp}\n\t") /* Restore Sp last */ + __ASM_EHABI(".pad #-(0x80 + 0x0c + 0x0c)\n\t") /* Move back across D0-D15, Cpsr, Fpscr, Padding, Pc, Lr and Sp */ + __ASM_EHABI(".vsave {d8-d15}\n\t") + __ASM_EHABI(".pad #0x40\n\t") /* Skip past D0-D7 */ + __ASM_EHABI(".pad #0x0c\n\t") /* Skip past Cpsr, Fpscr and Padding */ + __ASM_EHABI(".save {lr, pc}\n\t") + __ASM_EHABI(".pad #0x08\n\t") /* Skip past R12 and Sp - Sp is restored last */ + __ASM_EHABI(".save {r4-r11}\n\t") + __ASM_EHABI(".pad #0x14\n\t") /* Skip past ContextFlags and R0-R3 */ + "ldrd r1, r2, [sp, #0x1a4]\n\t" "mov r0, r2\n\t" "blx r1\n\t" @@ -1327,6 +1339,7 @@ extern LONG __C_ExecuteExceptionFilter(PEXCEPTION_POINTERS ptrs, PVOID frame, PUCHAR nonvolatile); __ASM_GLOBAL_FUNC( __C_ExecuteExceptionFilter, "push {r4-r11,lr}\n\t" + __ASM_EHABI(".save {r4-r11,lr}\n\t") __ASM_SEH(".seh_save_regs_w {r4-r11,lr}\n\t") __ASM_SEH(".seh_endprologue\n\t") @@ -1439,8 +1452,10 @@ EXCEPTION_DISPOSITION WINAPI __C_specific_handler( EXCEPTION_RECORD *rec, */ __ASM_STDCALL_FUNC( RtlRaiseException, 4, "push {r0, lr}\n\t" + __ASM_EHABI(".save {r0, lr}\n\t") __ASM_SEH(".seh_save_regs {r0, lr}\n\t") "sub sp, sp, #0x1a0\n\t" /* sizeof(CONTEXT) */ + __ASM_EHABI(".pad #0x1a0\n\t") __ASM_SEH(".seh_stackalloc 0x1a0\n\t") __ASM_SEH(".seh_endprologue\n\t") __ASM_CFI(".cfi_adjust_cfa_offset 424\n\t") diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 5d1478a1ff4..add01687c4b 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -593,6 +593,11 @@ __ASM_GLOBAL_FUNC( raise_func_trampoline, "push {r3}\n\t" /* Original Sp */ __ASM_CFI(".cfi_escape 0x0f,0x03,0x7D,0x04,0x06\n\t") /* CFA, DW_OP_breg13 + 0x04, DW_OP_deref */ __ASM_CFI(".cfi_escape 0x10,0x0e,0x02,0x7D,0x0c\n\t") /* LR, DW_OP_breg13 + 0x0c */ + __ASM_EHABI(".save {sp}\n\t") + __ASM_EHABI(".pad #-12\n\t") + __ASM_EHABI(".save {pc}\n\t") + __ASM_EHABI(".pad #8\n\t") + __ASM_EHABI(".save {lr}\n\t") /* We can't express restoring both Pc and Lr with CFI * directives, but we manually load Lr from the stack * in unwind_builtin_dll above. */ @@ -1171,6 +1176,7 @@ void DECLSPEC_HIDDEN call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, B * signal_start_thread */ __ASM_GLOBAL_FUNC( signal_start_thread, + __ASM_EHABI(".cantunwind\n\t") "push {r4-r12,lr}\n\t" /* store exit frame */ "str sp, [r3, #0x1d4]\n\t" /* arm_thread_data()->exit_frame */ @@ -1187,6 +1193,7 @@ __ASM_GLOBAL_FUNC( signal_start_thread, * signal_exit_thread */ __ASM_GLOBAL_FUNC( signal_exit_thread, + __ASM_EHABI(".cantunwind\n\t") "ldr r3, [r2, #0x1d4]\n\t" /* arm_thread_data()->exit_frame */ "mov ip, #0\n\t" "str ip, [r2, #0x1d4]\n\t" @@ -1200,6 +1207,7 @@ __ASM_GLOBAL_FUNC( signal_exit_thread, * __wine_syscall_dispatcher */ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, + __ASM_EHABI(".cantunwind\n\t") "mrc p15, 0, r1, c13, c0, 2\n\t" /* NtCurrentTeb() */ "ldr r1, [r1, #0x1d8]\n\t" /* arm_thread_data()->syscall_frame */ "add r0, r1, #0x10\n\t" @@ -1276,6 +1284,7 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, * __wine_setjmpex */ __ASM_GLOBAL_FUNC( __wine_setjmpex, + __ASM_EHABI(".cantunwind\n\t") "stm r0, {r1,r4-r11}\n" /* jmp_buf->Frame,R4..R11 */ "str sp, [r0, #0x24]\n\t" /* jmp_buf->Sp */ "str lr, [r0, #0x28]\n\t" /* jmp_buf->Pc */ @@ -1293,6 +1302,7 @@ __ASM_GLOBAL_FUNC( __wine_setjmpex, * __wine_longjmp */ __ASM_GLOBAL_FUNC( __wine_longjmp, + __ASM_EHABI(".cantunwind\n\t") "ldm r0, {r3-r11}\n\t" /* jmp_buf->Frame,R4..R11 */ "ldr sp, [r0, #0x24]\n\t" /* jmp_buf->Sp */ "ldr r2, [r0, #0x28]\n\t" /* jmp_buf->Pc */ diff --git a/include/wine/asm.h b/include/wine/asm.h index 2c996ccd86b..2448f591189 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -41,6 +41,12 @@ # define __ASM_CFI(str) #endif +#if defined(__arm__) && defined(__ELF__) && defined(__GNUC__) && !defined(__SEH__) && !defined(__ARM_DWARF_EH__) +# define __ASM_EHABI(str) str +#else +# define __ASM_EHABI(str) +#endif + #if defined(__SEH__) || (defined(_MSC_VER) && defined(__clang__) && (defined(__x86_64__) || defined(__aarch64__))) # if defined(__aarch64__) && defined(__clang_major__) && (__clang_major__ < 12 || defined(__apple_build_version__)) /* Clang got support for aarch64 SEH assembly directives in Clang 12, @@ -86,7 +92,7 @@ #define __ASM_DEFINE_FUNC(name,code) \ __ASM_BLOCK_BEGIN(__LINE__) \ asm(".text\n\t.align 4\n\t.globl " name "\n\t" __ASM_FUNC_TYPE(name) __ASM_SEH("\n\t.seh_proc " name) "\n" name ":\n\t" \ - __ASM_CFI(".cfi_startproc\n\t") code __ASM_CFI("\n\t.cfi_endproc") __ASM_SEH("\n\t.seh_endproc") __ASM_FUNC_SIZE(name)); \ + __ASM_CFI(".cfi_startproc\n\t") __ASM_EHABI(".fnstart\n\t") code __ASM_CFI("\n\t.cfi_endproc") __ASM_EHABI("\n\t.fnend") __ASM_SEH("\n\t.seh_endproc") __ASM_FUNC_SIZE(name)); \ __ASM_BLOCK_END #define __ASM_GLOBAL_FUNC(name,code) __ASM_DEFINE_FUNC(__ASM_NAME(#name),code) diff --git a/loader/preloader.c b/loader/preloader.c index d88964e9c4b..72556f09720 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -542,6 +542,7 @@ void *thread_data[256]; void _start(void); extern char _end[]; __ASM_GLOBAL_FUNC(_start, + __ASM_EHABI(".cantunwind\n\t") "mov r0, sp\n\t" "sub sp, sp, #144\n\t" /* allocate some space for extra aux values */ "str r0, [sp]\n\t" /* orig stack pointer */ @@ -564,6 +565,7 @@ __ASM_GLOBAL_FUNC(_start, #define SYSCALL_FUNC( name, nr ) \ __ASM_GLOBAL_FUNC( name, \ + __ASM_EHABI(".cantunwind\n\t") \ "push {r4-r5,r7,lr}\n\t" \ "ldr r4, [sp, #16]\n\t" \ "ldr r5, [sp, #20]\n\t" \ @@ -576,6 +578,7 @@ __ASM_GLOBAL_FUNC(_start, #define SYSCALL_NOERR( name, nr ) \ __ASM_GLOBAL_FUNC( name, \ + __ASM_EHABI(".cantunwind\n\t") \ "push {r7,lr}\n\t" \ "mov r7, #" #nr "\n\t" \ "svc #0\n\t" \

1 0

Martin Storsjö : ntdll: Implement ARM EHABI unwinding.
by Alexandre Julliard 07 Nov '22

07 Nov '22

Module: wine Branch: master Commit: a27b202a4ddc314e3e856c10f2e5d010c4a88ee0 URL: https://gitlab.winehq.org/wine/wine/-/commit/a27b202a4ddc314e3e856c10f2e5d0… Author: Martin Storsjö <martin(a)martin.st> Date: Tue Oct 18 22:55:47 2022 +0300 ntdll: Implement ARM EHABI unwinding. This avoids relying on libunwind, which isn't always available, and which can be brittle (e.g. current git master of libunwind fails, see https://github.com/libunwind/libunwind/pull/203#issuecomment-984126066) This allows unwinding with the EXIDX/EXTBL info which is used normally for C++ exception handling/unwinding. This avoids needing to keep the .so files unstripped and avoids needing libunwind to load .debug_frame from disk instead of the already mapped EXIDX/EXTBL. This patch uses the dl_iterate_phdr function for finding the EXIDX section; keeping this call within #ifdef linux to avoid breaking someone's build, even though it probably is available on most unix (or ELF) platforms. Alternatively, we could add configure checks for this function. This passes all my unwinding tests, for full ELF builds of Wine, built with both GCC and Clang. (It also works for PE builds, where only very few ELF bits need to be unwound.) Signed-off-by: Martin Storsjö <martin(a)martin.st> --- dlls/ntdll/unix/signal_arm.c | 448 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 439 insertions(+), 9 deletions(-)

1 0

Alexandre Julliard : packaging: Add Ubuntu 22.10.
by Alexandre Julliard 07 Nov '22

07 Nov '22

Module: tools Branch: master Commit: e84b5ce405af16cfa1a6a4ac985f687cccd1c9f3 URL: https://gitlab.winehq.org/winehq/tools/-/commit/e84b5ce405af16cfa1a6a4ac985… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 1 18:33:48 2022 +0100 packaging: Add Ubuntu 22.10. --- packaging/obs/apt-mirror.cfg | 4 ++++ packaging/obs/obs-sync | 6 +++--- packaging/obs/rsync-filter | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/packaging/obs/apt-mirror.cfg b/packaging/obs/apt-mirror.cfg index 1ea24ded..23ecbb6e 100644 --- a/packaging/obs/apt-mirror.cfg +++ b/packaging/obs/apt-mirror.cfg @@ -34,4 +34,8 @@ deb-amd64 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUb deb-i386 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ deb-src https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ +deb-amd64 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ +deb-i386 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ +deb-src https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ + clean https://download.opensuse.org/repositories/Emulators:/Wine:/Debian diff --git a/packaging/obs/obs-sync b/packaging/obs/obs-sync index 5a8e7ad8..99b00605 100755 --- a/packaging/obs/obs-sync +++ b/packaging/obs/obs-sync @@ -27,8 +27,7 @@ download_packages () rm -rf var # rpm packages - find $obs_mirror/Fedora -mtime "+120" -type f -print0 | xargs -0 rm -f - dnf reposync --source -c yum.conf -g + dnf reposync --delete -c yum.conf -g } # add rpm files for a single Fedora release @@ -199,7 +198,7 @@ publish_files () cd $basedir -distros="35 36 bullseye bookworm bionic focal jammy" +distros="35 36 bullseye bookworm bionic focal jammy kinetic" dry_run= build=1 @@ -258,6 +257,7 @@ do bionic) add_deb ubuntu $i xUbuntu_18.04 ;; focal) add_deb ubuntu $i xUbuntu_20.04 ;; jammy) add_deb ubuntu $i xUbuntu_22.04 ;; + kinetic) add_deb ubuntu $i xUbuntu_22.10 ;; *) echo "Unknown distro $i"; exit 1 ;; esac done diff --git a/packaging/obs/rsync-filter b/packaging/obs/rsync-filter index cccb35d0..ef253a5d 100644 --- a/packaging/obs/rsync-filter +++ b/packaging/obs/rsync-filter @@ -17,6 +17,7 @@ + /ubuntu/dists/bionic + /ubuntu/dists/focal + /ubuntu/dists/jammy ++ /ubuntu/dists/kinetic - /ubuntu/dists/* - /ubuntu/*

1 0

Rémi Bernon : winebuild: Avoid calling asm_name twice in function arguments.
by Alexandre Julliard 04 Nov '22

04 Nov '22

Module: wine Branch: master Commit: 9d1175a4649706d8d46a7bd8d5aa291b6528bfc4 URL: https://gitlab.winehq.org/wine/wine/-/commit/9d1175a4649706d8d46a7bd8d5aa29… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 4 19:47:35 2022 +0100 winebuild: Avoid calling asm_name twice in function arguments. It returns a static buffer pointer and will free the first returned pointer on the second call. --- tools/winebuild/utils.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 16d9c28d918..2148dc58a95 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -1021,8 +1021,11 @@ const char *asm_globl( const char *func ) break; case PLATFORM_MINGW: case PLATFORM_WINDOWS: - buffer = strmake( "\t.globl %s\n%s:", asm_name( func ), asm_name( func ) ); + { + const char *name = asm_name( func ); + buffer = strmake( "\t.globl %s\n%s:", name, name ); break; + } default: buffer = strmake( "\t.globl %s\n\t.hidden %s\n%s:", func, func, func ); break;

1 0

Jinoh Kang : server: Correctly expose composited parent window and its child on position change.
by Alexandre Julliard 04 Nov '22

04 Nov '22

Module: wine Branch: master Commit: 17e6ef6d7edcaac0adadb10f3aa89365bdc7a2e3 URL: https://gitlab.winehq.org/wine/wine/-/commit/17e6ef6d7edcaac0adadb10f3aa893… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Mon Oct 31 22:29:52 2022 +0900 server: Correctly expose composited parent window and its child on position change. Skip redrawing the composited child window when the window rect and visible region stays the same, since we're taking the union of the old and new visible regions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53153 Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/user32/tests/msg.c | 4 ++-- server/class.c | 5 +++++ server/region.c | 17 +++++++++++++++++ server/user.h | 9 +++++++++ server/window.c | 31 +++++++++++++++++++++++++++++-- 5 files changed, 62 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 76c30b7dfe5..9b4680bbcc1 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -9303,7 +9303,7 @@ static void subtest_swp_paint_regions_( int line, int wrap_toplevel, LPCSTR pare else { todo_wine_if( EqualRect( &rect_old, &rect_new ) ? is_zorder_redraw : - ((extest->style & WS_CLIPCHILDREN) == 0 || is_composited) ) + ((extest->style & WS_CLIPCHILDREN) == 0 && !is_composited) ) ok( !!rgn_ok, "Parent update region shall match expected region\n" ); } @@ -9366,7 +9366,7 @@ static void subtest_swp_paint_regions_( int line, int wrap_toplevel, LPCSTR pare else { todo_wine_if( EqualRect( &rect_old, &rect_new ) ? is_zorder_redraw : - ((extest->style & WS_CLIPCHILDREN) == 0 || is_composited) ) + ((extest->style & WS_CLIPCHILDREN) == 0 && !is_composited) ) ok( !!rgn_ok, "Child update region shall match expected region\n" ); } diff --git a/server/class.c b/server/class.c index e1e180bd97c..3231f366b26 100644 --- a/server/class.c +++ b/server/class.c @@ -141,6 +141,11 @@ int is_hwnd_message_class( struct window_class *class ) return (!class->local && class->atom == find_global_atom( NULL, &name )); } +int get_class_style( struct window_class *class ) +{ + return class->style; +} + atom_t get_class_atom( struct window_class *class ) { return class->base_atom; diff --git a/server/region.c b/server/region.c index 9f377ee05d3..d169f1ac2b4 100644 --- a/server/region.c +++ b/server/region.c @@ -684,6 +684,23 @@ int is_region_empty( const struct region *region ) } +/* checks if two regions are identical */ +int is_region_equal( const struct region *region1, const struct region *region2 ) +{ + int i; + + if (region1->num_rects != region2->num_rects) return 0; + if (region1->num_rects == 0) return 1; + if (!is_rect_equal( &region1->extents, &region2->extents )) return 0; + for (i = 0; i < region1->num_rects; i++) + { + if (!is_rect_equal( &region1->rects[i], &region2->rects[i] )) return 0; + } + + return 1; +} + + /* get the extents rect of a region */ void get_region_extents( const struct region *region, rectangle_t *rect ) { diff --git a/server/user.h b/server/user.h index 55a0d35feff..280da454d07 100644 --- a/server/user.h +++ b/server/user.h @@ -132,6 +132,7 @@ extern rectangle_t *get_region_data( const struct region *region, data_size_t ma extern rectangle_t *get_region_data_and_free( struct region *region, data_size_t max_size, data_size_t *total_size ); extern int is_region_empty( const struct region *region ); +extern int is_region_equal( const struct region *region1, const struct region *region2 ); extern void get_region_extents( const struct region *region, rectangle_t *rect ); extern void offset_region( struct region *region, int x, int y ); extern void mirror_region( const rectangle_t *client_rect, struct region *region ); @@ -175,6 +176,7 @@ extern struct window_class *grab_class( struct process *process, atom_t atom, extern void release_class( struct window_class *class ); extern int is_desktop_class( struct window_class *class ); extern int is_hwnd_message_class( struct window_class *class ); +extern int get_class_style( struct window_class *class ); extern atom_t get_class_atom( struct window_class *class ); extern client_ptr_t get_class_client_ptr( struct window_class *class ); @@ -191,6 +193,13 @@ extern void close_process_desktop( struct process *process ); extern void set_thread_default_desktop( struct thread *thread, struct desktop *desktop, obj_handle_t handle ); extern void release_thread_desktop( struct thread *thread, int close ); +/* checks if two rectangles are identical */ +static inline int is_rect_equal( const rectangle_t *rect1, const rectangle_t *rect2 ) +{ + return (rect1->left == rect2->left && rect1->right == rect2->right && + rect1->top == rect2->top && rect1->bottom == rect2->bottom); +} + static inline int is_rect_empty( const rectangle_t *rect ) { return (rect->left >= rect->right || rect->top >= rect->bottom); diff --git a/server/window.c b/server/window.c index 7675cd1103d..a56333cc6a5 100644 --- a/server/window.c +++ b/server/window.c @@ -789,6 +789,21 @@ int is_window_transparent( user_handle_t window ) return (win->ex_style & (WS_EX_LAYERED|WS_EX_TRANSPARENT)) == (WS_EX_LAYERED|WS_EX_TRANSPARENT); } +static int is_window_using_parent_dc( struct window *win ) +{ + return (win->style & (WS_POPUP|WS_CHILD)) == WS_CHILD && (get_class_style( win->class ) & CS_PARENTDC) != 0; +} + +static int is_window_composited( struct window *win ) +{ + return (win->ex_style & WS_EX_COMPOSITED) != 0 && !is_window_using_parent_dc(win); +} + +static int is_parent_composited( struct window *win ) +{ + return win->parent && is_window_composited( win->parent ); +} + /* check if point is inside the window, and map to window dpi */ static int is_point_in_window( struct window *win, int *x, int *y, unsigned int dpi ) { @@ -1712,12 +1727,23 @@ static struct region *expose_window( struct window *win, const rectangle_t *old_ struct region *old_vis_rgn ) { struct region *new_vis_rgn, *exposed_rgn; + int is_composited = is_parent_composited( win ); if (!(new_vis_rgn = get_visible_region( win, DCX_WINDOW ))) return NULL; + if (is_composited && + is_rect_equal( old_window_rect, &win->window_rect ) && + is_region_equal( old_vis_rgn, new_vis_rgn )) + { + free_region( new_vis_rgn ); + return NULL; + } + if ((exposed_rgn = create_empty_region())) { - if (subtract_region( exposed_rgn, new_vis_rgn, old_vis_rgn ) && !is_region_empty( exposed_rgn )) + if ((is_composited ? union_region( exposed_rgn, new_vis_rgn, old_vis_rgn ) + : subtract_region( exposed_rgn, new_vis_rgn, old_vis_rgn )) && + !is_region_empty( exposed_rgn )) { /* make it relative to the new client area */ offset_region( exposed_rgn, win->window_rect.left - win->client_rect.left, @@ -1736,7 +1762,8 @@ static struct region *expose_window( struct window *win, const rectangle_t *old_ offset_region( new_vis_rgn, win->window_rect.left - old_window_rect->left, win->window_rect.top - old_window_rect->top ); - if ((win->parent->style & WS_CLIPCHILDREN) ? + if (is_composited ? union_region( new_vis_rgn, old_vis_rgn, new_vis_rgn ) : + (win->parent->style & WS_CLIPCHILDREN) ? subtract_region( new_vis_rgn, old_vis_rgn, new_vis_rgn ) : xor_region( new_vis_rgn, old_vis_rgn, new_vis_rgn )) {

1 0

Jinoh Kang : server: Redraw composited window child when its z-order changes.
by Alexandre Julliard 04 Nov '22

04 Nov '22

Module: wine Branch: master Commit: c310e975f4b20e1401404c6aa3a93c0b4776b8e5 URL: https://gitlab.winehq.org/wine/wine/-/commit/c310e975f4b20e1401404c6aa3a93c… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Mon Oct 31 22:30:05 2022 +0900 server: Redraw composited window child when its z-order changes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53153 Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/user32/tests/msg.c | 8 ++++---- server/window.c | 21 +++++++++++++-------- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 9b4680bbcc1..fb22f6042fe 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -9302,8 +9302,8 @@ static void subtest_swp_paint_regions_( int line, int wrap_toplevel, LPCSTR pare } else { - todo_wine_if( EqualRect( &rect_old, &rect_new ) ? is_zorder_redraw : - ((extest->style & WS_CLIPCHILDREN) == 0 && !is_composited) ) + todo_wine_if( !EqualRect( &rect_old, &rect_new ) && + (extest->style & WS_CLIPCHILDREN) == 0 && !is_composited ) ok( !!rgn_ok, "Parent update region shall match expected region\n" ); } @@ -9365,8 +9365,8 @@ static void subtest_swp_paint_regions_( int line, int wrap_toplevel, LPCSTR pare } else { - todo_wine_if( EqualRect( &rect_old, &rect_new ) ? is_zorder_redraw : - ((extest->style & WS_CLIPCHILDREN) == 0 && !is_composited) ) + todo_wine_if( !EqualRect( &rect_old, &rect_new ) && + (extest->style & WS_CLIPCHILDREN) == 0 && !is_composited ) ok( !!rgn_ok, "Child update region shall match expected region\n" ); } diff --git a/server/window.c b/server/window.c index a56333cc6a5..5dbe1cd1eb2 100644 --- a/server/window.c +++ b/server/window.c @@ -254,15 +254,18 @@ static unsigned int get_monitor_dpi( struct window *win ) } /* link a window at the right place in the siblings list */ -static void link_window( struct window *win, struct window *previous ) +static int link_window( struct window *win, struct window *previous ) { + struct list *old_prev; + if (previous == WINPTR_NOTOPMOST) { - if (!(win->ex_style & WS_EX_TOPMOST) && win->is_linked) return; /* nothing to do */ + if (!(win->ex_style & WS_EX_TOPMOST) && win->is_linked) return 0; /* nothing to do */ win->ex_style &= ~WS_EX_TOPMOST; previous = WINPTR_TOP; /* fallback to the HWND_TOP case */ } + old_prev = win->is_linked ? win->entry.prev : NULL; list_remove( &win->entry ); /* unlink it from the previous location */ if (previous == WINPTR_BOTTOM) @@ -306,6 +309,7 @@ static void link_window( struct window *win, struct window *previous ) } win->is_linked = 1; + return old_prev != win->entry.prev; } /* change the parent of a window (or unlink the window if the new parent is NULL) */ @@ -1724,14 +1728,14 @@ static unsigned int get_window_update_flags( struct window *win, struct window * /* expose the areas revealed by a vis region change on the window parent */ /* returns the region exposed on the window itself (in client coordinates) */ static struct region *expose_window( struct window *win, const rectangle_t *old_window_rect, - struct region *old_vis_rgn ) + struct region *old_vis_rgn, int zorder_changed ) { struct region *new_vis_rgn, *exposed_rgn; int is_composited = is_parent_composited( win ); if (!(new_vis_rgn = get_visible_region( win, DCX_WINDOW ))) return NULL; - if (is_composited && + if (is_composited && !zorder_changed && is_rect_equal( old_window_rect, &win->window_rect ) && is_region_equal( old_vis_rgn, new_vis_rgn )) { @@ -1793,6 +1797,7 @@ static void set_window_pos( struct window *win, struct window *previous, rectangle_t rect; int client_changed, frame_changed; int visible = (win->style & WS_VISIBLE) || (swp_flags & SWP_SHOWWINDOW); + int zorder_changed = 0; if (win->parent && !is_visible( win->parent )) visible = 0; @@ -1804,7 +1809,7 @@ static void set_window_pos( struct window *win, struct window *previous, win->visible_rect = *visible_rect; win->surface_rect = *surface_rect; win->client_rect = *client_rect; - if (!(swp_flags & SWP_NOZORDER) && win->parent) link_window( win, previous ); + if (!(swp_flags & SWP_NOZORDER) && win->parent) zorder_changed |= link_window( win, previous ); if (swp_flags & SWP_SHOWWINDOW) win->style |= WS_VISIBLE; else if (swp_flags & SWP_HIDEWINDOW) win->style &= ~WS_VISIBLE; @@ -1833,7 +1838,7 @@ static void set_window_pos( struct window *win, struct window *previous, /* expose anything revealed by the change */ if (!(swp_flags & SWP_NOREDRAW)) - exposed_rgn = expose_window( win, &old_window_rect, old_vis_rgn ); + exposed_rgn = expose_window( win, &old_window_rect, old_vis_rgn, zorder_changed ); if (!(win->style & WS_VISIBLE)) { @@ -1964,7 +1969,7 @@ static void set_window_region( struct window *win, struct region *region, int re win->win_region = region; /* expose anything revealed by the change */ - if (old_vis_rgn && ((exposed_rgn = expose_window( win, &win->window_rect, old_vis_rgn )))) + if (old_vis_rgn && ((exposed_rgn = expose_window( win, &win->window_rect, old_vis_rgn, 0 )))) { redraw_window( win, exposed_rgn, 1, RDW_INVALIDATE | RDW_ERASE | RDW_FRAME | RDW_ALLCHILDREN ); free_region( exposed_rgn ); @@ -1989,7 +1994,7 @@ void free_window_handle( struct window *win ) win->style &= ~WS_VISIBLE; if (vis_rgn) { - struct region *exposed_rgn = expose_window( win, &win->window_rect, vis_rgn ); + struct region *exposed_rgn = expose_window( win, &win->window_rect, vis_rgn, 0 ); if (exposed_rgn) free_region( exposed_rgn ); free_region( vis_rgn ); }

1 0

Jinoh Kang : server: Don't invalidate the newly exposed child region on the parent if it doesn't clip children.
by Alexandre Julliard 04 Nov '22

04 Nov '22

Module: wine Branch: master Commit: 33617af8145b6fadfe41d48968a728ff57b3064b URL: https://gitlab.winehq.org/wine/wine/-/commit/33617af8145b6fadfe41d48968a728… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Mon Oct 31 22:30:20 2022 +0900 server: Don't invalidate the newly exposed child region on the parent if it doesn't clip children. This partly reverts e42eaaaf3a873d29b14f8f3a3617df2d0d4210ca. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/user32/tests/msg.c | 4 ---- server/window.c | 6 ++---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index fb22f6042fe..e36eb7125e6 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -9302,8 +9302,6 @@ static void subtest_swp_paint_regions_( int line, int wrap_toplevel, LPCSTR pare } else { - todo_wine_if( !EqualRect( &rect_old, &rect_new ) && - (extest->style & WS_CLIPCHILDREN) == 0 && !is_composited ) ok( !!rgn_ok, "Parent update region shall match expected region\n" ); } @@ -9365,8 +9363,6 @@ static void subtest_swp_paint_regions_( int line, int wrap_toplevel, LPCSTR pare } else { - todo_wine_if( !EqualRect( &rect_old, &rect_new ) && - (extest->style & WS_CLIPCHILDREN) == 0 && !is_composited ) ok( !!rgn_ok, "Child update region shall match expected region\n" ); } diff --git a/server/window.c b/server/window.c index 5dbe1cd1eb2..f713ed224aa 100644 --- a/server/window.c +++ b/server/window.c @@ -1766,10 +1766,8 @@ static struct region *expose_window( struct window *win, const rectangle_t *old_ offset_region( new_vis_rgn, win->window_rect.left - old_window_rect->left, win->window_rect.top - old_window_rect->top ); - if (is_composited ? union_region( new_vis_rgn, old_vis_rgn, new_vis_rgn ) : - (win->parent->style & WS_CLIPCHILDREN) ? - subtract_region( new_vis_rgn, old_vis_rgn, new_vis_rgn ) : - xor_region( new_vis_rgn, old_vis_rgn, new_vis_rgn )) + if (is_composited ? union_region( new_vis_rgn, old_vis_rgn, new_vis_rgn ) + : subtract_region( new_vis_rgn, old_vis_rgn, new_vis_rgn )) { if (!is_region_empty( new_vis_rgn )) {

1 0