November 2023 - Wine-Commits

Jacek Caban : vkd3d: Use VkPipelineStageFlags type for VkSubmitInfo.pWaitDstStageMask flags.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: vkd3d Branch: master Commit: 72bb5e8b020edbfd962aad000c2e21d037efc12d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/72bb5e8b020edbfd962aad000c2e2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 24 14:00:29 2023 +0100 vkd3d: Use VkPipelineStageFlags type for VkSubmitInfo.pWaitDstStageMask flags. --- libs/vkd3d/command.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 77d0f275..15c8317b 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -6852,7 +6852,7 @@ fail: static HRESULT d3d12_command_queue_wait_binary_semaphore_locked(struct d3d12_command_queue *command_queue, struct d3d12_fence *fence, uint64_t value) { - static const VkPipelineStageFlagBits wait_stage_mask = VK_PIPELINE_STAGE_ALL_COMMANDS_BIT; + static const VkPipelineStageFlags wait_stage_mask = VK_PIPELINE_STAGE_ALL_COMMANDS_BIT; const struct vkd3d_vk_device_procs *vk_procs; struct vkd3d_signaled_semaphore *semaphore; uint64_t completed_value = 0; @@ -6948,7 +6948,7 @@ fail: static HRESULT d3d12_command_queue_wait_locked(struct d3d12_command_queue *command_queue, struct d3d12_fence *fence, uint64_t value) { - static const VkPipelineStageFlagBits wait_stage_mask = VK_PIPELINE_STAGE_ALL_COMMANDS_BIT; + static const VkPipelineStageFlags wait_stage_mask = VK_PIPELINE_STAGE_ALL_COMMANDS_BIT; VkTimelineSemaphoreSubmitInfoKHR timeline_submit_info; const struct vkd3d_vk_device_procs *vk_procs; struct vkd3d_queue *queue;

1 0

Jacek Caban : gitlab: Remove no longer needed -Wno-enum-conversion from build-mac.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: vkd3d Branch: master Commit: b47ac10b5c07caf4d0f4b4aa97d900e9ee98a165 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b47ac10b5c07caf4d0f4b4aa97d90… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 27 15:37:14 2023 +0100 gitlab: Remove no longer needed -Wno-enum-conversion from build-mac. --- gitlab/build-mac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitlab/build-mac b/gitlab/build-mac index 27c70d31..17a8c7a0 100755 --- a/gitlab/build-mac +++ b/gitlab/build-mac @@ -11,7 +11,7 @@ set -Eeuxo pipefail rm -fr build mkdir build cd build -if ../configure CFLAGS="-g -O2 -Wno-implicit-fallthrough -Wno-enum-conversion -Werror" && \ +if ../configure CFLAGS="-g -O2 -Wno-implicit-fallthrough -Werror" && \ make -j$(sysctl -n hw.ncpu) ; then make -j$(sysctl -n hw.ncpu) check || \ touch ../tests_failed

1 0

Jacek Caban : vkd3d-shader: Use unsigned int type for tags passed to sm6_metadata_get_uint_value.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: vkd3d Branch: master Commit: 1edbc057450d4b9bbb32b8e254fcb19beebbb7b3 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1edbc057450d4b9bbb32b8e254fcb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 24 14:01:35 2023 +0100 vkd3d-shader: Use unsigned int type for tags passed to sm6_metadata_get_uint_value. --- libs/vkd3d-shader/dxil.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 1709212f..c03948ae 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -4895,8 +4895,7 @@ static enum vkd3d_result sm6_parser_resources_init(struct sm6_parser *sm6) static void signature_element_read_additional_element_values(struct signature_element *e, const struct sm6_metadata_node *node, struct sm6_parser *sm6) { - unsigned int i, operand_count, value; - enum dxil_element_additional_tag tag; + unsigned int i, operand_count, value, tag; if (node->operand_count < 11 || !node->operands[10]) return; @@ -5254,8 +5253,7 @@ static enum vkd3d_result sm6_parser_entry_point_init(struct sm6_parser *sm6) { const struct sm6_metadata_value *m = sm6_parser_find_named_metadata(sm6, "dx.entryPoints"); const struct sm6_metadata_node *node, *entry_node = m ? m->u.node : NULL; - enum dxil_shader_properties_tag tag; - unsigned int i, operand_count; + unsigned int i, operand_count, tag; const struct sm6_value *value; enum vkd3d_result ret;

1 0

Alexandre Julliard : gphoto2.ds: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

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

Alexandre Julliard : sane.ds: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: wine Branch: master Commit: ca7684f3eb8ea72ea3d5aa76decbea319b43546a URL: https://gitlab.winehq.org/wine/wine/-/commit/ca7684f3eb8ea72ea3d5aa76decbea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 27 22:39:21 2023 +0100 sane.ds: Remove DECLSPEC_HIDDEN usage. --- dlls/sane.ds/sane_i.h | 170 +++++++++++++++++++++++++------------------------- 1 file changed, 85 insertions(+), 85 deletions(-)

1 0

Alexandre Julliard : wineoss.drv: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

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 : winealsa.drv: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

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 : ntdll: Still use LdrGetProcedureAddress for CtrlRoutine.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

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 : winecoreaudio.drv: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

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 : ntdll: Store the syscall table in the TEB on ARM64.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

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