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

Francois Gouget : testbot: Tweak the Failure::Validate() error message.
by Alexandre Julliard July 5, 2022

July 5, 2022

Module: tools Branch: master Commit: 77c64eb821f81b4b3db8693096ce52dbf92b5d9f URL: https://source.winehq.org/git/tools.git/?a=commit;h=77c64eb821f81b4b3db8693… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 5 17:51:23 2022 +0200 testbot: Tweak the Failure::Validate() error message. The error message should indicate why the regular expression is invalid. Also use the field's actual display name instead of making one up. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Failures.pm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/testbot/lib/WineTestBot/Failures.pm b/testbot/lib/WineTestBot/Failures.pm index 6190ef25..8d41bfcc 100644 --- a/testbot/lib/WineTestBot/Failures.pm +++ b/testbot/lib/WineTestBot/Failures.pm @@ -98,20 +98,21 @@ sub Validate($) { return ("TestUnit", "The test unit '". $self->TestUnit ."' contains invalid characters"); } - foreach my $Pair (["ConfigRegExp", "configuration"], - ["FailureRegExp", "failure"]) + foreach my $Field ("ConfigRegExp", "FailureRegExp") { - my ($Field, $Name) = @$Pair; my $RegExp = $self->$Field; my $ErrMessage = eval { use warnings FATAL => qw(regexp); if ($RegExp and "" =~ /$RegExp/) { - return "The $Name regular expression should not match empty strings"; + return "The regular expression should not match empty strings"; } - }; - $ErrMessage = "The $Name regular expression is invalid" if ($@); - return ($Field, $ErrMessage) if ($ErrMessage); + } || "$@"; + if ($ErrMessage) + { + my $DisplayName = $self->GetPropertyDescriptorByName($Field)->GetDisplayName(); + return ($Field, "$DisplayName: $ErrMessage"); + } } return $self->SUPER::Validate(); }

1 0

Francois Gouget : testbot/web: Fix reporting the build special job errors.
by Alexandre Julliard July 5, 2022

July 5, 2022

Module: tools Branch: master Commit: 3449d75bbf7d9c52da432ce6441972a19b6341ad URL: https://source.winehq.org/git/tools.git/?a=commit;h=3449d75bbf7d9c52da432ce… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 5 17:51:19 2022 +0200 testbot/web: Fix reporting the build special job errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/admin/SpecialJobs.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/web/admin/SpecialJobs.pl b/testbot/web/admin/SpecialJobs.pl index e267cc7d..2c0bbd11 100644 --- a/testbot/web/admin/SpecialJobs.pl +++ b/testbot/web/admin/SpecialJobs.pl @@ -168,6 +168,7 @@ sub OnSubmit($) my $VMs = GetReconfigVMs($VMKey, "build"); push @Errors, "Found no build VM to update" if (!@$VMs); my $ErrMessage = AddReconfigJob($VMs, $VMKey, "build"); + push @Errors, $ErrMessage if (defined $ErrMessage); } # Run 32 bit WineTest

1 0

Francois Gouget : testbot/cgi: Avoid direct access to the base Page error fields.
by Alexandre Julliard July 5, 2022

July 5, 2022

Module: tools Branch: master Commit: df5a6e8c92e84ef6a2dc7a541636b9a1826281eb URL: https://source.winehq.org/git/tools.git/?a=commit;h=df5a6e8c92e84ef6a2dc7a5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 5 17:51:50 2022 +0200 testbot/cgi: Avoid direct access to the base Page error fields. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/FormPage.pm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 6f3449b5..f2fd0f09 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -503,14 +503,17 @@ sub GenerateBody($) $self->GenerateFields(); $self->GenerateRequiredLegend(); - if (defined $self->{ErrMessage}) + my $ErrMessage = $self->GetErrMessage(); + if (defined $ErrMessage) { - if (defined $self->{ErrField}) + my $ErrField = $self->GetErrField(); + if (defined $ErrField) { - my $PropertyDescriptor = $self->GetPropertyDescriptorByName($self->{ErrField}); + my $PropertyDescriptor = $self->GetPropertyDescriptorByName($ErrField); if ($PropertyDescriptor and !($self->DisplayProperty($PropertyDescriptor))[0]) { - $self->{ErrMessage} = "Internal error?\n$self->{ErrMessage}"; + # The hidden fields should not be invalid + $self->AddError("Internal error?\n$ErrMessage", $ErrField); } } $self->GenerateErrorPopup(); @@ -573,8 +576,7 @@ sub Validate($) my $ErrMessage = $PropertyDescriptor->ValidateValue($Value, 1); if ($ErrMessage) { - $self->{ErrMessage} = $ErrMessage; - $self->{ErrField} = $PropertyDescriptor->GetName(); + $self->AddError($ErrMessage, $PropertyDescriptor->GetName()); return !1; } } @@ -686,7 +688,7 @@ sub OnAction($$) { my ($self, $Action) = @_; - $self->SetError(undef, "No action defined for $Action"); + $self->AddError("No action defined for $Action"); return 0; }

1 0

Torge Matthies : msvcr100: Add _StructuredTaskCollection::_IsCanceling stub.
by Alexandre Julliard July 4, 2022

July 4, 2022

Module: wine Branch: master Commit: 3a25d00108966aee2888a94d867c35296b2f00fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a25d00108966aee2888a94d… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Mon Jul 4 20:29:14 2022 +0200 msvcr100: Add _StructuredTaskCollection::_IsCanceling 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 --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index 77092cfb65d..9370566bb2c 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -537,9 +537,9 @@ @ stub -arch=arm ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IBAXI(a)Z @ thiscall -arch=i386 ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IBEXI(a)Z(ptr long) _vector_base_v4__Internal_throw_exception @ cdecl -arch=win64 ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEBAX_K(a)Z(ptr long) _vector_base_v4__Internal_throw_exception -@ stub -arch=arm ?_IsCanceling(a)_StructuredTaskCollection@details(a)Concurrency@@QAA_NXZ -@ stub -arch=i386 ?_IsCanceling(a)_StructuredTaskCollection@details(a)Concurrency@@QAE_NXZ -@ stub -arch=win64 ?_IsCanceling(a)_StructuredTaskCollection@details(a)Concurrency@@QEAA_NXZ +@ cdecl -arch=arm ?_IsCanceling(a)_StructuredTaskCollection@details(a)Concurrency@@QAA_NXZ(ptr) _StructuredTaskCollection__IsCanceling +@ thiscall -arch=i386 ?_IsCanceling(a)_StructuredTaskCollection@details(a)Concurrency@@QAE_NXZ(ptr) _StructuredTaskCollection__IsCanceling +@ cdecl -arch=win64 ?_IsCanceling(a)_StructuredTaskCollection@details(a)Concurrency@@QEAA_NXZ(ptr) _StructuredTaskCollection__IsCanceling @ stub -arch=arm ?_IsCanceling(a)_TaskCollection@details(a)Concurrency@@QAA_NXZ @ stub -arch=i386 ?_IsCanceling(a)_TaskCollection@details(a)Concurrency@@QAE_NXZ @ stub -arch=win64 ?_IsCanceling(a)_TaskCollection@details(a)Concurrency@@QEAA_NXZ diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 29a5d4910e1..0d38005c13a 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -329,8 +329,8 @@ @ cdecl -arch=win64 ?_DoYield@?$_SpinWait@$00(a)details@Concurrency@@IEAAXXZ(ptr) SpinWait__DoYield @ thiscall -arch=win32 ?_DoYield@?$_SpinWait@$0A@@details(a)Concurrency@@IAEXXZ(ptr) SpinWait__DoYield @ cdecl -arch=win64 ?_DoYield@?$_SpinWait@$0A@@details(a)Concurrency@@IEAAXXZ(ptr) SpinWait__DoYield -@ stub -arch=win32 ?_IsCanceling(a)_StructuredTaskCollection@details(a)Concurrency@@QAE_NXZ -@ stub -arch=win64 ?_IsCanceling(a)_StructuredTaskCollection@details(a)Concurrency@@QEAA_NXZ +@ thiscall -arch=win32 ?_IsCanceling(a)_StructuredTaskCollection@details(a)Concurrency@@QAE_NXZ(ptr) _StructuredTaskCollection__IsCanceling +@ cdecl -arch=win64 ?_IsCanceling(a)_StructuredTaskCollection@details(a)Concurrency@@QEAA_NXZ(ptr) _StructuredTaskCollection__IsCanceling @ stub -arch=win32 ?_IsCanceling(a)_TaskCollection@details(a)Concurrency@@QAE_NXZ @ stub -arch=win64 ?_IsCanceling(a)_TaskCollection@details(a)Concurrency@@QEAA_NXZ @ stub -arch=win32 ?_Name_base(a)type_info@@CAPBDPBV1(a)PAU__type_info_node@@@Z diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 7e06ab8693f..24e7630194c 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -544,9 +544,9 @@ @ stub -arch=arm ?_Invoke(a)_CancellationTokenRegistration@details(a)Concurrency@@AAAXXZ @ stub -arch=i386 ?_Invoke(a)_CancellationTokenRegistration@details(a)Concurrency@@AAEXXZ @ stub -arch=win64 ?_Invoke(a)_CancellationTokenRegistration@details(a)Concurrency@@AEAAXXZ -@ stub -arch=arm ?_IsCanceling(a)_StructuredTaskCollection@details(a)Concurrency@@QAA_NXZ -@ stub -arch=i386 ?_IsCanceling(a)_StructuredTaskCollection@details(a)Concurrency@@QAE_NXZ -@ stub -arch=win64 ?_IsCanceling(a)_StructuredTaskCollection@details(a)Concurrency@@QEAA_NXZ +@ cdecl -arch=arm ?_IsCanceling(a)_StructuredTaskCollection@details(a)Concurrency@@QAA_NXZ(ptr) _StructuredTaskCollection__IsCanceling +@ thiscall -arch=i386 ?_IsCanceling(a)_StructuredTaskCollection@details(a)Concurrency@@QAE_NXZ(ptr) _StructuredTaskCollection__IsCanceling +@ cdecl -arch=win64 ?_IsCanceling(a)_StructuredTaskCollection@details(a)Concurrency@@QEAA_NXZ(ptr) _StructuredTaskCollection__IsCanceling @ stub -arch=arm ?_IsCanceling(a)_TaskCollection@details(a)Concurrency@@QAA_NXZ @ stub -arch=i386 ?_IsCanceling(a)_TaskCollection@details(a)Concurrency@@QAE_NXZ @ stub -arch=win64 ?_IsCanceling(a)_TaskCollection@details(a)Concurrency@@QEAA_NXZ diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 45641c1fb00..b1258dad5de 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -535,9 +535,9 @@ @ thiscall -arch=i386 ?_GetScheduler(a)_Scheduler@details(a)Concurrency@@QAEPAVScheduler(a)3@XZ(ptr) _Scheduler__GetScheduler @ cdecl -arch=win64 ?_GetScheduler(a)_Scheduler@details(a)Concurrency@@QEAAPEAVScheduler(a)3@XZ(ptr) _Scheduler__GetScheduler @ cdecl ?_Id(a)_CurrentScheduler@details(a)Concurrency@@SAIXZ() _CurrentScheduler__Id -@ stub -arch=arm ?_IsCanceling(a)_StructuredTaskCollection@details(a)Concurrency@@QAA_NXZ -@ stub -arch=i386 ?_IsCanceling(a)_StructuredTaskCollection@details(a)Concurrency@@QAE_NXZ -@ stub -arch=win64 ?_IsCanceling(a)_StructuredTaskCollection@details(a)Concurrency@@QEAA_NXZ +@ cdecl -arch=arm ?_IsCanceling(a)_StructuredTaskCollection@details(a)Concurrency@@QAA_NXZ(ptr) _StructuredTaskCollection__IsCanceling +@ thiscall -arch=i386 ?_IsCanceling(a)_StructuredTaskCollection@details(a)Concurrency@@QAE_NXZ(ptr) _StructuredTaskCollection__IsCanceling +@ cdecl -arch=win64 ?_IsCanceling(a)_StructuredTaskCollection@details(a)Concurrency@@QEAA_NXZ(ptr) _StructuredTaskCollection__IsCanceling @ stub -arch=arm ?_IsCanceling(a)_TaskCollection@details(a)Concurrency@@QAA_NXZ @ stub -arch=i386 ?_IsCanceling(a)_TaskCollection@details(a)Concurrency@@QAE_NXZ @ stub -arch=win64 ?_IsCanceling(a)_TaskCollection@details(a)Concurrency@@QEAA_NXZ diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 7adb0462565..93ce779ea69 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -532,9 +532,9 @@ @ thiscall -arch=i386 ?_GetScheduler(a)_Scheduler@details(a)Concurrency@@QAEPAVScheduler(a)3@XZ(ptr) msvcr120.?_GetScheduler(a)_Scheduler@details(a)Concurrency@@QAEPAVScheduler(a)3@XZ @ cdecl -arch=win64 ?_GetScheduler(a)_Scheduler@details(a)Concurrency@@QEAAPEAVScheduler(a)3@XZ(ptr) msvcr120.?_GetScheduler(a)_Scheduler@details(a)Concurrency@@QEAAPEAVScheduler(a)3@XZ @ cdecl ?_Id(a)_CurrentScheduler@details(a)Concurrency@@SAIXZ() msvcr120.?_Id(a)_CurrentScheduler@details(a)Concurrency@@SAIXZ -@ stub -arch=arm ?_IsCanceling(a)_StructuredTaskCollection@details(a)Concurrency@@QAA_NXZ -@ stub -arch=i386 ?_IsCanceling(a)_StructuredTaskCollection@details(a)Concurrency@@QAE_NXZ -@ stub -arch=win64 ?_IsCanceling(a)_StructuredTaskCollection@details(a)Concurrency@@QEAA_NXZ +@ cdecl -arch=arm ?_IsCanceling(a)_StructuredTaskCollection@details(a)Concurrency@@QAA_NXZ(ptr) msvcr120.?_IsCanceling(a)_StructuredTaskCollection@details(a)Concurrency@@QAA_NXZ +@ thiscall -arch=i386 ?_IsCanceling(a)_StructuredTaskCollection@details(a)Concurrency@@QAE_NXZ(ptr) msvcr120.?_IsCanceling(a)_StructuredTaskCollection@details(a)Concurrency@@QAE_NXZ +@ cdecl -arch=win64 ?_IsCanceling(a)_StructuredTaskCollection@details(a)Concurrency@@QEAA_NXZ(ptr) msvcr120.?_IsCanceling(a)_StructuredTaskCollection@details(a)Concurrency@@QEAA_NXZ @ stub -arch=arm ?_IsCanceling(a)_TaskCollection@details(a)Concurrency@@QAA_NXZ @ stub -arch=i386 ?_IsCanceling(a)_TaskCollection@details(a)Concurrency@@QAE_NXZ @ stub -arch=win64 ?_IsCanceling(a)_TaskCollection@details(a)Concurrency@@QEAA_NXZ diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index 80351993a58..c982e367749 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -1824,6 +1824,17 @@ void __thiscall _StructuredTaskCollection__Cancel( FIXME("(%p): stub!\n", this); } +/* ?_IsCanceling(a)_StructuredTaskCollection@details(a)Concurrency@@QAA_NXZ */ +/* ?_IsCanceling(a)_StructuredTaskCollection@details(a)Concurrency@@QAE_NXZ */ +/* ?_IsCanceling(a)_StructuredTaskCollection@details(a)Concurrency@@QEAA_NXZ */ +DEFINE_THISCALL_WRAPPER(_StructuredTaskCollection__IsCanceling, 4) +bool __thiscall _StructuredTaskCollection__IsCanceling( + _StructuredTaskCollection *this) +{ + FIXME("(%p): stub!\n", this); + return FALSE; +} + /* ??0critical_section(a)Concurrency@@QAE(a)XZ */ /* ??0critical_section(a)Concurrency@@QEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(critical_section_ctor, 4)

1 0

Torge Matthies : msvcr100: Add _StructuredTaskCollection::_Cancel stub.
by Alexandre Julliard July 4, 2022

July 4, 2022

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

Torge Matthies : msvcr100: Add _StructuredTaskCollection::_RunAndWait stub.
by Alexandre Julliard July 4, 2022

July 4, 2022

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 : msvcr110: Add _StructuredTaskCollection::_Schedule_loc stub.
by Alexandre Julliard July 4, 2022

July 4, 2022

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 : msvcr120: Add _StructuredTaskCollection::_StructuredTaskCollection_dtor stub.
by Alexandre Julliard July 4, 2022

July 4, 2022

Module: wine Branch: master Commit: ccde147084d64e9a7a96d2b0b383d3b911abd527 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ccde147084d64e9a7a96d2b0… 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> --- 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 aa00853d5cd..8afab0cecae 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 d964de1fb36..c45965d8acd 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 c26478f36cd..05ed0ef876f 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -1760,6 +1760,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

Dmitry Timoshkov : combase: Use file system redirection path only for an opposite architecture in a WoW64 setup.
by Alexandre Julliard July 4, 2022

July 4, 2022

Module: wine Branch: master Commit: 9ba69dce369a1c81ea6939e02e885f3117db81b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ba69dce369a1c81ea6939e0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jun 27 12:49:07 2022 +0300 combase: Use file system redirection path only for an opposite architecture in a WoW64 setup. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/rpc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/combase/rpc.c b/dlls/combase/rpc.c index bed7518358c..3a171dbb324 100644 --- a/dlls/combase/rpc.c +++ b/dlls/combase/rpc.c @@ -527,7 +527,7 @@ static HRESULT create_surrogate_server(REFCLSID rclsid, HANDLE *process) HKEY key; int arch = (sizeof(void *) > sizeof(int)) ? 64 : 32; REGSAM opposite = (arch == 64) ? KEY_WOW64_32KEY : KEY_WOW64_64KEY; - BOOL is_wow64 = FALSE; + BOOL is_wow64 = FALSE, is_opposite = FALSE; HRESULT hr; WCHAR command[MAX_PATH + ARRAY_SIZE(processidW) + CHARS_IN_GUID]; DWORD size; @@ -548,6 +548,7 @@ static HRESULT create_surrogate_server(REFCLSID rclsid, HANDLE *process) { hr = open_appidkey_from_clsid(rclsid, opposite | KEY_READ, &key); if (FAILED(hr)) return hr; + is_opposite = TRUE; } size = (MAX_PATH + 1) * sizeof(WCHAR); @@ -574,7 +575,7 @@ static HRESULT create_surrogate_server(REFCLSID rclsid, HANDLE *process) TRACE("Activating surrogate local server %s\n", debugstr_w(command)); - if (is_wow64 && arch == 64) + if (is_opposite) { void *cookie; Wow64DisableWow64FsRedirection(&cookie);

1 0

Roman Pišl : wpcap: Translate device identifier in pcap_create.
by Alexandre Julliard July 4, 2022

July 4, 2022

Module: wine Branch: master Commit: be94570d441c68cc1fd13a11b363fe25ce12f34b URL: https://source.winehq.org/git/wine.git/?a=commit;h=be94570d441c68cc1fd13a11… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Sat Jul 2 13:18:25 2022 +0200 wpcap: Translate device identifier in pcap_create. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53104 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: André Zwing <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wpcap/wpcap.c | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index b140deeb3d2..a295819f7fe 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -68,15 +68,6 @@ int CDECL pcap_compile( struct pcap *pcap, void *program, const char *buf, int o return PCAP_CALL( compile, &params ); } -struct pcap * CDECL pcap_create( const char *src, char *errbuf ) -{ - struct pcap *ret; - struct create_params params = { src, errbuf, &ret }; - TRACE( "%s, %p\n", src, errbuf ); - PCAP_CALL( create, &params ); - return ret; -} - int CDECL pcap_datalink( struct pcap *pcap ) { TRACE( "%p\n", pcap ); @@ -579,6 +570,26 @@ static char *map_win32_device_name( const char *dev ) return ret; } +struct pcap * CDECL pcap_create( const char *source, char *errbuf ) +{ + char *unix_dev; + struct pcap *ret; + TRACE( "%s, %p\n", source, errbuf ); + + if (!(unix_dev = map_win32_device_name( source ))) + { + if (errbuf) sprintf( errbuf, "Unable to open the adapter." ); + return NULL; + } + else + { + struct create_params params = { unix_dev, errbuf, &ret }; + PCAP_CALL( create, &params ); + } + free( unix_dev ); + return ret; +} + static struct pcap *open_live( const char *source, int snaplen, int promisc, int timeout, char *errbuf ) { char *unix_dev;

1 0