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

Francois Gouget : testbot/web: Fix reporting the build special job errors.
by Alexandre Julliard 05 Jul '22

05 Jul '22

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: Improve the error handling API.
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: tools Branch: master Commit: e788323fbb0c99f266a615703f748aafee9fc6d9 URL: https://source.winehq.org/git/tools.git/?a=commit;h=e788323fbb0c99f266a6157… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 5 17:51:39 2022 +0200 testbot/cgi: Improve the error handling API. Add IsErrField() and ResetErrors() so web pages don't need to access the error fields directly. Add AddError() where the name of the error field is optional since it is often undetermined. Document the API, particularly with regards to the content of the error message and whether all errors have an associated error field. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/Page.pm | 90 +++++++++++++++++++++++++++++++++---- 1 file changed, 82 insertions(+), 8 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index 1b9630cc..6e18c29a 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -89,8 +89,9 @@ sub new($$$@) my $self = {Request => $Request, CGIObj => CGI->new($Request), - ErrMessage => undef, - ErrField => undef}; + # ErrMessage => undef by default + # ErrField => undef by default + }; $self = bless $self, $class; $self->{PageBase} = &$PageBaseCreator($self, @_); $self->_initialize(@_); @@ -293,26 +294,99 @@ sub Redirect($$) # Error handling framework # -sub GetErrField($) +=pod +=over 12 + +=head1 C<GetErrMessage()> + +Returns the error message if any, undef otherwise. + +=back +=cut + +sub GetErrMessage($) { my ($self) = @_; + return $self->{ErrMessage}; +} + +=pod +=over 12 +=head1 C<GetErrField()> + +Returns the name of the invalid field, undef otherwise. + +Note that if the error does not concern a specific field this may return +undef even though an error has been set. + +=back +=cut + +sub GetErrField($) +{ + my ($self) = @_; return $self->{ErrField}; } -sub GetErrMessage($) +=pod +=over 12 + +=head1 C<IsErrField()> + +Returns true if the error concerns the specified field. + +=back +=cut + +sub IsErrField($$) { - my ($self) = @_; + my ($self, $FieldName) = @_; + return defined $self->{ErrField} and $self->{ErrField} eq $FieldName; +} - return $self->{ErrMessage}; +=pod +=over 12 + +=head1 C<AddError()> + +Sets the error message to be shown to the user. +=over + +=item ErrMessage +A message to be shown on the page that describes why the form data is invalid. +This should include the display name of the field(s) that need to be fixed. + +=item ErrField +If the error concerns a specific field, the name of that field. This can be +used by the page to highlight the field that needs to be corrected. + +=back + +=back +=cut + +sub AddError($$;$) +{ + my ($self, $ErrMessage, $ErrField) = @_; + + $self->{ErrMessage} = $ErrMessage; + $self->{ErrField} = $ErrField; } +# FIXME: For legacy code, to be removed. sub SetError($$$) { my ($self, $ErrField, $ErrMessage) = @_; + $self->AddError($ErrMessage, $ErrField); +} - $self->{ErrField} = $ErrField; - $self->{ErrMessage} = $ErrMessage; +sub ResetErrors($) +{ + my ($self) = @_; + + delete $self->{ErrMessage}; + delete $self->{ErrField}; } sub GenerateErrorDiv($)

1 0

Francois Gouget : testbot/cgi: Avoid direct access to the base Page error fields.
by Alexandre Julliard 05 Jul '22

05 Jul '22

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 04 Jul '22

04 Jul '22

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

Roman Pišl : wpcap: Translate device identifier in pcap_create.
by Alexandre Julliard 04 Jul '22

04 Jul '22

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

Dmitry Timoshkov : combase: Use file system redirection path only for an opposite architecture in a WoW64 setup.
by Alexandre Julliard 04 Jul '22

04 Jul '22

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

Dmitry Timoshkov : combase: Execute local server for correct architecture in a WoW64 setup.
by Alexandre Julliard 04 Jul '22

04 Jul '22

Module: wine Branch: master Commit: 3c9720f4a6b2ffd873c886da53f045709fe98b67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c9720f4a6b2ffd873c886da… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jun 27 12:49:11 2022 +0300 combase: Execute local server for correct architecture in a WoW64 setup. Based on implementation of create_surrogate_server(). This patch makes 64-bit application work with its own shipped 32-bit COM server. 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 | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/combase/rpc.c b/dlls/combase/rpc.c index 3a171dbb324..c51b59de4bf 100644 --- a/dlls/combase/rpc.c +++ b/dlls/combase/rpc.c @@ -477,6 +477,9 @@ static HRESULT create_server(REFCLSID rclsid, HANDLE *process) { static const WCHAR embeddingW[] = L" -Embedding"; HKEY key; + int arch = (sizeof(void *) > sizeof(int)) ? 64 : 32; + REGSAM opposite = (arch == 64) ? KEY_WOW64_32KEY : KEY_WOW64_64KEY; + BOOL is_wow64 = FALSE, is_opposite = FALSE; HRESULT hr; WCHAR command[MAX_PATH + ARRAY_SIZE(embeddingW)]; DWORD size = (MAX_PATH+1) * sizeof(WCHAR); @@ -484,7 +487,14 @@ static HRESULT create_server(REFCLSID rclsid, HANDLE *process) PROCESS_INFORMATION pinfo; LONG ret; + TRACE("Attempting to start server for %s\n", debugstr_guid(rclsid)); + hr = open_key_for_clsid(rclsid, L"LocalServer32", KEY_READ, &key); + if (FAILED(hr) && (arch == 64 || (IsWow64Process(GetCurrentProcess(), &is_wow64) && is_wow64))) + { + hr = open_key_for_clsid(rclsid, L"LocalServer32", opposite | KEY_READ, &key); + is_opposite = TRUE; + } if (FAILED(hr)) { ERR("class %s not registered\n", debugstr_guid(rclsid)); @@ -510,7 +520,19 @@ static HRESULT create_server(REFCLSID rclsid, HANDLE *process) /* FIXME: Win2003 supports a ServerExecutable value that is passed into * CreateProcess */ - if (!CreateProcessW(NULL, command, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &sinfo, &pinfo)) + if (is_opposite) + { + void *cookie; + Wow64DisableWow64FsRedirection(&cookie); + if (!CreateProcessW(NULL, command, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &sinfo, &pinfo)) + { + WARN("failed to run local server %s\n", debugstr_w(command)); + hr = HRESULT_FROM_WIN32(GetLastError()); + } + Wow64RevertWow64FsRedirection(cookie); + if (FAILED(hr)) return hr; + } + else if (!CreateProcessW(NULL, command, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &sinfo, &pinfo)) { WARN("failed to run local server %s\n", debugstr_w(command)); return HRESULT_FROM_WIN32(GetLastError());

1 0

Yoshiji Emoto : ntdll: Add SJIS charset.
by Alexandre Julliard 04 Jul '22

04 Jul '22

Module: wine Branch: master Commit: b19b3701e8e94bcdac0d4189fec362acd318d483 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b19b3701e8e94bcdac0d4189… Author: Yoshiji Emoto <alumina.from.ceramix(a)gmail.com> Date: Sat Jun 25 06:50:14 2022 +0900 ntdll: Add SJIS charset. Signed-off-by: Yoshiji Emoto <alumina.from.ceramix(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 161367e354f..17450b5ab4c 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -270,6 +270,7 @@ static const struct { const char *name; UINT cp; } charset_names[] = { "ISO88599", 28599 }, { "KOI8R", 20866 }, { "KOI8U", 21866 }, + { "SJIS", 932 }, { "TIS620", 28601 }, { "UTF8", CP_UTF8 } };

1 0

Torge Matthies : msvcr120/tests: Add test for canceling running chores.
by Alexandre Julliard 04 Jul '22

04 Jul '22

Module: wine Branch: master Commit: cf2eaf3e4a8c385f69a71630fb9508151524de2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf2eaf3e4a8c385f69a71630… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Mon Jul 4 20:28:48 2022 +0200 msvcr120/tests: Add test for canceling running chores. 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/msvcr120/tests/msvcr120.c | 53 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 26b363de6c5..88a32b382ef 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -250,6 +250,8 @@ static _StructuredTaskCollection* (__thiscall *p__StructuredTaskCollection_ctor) static void (__thiscall *p__StructuredTaskCollection_dtor)(_StructuredTaskCollection*); static void (__thiscall *p__StructuredTaskCollection__Schedule)(_StructuredTaskCollection*, _UnrealizedChore*); static int (__stdcall *p__StructuredTaskCollection__RunAndWait)(_StructuredTaskCollection*, _UnrealizedChore*); +static void (__thiscall *p__StructuredTaskCollection__Cancel)(_StructuredTaskCollection*); +static MSVCRT_bool (__thiscall *p__StructuredTaskCollection__IsCanceling)(_StructuredTaskCollection*); #define SETNOFAIL(x,y) x = (void*)GetProcAddress(module,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) @@ -313,6 +315,10 @@ static BOOL init(void) "?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z"); SET(p__StructuredTaskCollection__RunAndWait, "?_RunAndWait(a)_StructuredTaskCollection@details(a)Concurrency@@QEAA?AW4_TaskCollectionStatus(a)23@PEAV_UnrealizedChore(a)23@@Z"); + SET(p__StructuredTaskCollection__Cancel, + "?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXXZ"); + SET(p__StructuredTaskCollection__IsCanceling, + "?_IsCanceling(a)_StructuredTaskCollection@details(a)Concurrency@@QEAA_NXZ"); SET(p_critical_section_ctor, "??0critical_section(a)Concurrency@@QEAA(a)XZ"); SET(p_critical_section_dtor, @@ -355,6 +361,10 @@ static BOOL init(void) "?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@@Z"); SET(p__StructuredTaskCollection__RunAndWait, "?_RunAndWait(a)_StructuredTaskCollection@details(a)Concurrency@@QAA?AW4_TaskCollectionStatus(a)23@PAV_UnrealizedChore(a)23@@Z"); + SET(p__StructuredTaskCollection__Cancel, + "?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXXZ"); + SET(p__StructuredTaskCollection__IsCanceling, + "?_IsCanceling(a)_StructuredTaskCollection@details(a)Concurrency@@QAA_NXZ"); SET(p_critical_section_ctor, "??0critical_section(a)Concurrency@@QAA(a)XZ"); SET(p_critical_section_dtor, @@ -394,6 +404,10 @@ static BOOL init(void) "?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z"); SET(p__StructuredTaskCollection__RunAndWait, "?_RunAndWait(a)_StructuredTaskCollection@details(a)Concurrency@@QAG?AW4_TaskCollectionStatus(a)23@PAV_UnrealizedChore(a)23@@Z"); + SET(p__StructuredTaskCollection__Cancel, + "?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXXZ"); + SET(p__StructuredTaskCollection__IsCanceling, + "?_IsCanceling(a)_StructuredTaskCollection@details(a)Concurrency@@QAE_NXZ"); SET(p_critical_section_ctor, "??0critical_section(a)Concurrency@@QAE(a)XZ"); SET(p_critical_section_dtor, @@ -1334,6 +1348,7 @@ struct chore HANDLE set_event; HANDLE wait_event; DWORD main_tid; + BOOL check_canceling; }; static void __cdecl chore_proc(_UnrealizedChore *_this) @@ -1355,6 +1370,14 @@ static void __cdecl chore_proc(_UnrealizedChore *_this) GetCurrentThreadId(), chore->main_tid); } + if (chore->check_canceling) + { + MSVCRT_bool canceling = call_func1( + p__StructuredTaskCollection__IsCanceling, + chore->chore.task_collection); + ok(!canceling, "Task is already canceling"); + } + if (!chore->wait_event) chore->executed = TRUE; @@ -1370,6 +1393,14 @@ static void __cdecl chore_proc(_UnrealizedChore *_this) ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %ld\n", ret); chore->executed = TRUE; } + + if (chore->check_canceling) + { + MSVCRT_bool canceling = call_func1( + p__StructuredTaskCollection__IsCanceling, + chore->chore.task_collection); + ok(canceling, "Task is not canceling"); + } } static void chore_ctor(struct chore *chore) @@ -1533,6 +1564,28 @@ static void test_StructuredTaskCollection(void) ok(chore1.executed, "Chore was not executed\n"); call_func1(p__StructuredTaskCollection_dtor, &task_coll); + /* test that running chores can be canceled */ + call_func2(p__StructuredTaskCollection_ctor, &task_coll, NULL); + ResetEvent(chore_start_evt); + chore_ctor(&chore1); + chore1.check_canceling = TRUE; + chore1.wait_event = chore_evt2; + chore1.set_event = chore_evt1; + + call_func2(p__StructuredTaskCollection__Schedule, &task_coll, &chore1.chore); + + ret = WaitForSingleObject(chore_evt1, 5000); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %ld\n", ret); + + call_func1(p__StructuredTaskCollection__Cancel, &task_coll); + + b = SetEvent(chore_evt2); + ok(b, "SetEvent failed\n"); + + status = p__StructuredTaskCollection__RunAndWait(&task_coll, NULL); + ok(status == 2, "_StructuredTaskCollection::_RunAndWait failed: %d\n", status); + call_func1(p__StructuredTaskCollection_dtor, &task_coll); + CloseHandle(chore_start_evt); CloseHandle(chore_evt1); CloseHandle(chore_evt2);

1 0

Torge Matthies : msvcr120: Add _StructuredTaskCollection::_StructuredTaskCollection_dtor stub.
by Alexandre Julliard 04 Jul '22

04 Jul '22

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