wine-commits November 2023

wine-commits@winehq.org

1 participants
989 discussions

Zhiyi Zhang : msdasql: Return all initialization properties if no property ID is specified in dbprops_GetProperties().
by Alexandre Julliard 22 Nov '23

22 Nov '23

Module: wine Branch: master Commit: f0bad1ec37a135d41ad2a31f8e245166447d1dd7 URL: https://gitlab.winehq.org/wine/wine/-/commit/f0bad1ec37a135d41ad2a31f8e2451… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Nov 20 18:04:21 2023 +0800 msdasql: Return all initialization properties if no property ID is specified in dbprops_GetProperties(). --- dlls/msdasql/msdasql_main.c | 34 +++++++++++++++++++++++++++++++--- dlls/msdasql/tests/provider.c | 4 ---- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index 7ec35678b6f..34342295651 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -357,18 +357,19 @@ static HRESULT WINAPI dbprops_GetProperties(IDBProperties *iface, ULONG cPropert struct msdasql *provider = impl_from_IDBProperties(iface); int i, j, k; DBPROPSET *propset; + BOOL no_prop_id; TRACE("(%p)->(%ld %p %p %p)\n", provider, cPropertyIDSets, rgPropertyIDSets, pcPropertySets, prgPropertySets); *pcPropertySets = 1; - if (cPropertyIDSets != 1) + if (cPropertyIDSets > 1) { - FIXME("Currently only 1 property set supported.\n"); + FIXME("Currently only 0 or 1 property set are supported.\n"); cPropertyIDSets = 1; } - propset = CoTaskMemAlloc(cPropertyIDSets * sizeof(DBPROPSET)); + propset = CoTaskMemAlloc(max(cPropertyIDSets, 1) * sizeof(DBPROPSET)); if (IsEqualGUID(&rgPropertyIDSets[0].guidPropertySet, &DBPROPSET_DATASOURCEINFO)) { @@ -391,6 +392,33 @@ static HRESULT WINAPI dbprops_GetProperties(IDBProperties *iface, ULONG cPropert propset->guidPropertySet = DBPROPSET_DBINIT; + no_prop_id = TRUE; + for (i = 0; i < cPropertyIDSets; i++) + { + if (rgPropertyIDSets[i].cPropertyIDs) + { + no_prop_id = FALSE; + break; + } + } + + /* If no property ID is specified then return all currently set properties */ + if (no_prop_id) + { + propset->cProperties = ARRAY_SIZE(provider->properties); + propset->rgProperties = CoTaskMemAlloc(propset->cProperties * sizeof(DBPROP)); + for(i = 0; i < ARRAY_SIZE(provider->properties); i++) + { + propset->rgProperties[i].dwPropertyID = provider->properties[i].id; + V_VT(&propset->rgProperties[i].vValue) = VT_EMPTY; + VariantCopy(&propset->rgProperties[i].vValue, &provider->properties[i].value); + } + + *prgPropertySets = propset; + return S_OK; + } + + /* Return property info for properties in the specified property ID sets */ for (i=0; i < cPropertyIDSets; i++) { TRACE("Property id %d (count %ld, set %s)\n", i, rgPropertyIDSets[i].cPropertyIDs, diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 10517484c83..706d5a13ef9 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -201,10 +201,8 @@ static void test_Properties(void) /* Test when cPropertyIDSets is zero, all initialization properties should be returned */ hr = IDBProperties_GetProperties(props, 0, &propidlist, &propcnt, &propset); ok(hr == S_OK, "got 0x%08lx\n", hr); - todo_wine ok(propset->cProperties == ARRAY_SIZE(properties), "got %lu\n", propset->cProperties); for (i = 0; i < propset->cProperties; i++) - todo_wine_if(i > 0) ok(propset->rgProperties[i].dwPropertyID == properties[i], "%ld %ld, got %ld\n", i, properties[i], propset->rgProperties[i].dwPropertyID); free_dbpropset(propcnt, propset); @@ -217,9 +215,7 @@ static void test_Properties(void) hr = IDBProperties_GetProperties(props, 1, &propidlist, &propcnt, &propset); ok(hr == S_OK, "got 0x%08lx\n", hr); - todo_wine ok(propset->cProperties == ARRAY_SIZE(properties), "got %lu\n", propset->cProperties); - todo_wine for (i = 0; i < propset->cProperties; i++) ok(propset->rgProperties[i].dwPropertyID == properties[i], "%ld %ld, got %ld\n", i, properties[i], propset->rgProperties[i].dwPropertyID);

1 0

Zhiyi Zhang : msdasql/tests: Add more IDBProperties::GetProperties() tests.
by Alexandre Julliard 22 Nov '23

22 Nov '23

Module: wine Branch: master Commit: fd2a2d3842ca05ef4ea0433b6f539461738fb38c URL: https://gitlab.winehq.org/wine/wine/-/commit/fd2a2d3842ca05ef4ea0433b6f5394… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Nov 20 17:54:13 2023 +0800 msdasql/tests: Add more IDBProperties::GetProperties() tests. --- dlls/msdasql/tests/provider.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index b6936be31b5..10517484c83 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -154,6 +154,7 @@ static void test_Properties(void) free_dbpropinfoset(infocount, propinfoset); CoTaskMemFree(desc); + /* Test specifying all supported properties */ hr = IDBProperties_GetProperties(props, 1, &propidlist, &propcnt, &propset); ok(hr == S_OK, "got 0x%08lx\n", hr); ok(propidlist.cPropertyIDs == 14, "got %lu\n", propidlist.cPropertyIDs); @@ -184,7 +185,44 @@ static void test_Properties(void) ok(V_VT(&propset->rgProperties[i].vValue) == vartype, "%lu wrong type %d\n", i, V_VT(&propset->rgProperties[i].vValue)); } + for (i = 0; i < propset->cProperties; i++) + ok(propset->rgProperties[i].dwPropertyID == properties[i], + "%ld %ld, got %ld\n", i, properties[i], propset->rgProperties[i].dwPropertyID); + + free_dbpropset(propcnt, propset); + + /* Test specifying only one supported properties */ + propidlist.cPropertyIDs = 1; + hr = IDBProperties_GetProperties(props, 1, &propidlist, &propcnt, &propset); + ok(hr == S_OK, "got 0x%08lx\n", hr); + ok(propset->cProperties == 1, "expected 1, got %lu\n", propset->cProperties); + free_dbpropset(propcnt, propset); + + /* Test when cPropertyIDSets is zero, all initialization properties should be returned */ + hr = IDBProperties_GetProperties(props, 0, &propidlist, &propcnt, &propset); + ok(hr == S_OK, "got 0x%08lx\n", hr); + todo_wine + ok(propset->cProperties == ARRAY_SIZE(properties), "got %lu\n", propset->cProperties); + for (i = 0; i < propset->cProperties; i++) + todo_wine_if(i > 0) + ok(propset->rgProperties[i].dwPropertyID == properties[i], + "%ld %ld, got %ld\n", i, properties[i], propset->rgProperties[i].dwPropertyID); + free_dbpropset(propcnt, propset); + + /* Test when propidlist.cPropertyIDs is zero, all initialization properties should be returned */ CoTaskMemFree(propidlist.rgPropertyIDs); + propidlist.guidPropertySet = DBPROPSET_DBINIT; + propidlist.cPropertyIDs = 0; + propidlist.rgPropertyIDs = NULL; + + hr = IDBProperties_GetProperties(props, 1, &propidlist, &propcnt, &propset); + ok(hr == S_OK, "got 0x%08lx\n", hr); + todo_wine + ok(propset->cProperties == ARRAY_SIZE(properties), "got %lu\n", propset->cProperties); + todo_wine + for (i = 0; i < propset->cProperties; i++) + ok(propset->rgProperties[i].dwPropertyID == properties[i], + "%ld %ld, got %ld\n", i, properties[i], propset->rgProperties[i].dwPropertyID); free_dbpropset(propcnt, propset); }

1 0

Zhiyi Zhang : msdasql/tests: Fix memory leaks.
by Alexandre Julliard 22 Nov '23

22 Nov '23

Module: wine Branch: master Commit: b54e1ec604419326356a733c3884dbee1d4ee0c9 URL: https://gitlab.winehq.org/wine/wine/-/commit/b54e1ec604419326356a733c3884db… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Nov 21 10:50:42 2023 +0800 msdasql/tests: Fix memory leaks. --- dlls/msdasql/tests/provider.c | 42 ++++++++++++++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 10 deletions(-) diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index bb549bb2262..b6936be31b5 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -43,6 +43,32 @@ static char mdbpath[MAX_PATH]; static const VARTYPE intptr_vartype = (sizeof(void *) == 8 ? VT_I8 : VT_I4); +static void free_dbpropset(ULONG count, DBPROPSET *propset) +{ + ULONG i, j; + + for (i = 0; i < count; i++) + { + for (j = 0; j < propset[i].cProperties; j++) + VariantClear(&propset[i].rgProperties[j].vValue); + CoTaskMemFree(propset[i].rgProperties); + } + CoTaskMemFree(propset); +} + +static void free_dbpropinfoset(ULONG count, DBPROPINFOSET *propinfoset) +{ + ULONG i, j; + + for (i = 0; i < count; i++) + { + for (j = 0; j < propinfoset[i].cPropertyInfos; j++) + VariantClear(&propinfoset[i].rgPropertyInfos[j].vValues); + CoTaskMemFree(propinfoset[i].rgPropertyInfos); + } + CoTaskMemFree(propinfoset); +} + static void test_msdasql(void) { HRESULT hr; @@ -125,11 +151,8 @@ static void test_Properties(void) propidlist.rgPropertyIDs[i] = propinfoset->rgPropertyInfos[i].dwPropertyID; } - for (i = 0; i < propinfoset->cPropertyInfos; i++) - VariantClear(&propinfoset->rgPropertyInfos[i].vValues); - - CoTaskMemFree(propinfoset->rgPropertyInfos); - CoTaskMemFree(propinfoset); + free_dbpropinfoset(infocount, propinfoset); + CoTaskMemFree(desc); hr = IDBProperties_GetProperties(props, 1, &propidlist, &propcnt, &propset); ok(hr == S_OK, "got 0x%08lx\n", hr); @@ -162,7 +185,7 @@ static void test_Properties(void) } CoTaskMemFree(propidlist.rgPropertyIDs); - CoTaskMemFree(propset); + free_dbpropset(propcnt, propset); } propid = DBPROP_MULTIPLERESULTS; @@ -179,7 +202,7 @@ static void test_Properties(void) ok(propset->rgProperties[0].dwPropertyID == DBPROP_MULTIPLERESULTS, "got %ld\n", propset->rgProperties[0].dwPropertyID); ok(propset->rgProperties[0].dwStatus == DBPROPSTATUS_NOTSUPPORTED, "got %ld\n", propset->rgProperties[0].dwStatus); - CoTaskMemFree(propset); + free_dbpropset(propcnt, propset); IDBProperties_Release(props); } @@ -324,7 +347,7 @@ static void test_command_properties(ICommandProperties *props) } } - CoTaskMemFree(propset); + free_dbpropset(count, propset); } static void test_command_interfaces(IUnknown *cmd) @@ -528,8 +551,7 @@ static void test_rowset_info(IRowset *rowset) propset->rgProperties[i].dwPropertyID, row_props[i]); } - CoTaskMemFree(propset); - + free_dbpropset(propcnt, propset); IRowsetInfo_Release(info); }

1 0

Alex Henrie : d3dcompiler_43: Use CRT allocation functions.
by Alexandre Julliard 22 Nov '23

22 Nov '23

Module: wine Branch: master Commit: 9ba4c10035e780cdef14f4359fa55bd1782cdd0a URL: https://gitlab.winehq.org/wine/wine/-/commit/9ba4c10035e780cdef14f4359fa55b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Nov 21 17:50:21 2023 -0700 d3dcompiler_43: Use CRT allocation functions. --- dlls/d3dcompiler_43/asmparser.c | 26 +++---- dlls/d3dcompiler_43/asmshader.y | 8 +-- dlls/d3dcompiler_43/blob.c | 18 ++--- dlls/d3dcompiler_43/bytecodewriter.c | 77 +++++++++++---------- dlls/d3dcompiler_43/compiler.c | 24 +++---- dlls/d3dcompiler_43/d3dcompiler_private.h | 18 ----- dlls/d3dcompiler_43/reflection.c | 109 +++++++++++++----------------- dlls/d3dcompiler_43/utils.c | 4 +- 8 files changed, 125 insertions(+), 159 deletions(-)

1 0

Alexandre Julliard : ntdll: Remove the signal_exit_thread wrapper.
by Alexandre Julliard 22 Nov '23

22 Nov '23

Module: wine Branch: master Commit: 101bb94a69075cfddc527efda25772dbf4b76adf URL: https://gitlab.winehq.org/wine/wine/-/commit/101bb94a69075cfddc527efda25772… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 20 14:31:36 2023 +0100 ntdll: Remove the signal_exit_thread wrapper. --- dlls/ntdll/unix/signal_arm.c | 6 ------ dlls/ntdll/unix/signal_arm64.c | 5 ----- dlls/ntdll/unix/signal_i386.c | 6 ------ dlls/ntdll/unix/signal_x86_64.c | 6 ------ dlls/ntdll/unix/thread.c | 8 ++++---- dlls/ntdll/unix/unix_private.h | 3 +-- 6 files changed, 5 insertions(+), 29 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 07327718c0b..f255328fc73 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -1662,12 +1662,6 @@ __ASM_GLOBAL_FUNC( signal_start_thread, "bl " __ASM_NAME("call_init_thunk") ) -/*********************************************************************** - * signal_exit_thread - */ -__ASM_GLOBAL_FUNC( signal_exit_thread, "bx r1" ) - - /*********************************************************************** * __wine_syscall_dispatcher */ diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 6bf100351e1..0208913010d 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -1764,11 +1764,6 @@ __ASM_GLOBAL_FUNC( signal_start_thread, "1:\tmov sp, x4\n\t" "bl " __ASM_NAME("call_init_thunk") ) -/*********************************************************************** - * signal_exit_thread - */ -__ASM_GLOBAL_FUNC( signal_exit_thread, "br x1" ) - /*********************************************************************** * __wine_syscall_dispatcher diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index a1454d8d291..a5aa9623b07 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -2525,12 +2525,6 @@ __ASM_GLOBAL_FUNC( signal_start_thread, "call " __ASM_NAME("call_init_thunk") ) -/*********************************************************************** - * signal_exit_thread - */ -__ASM_GLOBAL_FUNC( signal_exit_thread, "jmp *8(%esp)" ) - - /*********************************************************************** * __wine_syscall_dispatcher */ diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index b7bed4e3702..851655a0b5a 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2572,12 +2572,6 @@ __ASM_GLOBAL_FUNC( signal_start_thread, "call " __ASM_NAME("call_init_thunk")) -/*********************************************************************** - * signal_exit_thread - */ -__ASM_GLOBAL_FUNC( signal_exit_thread, "jmp *%rsi" ) - - /*********************************************************************** * __wine_syscall_dispatcher */ diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 2a9bc41e788..c4653c6a769 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1078,7 +1078,7 @@ static void contexts_from_server( CONTEXT *context, context_t server_contexts[2] /*********************************************************************** * pthread_exit_wrapper */ -static void pthread_exit_wrapper( int status ) +static DECLSPEC_NORETURN void pthread_exit_wrapper( int status ) { close( ntdll_get_thread_data()->wait_fd[0] ); close( ntdll_get_thread_data()->wait_fd[1] ); @@ -1404,7 +1404,7 @@ void abort_thread( int status ) { pthread_sigmask( SIG_BLOCK, &server_block_set, NULL ); if (InterlockedDecrement( &nb_threads ) <= 0) abort_process( status ); - signal_exit_thread( status, pthread_exit_wrapper, NtCurrentTeb() ); + pthread_exit_wrapper( status ); } @@ -1439,7 +1439,7 @@ static DECLSPEC_NORETURN void exit_thread( int status ) virtual_free_teb( teb ); } } - signal_exit_thread( status, pthread_exit_wrapper, NtCurrentTeb() ); + pthread_exit_wrapper( status ); } @@ -1449,7 +1449,7 @@ static DECLSPEC_NORETURN void exit_thread( int status ) void exit_process( int status ) { pthread_sigmask( SIG_BLOCK, &server_block_set, NULL ); - signal_exit_thread( get_unix_exit_code( status ), process_exit_wrapper, NtCurrentTeb() ); + process_exit_wrapper( get_unix_exit_code( status )); } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index ef116bee917..9aeacc7b823 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -203,7 +203,7 @@ extern unsigned int server_queue_process_apc( HANDLE process, const apc_call_t * extern int server_get_unix_fd( HANDLE handle, unsigned int wanted_access, int *unix_fd, int *needs_close, enum server_fd_type *type, unsigned int *options ); extern void wine_server_send_fd( int fd ); -extern void process_exit_wrapper( int status ); +extern void process_exit_wrapper( int status ) DECLSPEC_NORETURN; extern size_t server_init_process(void); extern void server_init_process_done(void); extern void server_init_thread( void *entry_point, BOOL *suspend ); @@ -276,7 +276,6 @@ extern void signal_free_thread( TEB *teb ); extern void signal_init_process(void); extern void DECLSPEC_NORETURN signal_start_thread( PRTL_THREAD_START_ROUTINE entry, void *arg, BOOL suspend, TEB *teb ); -extern void DECLSPEC_NORETURN signal_exit_thread( int status, void (*func)(int), TEB *teb ); extern SYSTEM_SERVICE_TABLE KeServiceDescriptorTable[4]; extern void __wine_syscall_dispatcher(void); extern void DECLSPEC_NORETURN __wine_syscall_dispatcher_return( void *frame, ULONG_PTR retval );

1 0

Alexandre Julliard : ntdll: Get rid of the thread exit frame on ARM.
by Alexandre Julliard 22 Nov '23

22 Nov '23

Module: wine Branch: master Commit: 5ee1bf0aa195882c08dce66cb317cd2134d0f02a URL: https://gitlab.winehq.org/wine/wine/-/commit/5ee1bf0aa195882c08dce66cb317cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 20 14:27:48 2023 +0100 ntdll: Get rid of the thread exit frame on ARM. --- dlls/ntdll/unix/signal_arm.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index a5ab2473ade..07327718c0b 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -205,15 +205,13 @@ C_ASSERT( sizeof( struct syscall_frame ) == 0x160); struct arm_thread_data { - void *exit_frame; /* 1d4 exit frame pointer */ + SYSTEM_SERVICE_TABLE *syscall_table; /* 1d4 syscall table */ struct syscall_frame *syscall_frame; /* 1d8 frame pointer on syscall entry */ - SYSTEM_SERVICE_TABLE *syscall_table; /* 1dc syscall table */ }; C_ASSERT( sizeof(struct arm_thread_data) <= sizeof(((struct ntdll_thread_data *)0)->cpu_data) ); -C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct arm_thread_data, exit_frame ) == 0x1d4 ); +C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct arm_thread_data, syscall_table ) == 0x1d4 ); C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct arm_thread_data, syscall_frame ) == 0x1d8 ); -C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct arm_thread_data, syscall_table ) == 0x1dc ); static inline struct arm_thread_data *arm_thread_data(void) { @@ -1653,8 +1651,6 @@ __ASM_GLOBAL_FUNC( signal_start_thread, "push {r4-r12,lr}\n\t" "add r7, sp, #0x28\n\t" /* syscall_cfa */ "mcr p15, 0, r3, c13, c0, 2\n\t" /* set teb register */ - /* store exit frame */ - "str sp, [r3, #0x1d4]\n\t" /* arm_thread_data()->exit_frame */ /* set syscall frame */ "ldr r6, [r3, #0x1d8]\n\t" /* arm_thread_data()->syscall_frame */ "cbnz r6, 1f\n\t" @@ -1669,15 +1665,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" - "cmp r3, ip\n\t" - "it ne\n\t" - "movne sp, r3\n\t" - "blx r1" ) +__ASM_GLOBAL_FUNC( signal_exit_thread, "bx r1" ) /*********************************************************************** @@ -1718,7 +1706,7 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, __ASM_CFI(".cfi_offset r11,-0x0c\n\t") __ASM_CFI(".cfi_offset r12,-0x08\n\t") __ASM_CFI(".cfi_offset lr,-0x04\n\t") - "ldr r5, [r2, #0x1dc]\n\t" /* arm_thread_data()->syscall_table */ + "ldr r5, [r2, #0x1d4]\n\t" /* arm_thread_data()->syscall_table */ "ubfx r4, ip, #12, #2\n\t" /* syscall table number */ "bfc ip, #12, #20\n\t" /* syscall number */ "add r4, r5, r4, lsl #4\n\t"

1 0

Alexandre Julliard : ntdll: Get rid of the thread exit frame on ARM64.
by Alexandre Julliard 22 Nov '23

22 Nov '23

Module: wine Branch: master Commit: e5af98dc17fd4e2b50995c962b31cee970a9b71f URL: https://gitlab.winehq.org/wine/wine/-/commit/e5af98dc17fd4e2b50995c962b31ce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 20 14:21:42 2023 +0100 ntdll: Get rid of the thread exit frame on ARM64. --- dlls/ntdll/unix/signal_arm64.c | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 8bf9fce3948..6bf100351e1 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -148,13 +148,11 @@ C_ASSERT( sizeof( struct syscall_frame ) == 0x330 ); struct arm64_thread_data { - void *exit_frame; /* 02f0 exit frame pointer */ - struct syscall_frame *syscall_frame; /* 02f8 frame pointer on syscall entry */ + struct syscall_frame *syscall_frame; /* 02f0 frame pointer on syscall entry */ }; 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, exit_frame ) == 0x2f0 ); -C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct arm64_thread_data, syscall_frame ) == 0x2f8 ); +C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct arm64_thread_data, syscall_frame ) == 0x2f0 ); static inline struct arm64_thread_data *arm64_thread_data(void) { @@ -1143,9 +1141,9 @@ __ASM_GLOBAL_FUNC( call_user_mode_callback, "ldr x4, [x18]\n\t" /* teb->Tib.ExceptionList */ "stp x3, x4, [x29, #0xb0]\n\t" - "ldr x7, [x18, #0x2f8]\n\t" /* arm64_thread_data()->syscall_frame */ + "ldr x7, [x18, #0x2f0]\n\t" /* arm64_thread_data()->syscall_frame */ "sub x3, sp, #0x330\n\t" /* sizeof(struct syscall_frame) */ - "str x3, [x18, #0x2f8]\n\t" /* arm64_thread_data()->syscall_frame */ + "str x3, [x18, #0x2f0]\n\t" /* arm64_thread_data()->syscall_frame */ "add x8, x29, #0xc0\n\t" "stp x7, x8, [x3, #0x110]\n\t" /* frame->prev_frame,syscall_cfa */ /* switch to user stack */ @@ -1159,9 +1157,9 @@ __ASM_GLOBAL_FUNC( call_user_mode_callback, extern void DECLSPEC_NORETURN user_mode_callback_return( void *ret_ptr, ULONG ret_len, NTSTATUS status, TEB *teb ); __ASM_GLOBAL_FUNC( user_mode_callback_return, - "ldr x4, [x3, #0x2f8]\n\t" /* arm64_thread_data()->syscall_frame */ + "ldr x4, [x3, #0x2f0]\n\t" /* arm64_thread_data()->syscall_frame */ "ldp x5, x29, [x4,#0x110]\n\t" /* prev_frame,syscall_cfa */ - "str x5, [x3, #0x2f8]\n\t" /* arm64_thread_data()->syscall_frame */ + "str x5, [x3, #0x2f0]\n\t" /* arm64_thread_data()->syscall_frame */ "sub x29, x29, #0xc0\n\t" __ASM_CFI(".cfi_def_cfa_register 29\n\t") __ASM_CFI(".cfi_rel_offset 29,0x00\n\t") @@ -1757,13 +1755,11 @@ __ASM_GLOBAL_FUNC( signal_start_thread, __ASM_CFI(".cfi_rel_offset 27,0x50\n\t") __ASM_CFI(".cfi_rel_offset 28,0x58\n\t") "add x5, x29, #0xc0\n\t" /* syscall_cfa */ - /* store exit frame */ - "str x29, [x3, #0x2f0]\n\t" /* arm64_thread_data()->exit_frame */ /* set syscall frame */ - "ldr x4, [x3, #0x2f8]\n\t" /* arm64_thread_data()->syscall_frame */ + "ldr x4, [x3, #0x2f0]\n\t" /* arm64_thread_data()->syscall_frame */ "cbnz x4, 1f\n\t" "sub x4, sp, #0x330\n\t" /* sizeof(struct syscall_frame) */ - "str x4, [x3, #0x2f8]\n\t" /* arm64_thread_data()->syscall_frame */ + "str x4, [x3, #0x2f0]\n\t" /* arm64_thread_data()->syscall_frame */ /* switch to kernel stack */ "1:\tmov sp, x4\n\t" "bl " __ASM_NAME("call_init_thunk") ) @@ -1771,21 +1767,14 @@ __ASM_GLOBAL_FUNC( signal_start_thread, /*********************************************************************** * signal_exit_thread */ -__ASM_GLOBAL_FUNC( signal_exit_thread, - "stp x29, x30, [sp,#-0xc0]!\n\t" - "ldr x3, [x2, #0x2f0]\n\t" /* arm64_thread_data()->exit_frame */ - "str xzr, [x2, #0x2f0]\n\t" - "cbz x3, 1f\n\t" - "mov sp, x3\n" - "1:\tldp x29, x30, [sp], #0xc0\n\t" - "br x1" ) +__ASM_GLOBAL_FUNC( signal_exit_thread, "br x1" ) /*********************************************************************** * __wine_syscall_dispatcher */ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, - "ldr x10, [x18, #0x2f8]\n\t" /* arm64_thread_data()->syscall_frame */ + "ldr x10, [x18, #0x2f0]\n\t" /* arm64_thread_data()->syscall_frame */ "stp x18, x19, [x10, #0x90]\n\t" "stp x20, x21, [x10, #0xa0]\n\t" "stp x22, x23, [x10, #0xb0]\n\t" @@ -1920,7 +1909,7 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, * __wine_unix_call_dispatcher */ __ASM_GLOBAL_FUNC( __wine_unix_call_dispatcher, - "ldr x10, [x18, #0x2f8]\n\t" /* arm64_thread_data()->syscall_frame */ + "ldr x10, [x18, #0x2f0]\n\t" /* arm64_thread_data()->syscall_frame */ "stp x18, x19, [x10, #0x90]\n\t" "stp x20, x21, [x10, #0xa0]\n\t" "stp x22, x23, [x10, #0xb0]\n\t"

1 0

Alexandre Julliard : ntdll: Get rid of the thread exit frame on x86-64.
by Alexandre Julliard 22 Nov '23

22 Nov '23

Module: wine Branch: master Commit: f6b45674076d50b3c44b0e6873471f532f64d4c0 URL: https://gitlab.winehq.org/wine/wine/-/commit/f6b45674076d50b3c44b0e6873471f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 20 14:03:48 2023 +0100 ntdll: Get rid of the thread exit frame on x86-64. --- dlls/ntdll/unix/signal_x86_64.c | 40 +++++++++++----------------------------- 1 file changed, 11 insertions(+), 29 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 36b02b49f49..b7bed4e3702 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -418,16 +418,15 @@ struct amd64_thread_data DWORD_PTR dr3; /* 0308 */ DWORD_PTR dr6; /* 0310 */ DWORD_PTR dr7; /* 0318 */ - void *exit_frame; /* 0320 exit frame pointer */ + void *pthread_teb; /* 0320 thread data for pthread */ struct syscall_frame *syscall_frame; /* 0328 syscall frame pointer */ - void *pthread_teb; /* 0330 thread data for pthread */ - DWORD fs; /* 0338 WOW TEB selector */ + DWORD fs; /* 0330 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, exit_frame ) == 0x320 ); +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, pthread_teb ) == 0x330 ); +C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct amd64_thread_data, fs ) == 0x330 ); static inline struct amd64_thread_data *amd64_thread_data(void) { @@ -1586,7 +1585,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 0x338(%r11),%fs\n" /* amd64_thread_data()->fs */ + "movw 0x330(%r11),%fs\n" /* amd64_thread_data()->fs */ "1:\n\t" #endif "movq %rdi,%rcx\n\t" /* id */ @@ -2561,8 +2560,6 @@ __ASM_GLOBAL_FUNC( signal_start_thread, "movq %r15,-0x28(%rbp)\n\t" __ASM_CFI(".cfi_rel_offset %r15,-0x28\n\t") "leaq 0x10(%rbp),%r9\n\t" /* syscall_cfa */ - /* store exit frame */ - "movq %rsp,0x320(%rcx)\n\t" /* amd64_thread_data()->exit_frame */ /* set syscall frame */ "movq 0x328(%rcx),%r8\n\t" /* amd64_thread_data()->syscall_frame */ "orq %r8,%r8\n\t" @@ -2578,23 +2575,8 @@ __ASM_GLOBAL_FUNC( signal_start_thread, /*********************************************************************** * signal_exit_thread */ -__ASM_GLOBAL_FUNC( signal_exit_thread, - /* fetch exit frame */ - "xorl %ecx,%ecx\n\t" - "xchgq %rcx,0x320(%rdx)\n\t" /* amd64_thread_data()->exit_frame */ - "testq %rcx,%rcx\n\t" - "jnz 1f\n\t" - "jmp *%rsi\n" - /* switch to exit frame stack */ - "1:\tmovq %rcx,%rsp\n\t" - __ASM_CFI(".cfi_adjust_cfa_offset 56\n\t") - __ASM_CFI(".cfi_rel_offset %rbp,48\n\t") - __ASM_CFI(".cfi_rel_offset %rbx,40\n\t") - __ASM_CFI(".cfi_rel_offset %r12,32\n\t") - __ASM_CFI(".cfi_rel_offset %r13,24\n\t") - __ASM_CFI(".cfi_rel_offset %r14,16\n\t") - __ASM_CFI(".cfi_rel_offset %r15,8\n\t") - "call *%rsi" ) +__ASM_GLOBAL_FUNC( signal_exit_thread, "jmp *%rsi" ) + /*********************************************************************** * __wine_syscall_dispatcher @@ -2677,7 +2659,7 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, #ifdef __linux__ "testl $12,%r14d\n\t" /* SYSCALL_HAVE_PTHREAD_TEB | SYSCALL_HAVE_WRFSGSBASE */ "jz 2f\n\t" - "movq %gs:0x330,%rsi\n\t" /* amd64_thread_data()->pthread_teb */ + "movq %gs:0x320,%rsi\n\t" /* amd64_thread_data()->pthread_teb */ "testl $8,%r14d\n\t" /* SYSCALL_HAVE_WRFSGSBASE */ "jz 1f\n\t" "wrfsbase %rsi\n\t" @@ -2738,7 +2720,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:0x338,%fs\n" /* amd64_thread_data()->fs */ + "movw %gs:0x330,%fs\n" /* amd64_thread_data()->fs */ "1:\n\t" #endif "testl $0x48,%edx\n\t" /* CONTEXT_FLOATING_POINT | CONTEXT_XSTATE */ @@ -2880,7 +2862,7 @@ __ASM_GLOBAL_FUNC( __wine_unix_call_dispatcher, #ifdef __linux__ "testl $12,%r14d\n\t" /* SYSCALL_HAVE_PTHREAD_TEB | SYSCALL_HAVE_WRFSGSBASE */ "jz 2f\n\t" - "movq %gs:0x330,%rsi\n\t" /* amd64_thread_data()->pthread_teb */ + "movq %gs:0x320,%rsi\n\t" /* amd64_thread_data()->pthread_teb */ "testl $8,%r14d\n\t" /* SYSCALL_HAVE_WRFSGSBASE */ "jz 1f\n\t" "wrfsbase %rsi\n\t" @@ -2923,7 +2905,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:0x338,%fs\n" /* amd64_thread_data()->fs */ + "movw %gs:0x330,%fs\n" /* amd64_thread_data()->fs */ "1:\n\t" #endif "movq 0x60(%rcx),%r14\n\t"

1 0

Alexandre Julliard : ntdll: Get rid of the thread exit frame on i386.
by Alexandre Julliard 22 Nov '23

22 Nov '23

Module: wine Branch: master Commit: a50df817af8d6fdee679335ffe394781679d52c1 URL: https://gitlab.winehq.org/wine/wine/-/commit/a50df817af8d6fdee679335ffe3947… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 20 14:00:22 2023 +0100 ntdll: Get rid of the thread exit frame on i386. --- dlls/ntdll/unix/signal_i386.c | 33 +++++---------------------------- 1 file changed, 5 insertions(+), 28 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 57a525aaf97..a1454d8d291 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -480,16 +480,14 @@ struct x86_thread_data UINT dr3; /* 1e8 */ UINT dr6; /* 1ec */ UINT dr7; /* 1f0 */ - void *exit_frame; /* 1f4 exit frame pointer */ + SYSTEM_SERVICE_TABLE *syscall_table; /* 1f4 syscall table */ struct syscall_frame *syscall_frame; /* 1f8 frame pointer on syscall entry */ - SYSTEM_SERVICE_TABLE *syscall_table; /* 1fc syscall table */ }; C_ASSERT( sizeof(struct x86_thread_data) <= sizeof(((struct ntdll_thread_data *)0)->cpu_data) ); C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct x86_thread_data, gs ) == 0x1d8 ); -C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct x86_thread_data, exit_frame ) == 0x1f4 ); +C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct x86_thread_data, syscall_table ) == 0x1f4 ); C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct x86_thread_data, syscall_frame ) == 0x1f8 ); -C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct x86_thread_data, syscall_table ) == 0x1fc ); /* flags to control the behavior of the syscall dispatcher */ #define SYSCALL_HAVE_XSAVE 1 @@ -2508,10 +2506,8 @@ __ASM_GLOBAL_FUNC( signal_start_thread, "pushl %edi\n\t" __ASM_CFI(".cfi_rel_offset %edi,-12\n\t") "leal 8(%ebp),%edx\n\t" /* syscall_cfa */ - /* store exit frame */ - "movl 20(%ebp),%ecx\n\t" /* teb */ - "movl %ebp,0x1f4(%ecx)\n\t" /* x86_thread_data()->exit_frame */ /* set syscall frame */ + "movl 20(%ebp),%ecx\n\t" /* teb */ "movl 0x1f8(%ecx),%eax\n\t" /* x86_thread_data()->syscall_frame */ "orl %eax,%eax\n\t" "jnz 1f\n\t" @@ -2532,26 +2528,7 @@ __ASM_GLOBAL_FUNC( signal_start_thread, /*********************************************************************** * signal_exit_thread */ -__ASM_GLOBAL_FUNC( signal_exit_thread, - "movl 8(%esp),%ecx\n\t" - "movl 12(%esp),%esi\n\t" - "xorl %edx,%edx\n\t" - /* fetch exit frame */ - "xchgl %edx,0x1f4(%esi)\n\t" /* x86_thread_data()->exit_frame */ - "testl %edx,%edx\n\t" - "jnz 1f\n\t" - "jmp *%ecx\n\t" - /* switch to exit frame stack */ - "1:\tmovl 4(%esp),%eax\n\t" - "movl %edx,%ebp\n\t" - __ASM_CFI(".cfi_def_cfa %ebp,4\n\t") - __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") - __ASM_CFI(".cfi_rel_offset %ebx,-4\n\t") - __ASM_CFI(".cfi_rel_offset %esi,-8\n\t") - __ASM_CFI(".cfi_rel_offset %edi,-12\n\t") - "leal -20(%ebp),%esp\n\t" - "pushl %eax\n\t" - "call *%ecx" ) +__ASM_GLOBAL_FUNC( signal_exit_thread, "jmp *8(%esp)" ) /*********************************************************************** @@ -2597,7 +2574,7 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "movl %eax,%ebx\n\t" "shrl $8,%ebx\n\t" "andl $0x30,%ebx\n\t" /* syscall table number */ - "addl %fs:0x1fc,%ebx\n\t" /* x86_thread_data()->syscall_table */ + "addl %fs:0x1f4,%ebx\n\t" /* x86_thread_data()->syscall_table */ "testl $3,(%ecx)\n\t" /* frame->syscall_flags & (SYSCALL_HAVE_XSAVE | SYSCALL_HAVE_XSAVEC) */ "jz 2f\n\t" "movl $7,%eax\n\t"

1 0

Alexandre Julliard : ntdll: Switch to the kernel stack to abort a thread on ARM.
by Alexandre Julliard 22 Nov '23

22 Nov '23

Module: wine Branch: master Commit: 3e421c6675a2cfa45a5a641585b235b5cd1ecf6d URL: https://gitlab.winehq.org/wine/wine/-/commit/3e421c6675a2cfa45a5a641585b235… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 20 14:39:22 2023 +0100 ntdll: Switch to the kernel stack to abort a thread on ARM. --- dlls/ntdll/unix/signal_arm.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index b6f4636e3eb..a5ab2473ade 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -1219,6 +1219,30 @@ __ASM_GLOBAL_FUNC( user_mode_callback_return, "pop {r4-r12,pc}" ) +/*********************************************************************** + * user_mode_abort_thread + */ +extern void DECLSPEC_NORETURN user_mode_abort_thread( NTSTATUS status, struct syscall_frame *frame ); +__ASM_GLOBAL_FUNC( user_mode_abort_thread, + __ASM_EHABI(".cantunwind\n\t") + "ldr r7, [r1, #0x28]\n\t" /* frame->syscall_cfa */ + "sub r7, r7, #0x28\n\t" + /* switch to kernel stack */ + "mov sp, r7\n\t" + __ASM_CFI(".cfi_def_cfa 7,0x28\n\t") + __ASM_CFI(".cfi_offset r4,-0x28\n\t") + __ASM_CFI(".cfi_offset r5,-0x24\n\t") + __ASM_CFI(".cfi_offset r6,-0x20\n\t") + __ASM_CFI(".cfi_offset r7,-0x1c\n\t") + __ASM_CFI(".cfi_offset r8,-0x18\n\t") + __ASM_CFI(".cfi_offset r9,-0x14\n\t") + __ASM_CFI(".cfi_offset r10,-0x10\n\t") + __ASM_CFI(".cfi_offset r11,-0x0c\n\t") + __ASM_CFI(".cfi_offset r12,-0x08\n\t") + __ASM_CFI(".cfi_offset lr,-0x04\n\t") + "bl " __ASM_NAME("abort_thread") ) + + /*********************************************************************** * KeUserModeCallback */ @@ -1472,6 +1496,7 @@ static void abrt_handler( int signal, siginfo_t *siginfo, void *sigcontext ) */ static void quit_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { + if (!is_inside_syscall( sigcontext )) user_mode_abort_thread( 0, arm_thread_data()->syscall_frame ); abort_thread(0); }

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
99
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2023