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

Piotr Caban : msvcr100: Add Context::Block() implementation.
by Alexandre Julliard April 14, 2023

April 14, 2023

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

Torge Matthies : msvcr110: Implement _Context::_IsSynchronouslyBlocked.
by Alexandre Julliard April 14, 2023

April 14, 2023

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 ExternalContextBase::IsSynchronouslyBlocked() implementation.
by Alexandre Julliard April 14, 2023

April 14, 2023

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: Use Context blocking functions in reader_writer_lock class.
by Alexandre Julliard April 14, 2023

April 14, 2023

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 : msvcr100: Add missing ExternalContextBase virtual functions stubs.
by Alexandre Julliard April 14, 2023

April 14, 2023

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 ExternalContextBase::Unblock implementation.
by Alexandre Julliard April 14, 2023

April 14, 2023

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

Alexandre Julliard : winedump: Apply all dynamic relocations before dumping alternate PE headers.
by Alexandre Julliard April 14, 2023

April 14, 2023

Module: wine Branch: master Commit: c8a79e7bc6137807f016add34c3da362a25f3698 URL: https://gitlab.winehq.org/wine/wine/-/commit/c8a79e7bc6137807f016add34c3da3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 14 16:51:28 2023 +0200 winedump: Apply all dynamic relocations before dumping alternate PE headers. --- tools/winedump/pe.c | 585 ++++++++++++++++++++++++---------------------------- 1 file changed, 274 insertions(+), 311 deletions(-)

1 0

Rémi Bernon : winegstreamer: Introduce new stream_type_from_caps helper.
by Alexandre Julliard April 14, 2023

April 14, 2023

Module: wine Branch: master Commit: 223d279205420d37c32f8af3d9883f84a7e0da67 URL: https://gitlab.winehq.org/wine/wine/-/commit/223d279205420d37c32f8af3d9883f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Mar 15 14:58:04 2023 +0100 winegstreamer: Introduce new stream_type_from_caps helper. --- dlls/winegstreamer/unix_private.h | 1 + dlls/winegstreamer/unixlib.c | 21 +++++++++++++++++++++ dlls/winegstreamer/wg_transform.c | 17 +++-------------- 3 files changed, 25 insertions(+), 14 deletions(-) diff --git a/dlls/winegstreamer/unix_private.h b/dlls/winegstreamer/unix_private.h index 2f4e168c3a2..962668045c1 100644 --- a/dlls/winegstreamer/unix_private.h +++ b/dlls/winegstreamer/unix_private.h @@ -32,6 +32,7 @@ GST_DEBUG_CATEGORY_EXTERN(wine) DECLSPEC_HIDDEN; extern NTSTATUS wg_init_gstreamer(void *args) DECLSPEC_HIDDEN; +extern GstStreamType stream_type_from_caps(GstCaps *caps) DECLSPEC_HIDDEN; extern GstElement *create_element(const char *name, const char *plugin_set) DECLSPEC_HIDDEN; extern GstElement *find_element(GstElementFactoryListType type, GstCaps *src_caps, GstCaps *sink_caps) DECLSPEC_HIDDEN; extern bool append_element(GstElement *container, GstElement *element, GstElement **first, GstElement **last) DECLSPEC_HIDDEN; diff --git a/dlls/winegstreamer/unixlib.c b/dlls/winegstreamer/unixlib.c index 7111402bf0a..6ffd41e9712 100644 --- a/dlls/winegstreamer/unixlib.c +++ b/dlls/winegstreamer/unixlib.c @@ -47,6 +47,27 @@ GST_DEBUG_CATEGORY(wine); +GstStreamType stream_type_from_caps(GstCaps *caps) +{ + const gchar *media_type; + + if (!caps || !gst_caps_get_size(caps)) + return GST_STREAM_TYPE_UNKNOWN; + + media_type = gst_structure_get_name(gst_caps_get_structure(caps, 0)); + if (g_str_has_prefix(media_type, "video/") + || g_str_has_prefix(media_type, "image/")) + return GST_STREAM_TYPE_VIDEO; + if (g_str_has_prefix(media_type, "audio/")) + return GST_STREAM_TYPE_AUDIO; + if (g_str_has_prefix(media_type, "text/") + || g_str_has_prefix(media_type, "subpicture/") + || g_str_has_prefix(media_type, "closedcaption/")) + return GST_STREAM_TYPE_TEXT; + + return GST_STREAM_TYPE_UNKNOWN; +} + GstElement *create_element(const char *name, const char *plugin_set) { GstElement *element; diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index 978d790fbb6..7755dac2523 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -60,17 +60,6 @@ struct wg_transform GstCaps *output_caps; }; -static bool is_caps_video(GstCaps *caps) -{ - const gchar *media_type; - - if (!caps || !gst_caps_get_size(caps)) - return false; - - media_type = gst_structure_get_name(gst_caps_get_structure(caps, 0)); - return g_str_has_prefix(media_type, "video/"); -} - static void align_video_info_planes(gsize plane_align, GstVideoInfo *info, GstVideoAlignment *align) { gst_video_alignment_reset(align); @@ -127,7 +116,7 @@ static gboolean transform_sink_query_cb(GstPad *pad, GstObject *parent, GstQuery GstCaps *caps; gst_query_parse_allocation(query, &caps, &needs_pool); - if (!is_caps_video(caps) || !needs_pool) + if (stream_type_from_caps(caps) != GST_STREAM_TYPE_VIDEO || !needs_pool) break; if (!gst_video_info_from_caps(&info, caps) @@ -671,7 +660,7 @@ static NTSTATUS read_transform_output_data(GstBuffer *buffer, GstCaps *caps, gsi if ((ret = !needs_copy)) total_size = sample->size = info.size; - else if (is_caps_video(caps)) + else if (stream_type_from_caps(caps) == GST_STREAM_TYPE_VIDEO) ret = copy_video_buffer(buffer, caps, plane_align, sample, &total_size); else ret = copy_buffer(buffer, caps, sample, &total_size); @@ -707,7 +696,7 @@ static NTSTATUS read_transform_output_data(GstBuffer *buffer, GstCaps *caps, gsi if (needs_copy) { - if (is_caps_video(caps)) + if (stream_type_from_caps(caps) == GST_STREAM_TYPE_VIDEO) GST_WARNING("Copied %u bytes, sample %p, flags %#x", sample->size, sample, sample->flags); else GST_INFO("Copied %u bytes, sample %p, flags %#x", sample->size, sample, sample->flags);

1 0

Rémi Bernon : winegstreamer: Sync element state with parent in append_element.
by Alexandre Julliard April 14, 2023

April 14, 2023

Module: wine Branch: master Commit: 5ed0abf3490428ea28de5c6640e6a6e48520bf06 URL: https://gitlab.winehq.org/wine/wine/-/commit/5ed0abf3490428ea28de5c6640e6a6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Mar 15 10:38:02 2023 +0100 winegstreamer: Sync element state with parent in append_element. --- dlls/winegstreamer/wg_transform.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index cfc04f2093e..7977c818b42 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -267,13 +267,13 @@ NTSTATUS wg_transform_destroy(void *args) return STATUS_SUCCESS; } -static bool transform_append_element(struct wg_transform *transform, GstElement *element, - GstElement **first, GstElement **last) +static bool append_element(GstElement *container, GstElement *element, GstElement **first, GstElement **last) { gchar *name = gst_element_get_name(element); bool success = false; - if (!gst_bin_add(GST_BIN(transform->container), element) || + if (!gst_bin_add(GST_BIN(container), element) || + !gst_element_sync_state_with_parent(element) || (*last && !gst_element_link(*last, element))) { GST_ERROR("Failed to link %s element.", name); @@ -370,7 +370,7 @@ NTSTATUS wg_transform_create(void *args) transform->input_max_length = 16; transform->output_plane_align = 15; if (!(element = create_element("h264parse", "base")) - || !transform_append_element(transform, element, &first, &last)) + || !append_element(transform->container, element, &first, &last)) goto out; /* fallthrough */ case WG_MAJOR_TYPE_AUDIO_MPEG1: @@ -380,7 +380,7 @@ NTSTATUS wg_transform_create(void *args) case WG_MAJOR_TYPE_VIDEO_INDEO: case WG_MAJOR_TYPE_VIDEO_WMV: if (!(element = find_element(GST_ELEMENT_FACTORY_TYPE_DECODER, src_caps, raw_caps)) - || !transform_append_element(transform, element, &first, &last)) + || !append_element(transform->container, element, &first, &last)) { gst_caps_unref(raw_caps); goto out; @@ -411,17 +411,17 @@ NTSTATUS wg_transform_create(void *args) * non-interleaved format. */ if (!(element = create_element("audioconvert", "base")) - || !transform_append_element(transform, element, &first, &last)) + || !append_element(transform->container, element, &first, &last)) goto out; if (!(element = create_element("audioresample", "base")) - || !transform_append_element(transform, element, &first, &last)) + || !append_element(transform->container, element, &first, &last)) goto out; break; case WG_MAJOR_TYPE_VIDEO: case WG_MAJOR_TYPE_VIDEO_WMV: if (!(element = create_element("videoconvert", "base")) - || !transform_append_element(transform, element, &first, &last)) + || !append_element(transform->container, element, &first, &last)) goto out; /* Let GStreamer choose a default number of threads. */ gst_util_set_object_arg(G_OBJECT(element), "n-threads", "0");

1 0

Rémi Bernon : winegstreamer: Introduce a new wg_init_gstreamer unixlib entry.
by Alexandre Julliard April 14, 2023

April 14, 2023

Module: wine Branch: master Commit: 2df0b96008edded542b60dbeb3803d16c3a1ca30 URL: https://gitlab.winehq.org/wine/wine/-/commit/2df0b96008edded542b60dbeb3803d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Mar 15 10:11:13 2023 +0100 winegstreamer: Introduce a new wg_init_gstreamer unixlib entry. --- dlls/winegstreamer/Makefile.in | 1 + dlls/winegstreamer/main.c | 3 ++ dlls/winegstreamer/quartz_parser.c | 3 -- dlls/winegstreamer/unix_private.h | 16 ++++++++- dlls/winegstreamer/unixlib.c | 71 ++++++++++++++++++++++++++++++++++++++ dlls/winegstreamer/unixlib.h | 2 ++ dlls/winegstreamer/wg_allocator.c | 3 -- dlls/winegstreamer/wg_format.c | 3 -- dlls/winegstreamer/wg_parser.c | 42 ++-------------------- dlls/winegstreamer/wg_transform.c | 6 ---- dlls/winegstreamer/wm_reader.c | 3 ++ 11 files changed, 97 insertions(+), 56 deletions(-)

1 0