- Wine-Commits - list.winehq.org

Jinoh Kang : include/msvcrt: Add noreturn attribute to _assert.
by Alexandre Julliard Jan. 30, 2023

Jan. 30, 2023

Module: wine Branch: master Commit: b6a26817bc97bd4b14a7123da23928fd7d0e5aca URL: https://gitlab.winehq.org/wine/wine/-/commit/b6a26817bc97bd4b14a7123da23928… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Jan 28 08:21:19 2023 +0900 include/msvcrt: Add noreturn attribute to _assert. This informs the compiler that no code following an assertion failure will execute (unless NDEBUG is defined), which increases the accuracy of compiler warnings and static analyses. For assert.h, put DECLSPEC_NORETURN before the return type in the function declaration to remain consistent with other MSVCRT function declarations. --- dlls/msvcrt/exit.c | 4 ++-- dlls/ntdll/exception.c | 2 +- include/msvcrt/assert.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 6427b15bece..3a7b5ae0330 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -290,7 +290,7 @@ unsigned int CDECL _set_abort_behavior(unsigned int flags, unsigned int mask) /********************************************************************* * _wassert (MSVCRT.@) */ -void CDECL _wassert(const wchar_t* str, const wchar_t* file, unsigned int line) +void DECLSPEC_NORETURN CDECL _wassert(const wchar_t* str, const wchar_t* file, unsigned int line) { TRACE("(%s,%s,%d)\n", debugstr_w(str), debugstr_w(file), line); @@ -311,7 +311,7 @@ void CDECL _wassert(const wchar_t* str, const wchar_t* file, unsigned int line) /********************************************************************* * _assert (MSVCRT.@) */ -void CDECL _assert(const char* str, const char* file, unsigned int line) +void DECLSPEC_NORETURN CDECL _assert(const char* str, const char* file, unsigned int line) { wchar_t strW[1024], fileW[1024]; diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 5b3076387d6..fc3e8982a98 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -623,7 +623,7 @@ PRUNTIME_FUNCTION WINAPI RtlLookupFunctionEntry( ULONG_PTR pc, ULONG_PTR *base, /************************************************************* * _assert */ -void __cdecl _assert( const char *str, const char *file, unsigned int line ) +void DECLSPEC_NORETURN __cdecl _assert( const char *str, const char *file, unsigned int line ) { ERR( "%s:%u: Assertion failed %s\n", file, line, debugstr_a(str) ); RtlRaiseStatus( EXCEPTION_WINE_ASSERTION ); diff --git a/include/msvcrt/assert.h b/include/msvcrt/assert.h index 9a180f7e58d..26a9c0a7a5f 100644 --- a/include/msvcrt/assert.h +++ b/include/msvcrt/assert.h @@ -28,7 +28,7 @@ extern "C" { #ifdef NDEBUG #define assert(_expr) ((void)0) #else -_ACRTIMP void __cdecl _assert(const char *, const char *, unsigned int); +_ACRTIMP DECLSPEC_NORETURN void __cdecl _assert(const char *, const char *, unsigned int); #define assert(_expr) (void)((!!(_expr)) || (_assert(#_expr, __FILE__, __LINE__), 0)) #endif

1 0

K.B.Dharun Krishna : po: Update Tamil translation.
by Alexandre Julliard Jan. 30, 2023

Jan. 30, 2023

Module: wine Branch: master Commit: b46bcd2cb182cbf29cc550d489f7759c1660b3b3 URL: https://gitlab.winehq.org/wine/wine/-/commit/b46bcd2cb182cbf29cc550d489f775… Author: K.B.Dharun Krishna <kbdharunkrishna(a)gmail.com> Date: Mon Jan 30 11:38:22 2023 +0530 po: Update Tamil translation. --- po/ta.po | 674 ++++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 361 insertions(+), 313 deletions(-)

1 0

Zebediah Figura : ntdll: Make __wine_unix_call_dispatcher_prolog_end() hidden on x86_64.
by Alexandre Julliard Jan. 30, 2023

Jan. 30, 2023

Module: wine Branch: master Commit: d5683bad3493bfc9f74427074998d5b97aab0214 URL: https://gitlab.winehq.org/wine/wine/-/commit/d5683bad3493bfc9f74427074998d5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 18 20:01:38 2023 -0600 ntdll: Make __wine_unix_call_dispatcher_prolog_end() hidden on x86_64. --- dlls/ntdll/unix/signal_x86_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 68383cdcdca..54babc7d964 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1935,7 +1935,7 @@ static BOOL handle_syscall_trap( ucontext_t *sigcontext ) } else if ((void *)RIP_sig( sigcontext ) == __wine_unix_call_dispatcher) { - extern void __wine_unix_call_dispatcher_prolog_end(void); + extern void __wine_unix_call_dispatcher_prolog_end(void) DECLSPEC_HIDDEN; RIP_sig( sigcontext ) = (ULONG64)__wine_unix_call_dispatcher_prolog_end; R10_sig( sigcontext ) = RCX_sig( sigcontext );

1 0

Zebediah Figura : win32u: Make set_visible_region() hidden.
by Alexandre Julliard Jan. 30, 2023

Jan. 30, 2023

Module: wine Branch: master Commit: dd6d837b62f5e0e3a2b1f0157c4a41b59d4ea991 URL: https://gitlab.winehq.org/wine/wine/-/commit/dd6d837b62f5e0e3a2b1f0157c4a41… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 18 19:53:09 2023 -0600 win32u: Make set_visible_region() hidden. --- dlls/win32u/ntgdi_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/ntgdi_private.h b/dlls/win32u/ntgdi_private.h index 53674e0661a..ce5e30ab07d 100644 --- a/dlls/win32u/ntgdi_private.h +++ b/dlls/win32u/ntgdi_private.h @@ -160,7 +160,7 @@ extern void free_brush_pattern( struct brush_pattern *pattern ) DECLSPEC_HIDDEN; extern BOOL clip_device_rect( DC *dc, RECT *dst, const RECT *src ) DECLSPEC_HIDDEN; extern BOOL clip_visrect( DC *dc, RECT *dst, const RECT *src ) DECLSPEC_HIDDEN; extern void set_visible_region( HDC hdc, HRGN hrgn, const RECT *vis_rect, - const RECT *device_rect, struct window_surface *surface ); + const RECT *device_rect, struct window_surface *surface ) DECLSPEC_HIDDEN; extern void update_dc_clipping( DC * dc ) DECLSPEC_HIDDEN; /* Return the total DC region (if any) */

1 0

Zebediah Figura : ntdll: Make __wine_syscall_dispatcher_prolog_end() hidden on x86_64.
by Alexandre Julliard Jan. 30, 2023

Jan. 30, 2023

Module: wine Branch: master Commit: 5cc204cf00bda63c92bad72fc545112a0a13ba42 URL: https://gitlab.winehq.org/wine/wine/-/commit/5cc204cf00bda63c92bad72fc54511… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 18 20:01:28 2023 -0600 ntdll: Make __wine_syscall_dispatcher_prolog_end() hidden on x86_64. --- dlls/ntdll/unix/signal_x86_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 5612a1cee46..68383cdcdca 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1929,7 +1929,7 @@ static BOOL handle_syscall_trap( ucontext_t *sigcontext ) if ((void *)RIP_sig( sigcontext ) == __wine_syscall_dispatcher) { - extern void __wine_syscall_dispatcher_prolog_end(void); + extern void __wine_syscall_dispatcher_prolog_end(void) DECLSPEC_HIDDEN; RIP_sig( sigcontext ) = (ULONG64)__wine_syscall_dispatcher_prolog_end; }

1 0

Zebediah Figura : ntdll: Make user_mode_callback_return() hidden.
by Alexandre Julliard Jan. 30, 2023

Jan. 30, 2023

Module: wine Branch: master Commit: 0a669b5fdd59521e9e0162d333b92b176c5d192a URL: https://gitlab.winehq.org/wine/wine/-/commit/0a669b5fdd59521e9e0162d333b92b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 18 19:58:05 2023 -0600 ntdll: Make user_mode_callback_return() hidden. --- dlls/ntdll/unix/signal_arm.c | 2 +- dlls/ntdll/unix/signal_arm64.c | 2 +- dlls/ntdll/unix/signal_i386.c | 2 +- dlls/ntdll/unix/signal_x86_64.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 87c40d9ba96..8180bc52b46 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -1184,7 +1184,7 @@ __ASM_GLOBAL_FUNC( call_user_mode_callback, * user_mode_callback_return */ extern void CDECL DECLSPEC_NORETURN user_mode_callback_return( void *ret_ptr, ULONG ret_len, - NTSTATUS status, TEB *teb ); + NTSTATUS status, TEB *teb ) DECLSPEC_HIDDEN; __ASM_GLOBAL_FUNC( user_mode_callback_return, "ldr r4, [r3, #0x1d8]\n\t" /* arm_thread_data()->syscall_frame */ "ldr r5, [r4, #0x4c]\n\t" /* frame->prev_frame */ diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index d440d55fd6b..bd9818c808a 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -919,7 +919,7 @@ __ASM_GLOBAL_FUNC( call_user_mode_callback, * user_mode_callback_return */ extern void CDECL DECLSPEC_NORETURN user_mode_callback_return( void *ret_ptr, ULONG ret_len, - NTSTATUS status, TEB *teb ); + NTSTATUS status, TEB *teb ) DECLSPEC_HIDDEN; __ASM_GLOBAL_FUNC( user_mode_callback_return, "ldr x4, [x3, #0x2f8]\n\t" /* arm64_thread_data()->syscall_frame */ "ldr x5, [x4, #0x110]\n\t" /* prev_frame */ diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 3b16e7412f8..1cea685d995 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1610,7 +1610,7 @@ __ASM_GLOBAL_FUNC( call_user_mode_callback, * user_mode_callback_return */ extern void CDECL DECLSPEC_NORETURN user_mode_callback_return( void *ret_ptr, ULONG ret_len, - NTSTATUS status, TEB *teb ); + NTSTATUS status, TEB *teb ) DECLSPEC_HIDDEN; __ASM_GLOBAL_FUNC( user_mode_callback_return, "movl 16(%esp),%edx\n" /* teb */ "movl 0x1f8(%edx),%eax\n\t" /* x86_thread_data()->syscall_frame */ diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 13669f0e77c..5612a1cee46 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1644,7 +1644,7 @@ __ASM_GLOBAL_FUNC( call_user_mode_callback, * user_mode_callback_return */ extern void CDECL DECLSPEC_NORETURN user_mode_callback_return( void *ret_ptr, ULONG ret_len, - NTSTATUS status, TEB *teb ); + NTSTATUS status, TEB *teb ) DECLSPEC_HIDDEN; __ASM_GLOBAL_FUNC( user_mode_callback_return, "movq 0x328(%r9),%r10\n\t" /* amd64_thread_data()->syscall_frame */ "movq 0xa0(%r10),%r11\n\t" /* frame->prev_frame */

1 0

Zebediah Figura : winex11: Make client_foreign_window_proc hidden.
by Alexandre Julliard Jan. 30, 2023

Jan. 30, 2023

Module: wine Branch: master Commit: 2b0677341704affce04710a633ba9fb5b3a134d1 URL: https://gitlab.winehq.org/wine/wine/-/commit/2b0677341704affce04710a633ba9f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Jan 29 15:09:23 2023 -0600 winex11: Make client_foreign_window_proc hidden. --- dlls/winex11.drv/x11drv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 4997367ce9a..f4f6ba07e07 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -453,7 +453,7 @@ extern int alloc_system_colors DECLSPEC_HIDDEN; extern int xrender_error_base DECLSPEC_HIDDEN; extern char *process_name DECLSPEC_HIDDEN; extern Display *clipboard_display DECLSPEC_HIDDEN; -extern WNDPROC client_foreign_window_proc; +extern WNDPROC client_foreign_window_proc DECLSPEC_HIDDEN; /* atoms */

1 0

Zebediah Figura : winex11: Include x11drv.h in xrandr.c even if compiling without xrandr.
by Alexandre Julliard Jan. 30, 2023

Jan. 30, 2023

Module: wine Branch: master Commit: c05f5445dc2c330539cfb22fb5b27506061d26b4 URL: https://gitlab.winehq.org/wine/wine/-/commit/c05f5445dc2c330539cfb22fb5b275… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Jan 29 15:28:37 2023 -0600 winex11: Include x11drv.h in xrandr.c even if compiling without xrandr. Make sure we pull in the definition of X11DRV_XRandR_Init(), in particular because it has DECLSPEC_HIDDEN. --- dlls/winex11.drv/xrandr.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index dbd8a721074..2b0ee253cea 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -28,7 +28,11 @@ #define NONAMELESSSTRUCT #define NONAMELESSUNION - +#include <assert.h> +#include <X11/Xlib.h> +#include <X11/extensions/Xrandr.h> +#include <dlfcn.h> +#include "x11drv.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(xrandr); @@ -38,12 +42,6 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); #ifdef SONAME_LIBXRANDR -#include <assert.h> -#include <X11/Xlib.h> -#include <X11/extensions/Xrandr.h> -#include <dlfcn.h> -#include "x11drv.h" - #define VK_NO_PROTOTYPES #define WINE_VK_HOST

1 0

Zebediah Figura : win32u: Make send_message_timeout() hidden.
by Alexandre Julliard Jan. 30, 2023

Jan. 30, 2023

Module: wine Branch: master Commit: b2dd38372f9b800fd54704546c8a88c22eb9013f URL: https://gitlab.winehq.org/wine/wine/-/commit/b2dd38372f9b800fd54704546c8a88… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 18 19:50:38 2023 -0600 win32u: Make send_message_timeout() hidden. --- dlls/win32u/win32u_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 96b1b7647fe..44847829b75 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -314,7 +314,7 @@ extern LRESULT send_internal_message_timeout( DWORD dest_pid, DWORD dest_tid, UI extern LRESULT send_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN; extern BOOL send_notify_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL ansi ) DECLSPEC_HIDDEN; extern LRESULT send_message_timeout( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, - UINT flags, UINT timeout, BOOL ansi ); + UINT flags, UINT timeout, BOOL ansi ) DECLSPEC_HIDDEN; /* rawinput.c */ extern BOOL process_rawinput_message( MSG *msg, UINT hw_id, const struct hardware_msg_data *msg_data ) DECLSPEC_HIDDEN;

1 0

Zebediah Figura : ntdll: Make call_user_mode_callback() hidden.
by Alexandre Julliard Jan. 30, 2023

Jan. 30, 2023

Module: wine Branch: master Commit: 4cbb181d99bdf28ea79d9ec778c2a152fd41637d URL: https://gitlab.winehq.org/wine/wine/-/commit/4cbb181d99bdf28ea79d9ec778c2a1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 18 19:57:16 2023 -0600 ntdll: Make call_user_mode_callback() hidden. --- dlls/ntdll/unix/signal_arm.c | 2 +- dlls/ntdll/unix/signal_arm64.c | 2 +- dlls/ntdll/unix/signal_i386.c | 2 +- dlls/ntdll/unix/signal_x86_64.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 9bdb2f6d6fb..87c40d9ba96 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -1155,7 +1155,7 @@ NTSTATUS call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context * call_user_mode_callback */ extern NTSTATUS CDECL call_user_mode_callback( void *func, void *stack, void **ret_ptr, - ULONG *ret_len, TEB *teb ); + ULONG *ret_len, TEB *teb ) DECLSPEC_HIDDEN; __ASM_GLOBAL_FUNC( call_user_mode_callback, "push {r2-r12,lr}\n\t" "ldr r4, [sp, #0x30]\n\t" /* teb */ diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 4483303decc..d440d55fd6b 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -881,7 +881,7 @@ NTSTATUS call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context * call_user_mode_callback */ extern NTSTATUS CDECL call_user_mode_callback( void *func, void *stack, void **ret_ptr, - ULONG *ret_len, TEB *teb ); + ULONG *ret_len, TEB *teb ) DECLSPEC_HIDDEN; __ASM_GLOBAL_FUNC( call_user_mode_callback, "stp x29, x30, [sp,#-0xc0]!\n\t" "mov x29, sp\n\t" diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index d800885748f..3b16e7412f8 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1575,7 +1575,7 @@ NTSTATUS call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context * call_user_mode_callback */ extern NTSTATUS CDECL call_user_mode_callback( void *func, void *stack, void **ret_ptr, - ULONG *ret_len, TEB *teb ); + ULONG *ret_len, TEB *teb ) DECLSPEC_HIDDEN; __ASM_GLOBAL_FUNC( call_user_mode_callback, "pushl %ebp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 94d79b9cdd1..13669f0e77c 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1573,7 +1573,7 @@ NTSTATUS call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context * call_user_mode_callback */ extern NTSTATUS CDECL call_user_mode_callback( void *func, void *stack, void **ret_ptr, - ULONG *ret_len, TEB *teb ); + ULONG *ret_len, TEB *teb ) DECLSPEC_HIDDEN; __ASM_GLOBAL_FUNC( call_user_mode_callback, "subq $0xe8,%rsp\n\t" __ASM_SEH(".seh_stackalloc 0xf0\n\t")

1 0