December 2022 - Wine-commits

Gabriel Ivăncescu : jscript: Implement a Garbage Collector to deal with circular references.
by Alexandre Julliard 08 Dec '22

08 Dec '22

Module: wine Branch: master Commit: e8ee6ddae8077873c4a06530fd793a1c8c942428 URL: https://gitlab.winehq.org/wine/wine/-/commit/e8ee6ddae8077873c4a06530fd793a… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Dec 8 17:02:50 2022 +0200 jscript: Implement a Garbage Collector to deal with circular references. Implement a basic GC based on the mark-and-sweep algorithm, without requiring manually specifying "roots", which vastly simplifies the code. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/dispex.c | 324 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/engine.c | 28 ++++ dlls/jscript/enumerator.c | 11 +- dlls/jscript/function.c | 88 +++++++++++-- dlls/jscript/jscript.c | 3 + dlls/jscript/jscript.h | 20 ++- dlls/jscript/jsregexp.c | 17 ++- dlls/jscript/set.c | 37 +++++- dlls/jscript/tests/run.c | 18 +++ 9 files changed, 532 insertions(+), 14 deletions(-)

1 0

Jacek Caban : win32u: Move NtUserRealChildWindowFromPoint implementation from user32.
by Alexandre Julliard 08 Dec '22

08 Dec '22

Module: wine Branch: master Commit: 026700027e83060c79db32fb769097103704fa90 URL: https://gitlab.winehq.org/wine/wine/-/commit/026700027e83060c79db32fb769097… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 8 01:01:05 2022 +0100 win32u: Move NtUserRealChildWindowFromPoint implementation from user32. --- dlls/user32/winpos.c | 3 +-- dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/window.c | 8 ++++++++ dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 9 +++++++++ include/ntuser.h | 1 + 7 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index cee549d1ea9..00f82c33538 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -107,8 +107,7 @@ HWND WINAPI ChildWindowFromPoint( HWND parent, POINT pt ) */ HWND WINAPI RealChildWindowFromPoint( HWND parent, POINT pt ) { - return NtUserChildWindowFromPointEx( parent, pt.x, pt.y, - CWP_SKIPTRANSPARENT | CWP_SKIPINVISIBLE ); + return NtUserRealChildWindowFromPoint( parent, pt.x, pt.y ); } /******************************************************************* diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 558edc0257e..6aacfa47f2b 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -239,6 +239,7 @@ static void * const syscalls[] = NtUserPostThreadMessage, NtUserPrintWindow, NtUserQueryInputContext, + NtUserRealChildWindowFromPoint, NtUserRedrawWindow, NtUserRegisterClassExWOW, NtUserRegisterHotKey, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 1d85a450748..e2d84238008 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1117,7 +1117,7 @@ @ stdcall -syscall NtUserQueryInputContext(long long) @ stub NtUserQuerySendMessage @ stub NtUserQueryWindow -@ stub NtUserRealChildWindowFromPoint +@ stdcall -syscall NtUserRealChildWindowFromPoint(long long long) @ stub NtUserRealInternalGetMessage @ stub NtUserRealWaitMessageEx @ stdcall -syscall NtUserRedrawWindow(long ptr long long) diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 9a8963ce2a1..5074f255fd8 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -2296,6 +2296,14 @@ HWND WINAPI NtUserChildWindowFromPointEx( HWND parent, LONG x, LONG y, UINT flag return ret; } +/******************************************************************* + * NtUserRealChildWindowFromPoint (win32u.@) + */ +HWND WINAPI NtUserRealChildWindowFromPoint( HWND parent, LONG x, LONG y ) +{ + return NtUserChildWindowFromPointEx( parent, x, y, CWP_SKIPTRANSPARENT | CWP_SKIPINVISIBLE ); +} + /******************************************************************* * get_work_rect * diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 8573fa743a5..1730b6a1f60 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -225,6 +225,7 @@ SYSCALL_ENTRY( NtUserPostThreadMessage ) \ SYSCALL_ENTRY( NtUserPrintWindow ) \ SYSCALL_ENTRY( NtUserQueryInputContext ) \ + SYSCALL_ENTRY( NtUserRealChildWindowFromPoint ) \ SYSCALL_ENTRY( NtUserRedrawWindow ) \ SYSCALL_ENTRY( NtUserRegisterClassExWOW ) \ SYSCALL_ENTRY( NtUserRegisterHotKey ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index afc73ca1322..831ee2e84fc 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -2423,6 +2423,15 @@ NTSTATUS WINAPI wow64_NtUserGetRawInputDeviceList( UINT *args ) } } +NTSTATUS WINAPI wow64_NtUserRealChildWindowFromPoint( UINT *args ) +{ + HWND parent = get_handle( &args ); + LONG x = get_ulong( &args ); + LONG y = get_ulong( &args ); + + return HandleToUlong( NtUserRealChildWindowFromPoint( parent, x, y )); +} + NTSTATUS WINAPI wow64_NtUserRegisterClassExWOW( UINT *args ) { const WNDCLASSEXW32 *wc32 = get_ptr( &args ); diff --git a/include/ntuser.h b/include/ntuser.h index 3c41e435712..34e7f5240e7 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -812,6 +812,7 @@ BOOL WINAPI NtUserPostMessage( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpa BOOL WINAPI NtUserPostThreadMessage( DWORD thread, UINT msg, WPARAM wparam, LPARAM lparam ); BOOL WINAPI NtUserPrintWindow( HWND hwnd, HDC hdc, UINT flags ); UINT_PTR WINAPI NtUserQueryInputContext( HIMC handle, UINT attr ); +HWND WINAPI NtUserRealChildWindowFromPoint( HWND parent, LONG x, LONG y ); BOOL WINAPI NtUserRedrawWindow( HWND hwnd, const RECT *rect, HRGN hrgn, UINT flags ); ATOM WINAPI NtUserRegisterClassExWOW( const WNDCLASSEXW *wc, UNICODE_STRING *name, UNICODE_STRING *version, struct client_menu_name *client_menu_name, DWORD fnid, DWORD flags,

1 0

Jacek Caban : win32u: Move NtUserGetInternalWindowPos implementation from user32.
by Alexandre Julliard 08 Dec '22

08 Dec '22

Module: wine Branch: master Commit: f5c82753298ec76be0e32884859ee5cc9b516326 URL: https://gitlab.winehq.org/wine/wine/-/commit/f5c82753298ec76be0e32884859ee5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 8 01:08:25 2022 +0100 win32u: Move NtUserGetInternalWindowPos implementation from user32. --- dlls/user32/user32.spec | 2 +- dlls/user32/winpos.c | 19 ------------------- dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/window.c | 14 ++++++++++++++ dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 9 +++++++++ include/ntuser.h | 1 + 8 files changed, 28 insertions(+), 21 deletions(-) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 6f827144935..a53d02cd064 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -314,7 +314,7 @@ @ stdcall GetIconInfoExW(long ptr) @ stub GetInputDesktop @ stdcall GetInputState() -@ stdcall GetInternalWindowPos(long ptr ptr) +@ stdcall GetInternalWindowPos(long ptr ptr) NtUserGetInternalWindowPos @ stdcall GetKBCodePage() @ stdcall GetKeyNameTextA(long ptr long) @ stdcall GetKeyNameTextW(long ptr long) NtUserGetKeyNameText diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 00f82c33538..6e2c892f2b7 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -195,25 +195,6 @@ BOOL WINAPI BringWindowToTop( HWND hwnd ) } -/*********************************************************************** - * GetInternalWindowPos (USER32.@) - */ -UINT WINAPI GetInternalWindowPos( HWND hwnd, LPRECT rectWnd, - LPPOINT ptIcon ) -{ - WINDOWPLACEMENT wndpl; - - wndpl.length = sizeof(wndpl); - if (NtUserGetWindowPlacement( hwnd, &wndpl )) - { - if (rectWnd) *rectWnd = wndpl.rcNormalPosition; - if (ptIcon) *ptIcon = wndpl.ptMinPosition; - return wndpl.showCmd; - } - return 0; -} - - /*********************************************************************** * AnimateWindow (USER32.@) * Shows/Hides a window with an animation diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 6aacfa47f2b..6c59c91b5b0 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -178,6 +178,7 @@ static void * const syscalls[] = NtUserGetGUIThreadInfo, NtUserGetIconInfo, NtUserGetIconSize, + NtUserGetInternalWindowPos, NtUserGetKeyNameText, NtUserGetKeyState, NtUserGetKeyboardLayout, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index e2d84238008..1ffcfcaef5a 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -943,7 +943,7 @@ @ stub NtUserGetInteractiveControlDeviceInfo @ stub NtUserGetInteractiveControlInfo @ stub NtUserGetInteractiveCtrlSupportedWaveforms -@ stub NtUserGetInternalWindowPos +@ stdcall -syscall NtUserGetInternalWindowPos(long ptr ptr) @ stdcall -syscall NtUserGetKeyNameText(long ptr long) @ stdcall -syscall NtUserGetKeyState(long) @ stdcall -syscall NtUserGetKeyboardLayout(long) diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 5074f255fd8..24931eab199 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -2495,6 +2495,20 @@ static void make_rect_onscreen( RECT *rect ) } } +/*********************************************************************** + * NtUserGetInternalWindowPos (win32u.@) + */ +UINT WINAPI NtUserGetInternalWindowPos( HWND hwnd, RECT *rect, POINT *pt ) +{ + WINDOWPLACEMENT placement; + + placement.length = sizeof(placement); + if (!NtUserGetWindowPlacement( hwnd, &placement )) return 0; + if (rect) *rect = placement.rcNormalPosition; + if (pt) *pt = placement.ptMinPosition; + return placement.showCmd; +} + /* make sure the specified point is visible on screen */ static void make_point_onscreen( POINT *pt ) { diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 1730b6a1f60..24e52a2a476 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -164,6 +164,7 @@ SYSCALL_ENTRY( NtUserGetGUIThreadInfo ) \ SYSCALL_ENTRY( NtUserGetIconInfo ) \ SYSCALL_ENTRY( NtUserGetIconSize ) \ + SYSCALL_ENTRY( NtUserGetInternalWindowPos ) \ SYSCALL_ENTRY( NtUserGetKeyNameText ) \ SYSCALL_ENTRY( NtUserGetKeyState ) \ SYSCALL_ENTRY( NtUserGetKeyboardLayout ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 831ee2e84fc..c8354e6b04a 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -2050,6 +2050,15 @@ NTSTATUS WINAPI wow64_NtUserGetIconSize( UINT *args ) return NtUserGetIconSize( handle, step, width, height ); } +NTSTATUS WINAPI wow64_NtUserGetInternalWindowPos( UINT *args ) +{ + HWND hwnd = get_handle( &args ); + RECT *rect = get_ptr( &args ); + POINT *pt = get_ptr( &args ); + + return NtUserGetInternalWindowPos( hwnd, rect, pt ); +} + NTSTATUS WINAPI wow64_NtUserGetKeyNameText( UINT *args ) { LONG lparam = get_ulong( &args ); diff --git a/include/ntuser.h b/include/ntuser.h index 34e7f5240e7..2ca383c6e69 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -744,6 +744,7 @@ BOOL WINAPI NtUserGetGUIThreadInfo( DWORD id, GUITHREADINFO *info ); BOOL WINAPI NtUserGetIconInfo( HICON icon, ICONINFO *info, UNICODE_STRING *module, UNICODE_STRING *res_name, DWORD *bpp, LONG unk ); BOOL WINAPI NtUserGetIconSize( HICON handle, UINT step, LONG *width, LONG *height ); +UINT WINAPI NtUserGetInternalWindowPos( HWND hwnd, RECT *rect, POINT *pt ); INT WINAPI NtUserGetKeyNameText( LONG lparam, WCHAR *buffer, INT size ); SHORT WINAPI NtUserGetKeyState( INT vkey ); HKL WINAPI NtUserGetKeyboardLayout( DWORD thread_id );

1 0

Jacek Caban : user32: Merge winpos.c into win.c.
by Alexandre Julliard 08 Dec '22

08 Dec '22

Module: wine Branch: master Commit: 1d4a230c69cd78fa6efe3bd7879619dfc5afa4cf URL: https://gitlab.winehq.org/wine/wine/-/commit/1d4a230c69cd78fa6efe3bd7879619… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 8 01:22:08 2022 +0100 user32: Merge winpos.c into win.c. --- dlls/user32/Makefile.in | 1 - dlls/user32/win.c | 228 ++++++++++++++++++++++++++++++++++++++++++ dlls/user32/winpos.c | 258 ------------------------------------------------ 3 files changed, 228 insertions(+), 259 deletions(-)

1 0

Hans Leidekker : wofutil: New dll.
by Alexandre Julliard 08 Dec '22

08 Dec '22

Module: wine Branch: master Commit: de026dbd8e8449404d829242440b57954483ee09 URL: https://gitlab.winehq.org/wine/wine/-/commit/de026dbd8e8449404d829242440b57… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 8 13:55:05 2022 +0100 wofutil: New dll. --- configure | 2 ++ configure.ac | 1 + dlls/wofutil/Makefile.in | 1 + dlls/wofutil/wofutil.spec | 11 +++++++++++ 4 files changed, 15 insertions(+) diff --git a/configure b/configure index 61f6c3c7da2..5704afc1ff8 100755 --- a/configure +++ b/configure @@ -1490,6 +1490,7 @@ enable_wmp enable_wmphoto enable_wmvcore enable_wnaspi32 +enable_wofutil enable_wow64 enable_wow64cpu enable_wow64win @@ -21927,6 +21928,7 @@ wine_fn_config_makefile dlls/wmphoto enable_wmphoto wine_fn_config_makefile dlls/wmvcore enable_wmvcore wine_fn_config_makefile dlls/wmvcore/tests enable_tests wine_fn_config_makefile dlls/wnaspi32 enable_wnaspi32 +wine_fn_config_makefile dlls/wofutil enable_wofutil wine_fn_config_makefile dlls/wow32 enable_win16 wine_fn_config_makefile dlls/wow64 enable_wow64 wine_fn_config_makefile dlls/wow64cpu enable_wow64cpu diff --git a/configure.ac b/configure.ac index 7b3734bd2e9..9115244cb78 100644 --- a/configure.ac +++ b/configure.ac @@ -3197,6 +3197,7 @@ WINE_CONFIG_MAKEFILE(dlls/wmphoto) WINE_CONFIG_MAKEFILE(dlls/wmvcore) WINE_CONFIG_MAKEFILE(dlls/wmvcore/tests) WINE_CONFIG_MAKEFILE(dlls/wnaspi32) +WINE_CONFIG_MAKEFILE(dlls/wofutil) WINE_CONFIG_MAKEFILE(dlls/wow32,enable_win16) WINE_CONFIG_MAKEFILE(dlls/wow64) WINE_CONFIG_MAKEFILE(dlls/wow64cpu) diff --git a/dlls/wofutil/Makefile.in b/dlls/wofutil/Makefile.in new file mode 100644 index 00000000000..387a4264349 --- /dev/null +++ b/dlls/wofutil/Makefile.in @@ -0,0 +1 @@ +MODULE = wofutil.dll diff --git a/dlls/wofutil/wofutil.spec b/dlls/wofutil/wofutil.spec new file mode 100644 index 00000000000..60168790731 --- /dev/null +++ b/dlls/wofutil/wofutil.spec @@ -0,0 +1,11 @@ +@ stub WofEnumEntries +@ stub WofFileEnumFiles +@ stub WofGetDriverVersion +@ stub WofIsExternalFile +@ stub WofSetFileDataLocation +@ stub WofShouldCompressBinaries +@ stub WofWimAddEntry +@ stub WofWimEnumFiles +@ stub WofWimRemoveEntry +@ stub WofWimSuspendEntry +@ stub WofWimUpdateEntry

1 0

Hans Leidekker : wofutil: Stub WofShouldCompressBinaries().
by Alexandre Julliard 08 Dec '22

08 Dec '22

Module: wine Branch: master Commit: fa533f11e100a4380470ccffb6fa496b82d834ca URL: https://gitlab.winehq.org/wine/wine/-/commit/fa533f11e100a4380470ccffb6fa49… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 8 13:57:50 2022 +0100 wofutil: Stub WofShouldCompressBinaries(). --- dlls/wofutil/Makefile.in | 3 +++ dlls/wofutil/main.c | 30 ++++++++++++++++++++++++++++++ dlls/wofutil/wofutil.spec | 2 +- include/Makefile.in | 1 + include/wofapi.h | 19 +++++++++++++++++++ 5 files changed, 54 insertions(+), 1 deletion(-) diff --git a/dlls/wofutil/Makefile.in b/dlls/wofutil/Makefile.in index 387a4264349..479dea651bc 100644 --- a/dlls/wofutil/Makefile.in +++ b/dlls/wofutil/Makefile.in @@ -1 +1,4 @@ MODULE = wofutil.dll + +C_SRCS = \ + main.c diff --git a/dlls/wofutil/main.c b/dlls/wofutil/main.c new file mode 100644 index 00000000000..1866aed7c69 --- /dev/null +++ b/dlls/wofutil/main.c @@ -0,0 +1,30 @@ +/* + * Copyright 2022 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include "windef.h" +#include "wofapi.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wofutil); + +BOOL WINAPI WofShouldCompressBinaries( const WCHAR *volume, ULONG *alg ) +{ + FIXME( "%s, %p\n", debugstr_w(volume), alg ); + return FALSE; +} diff --git a/dlls/wofutil/wofutil.spec b/dlls/wofutil/wofutil.spec index 60168790731..73f11c4f885 100644 --- a/dlls/wofutil/wofutil.spec +++ b/dlls/wofutil/wofutil.spec @@ -3,7 +3,7 @@ @ stub WofGetDriverVersion @ stub WofIsExternalFile @ stub WofSetFileDataLocation -@ stub WofShouldCompressBinaries +@ stdcall WofShouldCompressBinaries(wstr ptr) @ stub WofWimAddEntry @ stub WofWimEnumFiles @ stub WofWimRemoveEntry diff --git a/include/Makefile.in b/include/Makefile.in index d0ae4b4667e..23a4265a437 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -917,6 +917,7 @@ SOURCES = \ wmsdkidl.idl \ wmsecure.idl \ wnaspi32.h \ + wofapi.h \ wownt16.h \ wownt32.h \ wpcapi.idl \ diff --git a/include/wofapi.h b/include/wofapi.h new file mode 100644 index 00000000000..8d678dc2d08 --- /dev/null +++ b/include/wofapi.h @@ -0,0 +1,19 @@ +/* + * Copyright 2022 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +BOOL WINAPI WofShouldCompressBinaries(const WCHAR *, ULONG *);

1 0

Torge Matthies : msvcr100: Implement _StructuredTaskCollection::_RunAndWait.
by Alexandre Julliard 08 Dec '22

08 Dec '22

Module: wine Branch: master Commit: 11af5b750c990d6541110527a214687f4f5c2ce2 URL: https://gitlab.winehq.org/wine/wine/-/commit/11af5b750c990d6541110527a21468… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Mon Sep 26 23:04:00 2022 +0200 msvcr100: Implement _StructuredTaskCollection::_RunAndWait. --- dlls/msvcrt/concurrency.c | 58 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 47 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index c5db2868d58..3f0fbe6b62c 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -1900,6 +1900,15 @@ static ThreadScheduler *get_thread_scheduler_from_context(Context *context) return NULL; } +static void execute_chore(_UnrealizedChore *chore, + _StructuredTaskCollection *task_collection) +{ + TRACE("(%p %p)\n", chore, task_collection); + + if (chore->chore_proc) + chore->chore_proc(chore); +} + static void CALLBACK chore_wrapper_finally(BOOL normal, void *data) { _UnrealizedChore *chore = data; @@ -1921,23 +1930,20 @@ static void CALLBACK chore_wrapper_finally(BOOL normal, void *data) new_finished = prev_finished + 1; } while (InterlockedCompareExchange(ptr, new_finished, prev_finished) != prev_finished); + RtlWakeAddressSingle((LONG*)ptr); } static void __cdecl chore_wrapper(_UnrealizedChore *chore) { - TRACE("(%p)\n", chore); - __TRY { - if (chore->chore_proc) - chore->chore_proc(chore); + execute_chore(chore, chore->task_collection); } __FINALLY_CTX(chore_wrapper_finally, chore) } -static void __cdecl _StructuredTaskCollection_scheduler_cb(void *data) +static BOOL pick_and_execute_chore(ThreadScheduler *scheduler) { - ThreadScheduler *scheduler = (ThreadScheduler*)get_current_scheduler(); struct list *entry; struct scheduled_chore *sc; _UnrealizedChore *chore; @@ -1947,7 +1953,7 @@ static void __cdecl _StructuredTaskCollection_scheduler_cb(void *data) if (scheduler->scheduler.vtable != &ThreadScheduler_vtable) { ERR("unknown scheduler set\n"); - return; + return FALSE; } EnterCriticalSection(&scheduler->cs); @@ -1956,13 +1962,19 @@ static void __cdecl _StructuredTaskCollection_scheduler_cb(void *data) list_remove(entry); LeaveCriticalSection(&scheduler->cs); if (!entry) - return; + return FALSE; sc = LIST_ENTRY(entry, struct scheduled_chore, entry); chore = sc->chore; operator_delete(sc); chore->chore_wrapper(chore); + return TRUE; +} + +static void __cdecl _StructuredTaskCollection_scheduler_cb(void *data) +{ + pick_and_execute_chore((ThreadScheduler*)get_current_scheduler()); } static bool schedule_chore(_StructuredTaskCollection *this, @@ -2044,11 +2056,35 @@ void __thiscall _StructuredTaskCollection__Schedule( /* ?_RunAndWait(a)_StructuredTaskCollection@details(a)Concurrency@@QAA?AW4_TaskCollectionStatus(a)23@PAV_UnrealizedChore(a)23@@Z */ /* ?_RunAndWait(a)_StructuredTaskCollection@details(a)Concurrency@@QAG?AW4_TaskCollectionStatus(a)23@PAV_UnrealizedChore(a)23@@Z */ /* ?_RunAndWait(a)_StructuredTaskCollection@details(a)Concurrency@@QEAA?AW4_TaskCollectionStatus(a)23@PEAV_UnrealizedChore(a)23@@Z */ -/*enum Concurrency::details::_TaskCollectionStatus*/int __stdcall -_StructuredTaskCollection__RunAndWait( +/*_TaskCollectionStatus*/int __stdcall _StructuredTaskCollection__RunAndWait( _StructuredTaskCollection *this, _UnrealizedChore *chore) { - FIXME("(%p %p): stub!\n", this, chore); + LONG expected, val; + + TRACE("(%p %p)\n", this, chore); + + if (chore) { + 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); + } + execute_chore(chore, this); + } + + if (this->context) { + ThreadScheduler *scheduler = get_thread_scheduler_from_context(this->context); + if (scheduler) { + while (pick_and_execute_chore(scheduler)) ; + } + } + + expected = this->count ? this->count : FINISHED_INITIAL; + while ((val = this->finished) != expected) + RtlWaitOnAddress((LONG*)&this->finished, &val, sizeof(val), NULL); + + this->finished = 0; + this->count = 0; return 1; }

1 0

Torge Matthies : msvcr100: Move exception_ptr functions to a separate file.
by Alexandre Julliard 08 Dec '22

08 Dec '22

Module: wine Branch: master Commit: 11631680346a9395540b245d9e0989c1d9ca52cc URL: https://gitlab.winehq.org/wine/wine/-/commit/11631680346a9395540b245d9e0989… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Mon Sep 26 23:04:01 2022 +0200 msvcr100: Move exception_ptr functions to a separate file. --- dlls/msvcr100/Makefile.in | 1 + dlls/msvcr110/Makefile.in | 1 + dlls/msvcr120/Makefile.in | 1 + dlls/msvcrt/Makefile.in | 1 + dlls/msvcrt/cpp.c | 357 ++------------------------------------------ dlls/msvcrt/cxx.h | 8 + dlls/msvcrt/exception_ptr.c | 350 +++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 378 insertions(+), 341 deletions(-)

1 0

Torge Matthies : msvcr100: Factor out EXCEPTION_RECORD to exception_ptr conversion.
by Alexandre Julliard 08 Dec '22

08 Dec '22

Module: wine Branch: master Commit: 96e2a766f8b9e84bf01c98d4fbcb4ae849f8e8a9 URL: https://gitlab.winehq.org/wine/wine/-/commit/96e2a766f8b9e84bf01c98d4fbcb4a… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Mon Sep 26 23:04:01 2022 +0200 msvcr100: Factor out EXCEPTION_RECORD to exception_ptr conversion. --- dlls/msvcrt/exception_ptr.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/msvcrt/exception_ptr.c b/dlls/msvcrt/exception_ptr.c index d4c427e436f..8238baec548 100644 --- a/dlls/msvcrt/exception_ptr.c +++ b/dlls/msvcrt/exception_ptr.c @@ -151,15 +151,9 @@ static inline void call_copy_ctor( void *func, void *this, void *src, int has_vb } #endif -/********************************************************************* - * ?__ExceptionPtrCurrentException@@YAXPAX(a)Z - * ?__ExceptionPtrCurrentException@@YAXPEAX(a)Z - */ #ifndef __x86_64__ -void __cdecl __ExceptionPtrCurrentException(exception_ptr *ep) +static void exception_ptr_from_record(exception_ptr *ep, EXCEPTION_RECORD *rec) { - EXCEPTION_RECORD *rec = msvcrt_get_thread_data()->exc_record; - TRACE("(%p)\n", ep); if (!rec) @@ -202,10 +196,8 @@ void __cdecl __ExceptionPtrCurrentException(exception_ptr *ep) return; } #else -void __cdecl __ExceptionPtrCurrentException(exception_ptr *ep) +static void exception_ptr_from_record(exception_ptr *ep, EXCEPTION_RECORD *rec) { - EXCEPTION_RECORD *rec = msvcrt_get_thread_data()->exc_record; - TRACE("(%p)\n", ep); if (!rec) @@ -250,6 +242,16 @@ void __cdecl __ExceptionPtrCurrentException(exception_ptr *ep) } #endif +/********************************************************************* + * ?__ExceptionPtrCurrentException@@YAXPAX(a)Z + * ?__ExceptionPtrCurrentException@@YAXPEAX(a)Z + */ +void __cdecl __ExceptionPtrCurrentException(exception_ptr *ep) +{ + TRACE("(%p)\n", ep); + exception_ptr_from_record(ep, msvcrt_get_thread_data()->exc_record); +} + #if _MSVCR_VER >= 110 /********************************************************************* * ?__ExceptionPtrToBool@@YA_NPBX(a)Z

1 0

Torge Matthies : msvcr100: Implement exception passing from chore threads to _RunAndWait.
by Alexandre Julliard 08 Dec '22

08 Dec '22

Module: wine Branch: master Commit: f26985affee6517def3d32e412b0e1117d325857 URL: https://gitlab.winehq.org/wine/wine/-/commit/f26985affee6517def3d32e412b0e1… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Mon Sep 26 23:04:01 2022 +0200 msvcr100: Implement exception passing from chore threads to _RunAndWait. --- dlls/concrt140/Makefile.in | 4 ++- dlls/concrt140/concrt140.c | 10 ++++++- dlls/crtdll/Makefile.in | 1 + dlls/msvcr70/Makefile.in | 1 + dlls/msvcr71/Makefile.in | 1 + dlls/msvcr80/Makefile.in | 1 + dlls/msvcr90/Makefile.in | 1 + dlls/msvcrt/concurrency.c | 69 +++++++++++++++++++++++++++++++++++++++++++-- dlls/msvcrt/cxx.h | 5 ++++ dlls/msvcrt/except_i386.c | 15 ---------- dlls/msvcrt/exception_ptr.c | 56 ++++++++++++++++++++++++++---------- dlls/msvcrtd/Makefile.in | 1 + dlls/ucrtbase/Makefile.in | 1 + 13 files changed, 132 insertions(+), 34 deletions(-)

1 0