September 2022 - Wine-commits

Jinoh Kang : msvcp90: Use atomic write for releasing threadsafe_queue spin lock.
by Alexandre Julliard 20 Sep '22

20 Sep '22

Module: wine Branch: master Commit: dce7a61fa4f90cb8bf6b22a12e3a23e5f8d75ac3 URL: https://gitlab.winehq.org/wine/wine/-/commit/dce7a61fa4f90cb8bf6b22a12e3a23… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Mon Sep 19 00:34:47 2022 +0900 msvcp90: Use atomic write for releasing threadsafe_queue spin lock. This fixes data race in ARM/ARM64 platforms, and prevents potential memory access reordering by the compiler. --- dlls/msvcp90/details.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/details.c b/dlls/msvcp90/details.c index 9b665ee841f..98579dfa991 100644 --- a/dlls/msvcp90/details.c +++ b/dlls/msvcp90/details.c @@ -239,7 +239,7 @@ static void threadsafe_queue_push(threadsafe_queue *queue, size_t id, queue->tail = p; if(!queue->head) queue->head = p; - queue->lock = 0; + WriteRelease(&queue->lock, 0); } else { @@ -289,7 +289,7 @@ static BOOL threadsafe_queue_pop(threadsafe_queue *queue, size_t id, queue->head = p->_Next; if(!queue->head) queue->tail = NULL; - queue->lock = 0; + WriteRelease(&queue->lock, 0); /* TODO: Add exception handling */ call__Concurrent_queue_base_v4__Deallocate_page(parent, p);

1 0

Nikolay Sivov : include: Add windows.system.threading.idl.
by Alexandre Julliard 20 Sep '22

20 Sep '22

Module: wine Branch: master Commit: 42e21bc5df6d9df6a5cc9ce4f7f635f1f37a53e2 URL: https://gitlab.winehq.org/wine/wine/-/commit/42e21bc5df6d9df6a5cc9ce4f7f635… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 18 11:03:35 2022 +0300 include: Add windows.system.threading.idl. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/Makefile.in | 1 + include/windows.system.threading.idl | 96 ++++++++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 0598a3ce3de..14fe8e24863 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -809,6 +809,7 @@ SOURCES = \ windows.storage.streams.idl \ windows.system.idl \ windows.system.power.idl \ + windows.system.threading.idl \ windows.system.userprofile.idl \ windows.ui.idl \ windowscontracts.idl \ diff --git a/include/windows.system.threading.idl b/include/windows.system.threading.idl new file mode 100644 index 00000000000..f1c3ade1033 --- /dev/null +++ b/include/windows.system.threading.idl @@ -0,0 +1,96 @@ +/* + * Copyright 2022 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "asyncinfo.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; + +namespace Windows.System.Threading +{ + typedef enum WorkItemPriority WorkItemPriority; + typedef enum WorkItemOptions WorkItemOptions; + + runtimeclass ThreadPool; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum WorkItemPriority + { + Low = -1, + Normal = 0, + High = 1 + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + flags + ] + enum WorkItemOptions + { + None = 0x0, + TimeSliced = 0x1 + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + uuid(1d1a8b8b-fa66-414f-9cbd-b65fc99d17fa) + ] + delegate HRESULT WorkItemHandler([in] Windows.Foundation.IAsyncAction *operation); + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.System.Threading.ThreadPool), + uuid(b6bf67dd-84bd-44f8-ac1c-93ebcb9dba91) + ] + interface IThreadPoolStatics : IInspectable + { + [overload("RunAsync")] HRESULT RunAsync( + [in] Windows.System.Threading.WorkItemHandler *handler, + [out, retval] Windows.Foundation.IAsyncAction **operation + ); + + [overload("RunAsync")] HRESULT RunWithPriorityAsync( + [in] Windows.System.Threading.WorkItemHandler *handler, + [in] Windows.System.Threading.WorkItemPriority priority, + [out, retval] Windows.Foundation.IAsyncAction **operation + ); + + [overload("RunAsync")] HRESULT RunWithPriorityAndOptionsAsync( + [in] Windows.System.Threading.WorkItemHandler *handler, + [in] Windows.System.Threading.WorkItemPriority priority, + [in] Windows.System.Threading.WorkItemOptions options, + [out, retval] Windows.Foundation.IAsyncAction **operation + ); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + static(Windows.System.Threading.IThreadPoolStatics, Windows.Foundation.UniversalApiContract, 1.0), + threading(both) + ] + runtimeclass ThreadPool + { + } +}

1 0

Nikolay Sivov : threadpoolwinrt: Add a stub module.
by Alexandre Julliard 20 Sep '22

20 Sep '22

Module: wine Branch: master Commit: 511be2e86d5116c30aee145493ec2d32efadbb75 URL: https://gitlab.winehq.org/wine/wine/-/commit/511be2e86d5116c30aee145493ec2d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 18 11:38:37 2022 +0300 threadpoolwinrt: Add a stub module. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- configure | 2 + configure.ac | 1 + dlls/threadpoolwinrt/Makefile.in | 7 + dlls/threadpoolwinrt/classes.idl | 21 +++ dlls/threadpoolwinrt/main.c | 261 ++++++++++++++++++++++++++++++ dlls/threadpoolwinrt/threadpoolwinrt.spec | 3 + 6 files changed, 295 insertions(+)

1 0

Nikolay Sivov : threadpoolwinrt: Add initial implementation of RunAsync.
by Alexandre Julliard 20 Sep '22

20 Sep '22

Module: wine Branch: master Commit: 0f25fadb1453e146b0ce790f4656b5ad8894befa URL: https://gitlab.winehq.org/wine/wine/-/commit/0f25fadb1453e146b0ce790f4656b5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 18 14:22:53 2022 +0300 threadpoolwinrt: Add initial implementation of RunAsync. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- configure | 1 + configure.ac | 1 + dlls/threadpoolwinrt/main.c | 391 +++++++++++++++++++++++++++++++- dlls/threadpoolwinrt/tests/Makefile.in | 5 + dlls/threadpoolwinrt/tests/threadpool.c | 292 ++++++++++++++++++++++++ 5 files changed, 684 insertions(+), 6 deletions(-)

1 0

Alistair Leslie-Hughes : msdasql: Implement ICommandProperties GetProperties.
by Alexandre Julliard 20 Sep '22

20 Sep '22

Module: wine Branch: master Commit: 323355a8481e666eb95073813c679a2e6e5099c6 URL: https://gitlab.winehq.org/wine/wine/-/commit/323355a8481e666eb95073813c679a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Nov 7 20:10:35 2021 +1100 msdasql: Implement ICommandProperties GetProperties. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/msdasql_main.c | 1 + dlls/msdasql/session.c | 240 +++++++++++++++++++++++++++++++++++++++++- dlls/msdasql/tests/provider.c | 145 +++++++++++++++++++++++++ 3 files changed, 384 insertions(+), 2 deletions(-)

1 0

Alistair Leslie-Hughes : msdasql: Implement ICommandProperties SetProperties.
by Alexandre Julliard 20 Sep '22

20 Sep '22

Module: wine Branch: master Commit: ebf0070899e8ab82c9f9de5f96c9f7d5953b5fff URL: https://gitlab.winehq.org/wine/wine/-/commit/ebf0070899e8ab82c9f9de5f96c9f7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Nov 7 19:11:57 2021 +1100 msdasql: Implement ICommandProperties SetProperties. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 795927fe778..01cd7cf10ea 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -1233,7 +1233,41 @@ static HRESULT WINAPI command_prop_SetProperties(ICommandProperties *iface, ULON DBPROPSET propertyset[]) { struct command *command = impl_from_ICommandProperties( iface ); - FIXME("%p, %lu, %p\n", command, count, propertyset); + int i, j, k; + + TRACE("%p %lu, %p\n", command, count, propertyset); + + for(i=0; i < count; i++) + { + TRACE("set %s, count %ld\n", debugstr_guid(&propertyset[i].guidPropertySet), propertyset[i].cProperties); + for(j=0; j < propertyset[i].cProperties; j++) + { + for(k=0; k < command->prop_count; k++) + { + if (command->properties[k].property_id == propertyset[i].rgProperties[j].dwPropertyID) + { + TRACE("Found property 0x%08lx\n", command->properties[k].property_id); + if (command->properties[k].flags & DBPROPFLAGS_WRITE) + { + if (command->properties[k].vartype == VT_BOOL) + { + command->properties[k].value = V_BOOL(&propertyset[i].rgProperties[j].vValue); + } + else if (command->properties[k].vartype == VT_I4) + { + command->properties[k].value = V_I4(&propertyset[i].rgProperties[j].vValue); + } + else + ERR("Unknown variant type %d\n", command->properties[j].vartype); + } + else + WARN("Attempting to set Readonly property\n"); + + break; + } + } + } + } return S_OK; }

1 0

Alistair Leslie-Hughes : msdasql: Implement IColumnsRowset GetAvailableColumns.
by Alexandre Julliard 20 Sep '22

20 Sep '22

Module: wine Branch: master Commit: df72f9a8707cf759f02fdc95a16526ab453c9f39 URL: https://gitlab.winehq.org/wine/wine/-/commit/df72f9a8707cf759f02fdc95a16526… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Nov 14 19:20:44 2021 +1100 msdasql: Implement IColumnsRowset GetAvailableColumns. The functions returns a series of custom columns to make a row unique. For us, it's safe to return no extra columns at this stage. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 01cd7cf10ea..7424d14c765 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -919,8 +919,16 @@ static ULONG WINAPI column_rs_Release(IColumnsRowset *iface) static HRESULT WINAPI column_rs_GetAvailableColumns(IColumnsRowset *iface, DBORDINAL *count, DBID **columns) { struct msdasql_rowset *rowset = impl_from_IColumnsRowset( iface ); - FIXME("%p, %p, %p\n", rowset, count, columns); - return E_NOTIMPL; + + TRACE("%p, %p, %p\n", rowset, count, columns); + + if (!count || !columns) + return E_INVALIDARG; + + *count = 0; + *columns = NULL; + + return S_OK; } static HRESULT WINAPI column_rs_GetColumnsRowset(IColumnsRowset *iface, IUnknown *outer, DBORDINAL count,

1 0

Piotr Caban : msvcp90: Fix indentation in concurrent_vector_alloc_segment function.
by Alexandre Julliard 19 Sep '22

19 Sep '22

Module: wine Branch: master Commit: bd43bb53040a6b7d3c2bd6b152a5761566dcb78e URL: https://gitlab.winehq.org/wine/wine/-/commit/bd43bb53040a6b7d3c2bd6b152a576… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 19 10:46:36 2022 +0200 msvcp90: Fix indentation in concurrent_vector_alloc_segment function. --- dlls/concrt140/details.c | 32 +++++++++++++++++--------------- dlls/msvcp90/details.c | 32 +++++++++++++++++--------------- 2 files changed, 34 insertions(+), 30 deletions(-) diff --git a/dlls/concrt140/details.c b/dlls/concrt140/details.c index e6711db6983..be5bc4a81d4 100644 --- a/dlls/concrt140/details.c +++ b/dlls/concrt140/details.c @@ -479,24 +479,26 @@ static void concurrent_vector_alloc_segment(_Concurrent_vector_base_v4 *this, spin_wait(&spin); if(!InterlockedCompareExchangeSizeT((this->segment + seg), SEGMENT_ALLOC_MARKER, 0)) - __TRY { - if(seg == 0) - this->segment[seg] = this->allocator(this, element_size * (1 << this->first_block)); - else if(seg < this->first_block) - this->segment[seg] = (BYTE**)this->segment[0] + __TRY + { + if(seg == 0) + this->segment[seg] = this->allocator(this, element_size * (1 << this->first_block)); + else if(seg < this->first_block) + this->segment[seg] = (BYTE**)this->segment[0] + element_size * (1 << seg); - else - this->segment[seg] = this->allocator(this, element_size * (1 << seg)); + else + this->segment[seg] = this->allocator(this, element_size * (1 << seg)); + } + __EXCEPT_ALL + { + this->segment[seg] = NULL; + _CxxThrowException(NULL, NULL); + } + __ENDTRY + if(!this->segment[seg]) + _vector_base_v4__Internal_throw_exception(this, 2); } - __EXCEPT_ALL - { - this->segment[seg] = NULL; - _CxxThrowException(NULL, NULL); - } - __ENDTRY - if(!this->segment[seg]) - _vector_base_v4__Internal_throw_exception(this, 2); } } diff --git a/dlls/msvcp90/details.c b/dlls/msvcp90/details.c index 767b20b2334..9b665ee841f 100644 --- a/dlls/msvcp90/details.c +++ b/dlls/msvcp90/details.c @@ -493,24 +493,26 @@ static void concurrent_vector_alloc_segment(_Concurrent_vector_base_v4 *this, spin_wait(&spin); if(!InterlockedCompareExchangeSizeT((this->segment + seg), SEGMENT_ALLOC_MARKER, 0)) - __TRY { - if(seg == 0) - this->segment[seg] = this->allocator(this, element_size * (1 << this->first_block)); - else if(seg < this->first_block) - this->segment[seg] = (BYTE**)this->segment[0] + __TRY + { + if(seg == 0) + this->segment[seg] = this->allocator(this, element_size * (1 << this->first_block)); + else if(seg < this->first_block) + this->segment[seg] = (BYTE**)this->segment[0] + element_size * (1 << seg); - else - this->segment[seg] = this->allocator(this, element_size * (1 << seg)); + else + this->segment[seg] = this->allocator(this, element_size * (1 << seg)); + } + __EXCEPT_ALL + { + this->segment[seg] = NULL; + _CxxThrowException(NULL, NULL); + } + __ENDTRY + if(!this->segment[seg]) + _vector_base_v4__Internal_throw_exception(this, 2); } - __EXCEPT_ALL - { - this->segment[seg] = NULL; - _CxxThrowException(NULL, NULL); - } - __ENDTRY - if(!this->segment[seg]) - _vector_base_v4__Internal_throw_exception(this, 2); } }

1 0

Piotr Caban : msvcr100: Fix crash when setting scheduler in schedule_task_proc.
by Alexandre Julliard 19 Sep '22

19 Sep '22

Module: wine Branch: master Commit: 548a6afccbc3a92050d651205f7b738e4ecf0211 URL: https://gitlab.winehq.org/wine/wine/-/commit/548a6afccbc3a92050d651205f7b73… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 19 12:49:15 2022 +0200 msvcr100: Fix crash when setting scheduler in schedule_task_proc. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53672 --- dlls/msvcrt/concurrency.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index a1c5c635602..f7f7adb86ed 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -1342,7 +1342,7 @@ static void WINAPI schedule_task_proc(PTP_CALLBACK_INSTANCE instance, void *cont arg = *(schedule_task_arg*)context; operator_delete(context); - if(&arg.scheduler->scheduler != try_get_current_scheduler()) { + if(&arg.scheduler->scheduler != get_current_scheduler()) { ThreadScheduler_Attach(arg.scheduler); detach = TRUE; }

1 0

Akihiro Sagawa : user32: Fix a memory allocation strategy.
by Alexandre Julliard 19 Sep '22

19 Sep '22

Module: wine Branch: master Commit: cb0e4f5f4f7dc10a0933349ad780a11405cd736e URL: https://gitlab.winehq.org/wine/wine/-/commit/cb0e4f5f4f7dc10a0933349ad780a1… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Sep 19 22:10:24 2022 +0900 user32: Fix a memory allocation strategy. Otherwise, the function allocates a heap memory when prev_size is enough. What is worse is that it returns the buffer untouched if the prev_size is insufficient. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53703 --- dlls/user32/winproc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 2ca802e647a..6cd41b51435 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -747,7 +747,8 @@ void dispatch_win_proc_params( struct win_proc_params *params ) /* make sure that there is space for 'size' bytes in buffer, growing it if needed */ static inline void *get_buffer_space( void **buffer, size_t size, size_t prev_size ) { - if (prev_size > size && !(*buffer = HeapAlloc( GetProcessHeap(), 0, size ))) return NULL; + if (prev_size < size) + *buffer = HeapAlloc( GetProcessHeap(), 0, size ); return *buffer; }

1 0