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

Jinoh Kang : riched20: Ensure MEPF_COMPLEX is unset when in password input mode.
by Alexandre Julliard March 27, 2023

March 27, 2023

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

Eric Pouech : wldap32: Fix compilation in 32-bit.
by Alexandre Julliard March 27, 2023

March 27, 2023

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

Torge Matthies : msvcr100: Add _StructuredTaskCollection::_Schedule stub.
by Alexandre Julliard March 27, 2023

March 27, 2023

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

Torge Matthies : msvcr120: Add _StructuredTaskCollection::_StructuredTaskCollection_dtor stub.
by Alexandre Julliard March 27, 2023

March 27, 2023

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

Piotr Caban : msvcr120: Add missing _StructuredTaskCollection destructor spec file entry.
by Alexandre Julliard March 27, 2023

March 27, 2023

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 : msvcr110: Add _StructuredTaskCollection::_StructuredTaskCollection_ctor stub.
by Alexandre Julliard March 27, 2023

March 27, 2023

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

Jinoh Kang : riched20: Commit and wrap paragraphs after changing text properties.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 3184473af0cdd067c2679692ac463ad014059e3f URL: https://gitlab.winehq.org/wine/wine/-/commit/3184473af0cdd067c2679692ac463a… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Mon Jun 20 20:37:01 2022 +0900 riched20: Commit and wrap paragraphs after changing text properties. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53170 Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> (cherry picked from commit 0974f047b57357252ec94bea119e5291250a446c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/riched20/richole.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 03572511ff7..74a484b0ebd 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -647,6 +647,9 @@ static void textrange_set_font(ITextRange *range, ITextFont *font) cursor_from_char_ofs( services->editor, start, &from ); cursor_from_char_ofs( services->editor, end, &to ); ME_SetCharFormat( services->editor, &from, &to, &fmt ); + ME_CommitUndo( services->editor ); + ME_WrapMarkedParagraphs( services->editor ); + ME_UpdateScrollBar( services->editor ); } } @@ -805,6 +808,9 @@ static HRESULT set_textfont_prop(ITextFontImpl *font, enum textfont_prop_id prop cursor_from_char_ofs( services->editor, start, &from ); cursor_from_char_ofs( services->editor, end, &to ); ME_SetCharFormat( services->editor, &from, &to, &fmt ); + ME_CommitUndo( services->editor ); + ME_WrapMarkedParagraphs( services->editor ); + ME_UpdateScrollBar( services->editor ); return S_OK; }

1 0

Rémi Bernon : winebus.sys: Implement SOCD neutral cleaning for hatswitches.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 069512032c186d08e752d6e1fa26bd129674d4e9 URL: https://gitlab.winehq.org/wine/wine/-/commit/069512032c186d08e752d6e1fa26bd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 20 21:05:36 2022 +0200 winebus.sys: Implement SOCD neutral cleaning for hatswitches. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52841 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> (cherry picked from commit e2936702a47247f806478f16d4631516ca2c3e9f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 27 +++++++++++++++------------ dlls/winebus.sys/hid.c | 11 +++++++++++ dlls/winebus.sys/unix_private.h | 1 + 3 files changed, 27 insertions(+), 12 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 37d75d0bc95..ab2da578928 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -326,6 +326,8 @@ static NTSTATUS build_controller_report_descriptor(struct unix_device *iface) static const USAGE trigger_axis_usages[] = {HID_USAGE_GENERIC_Z, HID_USAGE_GENERIC_RZ}; struct sdl_device *impl = impl_from_unix_device(iface); ULONG i, button_count = SDL_CONTROLLER_BUTTON_MAX - 1; + BOOL state; + C_ASSERT(SDL_CONTROLLER_AXIS_MAX == 6); if (!hid_device_begin_report_descriptor(iface, HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_GAMEPAD)) @@ -364,14 +366,15 @@ static NTSTATUS build_controller_report_descriptor(struct unix_device *iface) /* Initialize axis in the report */ for (i = SDL_CONTROLLER_AXIS_LEFTX; i < SDL_CONTROLLER_AXIS_MAX; i++) hid_device_set_abs_axis(iface, i, pSDL_GameControllerGetAxis(impl->sdl_controller, i)); - if (pSDL_GameControllerGetButton(impl->sdl_controller, SDL_CONTROLLER_BUTTON_DPAD_UP)) - hid_device_set_hatswitch_y(iface, 0, -1); - if (pSDL_GameControllerGetButton(impl->sdl_controller, SDL_CONTROLLER_BUTTON_DPAD_DOWN)) - hid_device_set_hatswitch_y(iface, 0, +1); - if (pSDL_GameControllerGetButton(impl->sdl_controller, SDL_CONTROLLER_BUTTON_DPAD_LEFT)) - hid_device_set_hatswitch_x(iface, 0, -1); - if (pSDL_GameControllerGetButton(impl->sdl_controller, SDL_CONTROLLER_BUTTON_DPAD_RIGHT)) - hid_device_set_hatswitch_x(iface, 0, +1); + + state = pSDL_GameControllerGetButton(impl->sdl_controller, SDL_CONTROLLER_BUTTON_DPAD_UP); + hid_device_move_hatswitch(iface, 0, 0, state ? -1 : +1); + state = pSDL_GameControllerGetButton(impl->sdl_controller, SDL_CONTROLLER_BUTTON_DPAD_DOWN); + hid_device_move_hatswitch(iface, 0, 0, state ? +1 : -1); + state = pSDL_GameControllerGetButton(impl->sdl_controller, SDL_CONTROLLER_BUTTON_DPAD_LEFT); + hid_device_move_hatswitch(iface, 0, state ? -1 : +1, 0); + state = pSDL_GameControllerGetButton(impl->sdl_controller, SDL_CONTROLLER_BUTTON_DPAD_RIGHT); + hid_device_move_hatswitch(iface, 0, state ? +1 : -1, 0); return STATUS_SUCCESS; } @@ -799,16 +802,16 @@ static BOOL set_report_from_controller_event(struct sdl_device *impl, SDL_Event switch ((button = ie->button)) { case SDL_CONTROLLER_BUTTON_DPAD_UP: - hid_device_set_hatswitch_y(iface, 0, ie->state ? -1 : 0); + hid_device_move_hatswitch(iface, 0, 0, ie->state ? -1 : +1); break; case SDL_CONTROLLER_BUTTON_DPAD_DOWN: - hid_device_set_hatswitch_y(iface, 0, ie->state ? +1 : 0); + hid_device_move_hatswitch(iface, 0, 0, ie->state ? +1 : -1); break; case SDL_CONTROLLER_BUTTON_DPAD_LEFT: - hid_device_set_hatswitch_x(iface, 0, ie->state ? -1 : 0); + hid_device_move_hatswitch(iface, 0, ie->state ? -1 : +1, 0); break; case SDL_CONTROLLER_BUTTON_DPAD_RIGHT: - hid_device_set_hatswitch_x(iface, 0, ie->state ? +1 : 0); + hid_device_move_hatswitch(iface, 0, ie->state ? +1 : -1, 0); break; case SDL_CONTROLLER_BUTTON_LEFTSHOULDER: button = 4; break; case SDL_CONTROLLER_BUTTON_RIGHTSHOULDER: button = 5; break; diff --git a/dlls/winebus.sys/hid.c b/dlls/winebus.sys/hid.c index 32628f1f2fd..1f088e35a0c 100644 --- a/dlls/winebus.sys/hid.c +++ b/dlls/winebus.sys/hid.c @@ -1386,6 +1386,17 @@ BOOL hid_device_set_hatswitch_y(struct unix_device *iface, ULONG index, LONG new return TRUE; } +BOOL hid_device_move_hatswitch(struct unix_device *iface, ULONG index, LONG x, LONG y) +{ + struct hid_device_state *state = &iface->hid_device_state; + ULONG offset = state->hatswitch_start + index; + LONG old_x, old_y; + if (index > state->hatswitch_count) return FALSE; + hatswitch_decompose(state->report_buf[offset], &old_x, &old_y); + hatswitch_compose(old_x + x, old_y + y, &state->report_buf[offset]); + return TRUE; +} + BOOL hid_device_sync_report(struct unix_device *iface) { BOOL dropped; diff --git a/dlls/winebus.sys/unix_private.h b/dlls/winebus.sys/unix_private.h index efecf6cdbe3..20c4ee5df9d 100644 --- a/dlls/winebus.sys/unix_private.h +++ b/dlls/winebus.sys/unix_private.h @@ -258,6 +258,7 @@ extern BOOL hid_device_set_rel_axis(struct unix_device *iface, ULONG index, LONG extern BOOL hid_device_set_button(struct unix_device *iface, ULONG index, BOOL is_set) DECLSPEC_HIDDEN; extern BOOL hid_device_set_hatswitch_x(struct unix_device *iface, ULONG index, LONG new_x) DECLSPEC_HIDDEN; extern BOOL hid_device_set_hatswitch_y(struct unix_device *iface, ULONG index, LONG new_y) DECLSPEC_HIDDEN; +extern BOOL hid_device_move_hatswitch(struct unix_device *iface, ULONG index, LONG x, LONG y) DECLSPEC_HIDDEN; extern BOOL hid_device_sync_report(struct unix_device *iface) DECLSPEC_HIDDEN; extern void hid_device_drop_report(struct unix_device *iface) DECLSPEC_HIDDEN;

1 0

Alex Henrie : ntdll: Don't hard-code the battery and AC adapter names on Linux.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 116269201986cdb010827e6a7d18be4eda7d8c47 URL: https://gitlab.winehq.org/wine/wine/-/commit/116269201986cdb010827e6a7d18be… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jun 15 20:33:54 2022 -0600 ntdll: Don't hard-code the battery and AC adapter names on Linux. Look through all of the devices in /sys/class/power_supply and take the statistics from the first battery and the first AC adapter. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52831 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> (cherry picked from commit 89ec37871f6093d8336f636dc967d79579607dd3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/unix/system.c | 79 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 54 insertions(+), 25 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 9f49b9e6f58..a06739388b8 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -35,6 +35,7 @@ #include <errno.h> #include <sys/time.h> #include <time.h> +#include <dirent.h> #ifdef HAVE_SYS_PARAM_H # include <sys/param.h> #endif @@ -3421,12 +3422,14 @@ static ULONG mhz_from_cpuinfo(void) return cmz; } -static const char * get_sys_str(const char *path, char *s) +static const char * get_sys_str(const char *dirname, const char *basename, char *s) { - FILE *f = fopen(path, "r"); + char path[64]; + FILE *f; const char *ret = NULL; - if (f) + if (snprintf(path, sizeof(path), "%s/%s", dirname, basename) >= sizeof(path)) return NULL; + if ((f = fopen(path, "r"))) { if (fgets(s, 16, f)) ret = s; fclose(f); @@ -3434,42 +3437,68 @@ static const char * get_sys_str(const char *path, char *s) return ret; } -static int get_sys_int(const char *path, int def) +static int get_sys_int(const char *dirname, const char *basename) { char s[16]; - return get_sys_str(path, s) ? atoi(s) : def; + return get_sys_str(dirname, basename, s) ? atoi(s) : 0; } static NTSTATUS fill_battery_state( SYSTEM_BATTERY_STATE *bs ) { + DIR *d = opendir("/sys/class/power_supply"); + struct dirent *de; char s[16], path[64]; - unsigned int i = 0; + BOOL found_ac = FALSE; LONG64 voltage; /* microvolts */ - bs->AcOnLine = get_sys_int("/sys/class/power_supply/AC/online", 1); + bs->AcOnLine = TRUE; + if (!d) return STATUS_SUCCESS; - for (;;) + while ((de = readdir(d))) { - sprintf(path, "/sys/class/power_supply/BAT%u/status", i); - if (!get_sys_str(path, s)) break; - bs->Charging |= (strcmp(s, "Charging\n") == 0); - bs->Discharging |= (strcmp(s, "Discharging\n") == 0); - bs->BatteryPresent = TRUE; - i++; - } + if (strcmp(de->d_name, ".") == 0 || strcmp(de->d_name, "..") == 0) continue; + if (snprintf(path, sizeof(path), "/sys/class/power_supply/%s", de->d_name) >= sizeof(path)) continue; + if (get_sys_str(path, "scope", s) && strcmp(s, "Device\n") == 0) continue; + if (!get_sys_str(path, "type", s)) continue; - if (bs->BatteryPresent) - { - voltage = get_sys_int("/sys/class/power_supply/BAT0/voltage_now", 0); - bs->MaxCapacity = get_sys_int("/sys/class/power_supply/BAT0/charge_full", 0) * voltage / 1e9; - bs->RemainingCapacity = get_sys_int("/sys/class/power_supply/BAT0/charge_now", 0) * voltage / 1e9; - bs->Rate = -get_sys_int("/sys/class/power_supply/BAT0/current_now", 0) * voltage / 1e9; - if (!bs->Charging && (LONG)bs->Rate < 0) - bs->EstimatedTime = 3600 * bs->RemainingCapacity / -(LONG)bs->Rate; - else - bs->EstimatedTime = ~0u; + if (strcmp(s, "Mains\n") == 0) + { + if (!get_sys_str(path, "online", s)) continue; + if (found_ac) + { + FIXME("Multiple mains found, only reporting on the first\n"); + } + else + { + bs->AcOnLine = atoi(s); + found_ac = TRUE; + } + } + else if (strcmp(s, "Battery\n") == 0) + { + if (!get_sys_str(path, "status", s)) continue; + if (bs->BatteryPresent) + { + FIXME("Multiple batteries found, only reporting on the first\n"); + } + else + { + bs->Charging = (strcmp(s, "Charging\n") == 0); + bs->Discharging = (strcmp(s, "Discharging\n") == 0); + bs->BatteryPresent = TRUE; + voltage = get_sys_int(path, "voltage_now"); + bs->MaxCapacity = get_sys_int(path, "charge_full") * voltage / 1e9; + bs->RemainingCapacity = get_sys_int(path, "charge_now") * voltage / 1e9; + bs->Rate = -get_sys_int(path, "current_now") * voltage / 1e9; + if (!bs->Charging && (LONG)bs->Rate < 0) + bs->EstimatedTime = 3600 * bs->RemainingCapacity / -(LONG)bs->Rate; + else + bs->EstimatedTime = ~0u; + } + } } + closedir(d); return STATUS_SUCCESS; }

1 0

Limstash Wong : taskmgr: Fix the unit in memory usage graph on performance tab.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 35da30e3552fa5481a97941f7b167cdb7e0f444b URL: https://gitlab.winehq.org/wine/wine/-/commit/35da30e3552fa5481a97941f7b167c… Author: Limstash Wong <limstash.w(a)gmail.com> Date: Fri May 20 01:31:35 2022 +0800 taskmgr: Fix the unit in memory usage graph on performance tab. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50948 Signed-off-by: Limstash Wong <limstash.w(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3e9af4478dcacd08d0e6de2a8631a90b2d01f37e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/taskmgr/graph.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/taskmgr/graph.c b/programs/taskmgr/graph.c index 12f22145664..4d04017e331 100644 --- a/programs/taskmgr/graph.c +++ b/programs/taskmgr/graph.c @@ -253,8 +253,8 @@ static void Graph_DrawMemUsageGraph(HDC hDC, HWND hWnd) /* * Get the memory usage */ - CommitChargeTotal = (ULONGLONG)PerfDataGetCommitChargeTotalK(); - CommitChargeLimit = (ULONGLONG)PerfDataGetCommitChargeLimitK(); + CommitChargeTotal = (ULONGLONG)PerfDataGetCommitChargeTotalK() << 10; + CommitChargeLimit = (ULONGLONG)PerfDataGetCommitChargeLimitK() << 10; if (CommitChargeTotal < 1024) StrFormatKBSizeW(CommitChargeTotal, Text, ARRAY_SIZE(Text));

1 0