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

Paul Gofman : crypt32: Support CRYPT_STRING_HEX in CryptStringToBinary().
by Alexandre Julliard 27 Mar '23

27 Mar '23

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 27 Mar '23

27 Mar '23

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

Gijs Vermeulen : msvcp140: Add _ExceptionHolder::ReportUnhandledError stub.
by Alexandre Julliard 27 Mar '23

27 Mar '23

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

Zebediah Figura : ntdll: Add a fast path for NtDeviceIoControlFile(INVALID_HANDLE_VALUE).
by Alexandre Julliard 27 Mar '23

27 Mar '23

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

Torge Matthies : msvcr110: Add _StructuredTaskCollection::_StructuredTaskCollection_ctor stub.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: ca1fc887a54e3ba7dbbda39b033e75d213972410 URL: https://gitlab.winehq.org/wine/wine/-/commit/ca1fc887a54e3ba7dbbda39b033e75… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Mon Apr 25 19:35:02 2022 +0200 msvcr110: Add _StructuredTaskCollection::_StructuredTaskCollection_ctor stub. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 881879c658c6b1bfed41beb5da87b6cf1ee31936) 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 | 19 +++++++++++++++++++ 5 files changed, 31 insertions(+), 12 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index 50db9348327..3257d61bb37 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -63,9 +63,9 @@ @ stub -arch=arm ??0_SpinLock(a)details@Concurrency@@QAA(a)ACJ@Z @ stub -arch=i386 ??0_SpinLock(a)details@Concurrency@@QAE(a)ACJ@Z @ stub -arch=win64 ??0_SpinLock(a)details@Concurrency@@QEAA(a)AECJ@Z -@ stub -arch=arm ??0_StructuredTaskCollection(a)details@Concurrency@@QAA(a)PAV_CancellationTokenState@12@@Z -@ stub -arch=i386 ??0_StructuredTaskCollection(a)details@Concurrency@@QAE(a)PAV_CancellationTokenState@12@@Z -@ stub -arch=win64 ??0_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)PEAV_CancellationTokenState@12@@Z +@ cdecl -arch=arm ??0_StructuredTaskCollection(a)details@Concurrency@@QAA(a)PAV_CancellationTokenState@12@@Z(ptr ptr) _StructuredTaskCollection_ctor +@ thiscall -arch=i386 ??0_StructuredTaskCollection(a)details@Concurrency@@QAE(a)PAV_CancellationTokenState@12@@Z(ptr ptr) _StructuredTaskCollection_ctor +@ cdecl -arch=win64 ??0_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)PEAV_CancellationTokenState@12@@Z(ptr ptr) _StructuredTaskCollection_ctor @ stub -arch=arm ??0_TaskCollection(a)details@Concurrency@@QAA(a)PAV_CancellationTokenState@12@@Z @ stub -arch=i386 ??0_TaskCollection(a)details@Concurrency@@QAE(a)PAV_CancellationTokenState@12@@Z @ stub -arch=win64 ??0_TaskCollection(a)details@Concurrency@@QEAA(a)PEAV_CancellationTokenState@12@@Z diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 23840f85eda..64b634b582e 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -62,9 +62,9 @@ @ stub -arch=arm ??0_SpinLock(a)details@Concurrency@@QAA(a)ACJ@Z @ stub -arch=i386 ??0_SpinLock(a)details@Concurrency@@QAE(a)ACJ@Z @ stub -arch=win64 ??0_SpinLock(a)details@Concurrency@@QEAA(a)AECJ@Z -@ stub -arch=arm ??0_StructuredTaskCollection(a)details@Concurrency@@QAA(a)PAV_CancellationTokenState@12@@Z -@ stub -arch=i386 ??0_StructuredTaskCollection(a)details@Concurrency@@QAE(a)PAV_CancellationTokenState@12@@Z -@ stub -arch=win64 ??0_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)PEAV_CancellationTokenState@12@@Z +@ cdecl -arch=arm ??0_StructuredTaskCollection(a)details@Concurrency@@QAA(a)PAV_CancellationTokenState@12@@Z(ptr ptr) _StructuredTaskCollection_ctor +@ thiscall -arch=i386 ??0_StructuredTaskCollection(a)details@Concurrency@@QAE(a)PAV_CancellationTokenState@12@@Z(ptr ptr) _StructuredTaskCollection_ctor +@ cdecl -arch=win64 ??0_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)PEAV_CancellationTokenState@12@@Z(ptr ptr) _StructuredTaskCollection_ctor @ stub -arch=arm ??0_TaskCollection(a)details@Concurrency@@QAA(a)PAV_CancellationTokenState@12@@Z @ stub -arch=i386 ??0_TaskCollection(a)details@Concurrency@@QAE(a)PAV_CancellationTokenState@12@@Z @ stub -arch=win64 ??0_TaskCollection(a)details@Concurrency@@QEAA(a)PEAV_CancellationTokenState@12@@Z diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 64ddeed42f4..68855b90096 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -59,9 +59,9 @@ @ stub -arch=arm ??0_SpinLock(a)details@Concurrency@@QAA(a)ACJ@Z @ stub -arch=i386 ??0_SpinLock(a)details@Concurrency@@QAE(a)ACJ@Z @ stub -arch=win64 ??0_SpinLock(a)details@Concurrency@@QEAA(a)AECJ@Z -@ stub -arch=arm ??0_StructuredTaskCollection(a)details@Concurrency@@QAA(a)PAV_CancellationTokenState@12@@Z -@ stub -arch=i386 ??0_StructuredTaskCollection(a)details@Concurrency@@QAE(a)PAV_CancellationTokenState@12@@Z -@ stub -arch=win64 ??0_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)PEAV_CancellationTokenState@12@@Z +@ cdecl -arch=arm ??0_StructuredTaskCollection(a)details@Concurrency@@QAA(a)PAV_CancellationTokenState@12@@Z(ptr ptr) _StructuredTaskCollection_ctor +@ thiscall -arch=i386 ??0_StructuredTaskCollection(a)details@Concurrency@@QAE(a)PAV_CancellationTokenState@12@@Z(ptr ptr) _StructuredTaskCollection_ctor +@ cdecl -arch=win64 ??0_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)PEAV_CancellationTokenState@12@@Z(ptr ptr) _StructuredTaskCollection_ctor @ stub -arch=arm ??0_TaskCollection(a)details@Concurrency@@QAA(a)PAV_CancellationTokenState@12@@Z @ stub -arch=i386 ??0_TaskCollection(a)details@Concurrency@@QAE(a)PAV_CancellationTokenState@12@@Z @ stub -arch=win64 ??0_TaskCollection(a)details@Concurrency@@QEAA(a)PEAV_CancellationTokenState@12@@Z diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 05f408d6884..eabb304dd6d 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -57,9 +57,9 @@ @ stub -arch=arm ??0_SpinLock(a)details@Concurrency@@QAA(a)ACJ@Z @ stub -arch=i386 ??0_SpinLock(a)details@Concurrency@@QAE(a)ACJ@Z @ stub -arch=win64 ??0_SpinLock(a)details@Concurrency@@QEAA(a)AECJ@Z -@ stub -arch=arm ??0_StructuredTaskCollection(a)details@Concurrency@@QAA(a)PAV_CancellationTokenState@12@@Z -@ stub -arch=i386 ??0_StructuredTaskCollection(a)details@Concurrency@@QAE(a)PAV_CancellationTokenState@12@@Z -@ stub -arch=win64 ??0_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)PEAV_CancellationTokenState@12@@Z +@ cdecl -arch=arm ??0_StructuredTaskCollection(a)details@Concurrency@@QAA(a)PAV_CancellationTokenState@12@@Z(ptr ptr) msvcr120.??0_StructuredTaskCollection(a)details@Concurrency@@QAA(a)PAV_CancellationTokenState@12@@Z +@ thiscall -arch=i386 ??0_StructuredTaskCollection(a)details@Concurrency@@QAE(a)PAV_CancellationTokenState@12@@Z(ptr ptr) msvcr120.??0_StructuredTaskCollection(a)details@Concurrency@@QAE(a)PAV_CancellationTokenState@12@@Z +@ cdecl -arch=win64 ??0_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)PEAV_CancellationTokenState@12@@Z(ptr ptr) msvcr120.??0_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)PEAV_CancellationTokenState@12@@Z @ stub -arch=arm ??0_TaskCollection(a)details@Concurrency@@QAA(a)PAV_CancellationTokenState@12@@Z @ stub -arch=i386 ??0_TaskCollection(a)details@Concurrency@@QAE(a)PAV_CancellationTokenState@12@@Z @ stub -arch=win64 ??0_TaskCollection(a)details@Concurrency@@QEAA(a)PEAV_CancellationTokenState@12@@Z diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index f66dfa43f36..d9fb031e9cb 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -164,6 +164,11 @@ typedef struct yield_func yield_func; } SpinWait; +typedef struct +{ + char dummy; +} _StructuredTaskCollection; + /* keep in sync with msvcp90/msvcp90.h */ typedef struct cs_queue { @@ -1738,6 +1743,20 @@ bool __thiscall SpinWait__SpinOnce(SpinWait *this) } } +#if _MSVCR_VER >= 110 + +/* ??0_StructuredTaskCollection(a)details@Concurrency@@QAE(a)PAV_CancellationTokenState@12@@Z */ +/* ??0_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)PEAV_CancellationTokenState@12@@Z */ +DEFINE_THISCALL_WRAPPER(_StructuredTaskCollection_ctor, 8) +_StructuredTaskCollection* __thiscall _StructuredTaskCollection_ctor( + _StructuredTaskCollection *this, /*_CancellationTokenState*/void *token) +{ + FIXME("(%p): stub\n", this); + return NULL; +} + +#endif /* _MSVCR_VER >= 110 */ + /* ??0critical_section(a)Concurrency@@QAE(a)XZ */ /* ??0critical_section(a)Concurrency@@QEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(critical_section_ctor, 4)

1 0

Piotr Caban : msvcr120: Add missing _StructuredTaskCollection destructor spec file entry.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: 99bae6d80a66ffad0196a635a69e579f1445d0f7 URL: https://gitlab.winehq.org/wine/wine/-/commit/99bae6d80a66ffad0196a635a69e57… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 19 16:54:46 2022 +0200 msvcr120: Add missing _StructuredTaskCollection destructor spec file entry. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f3576a0590260162cf6a03745f48d69d05ef428c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcr120/msvcr120.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 68855b90096..381f954d8a6 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -290,6 +290,7 @@ @ stub -arch=arm ??1_SpinLock(a)details@Concurrency@@QAA(a)XZ @ stub -arch=i386 ??1_SpinLock(a)details@Concurrency@@QAE(a)XZ @ stub -arch=win64 ??1_SpinLock(a)details@Concurrency@@QEAA(a)XZ +@ stub -arch=arm ??1_StructuredTaskCollection(a)details@Concurrency@@QAA(a)XZ @ stub -arch=i386 ??1_StructuredTaskCollection(a)details@Concurrency@@QAE(a)XZ @ stub -arch=win64 ??1_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)XZ @ stub -arch=arm ??1_TaskCollection(a)details@Concurrency@@QAA(a)XZ

1 0

Torge Matthies : msvcr120: Add _StructuredTaskCollection::_StructuredTaskCollection_dtor stub.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: 8b8d572cd105bcc592eb6552560a8a404c36486b URL: https://gitlab.winehq.org/wine/wine/-/commit/8b8d572cd105bcc592eb6552560a8a… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Mon Jul 4 20:28:53 2022 +0200 msvcr120: Add _StructuredTaskCollection::_StructuredTaskCollection_dtor 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 ccde147084d64e9a7a96d2b0b383d3b911abd527) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/concrt140/concrt140.spec | 6 +++--- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr120_app/msvcr120_app.spec | 4 +++- dlls/msvcrt/concurrency.c | 13 +++++++++++++ 4 files changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index 3257d61bb37..ad6e90d725c 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -267,9 +267,9 @@ @ stub -arch=arm ??1_SpinLock(a)details@Concurrency@@QAA(a)XZ @ stub -arch=i386 ??1_SpinLock(a)details@Concurrency@@QAE(a)XZ @ stub -arch=win64 ??1_SpinLock(a)details@Concurrency@@QEAA(a)XZ -@ stub -arch=arm ??1_StructuredTaskCollection(a)details@Concurrency@@QAA(a)XZ -@ stub -arch=i386 ??1_StructuredTaskCollection(a)details@Concurrency@@QAE(a)XZ -@ stub -arch=win64 ??1_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)XZ +@ cdecl -arch=arm ??1_StructuredTaskCollection(a)details@Concurrency@@QAA(a)XZ(ptr) _StructuredTaskCollection_dtor +@ thiscall -arch=i386 ??1_StructuredTaskCollection(a)details@Concurrency@@QAE(a)XZ(ptr) _StructuredTaskCollection_dtor +@ cdecl -arch=win64 ??1_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)XZ(ptr) _StructuredTaskCollection_dtor @ stub -arch=arm ??1_TaskCollection(a)details@Concurrency@@QAA(a)XZ @ stub -arch=i386 ??1_TaskCollection(a)details@Concurrency@@QAE(a)XZ @ stub -arch=win64 ??1_TaskCollection(a)details@Concurrency@@QEAA(a)XZ diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 381f954d8a6..7b6ace9f857 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -290,9 +290,9 @@ @ stub -arch=arm ??1_SpinLock(a)details@Concurrency@@QAA(a)XZ @ stub -arch=i386 ??1_SpinLock(a)details@Concurrency@@QAE(a)XZ @ stub -arch=win64 ??1_SpinLock(a)details@Concurrency@@QEAA(a)XZ -@ stub -arch=arm ??1_StructuredTaskCollection(a)details@Concurrency@@QAA(a)XZ -@ stub -arch=i386 ??1_StructuredTaskCollection(a)details@Concurrency@@QAE(a)XZ -@ stub -arch=win64 ??1_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)XZ +@ cdecl -arch=arm ??1_StructuredTaskCollection(a)details@Concurrency@@QAA(a)XZ(ptr) _StructuredTaskCollection_dtor +@ thiscall -arch=i386 ??1_StructuredTaskCollection(a)details@Concurrency@@QAE(a)XZ(ptr) _StructuredTaskCollection_dtor +@ cdecl -arch=win64 ??1_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)XZ(ptr) _StructuredTaskCollection_dtor @ stub -arch=arm ??1_TaskCollection(a)details@Concurrency@@QAA(a)XZ @ stub -arch=i386 ??1_TaskCollection(a)details@Concurrency@@QAE(a)XZ @ stub -arch=win64 ??1_TaskCollection(a)details@Concurrency@@QEAA(a)XZ diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index eabb304dd6d..f5ff30a46e4 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -288,7 +288,9 @@ @ stub -arch=arm ??1_SpinLock(a)details@Concurrency@@QAA(a)XZ @ stub -arch=i386 ??1_SpinLock(a)details@Concurrency@@QAE(a)XZ @ stub -arch=win64 ??1_SpinLock(a)details@Concurrency@@QEAA(a)XZ -@ stub -arch=i386 ??1_StructuredTaskCollection(a)details@Concurrency@@QAE(a)XZ +@ cdecl -arch=arm ??1_StructuredTaskCollection(a)details@Concurrency@@QAA(a)XZ(ptr) msvcr120.??1_StructuredTaskCollection(a)details@Concurrency@@QAA(a)XZ +@ thiscall -arch=i386 ??1_StructuredTaskCollection(a)details@Concurrency@@QAE(a)XZ(ptr) msvcr120.??1_StructuredTaskCollection(a)details@Concurrency@@QAE(a)XZ +@ cdecl -arch=win64 ??1_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)XZ(ptr) msvcr120.??1_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)XZ @ stub -arch=arm ??1_TaskCollection(a)details@Concurrency@@QAA(a)XZ @ stub -arch=i386 ??1_TaskCollection(a)details@Concurrency@@QAE(a)XZ @ stub -arch=win64 ??1_TaskCollection(a)details@Concurrency@@QEAA(a)XZ diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index d9fb031e9cb..b6e8c758e47 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -1757,6 +1757,19 @@ _StructuredTaskCollection* __thiscall _StructuredTaskCollection_ctor( #endif /* _MSVCR_VER >= 110 */ +#if _MSVCR_VER >= 120 + +/* ??1_StructuredTaskCollection(a)details@Concurrency@@QAA(a)XZ */ +/* ??1_StructuredTaskCollection(a)details@Concurrency@@QAE(a)XZ */ +/* ??1_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)XZ */ +DEFINE_THISCALL_WRAPPER(_StructuredTaskCollection_dtor, 4) +void __thiscall _StructuredTaskCollection_dtor(_StructuredTaskCollection *this) +{ + FIXME("(%p): stub!\n", this); +} + +#endif /* _MSVCR_VER >= 120 */ + /* ??0critical_section(a)Concurrency@@QAE(a)XZ */ /* ??0critical_section(a)Concurrency@@QEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(critical_section_ctor, 4)

1 0

Torge Matthies : msvcr100: Add _StructuredTaskCollection::_Schedule stub.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: b55f3b7a500616745792332443fbee50573dcd2c URL: https://gitlab.winehq.org/wine/wine/-/commit/b55f3b7a500616745792332443fbee… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Mon Jul 4 20:28:56 2022 +0200 msvcr100: Add _StructuredTaskCollection::_Schedule stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47375 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 d31e54d61c16afc8af28b6fd960507f7fd2ac283) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/concrt140/concrt140.spec | 6 +++--- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 6 +++--- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr120_app/msvcr120_app.spec | 6 +++--- dlls/msvcrt/concurrency.c | 15 +++++++++++++++ 6 files changed, 29 insertions(+), 14 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index ad6e90d725c..8474bde4b54 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -594,9 +594,9 @@ @ stub -arch=arm ?_RunAndWait(a)_TaskCollection@details(a)Concurrency@@QAA?AW4_TaskCollectionStatus(a)23@PAV_UnrealizedChore(a)23@@Z @ stub -arch=i386 ?_RunAndWait(a)_TaskCollection@details(a)Concurrency@@QAG?AW4_TaskCollectionStatus(a)23@PAV_UnrealizedChore(a)23@@Z @ stub -arch=win64 ?_RunAndWait(a)_TaskCollection@details(a)Concurrency@@QEAA?AW4_TaskCollectionStatus(a)23@PEAV_UnrealizedChore(a)23@@Z -@ stub -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@@Z -@ stub -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z -@ stub -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z +@ 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 diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 19b4cbe96d7..32c1658ebe9 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -363,8 +363,8 @@ @ stub -arch=win64 ?_RunAndWait(a)_StructuredTaskCollection@details(a)Concurrency@@QEAA?AW4_TaskCollectionStatus(a)23@PEAV_UnrealizedChore(a)23@@Z @ stub -arch=win32 ?_RunAndWait(a)_TaskCollection@details(a)Concurrency@@QAG?AW4_TaskCollectionStatus(a)23@PAV_UnrealizedChore(a)23@@Z @ stub -arch=win64 ?_RunAndWait(a)_TaskCollection@details(a)Concurrency@@QEAA?AW4_TaskCollectionStatus(a)23@PEAV_UnrealizedChore(a)23@@Z -@ stub -arch=win32 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z -@ stub -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z +@ thiscall -arch=win32 ?_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=win32 ?_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 @ thiscall -arch=win32 ?_SetSpinCount@?$_SpinWait@$00(a)details@Concurrency@@QAEXI(a)Z(ptr long) SpinWait__SetSpinCount diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 64b634b582e..c4cd29a2af7 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -614,9 +614,9 @@ @ stub -arch=arm ?_RunAndWait(a)_TaskCollection@details(a)Concurrency@@QAA?AW4_TaskCollectionStatus(a)23@PAV_UnrealizedChore(a)23@@Z @ stub -arch=i386 ?_RunAndWait(a)_TaskCollection@details(a)Concurrency@@QAG?AW4_TaskCollectionStatus(a)23@PAV_UnrealizedChore(a)23@@Z @ stub -arch=win64 ?_RunAndWait(a)_TaskCollection@details(a)Concurrency@@QEAA?AW4_TaskCollectionStatus(a)23@PEAV_UnrealizedChore(a)23@@Z -@ stub -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@@Z -@ stub -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z -@ stub -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z +@ 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 diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 7b6ace9f857..c1362a0f937 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -597,9 +597,9 @@ @ stub -arch=arm ?_RunAndWait(a)_TaskCollection@details(a)Concurrency@@QAA?AW4_TaskCollectionStatus(a)23@PAV_UnrealizedChore(a)23@@Z @ stub -arch=i386 ?_RunAndWait(a)_TaskCollection@details(a)Concurrency@@QAG?AW4_TaskCollectionStatus(a)23@PAV_UnrealizedChore(a)23@@Z @ stub -arch=win64 ?_RunAndWait(a)_TaskCollection@details(a)Concurrency@@QEAA?AW4_TaskCollectionStatus(a)23@PEAV_UnrealizedChore(a)23@@Z -@ stub -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@@Z -@ stub -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z -@ stub -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z +@ 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 diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index f5ff30a46e4..55cf9a1e293 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -594,9 +594,9 @@ @ stub -arch=arm ?_RunAndWait(a)_TaskCollection@details(a)Concurrency@@QAA?AW4_TaskCollectionStatus(a)23@PAV_UnrealizedChore(a)23@@Z @ stub -arch=i386 ?_RunAndWait(a)_TaskCollection@details(a)Concurrency@@QAG?AW4_TaskCollectionStatus(a)23@PAV_UnrealizedChore(a)23@@Z @ stub -arch=win64 ?_RunAndWait(a)_TaskCollection@details(a)Concurrency@@QEAA?AW4_TaskCollectionStatus(a)23@PEAV_UnrealizedChore(a)23@@Z -@ stub -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@@Z -@ stub -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z -@ stub -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z +@ 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 diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index b6e8c758e47..10d733bfdaf 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -164,6 +164,11 @@ typedef struct yield_func yield_func; } SpinWait; +typedef struct +{ + char dummy; +} _UnrealizedChore; + typedef struct { char dummy; @@ -1770,6 +1775,16 @@ void __thiscall _StructuredTaskCollection_dtor(_StructuredTaskCollection *this) #endif /* _MSVCR_VER >= 120 */ +/* ?_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 */ +DEFINE_THISCALL_WRAPPER(_StructuredTaskCollection__Schedule, 8) +void __thiscall _StructuredTaskCollection__Schedule( + _StructuredTaskCollection *this, _UnrealizedChore *chore) +{ + FIXME("(%p %p): stub!\n", this, chore); +} + /* ??0critical_section(a)Concurrency@@QAE(a)XZ */ /* ??0critical_section(a)Concurrency@@QEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(critical_section_ctor, 4)

1 0

Eric Pouech : wldap32: Fix compilation in 32-bit.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: 65cd882ae0503c0b3f92f3315a1ab1026365593d URL: https://gitlab.winehq.org/wine/wine/-/commit/65cd882ae0503c0b3f92f3315a1ab1… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 4 09:34:49 2022 +0100 wldap32: Fix compilation in 32-bit. 32-bit compilation has been broken by 8db1662d749991a77b8945c752ab024d2d6b1244. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 25946b48148784e8275c1685f6498ab88f553ca3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wldap32/libldap.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/wldap32/libldap.c b/dlls/wldap32/libldap.c index 8872421dabc..592e526ecdc 100644 --- a/dlls/wldap32/libldap.c +++ b/dlls/wldap32/libldap.c @@ -53,7 +53,14 @@ C_ASSERT( sizeof(LDAPSortKeyU) == sizeof(LDAPSortKey) ); C_ASSERT( sizeof(LDAPVLVInfoU) == sizeof(LDAPVLVInfo) ); C_ASSERT( sizeof(LDAPAPIInfoU) == sizeof(LDAPAPIInfo) ); C_ASSERT( sizeof(LDAPAPIFeatureInfoU) == sizeof(LDAPAPIFeatureInfo) ); -C_ASSERT( sizeof(struct timevalU) == sizeof(struct timeval) ); + +static struct timeval *convert_timeval(const struct timevalU *tvu, struct timeval *tv) +{ + if (!tvu) return NULL; + tv->tv_sec = tvu->tv_sec; + tv->tv_usec = tvu->tv_usec; + return tv; +} #define WLDAP32_LBER_ERROR (~0l) @@ -488,8 +495,9 @@ static NTSTATUS wrap_ldap_rename_s( void *args ) static NTSTATUS wrap_ldap_result( void *args ) { struct ldap_result_params *params = args; + struct timeval tv; return ldap_result( params->ld, params->msgid, params->all, - (struct timeval *)params->timeout, (LDAPMessage **)params->result ); + convert_timeval(params->timeout, &tv), (LDAPMessage **)params->result ); } static NTSTATUS wrap_ldap_sasl_bind( void *args ) @@ -555,18 +563,20 @@ static NTSTATUS wrap_ldap_sasl_interactive_bind_s( void *args ) static NTSTATUS wrap_ldap_search_ext( void *args ) { struct ldap_search_ext_params *params = args; + struct timeval tv; return ldap_search_ext( params->ld, params->base, params->scope, params->filter, params->attrs, params->attrsonly, (LDAPControl **)params->serverctrls, - (LDAPControl **)params->clientctrls, (struct timeval *)params->timeout, + (LDAPControl **)params->clientctrls, convert_timeval(params->timeout, &tv), params->sizelimit, (int *)params->msg ); } static NTSTATUS wrap_ldap_search_ext_s( void *args ) { struct ldap_search_ext_s_params *params = args; + struct timeval tv; return ldap_search_ext_s( params->ld, params->base, params->scope, params->filter, params->attrs, params->attrsonly, (LDAPControl **)params->serverctrls, - (LDAPControl **)params->clientctrls, (struct timeval *)params->timeout, + (LDAPControl **)params->clientctrls, convert_timeval(params->timeout, &tv), params->sizelimit, (LDAPMessage **)params->result ); }

1 0

Jinoh Kang : riched20: Ensure MEPF_COMPLEX is unset when in password input mode.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: 4f52f64efc774cc480176247dc931ae1b806ad05 URL: https://gitlab.winehq.org/wine/wine/-/commit/4f52f64efc774cc480176247dc931a… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Tue Jul 12 02:28:15 2022 +0900 riched20: Ensure MEPF_COMPLEX is unset when in password input mode. Otherwise, Wine may crash while attempting to fetch the script shaping information, which does not exist since shape_para() was not called. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53335 Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> (cherry picked from commit f77f12ba3b1dad9ebdcb116c66b137e9103a0d1b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/riched20/wrap.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 9456d54d815..a2747806127 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -835,6 +835,15 @@ static void ME_WrapTextParagraph( ME_TextEditor *editor, ME_Context *c, ME_Parag if (SUCCEEDED( itemize_para( c, para ) )) shape_para( c, para ); } + else + { + /* If the user has just converted a normal rich editor with already + * existing text into a password input, the text may contain paragraphs + * with MEPF_COMPLEX set. Since we don't really shape any paragraphs + * here, we need to ensure that the MEPF_COMPLEX flag is unset. + */ + para->nFlags &= ~MEPF_COMPLEX; + } wc.context = c; wc.para = para;

1 0