wine-commits November 2012

wine-commits@winehq.org

2 participants
708 discussions

Juan Lang : Revert "crypt32: Correct CryptVerifyMessageSignature' s use of pcbDecoded.".
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: wine Branch: master Commit: 1040e4151642a89ef1f5c3025f00933dd812becc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1040e4151642a89ef1f5c3025… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 1 20:28:30 2012 -0700 Revert "crypt32: Correct CryptVerifyMessageSignature's use of pcbDecoded.". This reverts commit 78c901586193d20092e992a460f00f4070c67ae9. The comments in the tests indicate that the tests are a little funny anyway, so they clearly weren't enough justification for the change introduced here. --- dlls/crypt32/message.c | 17 +++-------------- dlls/crypt32/tests/message.c | 1 + 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/dlls/crypt32/message.c b/dlls/crypt32/message.c index 8668cb1..7e163de 100644 --- a/dlls/crypt32/message.c +++ b/dlls/crypt32/message.c @@ -210,6 +210,9 @@ BOOL WINAPI CryptVerifyMessageSignature(PCRYPT_VERIFY_MESSAGE_PARA pVerifyPara, if (msg) { ret = CryptMsgUpdate(msg, pbSignedBlob, cbSignedBlob, TRUE); + if (ret && pcbDecoded) + ret = CryptMsgGetParam(msg, CMSG_CONTENT_PARAM, 0, pbDecoded, + pcbDecoded); if (ret) { CERT_INFO *certInfo = CRYPT_GetSignerCertInfoFromMsg(msg, @@ -241,20 +244,6 @@ BOOL WINAPI CryptVerifyMessageSignature(PCRYPT_VERIFY_MESSAGE_PARA pVerifyPara, } CryptMemFree(certInfo); } - if (ret) - { - /* The caller is expected to pass a valid pointer to pcbDecoded - * when the message verifies successfully. - */ - if (pcbDecoded) - ret = CryptMsgGetParam(msg, CMSG_CONTENT_PARAM, 0, pbDecoded, - pcbDecoded); - else - { - SetLastError(CRYPT_E_NOT_FOUND); - ret = FALSE; - } - } CryptMsgClose(msg); } if(!ret && pcbDecoded) diff --git a/dlls/crypt32/tests/message.c b/dlls/crypt32/tests/message.c index be3a03b..7e2e8aa 100644 --- a/dlls/crypt32/tests/message.c +++ b/dlls/crypt32/tests/message.c @@ -608,6 +608,7 @@ static void test_verify_message_signature(void) ret = CryptVerifyMessageSignature(&para, 0, signedWithCertWithValidPubKeyContent, sizeof(signedWithCertWithValidPubKeyContent), NULL, 0, NULL); + todo_wine ok(!ret, "Expected failure\n"); /* Finally, a message signed with a valid public key verifies successfully */

1 0

Juan Lang : rsaenh: Ensure a PKCS1 data block has at least minimum length.
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: wine Branch: master Commit: 373e472db99bda0ec1e9656b3629a3836241b86d URL: http://source.winehq.org/git/wine.git/?a=commit;h=373e472db99bda0ec1e9656b3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Feb 1 10:19:48 2012 -0800 rsaenh: Ensure a PKCS1 data block has at least minimum length. --- dlls/rsaenh/rsaenh.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 9d38793..a428cc7 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -1697,6 +1697,11 @@ static BOOL unpad_data(CONST BYTE *abData, DWORD dwDataLen, BYTE *abBuffer, DWOR { DWORD i; + if (dwDataLen < 3) + { + SetLastError(NTE_BAD_DATA); + return FALSE; + } for (i=2; i<dwDataLen; i++) if (!abData[i]) break;

1 0

Francois Gouget : winemenubuilder: Return the icon identifier instead of the full path on Mac OS X too.
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: wine Branch: master Commit: ed04a730f90ae9c91556e4aa20e0fe3e272c1931 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed04a730f90ae9c91556e4aa2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 1 23:21:00 2012 +0100 winemenubuilder: Return the icon identifier instead of the full path on Mac OS X too. --- programs/winemenubuilder/winemenubuilder.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 8c941e2..5a5789f 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1223,10 +1223,7 @@ static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, LPCWSTR ico end: HeapFree(GetProcessHeap(), 0, iconDirEntries); - if (SUCCEEDED(hr)) - *nativeIdentifier = icnsPath; - else - HeapFree(GetProcessHeap(), 0, icnsPath); + HeapFree(GetProcessHeap(), 0, icnsPath); return hr; } #else

1 0

Francois Gouget : winemenubuilder: Use the same icon name on Mac OS X as on Unix.
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: wine Branch: master Commit: 712b3571be129feb32fbd947071d914ceab4995b URL: http://source.winehq.org/git/wine.git/?a=commit;h=712b3571be129feb32fbd9470… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 1 23:20:13 2012 +0100 winemenubuilder: Use the same icon name on Mac OS X as on Unix. --- programs/winemenubuilder/winemenubuilder.c | 82 ++++++++++++---------------- 1 files changed, 36 insertions(+), 46 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 96ec29d..8c941e2 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -199,7 +199,6 @@ static WCHAR* assoc_query(ASSOCSTR assocStr, LPCWSTR name, LPCWSTR extra); static HRESULT open_icon(LPCWSTR filename, int index, BOOL bWait, IStream **ppStream); /* Utility routines */ -#ifndef __APPLE__ static unsigned short crc16(const char* string) { unsigned short crc = 0; @@ -218,7 +217,6 @@ static unsigned short crc16(const char* string) } return crc; } -#endif static char *strdupA( const char *str ) { @@ -1069,6 +1067,35 @@ static HRESULT open_icon(LPCWSTR filename, int index, BOOL bWait, IStream **ppSt return hr; } +static char* compute_native_identifier(int exeIndex, LPCWSTR icoPathW) +{ + char* nativeIdentifier; + char *icoPathA; + unsigned short crc; + char *basename, *ext; + + icoPathA = wchars_to_utf8_chars(icoPathW); + if (icoPathA == NULL) + return NULL; + + crc = crc16(icoPathA); + basename = strrchr(icoPathA, '\\'); + if (basename == NULL) + basename = icoPathA; + else + { + *basename = 0; + basename++; + } + ext = strrchr(basename, '.'); + if (ext) + *ext = 0; + + nativeIdentifier = heap_printf("%04X_%s.%d", crc, basename, exeIndex); + HeapFree(GetProcessHeap(), 0, icoPathA); + return nativeIdentifier; +} + #ifdef __APPLE__ #define ICNS_SLOTS 6 @@ -1102,9 +1129,6 @@ static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, LPCWSTR ico } best[ICNS_SLOTS]; int indexes[ICNS_SLOTS]; int i; - GUID guid; - WCHAR *guidStrW = NULL; - char *guidStrA = NULL; char *icnsPath = NULL; LARGE_INTEGER zero; HRESULT hr; @@ -1165,26 +1189,16 @@ static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, LPCWSTR ico } } - hr = CoCreateGuid(&guid); - if (FAILED(hr)) - { - WINE_WARN("CoCreateGuid failed, error 0x%08X\n", hr); - goto end; - } - hr = StringFromCLSID(&guid, &guidStrW); - if (FAILED(hr)) - { - WINE_WARN("StringFromCLSID failed, error 0x%08X\n", hr); - goto end; - } - guidStrA = wchars_to_utf8_chars(guidStrW); - if (guidStrA == NULL) + if (destFilename) + *nativeIdentifier = heap_printf("%s", destFilename); + else + *nativeIdentifier = compute_native_identifier(exeIndex, icoPathW); + if (*nativeIdentifier == NULL) { hr = E_OUTOFMEMORY; - WINE_WARN("out of memory converting GUID string\n"); goto end; } - icnsPath = heap_printf("/tmp/%s.icns", guidStrA); + icnsPath = heap_printf("/tmp/%s.icns", *nativeIdentifier); if (icnsPath == NULL) { hr = E_OUTOFMEMORY; @@ -1209,8 +1223,6 @@ static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, LPCWSTR ico end: HeapFree(GetProcessHeap(), 0, iconDirEntries); - CoTaskMemFree(guidStrW); - HeapFree(GetProcessHeap(), 0, guidStrA); if (SUCCEEDED(hr)) *nativeIdentifier = icnsPath; else @@ -1244,10 +1256,7 @@ static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, LPCWSTR ico ICONDIRENTRY *iconDirEntries = NULL; int numEntries; int i; - char *icoPathA = NULL; char *iconsDir = NULL; - unsigned short crc; - char *p, *q; HRESULT hr = S_OK; LARGE_INTEGER zero; @@ -1255,28 +1264,10 @@ static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, LPCWSTR ico if (FAILED(hr)) goto end; - icoPathA = wchars_to_utf8_chars(icoPathW); - if (icoPathA == NULL) - { - hr = E_OUTOFMEMORY; - goto end; - } - crc = crc16(icoPathA); - p = strrchr(icoPathA, '\\'); - if (p == NULL) - p = icoPathA; - else - { - *p = 0; - p++; - } - q = strrchr(p, '.'); - if (q) - *q = 0; if (destFilename) *nativeIdentifier = heap_printf("%s", destFilename); else - *nativeIdentifier = heap_printf("%04X_%s.%d", crc, p, exeIndex); + *nativeIdentifier = compute_native_identifier(exeIndex, icoPathW); if (*nativeIdentifier == NULL) { hr = E_OUTOFMEMORY; @@ -1353,7 +1344,6 @@ static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, LPCWSTR ico end: HeapFree(GetProcessHeap(), 0, iconDirEntries); - HeapFree(GetProcessHeap(), 0, icoPathA); HeapFree(GetProcessHeap(), 0, iconsDir); return hr; }

1 0

Francois Gouget : testbot/lib: Fix job cancellation so a rescheduling happens in short order.
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: tools Branch: master Commit: 138a6920df88a81f505449309f9ac7aa32ba44a0 URL: http://source.winehq.org/git/tools.git/?a=commit;h=138a6920df88a81f50544930… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 2 00:11:58 2012 +0100 testbot/lib: Fix job cancellation so a rescheduling happens in short order. Previously testbot would only be noticing cancelled jobs through the SafetyNet() function which is called every 10 minutes by default. Now we wait a couple of seconds for the SIGTERM to be served to the child process and then rechedule so other tasks can start. --- testbot/bin/Engine.pl | 11 +++++++++++ testbot/lib/WineTestBot/Jobs.pm | 39 ++++++++++++++------------------------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 1cc8a9b..f9be03a 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -153,6 +153,17 @@ sub HandleJobCancel return "0$ErrMessage"; } + # Wait a couple of seconds before rescheduling so the child processes have + # the time to die. + AddEvent("JobCancel$JobKey", 2, 0, sub { + $Job->UpdateStatus(); + $ErrMessage = ScheduleJobs(); + if (defined($ErrMessage)) + { + LogMsg "Scheduling problem in HandleJobCancel: $ErrMessage\n"; + } + }); + return "1OK"; } diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 74547d2..c15c7af 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -179,39 +179,28 @@ sub Cancel { my $self = shift; - foreach my $Step (@{$self->Steps->GetItems()}) + my $Steps = $self->Steps; + $Steps->AddFilter("Status", ["queued", "running"]); + foreach my $Step (@{$Steps->GetItems()}) { - my $Status = $Step->Status; - if ($Status eq "queued" || $Status eq "running") + my $Tasks = $Step->Tasks; + $Tasks->AddFilter("Status", ["queued", "running"]); + foreach my $Task (@{$Tasks->GetItems()}) { - foreach my $Task (@{$Step->Tasks->GetItems()}) + if ($Task->Status eq "queued") { - if ($Task->Status eq "queued") - { - $Task->Status("skipped"); - $Task->Save(); - } + $Task->Status("skipped"); + $Task->Save(); } - } - } - - foreach my $Step (@{$self->Steps->GetItems()}) - { - my $Status = $Step->Status; - if ($Status eq "queued" || $Status eq "running") - { - foreach my $Task (@{$Step->Tasks->GetItems()}) + elsif (defined $Task->ChildPid) { - if ($Task->Status eq "running") - { - if (defined($Task->ChildPid)) - { - kill "TERM", $Task->ChildPid; - } - } + # We don't unset ChildPid so Task::UpdateStatus() + # will add a trace in the log + kill("TERM", $Task->ChildPid); } } } + # Let the higher layers handle updating the overall job status return undef; }

1 0

Francois Gouget : testbot/lib: Turn the Jobs::Schedule() and Jobs::Check() methods into functions.
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: tools Branch: master Commit: 73c62ab7dc4bafb83bfc676b018b5db55e5edd3a URL: http://source.winehq.org/git/tools.git/?a=commit;h=73c62ab7dc4bafb83bfc676b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 2 00:11:12 2012 +0100 testbot/lib: Turn the Jobs::Schedule() and Jobs::Check() methods into functions. Their typical usage pattern shows there is no reason for them to be methods. This even more true for Check() since it modifies the object it is called on. --- testbot/bin/Engine.pl | 15 ++++------- testbot/lib/WineTestBot/Jobs.pm | 46 ++++++++++++++++------------------- testbot/lib/WineTestBot/Patches.pm | 6 ++-- 3 files changed, 30 insertions(+), 37 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 7bd14a1..1cc8a9b 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -81,7 +81,7 @@ sub HandleJobSubmit } } - $ErrMessage = $Jobs->Schedule(); + $ErrMessage = ScheduleJobs(); if (defined($ErrMessage)) { LogMsg "Scheduling problem in HandleJobSubmit: $ErrMessage\n"; @@ -158,7 +158,7 @@ sub HandleJobCancel sub HandleTaskComplete { - my $ErrMessage = CreateJobs()->Schedule(); + my $ErrMessage = ScheduleJobs(); if (defined($ErrMessage)) { LogMsg "Scheduling problem in HandleTaskComplete: $ErrMessage\n"; @@ -180,7 +180,7 @@ sub HandleVMStatusChange if ($OldStatus eq "reverting" || $OldStatus eq "running" || $NewStatus eq "idle" || $NewStatus eq "dirty") { - my $ErrMessage = CreateJobs()->Schedule(); + my $ErrMessage = ScheduleJobs(); if (defined($ErrMessage)) { LogMsg "Scheduling problem in HandleVMStatusChange: $ErrMessage\n"; @@ -266,7 +266,7 @@ sub HandleFoundWinetestUpdate DeleteEvent("GiveUpOnWinetestUpdate"); } - my $ErrMessage = CreateJobs()->Schedule(); + my $ErrMessage = ScheduleJobs(); if (defined($ErrMessage)) { LogMsg "Scheduling problem in HandleFoundWinetestUpdate: $ErrMessage\n"; @@ -511,11 +511,8 @@ checks whether any pending patchsets are now complete and thus can be scheduled. sub SafetyNet { - my $Jobs = CreateJobs(); - $Jobs->Check(); - $Jobs = undef; - $Jobs = CreateJobs(); - $Jobs->Schedule(); + CheckJobs(); + ScheduleJobs(); if (opendir STAGING, "$DataDir/staging") { diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 649f3ca..74547d2 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -277,7 +277,7 @@ use vars qw(@ISA @EXPORT @PropertyDescriptors); require Exporter; @ISA = qw(WineTestBot::WineTestBotCollection Exporter); -@EXPORT = qw(&CreateJobs); +@EXPORT = qw(&CreateJobs &ScheduleJobs &CheckJobs); my @PropertyDescriptors; @@ -374,10 +374,9 @@ VM. =back =cut -sub ScheduleOnHost +sub ScheduleOnHost($$) { - my $self = shift; - my $Hypervisors = $_[0]; + my ($SortedJobs, $Hypervisors) = @_; my $HostVMs = CreateVMs(); $HostVMs->FilterHypervisor($Hypervisors); @@ -385,11 +384,8 @@ sub ScheduleOnHost my $PoweredOnNonBaseVMs = $HostVMs->CountPoweredOnNonBaseVMs(); my %DirtyVMsBlockingJobs; - $self->AddFilter("Status", ["queued", "running"]); - my @SortedJobs = sort CompareJobPriority @{$self->GetItems()}; - my $DirtyIndex = 0; - foreach my $Job (@SortedJobs) + foreach my $Job (@$SortedJobs) { my $Steps = $Job->Steps; $Steps->AddFilter("Status", ["queued", "running"]); @@ -489,7 +485,7 @@ sub ScheduleOnHost =pod =over 12 -=item C<Schedule()> +=item C<ScheduleJobs()> Goes through the WineTestBot hosts and schedules the Job tasks on each of them using WineTestBot::Jobs::ScheduleOnHost(). @@ -497,9 +493,13 @@ them using WineTestBot::Jobs::ScheduleOnHost(). =back =cut -sub Schedule +sub ScheduleJobs() { - my $self = shift; + my $Jobs = CreateJobs(); + $Jobs->AddFilter("Status", ["queued", "running"]); + my @SortedJobs = sort CompareJobPriority @{$Jobs->GetItems()}; + # Note that even if there are no jobs to schedule + # we should check if there are VMs to revert my %Hosts; foreach my $VM (@{CreateVMs()->GetItems()}) @@ -507,24 +507,21 @@ sub Schedule my $Host = $VM->GetHost(); $Hosts{$Host}->{$VM->VirtURI} = 1; } - my $ErrMessage; + + my @ErrMessages; foreach my $Host (keys %Hosts) { my @HostHypervisors = keys %{$Hosts{$Host}}; - my $HostErrMessage = $self->ScheduleOnHost(\@HostHypervisors); - if (! defined($ErrMessage)) - { - $ErrMessage = $HostErrMessage; - } + my $HostErrMessage = ScheduleOnHost(\@SortedJobs, \@HostHypervisors); + push @ErrMessages, $HostErrMessage if (defined $HostErrMessage); } - - return $ErrMessage; + return @ErrMessages ? join("\n", @ErrMessages) : undef; } =pod =over 12 -=item C<Check()> +=item C<CheckJobs()> Goes through the list of Jobs and updates their status. As a side-effect this detects failed builds, dead child processes, etc. @@ -532,12 +529,11 @@ detects failed builds, dead child processes, etc. =back =cut -sub Check +sub CheckJobs() { - my $self = shift; - - $self->AddFilter("Status", ["queued", "running"]); - map { $_->UpdateStatus(); } @{$self->GetItems()}; + my $Jobs = CreateJobs(); + $Jobs->AddFilter("Status", ["queued", "running"]); + map { $_->UpdateStatus(); } @{$Jobs->GetItems()}; return undef; } diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 2852242..232e767 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -110,7 +110,7 @@ Analyzes the current patch to determine which Wine tests are impacted. Then for each impacted test it creates a high priority WineTestBot::Job to run that test. This also creates the WineTestBot::Step objects for that Job, as well as the WineTestBot::Task objects to run the test on each 'base' VM. Finally it calls -C<WineTestBot::Jobs::Schedule()> to run the new Jobs. +C<WineTestBot::Jobs::ScheduleJobs()> to run the new Jobs. Note that the path to the file containing the actual patch is passed as a parameter. This is used to apply a combined patch for patch series. See @@ -187,7 +187,7 @@ sub Submit my $First = 1; foreach my $BaseName (keys %Targets) { - my $Jobs = WineTestBot::Jobs::CreateJobs(); + my $Jobs = CreateJobs(); # Create a new job for this patch my $NewJob = $Jobs->Add(); @@ -283,7 +283,7 @@ sub Submit } $self->Disposition($Disposition); - WineTestBot::Jobs::CreateJobs()->Schedule(); + ScheduleJobs(); return undef; }

1 0

Francois Gouget : testbot: Fix the Job and Step status update.
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: tools Branch: master Commit: 4c266ab9e904222186b0fae0c28b190b80d22ce1 URL: http://source.winehq.org/git/tools.git/?a=commit;h=4c266ab9e904222186b0fae0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 2 00:11:00 2012 +0100 testbot: Fix the Job and Step status update. A job that has a non-build step fail should still be marked as failed. That's because when there are test failures the TestFailures field gets set to a non-zero value but the task's Status is still set to completed. So a failed Step really reflects a bot error. Also simplify the code and avoid duplicating the UpdateStatus() logic in the Check() method. --- testbot/lib/WineTestBot/Jobs.pm | 253 +++++++------------------------------- testbot/lib/WineTestBot/Steps.pm | 36 ++++++ testbot/lib/WineTestBot/Tasks.pm | 43 +++++++ 3 files changed, 125 insertions(+), 207 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=4c266ab9e904222186b0…

1 0

Francois Gouget : tesbot/ddl: Allow up to 128 characters for the job titles (aka Remarks).
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: tools Branch: master Commit: 577c3452e53e57f6838cf29cdbebfc7541e3fff3 URL: http://source.winehq.org/git/tools.git/?a=commit;h=577c3452e53e57f6838cf29c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 2 00:08:35 2012 +0100 tesbot/ddl: Allow up to 128 characters for the job titles (aka Remarks). --- testbot/ddl/update19.sql | 4 ++++ testbot/ddl/winetestbot.sql | 2 +- testbot/lib/WineTestBot/Jobs.pm | 2 +- testbot/web/Submit.pl | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/testbot/ddl/update19.sql b/testbot/ddl/update19.sql new file mode 100644 index 0000000..ca2d462 --- /dev/null +++ b/testbot/ddl/update19.sql @@ -0,0 +1,4 @@ +USE winetestbot; + +ALTER TABLE Jobs + MODIFY Remarks VARCHAR(128) NULL; diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql index 75e3318..bd06ec8 100644 --- a/testbot/ddl/winetestbot.sql +++ b/testbot/ddl/winetestbot.sql @@ -110,7 +110,7 @@ CREATE TABLE Jobs UserName VARCHAR(40) NOT NULL, Priority INT(1) NOT NULL, Status ENUM('queued', 'running', 'completed', 'failed') NOT NULL, - Remarks VARCHAR(50) NULL, + Remarks VARCHAR(128) NULL, Submitted DATETIME NULL, Ended DATETIME NULL, PatchId INT(7) NULL, diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index f4be9dc..e1401be 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -325,7 +325,7 @@ BEGIN CreateItemrefPropertyDescriptor("User", "Author", !1, 1, \&WineTestBot::Users::CreateUsers, ["UserName"]), CreateBasicPropertyDescriptor("Priority", "Priority", !1, 1, "N", 1), CreateEnumPropertyDescriptor("Status", "Status", !1, 1, ['queued', 'running', 'completed', 'failed']), - CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, !1, "A", 50), + CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, !1, "A", 128), CreateBasicPropertyDescriptor("Submitted", "Submitted", !1, !1, "DT", 19), CreateBasicPropertyDescriptor("Ended", "Ended", !1, !1, "DT", 19), CreateItemrefPropertyDescriptor("Patch", "Submitted from patch", !1, !1, \&WineTestBot::Patches::CreatePatches, ["PatchId"]), diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index d774b9a..56e542d 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -42,7 +42,7 @@ sub _initialize $self->{Page} = $self->GetParam("Page") || 1; my @PropertyDescriptors1 = ( - CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, !1, "A", 50), + CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, !1, "A", 128), ); $self->{PropertyDescriptors1} = \@PropertyDescriptors1;

1 0

Nozomi Kodama : d3dx9_36: Add tests for D3DXSHRotateZ.
by Alexandre Julliard 01 Nov '12

01 Nov '12

Module: wine Branch: master Commit: c59efbed77882fa549b03acd63263456ef581527 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c59efbed77882fa549b03acd6… Author: Nozomi Kodama <nozomi.kodama(a)yahoo.com> Date: Tue Oct 30 18:37:10 2012 -1000 d3dx9_36: Add tests for D3DXSHRotateZ. --- dlls/d3dx9_36/tests/math.c | 138 ++++++++++++++++++++++++++++++++------------ 1 files changed, 100 insertions(+), 38 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index a066ea8..533c6d7 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2784,49 +2784,111 @@ static void test_D3DXSHRotate(void) static void test_D3DXSHRotateZ(void) { - unsigned int i, j, order, square; - FLOAT angle[] = { D3DX_PI / 3.0f, -D3DX_PI / 3.0f, 4.0f * D3DX_PI / 3.0f, }, expected, in[49], out[49], *received_ptr, table[] = - { /* Angle = D3DX_PI / 3.0f */ - 1.01f, 4.477762f, 3.010000f, 0.264289f, 5.297888f, 9.941864f, 7.010000f, -1.199813f, - -8.843789f, -10.010002f, 7.494040f, 18.138016f, 13.010000, -3.395966f, -17.039942f, - -16.009998f, -30.164297f, -18.010004f, 10.422242f, 29.066219f, 21.010000f, -6.324171f, - -27.968145f, -24.009998f, 2.226099f, -18.180565, -43.824551f, -28.010004f, 14.082493f, - 42.726471f, 31.010000f, -9.984426f, -41.628399f, -34.009995f, 5.886358f, 40.530331f, - /* Angle = D3DX_PI / 3.0f */ - 1.01f, -2.467762f, 3.010000f, 3.745711f, -10.307890f, -3.931864f, 7.010000f, 9.209813f, - -0.166214f, -10.010002f, -18.504044f, -6.128017f, 13.010000f, 17.405966f, 2.029938f, - -16.009998f, 13.154303f, -18.010004f, -29.432247f, -9.056221f, 21.010000f, 28.334169f, - 4.958139f, -24.010002f, -27.236092f, 44.190582f, 16.814558f, -28.009996f, -43.092499f, - -12.716474f, 31.010000f, 41.994423f, 8.618393f, -34.010002f, -40.896347f, -4.520310f, - /* Angle = 4.0f * D3DX_PI / 3.0f */ - 1.01f, -4.477762f, 3.010000f, -0.264289f, 5.297887f, -9.941864f, 7.010000f, 1.199814f, - -8.843788f, 10.010004f, 7.494038f, -18.138016f, 13.010000f, 3.395967f, -17.039940f, - 16.009996f, -30.164293f, 18.010006f, 10.422239f, -29.066219f, 21.010000f, 6.324172f, - -27.968143f, 24.009993f, 2.226105f, 18.180552f, -43.824543f, 28.010008f, 14.082489f, - -42.726471f, 31.010000f, 9.984427f, -41.628399f, 34.009987f, 5.886366f, -40.530327, }; + unsigned int end, i, j, l, order, square; + FLOAT expected, in[49], out[49], *out_temp, *received_ptr; + const FLOAT angle[] = { D3DX_PI / 3.0f, -D3DX_PI / 3.0f, 4.0f * D3DX_PI / 3.0f, }, table[] = + { /* Angle = D3DX_PI / 3.0f */ + 1.01f, 4.477762f, 3.010000f, 0.264289f, 5.297888f, 9.941864f, + 7.010000f, -1.199813f, -8.843789f, -10.010002f, 7.494040f, 18.138016f, + 13.010000, -3.395966f, -17.039942f, -16.009998f, -30.164297f, -18.010004f, + 10.422242f, 29.066219f, 21.010000f, -6.324171f, -27.968145f, -24.009998f, + 2.226099f, -18.180565, -43.824551f, -28.010004f, 14.082493f, 42.726471f, + 31.010000f, -9.984426f, -41.628399f, -34.009995f, 5.886358f, 40.530331f, + + 1.01f, 4.477762f, 0.0f, -5.816784f, 5.297888f, 6.936864f, + 0.0f, -9.011250f, -2.294052f, -10.010002f, 12.999042f, 12.133017f, + 0.0f, -15.761250f, -5.628748f, 0.0f, -30.164297f, 0.0f, + 19.927244f, 19.061220f, 0.0f, -24.761251f, -8.628748f, 0.0f, + -13.061530f, -18.180565f, -30.319553f, 0.0f, 28.587496f, 27.721474f, + 0.0f, -36.011253f, -12.378746f, 0.0f, -13.128758f, -23.617250f, + + 1.010000f, 3.977762f, 3.977762f, 1.114195f, 7.245791f, 10.559759f, + 10.559759f, -0.995160f, -0.467341f, 0.467339f, 12.765371f, 18.515701f, + 18.515701f, -1.797287f, 0.493916f, -0.493916f, -21.412342f, 21.412338f, + 9.221072f, 23.671757f, 23.671757f, 3.850195f, -20.468727f, 20.468723f, + -10.662103f, -36.516628f, -12.061245f, 12.061240f, 22.556875f, 38.999908f, + 38.999908f, -0.034875f, -10.427902f, 10.427900f, -36.838284f, -27.652803f, + /* Angle = -D3DX_PI / 3.0f */ + 1.01f, -2.467762f, 3.010000f, 3.745711f, -10.307890f, -3.931864f, + 7.010000f, 9.209813f, -0.166214f, -10.010002f, -18.504044f, -6.128017f, + 13.010000f, 17.405966f, 2.029938f, -16.009998f, 13.154303f, -18.010004f, + -29.432247f, -9.056221f, 21.010000f, 28.334169f, 4.958139f, -24.010002f, + -27.236092f, 44.190582f, 16.814558f, -28.009996f, -43.092499f, -12.716474f, + 31.010000f, 41.994423f, 8.618393f, -34.010002f, -40.896347f, -4.520310f, + + 1.01f, -2.467762f, 0.0f, -3.205718f, -10.307890f, -6.936864f, + 0.0f, -9.011250f, -4.463446f, -10.009998f, -12.999042f, -12.133017f, + 0.0f, -15.761250f, -5.628748f, 0.0f, 13.154303f, 0.0f, + -19.927244f, -19.061220f, 0.0f, -24.761251f, -8.628748f, 0.0f, + -5.695983f, 44.190582f, 30.319553f, 0.0f, -28.587496f, -27.721474f, + 0.0f, -36.011253f, -12.378746f, 0.0f, -13.128758f, -57.405258f, + + 1.010000f, -2.967762f, -2.967762f, -0.609195f, -7.498291f, -10.686009f, + -10.686009f, -11.836716f, 5.390780f, -5.390779f, -10.303651f, -17.284842f, + -17.284842f, -17.565643f, 4.114273f, -4.114273f, 23.716436f, -23.716433f, + -8.069025f, -23.095732f, -23.095732f, -18.535847f, -11.271107f, 11.271104f, + -2.072484f, 30.149330f, 15.244893f, -15.244888f, -20.965050f, -38.203999f, + -38.203999f, -37.258266f, 5.426677f, -5.426679f, -23.396751f, -9.903559f, + /* Angle = 4.0f * D3DX_PI / 3.0f */ + 1.01f, -4.477762f, 3.010000f, -0.264289f, 5.297887f, -9.941864f, + 7.010000f, 1.199814f, -8.843788f, 10.010004f, 7.494038f, -18.138016f, + 13.010000f, 3.395967f, -17.039940f, 16.009996f, -30.164293f, 18.010006f, + 10.422239f, -29.066219f, 21.010000f, 6.324172f, -27.968143f, 24.009993f, + 2.226105f, 18.180552f, -43.824543f, 28.010008f, 14.082489f, -42.726471f, + 31.010000f, 9.984427f, -41.628399f, 34.009987f, 5.886366f, -40.530327f, + + 1.01f, -4.477762f, 0.0f, -1.938928f, 5.297887f, -6.936864f, + 0.0f, -3.003751f, -2.294051f, 10.010004f, 12.999040f, -12.133017f, + 0.0f, -5.253751f, -5.628747f, 0.0f, -30.164293f, 0.0f, + 19.927242f, -19.061220f, 0.0f, -8.253753f, -8.628746f, 0.0f, + -13.061535f, 18.180552f, -30.319553f, 0.0f, 28.587492f, -27.721474f, + 0.0f, -12.003753f, -12.378742f, 0.0f, -13.128765f, -7.872400f, + + 1.010000f, -3.977762f, -3.977762f, 2.863566f, 6.371104f, -10.122416f, + -10.122416f, 10.578746f, -7.769295f, -7.769290f, 16.883686f, -20.574858f, + -20.574858f, 24.909130f, -5.726166f, -5.726164f, -18.796221f, -18.796211f, + 29.325350f, -33.723892f, -33.723892f, 42.258442f, -4.851232f, -4.851226f, + -2.533393f, 32.452259f, -46.545670f, -46.545654f, 51.860325f, -53.651630f, + -53.651630f, 71.738174f, 4.440616f, 4.440629f, 25.884174f, -10.748116f, }; + + for (l = 0; l < 3; l++) + { + if (l == 0) + out_temp = out; + else + out_temp = &in[l - 1]; - for (i = 0; i < 49; i++) - in[i] = i + 1.01f; + if (l < 2) + end = 49; + else + end = 48; - for (j = 0; j < 3; j++) - { - for (order = 0; order <= D3DXSH_MAXORDER + 1; order++) + for (j = 0; j < 3; j++) { - for (i = 0; i < 49; i++) - out[i] = ( i + 1.0f ) * ( i + 1.0f ); + for (order = 0; order <= D3DXSH_MAXORDER + 1; order++) + { + for (i = 0; i < 49; i++) + { + out[i] = ( i + 1.0f ) * ( i + 1.0f ); + in[i] = i + 1.01f; + } - received_ptr = D3DXSHRotateZ(out, order, angle[j], in); - ok(received_ptr == out, "angle %f, order %u, Expected %p, received %p\n", angle[j], order, out, received_ptr); + received_ptr = D3DXSHRotateZ(out_temp, order, angle[j], in); + ok(received_ptr == out_temp, "angle %f, order %u, expected %p, received %p\n", angle[j], order, out_temp, received_ptr); - for (i = 0; i < 49; i++) - { - /* order = 0 or order = 1 behaves like order = D3DXSH_MINORDER */ - square = ( order <= D3DXSH_MINORDER ) ? D3DXSH_MINORDER * D3DXSH_MINORDER : order * order; - if ( i >= square || ( (order >= D3DXSH_MAXORDER) && ( i >= D3DXSH_MAXORDER * D3DXSH_MAXORDER ) ) ) - expected = ( i + 1.0f ) * ( i + 1.0f ); - else - expected = table[36 * j + i]; - ok(relative_error(out[i], expected) < admitted_error, "angle %f, order %u index %u, Expected %f, received %f\n", angle[j], order, i, expected, out[i]); + for (i = 0; i < end; i++) + { + /* order = 0 or order = 1 behaves like order = D3DXSH_MINORDER */ + square = (order <= D3DXSH_MINORDER) ? D3DXSH_MINORDER * D3DXSH_MINORDER : order * order; + if (i >= square || ((order >= D3DXSH_MAXORDER) && (i >= D3DXSH_MAXORDER * D3DXSH_MAXORDER))) + if (l > 0) + expected = i + l + 0.01f; + else + expected = ( i + 1.0f ) * ( i + 1.0f ); + else + expected = table[36 * (l + 3 * j) + i]; + ok(relative_error(expected, out_temp[i]) < admitted_error, "angle %f, order %u index %u, expected %f, received %f\n", angle[j], order, i, expected, out_temp[i]); + } } } }

1 0

Hiroshi Miura : wininet: Add a TLS fallback mechanism.
by Alexandre Julliard 01 Nov '12

01 Nov '12

Module: wine Branch: master Commit: 923ac2e546e5f86afd319d944a0a249bc1fa1e4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=923ac2e546e5f86afd319d944… Author: Hiroshi Miura <miurahr(a)linux.com> Date: Wed Oct 31 22:29:26 2012 +0900 wininet: Add a TLS fallback mechanism. --- dlls/wininet/netconnection.c | 166 ++++++++++++++++++++++++++++++++---------- 1 files changed, 127 insertions(+), 39 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index c944ff3..b746b54 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -124,8 +124,10 @@ MAKE_FUNCPTR(SSL_load_error_strings); MAKE_FUNCPTR(SSLv23_method); MAKE_FUNCPTR(SSL_CTX_free); MAKE_FUNCPTR(SSL_CTX_new); +MAKE_FUNCPTR(SSL_CTX_ctrl); MAKE_FUNCPTR(SSL_new); MAKE_FUNCPTR(SSL_free); +MAKE_FUNCPTR(SSL_ctrl); MAKE_FUNCPTR(SSL_set_fd); MAKE_FUNCPTR(SSL_connect); MAKE_FUNCPTR(SSL_shutdown); @@ -446,7 +448,50 @@ static int netconn_secure_verify(int preverify_ok, X509_STORE_CTX *ctx) return ret; } +static long get_tls_option(void) { + long tls_option = SSL_OP_NO_SSLv2; /* disable SSLv2 for security reason, secur32/Schannel(GnuTLS) don't support it */ +#ifdef SSL_OP_NO_TLSv1_2 + DWORD type, val, size; + HKEY hkey,tls12_client,tls11_client; + LONG res; + const WCHAR Schannel_Prot[] = { /* SYSTEM\\CurrentControlSet\\Control\\SecurityProviders\\SCANNEL\\Protocols */ + 'S','Y','S','T','E','M','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'S','e','c','u','r','i','t','y','P','r','o','v','i','d','e','r','s','\\', + 'S','C','H','A','N','N','E','L','\\', + 'P','r','o','t','o','c','o','l','s',0 }; + const WCHAR TLS12_Client[] = {'T','L','S',' ','1','.','2','\\','C','l','i','e','n','t',0}; + const WCHAR TLS11_Client[] = {'T','L','S',' ','1','.','1','\\','C','l','i','e','n','t',0}; + const WCHAR DisabledByDefault[] = {'D','i','s','a','b','l','e','d','B','y','D','e','f','a','u','l','t',0}; + + res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + Schannel_Prot, + 0, KEY_READ, &hkey); + if (res != ERROR_SUCCESS) { /* enabled TLSv1.1/1.2 when no registry entry */ + return tls_option; + } + if (RegOpenKeyExW(hkey, TLS12_Client, 0, KEY_READ, &tls12_client) == ERROR_SUCCESS) { + size = sizeof(DWORD); + if (RegQueryValueExW(tls12_client, DisabledByDefault, NULL, &type, (LPBYTE) &val, &size) == ERROR_SUCCESS + && type == REG_DWORD) { + tls_option |= val?SSL_OP_NO_TLSv1_2:0; + } + RegCloseKey(tls12_client); + } + if (RegOpenKeyExW(hkey, TLS11_Client, 0, KEY_READ, &tls11_client) == ERROR_SUCCESS) { + size = sizeof(DWORD); + if (RegQueryValueExW(tls11_client, DisabledByDefault, NULL, &type, (LPBYTE) &val, &size) == ERROR_SUCCESS + && type == REG_DWORD) { + tls_option |= val?SSL_OP_NO_TLSv1_1:0; + } + RegCloseKey(tls11_client); + } + RegCloseKey(hkey); #endif + return tls_option; +} +#endif /* SONAME_LIBSSL */ static CRITICAL_SECTION init_ssl_cs; static CRITICAL_SECTION_DEBUG init_ssl_cs_debug = @@ -491,8 +536,10 @@ static DWORD init_openssl(void) DYNSSL(SSLv23_method); DYNSSL(SSL_CTX_free); DYNSSL(SSL_CTX_new); + DYNSSL(SSL_CTX_ctrl); DYNSSL(SSL_new); DYNSSL(SSL_free); + DYNSSL(SSL_ctrl); DYNSSL(SSL_set_fd); DYNSSL(SSL_connect); DYNSSL(SSL_shutdown); @@ -534,12 +581,18 @@ static DWORD init_openssl(void) DYNCRYPTO(sk_value); #undef DYNCRYPTO +#define pSSL_CTX_set_options(ctx,op) \ + pSSL_CTX_ctrl((ctx),SSL_CTRL_OPTIONS,(op),NULL) +#define pSSL_set_options(ssl,op) \ + pSSL_ctrl((ssl),SSL_CTRL_OPTIONS,(op),NULL) + pSSL_library_init(); pSSL_load_error_strings(); pBIO_new_fp(stderr, BIO_NOCLOSE); /* FIXME: should use winedebug stuff */ meth = pSSLv23_method(); ctx = pSSL_CTX_new(meth); + pSSL_CTX_set_options(ctx, get_tls_option()); if(!pSSL_CTX_set_default_verify_paths(ctx)) { ERR("SSL_CTX_set_default_verify_paths failed: %s\n", pERR_error_string(pERR_get_error(), 0)); @@ -580,33 +633,10 @@ static DWORD init_openssl(void) #endif } -DWORD create_netconn(BOOL useSSL, server_t *server, DWORD security_flags, BOOL mask_errors, DWORD timeout, netconn_t **ret) +static DWORD create_netconn_socket(server_t *server, netconn_t *netconn, DWORD timeout) { - netconn_t *netconn; int result, flag; - if(useSSL) { - DWORD res; - - TRACE("using SSL connection\n"); - - EnterCriticalSection(&init_ssl_cs); - res = init_openssl(); - LeaveCriticalSection(&init_ssl_cs); - if(res != ERROR_SUCCESS) - return res; - } - - netconn = heap_alloc_zero(sizeof(*netconn)); - if(!netconn) - return ERROR_OUTOFMEMORY; - - netconn->useSSL = useSSL; - netconn->socketFD = -1; - netconn->security_flags = security_flags | server->security_flags; - netconn->mask_errors = mask_errors; - list_init(&netconn->pool_entry); - assert(server->addr_len); result = netconn->socketFD = socket(server->addr.ss_family, SOCK_STREAM, 0); if(result != -1) { @@ -656,11 +686,42 @@ DWORD create_netconn(BOOL useSSL, server_t *server, DWORD security_flags, BOOL m WARN("setsockopt(TCP_NODELAY) failed\n"); #endif + return ERROR_SUCCESS; +} + +DWORD create_netconn(BOOL useSSL, server_t *server, DWORD security_flags, BOOL mask_errors, DWORD timeout, netconn_t **ret) +{ + netconn_t *netconn; + int result; + + if(useSSL) { + DWORD res; + + TRACE("using SSL connection\n"); + + EnterCriticalSection(&init_ssl_cs); + res = init_openssl(); + LeaveCriticalSection(&init_ssl_cs); + if(res != ERROR_SUCCESS) + return res; + } + + netconn = heap_alloc_zero(sizeof(*netconn)); + if(!netconn) + return ERROR_OUTOFMEMORY; + + netconn->useSSL = useSSL; + netconn->socketFD = -1; + netconn->security_flags = security_flags | server->security_flags; + netconn->mask_errors = mask_errors; + list_init(&netconn->pool_entry); + + result = create_netconn_socket(server, netconn, timeout); server_addref(server); netconn->server = server; *ret = netconn; - return ERROR_SUCCESS; + return result; } void free_netconn(netconn_t *netconn) @@ -772,24 +833,13 @@ int sock_get_error( int err ) return err; } -/****************************************************************************** - * NETCON_secure_connect - * Initiates a secure connection over an existing plaintext connection. - */ -DWORD NETCON_secure_connect(netconn_t *connection) -{ - DWORD res = ERROR_NOT_SUPPORTED; #ifdef SONAME_LIBSSL +static DWORD netcon_secure_connect_setup(netconn_t *connection, long tls_option) +{ void *ssl_s; + DWORD res; int bits; - /* can't connect if we are already connected */ - if (connection->ssl_s) - { - ERR("already connected\n"); - return ERROR_INTERNET_CANNOT_CONNECT; - } - ssl_s = pSSL_new(ctx); if (!ssl_s) { @@ -798,6 +848,7 @@ DWORD NETCON_secure_connect(netconn_t *connection) return ERROR_OUTOFMEMORY; } + pSSL_set_options(ssl_s, tls_option); if (!pSSL_set_fd(ssl_s, connection->socketFD)) { ERR("SSL_set_fd failed: %s\n", @@ -843,6 +894,43 @@ fail: pSSL_shutdown(ssl_s); pSSL_free(ssl_s); } + return res; +} +#endif + +/****************************************************************************** + * NETCON_secure_connect + * Initiates a secure connection over an existing plaintext connection. + */ +DWORD NETCON_secure_connect(netconn_t *connection) +{ + DWORD res = ERROR_NOT_SUPPORTED; +#ifdef SONAME_LIBSSL + /* can't connect if we are already connected */ + if (connection->ssl_s) + { + ERR("already connected\n"); + return ERROR_INTERNET_CANNOT_CONNECT; + } + + /* connect with given TLS options */ + res = netcon_secure_connect_setup(connection, get_tls_option()); + if (res == ERROR_SUCCESS) + return res; + +#ifdef SSL_OP_NO_TLSv1_2 + /* FIXME: when got version alert and FIN from server */ + /* fallback to connect without TLSv1.1/TLSv1.2 */ + if (res == ERROR_INTERNET_SECURITY_CHANNEL_ERROR) + { + closesocket(connection->socketFD); + pSSL_CTX_set_options(ctx,SSL_OP_NO_TLSv1_1|SSL_OP_NO_TLSv1_2); + res = create_netconn_socket(connection->server, connection, 500); + if (res != ERROR_SUCCESS) + return res; + res = netcon_secure_connect_setup(connection, get_tls_option()|SSL_OP_NO_TLSv1_1|SSL_OP_NO_TLSv1_2); + } +#endif #endif return res; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2012