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

Henri Verbeet : wined3d: Explicitly calculate the sub-resource level in surface_load_drawable().
by Alexandre Julliard 01 Mar '18

01 Mar '18

Module: wine Branch: master Commit: 4d84feb542592271afec1b9e7cef7a3b1dec1670 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d84feb542592271afec1b9e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 1 10:04:53 2018 +0330 wined3d: Explicitly calculate the sub-resource level in surface_load_drawable(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b6235ce..a339171 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2226,6 +2226,7 @@ static BOOL surface_load_drawable(struct wined3d_surface *surface, struct wined3d_texture *texture = surface->container; struct wined3d_surface *restore_rt = NULL; struct wined3d_device *device; + unsigned int level; RECT r; if (texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) @@ -2250,8 +2251,9 @@ static BOOL surface_load_drawable(struct wined3d_surface *surface, else restore_rt = NULL; - SetRect(&r, 0, 0, wined3d_texture_get_level_width(texture, surface->texture_level), - wined3d_texture_get_level_height(texture, surface->texture_level)); + level = sub_resource_idx % texture->level_count; + SetRect(&r, 0, 0, wined3d_texture_get_level_width(texture, level), + wined3d_texture_get_level_height(texture, level)); wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); device->blitter->ops->blitter_blit(device->blitter, WINED3D_BLIT_OP_COLOR_BLIT, context, surface, WINED3D_LOCATION_TEXTURE_RGB, &r,

1 0

Henri Verbeet : wined3d: Explicitly calculate the sub-resource level in surface_load_texture().
by Alexandre Julliard 01 Mar '18

01 Mar '18

Module: wine Branch: master Commit: 4fc70a3b6a0ad9261bc4499df63f7168abe97d44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fc70a3b6a0ad9261bc4499d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 1 10:04:54 2018 +0330 wined3d: Explicitly calculate the sub-resource level in surface_load_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a339171..c82da87 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2269,7 +2269,7 @@ static BOOL surface_load_drawable(struct wined3d_surface *surface, static BOOL surface_load_texture(struct wined3d_surface *surface, struct wined3d_context *context, BOOL srgb) { - unsigned int width, height, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch; + unsigned int width, height, level, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch; unsigned int sub_resource_idx = surface_get_sub_resource_idx(surface); const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_texture *texture = surface->container; @@ -2295,8 +2295,9 @@ static BOOL surface_load_texture(struct wined3d_surface *surface, return TRUE; } - width = wined3d_texture_get_level_width(texture, surface->texture_level); - height = wined3d_texture_get_level_height(texture, surface->texture_level); + level = sub_resource_idx % texture->level_count; + width = wined3d_texture_get_level_width(texture, level); + height = wined3d_texture_get_level_height(texture, level); SetRect(&src_rect, 0, 0, width, height); if (!depth && sub_resource->locations & (WINED3D_LOCATION_TEXTURE_SRGB | WINED3D_LOCATION_TEXTURE_RGB) @@ -2360,7 +2361,7 @@ static BOOL surface_load_texture(struct wined3d_surface *surface, wined3d_texture_prepare_texture(texture, context, srgb); wined3d_texture_bind_and_dirtify(texture, context, srgb); - wined3d_texture_get_pitch(texture, surface->texture_level, &src_row_pitch, &src_slice_pitch); + wined3d_texture_get_pitch(texture, level, &src_row_pitch, &src_slice_pitch); format = *texture->resource.format; if ((conversion = wined3d_format_get_color_key_conversion(texture, TRUE)))

1 0

Michael Müller : fonts/tahoma.sfd: Add glyphs U+FB01 and U+FB02.
by Alexandre Julliard 01 Mar '18

01 Mar '18

Module: wine Branch: master Commit: e2cbfb68ad63e01384826f4d509cd257280b1197 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2cbfb68ad63e01384826f4d… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Feb 28 23:22:01 2018 -0600 fonts/tahoma.sfd: Add glyphs U+FB01 and U+FB02. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- fonts/tahoma.sfd | 16 ++++++++++++++++ fonts/tahoma.ttf | Bin 143652 -> 143884 bytes 2 files changed, 16 insertions(+) diff --git a/fonts/tahoma.sfd b/fonts/tahoma.sfd index 3d6b44e..466f250 100644 --- a/fonts/tahoma.sfd +++ b/fonts/tahoma.sfd @@ -24398,6 +24398,10 @@ BDFChar: 252 8364 7 0 5 0 8 4@"GpJGap_49,?] BDFChar: 253 8482 11 1 9 5 8 k^ZBX8q9H_ +BDFChar: 266 64257 6 0 5 0 9 +0LS1u6psF26pq"T +BDFChar: 267 64258 6 0 5 0 9 +1djb(6psF26pq"T BDFChar: 280 278 7 0 5 0 10 &-2WYJ:RQJJ:ROt BDFChar: 306 279 6 0 5 0 8 @@ -25127,6 +25131,10 @@ BDFChar: 252 8364 7 0 5 0 8 4@"GpJGap_49,?] BDFChar: 253 8482 11 1 9 5 8 k^ZBX8q9H_ +BDFChar: 266 64257 7 0 5 0 9 +0LS1u6psF26pq"T +BDFChar: 267 64258 7 0 5 0 9 +1djb(6psF26pq"T BDFChar: 280 278 7 1 6 0 11 0JEM)J:RQJJ:N1J BDFChar: 306 279 7 0 5 0 8 @@ -25856,6 +25864,10 @@ BDFChar: 252 8364 8 0 6 0 10 *$RXur.+]q5U%0J BDFChar: 253 8482 13 0 11 6 10 q(a)Fl*,1%O\+qO_S +BDFChar: 266 64257 8 0 6 0 11 +3'okqnj5Z06:+"* +BDFChar: 267 64258 8 0 6 0 11 +3^Q/"nj5Z06:+"* BDFChar: 280 278 8 1 7 0 12 &-2][J:RWLJ:N0#rVuou BDFChar: 306 279 8 0 6 0 10 @@ -26585,6 +26597,10 @@ BDFChar: 252 8364 9 0 7 0 11 %M9gK5lO%J5TgXK BDFChar: 253 8482 14 1 12 7 11 q(a)Fl*,1%O\+qO_S +BDFChar: 266 64257 9 0 6 0 12 +3'oqsnj5Z06:+"*63$uc +BDFChar: 267 64258 8 0 6 0 12 +3^Q/"nj5Z06:+"*63$uc BDFChar: 280 278 9 1 8 0 14 (`38QJ:N0#s+#WMJ:RY" BDFChar: 306 279 8 0 6 0 11 diff --git a/fonts/tahoma.ttf b/fonts/tahoma.ttf index 4f68d1e..8bee8ad 100644 Binary files a/fonts/tahoma.ttf and b/fonts/tahoma.ttf differ

1 0

Dmitry Timoshkov : secur32: Fix GetComputerObjectNameW for the cases of NULL or insufficient buffer size.
by Alexandre Julliard 01 Mar '18

01 Mar '18

Module: wine Branch: master Commit: 652090f598facd514fd55106abf54443adcaf4f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=652090f598facd514fd55106… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 1 16:25:44 2018 +0800 secur32: Fix GetComputerObjectNameW for the cases of NULL or insufficient buffer size. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/secur32.c | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index 4408e7c..889883c 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -996,29 +996,21 @@ BOOLEAN WINAPI GetComputerObjectNameW( if (GetComputerNameW(name, &size)) { DWORD len = domainInfo->Name.Length + size + 3; - if (lpNameBuffer) + if (lpNameBuffer && *nSize >= len) { - if (*nSize < len) - { - *nSize = len; - SetLastError(ERROR_INSUFFICIENT_BUFFER); - status = FALSE; - } - else - { - WCHAR bs[] = { '\\', 0 }; - WCHAR ds[] = { '$', 0 }; - lstrcpyW(lpNameBuffer, domainInfo->Name.Buffer); - lstrcatW(lpNameBuffer, bs); - lstrcatW(lpNameBuffer, name); - lstrcatW(lpNameBuffer, ds); - status = TRUE; - } + WCHAR bs[] = { '\\', 0 }; + WCHAR ds[] = { '$', 0 }; + lstrcpyW(lpNameBuffer, domainInfo->Name.Buffer); + lstrcatW(lpNameBuffer, bs); + lstrcatW(lpNameBuffer, name); + lstrcatW(lpNameBuffer, ds); + status = TRUE; } else /* just requesting length required */ { *nSize = len; - status = TRUE; + SetLastError(ERROR_INSUFFICIENT_BUFFER); + status = FALSE; } } else

1 0

Francois Gouget : testbot: Allow multiple VMs to share access to a hypervisor domain.
by Alexandre Julliard 01 Mar '18

01 Mar '18

Module: tools Branch: master Commit: 035ad3d5ab6ec66d91d10961bf834db5f0c6d7eb URL: https://source.winehq.org/git/tools.git/?a=commit;h=035ad3d5ab6ec66d91d1096… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 1 11:02:25 2018 +0100 testbot: Allow multiple VMs to share access to a hypervisor domain. This makes it possible to define two or more VM instances that have the same VirtURI and VirtDomain values and differ only in their IdleSnapshot field. This can be used to perform tests on multiple configurations of a given Windows version, such as testing different locales, etc. However a hypervisor domain only has one current snapshot. So the TestBot can only use one of the VM instances that depend on this hypervisor domain at any time. An important consequence is that $VM->Status does not necessarily matches the state of the hypervisor domain. So $VM->Status == off does not mean that the TestBot is free to revert the domain to that VM snapshot. The status of the other VMs using the same hypervisor domain much be checked first. This is handled by some extra _CanScheduleOnVM() calls. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Jobs.pm | 91 ++++++++++++++++++++++++++++++++++------- 1 file changed, 77 insertions(+), 14 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index eea1686..b870d7b 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -519,22 +519,67 @@ sub _GetMaxReverts($) Checks if a task or VM operation can be performed on the specified VM. +We allow multiple VM instances to refer to different snapshots of the same +hypervisor domain (that is VM objects that have identical VirtURI and +VirtDomain fields but different values for IdleSnapshot). This is typically +used to test different configurations of the same base virtual machine. + +However a hypervisor domain cannot run two snapshots simultaneously so this +function is used to ensure the scheduler does not simultaneously assign the +same hypervisor domain to two VM instances. + =back =cut -sub _CanScheduleOnVM($$) +sub _CanScheduleOnVM($$;$) { - my ($Sched, $VM) = @_; + my ($Sched, $VM, $Steal) = @_; + + my $DomainKey = $VM->VirtURI ." ". $VM->VirtDomain; + my $DomainVM = $Sched->{domains}->{$DomainKey}; - return 1 if ($VM->Status eq "off"); + if (!$DomainVM or $DomainVM->Status eq "off") + { + $Sched->{domains}->{$DomainKey} = $VM; + return 1; + } - # If the VM is busy it cannot be taken over for a new task my $VMKey = $VM->GetKey(); - return 0 if ($Sched->{busyvms}->{$VMKey}); + if ($Sched->{busyvms}->{$VMKey}) + { + # If the VM is busy it cannot be taken over for a new task + return 0; + } + + my $DomainVMKey = $DomainVM->GetKey(); + if ($VMKey eq $DomainVMKey) + { + # Already ours. Use it if it is not busy + return !$VM->ChildPid; + } - # A process may be working on the VM even though it is not busy (e.g. if it - # is sleeping). In that case just wait. - return !$VM->ChildPid; + # We cannot schedule anything on this VM if we cannot take the hypervisor + # domain from its current owner. Note that we can always take over dirty VMs + # if we did not start an operation on them yet (i.e. if they are in lambvms). + if (!$Sched->{lambvms}->{$DomainVMKey} or + (!$Steal and ($VM->Status eq "off" or $DomainVM->Status ne "dirty"))) + { + return 0; + } + + # $DomainVM is either dirty (with no child process), idle or sleeping. + # Just mark it off and let the caller poweroff or revert the + # hypervisor domain as needed for the new VM. + $DomainVM->KillChild(); # For the sleeping case + my $Host = _GetSchedHost($Sched, $DomainVM); + $Host->{$DomainVM->Status}--; + $Host->{active}--; + $DomainVM->Status("off"); + $DomainVM->Save(); + # off VMs are neither in busyvms nor lambvms + delete $Sched->{lambvms}->{$DomainVMKey}; + $Sched->{domains}->{$DomainKey} = $VM; + return 1; } =pod @@ -542,8 +587,8 @@ sub _CanScheduleOnVM($$) =item C<_CheckAndClassifyVMs()> -Checks the VMs state consistency, counts the VMs in each state and classifies -them. +Checks the VMs state consistency, counts the VMs in each state, classifies +them, and determines which VM owns each hypervisor domain. =over @@ -577,6 +622,14 @@ Puts the VMs in one of three sets: =item * +Determines which VM should have exclusive access to each hypervisor domain. +This is normally the VM that is currently using it, but if all a given +hypervisor domain's VMs are off, one of them is picked at random. In any case +if a VM is not in the busyvms set, the hypervisor domain can be taken away from +it if necessary. + +=item * + Each VM is given a priority describing the likelihood that it will be needed by a future job. When no other VM is running this can be used to decide which VMs to start in advance. @@ -699,8 +752,11 @@ sub _CheckAndClassifyVMs() } elsif ($VM->Status eq "offline") { - my $ErrMessage = $VM->RunMonitor(); - return ($ErrMessage, undef) if (defined $ErrMessage); + if (_CanScheduleOnVM($Sched, $VM)) + { + my $ErrMessage = $VM->RunMonitor(); + return ($ErrMessage, undef) if (defined $ErrMessage); + } # Ignore the VM for this round since we cannot use it $Sched->{busyvms}->{$VMKey} = 1; } @@ -720,6 +776,8 @@ sub _CheckAndClassifyVMs() # Note that off VMs are neither in busyvms nor lambvms } + _CanScheduleOnVM($Sched, $VM); + $Sched->{nicefuture}->{$VMKey} = ($VM->Role eq "base" ? 0 : $VM->Role eq "winetest" ? 10 : @@ -965,7 +1023,8 @@ sub _ScheduleTasks($) # count them against the running VM limit. if ($Host->{sleeping} + $Host->{running} + $Host->{dirty} < $Host->{MaxRunningVMs} and ($Host->{reverting} == 0 or - $Host->{reverting} <= $Host->{MaxRevertsWhileRunningVMs})) + $Host->{reverting} <= $Host->{MaxRevertsWhileRunningVMs}) and + _CanScheduleOnVM($Sched, $VM)) { $Sched->{busyvms}->{$VMKey} = 1; $VM->RecordStatus($Sched->{records}, join(" ", "running", $Job->Id, $Step->No, $Task->No)); @@ -1159,7 +1218,10 @@ sub _RevertVMs($$) # Skip this VM if the previous step's tasks are not about to run yet next if (_HasMissingDependencies($Sched, $NeededVMs, $VMKey)); - next if (!_CanScheduleOnVM($Sched, $VM)); + + # Don't steal the hypervisor domain for a VM we will only need later + my $Steal = (_GetNiceness($NeededVMs, $VMKey) < $NEXT_BASE); + next if (!_CanScheduleOnVM($Sched, $VM, $Steal)); my $NeedsSacrifice; if (_GetNiceness($NeededVMs, $VMKey) >= $FUTURE_BASE) @@ -1224,6 +1286,7 @@ sub _PowerOffDirtyVMs($) { my $VM = $Sched->{VMs}->GetItem($VMKey); next if ($VM->Status ne "dirty"); + next if (!_CanScheduleOnVM($Sched, $VM)); $VM->RecordStatus($Sched->{records}, "dirty poweroff"); my $ErrMessage = $VM->RunPowerOff();

1 0