October 2019 - Wine-Devel - list.winehq.org

[PATCH] dxgi: Sort reported output modes
by Andrew Eikum Oct. 24, 2019

Oct. 24, 2019

Sekiro: Shadows Die Twice depends on this for its mode switching. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/dxgi/output.c | 64 ++++++++++++++++++++++++++++++++++++++++++ dlls/dxgi/tests/dxgi.c | 32 ++++++++++++++++++++- 2 files changed, 95 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index abe1aef950c..c54c8b165ed 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -75,6 +75,60 @@ static HRESULT dxgi_output_find_closest_matching_mode(struct dxgi_output *output return hr; } +static int dxgi_mode_desc_compar(const void *l, const void *r) +{ + const DXGI_MODE_DESC *left = l, *right = r; + + if (left->Width < right->Width) + return -1; + + if (left->Width > right->Width) + return 1; + + if (left->Height < right->Height) + return -1; + + if (left->Height > right->Height) + return 1; + + if (left->RefreshRate.Numerator * right->RefreshRate.Denominator < + right->RefreshRate.Numerator * left->RefreshRate.Denominator) + return -1; + + if (left->RefreshRate.Numerator * right->RefreshRate.Denominator > + right->RefreshRate.Numerator * left->RefreshRate.Denominator) + return 1; + + return 0; +} + +static int dxgi_mode_desc1_compar(const void *l, const void *r) +{ + const DXGI_MODE_DESC1 *left = l, *right = r; + + if (left->Width < right->Width) + return -1; + + if (left->Width > right->Width) + return 1; + + if (left->Height < right->Height) + return -1; + + if (left->Height > right->Height) + return 1; + + if (left->RefreshRate.Numerator * right->RefreshRate.Denominator < + right->RefreshRate.Numerator * left->RefreshRate.Denominator) + return -1; + + if (left->RefreshRate.Numerator * right->RefreshRate.Denominator > + right->RefreshRate.Numerator * left->RefreshRate.Denominator) + return 1; + + return 0; +} + enum dxgi_mode_struct_version { DXGI_MODE_STRUCT_VERSION_0, @@ -151,6 +205,16 @@ static HRESULT dxgi_output_get_display_mode_list(struct dxgi_output *output, } wined3d_mutex_unlock(); + switch (struct_version) + { + case DXGI_MODE_STRUCT_VERSION_0: + qsort(modes, *mode_count, sizeof(DXGI_MODE_DESC), dxgi_mode_desc_compar); + break; + case DXGI_MODE_STRUCT_VERSION_1: + qsort(modes, *mode_count, sizeof(DXGI_MODE_DESC1), dxgi_mode_desc1_compar); + break; + } + return S_OK; } diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index a7517c8b0ab..be18943748c 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -1158,7 +1158,8 @@ static void test_output(void) HRESULT hr; IDXGIOutput *output; ULONG refcount; - UINT mode_count, mode_count_comp, i; + UINT mode_count, mode_count_comp, i, last_height, last_width; + double last_refresh_rate; DXGI_MODE_DESC *modes; if (!(device = create_device(0))) @@ -1227,9 +1228,38 @@ static void test_output(void) ok(SUCCEEDED(hr), "Failed to list modes, hr %#x.\n", hr); ok(mode_count == mode_count_comp, "Got unexpected mode_count %u, expected %u.\n", mode_count, mode_count_comp); + last_width = last_height = 0; + last_refresh_rate = 0.; for (i = 0; i < mode_count; i++) { ok(modes[i].Height && modes[i].Width, "Proper mode was expected\n"); + + ok(modes[i].Width >= last_width, + "Modes should have been sorted, mode %u width %u < %u\n", i, modes[i].Width, last_width); + if (modes[i].Width == last_width) + { + ok(modes[i].Height >= last_height, + "Modes should have been sorted, mode %u height %u < %u\n", i, modes[i].Height, last_height); + if (modes[i].Height == last_height) + { + double refresh_rate = modes[i].RefreshRate.Numerator / (double)modes[i].RefreshRate.Denominator; + ok(refresh_rate >= last_refresh_rate, + "Modes should have been sorted, mode %u refresh rate %f < %f\n", i, refresh_rate, last_refresh_rate); + if (refresh_rate != last_refresh_rate) + last_refresh_rate = refresh_rate; + } + else + { + last_height = modes[i].Height; + last_refresh_rate = 0.; + } + } + else + { + last_width = modes[i].Width; + last_height = 0; + last_refresh_rate = 0.; + } } mode_count += 5; -- 2.23.0

2 2

[PATCH v2 2/2] dxgi: Implement dxgi_output_TakeOwnership.
by Zhiyi Zhang Oct. 24, 2019

Oct. 24, 2019

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/output.c | 13 +++++++++++-- dlls/dxgi/tests/dxgi.c | 20 ++++++++++++-------- dlls/wined3d/directx.c | 31 +++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 5 files changed, 56 insertions(+), 10 deletions(-) diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 1faf202e24..4463e17178 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -336,9 +336,18 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_WaitForVBlank(IDXGIOutput4 *iface) static HRESULT STDMETHODCALLTYPE dxgi_output_TakeOwnership(IDXGIOutput4 *iface, IUnknown *device, BOOL exclusive) { - FIXME("iface %p, device %p, exclusive %d stub!\n", iface, device, exclusive); + struct dxgi_output *output = impl_from_IDXGIOutput4(iface); + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, device %p, exclusive %d.\n", iface, device, exclusive); + + if (!device) + return DXGI_ERROR_INVALID_CALL; + + wined3d_mutex_lock(); + hr = wined3d_output_take_ownership(output->wined3d_output, exclusive); + wined3d_mutex_unlock(); + return hr; } static void STDMETHODCALLTYPE dxgi_output_ReleaseOwnership(IDXGIOutput4 *iface) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index a7517c8b0a..7b661afc10 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -5581,10 +5581,14 @@ static void test_output_ownership(IUnknown *device, BOOL is_d3d12) wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS, FALSE); else wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_GRAPHICS_PRESENT_OCCLUDED, TRUE); + hr = IDXGIOutput_TakeOwnership(output, NULL, FALSE); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = IDXGIOutput_TakeOwnership(output, NULL, TRUE); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); hr = IDXGIOutput_TakeOwnership(output, device, FALSE); todo_wine ok(hr == (is_d3d12 ? E_NOINTERFACE : E_INVALIDARG), "Got unexpected hr %#x.\n", hr); hr = IDXGIOutput_TakeOwnership(output, device, TRUE); - todo_wine ok(hr == (is_d3d12 ? E_NOINTERFACE : S_OK), "Got unexpected hr %#x.\n", hr); + todo_wine_if(is_d3d12) ok(hr == (is_d3d12 ? E_NOINTERFACE : S_OK), "Got unexpected hr %#x.\n", hr); IDXGIOutput_ReleaseOwnership(output); wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS, FALSE); @@ -5594,16 +5598,16 @@ static void test_output_ownership(IUnknown *device, BOOL is_d3d12) goto done; hr = IDXGIOutput_TakeOwnership(output, device, FALSE); - todo_wine ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); IDXGIOutput_ReleaseOwnership(output); hr = IDXGIOutput_TakeOwnership(output, device, TRUE); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); /* Note that the "exclusive" parameter to IDXGIOutput_TakeOwnership() * seems to behave opposite to what's described by MSDN. */ - wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_GRAPHICS_PRESENT_OCCLUDED, TRUE); + wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_GRAPHICS_PRESENT_OCCLUDED, FALSE); hr = IDXGIOutput_TakeOwnership(output, device, FALSE); - todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); IDXGIOutput_ReleaseOwnership(output); /* Swapchain in windowed mode. */ @@ -5616,11 +5620,11 @@ static void test_output_ownership(IUnknown *device, BOOL is_d3d12) wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS, FALSE); hr = IDXGIOutput_TakeOwnership(output, device, FALSE); - todo_wine ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); hr = IDXGIOutput_TakeOwnership(output, device, TRUE); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_GRAPHICS_PRESENT_OCCLUDED, TRUE); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_GRAPHICS_PRESENT_OCCLUDED, FALSE); IDXGIOutput_ReleaseOwnership(output); wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS, FALSE); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 03c8781386..e752bd27ef 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -879,6 +879,37 @@ void CDECL wined3d_output_destroy(struct wined3d_output *output) heap_free(output); } +HRESULT CDECL wined3d_output_take_ownership(const struct wined3d_output *output, BOOL exclusive) +{ + D3DKMT_SETVIDPNSOURCEOWNER set_owner_desc; + D3DKMT_VIDPNSOURCEOWNER_TYPE owner_type; + NTSTATUS status; + + TRACE("output %p, exclusive %d.\n", output, exclusive); + + owner_type = exclusive ? D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE : D3DKMT_VIDPNSOURCEOWNER_SHARED; + set_owner_desc.pType = &owner_type; + set_owner_desc.pVidPnSourceId = &output->vidpn_source_id; + set_owner_desc.VidPnSourceCount = 1; + set_owner_desc.hDevice = output->kmt_device; + status = D3DKMTSetVidPnSourceOwner(&set_owner_desc); + + switch (status) + { + case STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE: + return DXGI_ERROR_NOT_CURRENTLY_AVAILABLE; + case STATUS_INVALID_PARAMETER: + return E_INVALIDARG; + case STATUS_PROCEDURE_NOT_FOUND: + return E_NOINTERFACE; + case STATUS_SUCCESS: + return S_OK; + default: + FIXME("Unhandled error %#x.\n", status); + return E_FAIL; + } +} + void CDECL wined3d_output_release_ownership(const struct wined3d_output *output) { D3DKMT_SETVIDPNSOURCEOWNER set_owner_desc = {0}; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 2e3a642813..79dd9de39c 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -21,6 +21,7 @@ @ cdecl wined3d_incref(ptr) @ cdecl wined3d_output_create(str ptr) @ cdecl wined3d_output_destroy(ptr) +@ cdecl wined3d_output_take_ownership(ptr long) @ cdecl wined3d_output_release_ownership(ptr) @ cdecl wined3d_register_software_device(ptr ptr) @ cdecl wined3d_register_window(ptr ptr ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index b75b544d11..fcbeea32ef 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2215,6 +2215,7 @@ HRESULT __cdecl wined3d_get_output_desc(const struct wined3d *wined3d, unsigned ULONG __cdecl wined3d_incref(struct wined3d *wined3d); HRESULT __cdecl wined3d_output_create(const WCHAR *display_name, struct wined3d_output **target); void __cdecl wined3d_output_destroy(struct wined3d_output *output); +HRESULT __cdecl wined3d_output_take_ownership(const struct wined3d_output *output, BOOL exclusive); void __cdecl wined3d_output_release_ownership(const struct wined3d_output *output); HRESULT __cdecl wined3d_register_software_device(struct wined3d *wined3d, void *init_function); BOOL __cdecl wined3d_register_window(struct wined3d *wined3d, HWND window, -- 2.23.0

1 0

[PATCH] testbot/web: Slightly tweak the activity history description.
by Francois Gouget Oct. 24, 2019

Oct. 24, 2019

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Stats.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index 91106bbc8..4c213ab45 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -222,7 +222,7 @@ sub GenerateBody($) print "<tr><td class='StatSeparator'>Activity</td><td colspan='2'><hr></td></tr>\n"; my $VMsStats = $Stats->{vms}; - _GenGlobalLine($VMsStats, "elapsed", "Activity history", "How far the activity records go. This is used for the VM and VM host tables."); + _GenGlobalLine($VMsStats, "elapsed", "Activity history", "How far back the activity records go. This is used for the VM and VM host tables."); _GenGlobalLine($GlobalStats, "records.count", "Record count", "The number of activity records."); print "</tbody></table></div>\n"; -- 2.20.1

1 0

[PATCH] testbot/web: Fix creating a job to update 'All Build VMs'.
by Francois Gouget Oct. 24, 2019

Oct. 24, 2019

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/admin/SpecialJobs.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/admin/SpecialJobs.pl b/testbot/web/admin/SpecialJobs.pl index 1556b55d1..c5a8f6587 100644 --- a/testbot/web/admin/SpecialJobs.pl +++ b/testbot/web/admin/SpecialJobs.pl @@ -167,7 +167,7 @@ sub OnSubmit($) $VMKey = $self->{JobTemplates}->{Build}->{VMKey}; if ($VMKey ne "*No") { - $VMKey = undef if ($VMKey eq "*All Wine VMs"); + $VMKey = undef if ($VMKey eq "*All Build VMs"); my $VMs = GetReconfigVMs($VMKey, "build"); push @Errors, "Found no build VM to update" if (!@$VMs); my $ErrMessage = AddReconfigJob($VMs, $VMKey, "build"); -- 2.20.1

1 0

[PATCH] testbot/web: Allow specifying how many days to analyze for the statistics.
by Francois Gouget Oct. 24, 2019

Oct. 24, 2019

Building statistics on the full job retention period may not be what's needed. Also, the longer the period analyzed the longer it takes to generate this page. So let the user specify which period to analyze and default to 7 days, a reasonable period to get values that are not unduly influenced by short-term patch storms, but also short enough to reflect current trends. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Stats.pl | 80 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 77 insertions(+), 3 deletions(-) diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index 4c213ab45..43f14948b 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -21,9 +21,10 @@ use strict; package StatsPage; -use ObjectModel::CGI::Page; -our @ISA = qw(ObjectModel::CGI::Page); +use ObjectModel::CGI::FreeFormPage; +our @ISA = qw(ObjectModel::CGI::FreeFormPage); +use ObjectModel::BasicPropertyDescriptor; use ObjectModel::Collection; use WineTestBot::Config; use WineTestBot::Activity; @@ -36,10 +37,33 @@ sub _initialize($$$) { my ($self, $Request, $RequiredRole) = @_; + $self->{Days} = $self->GetParam("Days"); + $self->Validate(); + $self->{start} = Time(); $self->SUPER::_initialize($Request, $RequiredRole); } +sub Validate($) +{ + my ($self) = @_; + + if (!defined $self->{Days}) + { + $self->{Days} = 7; + $self->{NoStats} = 1; + } + elsif ($self->{Days} !~ /^[0-9]{1,2}$/) + { + $self->{ErrField} = "Days"; + $self->{ErrMessage} = "The number of days must be between 1 and 99"; + $self->{NoStats} = 1; + $self->{Days} = 7; + return undef; + } + return $self->SUPER::Validate(); +} + sub GetPageTitle($$) { my ($self, $Page) = @_; @@ -168,7 +192,15 @@ sub GenerateBody($) { my ($self) = @_; + return $self->SUPER::GenerateBody() if ($self->{NoStats}); + print "<h1>${ProjectName} Test Bot activity statistics</h1>\n"; + $self->GenerateFormStart(); + $self->GenerateFields(); + $self->GenerateRequiredLegend(); + $self->GenerateActions(); + $self->GenerateFormEnd(); + print "<div class='Content'>\n"; ### Get the sorted VMs list @@ -176,7 +208,7 @@ sub GenerateBody($) my $VMs = CreateVMs(); $VMs->FilterEnabledRole(); my @SortedVMs = sort _CompareVMs @{$VMs->GetItems()}; - my $Stats = GetStatistics($VMs); + my $Stats = GetStatistics($VMs, $self->{Days} * 24 * 60 * 60); ### Show global statistics @@ -342,9 +374,51 @@ sub GenerateBody($) print "</tbody></table></div>\n"; } +sub GetPropertyDescriptors($) +{ + my ($self) = @_; + + $self->{PropertyDescriptors} ||= [ + CreateBasicPropertyDescriptor("Days", "Days to analyze", !1, !1, "N", 2), + ]; + + return $self->SUPER::GetPropertyDescriptors(); +} + +sub GetDisplayValue($$) +{ + my ($self, $PropertyDescriptor) = @_; + + return $self->{$PropertyDescriptor->GetName()}; +} + +sub GetActions($) +{ + my ($self) = @_; + + my $Actions = $self->SUPER::GetActions(); + push @$Actions, "Update"; + return $Actions; +} + +sub OnAction($$) +{ + my ($self, $Action) = @_; + + if ($Action eq "Update") + { + return $self->Validate() ? 1 : undef; + } + + return $self->SUPER::OnAction($Action); +} + sub GenerateFooter($) { my ($self) = @_; + + return $self->SUPER::GenerateFooter() if ($self->{NoStats}); + print "<p></p><div class='CollectionBlock'><table>\n"; print "<thead><tr><th class='Record'>Legend</th></tr></thead>\n"; print "<tbody><tr><td class='Record'>\n"; -- 2.20.1

1 0

[PATCH] testbot: Always update the VM guest time after a revert.
by Francois Gouget Oct. 24, 2019

Oct. 24, 2019

All VMs support it nowadays and having the current time is important not only for the tests but also for builds (due to a ccache bug). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- See also: https://github.com/ccache/ccache/issues/480 testbot/bin/LibvirtTool.pl | 16 ++++++++++++++++ testbot/bin/WineRunTask.pl | 13 ------------- testbot/bin/WineRunWineTest.pl | 13 ------------- 3 files changed, 16 insertions(+), 26 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index d5901910c..127c15c5c 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -420,6 +420,22 @@ sub SetupTestAgentd($$$$) # A side effect is that it will force TestAgentd.exe.old to stay around. } + # Always update the guest's system time + # This is needed not only for the tests (date is important when checking + # HTTPS certificates), but also for the build (if the time moves forward + # during the build some ccache versions will return a compilation error). + if (!$TA->SetTime()) + { + # Not a fatal error. Try the next port in case the VM runs a privileged + # TestAgentd daemon there. + my $PrivilegedTA = $VM->GetAgent(1); + if (!$PrivilegedTA->SetTime()) + { + FatalError("Unable to set the VM system time: ". $PrivilegedTA->GetLastError() ."\n"); + } + $PrivilegedTA->Disconnect(); + } + if ($Booting and $VM->Type eq "wine") { # Make sure the X session has had time to start diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index c862ddd81..57535af18 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -433,19 +433,6 @@ my $Mission = $Missions->[0]->{Missions}->[0]; # my $TA = $VM->GetAgent(); -Debug(Elapsed($Start), " Setting the time\n"); -if (!$TA->SetTime()) -{ - # Not a fatal error. Try the next port in case the VM runs a privileged - # TestAgentd daemon there. - my $PrivilegedTA = $VM->GetAgent("privileged"); - if (!$PrivilegedTA->SetTime()) - { - LogTaskError("Unable to set the VM system time: ". $PrivilegedTA->GetLastError() .". Maybe the TestAgentd process is missing the required privileges.\n"); - $PrivilegedTA->Disconnect(); - } -} - my $FileName = $Step->FileName; Debug(Elapsed($Start), " Sending '". $Step->GetFullFileName() ."'\n"); if (!$TA->SendFile($Step->GetFullFileName(), $FileName, 0)) diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 4b66ee226..f837f9e38 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -432,19 +432,6 @@ $TaskMissions = $Missions->[0]; # Setup the VM # my $TA = $VM->GetAgent(); -Debug(Elapsed($Start), " Setting the time\n"); -if (!$TA->SetTime()) -{ - # Not a fatal error. Try the next port in case the VM runs a privileged - # TestAgentd daemon there. - my $PrivilegedTA = $VM->GetAgent(1); - if (!$PrivilegedTA->SetTime()) - { - LogTaskError("Unable to set the VM system time: ". $PrivilegedTA->GetLastError() .". Maybe the TestAgentd process is missing the required privileges.\n"); - $PrivilegedTA->Disconnect(); - } -} - my $FileName = $Step->FileName; if (defined $FileName) { -- 2.20.1

1 0

[PATCH] user32/static: Return MA_NOACTIVATE for WM_MOUSEACTIVATE message
by Alistair Leslie-Hughes Oct. 24, 2019

Oct. 24, 2019

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/user32/static.c | 3 +++ dlls/user32/tests/static.c | 21 +++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/dlls/user32/static.c b/dlls/user32/static.c index 1f7c03121c3..1e74f92a3fd 100644 --- a/dlls/user32/static.c +++ b/dlls/user32/static.c @@ -493,6 +493,9 @@ LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam MAKEWPARAM( GetWindowLongPtrW(hwnd,GWLP_ID), STN_DBLCLK ), (LPARAM)hwnd); return 0; + case WM_MOUSEACTIVATE: + return MA_NOACTIVATE; + case STM_GETIMAGE: return (LRESULT)STATIC_GetImage( hwnd, wParam, full_style ); diff --git a/dlls/user32/tests/static.c b/dlls/user32/tests/static.c index 8776c3a9e07..91e2a5b32e7 100644 --- a/dlls/user32/tests/static.c +++ b/dlls/user32/tests/static.c @@ -130,6 +130,26 @@ static void test_set_text(void) DestroyWindow(hStatic); } +static void test_mouse_activate(void) +{ + LRESULT ma; + HWND hStatic = build_static(SS_SIMPLE); + + ma = SendMessageW( hStatic, WM_MOUSEACTIVATE, (WPARAM)GetAncestor( hStatic, GA_ROOT ), + MAKELONG(HTCAPTION,WM_LBUTTONDOWN) ); + ok(ma == MA_NOACTIVATE, "got %d\n", ma); + + DestroyWindow(hStatic); + + hStatic = CreateWindowA("static", "Test2", WS_VISIBLE, 5, 5, 100, 100, NULL, NULL, NULL, NULL); + + ma = SendMessageW( hStatic, WM_MOUSEACTIVATE, (WPARAM)GetAncestor( hStatic, GA_ROOT ), + MAKELONG(HTCAPTION,WM_LBUTTONDOWN) ); + ok(ma == MA_NOACTIVATE, "got %d\n", ma); + + DestroyWindow(hStatic); +} + START_TEST(static) { static const char szClassName[] = "testclass"; @@ -162,6 +182,7 @@ START_TEST(static) test_updates(SS_ETCHEDHORZ, TODO_COUNT); test_updates(SS_ETCHEDVERT, TODO_COUNT); test_set_text(); + test_mouse_activate(); DestroyWindow(hMainWnd); } -- 2.23.0

3 2

[PATCH] wininet/tests: Fix some test failures on Windows.
by Sven Baars Oct. 24, 2019

Oct. 24, 2019

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- What happened with the previous test was that on machines where it succeeded a file was created with the name "actualuser(a)_user@http_[1]". This appears to be because the file name is split on ":", and the space is replaced by "_". Now when we remove "http://" CreateUrlCacheEntryW and CreateUrlCacheEntryA will actually create files with different names (because of encoding differences), which means the test fails. When we remove the "user@" (which would make sense since the file start with "actualuser(a)user@" instead of just "user@") CreateUrlCacheEntryW fails with ERROR_INVALID_PARAMETER. So I instead just changed it to not include the unicode characters. dlls/wininet/tests/urlcache.c | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index c5e72ae82b..a38ed9bc5b 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -877,9 +877,8 @@ static void test_urlcacheW(void) "", {0}, {0} }, { - 0, {'C','o','o','k','i','e',':',' ','u','s','e','r','@','h','t','t','p', - ':','/','/','t',0x15b,0x107,'.','o','r','g','/',0}, - "Cookie: user(a)http://t\xc5\x9b\xc4\x87.org/", {0}, {0} + 0, {'C','o','o','k','i','e',':',' ','u','s','e','r','@','t','e','s','t','.','o','r','g','/',0}, + "Cookie: user(a)test.org/", {0}, {0} } }; static const FILETIME filetime_zero; @@ -893,24 +892,11 @@ static void test_urlcacheW(void) return; } - if(ie10_cache) { - if(!MultiByteToWideChar(CP_ACP, 0, urls[6].encoded_url, -1, - urls[6].url, ARRAY_SIZE(urls[6].url))) - urls[6].url[0] = 0; - - trace("converted url in test 6: %s\n", wine_dbgstr_w(urls[6].url)); - } - for(i=0; i<ARRAY_SIZE(urls); i++) { INTERNET_CACHE_ENTRY_INFOA *entry_infoA; INTERNET_CACHE_ENTRY_INFOW *entry_infoW; DWORD size; - if(!urls[i].url[0]) { - win_skip("No UTF16 version of url (%d)\n", i); - continue; - } - SetLastError(0xdeadbeef); ret = CreateUrlCacheEntryW(urls[i].url, 0, NULL, bufW, 0); if(urls[i].err != 0) { @@ -937,10 +923,6 @@ static void test_urlcacheW(void) ret = GetUrlCacheEntryInfoA(urls[i].encoded_url, NULL, &size); ok(!ret && GetLastError()==ERROR_INSUFFICIENT_BUFFER, "%d) GetLastError() = %d\n", i, GetLastError()); - if(!ret && GetLastError()!=ERROR_INSUFFICIENT_BUFFER) { - win_skip("ANSI version of url is incorrect\n"); - continue; - } entry_infoA = HeapAlloc(GetProcessHeap(), 0, size); ret = GetUrlCacheEntryInfoA(urls[i].encoded_url, entry_infoA, &size); ok(ret, "%d) GetUrlCacheEntryInfoA failed: %d\n", i, GetLastError()); -- 2.17.1

2 1

[PATCH] shell32/tests: Relax some tests to fix failures on Win10.
by Nikolay Sivov Oct. 24, 2019

Oct. 24, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shell32/tests/shlfolder.c | 36 ++++++++++++++++------------------ 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 87e9141987..ebeaf4e20e 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -336,11 +336,11 @@ static void test_EnumObjects(IShellFolder *iFolder) /* Don't test for SFGAO_HASSUBFOLDER since we return real state and native cached */ static const ULONG attrs[5] = { - SFGAO_CAPABILITYMASK | SFGAO_FILESYSTEM | SFGAO_FOLDER | SFGAO_FILESYSANCESTOR, - SFGAO_CAPABILITYMASK | SFGAO_FILESYSTEM | SFGAO_FOLDER | SFGAO_FILESYSANCESTOR, - SFGAO_CAPABILITYMASK | SFGAO_FILESYSTEM, - SFGAO_CAPABILITYMASK | SFGAO_FILESYSTEM, - SFGAO_CAPABILITYMASK | SFGAO_FILESYSTEM, + SFGAO_DROPTARGET | SFGAO_CANLINK | SFGAO_CANCOPY | SFGAO_FILESYSTEM | SFGAO_FOLDER | SFGAO_FILESYSANCESTOR, + SFGAO_DROPTARGET | SFGAO_CANLINK | SFGAO_CANCOPY | SFGAO_FILESYSTEM | SFGAO_FOLDER | SFGAO_FILESYSANCESTOR, + SFGAO_DROPTARGET | SFGAO_CANLINK | SFGAO_CANCOPY | SFGAO_FILESYSTEM, + SFGAO_DROPTARGET | SFGAO_CANLINK | SFGAO_CANCOPY | SFGAO_FILESYSTEM, + SFGAO_DROPTARGET | SFGAO_CANLINK | SFGAO_CANCOPY | SFGAO_FILESYSTEM, }; static const ULONG full_attrs[5] = { @@ -380,30 +380,28 @@ static void test_EnumObjects(IShellFolder *iFolder) ok(hr == iResults[i][j], "Got %x expected [%d]-[%d]=%x\n", hr, i, j, iResults[i][j]); } - - for (i = 0; i < 5; i++) + for (i = 0; i < ARRAY_SIZE(attrs); ++i) { SFGAOF flags; -#define SFGAO_VISTA SFGAO_DROPTARGET | SFGAO_CANLINK | SFGAO_CANCOPY - /* Native returns all flags no matter what we ask for */ + flags = SFGAO_CANCOPY; hr = IShellFolder_GetAttributesOf(iFolder, 1, (LPCITEMIDLIST*)(idlArr + i), &flags); flags &= SFGAO_testfor; - ok(hr == S_OK, "GetAttributesOf returns %08x\n", hr); - ok(flags == (attrs[i]) || - flags == ((attrs[i] & ~SFGAO_CAPABILITYMASK) | SFGAO_VISTA), /* Vista and higher */ - "GetAttributesOf[%i] got %08x, expected %08x\n", i, flags, attrs[i]); + ok(hr == S_OK, "Failed to get item attributes, hr %#x.\n", hr); + ok((flags & attrs[i]) == attrs[i], "%i: unexpected attributes got %#x, expected %#x.\n", i, flags, attrs[i]); flags = SFGAO_testfor; hr = IShellFolder_GetAttributesOf(iFolder, 1, (LPCITEMIDLIST*)(idlArr + i), &flags); flags &= SFGAO_testfor; - ok(hr == S_OK, "GetAttributesOf returns %08x\n", hr); - ok(flags == attrs[i], "GetAttributesOf[%i] got %08x, expected %08x\n", i, flags, attrs[i]); + ok(hr == S_OK, "Failed to get item attributes, hr %#x.\n", hr); + ok(flags == (attrs[i] | SFGAO_CAPABILITYMASK), "%i: unexpected attributes got %#x, expected %#x.\n", + i, flags, attrs[i]); flags = ~0u; hr = IShellFolder_GetAttributesOf(iFolder, 1, (LPCITEMIDLIST*)(idlArr + i), &flags); - ok(hr == S_OK, "GetAttributesOf returns %08x\n", hr); - ok((flags & ~(SFGAO_HASSUBFOLDER|SFGAO_COMPRESSED)) == full_attrs[i], "%d: got %08x expected %08x\n", i, flags, full_attrs[i]); + ok(hr == S_OK, "Failed to get item attributes, hr %#x.\n", hr); + ok((flags & ~(SFGAO_HASSUBFOLDER|SFGAO_COMPRESSED)) == full_attrs[i], "%d: unexpected attributes %#x, expected %#x\n", + i, flags, full_attrs[i]); } for (i=0;i<5;i++) @@ -5263,7 +5261,7 @@ static void test_SHGetSetFolderCustomSettings(void) if (!pSHGetSetFolderCustomSettings) { - win_skip("SHGetSetFolderCustomSetting not exported by name (only by ordinal) for version XP/win2003\n"); + win_skip("SHGetSetFolderCustomSetting is not available.\n"); return; } @@ -5294,7 +5292,7 @@ static void test_SHGetSetFolderCustomSettings(void) todo_wine ok(!lstrcmpiW(iconpathW, fcs.pszIconFile), "Expected %s, got %s\n", wine_dbgstr_w(iconpathW), wine_dbgstr_w(fcs.pszIconFile)); hr = pSHGetSetFolderCustomSettings(&fcs, NULL, FCS_READ); - ok(hr == E_FAIL, "Expected E_FAIL, got %#x\n", hr); + ok(FAILED(hr), "Unexpected hr %#x.\n", hr); lstrcpyW(bufferW, pathW); lstrcatW(bufferW, desktop_iniW); -- 2.23.0

2 1

[PATCH v2] setupapi/tests: use the inline heap_* functions
by Vijay Kiran Kamuju Oct. 24, 2019

Oct. 24, 2019

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/setupapi/tests/install.c | 11 ++++++----- dlls/setupapi/tests/misc.c | 9 +++++---- dlls/setupapi/tests/query.c | 20 +++++++++++--------- 3 files changed, 22 insertions(+), 18 deletions(-) diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index fd10fd913323..289328eed5a7 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -33,6 +33,7 @@ #include "shlobj.h" #include "fci.h" +#include "wine/heap.h" #include "wine/test.h" static const char inffile[] = "test.inf"; @@ -86,12 +87,12 @@ static BOOL file_exists(const char *path) static void * CDECL mem_alloc(ULONG cb) { - return HeapAlloc(GetProcessHeap(), 0, cb); + return heap_alloc(cb); } static void CDECL mem_free(void *memory) { - HeapFree(GetProcessHeap(), 0, memory); + heap_free(memory); } static BOOL CDECL get_next_cabinet(PCCAB pccab, ULONG cbPrevCab, void *pv) @@ -189,17 +190,17 @@ static BOOL CDECL get_temp_file(char *pszTempName, int cbTempName, void *pv) { LPSTR tempname; - tempname = HeapAlloc(GetProcessHeap(), 0, MAX_PATH); + tempname = heap_alloc(MAX_PATH); GetTempFileNameA(".", "xx", 0, tempname); if (tempname && (strlen(tempname) < (unsigned)cbTempName)) { lstrcpyA(pszTempName, tempname); - HeapFree(GetProcessHeap(), 0, tempname); + heap_free(tempname); return TRUE; } - HeapFree(GetProcessHeap(), 0, tempname); + heap_free(tempname); return FALSE; } diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index 3bb308ef4a74..9477d4a63126 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -31,6 +31,7 @@ #include "setupapi.h" #include "cfgmgr32.h" +#include "wine/heap.h" #include "wine/test.h" static CHAR CURR_DIR[MAX_PATH]; @@ -105,7 +106,7 @@ static void test_original_file_name(LPCSTR original, LPCSTR dest) res = SetupGetInfInformationA(hinf, INFINFO_INF_SPEC_IS_HINF, NULL, 0, &size); ok(res, "SetupGetInfInformation failed with error %d\n", GetLastError()); - pspii = HeapAlloc(GetProcessHeap(), 0, size); + pspii = heap_alloc(size); res = SetupGetInfInformationA(hinf, INFINFO_INF_SPEC_IS_HINF, pspii, size, NULL); ok(res, "SetupGetInfInformation failed with error %d\n", GetLastError()); @@ -121,7 +122,7 @@ static void test_original_file_name(LPCSTR original, LPCSTR dest) ok(!spofi.OriginalCatalogName[0], "spofi.OriginalCatalogName should have been \"\" instead of \"%s\"\n", spofi.OriginalCatalogName); ok(!strcmp(original, spofi.OriginalInfName), "spofi.OriginalInfName of %s didn't match real original name %s\n", spofi.OriginalInfName, original); - HeapFree(GetProcessHeap(), 0, pspii); + heap_free(pspii); SetupCloseInfFile(hinf); } @@ -367,12 +368,12 @@ static BOOL compare_file_data(LPSTR file, const BYTE *data, DWORD size) LPBYTE buffer; handle = CreateFileA(file, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - buffer = HeapAlloc(GetProcessHeap(), 0, size); + buffer = heap_alloc(size); if (buffer) { ReadFile(handle, buffer, size, &read, NULL); if (read == size && !memcmp(data, buffer, size)) ret = TRUE; - HeapFree(GetProcessHeap(), 0, buffer); + heap_free(buffer); } CloseHandle(handle); return ret; diff --git a/dlls/setupapi/tests/query.c b/dlls/setupapi/tests/query.c index 6b6d1bd5c296..00b03b653809 100644 --- a/dlls/setupapi/tests/query.c +++ b/dlls/setupapi/tests/query.c @@ -21,6 +21,8 @@ #include <stdio.h> #include <windows.h> #include <setupapi.h> + +#include "wine/heap.h" #include "wine/test.h" static CHAR CURR_DIR[MAX_PATH]; @@ -120,7 +122,7 @@ static BOOL check_info_filename(PSP_INF_INFORMATION info, LPSTR test) if (!SetupQueryInfFileInformationA(info, 0, NULL, 0, &size)) return FALSE; - filename = HeapAlloc(GetProcessHeap(), 0, size); + filename = heap_alloc(size); if (!filename) return FALSE; @@ -129,7 +131,7 @@ static BOOL check_info_filename(PSP_INF_INFORMATION info, LPSTR test) if (!lstrcmpiA(test, filename)) ret = TRUE; - HeapFree(GetProcessHeap(), 0, filename); + heap_free(filename); return ret; } @@ -142,7 +144,7 @@ static PSP_INF_INFORMATION alloc_inf_info(LPCSTR filename, DWORD search, PDWORD if (!ret) return NULL; - info = HeapAlloc(GetProcessHeap(), 0, *size); + info = heap_alloc(*size); return info; } @@ -234,7 +236,7 @@ static void test_SetupGetInfInformation(void) ret = SetupGetInfInformationA(inf_filename, INFINFO_INF_NAME_IS_ABSOLUTE, NULL, size, NULL); ok(ret == FALSE, "Expected SetupGetInfInformation to fail\n"); - info = HeapAlloc(GetProcessHeap(), 0, size); + info = heap_alloc(size); /* try valid ReturnBuffer but too small size */ SetLastError(0xbeefcafe); @@ -248,7 +250,7 @@ static void test_SetupGetInfInformation(void) ok(ret == TRUE, "Expected SetupGetInfInformation to succeed\n"); ok(check_info_filename(info, inf_filename), "Expected returned filename to be equal\n"); - HeapFree(GetProcessHeap(), 0, info); + heap_free(info); /* try the INFINFO_INF_SPEC_IS_HINF search flag */ hinf = SetupOpenInfFileA(inf_filename, NULL, INF_STYLE_WIN4, NULL); @@ -269,7 +271,7 @@ static void test_SetupGetInfInformation(void) } ok(ret, "can't create inf file %u\n", GetLastError()); - HeapFree(GetProcessHeap(), 0, info); + heap_free(info); info = alloc_inf_info("test.inf", INFINFO_DEFAULT_SEARCH, &size); /* check if system32 is searched for inf */ @@ -284,7 +286,7 @@ static void test_SetupGetInfInformation(void) lstrcatA(inf_one, "test.inf"); create_inf_file(inf_one, inf_data1, sizeof(inf_data1) - 1); - HeapFree(GetProcessHeap(), 0, info); + heap_free(info); info = alloc_inf_info("test.inf", INFINFO_DEFAULT_SEARCH, &size); /* test the INFINFO_DEFAULT_SEARCH search flag */ @@ -292,7 +294,7 @@ static void test_SetupGetInfInformation(void) ok(ret == TRUE, "Expected SetupGetInfInformation to succeed: %d\n", GetLastError()); ok(check_info_filename(info, inf_one), "Expected returned filename to be equal\n"); - HeapFree(GetProcessHeap(), 0, info); + heap_free(info); info = alloc_inf_info("test.inf", INFINFO_REVERSE_DEFAULT_SEARCH, &size); /* test the INFINFO_REVERSE_DEFAULT_SEARCH search flag */ @@ -301,7 +303,7 @@ static void test_SetupGetInfInformation(void) ok(check_info_filename(info, revfile), "Expected returned filename to be equal\n"); done: - HeapFree(GetProcessHeap(), 0, info); + heap_free(info); DeleteFileA(inf_filename); DeleteFileA(inf_one); DeleteFileA(inf_two); -- 2.21.0

1 0