wine-commits October 2019

wine-commits@winehq.org

2 participants
614 discussions

Francois Gouget : testbot/LibvirtTool: Check the X session for Wine VMs after booting.
by Alexandre Julliard 02 Oct '19

02 Oct '19

Module: tools Branch: master Commit: ae2ecce33aad2f1cefecf5e8fa7ca65cfa6be587 URL: https://source.winehq.org/git/tools.git/?a=commit;h=ae2ecce33aad2f1cefecf5e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 2 07:00:28 2019 +0200 testbot/LibvirtTool: Check the X session for Wine VMs after booting. We need to wait for the X session whenever a Wine VM is booted, even when not creating a snapshot. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 42 +++++++++++++++++++----------------------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index f6e2d4f..5438f29 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -420,6 +420,25 @@ sub SetupTestAgentd($$$$) # A side effect is that it will force TestAgentd.exe.old to stay around. } + if ($Booting and $VM->Type eq "wine") + { + # Make sure the X session has had time to start + Debug(Elapsed($Start), " Waiting for the X session\n"); + LogMsg "Waiting for the $VMKey X session\n"; + my $Pid = $TA->Run(["sh", "-c", "while ! xset -display :0.0 q >/dev/null; do sleep 1; done"], 0); + FatalError("Could not check for the X session on $VMKey\n") if (!$Pid); + + if (!defined $TA->Wait($Pid, $SleepAfterBoot)) + { + my $ErrMessage = $TA->GetLastError(); + if ($ErrMessage =~ /timed out waiting for the child process/) + { + FatalError("Timed out waiting for the X session\n"); + } + FatalError("An error occurred while waiting for the X session: $ErrMessage\n"); + } + } + if ($ResetStartCount) { # If SetProperty() is not supported neither is --show-restarts. @@ -443,29 +462,6 @@ sub CreateSnapshot($$) { my ($Domain, $SnapshotName) = @_; - if ($VM->Type eq "wine") - { - # Make sure an X session has started before taking the snapshot - Debug(Elapsed($Start), " Waiting for the X session\n"); - LogMsg "Waiting for the $VMKey X session\n"; - my $TA = $VM->GetAgent(); - my $Pid = $TA->Run(["sh", "-c", "while ! xset -display :0.0 q >/dev/null; do sleep 1; done"], 0); - if (!$Pid) - { - FatalError("Could not check for the X session on the $VMKey VM\n"); - } - if (!defined $TA->Wait($Pid, $SleepAfterBoot)) - { - my $ErrMessage = $TA->GetLastError(); - if ($ErrMessage =~ /timed out waiting for the child process/) - { - FatalError("Timed out waiting for the X session\n"); - } - FatalError("An error occurred while waiting for the X session: $ErrMessage\n"); - } - $TA->Disconnect(); - } - if ($SleepAfterBoot != 0) { Debug(Elapsed($Start), " Sleeping for the $SnapshotName snapshot\n");

1 0

Francois Gouget : testbot/Submit: Add a single page mode.
by Alexandre Julliard 02 Oct '19

02 Oct '19

Module: tools Branch: master Commit: 0ad777fa1db816a0f74663c94d9fa969218ac859 URL: https://source.winehq.org/git/tools.git/?a=commit;h=0ad777fa1db816a0f74663c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 2 06:56:23 2019 +0200 testbot/Submit: Add a single page mode. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Submit.pl | 131 ++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 95 insertions(+), 36 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index b672375..dc3fdca 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -325,6 +325,22 @@ sub _ValidateTestExecutable($;$) return 1; } +sub _ValidateUpload($) +{ + my ($self) = @_; + + if (defined $self->{FileName}) + { + return undef if (!$self->_ValidateFileName()); + } + else + { + $self->{FileName} = $self->GetParam("Upload"); + return undef if (!$self->_ValidateFileName() or !$self->_Upload()); + } + return 1; +} + sub Validate($) { my ($self) = @_; @@ -410,7 +426,7 @@ sub _initialize($$$) $self->{Page} = $self->GetParam("Page"); # Page is a hidden parameter so fix it instead of issuing an error - $self->{Page} = 1 if (!defined $self->{Page} or $self->{Page} !~ /^[0-3]$/); + $self->{Page} = 1 if (!defined $self->{Page} or $self->{Page} !~ /^[0-4]$/); $self->{LastPage} = $self->{Page}; # Load the Page 1 parameters @@ -468,6 +484,9 @@ sub _GenerateStateFields($) $self->_GenerateStateField("Page"); + # There are no parameters to preserve when there is a single page + return if ($self->{Page} == 4); + if ($self->{Page} != 1) { $self->_GenerateStateField("Branch"); @@ -514,22 +533,24 @@ sub GetHeaderText($) { my ($self) = @_; + my @Headers; if ($self->{Page} == 0) { - return "Your job was successfully queued, but the job engine that takes " . - "care of actually running it seems to be unavailable (perhaps it " . - "crashed). Your job will remain queued until the engine is " . - "restarted."; + push @Headers, + "Your job was successfully queued, but the job engine that takes " . + "care of actually running it seems to be unavailable (perhaps it " . + "crashed). Your job will remain queued until the engine is " . + "restarted."; } - elsif ($self->{Page} == 1) + if ($self->{Page} == 1 or $self->{Page} == 4) { - return defined $self->{FileName} ? "" : + push @Headers, defined $self->{FileName} ? "" : "Specify the patch file that you want to upload and submit " . "for testing.<br>\n" . "You can also specify a Windows .exe file, this would normally be " . "a Wine test executable that you cross-compiled." } - elsif ($self->{Page} == 2) + if ($self->{Page} == 2 or $self->{Page} == 4) { my $HeaderText = "Select the VMs on which you want to run your test."; my $VMs = CreateVMs(); @@ -538,9 +559,9 @@ sub GetHeaderText($) { $HeaderText .= "<br>NOTE: Offline VMs and those undergoing maintenance will not be able to run your tests right away."; } - return $HeaderText; + push @Headers, $HeaderText; } - elsif ($self->{Page} == 3 and $self->{Impacts}) + if (($self->{Page} == 3 or $self->{Page} == 0) and $self->{Impacts}) { my @TestExecutables; $self->_GetTestExecutables(); @@ -562,10 +583,10 @@ sub GetHeaderText($) } push @TestExecutables, "$Module: ". join(" ", @TestUnits) if (@TestUnits); } - return join("<br>\n", "Here is a list of the test executables impacted by the patch (patched test units, if any, are in italics).", @TestExecutables); + push @Headers, join("<br>\n", "Here is a list of the test executables impacted by the patch (patched test units, if any, are in italics).", @TestExecutables); } - return ""; + return join("<br>\n", @Headers); } sub GetPropertyDescriptors($) @@ -581,21 +602,33 @@ sub GetPropertyDescriptors($) CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, !1, "A", 128), ]; } - elsif ($self->{Page} == 3) + elsif (($self->{Page} == 3 or $self->{Page} == 4) and + !$self->{PropertyDescriptors}) { - if (!$self->{PropertyDescriptors}) + if ($self->{Page} == 4) + { + $self->{PropertyDescriptors} = [ + CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, !1, "A", 128), + # Let the user type in the TestExecutable since we won't be able to + # figure it out in advance + CreateBasicPropertyDescriptor("TestExecutable", "Test executable", !1, 1, "A", 50), + ]; + } + else { $self->_GetTestExecutables(); my @TestExecutables = sort keys %{$self->{TestExecutables}}; $self->{PropertyDescriptors} = [ CreateEnumPropertyDescriptor("TestExecutable", "Test executable", !1, 1, \@TestExecutables), - CreateBasicPropertyDescriptor("CmdLineArg", "Command line arguments", !1, !1, "A", 50), - CreateBasicPropertyDescriptor("Run64", "Run 64-bit tests in addition to 32-bit tests", !1, 1, "B", 1), - CreateBasicPropertyDescriptor("DebugLevel", "Debug level (WINETEST_DEBUG)", !1, 1, "N", 2), - CreateBasicPropertyDescriptor("ReportSuccessfulTests", "Report successful tests (WINETEST_REPORT_SUCCESS)", !1, 1, "B", 1), ]; } + push @{$self->{PropertyDescriptors}}, + CreateBasicPropertyDescriptor("CmdLineArg", "Command line arguments", !1, !1, "A", 50), + CreateBasicPropertyDescriptor("Run64", "Run 64-bit tests in addition to 32-bit tests", !1, 1, "B", 1), + CreateBasicPropertyDescriptor("DebugLevel", "Debug level (WINETEST_DEBUG)", !1, 1, "N", 2), + CreateBasicPropertyDescriptor("ReportSuccessfulTests", "Report successful tests (WINETEST_REPORT_SUCCESS)", !1, 1, "B", 1); } + return $self->SUPER::GetPropertyDescriptors(); } @@ -611,7 +644,7 @@ sub GenerateFields($) $self->_GenerateStateField("JobKey"); } - elsif ($self->{Page} == 1) + if ($self->{Page} == 1 or $self->{Page} == 4) { print "<div class='ItemProperty'><label>File</label>", "<div class='ItemValue'>"; @@ -657,9 +690,11 @@ sub GenerateFields($) } # The other fields are taken care of by FreeFormPage. $self->{HasRequired} = 1; + + print "<br>\n" if ($self->{Page} == 4); } - elsif ($self->{Page} == 2) + if ($self->{Page} == 2 or $self->{Page} == 4) { $self->_GenerateStateField("ShowAll"); print "<div class='CollectionBlock'><table>\n"; @@ -742,15 +777,23 @@ EOF print "<input type='submit' name='Action' value='", $self->{ShowAll} ? "Show base VMs" : "Show all VMs", "'/>\n"; print "</div>\n"; + + print "<br>\n" if ($self->{Page} == 4); } - elsif ($self->{Page} == 3) + if ($self->{Page} == 3 or $self->{Page} == 4) { $self->_GenerateStateField("NoCmdLineArgWarn"); # Preserve these fields if they are not shown - $self->_GenerateStateField("Run64") if (!$self->{ShowRun64} or $self->{FileType} ne "patch"); - $self->_GenerateStateField("TestExecutable") if ($self->{FileType} ne "patch"); + if (!$self->{ShowRun64} or $self->{FileType} ne "patch") + { + $self->_GenerateStateField("Run64"); + } + if ($self->{FileType} ne "patch" and $self->{Page} != 4) + { + $self->_GenerateStateField("TestExecutable"); + } # The other fields are taken care of by FreeFormPage. } @@ -769,7 +812,7 @@ sub GetActions($) } elsif ($self->{Page} == 1) { - push @$Actions, "Next >"; + push @$Actions, "Single Page", "Next >"; } elsif ($self->{Page} == 2) { @@ -779,6 +822,10 @@ sub GetActions($) { push @$Actions, "< Prev", "Submit"; } + elsif ($self->{Page} == 4) + { + push @$Actions, "Submit"; + } return $Actions; } @@ -848,16 +895,8 @@ sub OnPage1Next($) { my ($self) = @_; - if (defined $self->{FileName}) - { - return undef if (!$self->_ValidateFileName()); - } - else - { - $self->{FileName} = $self->GetParam("Upload"); - return undef if (!$self->_ValidateFileName() or !$self->_Upload()); - } - if (!$self->Validate() or !$self->_ValidateVMSelection("deselect") or + if (!$self->_ValidateUpload() or !$self->Validate() or + !$self->_ValidateVMSelection("deselect") or !$self->_ValidateTestExecutable("reset")) { return undef; @@ -874,6 +913,22 @@ sub OnPage1Next($) return 1; } +sub OnSinglePage($) +{ + my ($self) = @_; + + # The checks and defaults are the same as for Page1Next() + if (!$self->OnPage1Next()) + { + # But ignore all errors. The user can change everything anyway. + delete $self->{ErrField}; + delete $self->{ErrMessage}; + } + + $self->_SetPage(4); + return 1; +} + sub OnPage2Next($) { my ($self) = @_; @@ -1101,7 +1156,7 @@ sub OnSubmit($) { my ($self) = @_; - return undef if (!$self->Validate()); + return undef if (!$self->_ValidateUpload() or !$self->Validate()); # Rename the staging file to avoid race conditions if the user clicks on # Submit multiple times @@ -1165,7 +1220,11 @@ sub OnAction($$) { my ($self, $Action) = @_; - if ($Action eq "Next >") + if ($Action eq "Single Page") + { + return $self->OnSinglePage(); + } + elsif ($Action eq "Next >") { return $self->{Page} == 2 ? $self->OnPage2Next() : $self->OnPage1Next(); }

1 0

Francois Gouget : testbot/Submit: Allow submitting patches that touch zero or multiple test units.
by Alexandre Julliard 02 Oct '19

02 Oct '19

Module: tools Branch: master Commit: cee9428e9c32135ce491b038ee552da999819871 URL: https://source.winehq.org/git/tools.git/?a=commit;h=cee9428e9c32135ce491b03… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 2 06:56:19 2019 +0200 testbot/Submit: Allow submitting patches that touch zero or multiple test units. Patches submitted through the submit page no longer need to impact one and only one test unit. This means it's no longer necessary to split longer patches in order to test them. With the Wine VMs it also no longer makes sense to ban patches that don't touch the tests as one may need to make sure they compile and don't cause regressions in existing tests. However it is still necessary to specify command line arguments for the test executable which means picking a single test unit to run. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunWineTest.pl | 1 + testbot/bin/build/Build.pl | 6 ++ testbot/bin/build/WineTest.pl | 79 +++++++++++++----- testbot/lib/Build/Utils.pm | 43 ++++++---- testbot/lib/WineTestBot/PatchUtils.pm | 1 + testbot/web/Submit.pl | 153 +++++++++++++++++++++++----------- 6 files changed, 199 insertions(+), 84 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=cee9428e9c32135ce49…

1 0

Francois Gouget : testbot/TestAgent: Fix typos in the usage message.
by Alexandre Julliard 02 Oct '19

02 Oct '19

Module: tools Branch: master Commit: 8f90991afae2d18da0f10255ce24f7ed8af2a726 URL: https://source.winehq.org/git/tools.git/?a=commit;h=8f90991afae2d18da0f1025… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 2 06:55:32 2019 +0200 testbot/TestAgent: Fix typos in the usage message. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/scripts/TestAgent | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index 84bbf7e..40f443e 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -345,12 +345,12 @@ if (defined $Usage) print " as <localpath>.\n"; print " run Runs the specified <command> on the server.\n"; print " --run-no-wait Don't wait for the command.\n"; - print " --run-in <serverpath> Redirect the stdin or the command being run to the\n"; + print " --run-in <serverpath> Redirect the stdin of the command being run to the\n"; print " specified server file.\n"; - print " --run-out <serverpath> Redirect the stdout or the command being run to the\n"; + print " --run-out <serverpath> Redirect the stdout of the command being run to the\n"; print " specified server file.\n"; print " --run-dntrunc-out Do not truncate the file stdout is redirected to.\n"; - print " --run-err <serverpath> Redirect the stderr or the command being run to the\n"; + print " --run-err <serverpath> Redirect the stderr of the command being run to the\n"; print " specified server file.\n"; print " --run-dntrunc-err Do not truncate the file stderr is redirected to.\n"; print " wait Waits for the specified child process on the server.\n";

1 0

Francois Gouget : testbot/web: Remove the execute permissions on Munin.pl.
by Alexandre Julliard 02 Oct '19

02 Oct '19

Module: tools Branch: master Commit: f39b240e0ae3089e684c013feac85d9e852c30ad URL: https://source.winehq.org/git/tools.git/?a=commit;h=f39b240e0ae3089e684c013… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 2 06:54:24 2019 +0200 testbot/web: Remove the execute permissions on Munin.pl. They are not needed for CGI scripts. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Munin.pl | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/testbot/web/Munin.pl b/testbot/web/Munin.pl old mode 100755 new mode 100644

1 0

Alistair Leslie-Hughes : dsound/tests: Add some GetStatus checks.
by Alexandre Julliard 01 Oct '19

01 Oct '19

Module: wine Branch: master Commit: b360cd67e8f7f8c01f09457bacb032fd4a248d0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b360cd67e8f7f8c01f09457b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Sep 30 01:00:24 2019 +0000 dsound/tests: Add some GetStatus checks. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/tests/dsound.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 41818deb17..d242bf6b24 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1063,7 +1063,7 @@ static HRESULT test_notify(LPDIRECTSOUNDBUFFER dsb, DWORD expected) { HRESULT rc; - DWORD ret; + DWORD ret, status; rc=IDirectSoundBuffer_SetCurrentPosition(dsb,0); ok(rc==DS_OK, @@ -1076,13 +1076,22 @@ static HRESULT test_notify(LPDIRECTSOUNDBUFFER dsb, if(rc!=DS_OK) return rc; + rc = IDirectSoundBuffer_GetStatus(dsb, &status); + ok(rc == DS_OK,"Failed %08x\n",rc); + ok(status == DSBSTATUS_PLAYING,"got %08x\n", status); + rc=IDirectSoundBuffer_Stop(dsb); ok(rc==DS_OK,"IDirectSoundBuffer_Stop failed %08x\n",rc); if(rc!=DS_OK) return rc; + rc = IDirectSoundBuffer_GetStatus(dsb, &status); + ok(rc == DS_OK,"Failed %08x\n",rc); + ok(status == 0 /* Stopped */,"got %08x\n", status); + ret=WaitForMultipleObjects(count,event,FALSE,0); ok(ret==expected,"expected %d. got %d\n",expected,ret); + return rc; } @@ -1537,7 +1546,7 @@ static void test_notifications(LPGUID lpGuid) WAVEFORMATEX wfx; DSBPOSITIONNOTIFY notifies[2]; HANDLE handles[2]; - DWORD expect; + DWORD expect, status; int cycles; rc = pDirectSoundCreate(lpGuid, &dso, NULL); @@ -1607,12 +1616,20 @@ static void test_notifications(LPGUID lpGuid) ok(wait <= WAIT_OBJECT_0 + 1 && wait - WAIT_OBJECT_0 == expect, "Got unexpected notification order or timeout: %u\n", wait); + rc = IDirectSoundBuffer_GetStatus(buf, &status); + ok(rc == DS_OK,"Failed %08x\n",rc); + ok(status == (DSBSTATUS_PLAYING | DSBSTATUS_LOOPING),"got %08x\n", status); + expect = !expect; } rc = IDirectSoundBuffer_Stop(buf); ok(rc == DS_OK, "Stop: %08x\n", rc); + rc = IDirectSoundBuffer_GetStatus(buf, &status); + ok(rc == DS_OK,"Failed %08x\n",rc); + ok(status == 0,"got %08x\n", status); + CloseHandle(notifies[0].hEventNotify); CloseHandle(notifies[1].hEventNotify);

1 0

Hans Leidekker : bcrypt: Avoid recreating the hash on every iteration in BCryptDeriveKeyPBKDF2.
by Alexandre Julliard 01 Oct '19

01 Oct '19

Module: wine Branch: master Commit: 02723a8856eceb9041b954f20d9b278e7c181256 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02723a8856eceb9041b954f2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 1 17:57:13 2019 +0200 bcrypt: Avoid recreating the hash on every iteration in BCryptDeriveKeyPBKDF2. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 49 ++++++++++++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 18 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 10e0b98869..c1a0a56e99 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1578,10 +1578,9 @@ NTSTATUS WINAPI BCryptSetProperty( BCRYPT_HANDLE handle, const WCHAR *prop, UCHA } } -static NTSTATUS pbkdf2( BCRYPT_ALG_HANDLE algorithm, UCHAR *pwd, ULONG pwd_len, UCHAR *salt, ULONG salt_len, +static NTSTATUS pbkdf2( BCRYPT_HASH_HANDLE handle, UCHAR *pwd, ULONG pwd_len, UCHAR *salt, ULONG salt_len, ULONGLONG iterations, ULONG i, UCHAR *dst, ULONG hash_len ) { - BCRYPT_HASH_HANDLE handle = NULL; NTSTATUS status = STATUS_INVALID_PARAMETER; UCHAR bytes[4], *buf; ULONG j, k; @@ -1590,16 +1589,15 @@ static NTSTATUS pbkdf2( BCRYPT_ALG_HANDLE algorithm, UCHAR *pwd, ULONG pwd_len, for (j = 0; j < iterations; j++) { - status = BCryptCreateHash( algorithm, &handle, NULL, 0, pwd, pwd_len, 0 ); - if (status != STATUS_SUCCESS) - goto done; - if (j == 0) { /* use salt || INT(i) */ status = BCryptHashData( handle, salt, salt_len, 0 ); if (status != STATUS_SUCCESS) - goto done; + { + heap_free( buf ); + return status; + } bytes[0] = (i >> 24) & 0xff; bytes[1] = (i >> 16) & 0xff; bytes[2] = (i >> 8) & 0xff; @@ -1608,21 +1606,22 @@ static NTSTATUS pbkdf2( BCRYPT_ALG_HANDLE algorithm, UCHAR *pwd, ULONG pwd_len, } else status = BCryptHashData( handle, buf, hash_len, 0 ); /* use U_j */ if (status != STATUS_SUCCESS) - goto done; + { + heap_free( buf ); + return status; + } status = BCryptFinishHash( handle, buf, hash_len, 0 ); if (status != STATUS_SUCCESS) - goto done; + { + heap_free( buf ); + return status; + } if (j == 0) memcpy( dst, buf, hash_len ); else for (k = 0; k < hash_len; k++) dst[k] ^= buf[k]; - - BCryptDestroyHash( handle ); - handle = NULL; } -done: - BCryptDestroyHash( handle ); heap_free( buf ); return status; } @@ -1632,6 +1631,7 @@ NTSTATUS WINAPI BCryptDeriveKeyPBKDF2( BCRYPT_ALG_HANDLE handle, UCHAR *pwd, ULO { struct algorithm *alg = handle; ULONG hash_len, block_count, bytes_left, i; + BCRYPT_HASH_HANDLE hash; UCHAR *partial; NTSTATUS status; @@ -1646,26 +1646,39 @@ NTSTATUS WINAPI BCryptDeriveKeyPBKDF2( BCRYPT_ALG_HANDLE handle, UCHAR *pwd, ULO block_count = 1 + ((dk_len - 1) / hash_len); /* ceil(dk_len / hash_len) */ bytes_left = dk_len - (block_count - 1) * hash_len; + status = BCryptCreateHash( handle, &hash, NULL, 0, pwd, pwd_len, BCRYPT_HASH_REUSABLE_FLAG ); + if (status != STATUS_SUCCESS) + return status; + /* full blocks */ for (i = 1; i < block_count; i++) { - status = pbkdf2( handle, pwd, pwd_len, salt, salt_len, iterations, i, dk + ((i - 1) * hash_len), hash_len ); + status = pbkdf2( hash, pwd, pwd_len, salt, salt_len, iterations, i, dk + ((i - 1) * hash_len), hash_len ); if (status != STATUS_SUCCESS) + { + BCryptDestroyHash( hash ); return status; + } } /* final partial block */ - if (!(partial = heap_alloc( hash_len ))) return STATUS_NO_MEMORY; + if (!(partial = heap_alloc( hash_len ))) + { + BCryptDestroyHash( hash ); + return STATUS_NO_MEMORY; + } - status = pbkdf2( handle, pwd, pwd_len, salt, salt_len, iterations, block_count, partial, hash_len ); + status = pbkdf2( hash, pwd, pwd_len, salt, salt_len, iterations, block_count, partial, hash_len ); if (status != STATUS_SUCCESS) { + BCryptDestroyHash( hash ); heap_free( partial ); return status; } memcpy( dk + ((block_count - 1) * hash_len), partial, bytes_left ); - heap_free( partial ); + BCryptDestroyHash( hash ); + heap_free( partial ); return STATUS_SUCCESS; }

1 0

Nikolay Sivov : mf: Implement initial support for starting media sources within a session.
by Alexandre Julliard 01 Oct '19

01 Oct '19

Module: wine Branch: master Commit: 350a3ec6a218822ed5208c17aff7acabf74d5de9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=350a3ec6a218822ed5208c17… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 1 16:35:33 2019 +0300 mf: Implement initial support for starting media sources within a session. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 196 +++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 188 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=350a3ec6a218822ed520…

1 0

Nikolay Sivov : mf: Partially implement topology cloning.
by Alexandre Julliard 01 Oct '19

01 Oct '19

Module: wine Branch: master Commit: 0d41926cc067eec06bd0bf3114a4ca6c0e7e2b6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d41926cc067eec06bd0bf31… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 1 16:35:32 2019 +0300 mf: Partially implement topology cloning. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 1 - dlls/mf/topology.c | 52 +++++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 45 insertions(+), 8 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 4eba79e120..b221398a71 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1308,7 +1308,6 @@ todo_wine { ok(value == MF_TOPOLOGY_RESOLUTION_SUCCEEDED, "Unexpected value %#x.\n", value); } hr = IMFTopoLoader_Load(loader, full_topology, &topology2, NULL); -todo_wine ok(hr == S_OK, "Failed to resolve topology, hr %#x.\n", hr); ok(full_topology != topology2, "Unexpected instance.\n"); diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index 926fd48747..dacb57d264 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -111,6 +111,8 @@ static struct topology_node *unsafe_impl_from_IMFTopologyNode(IMFTopologyNode *i return impl_from_IMFTopologyNode(iface); } +static struct topology *unsafe_impl_from_IMFTopology(IMFTopology *iface); + static struct topology_loader *impl_from_IMFTopoLoader(IMFTopoLoader *iface) { return CONTAINING_RECORD(iface, struct topology_loader, IMFTopoLoader_iface); @@ -574,14 +576,11 @@ static HRESULT topology_get_node_by_id(const struct topology *topology, TOPOID i return MF_E_NOT_FOUND; } -static HRESULT WINAPI topology_AddNode(IMFTopology *iface, IMFTopologyNode *node_iface) +static HRESULT topology_add_node(struct topology *topology, IMFTopologyNode *node_iface) { - struct topology *topology = impl_from_IMFTopology(iface); struct topology_node *node = unsafe_impl_from_IMFTopologyNode(node_iface); struct topology_node *match; - TRACE("%p, %p.\n", iface, node_iface); - if (!node) return E_POINTER; @@ -603,6 +602,15 @@ static HRESULT WINAPI topology_AddNode(IMFTopology *iface, IMFTopologyNode *node return S_OK; } +static HRESULT WINAPI topology_AddNode(IMFTopology *iface, IMFTopologyNode *node) +{ + struct topology *topology = impl_from_IMFTopology(iface); + + TRACE("%p, %p.\n", iface, node); + + return topology_add_node(topology, node); +} + static HRESULT WINAPI topology_RemoveNode(IMFTopology *iface, IMFTopologyNode *node) { struct topology *topology = impl_from_IMFTopology(iface); @@ -672,11 +680,41 @@ static HRESULT WINAPI topology_Clear(IMFTopology *iface) return S_OK; } -static HRESULT WINAPI topology_CloneFrom(IMFTopology *iface, IMFTopology *src_topology) +static HRESULT WINAPI topology_CloneFrom(IMFTopology *iface, IMFTopology *src) { - FIXME("(%p)->(%p)\n", iface, src_topology); + struct topology *topology = impl_from_IMFTopology(iface); + struct topology *src_topology = unsafe_impl_from_IMFTopology(src); + IMFTopologyNode *node; + HRESULT hr; + size_t i; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, src); + + topology_clear(topology); + + /* Clone nodes. */ + for (i = 0; i < src_topology->nodes.count; ++i) + { + if (FAILED(hr = MFCreateTopologyNode(src_topology->nodes.nodes[i]->node_type, &node))) + { + WARN("Failed to create a node, hr %#x.\n", hr); + break; + } + + if (SUCCEEDED(hr = IMFTopologyNode_CloneFrom(node, &src_topology->nodes.nodes[i]->IMFTopologyNode_iface))) + topology_add_node(topology, node); + + IMFTopologyNode_Release(node); + } + + FIXME("Clone node connections.\n"); + + /* Copy attributes and id. */ + hr = IMFTopology_CopyAllItems(src, (IMFAttributes *)&topology->IMFTopology_iface); + if (SUCCEEDED(hr)) + topology->id = src_topology->id; + + return S_OK; } static HRESULT WINAPI topology_GetNodeByID(IMFTopology *iface, TOPOID id, IMFTopologyNode **ret)

1 0

Gabriel Ivăncescu : msscript.ocx/tests: Add tests for IScriptControl::Run.
by Alexandre Julliard 01 Oct '19

01 Oct '19

Module: wine Branch: master Commit: 5dbe0e3be8ba66a793beaf094766b408fc39bab6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5dbe0e3be8ba66a793beaf09… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Oct 1 14:38:14 2019 +0300 msscript.ocx/tests: Add tests for IScriptControl::Run. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/tests/msscript.c | 385 ++++++++++++++++++++++++++++++++++++- 1 file changed, 383 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5dbe0e3be8ba66a793be…

1 0

← Newer
1
...
54
55
56
57
58
59
60
61
62
Older →

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 October 2019