[PATCH 0/5] MR2056: ntdll: Make some definitions static or hidden.
From: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/unix/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 957d9f3b801..981b0c57b35 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1618,7 +1618,7 @@ static int fd_set_dos_attrib( int fd, UINT attr ) /* set the stat info and file attributes for a file (by file descriptor) */ -NTSTATUS fd_set_file_info( int fd, UINT attr ) +static NTSTATUS fd_set_file_info( int fd, UINT attr ) { struct stat st; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2056
From: Zebediah Figura <zfigura(a)codeweavers.com> --- 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") -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2056
From: Zebediah Figura <zfigura(a)codeweavers.com> --- 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 */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2056
From: Zebediah Figura <zfigura(a)codeweavers.com> --- 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; } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2056
From: Zebediah Figura <zfigura(a)codeweavers.com> --- 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 ); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2056
participants (2)
-
Zebediah Figura -
Zebediah Figura (＠zfigura)