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

Francois Gouget : testbot: Small package documentation tweaks.
by Alexandre Julliard 22 Mar '18

22 Mar '18

Module: tools Branch: master Commit: e844c3d48c1d3073e0209d20bc0529bd4c53a57d URL: https://source.winehq.org/git/tools.git/?a=commit;h=e844c3d48c1d3073e0209d2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 22 02:01:22 2018 +0100 testbot: Small package documentation tweaks. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/RecordGroups.pm | 2 +- testbot/lib/WineTestBot/StepsTasks.pm | 14 ++++++++------ testbot/lib/WineTestBot/Users.pm | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/testbot/lib/WineTestBot/RecordGroups.pm b/testbot/lib/WineTestBot/RecordGroups.pm index dfa83ae..426bf60 100644 --- a/testbot/lib/WineTestBot/RecordGroups.pm +++ b/testbot/lib/WineTestBot/RecordGroups.pm @@ -21,7 +21,7 @@ package WineTestBot::RecordGroup; =head1 NAME -WineTestBot::RecordGroup - a group of related history records +WineTestBot::RecordGroup - A group of related history records =head1 DESCRIPTION diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index 79216d4..5f9b2ca 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -22,12 +22,7 @@ package WineTestBot::StepTask; =head1 NAME -WineTestBot::StepTask - Merged job steps/tasks - -=head1 DESCRIPTION - -This ties together a given WineTestBot::Task object with the corresponding -WineTestBot::Step object. +WineTestBot::StepTask - Merged Step + Task object =cut @@ -93,6 +88,13 @@ package WineTestBot::StepsTasks; WineTestBot::StepsTasks - A collection of StepsTasks objects +=head1 DESCRIPTION + +Provides a flat collection of all the tasks in the specified Job. + +Note that this is an in-memory only collection since it does not correspond to +a specific database table. + =cut use ObjectModel::BasicPropertyDescriptor; diff --git a/testbot/lib/WineTestBot/Users.pm b/testbot/lib/WineTestBot/Users.pm index b9745d8..e9aba57 100644 --- a/testbot/lib/WineTestBot/Users.pm +++ b/testbot/lib/WineTestBot/Users.pm @@ -22,7 +22,7 @@ package WineTestBot::User; =head1 NAME -WineTestBot::Users - A User +WineTestBot::User - A User =cut

1 0

Francois Gouget : testbot/web: Centralize the conversion of durations to human readable strings.
by Alexandre Julliard 22 Mar '18

22 Mar '18

Module: tools Branch: master Commit: ee3483d4b8b0d1aaf7f706f2d645d696a5ccf548 URL: https://source.winehq.org/git/tools.git/?a=commit;h=ee3483d4b8b0d1aaf7f706f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 22 02:01:33 2018 +0100 testbot/web: Centralize the conversion of durations to human readable strings. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Utils.pm | 30 +++++++++++++++++++++++++++++- testbot/web/Activity.pl | 12 ++---------- testbot/web/Stats.pl | 29 ++--------------------------- 3 files changed, 33 insertions(+), 38 deletions(-) diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index 5538ecd..63b9062 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -35,7 +35,7 @@ require Exporter; @ISA = qw(Exporter); @EXPORT = qw(&MakeSecureURL &SecureConnection &GenerateRandomString &OpenNewFile &CreateNewFile &CreateNewLink &CreateNewDir - &BuildEMailRecipient); + &DurationToString &BuildEMailRecipient); sub MakeSecureURL($) { @@ -121,6 +121,34 @@ sub CreateNewDir($$) } } +sub DurationToString($;$) +{ + my ($Secs, $Raw) = @_; + + return "n/a" if (!defined $Secs); + + my @Parts; + if (!$Raw) + { + my $Mins = int($Secs / 60); + $Secs -= 60 * $Mins; + my $Hours = int($Mins / 60); + $Mins -= 60 * $Hours; + my $Days = int($Hours / 24); + $Hours -= 24 * $Days; + push @Parts, "${Days}d" if ($Days); + push @Parts, "${Hours}h" if ($Hours); + push @Parts, "${Mins}m" if ($Mins); + } + if (!@Parts or int($Secs) != 0) + { + push @Parts, (@Parts or int($Secs) == $Secs) ? + int($Secs) ."s" : + sprintf('%.1fs', $Secs); + } + return join(" ", @Parts); +} + sub BuildEMailRecipient($$) { my ($EMailAddress, $Name) = @_; diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index ddea602..96a1ef0 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -28,6 +28,7 @@ use ObjectModel::CGI::FreeFormPage; use WineTestBot::Config; use WineTestBot::Activity; use WineTestBot::Log; +use WineTestBot::Utils; use WineTestBot::VMs; @ActivityPage::ISA = qw(ObjectModel::CGI::FreeFormPage); @@ -72,16 +73,7 @@ sub _GetHtmlTime($) sub _GetHtmlDuration($) { my ($Secs) = @_; - - return "" if ($Secs < 2); - my $Mins = int($Secs / 60); - my $Hours = int($Mins / 60); - - my @Parts; - push @Parts, "${Hours}h" if ($Hours); - push @Parts, "${Mins}m" if ($Mins %= 60); - push @Parts, "${Secs}s" if ($Secs %= 60); - return "<span class='RecordDuration'>". join(" ", @Parts) ."</span>"; + return ($Secs < 2) ? "" : "<span class='RecordDuration'>". DurationToString($Secs) ."</span>"; } sub _CompareVMs() diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index 806a366..1467407 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -38,31 +38,6 @@ sub _initialize($$$) $self->SUPER::_initialize($Request, $RequiredRole); } -sub _GetDuration($;$) -{ - my ($Secs, $Raw) = @_; - - return "n/a" if (!defined $Secs); - - my @Parts; - if (!$Raw) - { - my $Mins = int($Secs / 60); - my $Hours = int($Mins / 60); - my $Days = int($Hours / 24); - push @Parts, "${Days}d" if ($Days); - my $Part = $Hours - 24 * $Days; - push @Parts, "${Part}h" if ($Part); - $Part = $Mins - 60 * $Hours; - push @Parts, "${Part}m" if ($Part); - $Secs = $Secs - 60 * $Mins; - } - push @Parts, (@Parts or int($Secs) == $Secs) ? - int($Secs) ."s" : - sprintf('%.1fs', $Secs); - return join(" ", @Parts); -} - sub _CompareVMs() { my ($aHost, $bHost) = ($a->GetHost(), $b->GetHost()); @@ -105,7 +80,7 @@ sub _GetStatStr($$;$$) exists $Stats->{"$StatKey.count"}) { my $Avg = _GetAverage($Stats, $StatKey); - return $Avg eq "n/a" ? "n/a" : _GetDuration($Avg, $Flags & $NO_TIME); + return $Avg eq "n/a" ? "n/a" : DurationToString($Avg, $Flags & $NO_TIME); } if ($StatKey =~ /\.size$/ and !($Flags & $NO_AVERAGE) and @@ -124,7 +99,7 @@ sub _GetStatStr($$;$$) } if ($StatKey =~ /(?:\belapsed|\.time(?!\.count))/) { - return _GetDuration($Value, $Flags & $NO_TIME); + return DurationToString($Value, $Flags & $NO_TIME); } if ($StatKey =~ /\.rate$/) {

1 0

Francois Gouget : testbot: Use human readable durations for the administrator notifications.
by Alexandre Julliard 22 Mar '18

22 Mar '18

Module: tools Branch: master Commit: 0b308ee3291535b1a0575045d3afed25f8ec040d URL: https://source.winehq.org/git/tools.git/?a=commit;h=0b308ee3291535b1a057504… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 22 02:01:40 2018 +0100 testbot: Use human readable durations for the administrator notifications. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 9 ++++----- testbot/lib/WineTestBot/Log.pm | 9 ++++++++- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index c0288e7..fa07d2d 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -265,15 +265,14 @@ sub Monitor() "$VMKey does not exist anymore"; NotifyAdministrator("The $VMKey VM is not relevant anymore", "The $VMKey VM was offline but ceased to be relevant after ". - Elapsed($Start). " seconds:\n\n$Reason\n"); + PrettyElapsed($Start). ":\n\n$Reason\n"); return 1; } if ($VM->Status ne "offline") { NotifyAdministrator("The $VMKey VM is working again (". $VM->Status .")", "The status of the $VMKey VM unexpectedly switched from offline\n". - "to ". $VM->Status ." after ". Elapsed($Start) - ." seconds."); + "to ". $VM->Status ." after ". PrettyElapsed($Start) ."."); return 0; } @@ -320,7 +319,7 @@ sub Monitor() return 1 if (ChangeStatus("offline", "off", "done")); NotifyAdministrator("The $VMKey VM is working again", "The $VMKey VM started working again after ". - Elapsed($Start) ." seconds."); + PrettyElapsed($Start) ." seconds."); return 0; } } @@ -459,6 +458,6 @@ else Error("Unsupported action $Action!\n"); $Rc = 1; } -LogMsg "$Action on $VMKey completed in ", Elapsed($Start), " s\n"; +LogMsg "$Action on $VMKey completed in ", PrettyElapsed($Start), " s\n"; exit $Rc; diff --git a/testbot/lib/WineTestBot/Log.pm b/testbot/lib/WineTestBot/Log.pm index f1499dd..65782c5 100644 --- a/testbot/lib/WineTestBot/Log.pm +++ b/testbot/lib/WineTestBot/Log.pm @@ -26,12 +26,13 @@ WineTestBot::Log - Logging =cut use WineTestBot::Config; +use WineTestBot::Utils; use vars qw (@ISA @EXPORT); require Exporter; @ISA = qw(Exporter); -(a)EXPORT = qw(&LogMsg &OpenLog &Time &Elapsed); +(a)EXPORT = qw(&LogMsg &OpenLog &Time &Elapsed &PrettyElapsed); my $logfile; my $logprefix; @@ -108,4 +109,10 @@ sub Elapsed($) return sprintf("%0.2f", Time()-$Start); } +sub PrettyElapsed($) +{ + my ($Start) = @_; + return DurationToString(Time()-$Start); +} + 1;

1 0

Francois Gouget : testbot/Janitor: Add --dry-run and --log-only options.
by Alexandre Julliard 22 Mar '18

22 Mar '18

Module: tools Branch: master Commit: 9c0189f9fead2b7194fdd80c6c218023cd8f1360 URL: https://source.winehq.org/git/tools.git/?a=commit;h=9c0189f9fead2b7194fdd80… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 22 02:03:02 2018 +0100 testbot/Janitor: Add --dry-run and --log-only options. Janitor.pl now prints informational messages to stdout by default. This helps with debugging. The old behavior can be restored by using the --log-only option, like with the other TestBot tools. One can now also invoke it with the --dry-run option to see what it would do. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Janitor.pl | 141 ++++++++++++++++++++++++++++++++++-------------- testbot/doc/INSTALL.txt | 2 +- 2 files changed, 101 insertions(+), 42 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 41f88d9..56e024a 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -37,6 +37,8 @@ sub BEGIN unshift @INC, "$::RootDir/lib"; } } +my $Name0 = $0; +$Name0 =~ s+^.*/++; use File::Path; @@ -50,10 +52,61 @@ use WineTestBot::RecordGroups; use WineTestBot::Users; use WineTestBot::VMs; +my $LogOnly; +sub Trace(@) +{ + print @_ if (!$LogOnly); + LogMsg @_; +} + +sub Error(@) +{ + print STDERR "$Name0:error: ", @_ if (!$LogOnly); + LogMsg @_; +} + + $ENV{PATH} = "/usr/bin:/bin"; delete $ENV{ENV}; +# Grab the command line options +my ($Usage, $DryRun); +while (@ARGV) +{ + my $Arg = shift @ARGV; + if ($Arg eq "--dry-run") + { + $DryRun = 1; + } + elsif ($Arg eq "--log-only") + { + $LogOnly = 1; + } + elsif ($Arg =~ /^(?:-\?|-h|--help)$/) + { + $Usage = 0; + last; + } + else + { + Error "unexpected argument '$Arg'\n"; + $Usage = 2; + last; + } +} +# Check parameters +if (defined $Usage) +{ + print "Usage: $Name0 [--dry-run] [--log-only] [--help]\n"; + exit $Usage; +} + + +# +# Main +# + # Delete obsolete Jobs if ($JobPurgeDays != 0) { @@ -61,13 +114,12 @@ if ($JobPurgeDays != 0) $Jobs->AddFilter("Submitted", [time() - $JobPurgeDays * 86400], "<"); foreach my $Job (@{$Jobs->GetItems()}) { - LogMsg "Deleting job ", $Job->Id, "\n"; + Trace "Deleting job ", $Job->Id, "\n"; + next if ($DryRun); + $Job->RmTree(); my $ErrMessage = $Jobs->DeleteItem($Job); - if (defined($ErrMessage)) - { - LogMsg $ErrMessage, "\n"; - } + Error "$ErrMessage\n" if (defined $ErrMessage); } } @@ -89,7 +141,9 @@ foreach my $Set (@{$Sets->GetItems()}) if (! defined($MostRecentPatch) || $MostRecentPatch->Received < $DeleteBefore) { - LogMsg "Deleting pending series for ", $Set->EMail, "\n"; + Error "Deleting pending series for ", $Set->EMail, "\n"; + next if ($DryRun); + $Sets->DeleteItem($Set); $MostRecentPatch->Disposition("Incomplete series, discarded"); $MostRecentPatch->Save(); @@ -107,13 +161,12 @@ if ($JobPurgeDays != 0) $Jobs->AddFilter("Patch", [$Patch]); if ($Jobs->IsEmpty()) { - LogMsg "Deleting patch ", $Patch->Id, "\n"; + Trace "Deleting patch ", $Patch->Id, "\n"; + next if ($DryRun); + unlink("$DataDir/patches/" . $Patch->Id); my $ErrMessage = $Patches->DeleteItem($Patch); - if (defined($ErrMessage)) - { - LogMsg $ErrMessage, "\n"; - } + Error "$ErrMessage\n" if (defined $ErrMessage); } } } @@ -128,7 +181,9 @@ if ($JobArchiveDays != 0) { if (defined($Job->Ended) && $Job->Ended < $ArchiveBefore) { - LogMsg "Archiving job ", $Job->Id, "\n"; + Trace "Archiving job ", $Job->Id, "\n"; + next if ($DryRun); + foreach my $Step (@{$Job->Steps->GetItems()}) { unlink $Step->GetDir() . "/" . $Step->FileName; @@ -157,7 +212,7 @@ if (%DeletedUsers or %DeletedVMs) { if (exists $DeletedUsers{$Job->User->Name}) { - LogMsg "Keeping the ", $Job->User->Name, " account for job ", $Job->Id, "\n"; + Trace "Keeping the ", $Job->User->Name, " account for job ", $Job->Id, "\n"; delete $DeletedUsers{$Job->User->Name}; } @@ -169,7 +224,7 @@ if (%DeletedUsers or %DeletedVMs) { if (exists $DeletedVMs{$Task->VM->Name}) { - LogMsg "Keeping the ", $Task->VM->Name, " VM for task ", join("/", @{$Task->GetMasterKey()}), "\n"; + Trace "Keeping the ", $Task->VM->Name, " VM for task ", join("/", @{$Task->GetMasterKey()}), "\n"; delete $DeletedVMs{$Task->VM->Name}; } } @@ -182,15 +237,14 @@ if (%DeletedUsers or %DeletedVMs) foreach my $UserName (keys %DeletedUsers) { my $User = $Users->GetItem($UserName); + Trace "Deleting the $UserName account\n"; + next if ($DryRun); + DeleteSessions($User); my $ErrMessage = $Users->DeleteItem($User); if (defined $ErrMessage) { - LogMsg "Unable to delete the $UserName account: $ErrMessage\n"; - } - else - { - LogMsg "Deleted the $UserName account\n"; + Error "Unable to delete the $UserName account: $ErrMessage\n"; } } } @@ -198,14 +252,13 @@ if (%DeletedUsers or %DeletedVMs) foreach my $VMKey (keys %DeletedVMs) { my $VM = $VMs->GetItem($VMKey); + Trace "Deleting the $VMKey VM\n"; + next if ($DryRun); + my $ErrMessage = $VMs->DeleteItem($VM); if (defined $ErrMessage) { - LogMsg "Unable to delete the $VMKey VM: $ErrMessage\n"; - } - else - { - LogMsg "Deleted the $VMKey VM\n"; + Error "Unable to delete the $VMKey VM: $ErrMessage\n"; } } } @@ -223,41 +276,43 @@ if (opendir(my $dh, "$DataDir/staging")) my $FileName = "$DataDir/staging/$1"; my $Age = int((-M $FileName) + 0.5); - if ($Entry =~ /^[0-9a-f]{32}-websubmit_/) - { - if ($Age >= 1 and !unlink $FileName) - { - # The user abandoned the submit procedure half-way through - LogMsg "Could not delete '$FileName': $!\n" if (!unlink($FileName)); - } - } - else + if ($Entry !~ /^[0-9a-f]{32}-websubmit_/) { if ($Entry !~ /^[0-9a-f]{32}_(?:patch|patch\.diff|wine-patches|winetest(?:64)?-latest\.exe|work)$/) { - LogMsg "Found a suspicious staging file: $Entry\n"; + Trace "Found a suspicious staging file: $Entry\n"; } if ($JobPurgeDays != 0) { if ($Age >= $JobPurgeDays + 7) { - if (!rmtree($FileName)) + Trace "Deleting '$FileName'\n"; + if (!$DryRun and !rmtree($FileName)) { - LogMsg "Could not delete '$FileName': $!\n"; + Error "Could not delete '$FileName': $!\n"; } } elsif ($Age > $JobPurgeDays) { - LogMsg "'$FileName' is $Age days old and should have been deleted already. It will be deleted in ", $JobPurgeDays + 7 - $Age, " day(s).\n"; + Error "'$FileName' is $Age days old and should have been deleted already. It will be deleted in ", $JobPurgeDays + 7 - $Age, " day(s).\n"; } } } + elsif ($Age >= 1) + { + Trace "Deleting '$FileName'\n"; + if (!$DryRun and !unlink $FileName) + { + # The user abandoned the submit procedure half-way through + Error "Could not delete '$FileName': $!\n"; + } + } } } else { - LogMsg "Unable to open '$DataDir/staging': $!"; + Error "Unable to open '$DataDir/staging': $!"; } # Delete obsolete record groups @@ -267,10 +322,14 @@ if ($JobPurgeDays != 0) $RecordGroups->AddFilter("Timestamp", [time() - $JobPurgeDays * 86400], "<"); foreach my $RecordGroup (@{$RecordGroups->GetItems()}) { - my $ErrMessage = $RecordGroups->DeleteItem($RecordGroup); - if (defined($ErrMessage)) + if ($DryRun) + { + Trace "Deleting RecordGroup ", $RecordGroup->Id, "\n"; + } + else { - LogMsg $ErrMessage, "\n"; + my $ErrMessage = $RecordGroups->DeleteItem($RecordGroup); + Error "$ErrMessage\n" if (defined $ErrMessage); } } } diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index 15b2b91..8827c22 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -67,7 +67,7 @@ General setup for the web site: Janitorial tasks: - Run the Janitor.pl script once per day to perform the janitorial tasks. For instance: - 0 0 * * * $HOME/tools/testbot/bin/Janitor.pl + 0 0 * * * $HOME/tools/testbot/bin/Janitor.pl --log-only - Run the CheckWineTestBot.pl script periodically to get notified in case the WineTestBot server dies. For instance: */20 * * * * $HOME/tools/testbot/scripts/CheckWineTestBot.pl

1 0

Francois Gouget : testbot: Standardize and clean up the Collections initialization.
by Alexandre Julliard 22 Mar '18

22 Mar '18

Module: tools Branch: master Commit: 3f34c82726145f4bd4f1cac4a9f5ca1cdaf32f98 URL: https://source.winehq.org/git/tools.git/?a=commit;h=3f34c82726145f4bd4f1cac… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 22 02:03:16 2018 +0100 testbot: Standardize and clean up the Collections initialization. @PropertyDescriptors does not need to be exported and it does not need to be initialized in a BEGIN block. Add documentation for the CreateXxx() functions. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Branches.pm | 25 +++++++++----- testbot/lib/WineTestBot/CGI/Sessions.pm | 40 +++++++++++++--------- testbot/lib/WineTestBot/Jobs.pm | 44 ++++++++++++++----------- testbot/lib/WineTestBot/Patches.pm | 51 ++++++++++++++++------------- testbot/lib/WineTestBot/PendingPatchSets.pm | 40 ++++++++++++---------- testbot/lib/WineTestBot/PendingPatches.pm | 28 +++++++++++----- testbot/lib/WineTestBot/RecordGroups.pm | 27 +++++++++------ testbot/lib/WineTestBot/Records.pm | 32 +++++++++--------- testbot/lib/WineTestBot/Roles.pm | 24 +++++++++----- testbot/lib/WineTestBot/Steps.pm | 44 ++++++++++++++++--------- testbot/lib/WineTestBot/StepsTasks.pm | 37 ++++++++++----------- testbot/lib/WineTestBot/Tasks.pm | 36 ++++++++++++-------- testbot/lib/WineTestBot/UserRoles.pm | 24 +++++++++----- testbot/lib/WineTestBot/Users.pm | 34 +++++++++++-------- testbot/lib/WineTestBot/VMs.pm | 45 ++++++++++++++----------- 15 files changed, 314 insertions(+), 217 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=3f34c82726145f4bd4f…

1 0

Michael Müller : bcrypt: Add support for computing/ comparing cipher tag.
by Alexandre Julliard 21 Mar '18

21 Mar '18

Module: wine Branch: master Commit: c7b46e8e3c1f91ba4e49ba7ae011006775d8b080 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7b46e8e3c1f91ba4e49ba7a… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Mar 20 20:27:09 2018 +0000 bcrypt: Add support for computing/comparing cipher tag. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 47 +++++++++++++++++++++++++++++++++++++++++++++- dlls/bcrypt/tests/bcrypt.c | 10 +++++----- 2 files changed, 51 insertions(+), 6 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 573cd37..a08eb00 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -50,6 +50,9 @@ static HINSTANCE instance; #if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) WINE_DECLARE_DEBUG_CHANNEL(winediag); +/* Not present in gnutls version < 3.0 */ +static int (*pgnutls_cipher_tag)(gnutls_cipher_hd_t handle, void * tag, size_t tag_size); + static void *libgnutls_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p##f MAKE_FUNCPTR(gnutls_cipher_decrypt2); @@ -69,6 +72,11 @@ MAKE_FUNCPTR(gnutls_perror); #define GNUTLS_CIPHER_AES_256_GCM 94 #endif +static int compat_gnutls_cipher_tag(gnutls_cipher_hd_t handle, void * tag, size_t tag_size) +{ + return GNUTLS_E_UNKNOWN_CIPHER_TYPE; +} + static void gnutls_log( int level, const char *msg ) { TRACE( "<%d> %s", level, msg ); @@ -102,6 +110,12 @@ static BOOL gnutls_initialize(void) LOAD_FUNCPTR(gnutls_perror) #undef LOAD_FUNCPTR + if (!(pgnutls_cipher_tag = wine_dlsym( libgnutls_handle, "gnutls_cipher_tag", NULL, 0 ))) + { + WARN("gnutls_cipher_tag not found\n"); + pgnutls_cipher_tag = compat_gnutls_cipher_tag; + } + if ((ret = pgnutls_global_init()) != GNUTLS_E_SUCCESS) { pgnutls_perror( ret ); @@ -1018,6 +1032,19 @@ static NTSTATUS key_decrypt( struct key *key, const UCHAR *input, ULONG input_le return STATUS_SUCCESS; } +static NTSTATUS key_get_tag( struct key *key, UCHAR *tag, ULONG len ) +{ + int ret; + + if ((ret = pgnutls_cipher_tag( key->handle, tag, len ))) + { + pgnutls_perror( ret ); + return STATUS_INTERNAL_ERROR; + } + + return STATUS_SUCCESS; +} + static NTSTATUS key_destroy( struct key *key ) { if (key->handle) pgnutls_cipher_deinit( key->handle ); @@ -1123,6 +1150,12 @@ static NTSTATUS key_decrypt( struct key *key, const UCHAR *input, ULONG input_le return STATUS_SUCCESS; } +static NTSTATUS key_get_tag( struct key *key, UCHAR *tag, ULONG len ) +{ + FIXME( "not implemented on Mac\n" ); + return STATUS_NOT_IMPLEMENTED; +} + static NTSTATUS key_destroy( struct key *key ) { if (key->ref_encrypt) CCCryptorRelease( key->ref_encrypt ); @@ -1158,6 +1191,12 @@ static NTSTATUS key_decrypt( struct key *key, const UCHAR *input, ULONG input_le return STATUS_NOT_IMPLEMENTED; } +static NTSTATUS key_get_tag( struct key *key, UCHAR *tag, ULONG len ) +{ + ERR( "support for keys not available at build time\n" ); + return STATUS_NOT_IMPLEMENTED; +} + static NTSTATUS key_destroy( struct key *key ) { ERR( "support for keys not available at build time\n" ); @@ -1311,7 +1350,7 @@ NTSTATUS WINAPI BCryptEncrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp if ((status = key_encrypt( key, input, input_len, output, output_len ))) return status; - return STATUS_SUCCESS; + return key_get_tag( key, auth_info->pbTag, auth_info->cbTag ); } if ((status = key_set_params( key, iv, iv_len ))) return status; @@ -1370,6 +1409,7 @@ NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp if (key->mode == MODE_ID_GCM) { BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO *auth_info = padding; + UCHAR tag[16]; if (!auth_info) return STATUS_INVALID_PARAMETER; if (!auth_info->pbNonce) return STATUS_INVALID_PARAMETER; @@ -1387,6 +1427,11 @@ NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp if ((status = key_decrypt( key, input, input_len, output, output_len ))) return status; + if ((status = key_get_tag( key, tag, sizeof(tag) ))) + return status; + if (memcmp( tag, auth_info->pbTag, auth_info->cbTag )) + return STATUS_AUTH_TAG_MISMATCH; + return STATUS_SUCCESS; } diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index e3cbc87..1176796 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -754,11 +754,11 @@ static void test_BCryptEncrypt(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(size == 32, "got %u\n", size); ok(!memcmp(ciphertext, expected4, sizeof(expected4)), "wrong data\n"); - todo_wine ok(!memcmp(tag, expected_tag, sizeof(expected_tag)), "wrong tag\n"); + ok(!memcmp(tag, expected_tag, sizeof(expected_tag)), "wrong tag\n"); for (i = 0; i < 32; i++) ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]); for (i = 0; i < 16; i++) - todo_wine ok(tag[i] == expected_tag[i], "%u: %02x != %02x\n", i, tag[i], expected_tag[i]); + ok(tag[i] == expected_tag[i], "%u: %02x != %02x\n", i, tag[i], expected_tag[i]); /* input size is not multiple of block size */ size = 0; @@ -769,11 +769,11 @@ static void test_BCryptEncrypt(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(size == 24, "got %u\n", size); ok(!memcmp(ciphertext, expected4, 24), "wrong data\n"); - todo_wine ok(!memcmp(tag, expected_tag2, sizeof(expected_tag2)), "wrong tag\n"); + ok(!memcmp(tag, expected_tag2, sizeof(expected_tag2)), "wrong tag\n"); for (i = 0; i < 24; i++) ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]); for (i = 0; i < 16; i++) - todo_wine ok(tag[i] == expected_tag2[i], "%u: %02x != %02x\n", i, tag[i], expected_tag2[i]); + ok(tag[i] == expected_tag2[i], "%u: %02x != %02x\n", i, tag[i], expected_tag2[i]); /* test with padding */ memcpy(ivbuf, iv, sizeof(iv)); @@ -977,7 +977,7 @@ static void test_BCryptDecrypt(void) memcpy(ivbuf, iv, sizeof(iv)); auth_info.pbTag = iv; /* wrong tag */ ret = pBCryptDecrypt(key, ciphertext4, 32, &auth_info, ivbuf, 16, plaintext, 32, &size, 0); - todo_wine ok(ret == STATUS_AUTH_TAG_MISMATCH, "got %08x\n", ret); + ok(ret == STATUS_AUTH_TAG_MISMATCH, "got %08x\n", ret); ok(size == 32, "got %u\n", size); ret = pBCryptDestroyKey(key);

1 0

Michael Müller : include: Add ecdsa and asymmetric key related bcrypt definitions.
by Alexandre Julliard 21 Mar '18

21 Mar '18

Module: wine Branch: master Commit: 1f782675302020ddf58dc7e4c3051efc9b9b5b5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f782675302020ddf58dc7e4… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Mar 20 20:27:11 2018 +0000 include: Add ecdsa and asymmetric key related bcrypt definitions. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/bcrypt.h | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/include/bcrypt.h b/include/bcrypt.h index d0b29c7..717d77c 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -61,6 +61,8 @@ typedef LONG NTSTATUS; #define BCRYPT_OPAQUE_KEY_BLOB (const WCHAR []){'O','p','a','q','u','e','K','e','y','B','l','o','b',0} #define BCRYPT_KEY_DATA_BLOB (const WCHAR []){'K','e','y','D','a','t','a','B','l','o','b',0} #define BCRYPT_AES_WRAP_KEY_BLOB (const WCHAR []){'R','f','c','3','5','6','5','K','e','y','W','r','a','p','B','l','o','b',0} +#define BCRYPT_ECCPUBLIC_BLOB (const WCHAR []){'E','C','C','P','U','B','L','I','C','B','L','O','B',0} +#define BCRYPT_ECCPRIVATE_BLOB (const WCHAR []){'E','C','C','P','R','I','V','A','T','E','B','L','O','B',0} #define MS_PRIMITIVE_PROVIDER (const WCHAR [])\ {'M','i','c','r','o','s','o','f','t',' ','P','r','i','m','i','t','i','v','e',' ','P','r','o','v','i','d','e','r',0} @@ -76,6 +78,9 @@ typedef LONG NTSTATUS; #define BCRYPT_SHA256_ALGORITHM (const WCHAR []){'S','H','A','2','5','6',0} #define BCRYPT_SHA384_ALGORITHM (const WCHAR []){'S','H','A','3','8','4',0} #define BCRYPT_SHA512_ALGORITHM (const WCHAR []){'S','H','A','5','1','2',0} +#define BCRYPT_ECDSA_P256_ALGORITHM (const WCHAR []){'E','C','D','S','A','_','P','2','5','6',0} +#define BCRYPT_ECDSA_P384_ALGORITHM (const WCHAR []){'E','C','D','S','A','_','P','3','8','4',0} +#define BCRYPT_ECDSA_P521_ALGORITHM (const WCHAR []){'E','C','D','S','A','_','P','5','2','1',0} #define BCRYPT_CHAIN_MODE_NA (const WCHAR []){'C','h','a','i','n','i','n','g','M','o','d','e','N','/','A',0} #define BCRYPT_CHAIN_MODE_CBC (const WCHAR []){'C','h','a','i','n','i','n','g','M','o','d','e','C','B','C',0} @@ -84,6 +89,13 @@ typedef LONG NTSTATUS; #define BCRYPT_CHAIN_MODE_CCM (const WCHAR []){'C','h','a','i','n','i','n','g','M','o','d','e','C','C','M',0} #define BCRYPT_CHAIN_MODE_GCM (const WCHAR []){'C','h','a','i','n','i','n','g','M','o','d','e','G','C','M',0} +#define BCRYPT_ECDSA_PUBLIC_P256_MAGIC 0x31534345 +#define BCRYPT_ECDSA_PRIVATE_P256_MAGIC 0x32534345 +#define BCRYPT_ECDSA_PUBLIC_P384_MAGIC 0x33534345 +#define BCRYPT_ECDSA_PRIVATE_P384_MAGIC 0x34534345 +#define BCRYPT_ECDSA_PUBLIC_P521_MAGIC 0x35534345 +#define BCRYPT_ECDSA_PRIVATE_P521_MAGIC 0x36534345 + typedef struct _BCRYPT_ALGORITHM_IDENTIFIER { LPWSTR pszName; @@ -115,6 +127,23 @@ typedef struct _BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO ULONG dwFlags; } BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO, *PBCRYPT_AUTHENTICATED_CIPHER_MODE_INFO; +typedef struct _BCRYPT_ECCKEY_BLOB +{ + ULONG dwMagic; + ULONG cbKey; +} BCRYPT_ECCKEY_BLOB, *PBCRYPT_ECCKEY_BLOB; + +typedef struct _BCRYPT_PKCS1_PADDING_INFO +{ + LPCWSTR pszAlgId; +} BCRYPT_PKCS1_PADDING_INFO; + +#define BCRYPT_PAD_NONE 0x00000001 +#define BCRYPT_PAD_PKCS1 0x00000002 +#define BCRYPT_PAD_OAEP 0x00000004 +#define BCRYPT_PAD_PSS 0x00000008 +#define BCRYPT_PAD_PKCS1_OPTIONAL_HASH_OID 0x00000010 + #define BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO_VERSION 1 #define BCRYPT_AUTH_MODE_CHAIN_CALLS_FLAG 0x00000001

1 0

Michael Müller : bcrypt: Allow to call BCryptSetProperty on key objects.
by Alexandre Julliard 21 Mar '18

21 Mar '18

Module: wine Branch: master Commit: 1b999a447b73d1441bb271cb11a47393d02024e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b999a447b73d1441bb271cb… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Mar 20 20:27:13 2018 +0000 bcrypt: Allow to call BCryptSetProperty on key objects. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 89 ++++++++++++++++++++++++++++++++-------------- dlls/bcrypt/tests/bcrypt.c | 4 +++ 2 files changed, 67 insertions(+), 26 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index a08eb00..cd44bdf 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -679,32 +679,6 @@ NTSTATUS WINAPI BCryptGetProperty( BCRYPT_HANDLE handle, LPCWSTR prop, UCHAR *bu } } -NTSTATUS WINAPI BCryptSetProperty( BCRYPT_HANDLE handle, const WCHAR *prop, UCHAR *value, ULONG size, ULONG flags ) -{ - struct object *object = handle; - - TRACE( "%p, %s, %p, %u, %08x\n", handle, debugstr_w(prop), value, size, flags ); - - if (!object) return STATUS_INVALID_HANDLE; - - switch (object->magic) - { - case MAGIC_ALG: - { - struct algorithm *alg = (struct algorithm *)object; - return set_alg_property( alg, prop, value, size, flags ); - } - case MAGIC_KEY: - { - FIXME( "keys not implemented yet\n" ); - return STATUS_NOT_IMPLEMENTED; - } - default: - WARN( "unknown magic %08x\n", object->magic ); - return STATUS_INVALID_HANDLE; - } -} - NTSTATUS WINAPI BCryptCreateHash( BCRYPT_ALG_HANDLE algorithm, BCRYPT_HASH_HANDLE *handle, UCHAR *object, ULONG objectlen, UCHAR *secret, ULONG secretlen, ULONG flags ) { @@ -954,6 +928,31 @@ static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *s return STATUS_SUCCESS; } +static NTSTATUS set_key_property( struct key *key, const WCHAR *prop, UCHAR *value, ULONG size, ULONG flags ) +{ + if (!strcmpW( prop, BCRYPT_CHAINING_MODE )) + { + if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_CBC, size )) + { + key->mode = MODE_ID_CBC; + return STATUS_SUCCESS; + } + else if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_GCM, size )) + { + key->mode = MODE_ID_GCM; + return STATUS_SUCCESS; + } + else + { + FIXME( "unsupported mode %s\n", debugstr_wn( (WCHAR *)value, size ) ); + return STATUS_NOT_IMPLEMENTED; + } + } + + FIXME( "unsupported key property %s\n", debugstr_w(prop) ); + return STATUS_NOT_IMPLEMENTED; +} + static gnutls_cipher_algorithm_t get_gnutls_cipher( const struct key *key ) { switch (key->alg_id) @@ -1089,6 +1088,12 @@ static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *s return STATUS_SUCCESS; } +static NTSTATUS set_key_property( struct key *key, const WCHAR *prop, UCHAR *value, ULONG size, ULONG flags ) +{ + FIXME( "not implemented on Mac\n" ); + return STATUS_NOT_IMPLEMENTED; +} + static NTSTATUS key_set_params( struct key *key, UCHAR *iv, ULONG iv_len ) { CCCryptorStatus status; @@ -1171,6 +1176,12 @@ static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *s return STATUS_NOT_IMPLEMENTED; } +static NTSTATUS set_key_property( struct key *key, const WCHAR *prop, UCHAR *value, ULONG size, ULONG flags ) +{ + ERR( "support for keys not available at build time\n" ); + return STATUS_NOT_IMPLEMENTED; +} + static NTSTATUS key_set_params( struct key *key, UCHAR *iv, ULONG iv_len ) { ERR( "support for keys not available at build time\n" ); @@ -1478,6 +1489,32 @@ NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp return status; } +NTSTATUS WINAPI BCryptSetProperty( BCRYPT_HANDLE handle, const WCHAR *prop, UCHAR *value, ULONG size, ULONG flags ) +{ + struct object *object = handle; + + TRACE( "%p, %s, %p, %u, %08x\n", handle, debugstr_w(prop), value, size, flags ); + + if (!object) return STATUS_INVALID_HANDLE; + + switch (object->magic) + { + case MAGIC_ALG: + { + struct algorithm *alg = (struct algorithm *)object; + return set_alg_property( alg, prop, value, size, flags ); + } + case MAGIC_KEY: + { + struct key *key = (struct key *)object; + return set_key_property( key, prop, value, size, flags ); + } + default: + WARN( "unknown magic %08x\n", object->magic ); + return STATUS_INVALID_HANDLE; + } +} + BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) { switch (reason) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 1176796..9922e41 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -525,6 +525,10 @@ static void test_BCryptGenerateSymmetricKey(void) sizeof(BCRYPT_CHAIN_MODE_CBC), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ret = pBCryptSetProperty(key, BCRYPT_CHAINING_MODE, (UCHAR *)BCRYPT_CHAIN_MODE_CBC, + sizeof(BCRYPT_CHAIN_MODE_CBC), 0); + ok(ret == STATUS_SUCCESS || broken(ret == STATUS_NOT_SUPPORTED) /* < Win 8 */, "got %08x\n", ret); + size = 0xdeadbeef; ret = pBCryptEncrypt(key, NULL, 0, NULL, NULL, 0, NULL, 0, &size, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret);

1 0

Nikolay Sivov : user32: Remove some misleading TODOs.
by Alexandre Julliard 21 Mar '18

21 Mar '18

Module: wine Branch: master Commit: 080cb3aa81bd678ad8e214ded3fc6e81ecbc714c URL: https://source.winehq.org/git/wine.git/?a=commit;h=080cb3aa81bd678ad8e214de… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 21 14:33:49 2018 +0300 user32: Remove some misleading TODOs. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/button.c | 16 ---------------- dlls/user32/combo.c | 2 -- dlls/user32/edit.c | 5 ----- 3 files changed, 23 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index 0f56e4e..adfb6a9 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -28,30 +28,14 @@ * - WM_SETFOCUS: For (manual or automatic) radio buttons, send the parent window BN_CLICKED * - WM_NCCREATE: Turns any BS_OWNERDRAW button into a BS_PUSHBUTTON button. * - WM_SYSKEYUP - * - BCM_GETIDEALSIZE - * - BCM_GETIMAGELIST - * - BCM_GETTEXTMARGIN - * - BCM_SETIMAGELIST - * - BCM_SETTEXTMARGIN * * Notifications - * - BCN_HOTITEMCHANGE * - BN_DISABLE * - BN_PUSHED/BN_HILITE * + BN_KILLFOCUS: is it OK? * - BN_PAINT * + BN_SETFOCUS: is it OK? * - BN_UNPUSHED/BN_UNHILITE - * - NM_CUSTOMDRAW - * - * Structures/Macros/Definitions - * - BUTTON_IMAGELIST - * - NMBCHOTITEM - * - Button_GetIdealSize - * - Button_GetImageList - * - Button_GetTextMargin - * - Button_SetImageList - * - Button_SetTextMargin */ #include <stdarg.h> diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index ef75c76..dcfa661 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * TODO: - * - ComboBox_[GS]etMinVisible() - * - CB_GETMINVISIBLE, CB_SETMINVISIBLE * - CB_SETTOPINDEX */ diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 693c58f..96ecbec 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -21,11 +21,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * TODO: - * - EDITBALLOONTIP structure - * - EM_GETCUEBANNER/Edit_GetCueBannerText - * - EM_HIDEBALLOONTIP/Edit_HideBalloonTip - * - EM_SETCUEBANNER/Edit_SetCueBannerText - * - EM_SHOWBALLOONTIP/Edit_ShowBalloonTip * - EM_GETIMESTATUS, EM_SETIMESTATUS * - EN_ALIGN_LTR_EC * - EN_ALIGN_RTL_EC

1 0

Louis Lenders : sas: Add stub dll.
by Alexandre Julliard 21 Mar '18

21 Mar '18

Module: wine Branch: master Commit: be0bae2c6b4294be6e3fb9a3b7bf2ed59081f0b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be0bae2c6b4294be6e3fb9a3… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Fri Mar 9 16:15:41 2018 +0100 sas: Add stub dll. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/sas/Makefile.in | 4 ++++ dlls/sas/main.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/sas/sas.spec | 1 + 5 files changed, 49 insertions(+) diff --git a/configure b/configure index 88ee44d..6324574 100755 --- a/configure +++ b/configure @@ -1482,6 +1482,7 @@ enable_rtutils enable_samlib enable_sane_ds enable_sapi +enable_sas enable_scarddlg enable_sccbase enable_schannel @@ -18958,6 +18959,7 @@ wine_fn_config_makefile dlls/samlib enable_samlib wine_fn_config_makefile dlls/sane.ds enable_sane_ds wine_fn_config_makefile dlls/sapi enable_sapi wine_fn_config_makefile dlls/sapi/tests enable_tests +wine_fn_config_makefile dlls/sas enable_sas wine_fn_config_makefile dlls/scarddlg enable_scarddlg wine_fn_config_makefile dlls/sccbase enable_sccbase wine_fn_config_makefile dlls/schannel enable_schannel diff --git a/configure.ac b/configure.ac index b6c94a5..6a30601 100644 --- a/configure.ac +++ b/configure.ac @@ -3583,6 +3583,7 @@ WINE_CONFIG_MAKEFILE(dlls/samlib) WINE_CONFIG_MAKEFILE(dlls/sane.ds) WINE_CONFIG_MAKEFILE(dlls/sapi) WINE_CONFIG_MAKEFILE(dlls/sapi/tests) +WINE_CONFIG_MAKEFILE(dlls/sas) WINE_CONFIG_MAKEFILE(dlls/scarddlg) WINE_CONFIG_MAKEFILE(dlls/sccbase) WINE_CONFIG_MAKEFILE(dlls/schannel) diff --git a/dlls/sas/Makefile.in b/dlls/sas/Makefile.in new file mode 100644 index 0000000..aa76b59 --- /dev/null +++ b/dlls/sas/Makefile.in @@ -0,0 +1,4 @@ +MODULE = sas.dll + +C_SRCS = \ + main.c diff --git a/dlls/sas/main.c b/dlls/sas/main.c new file mode 100644 index 0000000..1a2017d --- /dev/null +++ b/dlls/sas/main.c @@ -0,0 +1,41 @@ +/* + * Copyright 2018 Louis Lenders + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(sas); + +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD reason, LPVOID lpv) +{ + TRACE("(%p, %d, %p)\n", hInstDLL, reason, lpv); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hInstDLL); + break; + } + return TRUE; +} diff --git a/dlls/sas/sas.spec b/dlls/sas/sas.spec new file mode 100644 index 0000000..9af3cd3 --- /dev/null +++ b/dlls/sas/sas.spec @@ -0,0 +1 @@ +@ stub SendSAS

1 0