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

David Kahurani : win32u: Use allocator mechanism to allocate DC attributes.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 9e9152843bba79a62fc4ed99f84a5b0bd5d49fef URL: https://gitlab.winehq.org/wine/wine/-/commit/9e9152843bba79a62fc4ed99f84a5b… Author: David Kahurani <k.kahurani(a)gmail.com> Date: Mon Sep 19 10:58:45 2022 +0300 win32u: Use allocator mechanism to allocate DC attributes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53645 (cherry picked from commit 903c91fc60aa7f3da127ab81e2c27844eec9bcdd) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/win32u/dc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/dc.c b/dlls/win32u/dc.c index 3aae73779e9..ca0b08fa2d3 100644 --- a/dlls/win32u/dc.c +++ b/dlls/win32u/dc.c @@ -548,7 +548,7 @@ INT WINAPI NtGdiSaveDC( HDC hdc ) release_dc_ptr( dc ); return 0; } - if (!(newdc->attr = calloc( 1, sizeof(*newdc->attr) ))) + if (!(newdc->attr = alloc_dc_attr() )) { free( newdc ); release_dc_ptr( dc );

1 0

Zebediah Figura : ntdll: Add a fast path for NtDeviceIoControlFile(INVALID_HANDLE_VALUE).
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: bdc1b882cbd08703720b1ecd91e280834f282c6e URL: https://gitlab.winehq.org/wine/wine/-/commit/bdc1b882cbd08703720b1ecd91e280… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Sep 19 23:31:43 2022 -0500 ntdll: Add a fast path for NtDeviceIoControlFile(INVALID_HANDLE_VALUE). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53706 (cherry picked from commit d0f34c232abb07c0e679d92917254c2f05b001c1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/unix/file.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index a29b5cbb980..da2119b28d3 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -5707,6 +5707,11 @@ NTSTATUS WINAPI NtDeviceIoControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUT TRACE( "(%p,%p,%p,%p,%p,0x%08x,%p,0x%08x,%p,0x%08x)\n", handle, event, apc, apc_context, io, code, in_buffer, in_size, out_buffer, out_size ); + /* some broken applications call this frequently with INVALID_HANDLE_VALUE, + * and run slowly if we make a server call every time */ + if (HandleToLong( handle ) == ~0) + return STATUS_INVALID_HANDLE; + switch (device) { case FILE_DEVICE_BEEP:

1 0

Gijs Vermeulen : msvcp140: Add _ExceptionHolder::ReportUnhandledError stub.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: cd812463691120d558edbef724b0d56b347df2c3 URL: https://gitlab.winehq.org/wine/wine/-/commit/cd812463691120d558edbef724b0d5… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri Sep 2 23:16:25 2022 +0200 msvcp140: Add _ExceptionHolder::ReportUnhandledError stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53614 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> (cherry picked from commit 3f47b478b4508a2010bbe4a8a365abe70e929707) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/concrt140/details.c | 9 +++++++++ dlls/msvcp140/msvcp140.spec | 6 +++--- dlls/msvcp90/details.c | 9 +++++++++ dlls/msvcp_win/msvcp_win.spec | 6 +++--- 4 files changed, 24 insertions(+), 6 deletions(-) diff --git a/dlls/concrt140/details.c b/dlls/concrt140/details.c index 13a2fbbca96..517c3fdb39a 100644 --- a/dlls/concrt140/details.c +++ b/dlls/concrt140/details.c @@ -1091,6 +1091,15 @@ bool __cdecl _Task_impl_base__IsNonBlockingThread(void) return FALSE; } +/* ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AAAXXZ */ +/* ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AAEXXZ */ +/* ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AEAAXXZ */ +DEFINE_THISCALL_WRAPPER(_ExceptionHolder__ReportUnhandledError, 4) +void __thiscall _ExceptionHolder__ReportUnhandledError(void *this) +{ + FIXME("(%p) stub\n", this); +} + __ASM_BLOCK_BEGIN(concurrency_details_vtables) __ASM_VTABLE(_Concurrent_queue_base_v4, VTABLE_ADD_FUNC(_Concurrent_queue_base_v4_dummy) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 3945a4bfbd4..ee75a8ad87f 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -1085,9 +1085,9 @@ @ stub -arch=win64 ?CaptureCallstack(a)platform@details(a)Concurrency@@YA_KPEAPEAX_K1(a)Z @ cdecl ?GetCurrentThreadId(a)platform@details(a)Concurrency@@YAJXZ() kernel32.GetCurrentThreadId @ stub ?GetNextAsyncId(a)platform@details(a)Concurrency@@YAIXZ -@ stub -arch=arm ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AAAXXZ -@ stub -arch=i386 ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AAEXXZ -@ stub -arch=win64 ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AEAAXXZ +@ cdecl -arch=arm ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AAAXXZ(ptr) _ExceptionHolder__ReportUnhandledError +@ thiscall -arch=i386 ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AAEXXZ(ptr) _ExceptionHolder__ReportUnhandledError +@ cdecl -arch=win64 ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AEAAXXZ(ptr) _ExceptionHolder__ReportUnhandledError @ cdecl -arch=arm ?_Addcats(a)_Locinfo@std@@QAAAAV12(a)HPBD@Z(ptr long str) _Locinfo__Addcats @ thiscall -arch=i386 ?_Addcats(a)_Locinfo@std@@QAEAAV12(a)HPBD@Z(ptr long str) _Locinfo__Addcats @ cdecl -arch=win64 ?_Addcats(a)_Locinfo@std@@QEAAAEAV12(a)HPEBD@Z(ptr long str) _Locinfo__Addcats diff --git a/dlls/msvcp90/details.c b/dlls/msvcp90/details.c index e3c3148a133..046a38a0785 100644 --- a/dlls/msvcp90/details.c +++ b/dlls/msvcp90/details.c @@ -1105,6 +1105,15 @@ bool __cdecl _Task_impl_base__IsNonBlockingThread(void) FIXME("() stub\n"); return FALSE; } + +/* ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AAAXXZ */ +/* ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AAEXXZ */ +/* ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AEAAXXZ */ +DEFINE_THISCALL_WRAPPER(_ExceptionHolder__ReportUnhandledError, 4) +void __thiscall _ExceptionHolder__ReportUnhandledError(void *this) +{ + FIXME("(%p) stub\n", this); +} #endif __ASM_BLOCK_BEGIN(concurrency_details_vtables) diff --git a/dlls/msvcp_win/msvcp_win.spec b/dlls/msvcp_win/msvcp_win.spec index c6ca765f158..60d2f816341 100644 --- a/dlls/msvcp_win/msvcp_win.spec +++ b/dlls/msvcp_win/msvcp_win.spec @@ -1085,9 +1085,9 @@ @ stub -arch=win64 ?CaptureCallstack(a)platform@details(a)Concurrency@@YA_KPEAPEAX_K1(a)Z @ cdecl ?GetCurrentThreadId(a)platform@details(a)Concurrency@@YAJXZ() msvcp140.?GetCurrentThreadId(a)platform@details(a)Concurrency@@YAJXZ @ stub ?GetNextAsyncId(a)platform@details(a)Concurrency@@YAIXZ -@ stub -arch=arm ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AAAXXZ -@ stub -arch=i386 ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AAEXXZ -@ stub -arch=win64 ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AEAAXXZ +@ cdecl -arch=arm ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AAAXXZ(ptr) msvcp140.?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AAAXXZ +@ thiscall -arch=i386 ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AAEXXZ(ptr) msvcp140.?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AAEXXZ +@ cdecl -arch=win64 ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AEAAXXZ(ptr) msvcp140.?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AEAAXXZ @ cdecl -arch=arm ?_Addcats(a)_Locinfo@std@@QAAAAV12(a)HPBD@Z(ptr long str) msvcp140.?_Addcats(a)_Locinfo@std@@QAAAAV12(a)HPBD@Z @ thiscall -arch=i386 ?_Addcats(a)_Locinfo@std@@QAEAAV12(a)HPBD@Z(ptr long str) msvcp140.?_Addcats(a)_Locinfo@std@@QAEAAV12(a)HPBD@Z @ cdecl -arch=win64 ?_Addcats(a)_Locinfo@std@@QEAAAEAV12(a)HPEBD@Z(ptr long str) msvcp140.?_Addcats(a)_Locinfo@std@@QEAAAEAV12(a)HPEBD@Z

1 0

Paul Gofman : crypt32: Support CRYPT_STRING_HEX in CryptStringToBinary().
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 9c6f810c2972f9e3d587a5e731afacdd6fd2b0d8 URL: https://gitlab.winehq.org/wine/wine/-/commit/9c6f810c2972f9e3d587a5e731afac… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Sep 20 15:47:54 2022 -0500 crypt32: Support CRYPT_STRING_HEX in CryptStringToBinary(). (cherry picked from commit 1120a1cb2951964f3b9f8467a0e34d3f2faf6bc2) Conflicts: dlls/crypt32/tests/base64.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/crypt32/base64.c | 123 ++++++++++++++ dlls/crypt32/tests/base64.c | 386 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 505 insertions(+), 4 deletions(-)

1 0

Gijs Vermeulen : dbghelp: Add SymSrvGetFileIndexInfo stub.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: d5a6b8a412890302d879bcc93665f2cd13c2686a URL: https://gitlab.winehq.org/wine/wine/-/commit/d5a6b8a412890302d879bcc93665f2… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sun Sep 11 19:24:45 2022 +0200 dbghelp: Add SymSrvGetFileIndexInfo stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48600 (cherry picked from commit 4f90e88d0b4316630e9b33e0e0813c1c079deb5c) Conflicts: dlls/dbghelp/symbol.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dbghelp/dbghelp.spec | 2 +- dlls/dbghelp/symbol.c | 11 +++++++++++ include/dbghelp.h | 28 ++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 87861cd87ce..754fb456611 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -175,7 +175,7 @@ @ stdcall SymSetSearchPathW(long wstr) @ stub SymSrvDeltaName @ stub SymSrvDeltaNameW -@ stub SymSrvGetFileIndexInfo +@ stdcall SymSrvGetFileIndexInfo(str ptr long) @ stub SymSrvGetFileIndexInfoW @ stub SymSrvGetFileIndexString @ stub SymSrvGetFileIndexStringW diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index d3ba4521fa0..2638a81c380 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -2766,3 +2766,14 @@ BOOL WINAPI SymGetLineFromInlineContextW(HANDLE hProcess, DWORD64 addr, ULONG in if (!get_line_from_inline_context(hProcess, addr, inline_ctx, mod_addr, disp, &intl)) return FALSE; return internal_line_copy_toW64(&intl, line); } + +/****************************************************************** + * SymSrvGetFileIndexInfo (DBGHELP.@) + * + */ +BOOL WINAPI SymSrvGetFileIndexInfo(const char *file, SYMSRV_INDEX_INFO* info, DWORD flags) +{ + FIXME("(%s, %p, 0x%08x): stub!\n", debugstr_a(file), info, flags); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/include/dbghelp.h b/include/dbghelp.h index 07fa429809a..b79dcd8a737 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -982,6 +982,34 @@ typedef struct _SYMBOL_INFO_PACKAGEW WCHAR name[MAX_SYM_NAME+1]; } SYMBOL_INFO_PACKAGEW, *PSYMBOL_INFO_PACKAGEW; +typedef struct _SYMSRV_INDEX_INFO +{ + DWORD sizeofstruct; + CHAR file[MAX_PATH + 1]; + BOOL stripped; + DWORD timestamp; + DWORD size; + CHAR dbgfile[MAX_PATH + 1]; + CHAR pdbfile[MAX_PATH + 1]; + GUID guid; + DWORD sig; + DWORD age; +} SYMSRV_INDEX_INFO, *PSYMSRV_INDEX_INFO; + +typedef struct +{ + DWORD sizeofstruct; + WCHAR file[MAX_PATH + 1]; + BOOL stripped; + DWORD timestamp; + DWORD size; + WCHAR dbgfile[MAX_PATH + 1]; + WCHAR pdbfile[MAX_PATH + 1]; + GUID guid; + DWORD sig; + DWORD age; +} SYMSRV_INDEX_INFOW, *PSYMSRV_INDEX_INFOW; + typedef enum _IMAGEHLP_SYMBOL_TYPE_INFO { TI_GET_SYMTAG,

1 0

Torge Matthies : msvcr100: Implement _StructuredTaskCollection::_Schedule and _Schedule_loc.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 4d7e90154af6e05840b82fa99d6c0e0675c6a1c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/4d7e90154af6e05840b82fa99d6c0e… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Wed Aug 17 15:19:10 2022 +0200 msvcr100: Implement _StructuredTaskCollection::_Schedule and _Schedule_loc. Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> (cherry picked from commit 581a35d1bf739ccd0ac9379d80acd77eb166fcd8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/concurrency.c | 190 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 183 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index 719ceec8fb8..a2d7a6e1bce 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -24,6 +24,8 @@ #include "windef.h" #include "winternl.h" #include "wine/debug.h" +#include "wine/exception.h" +#include "wine/list.h" #include "msvcrt.h" #include "cxx.h" @@ -135,6 +137,7 @@ typedef struct { int shutdown_size; HANDLE *shutdown_events; CRITICAL_SECTION cs; + struct list scheduled_chores; } ThreadScheduler; extern const vtable_ptr ThreadScheduler_vtable; @@ -164,15 +167,32 @@ typedef struct yield_func yield_func; } SpinWait; +#define FINISHED_INITIAL 0x80000000 typedef struct { - char dummy; -} _UnrealizedChore; + void *unk1; + unsigned int unk2; + void *unk3; + Context *context; + volatile LONG count; + volatile LONG finished; + void *exception; + void *event; +} _StructuredTaskCollection; -typedef struct +typedef struct _UnrealizedChore { - char dummy; -} _StructuredTaskCollection; + const vtable_ptr *vtable; + void (__cdecl *chore_proc)(struct _UnrealizedChore*); + _StructuredTaskCollection *task_collection; + void (__cdecl *chore_wrapper)(struct _UnrealizedChore*); + void *unk[6]; +} _UnrealizedChore; + +struct scheduled_chore { + struct list entry; + _UnrealizedChore *chore; +}; /* keep in sync with msvcp90/msvcp90.h */ typedef struct cs_queue @@ -628,6 +648,7 @@ DEFINE_RTTI_DATA1(scheduler_resource_allocation_error, 0, &cexception_rtti_base_ DEFINE_CXX_DATA1(improper_lock, &cexception_cxx_type_info, cexception_dtor) DEFINE_CXX_DATA1(improper_scheduler_attach, &cexception_cxx_type_info, cexception_dtor) DEFINE_CXX_DATA1(improper_scheduler_detach, &cexception_cxx_type_info, cexception_dtor) +DEFINE_CXX_DATA1(invalid_multiple_scheduling, &cexception_cxx_type_info, cexception_dtor) DEFINE_CXX_DATA1(invalid_scheduler_policy_key, &cexception_cxx_type_info, cexception_dtor) DEFINE_CXX_DATA1(invalid_scheduler_policy_thread_specification, &cexception_cxx_type_info, cexception_dtor) DEFINE_CXX_DATA1(invalid_scheduler_policy_value, &cexception_cxx_type_info, cexception_dtor) @@ -836,6 +857,25 @@ bool __thiscall ExternalContextBase_IsSynchronouslyBlocked(const ExternalContext return FALSE; } +static void remove_scheduled_chores(Scheduler *scheduler, const ExternalContextBase *context) +{ + ThreadScheduler *tscheduler = (ThreadScheduler*)scheduler; + struct scheduled_chore *sc, *next; + + if (tscheduler->scheduler.vtable != &ThreadScheduler_vtable) + return; + + EnterCriticalSection(&tscheduler->cs); + LIST_FOR_EACH_ENTRY_SAFE(sc, next, &tscheduler->scheduled_chores, + struct scheduled_chore, entry) { + if (sc->chore->task_collection->context == &context->context) { + list_remove(&sc->entry); + operator_delete(sc); + } + } + LeaveCriticalSection(&tscheduler->cs); +} + static void ExternalContextBase_dtor(ExternalContextBase *this) { struct scheduler_list *scheduler_cur, *scheduler_next; @@ -851,10 +891,12 @@ static void ExternalContextBase_dtor(ExternalContextBase *this) } if (this->scheduler.scheduler) { + remove_scheduled_chores(this->scheduler.scheduler, this); call_Scheduler_Release(this->scheduler.scheduler); for(scheduler_cur=this->scheduler.next; scheduler_cur; scheduler_cur=scheduler_next) { scheduler_next = scheduler_cur->next; + remove_scheduled_chores(scheduler_cur->scheduler, this); call_Scheduler_Release(scheduler_cur->scheduler); operator_delete(scheduler_cur); } @@ -1154,6 +1196,7 @@ void __thiscall SchedulerPolicy_dtor(SchedulerPolicy *this) static void ThreadScheduler_dtor(ThreadScheduler *this) { int i; + struct scheduled_chore *sc, *next; if(this->ref != 0) WARN("ref = %d\n", this->ref); SchedulerPolicy_dtor(&this->policy); @@ -1164,6 +1207,12 @@ static void ThreadScheduler_dtor(ThreadScheduler *this) this->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&this->cs); + + if (!list_empty(&this->scheduled_chores)) + ERR("scheduled chore list is not empty\n"); + LIST_FOR_EACH_ENTRY_SAFE(sc, next, &this->scheduled_chores, + struct scheduled_chore, entry) + operator_delete(sc); } DEFINE_THISCALL_WRAPPER(ThreadScheduler_Id, 4) @@ -1372,6 +1421,8 @@ static ThreadScheduler* ThreadScheduler_ctor(ThreadScheduler *this, InitializeCriticalSection(&this->cs); this->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ThreadScheduler"); + + list_init(&this->scheduled_chores); return this; } @@ -1821,6 +1872,114 @@ void __thiscall _StructuredTaskCollection_dtor(_StructuredTaskCollection *this) #endif /* _MSVCR_VER >= 120 */ +static ThreadScheduler *get_thread_scheduler_from_context(Context *context) +{ + Scheduler *scheduler = get_scheduler_from_context(context); + if (scheduler && scheduler->vtable == &ThreadScheduler_vtable) + return (ThreadScheduler*)scheduler; + return NULL; +} + +static void CALLBACK chore_wrapper_finally(BOOL normal, void *data) +{ + _UnrealizedChore *chore = data; + LONG prev_finished, new_finished; + volatile LONG *ptr; + + TRACE("(%u %p)\n", normal, data); + + if (!chore->task_collection) + return; + ptr = &chore->task_collection->finished; + chore->task_collection = NULL; + + do { + prev_finished = *ptr; + if (prev_finished == FINISHED_INITIAL) + new_finished = 1; + else + new_finished = prev_finished + 1; + } while (InterlockedCompareExchange(ptr, new_finished, prev_finished) + != prev_finished); +} + +static void __cdecl chore_wrapper(_UnrealizedChore *chore) +{ + TRACE("(%p)\n", chore); + + __TRY + { + if (chore->chore_proc) + chore->chore_proc(chore); + } + __FINALLY_CTX(chore_wrapper_finally, chore) +} + +static void __cdecl _StructuredTaskCollection_scheduler_cb(void *data) +{ + ThreadScheduler *scheduler = (ThreadScheduler*)get_current_scheduler(); + struct list *entry; + struct scheduled_chore *sc; + _UnrealizedChore *chore; + + TRACE("(%p)\n", scheduler); + + if (scheduler->scheduler.vtable != &ThreadScheduler_vtable) + { + ERR("unknown scheduler set\n"); + return; + } + + EnterCriticalSection(&scheduler->cs); + entry = list_head(&scheduler->scheduled_chores); + if (entry) + list_remove(entry); + LeaveCriticalSection(&scheduler->cs); + if (!entry) + return; + + sc = LIST_ENTRY(entry, struct scheduled_chore, entry); + chore = sc->chore; + operator_delete(sc); + + chore->chore_wrapper(chore); +} + +static bool schedule_chore(_StructuredTaskCollection *this, + _UnrealizedChore *chore, Scheduler **pscheduler) +{ + struct scheduled_chore *sc; + ThreadScheduler *scheduler; + + if (chore->task_collection) { + invalid_multiple_scheduling e; + invalid_multiple_scheduling_ctor_str(&e, "Chore scheduled multiple times"); + _CxxThrowException(&e, &invalid_multiple_scheduling_exception_type); + return FALSE; + } + + if (!this->context) + this->context = get_current_context(); + scheduler = get_thread_scheduler_from_context(this->context); + if (!scheduler) { + ERR("unknown context or scheduler set\n"); + return FALSE; + } + + sc = operator_new(sizeof(*sc)); + sc->chore = chore; + + chore->task_collection = this; + chore->chore_wrapper = chore_wrapper; + InterlockedIncrement(&this->count); + + EnterCriticalSection(&scheduler->cs); + list_add_head(&scheduler->scheduled_chores, &sc->entry); + LeaveCriticalSection(&scheduler->cs); + *pscheduler = &scheduler->scheduler; + return TRUE; +} + #if _MSVCR_VER >= 110 /* ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z */ @@ -1831,7 +1990,15 @@ void __thiscall _StructuredTaskCollection__Schedule_loc( _StructuredTaskCollection *this, _UnrealizedChore *chore, /*location*/void *placement) { - FIXME("(%p %p %p): stub!\n", this, chore, placement); + Scheduler *scheduler; + + TRACE("(%p %p %p)\n", this, chore, placement); + + if (schedule_chore(this, chore, &scheduler)) + { + call_Scheduler_ScheduleTask_loc(scheduler, + _StructuredTaskCollection_scheduler_cb, NULL, placement); + } } #endif /* _MSVCR_VER >= 110 */ @@ -1843,7 +2010,15 @@ DEFINE_THISCALL_WRAPPER(_StructuredTaskCollection__Schedule, 8) void __thiscall _StructuredTaskCollection__Schedule( _StructuredTaskCollection *this, _UnrealizedChore *chore) { - FIXME("(%p %p): stub!\n", this, chore); + Scheduler *scheduler; + + TRACE("(%p %p)\n", this, chore); + + if (schedule_chore(this, chore, &scheduler)) + { + call_Scheduler_ScheduleTask(scheduler, + _StructuredTaskCollection_scheduler_cb, NULL); + } } /* ??0critical_section(a)Concurrency@@QAE(a)XZ */ @@ -3064,6 +3239,7 @@ void msvcrt_init_concurrency(void *base) init_improper_lock_cxx(base); init_improper_scheduler_attach_cxx(base); init_improper_scheduler_detach_cxx(base); + init_invalid_multiple_scheduling_cxx(base); init_invalid_scheduler_policy_key_cxx(base); init_invalid_scheduler_policy_thread_specification_cxx(base); init_invalid_scheduler_policy_value_cxx(base);

1 0

Kevin Puetz : winecrt0: Remove free_delay_imports.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 79b532284aa09da54dd0cf27c7670763120e251e URL: https://gitlab.winehq.org/wine/wine/-/commit/79b532284aa09da54dd0cf27c76707… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Wed Aug 31 09:53:17 2022 -0500 winecrt0: Remove free_delay_imports. MSVC's delayimp.lib does not actually free delayload dependencies. winecrt0's attempt to do so from ELF __attribute__((destructor)) is unnecessary and potentially harmful: - When triggered naturally via LdrUnloadDll, this leads to recursive calls to FreeLibrary, violating free_lib_count and missing DLL_PROCESS_DETACH - when triggered by glibc's _dl_fini (at process exit), it leads to use-after-free of the TEB (GetCurrentThreadID after the main thread is no longer Win32) via FreeLibrary -> LdrLdrUnloadDll -> RtlEnterCriticalSection( &loader_section ) - double-free of the library itself, since the DLL_PROCESS_DETACH has already been handled by LdrShutdownProcess - Race against wineserver sending a SIGKILL from process_killed, since all Win32 threads of the process have exited Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53032 (cherry picked from commit b5d3759fc5852f083632792d6213f54151a6467a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winecrt0/delay_load.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/dlls/winecrt0/delay_load.c b/dlls/winecrt0/delay_load.c index 8f28c94d1d5..4ba840479d8 100644 --- a/dlls/winecrt0/delay_load.c +++ b/dlls/winecrt0/delay_load.c @@ -69,14 +69,4 @@ FARPROC WINAPI DECLSPEC_HIDDEN __wine_spec_delay_load( unsigned int id ) return proc; } -#if defined(__GNUC__) && !defined(__APPLE__) /* we can't support destructors properly on Mac OS */ -static void free_delay_imports(void) __attribute__((destructor)); -static void free_delay_imports(void) -{ - struct ImgDelayDescr *descr; - for (descr = __wine_spec_delay_imports; descr->szName; descr++) - if (*descr->phmod) FreeLibrary( *descr->phmod ); -} -#endif - #endif /* __WINE_PE_BUILD */

1 0

Torge Matthies : msvcr100: Implement invalid_multiple_scheduling exception.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 5e40333a7107084356981984aecf83a6fa6cc411 URL: https://gitlab.winehq.org/wine/wine/-/commit/5e40333a7107084356981984aecf83… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Fri Jul 15 21:52:01 2022 +0200 msvcr100: Implement invalid_multiple_scheduling exception. Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> (cherry picked from commit 013ba6aaa130e1135b58970764df44fc4f4f47ae) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/concrt140/concrt140.spec | 12 ++++++------ dlls/msvcr100/msvcr100.spec | 8 ++++---- dlls/msvcr110/msvcr110.spec | 12 ++++++------ dlls/msvcr120/msvcr120.spec | 12 ++++++------ dlls/msvcr120_app/msvcr120_app.spec | 12 ++++++------ dlls/msvcrt/concurrency.c | 38 +++++++++++++++++++++++++++++++++++++ 6 files changed, 66 insertions(+), 28 deletions(-)

1 0

Torge Matthies : msvcr110: Add _StructuredTaskCollection::_Schedule_loc stub.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: cc2b3e945261598280dd570def88cde5b1bcf92a URL: https://gitlab.winehq.org/wine/wine/-/commit/cc2b3e945261598280dd570def88cd… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Mon Jul 4 20:28:58 2022 +0200 msvcr110: Add _StructuredTaskCollection::_Schedule_loc stub. Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 09a6881ca2988463e9136b7912e11024e51ae411) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- 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 | 15 +++++++++++++++ 5 files changed, 27 insertions(+), 12 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index 8474bde4b54..5ba0477953f 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -597,9 +597,9 @@ @ cdecl -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@@Z(ptr ptr) _StructuredTaskCollection__Schedule @ thiscall -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z(ptr ptr) _StructuredTaskCollection__Schedule @ cdecl -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z(ptr ptr) _StructuredTaskCollection__Schedule -@ stub -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z -@ stub -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z -@ stub -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@PEAVlocation(a)3@@Z +@ cdecl -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z(ptr ptr ptr) _StructuredTaskCollection__Schedule_loc +@ thiscall -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z(ptr ptr ptr) _StructuredTaskCollection__Schedule_loc +@ cdecl -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@PEAVlocation(a)3@@Z(ptr ptr ptr) _StructuredTaskCollection__Schedule_loc @ stub -arch=arm ?_Schedule(a)_TaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@@Z @ stub -arch=i386 ?_Schedule(a)_TaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z @ stub -arch=win64 ?_Schedule(a)_TaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index c4cd29a2af7..4cc8bbf1d31 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -617,9 +617,9 @@ @ cdecl -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@@Z(ptr ptr) _StructuredTaskCollection__Schedule @ thiscall -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z(ptr ptr) _StructuredTaskCollection__Schedule @ cdecl -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z(ptr ptr) _StructuredTaskCollection__Schedule -@ stub -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z -@ stub -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z -@ stub -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@PEAVlocation(a)3@@Z +@ cdecl -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z(ptr ptr ptr) _StructuredTaskCollection__Schedule_loc +@ thiscall -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z(ptr ptr ptr) _StructuredTaskCollection__Schedule_loc +@ cdecl -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@PEAVlocation(a)3@@Z(ptr ptr ptr) _StructuredTaskCollection__Schedule_loc @ stub -arch=arm ?_Schedule(a)_TaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@@Z @ stub -arch=i386 ?_Schedule(a)_TaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z @ stub -arch=win64 ?_Schedule(a)_TaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index c1362a0f937..869cefa4a36 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -600,9 +600,9 @@ @ cdecl -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@@Z(ptr ptr) _StructuredTaskCollection__Schedule @ thiscall -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z(ptr ptr) _StructuredTaskCollection__Schedule @ cdecl -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z(ptr ptr) _StructuredTaskCollection__Schedule -@ stub -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z -@ stub -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z -@ stub -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@PEAVlocation(a)3@@Z +@ cdecl -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z(ptr ptr ptr) _StructuredTaskCollection__Schedule_loc +@ thiscall -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z(ptr ptr ptr) _StructuredTaskCollection__Schedule_loc +@ cdecl -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@PEAVlocation(a)3@@Z(ptr ptr ptr) _StructuredTaskCollection__Schedule_loc @ stub -arch=arm ?_Schedule(a)_TaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@@Z @ stub -arch=i386 ?_Schedule(a)_TaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z @ stub -arch=win64 ?_Schedule(a)_TaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 55cf9a1e293..1ca0e566f29 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -597,9 +597,9 @@ @ cdecl -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@@Z(ptr ptr) msvcr120.?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@@Z @ thiscall -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z(ptr ptr) msvcr120.?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z @ cdecl -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z(ptr ptr) msvcr120.?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z -@ stub -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z -@ stub -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z -@ stub -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@PEAVlocation(a)3@@Z +@ cdecl -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z(ptr ptr ptr) msvcr120.?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z +@ thiscall -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z(ptr ptr ptr) msvcr120.?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z +@ cdecl -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@PEAVlocation(a)3@@Z(ptr ptr ptr) msvcr120.?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@PEAVlocation(a)3@@Z @ stub -arch=arm ?_Schedule(a)_TaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@@Z @ stub -arch=i386 ?_Schedule(a)_TaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z @ stub -arch=win64 ?_Schedule(a)_TaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index 10d733bfdaf..f89b143c27d 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -1775,6 +1775,21 @@ void __thiscall _StructuredTaskCollection_dtor(_StructuredTaskCollection *this) #endif /* _MSVCR_VER >= 120 */ +#if _MSVCR_VER >= 110 + +/* ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z */ +/* ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z */ +/* ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@PEAVlocation(a)3@@Z */ +DEFINE_THISCALL_WRAPPER(_StructuredTaskCollection__Schedule_loc, 12) +void __thiscall _StructuredTaskCollection__Schedule_loc( + _StructuredTaskCollection *this, _UnrealizedChore *chore, + /*location*/void *placement) +{ + FIXME("(%p %p %p): stub!\n", this, chore, placement); +} + +#endif /* _MSVCR_VER >= 110 */ + /* ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@@Z */ /* ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z */ /* ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z */

1 0

Torge Matthies : msvcr100: Factor out the mapping of a context to a scheduler.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: cbc58a50275adae69adb4d31a8e187abbac75c74 URL: https://gitlab.winehq.org/wine/wine/-/commit/cbc58a50275adae69adb4d31a8e187… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Wed Aug 17 15:19:10 2022 +0200 msvcr100: Factor out the mapping of a context to a scheduler. Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> (cherry picked from commit e704c445429391ab2d0874ff6cfe8f708a69f8fd) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/concurrency.c | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index 83ecdab89ff..719ceec8fb8 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -694,29 +694,38 @@ static Context* get_current_context(void) return ret; } +static Scheduler* get_scheduler_from_context(Context *ctx) +{ + ExternalContextBase *context = (ExternalContextBase*)ctx; + + if (context->context.vtable != &ExternalContextBase_vtable) + return NULL; + return context->scheduler.scheduler; +} + static Scheduler* try_get_current_scheduler(void) { - ExternalContextBase *context = (ExternalContextBase*)try_get_current_context(); + Context *context = try_get_current_context(); + Scheduler *ret; if (!context) return NULL; - if (context->context.vtable != &ExternalContextBase_vtable) { + ret = get_scheduler_from_context(context); + if (!ret) ERR("unknown context set\n"); - return NULL; - } - return context->scheduler.scheduler; + return ret; } static Scheduler* get_current_scheduler(void) { - ExternalContextBase *context = (ExternalContextBase*)get_current_context(); + Context *context = get_current_context(); + Scheduler *ret; - if (context->context.vtable != &ExternalContextBase_vtable) { + ret = get_scheduler_from_context(context); + if (!ret) ERR("unknown context set\n"); - return NULL; - } - return context->scheduler.scheduler; + return ret; } /* ?CurrentContext(a)Context@Concurrency@@SAPAV12(a)XZ */

1 0