November 2023 - Wine-commits

Zebediah Figura : vkd3d-shader/hlsl: Remove an unnecessary local variable in copy_propagation_get_value().
by Alexandre Julliard 27 Nov '23

27 Nov '23

Module: vkd3d Branch: master Commit: 2d1825bb893b3280259ca70c3a2a384a9b302454 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2d1825bb893b3280259ca70c3a2a3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Apr 30 17:40:32 2023 -0500 vkd3d-shader/hlsl: Remove an unnecessary local variable in copy_propagation_get_value(). Found with -Wshadow. --- libs/vkd3d-shader/hlsl_codegen.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 294a8156..628de796 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1304,12 +1304,10 @@ static struct copy_propagation_value *copy_propagation_get_value(const struct co { struct copy_propagation_var_def *var_def = RB_ENTRY_VALUE(entry, struct copy_propagation_var_def, entry); unsigned int component_count = hlsl_type_component_count(var->data_type); - enum copy_propagation_value_state state; assert(component < component_count); - state = var_def->values[component].state; - switch (state) + switch (var_def->values[component].state) { case VALUE_STATE_STATICALLY_WRITTEN: return &var_def->values[component];

1 0

Zebediah Figura : vkd3d-shader/tpf: Remove an unnecessary local variable declaration.
by Alexandre Julliard 27 Nov '23

27 Nov '23

Module: vkd3d Branch: master Commit: 10957bebbf7dd09b12808f97c627709e12327a89 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/10957bebbf7dd09b12808f97c6277… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Apr 30 17:41:30 2023 -0500 vkd3d-shader/tpf: Remove an unnecessary local variable declaration. Found with -Wshadow. --- libs/vkd3d-shader/tpf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 61d14e30..81ead41e 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -3528,8 +3528,8 @@ static void write_sm4_rdef(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) { const unsigned int var_size = (profile->major_version >= 5 ? 10 : 6); size_t var_offset = vars_start + j * var_size * sizeof(uint32_t); - size_t string_offset = put_string(&buffer, var->name); + string_offset = put_string(&buffer, var->name); set_u32(&buffer, var_offset, string_offset); write_sm4_type(ctx, &buffer, var->data_type); set_u32(&buffer, var_offset + 4 * sizeof(uint32_t), var->data_type->bytecode_offset);

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Handle 'linear centroid' modifier.
by Alexandre Julliard 27 Nov '23

27 Nov '23

Module: vkd3d Branch: master Commit: 6a4a9a4518689a7db5eff362cc5e0fff0994a7af URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6a4a9a4518689a7db5eff362cc5e0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 26 20:36:29 2023 +0100 vkd3d-shader/hlsl: Handle 'linear centroid' modifier. --- libs/vkd3d-shader/hlsl.c | 2 ++ libs/vkd3d-shader/hlsl.h | 3 ++- libs/vkd3d-shader/hlsl.l | 1 + libs/vkd3d-shader/hlsl.y | 5 +++++ libs/vkd3d-shader/tpf.c | 1 + 5 files changed, 11 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 501bff8c..da3bbda1 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -2255,6 +2255,8 @@ struct vkd3d_string_buffer *hlsl_modifiers_to_string(struct hlsl_ctx *ctx, unsig if (modifiers & HLSL_STORAGE_EXTERN) vkd3d_string_buffer_printf(string, "extern "); + if (modifiers & HLSL_STORAGE_LINEAR) + vkd3d_string_buffer_printf(string, "linear "); if (modifiers & HLSL_STORAGE_NOINTERPOLATION) vkd3d_string_buffer_printf(string, "nointerpolation "); if (modifiers & HLSL_STORAGE_CENTROID) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index f3596764..21b2fe38 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -357,13 +357,14 @@ struct hlsl_attribute #define HLSL_MODIFIER_INLINE 0x00002000 #define HLSL_STORAGE_CENTROID 0x00004000 #define HLSL_STORAGE_NOPERSPECTIVE 0x00008000 +#define HLSL_STORAGE_LINEAR 0x00010000 #define HLSL_TYPE_MODIFIERS_MASK (HLSL_MODIFIER_PRECISE | HLSL_MODIFIER_VOLATILE | \ HLSL_MODIFIER_CONST | HLSL_MODIFIER_ROW_MAJOR | \ HLSL_MODIFIER_COLUMN_MAJOR) #define HLSL_INTERPOLATION_MODIFIERS_MASK (HLSL_STORAGE_NOINTERPOLATION | HLSL_STORAGE_CENTROID | \ - HLSL_STORAGE_NOPERSPECTIVE) + HLSL_STORAGE_NOPERSPECTIVE | HLSL_STORAGE_LINEAR) #define HLSL_MODIFIERS_MAJORITY_MASK (HLSL_MODIFIER_ROW_MAJOR | HLSL_MODIFIER_COLUMN_MAJOR) diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index 401fba60..fe838750 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -95,6 +95,7 @@ if {return KW_IF; } in {return KW_IN; } inline {return KW_INLINE; } inout {return KW_INOUT; } +linear {return KW_LINEAR; } matrix {return KW_MATRIX; } namespace {return KW_NAMESPACE; } nointerpolation {return KW_NOINTERPOLATION; } diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 67b01293..0dde4c18 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -4893,6 +4893,7 @@ static void check_duplicated_switch_cases(struct hlsl_ctx *ctx, const struct hls %token KW_IN %token KW_INLINE %token KW_INOUT +%token KW_LINEAR %token KW_MATRIX %token KW_NAMESPACE %token KW_NOINTERPOLATION @@ -6262,6 +6263,10 @@ var_modifiers: { $$ = add_modifiers(ctx, $2, HLSL_STORAGE_CENTROID, &@1); } + | KW_LINEAR var_modifiers + { + $$ = add_modifiers(ctx, $2, HLSL_STORAGE_LINEAR, &@1); + } | KW_NOPERSPECTIVE var_modifiers { $$ = add_modifiers(ctx, $2, HLSL_STORAGE_NOPERSPECTIVE, &@1); diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 81ead41e..80f8ab98 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -4311,6 +4311,7 @@ static void write_sm4_dcl_semantic(const struct tpf_writer *tpf, const struct hl { HLSL_STORAGE_CENTROID | HLSL_STORAGE_NOPERSPECTIVE, VKD3DSIM_LINEAR_NOPERSPECTIVE_CENTROID }, { HLSL_STORAGE_NOPERSPECTIVE, VKD3DSIM_LINEAR_NOPERSPECTIVE }, { HLSL_STORAGE_CENTROID, VKD3DSIM_LINEAR_CENTROID }, + { HLSL_STORAGE_CENTROID | HLSL_STORAGE_LINEAR, VKD3DSIM_LINEAR_CENTROID }, }; unsigned int i;

1 0

Alexandre Julliard : ntdll: Store the syscall table in the TEB on x86-64.
by Alexandre Julliard 27 Nov '23

27 Nov '23

Module: wine Branch: master Commit: f2fa8ca29b4f3894daaafc7cf47260bc56ae5cb3 URL: https://gitlab.winehq.org/wine/wine/-/commit/f2fa8ca29b4f3894daaafc7cf47260… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 25 11:38:55 2023 +0100 ntdll: Store the syscall table in the TEB on x86-64. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55935 --- dlls/ntdll/unix/signal_x86_64.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 851655a0b5a..17a558da74c 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -420,13 +420,15 @@ struct amd64_thread_data DWORD_PTR dr7; /* 0318 */ void *pthread_teb; /* 0320 thread data for pthread */ struct syscall_frame *syscall_frame; /* 0328 syscall frame pointer */ - DWORD fs; /* 0330 WOW TEB selector */ + SYSTEM_SERVICE_TABLE *syscall_table; /* 0330 syscall table */ + DWORD fs; /* 0338 WOW TEB selector */ }; C_ASSERT( sizeof(struct amd64_thread_data) <= sizeof(((struct ntdll_thread_data *)0)->cpu_data) ); C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct amd64_thread_data, pthread_teb ) == 0x320 ); C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct amd64_thread_data, syscall_frame ) == 0x328 ); -C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct amd64_thread_data, fs ) == 0x330 ); +C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct amd64_thread_data, syscall_table ) == 0x330 ); +C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct amd64_thread_data, fs ) == 0x338 ); static inline struct amd64_thread_data *amd64_thread_data(void) { @@ -1585,7 +1587,7 @@ __ASM_GLOBAL_FUNC( call_user_mode_callback, #ifdef __linux__ "testl $12,%r14d\n\t" /* SYSCALL_HAVE_PTHREAD_TEB | SYSCALL_HAVE_WRFSGSBASE */ "jz 1f\n\t" - "movw 0x330(%r11),%fs\n" /* amd64_thread_data()->fs */ + "movw 0x338(%r11),%fs\n" /* amd64_thread_data()->fs */ "1:\n\t" #endif "movq %rdi,%rcx\n\t" /* id */ @@ -2463,9 +2465,11 @@ void call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend, TEB CONTEXT *ctx, context = { 0 }; I386_CONTEXT *wow_context; + thread_data->syscall_table = KeServiceDescriptorTable; + #if defined __linux__ arch_prctl( ARCH_SET_GS, teb ); - arch_prctl( ARCH_GET_FS, &amd64_thread_data()->pthread_teb ); + arch_prctl( ARCH_GET_FS, &thread_data->pthread_teb ); if (fs32_sel) alloc_fs_sel( fs32_sel >> 3, get_wow_teb( teb )); #elif defined (__FreeBSD__) || defined (__FreeBSD_kernel__) amd64_set_gsbase( teb ); @@ -2474,11 +2478,11 @@ void call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend, TEB #elif defined (__APPLE__) __asm__ volatile (".byte 0x65\n\tmovq %0,%c1" :: "r" (teb->Tib.Self), "n" (FIELD_OFFSET(TEB, Tib.Self))); __asm__ volatile (".byte 0x65\n\tmovq %0,%c1" :: "r" (teb->ThreadLocalStoragePointer), "n" (FIELD_OFFSET(TEB, ThreadLocalStoragePointer))); - amd64_thread_data()->pthread_teb = mac_thread_gsbase(); + thread_data->pthread_teb = mac_thread_gsbase(); /* alloc_tls_slot() needs to poke a value to an address relative to each thread's gsbase. Have each thread record its gsbase pointer into its TEB so alloc_tls_slot() can find it. */ - teb->Instrumentation[0] = amd64_thread_data()->pthread_teb; + teb->Instrumentation[0] = thread_data->pthread_teb; #else # error Please define setting %gs for your architecture #endif @@ -2685,7 +2689,12 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "movl %eax,%ebx\n\t" "shrl $8,%ebx\n\t" "andl $0x30,%ebx\n\t" /* syscall table number */ - "leaq " __ASM_NAME("KeServiceDescriptorTable") "(%rip),%rcx\n\t" +#ifdef __APPLE__ + "movq %gs:0x30,%rcx\n\t" + "movq 0x330(%rcx),%rcx\n\t" +#else + "movq %gs:0x330,%rcx\n\t" /* amd64_thread_data()->syscall_table */ +#endif "leaq (%rcx,%rbx,2),%rbx\n\t" "andl $0xfff,%eax\n\t" /* syscall number */ "cmpq 16(%rbx),%rax\n\t" /* table->ServiceLimit */ @@ -2714,7 +2723,7 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, #ifdef __linux__ "testl $12,%r14d\n\t" /* SYSCALL_HAVE_PTHREAD_TEB | SYSCALL_HAVE_WRFSGSBASE */ "jz 1f\n\t" - "movw %gs:0x330,%fs\n" /* amd64_thread_data()->fs */ + "movw %gs:0x338,%fs\n" /* amd64_thread_data()->fs */ "1:\n\t" #endif "testl $0x48,%edx\n\t" /* CONTEXT_FLOATING_POINT | CONTEXT_XSTATE */ @@ -2899,7 +2908,7 @@ __ASM_GLOBAL_FUNC( __wine_unix_call_dispatcher, #ifdef __linux__ "testl $12,%r14d\n\t" /* SYSCALL_HAVE_PTHREAD_TEB | SYSCALL_HAVE_WRFSGSBASE */ "jz 1f\n\t" - "movw %gs:0x330,%fs\n" /* amd64_thread_data()->fs */ + "movw %gs:0x338,%fs\n" /* amd64_thread_data()->fs */ "1:\n\t" #endif "movq 0x60(%rcx),%r14\n\t"

1 0

Alexandre Julliard : ntdll: Store the syscall table in the TEB on ARM64.
by Alexandre Julliard 27 Nov '23

27 Nov '23

Module: wine Branch: master Commit: 5b01bf79e634d03cd529f82af4b60bfa7ac8eaf3 URL: https://gitlab.winehq.org/wine/wine/-/commit/5b01bf79e634d03cd529f82af4b60b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 25 11:39:04 2023 +0100 ntdll: Store the syscall table in the TEB on ARM64. --- dlls/ntdll/unix/signal_arm64.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 0208913010d..5128c052bd1 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -149,10 +149,12 @@ C_ASSERT( sizeof( struct syscall_frame ) == 0x330 ); struct arm64_thread_data { struct syscall_frame *syscall_frame; /* 02f0 frame pointer on syscall entry */ + SYSTEM_SERVICE_TABLE *syscall_table; /* 02f8 syscall table */ }; C_ASSERT( sizeof(struct arm64_thread_data) <= sizeof(((struct ntdll_thread_data *)0)->cpu_data) ); C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct arm64_thread_data, syscall_frame ) == 0x2f0 ); +C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct arm64_thread_data, syscall_table ) == 0x2f8 ); static inline struct arm64_thread_data *arm64_thread_data(void) { @@ -1669,10 +1671,13 @@ void syscall_dispatcher_return_slowpath(void) void call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend, TEB *teb, struct syscall_frame *frame, void *syscall_cfa ) { + struct arm64_thread_data *thread_data = (struct arm64_thread_data *)&teb->GdiTebBatch; CONTEXT *ctx, context = { CONTEXT_ALL }; I386_CONTEXT *i386_context; ARM_CONTEXT *arm_context; + thread_data->syscall_table = KeServiceDescriptorTable; + context.X0 = (DWORD64)entry; context.X1 = (DWORD64)arg; context.X18 = (DWORD64)teb; @@ -1819,7 +1824,7 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, __ASM_CFI(".cfi_offset 28, -0x68\n\t") "and x20, x8, #0xfff\n\t" /* syscall number */ "ubfx x21, x8, #12, #2\n\t" /* syscall table number */ - "adr x16, " __ASM_NAME("KeServiceDescriptorTable") "\n\t" + "ldr x16, [x18, #0x2f8]\n\t" /* arm64_thread_data()->syscall_table */ "add x21, x16, x21, lsl #5\n\t" "ldr x16, [x21, #16]\n\t" /* table->ServiceLimit */ "cmp x20, x16\n\t"

1 0

Alexandre Julliard : ntdll: Still use LdrGetProcedureAddress for CtrlRoutine.
by Alexandre Julliard 27 Nov '23

27 Nov '23

Module: wine Branch: master Commit: a60d6f3ec967e9b114985e5dbb6ec7a22b0d0000 URL: https://gitlab.winehq.org/wine/wine/-/commit/a60d6f3ec967e9b114985e5dbb6ec7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 27 12:55:26 2023 +0100 ntdll: Still use LdrGetProcedureAddress for CtrlRoutine. Fixes d57c41990acde38f085da1c8dd6051e5fd287fb7. --- dlls/ntdll/loader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 5b0d3f6b6ee..df8324e0b6b 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -4268,6 +4268,7 @@ void loader_init( CONTEXT *context, void **entry ) if (!imports_fixup_done) { MEMORY_BASIC_INFORMATION meminfo; + ANSI_STRING ctrl_routine = RTL_CONSTANT_STRING( "CtrlRoutine" ); WINE_MODREF *kernel32; PEB *peb = NtCurrentTeb()->Peb; @@ -4304,7 +4305,7 @@ void loader_init( CONTEXT *context, void **entry ) } node_kernel32 = kernel32->ldr.DdagNode; pBaseThreadInitThunk = RtlFindExportedRoutineByName( kernel32->ldr.DllBase, "BaseThreadInitThunk" ); - pCtrlRoutine = RtlFindExportedRoutineByName( kernel32->ldr.DllBase, "CtrlRoutine" ); + LdrGetProcedureAddress( kernel32->ldr.DllBase, &ctrl_routine, 0, (void **)&pCtrlRoutine ); actctx_init(); locale_init();

1 0

Alexandre Julliard : winealsa.drv: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 27 Nov '23

27 Nov '23

Module: wine Branch: master Commit: feb9b9c7d50c37ccb1e604b3b63e5366acd7a0d7 URL: https://gitlab.winehq.org/wine/wine/-/commit/feb9b9c7d50c37ccb1e604b3b63e53… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 27 22:38:09 2023 +0100 winealsa.drv: Remove DECLSPEC_HIDDEN usage. --- dlls/winealsa.drv/unixlib.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index de6ce71571c..5784d5f7ade 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -18,15 +18,15 @@ #include "../mmdevapi/unixlib.h" -NTSTATUS alsa_midi_release(void *args) DECLSPEC_HIDDEN; -NTSTATUS alsa_midi_out_message(void *args) DECLSPEC_HIDDEN; -NTSTATUS alsa_midi_in_message(void *args) DECLSPEC_HIDDEN; -NTSTATUS alsa_midi_notify_wait(void *args) DECLSPEC_HIDDEN; +NTSTATUS alsa_midi_release(void *args); +NTSTATUS alsa_midi_out_message(void *args); +NTSTATUS alsa_midi_in_message(void *args); +NTSTATUS alsa_midi_notify_wait(void *args); #ifdef _WIN64 -NTSTATUS alsa_wow64_midi_out_message(void *args) DECLSPEC_HIDDEN; -NTSTATUS alsa_wow64_midi_in_message(void *args) DECLSPEC_HIDDEN; -NTSTATUS alsa_wow64_midi_notify_wait(void *args) DECLSPEC_HIDDEN; +NTSTATUS alsa_wow64_midi_out_message(void *args); +NTSTATUS alsa_wow64_midi_in_message(void *args); +NTSTATUS alsa_wow64_midi_notify_wait(void *args); #endif #define ALSA_CALL(func, params) WINE_UNIX_CALL(func, params)

1 0

Alexandre Julliard : winecoreaudio.drv: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 27 Nov '23

27 Nov '23

Module: wine Branch: master Commit: 21c5affdb5acc65dd97c1327fbb9c20e056f3d13 URL: https://gitlab.winehq.org/wine/wine/-/commit/21c5affdb5acc65dd97c1327fbb9c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 27 22:38:27 2023 +0100 winecoreaudio.drv: Remove DECLSPEC_HIDDEN usage. --- dlls/winecoreaudio.drv/unixlib.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 1ff4a0bac24..932a7726b38 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -20,17 +20,17 @@ #include "../mmdevapi/unixlib.h" -NTSTATUS unix_midi_init( void * ) DECLSPEC_HIDDEN; -NTSTATUS unix_midi_release( void * ) DECLSPEC_HIDDEN; -NTSTATUS unix_midi_out_message( void * ) DECLSPEC_HIDDEN; -NTSTATUS unix_midi_in_message( void * ) DECLSPEC_HIDDEN; -NTSTATUS unix_midi_notify_wait( void * ) DECLSPEC_HIDDEN; +NTSTATUS unix_midi_init( void * ); +NTSTATUS unix_midi_release( void * ); +NTSTATUS unix_midi_out_message( void * ); +NTSTATUS unix_midi_in_message( void * ); +NTSTATUS unix_midi_notify_wait( void * ); #ifdef _WIN64 -NTSTATUS unix_wow64_midi_init(void *args) DECLSPEC_HIDDEN; -NTSTATUS unix_wow64_midi_out_message(void *args) DECLSPEC_HIDDEN; -NTSTATUS unix_wow64_midi_in_message(void *args) DECLSPEC_HIDDEN; -NTSTATUS unix_wow64_midi_notify_wait(void *args) DECLSPEC_HIDDEN; +NTSTATUS unix_wow64_midi_init(void *args); +NTSTATUS unix_wow64_midi_out_message(void *args); +NTSTATUS unix_wow64_midi_in_message(void *args); +NTSTATUS unix_wow64_midi_notify_wait(void *args); #endif #define UNIX_CALL( func, params ) WINE_UNIX_CALL( func, params )

1 0

Alexandre Julliard : wineoss.drv: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 27 Nov '23

27 Nov '23

Module: wine Branch: master Commit: e9bf73872cc0cf8525a488678687f43469aea2de URL: https://gitlab.winehq.org/wine/wine/-/commit/e9bf73872cc0cf8525a488678687f4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 27 22:38:45 2023 +0100 wineoss.drv: Remove DECLSPEC_HIDDEN usage. --- dlls/wineoss.drv/unixlib.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index f921b00e0a2..54482a1feae 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -18,15 +18,15 @@ #include "../mmdevapi/unixlib.h" -NTSTATUS oss_midi_release(void *args) DECLSPEC_HIDDEN; -NTSTATUS oss_midi_out_message(void *args) DECLSPEC_HIDDEN; -NTSTATUS oss_midi_in_message(void *args) DECLSPEC_HIDDEN; -NTSTATUS oss_midi_notify_wait(void *args) DECLSPEC_HIDDEN; +NTSTATUS oss_midi_release(void *args); +NTSTATUS oss_midi_out_message(void *args); +NTSTATUS oss_midi_in_message(void *args); +NTSTATUS oss_midi_notify_wait(void *args); #ifdef _WIN64 -NTSTATUS oss_wow64_midi_out_message(void *args) DECLSPEC_HIDDEN; -NTSTATUS oss_wow64_midi_in_message(void *args) DECLSPEC_HIDDEN; -NTSTATUS oss_wow64_midi_notify_wait(void *args) DECLSPEC_HIDDEN; +NTSTATUS oss_wow64_midi_out_message(void *args); +NTSTATUS oss_wow64_midi_in_message(void *args); +NTSTATUS oss_wow64_midi_notify_wait(void *args); #endif #define OSS_CALL(func, params) WINE_UNIX_CALL(func, params)

1 0

Alexandre Julliard : gphoto2.ds: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 27 Nov '23

27 Nov '23

Module: wine Branch: master Commit: 048f2f346d499b35d1f2c600f92e91d1ab8d444b URL: https://gitlab.winehq.org/wine/wine/-/commit/048f2f346d499b35d1f2c600f92e91… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 27 22:39:08 2023 +0100 gphoto2.ds: Remove DECLSPEC_HIDDEN usage. --- dlls/gphoto2.ds/gphoto2_i.h | 56 ++++++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/gphoto2.ds/gphoto2_i.h b/dlls/gphoto2.ds/gphoto2_i.h index f52eebd1b00..231047555f2 100644 --- a/dlls/gphoto2.ds/gphoto2_i.h +++ b/dlls/gphoto2.ds/gphoto2_i.h @@ -34,7 +34,7 @@ #include "wine/list.h" -extern HINSTANCE GPHOTO2_instance DECLSPEC_HIDDEN; +extern HINSTANCE GPHOTO2_instance; /* internal information about an active data source */ struct tagActiveDS @@ -63,64 +63,64 @@ struct tagActiveDS struct jpeg_error_mgr jerr; }; -extern struct tagActiveDS activeDS DECLSPEC_HIDDEN; +extern struct tagActiveDS activeDS; /* Helper functions */ -extern TW_UINT16 GPHOTO2_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) DECLSPEC_HIDDEN; +extern TW_UINT16 GPHOTO2_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action); /* Implementation of operation triplets * From Application to Source (Image Information) */ TW_UINT16 GPHOTO2_CIEColorGet - (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; + (pTW_IDENTITY pOrigin, TW_MEMREF pData); TW_UINT16 GPHOTO2_ExtImageInfoGet - (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; + (pTW_IDENTITY pOrigin, TW_MEMREF pData); TW_UINT16 GPHOTO2_GrayResponseReset - (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; + (pTW_IDENTITY pOrigin, TW_MEMREF pData); TW_UINT16 GPHOTO2_GrayResponseSet - (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; + (pTW_IDENTITY pOrigin, TW_MEMREF pData); TW_UINT16 GPHOTO2_ImageFileXferGet - (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; + (pTW_IDENTITY pOrigin, TW_MEMREF pData); TW_UINT16 GPHOTO2_ImageInfoGet - (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; + (pTW_IDENTITY pOrigin, TW_MEMREF pData); TW_UINT16 GPHOTO2_ImageLayoutGet - (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; + (pTW_IDENTITY pOrigin, TW_MEMREF pData); TW_UINT16 GPHOTO2_ImageLayoutGetDefault - (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; + (pTW_IDENTITY pOrigin, TW_MEMREF pData); TW_UINT16 GPHOTO2_ImageLayoutReset - (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; + (pTW_IDENTITY pOrigin, TW_MEMREF pData); TW_UINT16 GPHOTO2_ImageLayoutSet - (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; + (pTW_IDENTITY pOrigin, TW_MEMREF pData); TW_UINT16 GPHOTO2_ImageMemXferGet - (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; + (pTW_IDENTITY pOrigin, TW_MEMREF pData); TW_UINT16 GPHOTO2_ImageNativeXferGet - (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; + (pTW_IDENTITY pOrigin, TW_MEMREF pData); TW_UINT16 GPHOTO2_JPEGCompressionGet - (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; + (pTW_IDENTITY pOrigin, TW_MEMREF pData); TW_UINT16 GPHOTO2_JPEGCompressionGetDefault - (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; + (pTW_IDENTITY pOrigin, TW_MEMREF pData); TW_UINT16 GPHOTO2_JPEGCompressionReset - (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; + (pTW_IDENTITY pOrigin, TW_MEMREF pData); TW_UINT16 GPHOTO2_JPEGCompressionSet - (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; + (pTW_IDENTITY pOrigin, TW_MEMREF pData); TW_UINT16 GPHOTO2_Palette8Get - (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; + (pTW_IDENTITY pOrigin, TW_MEMREF pData); TW_UINT16 GPHOTO2_Palette8GetDefault - (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; + (pTW_IDENTITY pOrigin, TW_MEMREF pData); TW_UINT16 GPHOTO2_Palette8Reset - (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; + (pTW_IDENTITY pOrigin, TW_MEMREF pData); TW_UINT16 GPHOTO2_Palette8Set - (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; + (pTW_IDENTITY pOrigin, TW_MEMREF pData); TW_UINT16 GPHOTO2_RGBResponseReset - (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; + (pTW_IDENTITY pOrigin, TW_MEMREF pData); TW_UINT16 GPHOTO2_RGBResponseSet - (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; + (pTW_IDENTITY pOrigin, TW_MEMREF pData); /* UI function */ -BOOL DoCameraUI(void) DECLSPEC_HIDDEN; -HWND TransferringDialogBox(HWND dialog, LONG progress) DECLSPEC_HIDDEN; +BOOL DoCameraUI(void); +HWND TransferringDialogBox(HWND dialog, LONG progress); /* Helper function for GUI */ TW_UINT16 -_get_gphoto2_file_as_DIB( unsigned int idx, BOOL preview, HWND hwnd, HBITMAP *hDIB ) DECLSPEC_HIDDEN; +_get_gphoto2_file_as_DIB( unsigned int idx, BOOL preview, HWND hwnd, HBITMAP *hDIB ); #endif

1 0