July 2022 - Wine-commits - list.winehq.org

Torge Matthies : msvcr100: Add _StructuredTaskCollection::_Schedule stub.
by Alexandre Julliard 04 Jul '22

04 Jul '22

Module: wine Branch: master Commit: d31e54d61c16afc8af28b6fd960507f7fd2ac283 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d31e54d61c16afc8af28b6fd… 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> --- 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 7bdae76cf68..b1e6ba548a4 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 8afab0cecae..9a35919a85b 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 c45965d8acd..3419ca3cbe7 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 05ed0ef876f..b12362294db 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; @@ -1773,6 +1778,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 : msvcr110: Add _StructuredTaskCollection::_Schedule_loc stub.
by Alexandre Julliard 04 Jul '22

04 Jul '22

Module: wine Branch: master Commit: 09a6881ca2988463e9136b7912e11024e51ae411 URL: https://source.winehq.org/git/wine.git/?a=commit;h=09a6881ca2988463e9136b79… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Mon Jul 4 20:28:58 2022 +0200 msvcr110: Add _StructuredTaskCollection::_Schedule_loc stub. Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 6 +++--- dlls/msvcr110/msvcr110.spec | 6 +++--- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr120_app/msvcr120_app.spec | 6 +++--- dlls/msvcrt/concurrency.c | 15 +++++++++++++++ 5 files changed, 27 insertions(+), 12 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index 8474bde4b54..5ba0477953f 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -597,9 +597,9 @@ @ cdecl -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@@Z(ptr ptr) _StructuredTaskCollection__Schedule @ thiscall -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z(ptr ptr) _StructuredTaskCollection__Schedule @ cdecl -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z(ptr ptr) _StructuredTaskCollection__Schedule -@ stub -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z -@ stub -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z -@ stub -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@PEAVlocation(a)3@@Z +@ cdecl -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z(ptr ptr ptr) _StructuredTaskCollection__Schedule_loc +@ thiscall -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z(ptr ptr ptr) _StructuredTaskCollection__Schedule_loc +@ cdecl -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@PEAVlocation(a)3@@Z(ptr ptr ptr) _StructuredTaskCollection__Schedule_loc @ stub -arch=arm ?_Schedule(a)_TaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@@Z @ stub -arch=i386 ?_Schedule(a)_TaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z @ stub -arch=win64 ?_Schedule(a)_TaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index b1e6ba548a4..51dc5329ad0 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -617,9 +617,9 @@ @ cdecl -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@@Z(ptr ptr) _StructuredTaskCollection__Schedule @ thiscall -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z(ptr ptr) _StructuredTaskCollection__Schedule @ cdecl -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z(ptr ptr) _StructuredTaskCollection__Schedule -@ stub -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z -@ stub -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z -@ stub -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@PEAVlocation(a)3@@Z +@ cdecl -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z(ptr ptr ptr) _StructuredTaskCollection__Schedule_loc +@ thiscall -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z(ptr ptr ptr) _StructuredTaskCollection__Schedule_loc +@ cdecl -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@PEAVlocation(a)3@@Z(ptr ptr ptr) _StructuredTaskCollection__Schedule_loc @ stub -arch=arm ?_Schedule(a)_TaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@@Z @ stub -arch=i386 ?_Schedule(a)_TaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z @ stub -arch=win64 ?_Schedule(a)_TaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 9a35919a85b..6e946a72eed 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -600,9 +600,9 @@ @ cdecl -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@@Z(ptr ptr) _StructuredTaskCollection__Schedule @ thiscall -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z(ptr ptr) _StructuredTaskCollection__Schedule @ cdecl -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z(ptr ptr) _StructuredTaskCollection__Schedule -@ stub -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z -@ stub -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z -@ stub -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@PEAVlocation(a)3@@Z +@ cdecl -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z(ptr ptr ptr) _StructuredTaskCollection__Schedule_loc +@ thiscall -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z(ptr ptr ptr) _StructuredTaskCollection__Schedule_loc +@ cdecl -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@PEAVlocation(a)3@@Z(ptr ptr ptr) _StructuredTaskCollection__Schedule_loc @ stub -arch=arm ?_Schedule(a)_TaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@@Z @ stub -arch=i386 ?_Schedule(a)_TaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z @ stub -arch=win64 ?_Schedule(a)_TaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 3419ca3cbe7..0f107ed5084 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -597,9 +597,9 @@ @ cdecl -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@@Z(ptr ptr) msvcr120.?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@@Z @ thiscall -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z(ptr ptr) msvcr120.?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z @ cdecl -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z(ptr ptr) msvcr120.?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z -@ stub -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z -@ stub -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z -@ stub -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@PEAVlocation(a)3@@Z +@ cdecl -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z(ptr ptr ptr) msvcr120.?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z +@ thiscall -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z(ptr ptr ptr) msvcr120.?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z +@ cdecl -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@PEAVlocation(a)3@@Z(ptr ptr ptr) msvcr120.?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@PEAVlocation(a)3@@Z @ stub -arch=arm ?_Schedule(a)_TaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@@Z @ stub -arch=i386 ?_Schedule(a)_TaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z @ stub -arch=win64 ?_Schedule(a)_TaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index b12362294db..5a00b9e8af1 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -1778,6 +1778,21 @@ void __thiscall _StructuredTaskCollection_dtor(_StructuredTaskCollection *this) #endif /* _MSVCR_VER >= 120 */ +#if _MSVCR_VER >= 110 + +/* ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z */ +/* ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z */ +/* ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@PEAVlocation(a)3@@Z */ +DEFINE_THISCALL_WRAPPER(_StructuredTaskCollection__Schedule_loc, 12) +void __thiscall _StructuredTaskCollection__Schedule_loc( + _StructuredTaskCollection *this, _UnrealizedChore *chore, + /*location*/void *placement) +{ + FIXME("(%p %p %p): stub!\n", this, chore, placement); +} + +#endif /* _MSVCR_VER >= 110 */ + /* ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@@Z */ /* ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z */ /* ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z */

1 0

Torge Matthies : msvcr100: Add _StructuredTaskCollection::_RunAndWait stub.
by Alexandre Julliard 04 Jul '22

04 Jul '22

Module: wine Branch: master Commit: 4b5c486aaef3950a5fedb8c57ac5be47db0788b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b5c486aaef3950a5fedb8c5… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Mon Jul 4 20:29:03 2022 +0200 msvcr100: Add _StructuredTaskCollection::_RunAndWait 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> --- 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 | 11 +++++++++++ 6 files changed, 25 insertions(+), 14 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4b5c486aaef3950a5fed…

1 0

Torge Matthies : msvcr100: Add _StructuredTaskCollection::_Cancel stub.
by Alexandre Julliard 04 Jul '22

04 Jul '22

Module: wine Branch: master Commit: 3b1df19cdbe8115bfa38c8aaee5b7d34e442b609 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b1df19cdbe8115bfa38c8aa… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Mon Jul 4 20:29:09 2022 +0200 msvcr100: Add _StructuredTaskCollection::_Cancel 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> --- 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 | 10 ++++++++++ 6 files changed, 24 insertions(+), 14 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index 2f26a39a5fa..77092cfb65d 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -434,9 +434,9 @@ @ stub -arch=i386 ?_Assign(a)_Concurrent_queue_iterator_base_v4@details(a)Concurrency@@IAEXABV123@@Z @ stub -arch=win64 ?_Assign(a)_Concurrent_queue_iterator_base_v4@details(a)Concurrency@@IEAAXAEBV123@@Z @ extern ?_Byte_reverse_table(a)details@Concurrency@@3QBEB byte_reverse_table -@ stub -arch=arm ?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXXZ -@ stub -arch=i386 ?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXXZ -@ stub -arch=win64 ?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXXZ +@ cdecl -arch=arm ?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXXZ(ptr) _StructuredTaskCollection__Cancel +@ thiscall -arch=i386 ?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXXZ(ptr) _StructuredTaskCollection__Cancel +@ cdecl -arch=win64 ?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXXZ(ptr) _StructuredTaskCollection__Cancel @ stub -arch=arm ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QAAXXZ @ stub -arch=i386 ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QAEXXZ @ stub -arch=win64 ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QEAAXXZ diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index d77aca6a2c2..29a5d4910e1 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -309,8 +309,8 @@ @ stub -arch=win64 ?_AcquireRead(a)_ReaderWriterLock@details(a)Concurrency@@QEAAXXZ @ stub -arch=win32 ?_AcquireWrite(a)_ReaderWriterLock@details(a)Concurrency@@QAEXXZ @ stub -arch=win64 ?_AcquireWrite(a)_ReaderWriterLock@details(a)Concurrency@@QEAAXXZ -@ stub -arch=win32 ?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXXZ -@ stub -arch=win64 ?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXXZ +@ thiscall -arch=win32 ?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXXZ(ptr) _StructuredTaskCollection__Cancel +@ cdecl -arch=win64 ?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXXZ(ptr) _StructuredTaskCollection__Cancel @ stub -arch=win32 ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QAEXXZ @ stub -arch=win64 ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QEAAXXZ @ stub -arch=win32 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAEXXZ diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 70c857a73da..7e06ab8693f 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -487,9 +487,9 @@ @ stub -arch=arm ?_Cancel(a)_CancellationTokenState@details(a)Concurrency@@QAAXXZ @ stub -arch=i386 ?_Cancel(a)_CancellationTokenState@details(a)Concurrency@@QAEXXZ @ stub -arch=win64 ?_Cancel(a)_CancellationTokenState@details(a)Concurrency@@QEAAXXZ -@ stub -arch=arm ?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXXZ -@ stub -arch=i386 ?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXXZ -@ stub -arch=win64 ?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXXZ +@ cdecl -arch=arm ?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXXZ(ptr) _StructuredTaskCollection__Cancel +@ thiscall -arch=i386 ?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXXZ(ptr) _StructuredTaskCollection__Cancel +@ cdecl -arch=win64 ?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXXZ(ptr) _StructuredTaskCollection__Cancel @ stub -arch=arm ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QAAXXZ @ stub -arch=i386 ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QAEXXZ @ stub -arch=win64 ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QEAAXXZ diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index c573dfac713..45641c1fb00 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -484,9 +484,9 @@ @ stub -arch=arm ?_AcquireWrite(a)_ReaderWriterLock@details(a)Concurrency@@QAAXXZ @ stub -arch=i386 ?_AcquireWrite(a)_ReaderWriterLock@details(a)Concurrency@@QAEXXZ @ stub -arch=win64 ?_AcquireWrite(a)_ReaderWriterLock@details(a)Concurrency@@QEAAXXZ -@ stub -arch=arm ?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXXZ -@ stub -arch=i386 ?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXXZ -@ stub -arch=win64 ?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXXZ +@ cdecl -arch=arm ?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXXZ(ptr) _StructuredTaskCollection__Cancel +@ thiscall -arch=i386 ?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXXZ(ptr) _StructuredTaskCollection__Cancel +@ cdecl -arch=win64 ?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXXZ(ptr) _StructuredTaskCollection__Cancel @ stub -arch=arm ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QAAXXZ @ stub -arch=i386 ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QAEXXZ @ stub -arch=win64 ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QEAAXXZ diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 94e51d9d056..7adb0462565 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -481,9 +481,9 @@ @ stub -arch=arm ?_AcquireWrite(a)_ReaderWriterLock@details(a)Concurrency@@QAAXXZ @ stub -arch=i386 ?_AcquireWrite(a)_ReaderWriterLock@details(a)Concurrency@@QAEXXZ @ stub -arch=win64 ?_AcquireWrite(a)_ReaderWriterLock@details(a)Concurrency@@QEAAXXZ -@ stub -arch=arm ?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXXZ -@ stub -arch=i386 ?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXXZ -@ stub -arch=win64 ?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXXZ +@ cdecl -arch=arm ?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXXZ(ptr) msvcr120.?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXXZ +@ thiscall -arch=i386 ?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXXZ(ptr) msvcr120.?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXXZ +@ cdecl -arch=win64 ?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXXZ(ptr) msvcr120.?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXXZ @ stub -arch=arm ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QAAXXZ @ stub -arch=i386 ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QAEXXZ @ stub -arch=win64 ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QEAAXXZ diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index e19b0286b48..80351993a58 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -1814,6 +1814,16 @@ _StructuredTaskCollection__RunAndWait( return 1; } +/* ?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXXZ */ +/* ?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXXZ */ +/* ?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXXZ */ +DEFINE_THISCALL_WRAPPER(_StructuredTaskCollection__Cancel, 4) +void __thiscall _StructuredTaskCollection__Cancel( + _StructuredTaskCollection *this) +{ + FIXME("(%p): stub!\n", this); +} + /* ??0critical_section(a)Concurrency@@QAE(a)XZ */ /* ??0critical_section(a)Concurrency@@QEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(critical_section_ctor, 4)

1 0

Jacek Caban : win32u: Move scroll bar WM_CREATE implementation from user32.
by Alexandre Julliard 04 Jul '22

04 Jul '22

Module: wine Branch: master Commit: 6452e67ebabf553944e16544364658a6c23c6110 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6452e67ebabf553944e16544… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 28 21:10:50 2022 +0200 win32u: Move scroll bar WM_CREATE implementation from user32. --- dlls/user32/scroll.c | 81 ++------------------------------------------ dlls/win32u/ntuser_private.h | 6 ++++ dlls/win32u/scroll.c | 62 +++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 79 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index 9cb07af0706..cc847b48ec6 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -32,6 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(scroll); typedef struct scroll_info SCROLLBAR_INFO, *LPSCROLLBAR_INFO; +typedef struct scroll_bar_win_data SCROLLBAR_WNDDATA; /* data for window that has (one or two) scroll bars */ typedef struct @@ -40,12 +41,6 @@ typedef struct SCROLLBAR_INFO vert; } WINSCROLLBAR_INFO, *LPWINSCROLLBAR_INFO; -typedef struct -{ - DWORD magic; - SCROLLBAR_INFO info; -} SCROLLBAR_WNDDATA; - #define SCROLLBAR_MAGIC 0x5c6011ba /* Minimum size of the rectangle between the arrows */ @@ -1127,75 +1122,6 @@ void SCROLL_TrackScrollBar( HWND hwnd, INT scrollbar, POINT pt ) } -/*********************************************************************** - * SCROLL_CreateScrollBar - * - * Create a scroll bar - * - * PARAMS - * hwnd [I] Handle of window with scrollbar(s) - * lpCreate [I] The style and place of the scroll bar - */ -static void SCROLL_CreateScrollBar(HWND hwnd, LPCREATESTRUCTW lpCreate) -{ - LPSCROLLBAR_INFO info = NULL; - WND *win; - - TRACE("hwnd=%p lpCreate=%p\n", hwnd, lpCreate); - - win = WIN_GetPtr(hwnd); - if (win->cbWndExtra >= sizeof(SCROLLBAR_WNDDATA)) - { - SCROLLBAR_WNDDATA *data = (SCROLLBAR_WNDDATA*)win->wExtra; - data->magic = SCROLLBAR_MAGIC; - info = &data->info; - } - else WARN("Not enough extra data\n"); - WIN_ReleasePtr(win); - if (!info) return; - - if (lpCreate->style & WS_DISABLED) - { - info->flags = ESB_DISABLE_BOTH; - TRACE("Created WS_DISABLED scrollbar\n"); - } - - if (lpCreate->style & (SBS_SIZEGRIP | SBS_SIZEBOX)) - { - if (lpCreate->style & SBS_SIZEBOXTOPLEFTALIGN) - NtUserMoveWindow( hwnd, lpCreate->x, lpCreate->y, GetSystemMetrics(SM_CXVSCROLL)+1, - GetSystemMetrics(SM_CYHSCROLL)+1, FALSE ); - else if(lpCreate->style & SBS_SIZEBOXBOTTOMRIGHTALIGN) - NtUserMoveWindow( hwnd, lpCreate->x+lpCreate->cx-GetSystemMetrics(SM_CXVSCROLL)-1, - lpCreate->y+lpCreate->cy-GetSystemMetrics(SM_CYHSCROLL)-1, - GetSystemMetrics(SM_CXVSCROLL)+1, - GetSystemMetrics(SM_CYHSCROLL)+1, FALSE ); - } - else if (lpCreate->style & SBS_VERT) - { - if (lpCreate->style & SBS_LEFTALIGN) - NtUserMoveWindow( hwnd, lpCreate->x, lpCreate->y, - GetSystemMetrics(SM_CXVSCROLL)+1, lpCreate->cy, FALSE ); - else if (lpCreate->style & SBS_RIGHTALIGN) - NtUserMoveWindow( hwnd, - lpCreate->x+lpCreate->cx-GetSystemMetrics(SM_CXVSCROLL)-1, - lpCreate->y, - GetSystemMetrics(SM_CXVSCROLL)+1, lpCreate->cy, FALSE ); - } - else /* SBS_HORZ */ - { - if (lpCreate->style & SBS_TOPALIGN) - NtUserMoveWindow( hwnd, lpCreate->x, lpCreate->y, - lpCreate->cx, GetSystemMetrics(SM_CYHSCROLL)+1, FALSE ); - else if (lpCreate->style & SBS_BOTTOMALIGN) - NtUserMoveWindow( hwnd, - lpCreate->x, - lpCreate->y+lpCreate->cy-GetSystemMetrics(SM_CYHSCROLL)-1, - lpCreate->cx, GetSystemMetrics(SM_CYHSCROLL)+1, FALSE ); - } -} - - /************************************************************************* * SCROLL_GetScrollInfo * @@ -1409,10 +1335,6 @@ LRESULT WINAPI USER_ScrollBarProc( HWND hwnd, UINT message, WPARAM wParam, LPARA switch(message) { - case WM_CREATE: - SCROLL_CreateScrollBar(hwnd, (LPCREATESTRUCTW)lParam); - break; - case WM_ENABLE: { SCROLLBAR_INFO *infoPtr; @@ -1503,6 +1425,7 @@ LRESULT WINAPI USER_ScrollBarProc( HWND hwnd, UINT message, WPARAM wParam, LPARA } break; + case WM_CREATE: case WM_ERASEBKGND: case WM_GETDLGCODE: return NtUserMessageCall( hwnd, message, wParam, lParam, 0, NtUserScrollBarWndProc, !unicode ); diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index 609f7018b07..36c11a49c4e 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -216,6 +216,12 @@ struct scroll_info BOOL painted; /* Whether the scroll bar is painted by DefWinProc() */ }; +struct scroll_bar_win_data +{ + DWORD magic; + struct scroll_info info; +}; + /* FIXME: make it private to class.c */ typedef struct tagWINDOWPROC { diff --git a/dlls/win32u/scroll.c b/dlls/win32u/scroll.c index d6c21fc6992..a15c8bfd36d 100644 --- a/dlls/win32u/scroll.c +++ b/dlls/win32u/scroll.c @@ -30,6 +30,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(scroll); +#define SCROLLBAR_MAGIC 0x5c6011ba + static struct scroll_info *get_scroll_info_ptr( HWND hwnd, int bar, BOOL alloc ) { struct scroll_info *ret = NULL; @@ -82,10 +84,70 @@ static BOOL show_scroll_bar( HWND hwnd, int bar, BOOL show_horz, BOOL show_vert return FALSE; /* no frame changes */ } +static void create_scroll_bar( HWND hwnd, CREATESTRUCTW *create ) +{ + struct scroll_info *info = NULL; + WND *win; + + TRACE( "hwnd=%p create=%p\n", hwnd, create ); + + win = get_win_ptr( hwnd ); + if (win->cbWndExtra >= sizeof(struct scroll_bar_win_data)) + { + struct scroll_bar_win_data *data = (struct scroll_bar_win_data *)win->wExtra; + data->magic = SCROLLBAR_MAGIC; + info = &data->info; + } + else WARN( "Not enough extra data\n" ); + release_win_ptr( win ); + if (!info) return; + + if (create->style & WS_DISABLED) + { + info->flags = ESB_DISABLE_BOTH; + TRACE( "Created WS_DISABLED scrollbar\n" ); + } + + if (create->style & (SBS_SIZEGRIP | SBS_SIZEBOX)) + { + if (create->style & SBS_SIZEBOXTOPLEFTALIGN) + NtUserMoveWindow( hwnd, create->x, create->y, get_system_metrics( SM_CXVSCROLL ) + 1, + get_system_metrics( SM_CYHSCROLL ) + 1, FALSE ); + else if(create->style & SBS_SIZEBOXBOTTOMRIGHTALIGN) + NtUserMoveWindow( hwnd, create->x + create->cx - get_system_metrics( SM_CXVSCROLL ) - 1, + create->y + create->cy-get_system_metrics( SM_CYHSCROLL ) - 1, + get_system_metrics( SM_CXVSCROLL ) + 1, + get_system_metrics( SM_CYHSCROLL ) + 1, FALSE ); + } + else if (create->style & SBS_VERT) + { + if (create->style & SBS_LEFTALIGN) + NtUserMoveWindow( hwnd, create->x, create->y, get_system_metrics( SM_CXVSCROLL ) + 1, + create->cy, FALSE ); + else if (create->style & SBS_RIGHTALIGN) + NtUserMoveWindow( hwnd, create->x + create->cx - get_system_metrics( SM_CXVSCROLL ) - 1, + create->y, get_system_metrics( SM_CXVSCROLL ) + 1, create->cy, FALSE ); + } + else /* SBS_HORZ */ + { + if (create->style & SBS_TOPALIGN) + NtUserMoveWindow( hwnd, create->x, create->y, create->cx, + get_system_metrics( SM_CYHSCROLL ) + 1, FALSE ); + else if (create->style & SBS_BOTTOMALIGN) + NtUserMoveWindow( hwnd, create->x, + create->y + create->cy - get_system_metrics( SM_CYHSCROLL ) - 1, + create->cx, get_system_metrics( SM_CYHSCROLL ) + 1, FALSE ); + } +} + LRESULT scroll_bar_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL ansi ) { switch (msg) { + case WM_CREATE: + create_scroll_bar( hwnd, (CREATESTRUCTW *)lparam ); + return 0; + case WM_ERASEBKGND: return 1;

1 0

Jacek Caban : win32u: Move scroll bar WM_SETFOCUS and WM_KILLFOCUS implementation from user32.
by Alexandre Julliard 04 Jul '22

04 Jul '22

Module: wine Branch: master Commit: 13727e42e965a7a105c0081fbfc775aad22ffbab URL: https://source.winehq.org/git/wine.git/?a=commit;h=13727e42e965a7a105c0081f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 28 21:26:37 2022 +0200 win32u: Move scroll bar WM_SETFOCUS and WM_KILLFOCUS implementation from user32. --- dlls/user32/scroll.c | 39 ----------- dlls/win32u/ntgdi_private.h | 1 - dlls/win32u/scroll.c | 158 +++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/win32u_private.h | 1 + 4 files changed, 159 insertions(+), 40 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index cc847b48ec6..01f7f3b88ae 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -1385,46 +1385,7 @@ LRESULT WINAPI USER_ScrollBarProc( HWND hwnd, UINT message, WPARAM wParam, LPARA break; case WM_SETFOCUS: - { - /* Create a caret when a ScrollBar get focus */ - RECT rect; - int arrowSize, thumbSize, thumbPos, vertical; - vertical = SCROLL_GetScrollBarRect( hwnd, SB_CTL, &rect, - &arrowSize, &thumbSize, &thumbPos ); - if (!vertical) - { - NtUserCreateCaret( hwnd, (HBITMAP)1, thumbSize - 2, rect.bottom - rect.top - 2 ); - SetCaretPos(thumbPos+1, rect.top+1); - } - else - { - NtUserCreateCaret( hwnd, (HBITMAP)1, rect.right - rect.left - 2, thumbSize - 2); - SetCaretPos(rect.top+1, thumbPos+1); - } - NtUserShowCaret( hwnd ); - } - break; - case WM_KILLFOCUS: - { - RECT rect; - int arrowSize, thumbSize, thumbPos, vertical; - vertical = SCROLL_GetScrollBarRect( hwnd, SB_CTL, &rect,&arrowSize, &thumbSize, &thumbPos ); - if (!vertical){ - rect.left=thumbPos+1; - rect.right=rect.left+thumbSize; - } - else - { - rect.top=thumbPos+1; - rect.bottom=rect.top+thumbSize; - } - NtUserHideCaret( hwnd ); - NtUserInvalidateRect( hwnd, &rect, 0 ); - DestroyCaret(); - } - break; - case WM_CREATE: case WM_ERASEBKGND: case WM_GETDLGCODE: diff --git a/dlls/win32u/ntgdi_private.h b/dlls/win32u/ntgdi_private.h index ac552897769..0397138b109 100644 --- a/dlls/win32u/ntgdi_private.h +++ b/dlls/win32u/ntgdi_private.h @@ -391,7 +391,6 @@ extern void lp_to_dp( DC *dc, POINT *points, INT count ) DECLSPEC_HIDDEN; extern BOOL set_map_mode( DC *dc, int mode ) DECLSPEC_HIDDEN; extern void combine_transform( XFORM *result, const XFORM *xform1, const XFORM *xform2 ) DECLSPEC_HIDDEN; -extern int muldiv( int a, int b, int c ) DECLSPEC_HIDDEN; /* driver.c */ extern BOOL is_display_device( LPCWSTR name ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/scroll.c b/dlls/win32u/scroll.c index a15c8bfd36d..14bec1e3b83 100644 --- a/dlls/win32u/scroll.c +++ b/dlls/win32u/scroll.c @@ -32,6 +32,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(scroll); #define SCROLLBAR_MAGIC 0x5c6011ba +/* Minimum size of the rectangle between the arrows */ +#define SCROLL_MIN_RECT 4 + +/* Minimum size of the thumb in pixels */ +#define SCROLL_MIN_THUMB 8 + +/* Overlap between arrows and thumb */ +#define SCROLL_ARROW_THUMB_OVERLAP 0 + static struct scroll_info *get_scroll_info_ptr( HWND hwnd, int bar, BOOL alloc ) { struct scroll_info *ret = NULL; @@ -84,6 +93,113 @@ static BOOL show_scroll_bar( HWND hwnd, int bar, BOOL show_horz, BOOL show_vert return FALSE; /* no frame changes */ } +/*********************************************************************** + * get_scroll_bar_rect + * + * Compute the scroll bar rectangle, in drawing coordinates (i.e. client + * coords for SB_CTL, window coords for SB_VERT and SB_HORZ). + * 'arrow_size' returns the width or height of an arrow (depending on + * the orientation of the scrollbar), 'thumb_size' returns the size of + * the thumb, and 'thumb_pos' returns the position of the thumb + * relative to the left or to the top. + * Return TRUE if the scrollbar is vertical, FALSE if horizontal. + */ +static BOOL get_scroll_bar_rect( HWND hwnd, int bar, RECT *rect, int *arrow_size, + int *thumb_size, int *thumb_pos ) +{ + int pixels, min_thumb_size; + BOOL vertical; + WND *win = get_win_ptr( hwnd ); + + if (!win || win == WND_OTHER_PROCESS || win == WND_DESKTOP) return FALSE; + + switch(bar) + { + case SB_HORZ: + get_window_rects( hwnd, COORDS_WINDOW, NULL, rect, get_thread_dpi() ); + rect->top = rect->bottom; + rect->bottom += get_system_metrics( SM_CYHSCROLL ); + if (win->dwStyle & WS_VSCROLL) rect->right++; + vertical = FALSE; + break; + + case SB_VERT: + get_window_rects( hwnd, COORDS_WINDOW, NULL, rect, get_thread_dpi() ); + if (win->dwExStyle & WS_EX_LEFTSCROLLBAR) + { + rect->right = rect->left; + rect->left -= get_system_metrics( SM_CXVSCROLL ); + } + else + { + rect->left = rect->right; + rect->right += get_system_metrics( SM_CXVSCROLL ); + } + if (win->dwStyle & WS_HSCROLL) rect->bottom++; + vertical = TRUE; + break; + + case SB_CTL: + get_client_rect( hwnd, rect ); + vertical = (win->dwStyle & SBS_VERT) != 0; + break; + + default: + release_win_ptr( win ); + return FALSE; + } + + if (vertical) pixels = rect->bottom - rect->top; + else pixels = rect->right - rect->left; + + if (pixels <= 2 * get_system_metrics( SM_CXVSCROLL ) + SCROLL_MIN_RECT) + { + if (pixels > SCROLL_MIN_RECT) + *arrow_size = (pixels - SCROLL_MIN_RECT) / 2; + else + *arrow_size = 0; + *thumb_pos = *thumb_size = 0; + } + else + { + struct scroll_info *info = get_scroll_info_ptr( hwnd, bar, TRUE ); + if (!info) + { + WARN( "called for missing scroll bar\n" ); + release_win_ptr( win ); + return FALSE; + } + *arrow_size = get_system_metrics( SM_CXVSCROLL ); + pixels -= 2 * (get_system_metrics( SM_CXVSCROLL ) - SCROLL_ARROW_THUMB_OVERLAP); + + if (info->page) + { + *thumb_size = muldiv( pixels,info->page, info->maxVal - info->minVal + 1 ); + min_thumb_size = muldiv( SCROLL_MIN_THUMB, get_dpi_for_window( hwnd ), 96 ); + if (*thumb_size < min_thumb_size) *thumb_size = min_thumb_size; + } + else *thumb_size = get_system_metrics( SM_CXVSCROLL ); + + if ((pixels -= *thumb_size ) < 0 || (info->flags & ESB_DISABLE_BOTH) == ESB_DISABLE_BOTH) + { + /* Rectangle too small or scrollbar disabled -> no thumb */ + *thumb_pos = *thumb_size = 0; + } + else + { + int max = info->maxVal - max( info->page-1, 0 ); + if (info->minVal >= max) + *thumb_pos = *arrow_size - SCROLL_ARROW_THUMB_OVERLAP; + else + *thumb_pos = *arrow_size - SCROLL_ARROW_THUMB_OVERLAP + + muldiv( pixels, info->curVal - info->minVal, max - info->minVal ); + } + release_scroll_info_ptr( info ); + } + release_win_ptr( win ); + return vertical; +} + static void create_scroll_bar( HWND hwnd, CREATESTRUCTW *create ) { struct scroll_info *info = NULL; @@ -148,6 +264,48 @@ LRESULT scroll_bar_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpara create_scroll_bar( hwnd, (CREATESTRUCTW *)lparam ); return 0; + case WM_SETFOCUS: + { + /* Create a caret when a ScrollBar get focus */ + RECT rect; + int arrow_size, thumb_size, thumb_pos, vertical; + vertical = get_scroll_bar_rect( hwnd, SB_CTL, &rect, &arrow_size, + &thumb_size, &thumb_pos ); + if (!vertical) + { + NtUserCreateCaret( hwnd, (HBITMAP)1, thumb_size - 2, rect.bottom - rect.top - 2 ); + set_caret_pos( thumb_pos + 1, rect.top + 1 ); + } + else + { + NtUserCreateCaret( hwnd, (HBITMAP)1, rect.right - rect.left - 2, thumb_size - 2 ); + set_caret_pos( rect.top + 1, thumb_pos + 1 ); + } + NtUserShowCaret( hwnd ); + } + return 0; + + case WM_KILLFOCUS: + { + int arrow_size, thumb_size, thumb_pos, vertical; + RECT rect; + vertical = get_scroll_bar_rect( hwnd, SB_CTL, &rect,&arrow_size, &thumb_size, &thumb_pos ); + if (!vertical) + { + rect.left = thumb_pos + 1; + rect.right = rect.left + thumb_size; + } + else + { + rect.top = thumb_pos + 1; + rect.bottom = rect.top + thumb_size; + } + NtUserHideCaret( hwnd ); + NtUserInvalidateRect( hwnd, &rect, 0 ); + destroy_caret(); + } + return 0; + case WM_ERASEBKGND: return 1; diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 684a5e59c5b..49c81ea3bef 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -535,6 +535,7 @@ extern NTSTATUS gdi_init(void) DECLSPEC_HIDDEN; extern NTSTATUS callbacks_init( void *args ) DECLSPEC_HIDDEN; extern void winstation_init(void) DECLSPEC_HIDDEN; extern void sysparams_init(void) DECLSPEC_HIDDEN; +extern int muldiv( int a, int b, int c ) DECLSPEC_HIDDEN; extern HKEY reg_create_key( HKEY root, const WCHAR *name, ULONG name_len, DWORD options, DWORD *disposition ) DECLSPEC_HIDDEN;

1 0

Jacek Caban : win32u: Move scroll tracking implementation from user32.
by Alexandre Julliard 04 Jul '22

04 Jul '22

Module: wine Branch: master Commit: 419893519c0660a765ebb9898b5ccf64c273b0cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=419893519c0660a765ebb989… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 30 17:12:46 2022 +0200 win32u: Move scroll tracking implementation from user32. --- dlls/user32/controls.h | 3 - dlls/user32/defwnd.c | 24 +- dlls/user32/edit.c | 4 +- dlls/user32/listbox.c | 14 +- dlls/user32/mdi.c | 4 +- dlls/user32/nonclient.c | 69 --- dlls/user32/scroll.c | 1304 +----------------------------------------- dlls/user32/user32.spec | 6 +- dlls/user32/user_main.c | 12 +- dlls/user32/win.c | 14 - dlls/user32/win.h | 1 - dlls/win32u/defwnd.c | 77 ++- dlls/win32u/gdiobj.c | 3 + dlls/win32u/ntuser_private.h | 1 - dlls/win32u/scroll.c | 1032 ++++++++++++++++++++++++++++++++- dlls/win32u/win32u.spec | 6 +- dlls/win32u/win32u_private.h | 8 + dlls/win32u/window.c | 11 +- dlls/win32u/wrappers.c | 18 + include/ntuser.h | 36 +- 20 files changed, 1219 insertions(+), 1428 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=419893519c0660a765eb…

1 0

Jacek Caban : user32: Pass scroll enable flags to ScrollBarDraw.
by Alexandre Julliard 04 Jul '22

04 Jul '22

Module: wine Branch: master Commit: 79910bcf83e2b42688e8c85d6d3d730eac7f34ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=79910bcf83e2b42688e8c85d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 3 22:14:54 2022 +0200 user32: Pass scroll enable flags to ScrollBarDraw. --- dlls/user32/scroll.c | 30 +++++++++++------------------- dlls/user32/user_main.c | 2 +- dlls/user32/user_private.h | 4 ++-- dlls/uxtheme/scrollbar.c | 6 +++--- dlls/uxtheme/uxthemedll.h | 4 ++-- include/winuser.h | 4 ++-- 6 files changed, 21 insertions(+), 29 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index bf0a7d3350a..e368a2feb70 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -125,7 +125,7 @@ SCROLLBAR_INFO *SCROLL_GetInternalInfo( HWND hwnd, INT nBar, BOOL alloc ) * * Draw the scroll bar arrows. */ -static void SCROLL_DrawArrows( HDC hdc, SCROLLBAR_INFO *infoPtr, +static void SCROLL_DrawArrows( HDC hdc, UINT flags, RECT *rect, INT arrowSize, BOOL vertical, BOOL top_pressed, BOOL bottom_pressed ) { @@ -140,7 +140,7 @@ static void SCROLL_DrawArrows( HDC hdc, SCROLLBAR_INFO *infoPtr, DrawFrameControl( hdc, &r, DFC_SCROLL, (vertical ? DFCS_SCROLLUP : DFCS_SCROLLLEFT) | (top_pressed ? (DFCS_PUSHED | DFCS_FLAT) : 0 ) - | (infoPtr->flags&ESB_DISABLE_LTUP ? DFCS_INACTIVE : 0 ) ); + | (flags & ESB_DISABLE_LTUP ? DFCS_INACTIVE : 0 ) ); r = *rect; if( vertical ) @@ -151,7 +151,7 @@ static void SCROLL_DrawArrows( HDC hdc, SCROLLBAR_INFO *infoPtr, DrawFrameControl( hdc, &r, DFC_SCROLL, (vertical ? DFCS_SCROLLDOWN : DFCS_SCROLLRIGHT) | (bottom_pressed ? (DFCS_PUSHED | DFCS_FLAT) : 0 ) - | (infoPtr->flags&ESB_DISABLE_RTDN ? DFCS_INACTIVE : 0) ); + | (flags & ESB_DISABLE_RTDN ? DFCS_INACTIVE : 0) ); } /*********************************************************************** @@ -161,8 +161,7 @@ static void SCROLL_DrawArrows( HDC hdc, SCROLLBAR_INFO *infoPtr, */ static void SCROLL_DrawInterior( HWND hwnd, HDC hdc, INT nBar, RECT *rect, INT arrowSize, - INT thumbSize, INT thumbPos, - UINT flags, BOOL vertical, + INT thumbSize, INT thumbPos, BOOL vertical, BOOL top_selected, BOOL bottom_selected ) { RECT r; @@ -247,11 +246,9 @@ static void SCROLL_DrawInterior( HWND hwnd, HDC hdc, INT nBar, void WINAPI USER_ScrollBarDraw( HWND hwnd, HDC hdc, INT nBar, enum SCROLL_HITTEST hit_test, const struct SCROLL_TRACKING_INFO *tracking_info, BOOL arrows, - BOOL interior, RECT *rect, INT arrowSize, INT thumbPos, - INT thumbSize, BOOL vertical ) + BOOL interior, RECT *rect, UINT enable_flags, INT arrowSize, + INT thumbPos, INT thumbSize, BOOL vertical ) { - SCROLLBAR_INFO *infoPtr; - if (nBar == SB_CTL) { DWORD style = GetWindowLongW( hwnd, GWL_STYLE ); @@ -274,34 +271,29 @@ void WINAPI USER_ScrollBarDraw( HWND hwnd, HDC hdc, INT nBar, enum SCROLL_HITTES } } - if (!(infoPtr = SCROLL_GetInternalInfo( hwnd, nBar, TRUE ))) - return; - - /* Draw the arrows */ - + /* Draw the arrows */ if (arrows && arrowSize) { if (vertical == tracking_info->vertical && GetCapture() == hwnd) - SCROLL_DrawArrows( hdc, infoPtr, rect, arrowSize, vertical, + SCROLL_DrawArrows( hdc, enable_flags, rect, arrowSize, vertical, hit_test == tracking_info->hit_test && hit_test == SCROLL_TOP_ARROW, hit_test == tracking_info->hit_test && hit_test == SCROLL_BOTTOM_ARROW ); else - SCROLL_DrawArrows( hdc, infoPtr, rect, arrowSize, vertical, FALSE, FALSE ); + SCROLL_DrawArrows( hdc, enable_flags, rect, arrowSize, vertical, FALSE, FALSE ); } if (interior) { if (vertical == tracking_info->vertical && GetCapture() == hwnd) { - SCROLL_DrawInterior( hwnd, hdc, nBar, rect, arrowSize, thumbSize, thumbPos, - infoPtr->flags, vertical, + SCROLL_DrawInterior( hwnd, hdc, nBar, rect, arrowSize, thumbSize, thumbPos, vertical, hit_test == tracking_info->hit_test && hit_test == SCROLL_TOP_RECT, hit_test == tracking_info->hit_test && hit_test == SCROLL_BOTTOM_RECT ); } else { SCROLL_DrawInterior( hwnd, hdc, nBar, rect, arrowSize, thumbSize, thumbPos, - infoPtr->flags, vertical, FALSE, FALSE ); + vertical, FALSE, FALSE ); } } diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index b6c8f26cec6..fb9ce74736d 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -178,7 +178,7 @@ static NTSTATUS WINAPI User32DrawScrollBar( const struct draw_scroll_bar_params RECT rect = params->rect; user_api->pScrollBarDraw( params->hwnd, params->hdc, params->bar, params->hit_test, &params->tracking_info, params->arrows, params->interior, - &rect, params->arrow_size, params->thumb_pos, + &rect, params->enable_flags, params->arrow_size, params->thumb_pos, params->thumb_size, params->vertical ); return 0; } diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index f34818ea258..3be5b84b41b 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -177,8 +177,8 @@ extern struct user_api_hook *user_api DECLSPEC_HIDDEN; LRESULT WINAPI USER_DefDlgProc(HWND, UINT, WPARAM, LPARAM, BOOL) DECLSPEC_HIDDEN; LRESULT WINAPI USER_ScrollBarProc(HWND, UINT, WPARAM, LPARAM, BOOL) DECLSPEC_HIDDEN; void WINAPI USER_ScrollBarDraw(HWND, HDC, INT, enum SCROLL_HITTEST, - const struct SCROLL_TRACKING_INFO *, BOOL, BOOL, RECT *, INT, INT, - INT, BOOL) DECLSPEC_HIDDEN; + const struct SCROLL_TRACKING_INFO *, BOOL, BOOL, RECT *, UINT, + INT, INT, INT, BOOL) DECLSPEC_HIDDEN; struct scroll_info *SCROLL_GetInternalInfo( HWND hwnd, INT nBar, BOOL alloc ); #endif /* __WINE_USER_PRIVATE_H */ diff --git a/dlls/uxtheme/scrollbar.c b/dlls/uxtheme/scrollbar.c index 719081ad5b8..4ae1b2a8724 100644 --- a/dlls/uxtheme/scrollbar.c +++ b/dlls/uxtheme/scrollbar.c @@ -34,8 +34,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(theme_scroll); void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTEST hit_test, const struct SCROLL_TRACKING_INFO *tracking_info, - BOOL draw_arrows, BOOL draw_interior, RECT *rect, INT arrowsize, - INT thumbpos, INT thumbsize, BOOL vertical) + BOOL draw_arrows, BOOL draw_interior, RECT *rect, UINT enable_flags, + INT arrowsize, INT thumbpos, INT thumbsize, BOOL vertical) { BOOL disabled = !IsWindowEnabled(hwnd); HTHEME theme; @@ -49,7 +49,7 @@ void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTES if (!theme) { user_api.pScrollBarDraw(hwnd, dc, bar, hit_test, tracking_info, draw_arrows, draw_interior, - rect, arrowsize, thumbpos, thumbsize, vertical); + rect, enable_flags, arrowsize, thumbpos, thumbsize, vertical); return; } diff --git a/dlls/uxtheme/uxthemedll.h b/dlls/uxtheme/uxthemedll.h index 67130774392..85b834e20e8 100644 --- a/dlls/uxtheme/uxthemedll.h +++ b/dlls/uxtheme/uxthemedll.h @@ -109,8 +109,8 @@ extern struct user_api_hook user_api DECLSPEC_HIDDEN; LRESULT WINAPI UXTHEME_DefDlgProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL unicode) DECLSPEC_HIDDEN; void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTEST hit_test, const struct SCROLL_TRACKING_INFO *tracking_info, - BOOL draw_arrows, BOOL draw_interior, RECT *rect, INT arrowsize, - INT thumbpos, INT thumbsize, BOOL vertical) DECLSPEC_HIDDEN; + BOOL draw_arrows, BOOL draw_interior, RECT *rect, UINT enable_flags, + INT arrowsize, INT thumbpos, INT thumbsize, BOOL vertical) DECLSPEC_HIDDEN; LRESULT WINAPI UXTHEME_ScrollbarWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode) DECLSPEC_HIDDEN; diff --git a/include/winuser.h b/include/winuser.h index 4e43d6c1170..d2262b6d70a 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4789,8 +4789,8 @@ struct user_api_hook { LRESULT (WINAPI *pDefDlgProc)(HWND, UINT, WPARAM, LPARAM, BOOL); void (WINAPI *pScrollBarDraw)(HWND, HDC, INT, enum SCROLL_HITTEST, - const struct SCROLL_TRACKING_INFO *, BOOL, BOOL, RECT *, INT, INT, - INT, BOOL); + const struct SCROLL_TRACKING_INFO *, BOOL, BOOL, RECT *, UINT, + INT, INT, INT, BOOL); LRESULT (WINAPI *pScrollBarWndProc)(HWND, UINT, WPARAM, LPARAM, BOOL); };

1 0

Jinoh Kang : loader: Fix return type of get_auxiliary().
by Alexandre Julliard 04 Jul '22

04 Jul '22

Module: wine Branch: master Commit: 38dfa2f4551626d05d5c23824a8e0277374e63ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=38dfa2f4551626d05d5c2382… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Jan 1 05:34:54 2022 +0900 loader: Fix return type of get_auxiliary(). This is required for fetching pointer-valued vectors (e.g. AT_SYSINFO_EHDR). Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- loader/preloader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/preloader.c b/loader/preloader.c index 585be50624f..d88964e9c4b 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -868,7 +868,7 @@ static void set_auxiliary_values( struct wld_auxv *av, const struct wld_auxv *ne * * Get a field of the auxiliary structure */ -static int get_auxiliary( struct wld_auxv *av, int type, int def_val ) +static ElfW(Addr) get_auxiliary( struct wld_auxv *av, int type, ElfW(Addr) def_val ) { for ( ; av->a_type != AT_NULL; av++) if( av->a_type == type ) return av->a_un.a_val;

1 0

Nikolay Sivov : d2d1/effect: Support parsing vector4 property values.
by Alexandre Julliard 04 Jul '22

04 Jul '22

Module: wine Branch: master Commit: 618141d8179beb5a0b44f370c9d6a73eae86e96a URL: https://source.winehq.org/git/wine.git/?a=commit;h=618141d8179beb5a0b44f370… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jul 2 15:45:13 2022 +0300 d2d1/effect: Support parsing vector4 property values. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/effect.c | 1 + dlls/d2d1/tests/d2d1.c | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index a2cb08ac873..154b3c35a1b 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -361,6 +361,7 @@ static HRESULT d2d_effect_properties_internal_add(struct d2d_effect_properties * break; case D2D1_PROPERTY_TYPE_VECTOR2: case D2D1_PROPERTY_TYPE_VECTOR3: + case D2D1_PROPERTY_TYPE_VECTOR4: if (FAILED(hr = d2d_effect_parse_vector_value(p->type, value, _vec))) { WARN("Failed to parse vector value %s.\n", wine_dbgstr_w(value)); diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index f76ad185f3e..d796d738077 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -62,6 +62,10 @@ L"<?xml version='1.0'?> \ <Property name='DisplayName' type='string' value='Vec3 prop'/> \ <Property name='Default' type='vector3' value='(0.1, 0.2, 0.3)'/> \ </Property> \ + <Property name='Vec4Prop' type='vector4' value='(8.0,9.0,10.0,11.0)'> \ + <Property name='DisplayName' type='string' value='Vec4 prop'/> \ + <Property name='Default' type='vector4' value='(0.8,0.9,1.0,1.1)'/> \ + </Property> \ </Effect> \ "; @@ -11030,11 +11034,11 @@ static void test_effect_properties(BOOL d3d11) UINT32 i, min_inputs, max_inputs, integer, index, size; ID2D1EffectContext *effect_context; D2D1_BUFFER_PRECISION precision; + float vec2[2], vec3[3], vec4[4]; ID2D1Properties *subproperties; D2D1_PROPERTY_TYPE prop_type; struct d2d1_test_context ctx; ID2D1Factory1 *factory; - float vec2[2], vec3[3]; ID2D1Effect *effect; UINT32 count, data; WCHAR buffer[128]; @@ -11152,6 +11156,18 @@ static void test_effect_properties(BOOL d3d11) ok(vec3[0] == 5.0f && vec3[1] == 6.0f && vec3[2] == 7.0f, "Unexpected vector (%.8e,%.8e,%.8e).\n", vec3[0], vec3[1], vec3[2]); + /* Vector4 property. */ + index = ID2D1Effect_GetPropertyIndex(effect, L"Vec4Prop"); + hr = ID2D1Effect_GetPropertyName(effect, index, buffer, ARRAY_SIZE(buffer)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(!wcscmp(buffer, L"Vec4Prop"), "Unexpected name %s.\n", wine_dbgstr_w(buffer)); + prop_type = ID2D1Effect_GetType(effect, index); + ok(prop_type == D2D1_PROPERTY_TYPE_VECTOR4, "Unexpected type %u.\n", prop_type); + hr = ID2D1Effect_GetValue(effect, index, D2D1_PROPERTY_TYPE_VECTOR4, (BYTE *)vec4, sizeof(vec4)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(vec4[0] == 8.0f && vec4[1] == 9.0f && vec4[2] == 10.0f && vec4[3] == 11.0f, + "Unexpected vector (%.8e,%.8e,%.8e,%.8e).\n", vec4[0], vec4[1], vec4[2], vec4[3]); + ID2D1Effect_Release(effect); hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect);

1 0