April 2023 - Wine-commits - list.winehq.org

Torge Matthies : msvcr110: Implement _Context::_IsSynchronouslyBlocked.
by Alexandre Julliard 14 Apr '23

14 Apr '23

Module: wine Branch: master Commit: 0aa7ac415f67cf9298d80f52490942b053224aed URL: https://gitlab.winehq.org/wine/wine/-/commit/0aa7ac415f67cf9298d80f52490942… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Wed Apr 12 15:53:48 2023 +0200 msvcr110: Implement _Context::_IsSynchronouslyBlocked. --- dlls/concrt140/concrt140.spec | 6 +++--- dlls/msvcr110/msvcr110.spec | 6 +++--- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr120_app/msvcr120_app.spec | 6 +++--- dlls/msvcrt/concurrency.c | 9 +++++++++ 5 files changed, 21 insertions(+), 12 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index f2b2789a5e2..6df2eb20c77 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -543,9 +543,9 @@ @ stub -arch=arm ?_IsCanceling(a)_TaskCollection@details(a)Concurrency@@QAA_NXZ @ stub -arch=i386 ?_IsCanceling(a)_TaskCollection@details(a)Concurrency@@QAE_NXZ @ stub -arch=win64 ?_IsCanceling(a)_TaskCollection@details(a)Concurrency@@QEAA_NXZ -@ stub -arch=arm ?_IsSynchronouslyBlocked(a)_Context@details(a)Concurrency@@QBA_NXZ -@ stub -arch=i386 ?_IsSynchronouslyBlocked(a)_Context@details(a)Concurrency@@QBE_NXZ -@ stub -arch=win64 ?_IsSynchronouslyBlocked(a)_Context@details(a)Concurrency@@QEBA_NXZ +@ cdecl -arch=arm ?_IsSynchronouslyBlocked(a)_Context@details(a)Concurrency@@QBA_NXZ(ptr) msvcr120.?_IsSynchronouslyBlocked(a)_Context@details(a)Concurrency@@QBA_NXZ +@ thiscall -arch=i386 ?_IsSynchronouslyBlocked(a)_Context@details(a)Concurrency@@QBE_NXZ(ptr) msvcr120.?_IsSynchronouslyBlocked(a)_Context@details(a)Concurrency@@QBE_NXZ +@ cdecl -arch=win64 ?_IsSynchronouslyBlocked(a)_Context@details(a)Concurrency@@QEBA_NXZ(ptr) msvcr120.?_IsSynchronouslyBlocked(a)_Context@details(a)Concurrency@@QEBA_NXZ @ stub -arch=win32 ?_NewCollection(a)_AsyncTaskCollection@details(a)Concurrency@@SAPAV123(a)PAV_CancellationTokenState@23@@Z @ stub -arch=win64 ?_NewCollection(a)_AsyncTaskCollection@details(a)Concurrency@@SAPEAV123(a)PEAV_CancellationTokenState@23@@Z @ cdecl -arch=arm ?_NumberOfSpins@?$_SpinWait@$00(a)details@Concurrency@@IAAKXZ(ptr) SpinWait__NumberOfSpins diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 1032c9e4c7a..da4e22960b9 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -550,9 +550,9 @@ @ stub -arch=arm ?_IsCanceling(a)_TaskCollection@details(a)Concurrency@@QAA_NXZ @ stub -arch=i386 ?_IsCanceling(a)_TaskCollection@details(a)Concurrency@@QAE_NXZ @ stub -arch=win64 ?_IsCanceling(a)_TaskCollection@details(a)Concurrency@@QEAA_NXZ -@ stub -arch=arm ?_IsSynchronouslyBlocked(a)_Context@details(a)Concurrency@@QBA_NXZ -@ stub -arch=i386 ?_IsSynchronouslyBlocked(a)_Context@details(a)Concurrency@@QBE_NXZ -@ stub -arch=win64 ?_IsSynchronouslyBlocked(a)_Context@details(a)Concurrency@@QEBA_NXZ +@ cdecl -arch=arm ?_IsSynchronouslyBlocked(a)_Context@details(a)Concurrency@@QBA_NXZ(ptr) _Context_IsSynchronouslyBlocked +@ thiscall -arch=i386 ?_IsSynchronouslyBlocked(a)_Context@details(a)Concurrency@@QBE_NXZ(ptr) _Context_IsSynchronouslyBlocked +@ cdecl -arch=win64 ?_IsSynchronouslyBlocked(a)_Context@details(a)Concurrency@@QEBA_NXZ(ptr) _Context_IsSynchronouslyBlocked @ stub -arch=win32 ?_Name_base(a)type_info@@CAPBDPBV1(a)PAU__type_info_node@@@Z @ stub -arch=win64 ?_Name_base(a)type_info@@CAPEBDPEBV1(a)PEAU__type_info_node@@@Z @ stub -arch=win32 ?_Name_base_internal(a)type_info@@CAPBDPBV1(a)PAU__type_info_node@@@Z diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index ca11ea4b49d..1eff4e82f61 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -541,9 +541,9 @@ @ stub -arch=arm ?_IsCanceling(a)_TaskCollection@details(a)Concurrency@@QAA_NXZ @ stub -arch=i386 ?_IsCanceling(a)_TaskCollection@details(a)Concurrency@@QAE_NXZ @ stub -arch=win64 ?_IsCanceling(a)_TaskCollection@details(a)Concurrency@@QEAA_NXZ -@ stub -arch=arm ?_IsSynchronouslyBlocked(a)_Context@details(a)Concurrency@@QBA_NXZ -@ stub -arch=i386 ?_IsSynchronouslyBlocked(a)_Context@details(a)Concurrency@@QBE_NXZ -@ stub -arch=win64 ?_IsSynchronouslyBlocked(a)_Context@details(a)Concurrency@@QEBA_NXZ +@ cdecl -arch=arm ?_IsSynchronouslyBlocked(a)_Context@details(a)Concurrency@@QBA_NXZ(ptr) _Context_IsSynchronouslyBlocked +@ thiscall -arch=i386 ?_IsSynchronouslyBlocked(a)_Context@details(a)Concurrency@@QBE_NXZ(ptr) _Context_IsSynchronouslyBlocked +@ cdecl -arch=win64 ?_IsSynchronouslyBlocked(a)_Context@details(a)Concurrency@@QEBA_NXZ(ptr) _Context_IsSynchronouslyBlocked @ stub -arch=win32 ?_Name_base(a)type_info@@CAPBDPBV1(a)PAU__type_info_node@@@Z @ stub -arch=win64 ?_Name_base(a)type_info@@CAPEBDPEBV1(a)PEAU__type_info_node@@@Z @ stub -arch=win32 ?_Name_base_internal(a)type_info@@CAPBDPBV1(a)PAU__type_info_node@@@Z diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index aad6ece8acc..bb1d6914c40 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -538,9 +538,9 @@ @ stub -arch=arm ?_IsCanceling(a)_TaskCollection@details(a)Concurrency@@QAA_NXZ @ stub -arch=i386 ?_IsCanceling(a)_TaskCollection@details(a)Concurrency@@QAE_NXZ @ stub -arch=win64 ?_IsCanceling(a)_TaskCollection@details(a)Concurrency@@QEAA_NXZ -@ stub -arch=arm ?_IsSynchronouslyBlocked(a)_Context@details(a)Concurrency@@QBA_NXZ -@ stub -arch=i386 ?_IsSynchronouslyBlocked(a)_Context@details(a)Concurrency@@QBE_NXZ -@ stub -arch=win64 ?_IsSynchronouslyBlocked(a)_Context@details(a)Concurrency@@QEBA_NXZ +@ cdecl -arch=arm ?_IsSynchronouslyBlocked(a)_Context@details(a)Concurrency@@QBA_NXZ(ptr) msvcr120.?_IsSynchronouslyBlocked(a)_Context@details(a)Concurrency@@QBA_NXZ +@ thiscall -arch=i386 ?_IsSynchronouslyBlocked(a)_Context@details(a)Concurrency@@QBE_NXZ(ptr) msvcr120.?_IsSynchronouslyBlocked(a)_Context@details(a)Concurrency@@QBE_NXZ +@ cdecl -arch=win64 ?_IsSynchronouslyBlocked(a)_Context@details(a)Concurrency@@QEBA_NXZ(ptr) msvcr120.?_IsSynchronouslyBlocked(a)_Context@details(a)Concurrency@@QEBA_NXZ @ stub -arch=win32 ?_Name_base(a)type_info@@CAPBDPBV1(a)PAU__type_info_node@@@Z @ stub -arch=win64 ?_Name_base(a)type_info@@CAPEBDPEBV1(a)PEAU__type_info_node@@@Z @ stub -arch=win32 ?_Name_base_internal(a)type_info@@CAPBDPBV1(a)PAU__type_info_node@@@Z diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index d148aadd13a..f81cd9571a3 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -68,6 +68,8 @@ typedef struct { unsigned int, (const Context*), (this)) #define call_Context_GetScheduleGroupId(this) CALL_VTBL_FUNC(this, 8, \ unsigned int, (const Context*), (this)) +#define call_Context_IsSynchronouslyBlocked(this) CALL_VTBL_FUNC(this, 16, \ + bool, (const Context*), (this)) #define call_Context_dtor(this, flags) CALL_VTBL_FUNC(this, 20, \ Context*, (Context*, unsigned int), (this, flags)) @@ -875,6 +877,13 @@ _Context *__cdecl _Context__CurrentContext(_Context *ret) ret->context = Context_CurrentContext(); return ret; } + +DEFINE_THISCALL_WRAPPER(_Context_IsSynchronouslyBlocked, 4) +BOOL __thiscall _Context_IsSynchronouslyBlocked(const _Context *this) +{ + TRACE("(%p)\n", this); + return call_Context_IsSynchronouslyBlocked(this->context); +} #endif DEFINE_THISCALL_WRAPPER(ExternalContextBase_GetId, 4)

1 0

Piotr Caban : msvcr100: Add missing ExternalContextBase virtual functions stubs.
by Alexandre Julliard 14 Apr '23

14 Apr '23

Module: wine Branch: master Commit: 08ed6b1ddf3b20650632028076d85038de1adcea URL: https://gitlab.winehq.org/wine/wine/-/commit/08ed6b1ddf3b20650632028076d850… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 14 11:40:36 2023 +0200 msvcr100: Add missing ExternalContextBase virtual functions stubs. --- dlls/msvcrt/concurrency.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 93 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index f81cd9571a3..42ca4ed7d19 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -920,6 +920,86 @@ bool __thiscall ExternalContextBase_IsSynchronouslyBlocked(const ExternalContext return FALSE; } +DEFINE_THISCALL_WRAPPER(ExternalContextBase_Block, 4) +void __thiscall ExternalContextBase_Block(ExternalContextBase *this) +{ + FIXME("(%p)->() stub\n", this); +} + +DEFINE_THISCALL_WRAPPER(ExternalContextBase_Yield, 4) +void __thiscall ExternalContextBase_Yield(ExternalContextBase *this) +{ + FIXME("(%p)->() stub\n", this); +} + +DEFINE_THISCALL_WRAPPER(ExternalContextBase_SpinYield, 4) +void __thiscall ExternalContextBase_SpinYield(ExternalContextBase *this) +{ + FIXME("(%p)->() stub\n", this); +} + +DEFINE_THISCALL_WRAPPER(ExternalContextBase_Oversubscribe, 8) +void __thiscall ExternalContextBase_Oversubscribe( + ExternalContextBase *this, bool oversubscribe) +{ + FIXME("(%p)->(%x) stub\n", this, oversubscribe); +} + +DEFINE_THISCALL_WRAPPER(ExternalContextBase_Alloc, 8) +void* __thiscall ExternalContextBase_Alloc(ExternalContextBase *this, size_t size) +{ + FIXME("(%p)->(%Iu) stub\n", this, size); + return NULL; +} + +DEFINE_THISCALL_WRAPPER(ExternalContextBase_Free, 8) +void __thiscall ExternalContextBase_Free(ExternalContextBase *this, void *addr) +{ + FIXME("(%p)->(%p) stub\n", this, addr); +} + +DEFINE_THISCALL_WRAPPER(ExternalContextBase_EnterCriticalRegionHelper, 4) +int __thiscall ExternalContextBase_EnterCriticalRegionHelper(ExternalContextBase *this) +{ + FIXME("(%p)->() stub\n", this); + return 0; +} + +DEFINE_THISCALL_WRAPPER(ExternalContextBase_EnterHyperCriticalRegionHelper, 4) +int __thiscall ExternalContextBase_EnterHyperCriticalRegionHelper(ExternalContextBase *this) +{ + FIXME("(%p)->() stub\n", this); + return 0; +} + +DEFINE_THISCALL_WRAPPER(ExternalContextBase_ExitCriticalRegionHelper, 4) +int __thiscall ExternalContextBase_ExitCriticalRegionHelper(ExternalContextBase *this) +{ + FIXME("(%p)->() stub\n", this); + return 0; +} + +DEFINE_THISCALL_WRAPPER(ExternalContextBase_ExitHyperCriticalRegionHelper, 4) +int __thiscall ExternalContextBase_ExitHyperCriticalRegionHelper(ExternalContextBase *this) +{ + FIXME("(%p)->() stub\n", this); + return 0; +} + +DEFINE_THISCALL_WRAPPER(ExternalContextBase_GetCriticalRegionType, 4) +int __thiscall ExternalContextBase_GetCriticalRegionType(const ExternalContextBase *this) +{ + FIXME("(%p)->() stub\n", this); + return 0; +} + +DEFINE_THISCALL_WRAPPER(ExternalContextBase_GetContextKind, 4) +int __thiscall ExternalContextBase_GetContextKind(const ExternalContextBase *this) +{ + FIXME("(%p)->() stub\n", this); + return 0; +} + static void remove_scheduled_chores(Scheduler *scheduler, const ExternalContextBase *context) { ThreadScheduler *tscheduler = (ThreadScheduler*)scheduler; @@ -3483,7 +3563,19 @@ __ASM_BLOCK_BEGIN(concurrency_vtables) VTABLE_ADD_FUNC(ExternalContextBase_GetScheduleGroupId) VTABLE_ADD_FUNC(ExternalContextBase_Unblock) VTABLE_ADD_FUNC(ExternalContextBase_IsSynchronouslyBlocked) - VTABLE_ADD_FUNC(ExternalContextBase_vector_dtor)); + VTABLE_ADD_FUNC(ExternalContextBase_vector_dtor) + VTABLE_ADD_FUNC(ExternalContextBase_Block) + VTABLE_ADD_FUNC(ExternalContextBase_Yield) + VTABLE_ADD_FUNC(ExternalContextBase_SpinYield) + VTABLE_ADD_FUNC(ExternalContextBase_Oversubscribe) + VTABLE_ADD_FUNC(ExternalContextBase_Alloc) + VTABLE_ADD_FUNC(ExternalContextBase_Free) + VTABLE_ADD_FUNC(ExternalContextBase_EnterCriticalRegionHelper) + VTABLE_ADD_FUNC(ExternalContextBase_EnterHyperCriticalRegionHelper) + VTABLE_ADD_FUNC(ExternalContextBase_ExitCriticalRegionHelper) + VTABLE_ADD_FUNC(ExternalContextBase_ExitHyperCriticalRegionHelper) + VTABLE_ADD_FUNC(ExternalContextBase_GetCriticalRegionType) + VTABLE_ADD_FUNC(ExternalContextBase_GetContextKind)); __ASM_VTABLE(ThreadScheduler, VTABLE_ADD_FUNC(ThreadScheduler_vector_dtor) VTABLE_ADD_FUNC(ThreadScheduler_Id)

1 0

Piotr Caban : msvcr100: Add Context::Block() implementation.
by Alexandre Julliard 14 Apr '23

14 Apr '23

Module: wine Branch: master Commit: 92e75061f396a87ea04118fe5c5ef8be7c62d5f9 URL: https://gitlab.winehq.org/wine/wine/-/commit/92e75061f396a87ea04118fe5c5ef8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 14 12:10:51 2023 +0200 msvcr100: Add Context::Block() implementation. --- dlls/msvcrt/concurrency.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index 42ca4ed7d19..ede70116f4a 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -72,6 +72,8 @@ typedef struct { bool, (const Context*), (this)) #define call_Context_dtor(this, flags) CALL_VTBL_FUNC(this, 20, \ Context*, (Context*, unsigned int), (this, flags)) +#define call_Context_Block(this) CALL_VTBL_FUNC(this, 24, \ + void, (Context*), (this)) typedef struct { Context *context; @@ -824,7 +826,9 @@ unsigned int __cdecl Context_Id(void) /* ?Block(a)Context@Concurrency@@SAXXZ */ void __cdecl Context_Block(void) { - FIXME("()\n"); + Context *ctx = get_current_context(); + TRACE("()\n"); + call_Context_Block(ctx); } /* ?Yield(a)Context@Concurrency@@SAXXZ */

1 0

Piotr Caban : msvcr100: Add ExternalContextBase::Block() implementation.
by Alexandre Julliard 14 Apr '23

14 Apr '23

Module: wine Branch: master Commit: dcccf544bec042cfe76defaf4a97763a3f47a650 URL: https://gitlab.winehq.org/wine/wine/-/commit/dcccf544bec042cfe76defaf4a9776… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 14 12:54:09 2023 +0200 msvcr100: Add ExternalContextBase::Block() implementation. --- dlls/msvcrt/concurrency.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index ede70116f4a..565b911425e 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -100,6 +100,7 @@ typedef struct { struct scheduler_list scheduler; unsigned int id; union allocator_cache_entry *allocator_cache[8]; + LONG blocked; } ExternalContextBase; extern const vtable_ptr ExternalContextBase_vtable; static void ExternalContextBase_ctor(ExternalContextBase*); @@ -927,7 +928,16 @@ bool __thiscall ExternalContextBase_IsSynchronouslyBlocked(const ExternalContext DEFINE_THISCALL_WRAPPER(ExternalContextBase_Block, 4) void __thiscall ExternalContextBase_Block(ExternalContextBase *this) { - FIXME("(%p)->() stub\n", this); + LONG blocked; + + TRACE("(%p)->()\n", this); + + blocked = InterlockedIncrement(&this->blocked); + while (blocked >= 1) + { + RtlWaitOnAddress(&this->blocked, &blocked, sizeof(LONG), NULL); + blocked = this->blocked; + } } DEFINE_THISCALL_WRAPPER(ExternalContextBase_Yield, 4)

1 0

Piotr Caban : msvcr100: Add ExternalContextBase::IsSynchronouslyBlocked() implementation.
by Alexandre Julliard 14 Apr '23

14 Apr '23

Module: wine Branch: master Commit: b96e7d34e4d4a26299cf7d716c0166b23dc3bdae URL: https://gitlab.winehq.org/wine/wine/-/commit/b96e7d34e4d4a26299cf7d716c0166… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 14 12:55:50 2023 +0200 msvcr100: Add ExternalContextBase::IsSynchronouslyBlocked() implementation. --- dlls/msvcrt/concurrency.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index 565b911425e..d7520ac308c 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -921,8 +921,8 @@ void __thiscall ExternalContextBase_Unblock(ExternalContextBase *this) DEFINE_THISCALL_WRAPPER(ExternalContextBase_IsSynchronouslyBlocked, 4) bool __thiscall ExternalContextBase_IsSynchronouslyBlocked(const ExternalContextBase *this) { - FIXME("(%p)->() stub\n", this); - return FALSE; + TRACE("(%p)->()\n", this); + return this->blocked >= 1; } DEFINE_THISCALL_WRAPPER(ExternalContextBase_Block, 4)

1 0

Piotr Caban : msvcr100: Add ExternalContextBase::Unblock implementation.
by Alexandre Julliard 14 Apr '23

14 Apr '23

Module: wine Branch: master Commit: c595bef69b84a0542c006aa23bd79823cf8eef10 URL: https://gitlab.winehq.org/wine/wine/-/commit/c595bef69b84a0542c006aa23bd798… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 14 12:57:06 2023 +0200 msvcr100: Add ExternalContextBase::Unblock implementation. --- dlls/msvcrt/concurrency.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index d7520ac308c..47a0e08adb8 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -915,7 +915,11 @@ unsigned int __thiscall ExternalContextBase_GetScheduleGroupId(const ExternalCon DEFINE_THISCALL_WRAPPER(ExternalContextBase_Unblock, 4) void __thiscall ExternalContextBase_Unblock(ExternalContextBase *this) { - FIXME("(%p)->() stub\n", this); + TRACE("(%p)->()\n", this); + + /* TODO: throw context_unblock_unbalanced if this->blocked goes below -1 */ + if (!InterlockedDecrement(&this->blocked)) + RtlWakeAddressSingle(&this->blocked); } DEFINE_THISCALL_WRAPPER(ExternalContextBase_IsSynchronouslyBlocked, 4)

1 0

Piotr Caban : msvcr100: Use Context blocking functions in reader_writer_lock class.
by Alexandre Julliard 14 Apr '23

14 Apr '23

Module: wine Branch: master Commit: 256c344550fa27d82602232588b32e74a3a9a7f3 URL: https://gitlab.winehq.org/wine/wine/-/commit/256c344550fa27d82602232588b32e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 14 13:46:33 2023 +0200 msvcr100: Use Context blocking functions in reader_writer_lock class. --- dlls/msvcrt/concurrency.c | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index 47a0e08adb8..d0f029650ac 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -68,6 +68,8 @@ typedef struct { unsigned int, (const Context*), (this)) #define call_Context_GetScheduleGroupId(this) CALL_VTBL_FUNC(this, 8, \ unsigned int, (const Context*), (this)) +#define call_Context_Unblock(this) CALL_VTBL_FUNC(this, 12, \ + void, (Context*), (this)) #define call_Context_IsSynchronouslyBlocked(this) CALL_VTBL_FUNC(this, 16, \ bool, (const Context*), (this)) #define call_Context_dtor(this, flags) CALL_VTBL_FUNC(this, 20, \ @@ -324,6 +326,7 @@ typedef struct { typedef struct rwl_queue { struct rwl_queue *next; + Context *ctx; } rwl_queue; #define WRITER_WAITING 0x80000000 @@ -3129,14 +3132,6 @@ reader_writer_lock* __thiscall reader_writer_lock_ctor(reader_writer_lock *this) { TRACE("(%p)\n", this); - if (!keyed_event) { - HANDLE event; - - NtCreateKeyedEvent(&event, GENERIC_READ|GENERIC_WRITE, NULL, 0); - if (InterlockedCompareExchangePointer(&keyed_event, event, NULL) != NULL) - NtClose(event); - } - memset(this, 0, sizeof(*this)); return this; } @@ -3170,7 +3165,7 @@ static inline void spin_wait_for_next_rwl(rwl_queue *q) DEFINE_THISCALL_WRAPPER(reader_writer_lock_lock, 4) void __thiscall reader_writer_lock_lock(reader_writer_lock *this) { - rwl_queue q = { NULL }, *last; + rwl_queue q = { NULL, get_current_context() }, *last; TRACE("(%p)\n", this); @@ -3183,11 +3178,11 @@ void __thiscall reader_writer_lock_lock(reader_writer_lock *this) last = InterlockedExchangePointer((void**)&this->writer_tail, &q); if (last) { last->next = &q; - NtWaitForKeyedEvent(keyed_event, &q, 0, NULL); + call_Context_Block(q.ctx); } else { this->writer_head = &q; if (InterlockedOr(&this->count, WRITER_WAITING)) - NtWaitForKeyedEvent(keyed_event, &q, 0, NULL); + call_Context_Block(q.ctx); } this->thread_id = GetCurrentThreadId(); @@ -3204,7 +3199,7 @@ void __thiscall reader_writer_lock_lock(reader_writer_lock *this) DEFINE_THISCALL_WRAPPER(reader_writer_lock_lock_read, 4) void __thiscall reader_writer_lock_lock_read(reader_writer_lock *this) { - rwl_queue q; + rwl_queue q = { NULL, get_current_context() }; TRACE("(%p)\n", this); @@ -3226,17 +3221,17 @@ void __thiscall reader_writer_lock_lock_read(reader_writer_lock *this) if (InterlockedCompareExchange(&this->count, count+1, count) == count) break; if (count & WRITER_WAITING) - NtWaitForKeyedEvent(keyed_event, &q, 0, NULL); + call_Context_Block(q.ctx); head = InterlockedExchangePointer((void**)&this->reader_head, NULL); while(head && head != &q) { rwl_queue *next = head->next; InterlockedIncrement(&this->count); - NtReleaseKeyedEvent(keyed_event, head, 0, NULL); + call_Context_Unblock(head->ctx); head = next; } } else { - NtWaitForKeyedEvent(keyed_event, &q, 0, NULL); + call_Context_Block(q.ctx); } } @@ -3314,7 +3309,7 @@ void __thiscall reader_writer_lock_unlock(reader_writer_lock *this) this->thread_id = 0; next = this->writer_head->next; if (next) { - NtReleaseKeyedEvent(keyed_event, next, 0, NULL); + call_Context_Unblock(next->ctx); return; } InterlockedAnd(&this->count, ~WRITER_WAITING); @@ -3322,7 +3317,7 @@ void __thiscall reader_writer_lock_unlock(reader_writer_lock *this) while (head) { next = head->next; InterlockedIncrement(&this->count); - NtReleaseKeyedEvent(keyed_event, head, 0, NULL); + call_Context_Unblock(head->ctx); head = next; }

1 0

Piotr Caban : wineps: Don't store currently selected brush in print processor data.
by Alexandre Julliard 14 Apr '23

14 Apr '23

Module: wine Branch: master Commit: 7dc4f9d0017dfda58c757908584ce11296c8a053 URL: https://gitlab.winehq.org/wine/wine/-/commit/7dc4f9d0017dfda58c757908584ce1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 13 20:13:39 2023 +0200 wineps: Don't store currently selected brush in print processor data. --- dlls/wineps.drv/printproc.c | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index f46f7752a3c..9993d5e236b 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -41,7 +41,6 @@ struct pp_data WCHAR *doc_name; WCHAR *out_file; PSDRV_PDEVICE *pdev; - DWORD brush; struct brush_pattern *patterns; BOOL path; }; @@ -939,7 +938,24 @@ static HGDIOBJ get_object_handle(struct pp_data *data, HANDLETABLE *handletable, return handletable->objectHandle[i]; } -static BOOL fill_rgn(struct pp_data *data, HANDLETABLE *htable, DWORD brush, HRGN rgn) +static BOOL select_hbrush(struct pp_data *data, HANDLETABLE *htable, int handle_count, HBRUSH brush) +{ + struct brush_pattern *pattern = NULL; + int i; + + for (i = 0; i < handle_count; i++) + { + if (htable->objectHandle[i] == brush) + { + pattern = data->patterns + i; + break; + } + } + + return PSDRV_SelectBrush(&data->pdev->dev, brush, pattern) != NULL; +} + +static BOOL fill_rgn(struct pp_data *data, HANDLETABLE *htable, int handle_count, DWORD brush, HRGN rgn) { struct brush_pattern *pattern; HBRUSH hbrush; @@ -948,7 +964,7 @@ static BOOL fill_rgn(struct pp_data *data, HANDLETABLE *htable, DWORD brush, HRG hbrush = get_object_handle(data, htable, brush, &pattern); PSDRV_SelectBrush(&data->pdev->dev, hbrush, pattern); ret = PSDRV_PaintRgn(&data->pdev->dev, rgn); - hbrush = get_object_handle(data, htable, data->brush, &pattern); + select_hbrush(data, htable, handle_count, GetCurrentObject(data->pdev->dev.hdc, OBJ_BRUSH)); PSDRV_SelectBrush(&data->pdev->dev, hbrush, pattern); return ret; } @@ -1090,13 +1106,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, switch (GetObjectType(obj)) { case OBJ_PEN: return PSDRV_SelectPen(&data->pdev->dev, obj, NULL) != NULL; - case OBJ_BRUSH: - if (PSDRV_SelectBrush(&data->pdev->dev, obj, pattern)) - { - data->brush = so->ihObject; - return 1; - } - return 0; + case OBJ_BRUSH: return PSDRV_SelectBrush(&data->pdev->dev, obj, pattern) != NULL; default: FIXME("unhandled object type %ld\n", GetObjectType(obj)); return 1; @@ -1253,7 +1263,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, int ret; rgn = ExtCreateRegion(NULL, p->cbRgnData, (const RGNDATA *)p->RgnData); - ret = fill_rgn(data, htable, p->ihBrush, rgn); + ret = fill_rgn(data, htable, n, p->ihBrush, rgn); DeleteObject(rgn); return ret; } @@ -1277,7 +1287,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, OffsetRgn(rgn, 0, -p->szlStroke.cy); CombineRgn(frame, rgn, frame, RGN_DIFF); - ret = fill_rgn(data, htable, p->ihBrush, frame); + ret = fill_rgn(data, htable, n, p->ihBrush, frame); DeleteObject(rgn); DeleteObject(frame); return ret; @@ -1290,7 +1300,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, rgn = ExtCreateRegion(NULL, p->cbRgnData, (const RGNDATA *)p->RgnData); old_rop = SetROP2(data->pdev->dev.hdc, R2_NOT); - ret = fill_rgn(data, htable, 0x80000000 | BLACK_BRUSH, rgn); + ret = fill_rgn(data, htable, n, 0x80000000 | BLACK_BRUSH, rgn); SetROP2(data->pdev->dev.hdc, old_rop); DeleteObject(rgn); return ret;

1 0

Piotr Caban : wineps: Handle EMR_SETTEXTCOLOR record in spool files.
by Alexandre Julliard 14 Apr '23

14 Apr '23

Module: wine Branch: master Commit: 90191dbacc2d8d61f5f6f3a364e713605843b94d URL: https://gitlab.winehq.org/wine/wine/-/commit/90191dbacc2d8d61f5f6f3a364e713… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 13 20:16:08 2023 +0200 wineps: Handle EMR_SETTEXTCOLOR record in spool files. --- dlls/wineps.drv/printproc.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 9993d5e236b..c6b2651ee0b 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -1094,6 +1094,14 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, return PSDRV_SetPixel(&data->pdev->dev, p->ptlPixel.x, p->ptlPixel.y, p->crColor); } + case EMR_SETTEXTCOLOR: + { + const EMRSETTEXTCOLOR *p = (const EMRSETTEXTCOLOR *)rec; + + SetTextColor(data->pdev->dev.hdc, p->crColor); + PSDRV_SetTextColor(&data->pdev->dev, p->crColor); + return 1; + } case EMR_SELECTOBJECT: { const EMRSELECTOBJECT *so = (const EMRSELECTOBJECT *)rec;

1 0

Piotr Caban : wineps: Handle EMR_SETBKCOLOR record in spool files.
by Alexandre Julliard 14 Apr '23

14 Apr '23

Module: wine Branch: master Commit: e26b3ba30a2e18ff55851e98e64210eba1b7a728 URL: https://gitlab.winehq.org/wine/wine/-/commit/e26b3ba30a2e18ff55851e98e64210… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 13 20:17:02 2023 +0200 wineps: Handle EMR_SETBKCOLOR record in spool files. --- dlls/wineps.drv/printproc.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index c6b2651ee0b..5e6b5489b0d 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -1102,6 +1102,14 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, PSDRV_SetTextColor(&data->pdev->dev, p->crColor); return 1; } + case EMR_SETBKCOLOR: + { + const EMRSETBKCOLOR *p = (const EMRSETBKCOLOR *)rec; + + SetBkColor(data->pdev->dev.hdc, p->crColor); + PSDRV_SetBkColor(&data->pdev->dev, p->crColor); + return 1; + } case EMR_SELECTOBJECT: { const EMRSELECTOBJECT *so = (const EMRSELECTOBJECT *)rec;

1 0