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

Piotr Caban : user32: Fix itemData passed in ListBox WM_MEASUREITEM message.
by Alexandre Julliard March 1, 2018

March 1, 2018

Module: wine Branch: master Commit: 3c5c9b157771828419cb5d7e831d46813ede041f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c5c9b157771828419cb5d7e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 28 17:36:51 2018 +0100 user32: Fix itemData passed in ListBox WM_MEASUREITEM message. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index f6b936a..8df6763 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -1538,7 +1538,7 @@ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, RtlMoveMemory( item + 1, item, (descr->nb_items - index) * sizeof(LB_ITEMDATA) ); item->str = str; - item->data = data; + item->data = HAS_STRINGS(descr) ? 0 : data; item->height = 0; item->selected = FALSE; descr->nb_items++; @@ -1553,7 +1553,7 @@ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, mis.CtlType = ODT_LISTBOX; mis.CtlID = id; mis.itemID = index; - mis.itemData = descr->items[index].data; + mis.itemData = data; mis.itemHeight = descr->item_height; SendMessageW( descr->owner, WM_MEASUREITEM, id, (LPARAM)&mis ); item->height = mis.itemHeight ? mis.itemHeight : 1; @@ -1594,7 +1594,6 @@ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, static LRESULT LISTBOX_InsertString( LB_DESCR *descr, INT index, LPCWSTR str ) { LPWSTR new_str = NULL; - ULONG_PTR data = 0; LRESULT ret; if (HAS_STRINGS(descr)) @@ -1608,10 +1607,9 @@ static LRESULT LISTBOX_InsertString( LB_DESCR *descr, INT index, LPCWSTR str ) } strcpyW(new_str, str); } - else data = (ULONG_PTR)str; if (index == -1) index = descr->nb_items; - if ((ret = LISTBOX_InsertItem( descr, index, new_str, data )) != 0) + if ((ret = LISTBOX_InsertItem( descr, index, new_str, (ULONG_PTR)str )) != 0) { HeapFree( GetProcessHeap(), 0, new_str ); return ret;

1 0

Henri Verbeet : wined3d: Explicitly calculate the sub-resource level in surface_blt_special().
by Alexandre Julliard March 1, 2018

March 1, 2018

Module: wine Branch: master Commit: 28d0ee637a6517d0e53d8722fa70a5e8ec639d77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=28d0ee637a6517d0e53d8722… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 1 10:04:52 2018 +0330 wined3d: Explicitly calculate the sub-resource level in surface_blt_special(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 668cfba..b6235ce 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2113,7 +2113,7 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE if ((src_swapchain || src_surface == rt) && !dst_swapchain) { - unsigned int src_width, src_height; + unsigned int src_level, src_width, src_height; /* Blit from render target to texture */ BOOL stretchx; @@ -2147,8 +2147,9 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE * back buffer. This is slower than reading line per line, thus not used for flipping * -> If the app wants a scaled image with a dest rect that is bigger than the fb, it has to be copied * pixel by pixel. */ - src_width = wined3d_texture_get_level_width(src_texture, src_surface->texture_level); - src_height = wined3d_texture_get_level_height(src_texture, src_surface->texture_level); + src_level = surface_get_sub_resource_idx(src_surface) % src_texture->level_count; + src_width = wined3d_texture_get_level_width(src_texture, src_level); + src_height = wined3d_texture_get_level_height(src_texture, src_level); if (!stretchx || dst_rect->right - dst_rect->left > src_width || dst_rect->bottom - dst_rect->top > src_height) {

1 0

Piotr Caban : user32/tests: Add listbox WM_MEASUREITEM tests.
by Alexandre Julliard March 1, 2018

March 1, 2018

Module: wine Branch: master Commit: 43df3f468f2d3364345a685ca9f236a8502fa3a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43df3f468f2d3364345a685c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 28 17:37:03 2018 +0100 user32/tests: Add listbox WM_MEASUREITEM tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/listbox.c | 55 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 91d4675..88d3adb 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -46,6 +46,15 @@ static const char * const strings[4] = { static const char BAD_EXTENSION[] = "*.badtxt"; +static int strcmp_aw(LPCWSTR strw, const char *stra) +{ + WCHAR buf[1024]; + + if (!stra) return 1; + MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, sizeof(buf)/sizeof(WCHAR)); + return lstrcmpW(strw, buf); +} + static HWND create_listbox (DWORD add_style, HWND parent) { @@ -239,6 +248,31 @@ static LRESULT WINAPI main_window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARA { switch (msg) { + case WM_MEASUREITEM: + { + DWORD style = GetWindowLongA(GetWindow(hwnd, GW_CHILD), GWL_STYLE); + MEASUREITEMSTRUCT *mi = (void*)lparam; + + ok(wparam == mi->CtlID, "got wParam=%08lx, expected %08x\n", wparam, mi->CtlID); + ok(mi->CtlType == ODT_LISTBOX, "mi->CtlType = %u\n", mi->CtlType); + ok(mi->CtlID == 1, "mi->CtlID = %u\n", mi->CtlID); + ok(mi->itemHeight, "mi->itemHeight = 0\n"); + + if (mi->itemID > 4 || style & LBS_OWNERDRAWFIXED) + break; + + if (style & LBS_HASSTRINGS) + { + ok(!strcmp_aw((WCHAR*)mi->itemData, strings[mi->itemID]), + "mi->itemData = %s (%d)\n", wine_dbgstr_w((WCHAR*)mi->itemData), mi->itemID); + } + else + { + ok((void*)mi->itemData == strings[mi->itemID], + "mi->itemData = %08lx, expected %p\n", mi->itemData, strings[mi->itemID]); + } + break; + } case WM_DRAWITEM: { RECT rc_item, rc_client, rc_clip; @@ -1822,6 +1856,26 @@ static void test_extents(void) DestroyWindow(parent); } +static void test_WM_MEASUREITEM(void) +{ + HWND parent, listbox; + LRESULT data; + + parent = create_parent(); + listbox = create_listbox(WS_CHILD | LBS_OWNERDRAWVARIABLE, parent); + + data = SendMessageA(listbox, LB_GETITEMDATA, 0, 0); + ok(data == (LRESULT)strings[0], "data = %08lx, expected %p\n", data, strings[0]); + DestroyWindow(parent); + + parent = create_parent(); + listbox = create_listbox(WS_CHILD | LBS_OWNERDRAWVARIABLE | LBS_HASSTRINGS, parent); + + data = SendMessageA(listbox, LB_GETITEMDATA, 0, 0); + ok(!data, "data = %08lx\n", data); + DestroyWindow(parent); +} + START_TEST(listbox) { const struct listbox_test SS = @@ -1905,4 +1959,5 @@ START_TEST(listbox) test_GetListBoxInfo(); test_missing_lbuttonup(); test_extents(); + test_WM_MEASUREITEM(); }

1 0

Piotr Caban : comctl32: Fix itemData passed in ListBox WM_MEASUREITEM message.
by Alexandre Julliard March 1, 2018

March 1, 2018

Module: wine Branch: master Commit: 0bb2cb3d998cfb6a3a98e469807b7a0e5f55ca15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0bb2cb3d998cfb6a3a98e469… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 28 17:37:10 2018 +0100 comctl32: Fix itemData passed in ListBox WM_MEASUREITEM message. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 3184e20..94712fd 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -1533,7 +1533,7 @@ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, RtlMoveMemory( item + 1, item, (descr->nb_items - index) * sizeof(LB_ITEMDATA) ); item->str = str; - item->data = data; + item->data = HAS_STRINGS(descr) ? 0 : data; item->height = 0; item->selected = FALSE; descr->nb_items++; @@ -1548,7 +1548,7 @@ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, mis.CtlType = ODT_LISTBOX; mis.CtlID = id; mis.itemID = index; - mis.itemData = descr->items[index].data; + mis.itemData = data; mis.itemHeight = descr->item_height; SendMessageW( descr->owner, WM_MEASUREITEM, id, (LPARAM)&mis ); item->height = mis.itemHeight ? mis.itemHeight : 1; @@ -1589,7 +1589,6 @@ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, static LRESULT LISTBOX_InsertString( LB_DESCR *descr, INT index, LPCWSTR str ) { LPWSTR new_str = NULL; - ULONG_PTR data = 0; LRESULT ret; if (HAS_STRINGS(descr)) @@ -1603,10 +1602,9 @@ static LRESULT LISTBOX_InsertString( LB_DESCR *descr, INT index, LPCWSTR str ) } strcpyW(new_str, str); } - else data = (ULONG_PTR)str; if (index == -1) index = descr->nb_items; - if ((ret = LISTBOX_InsertItem( descr, index, new_str, data )) != 0) + if ((ret = LISTBOX_InsertItem( descr, index, new_str, (ULONG_PTR)str )) != 0) { HeapFree( GetProcessHeap(), 0, new_str ); return ret;

1 0

Francois Gouget : testbot: Allow multiple VMs to share access to a hypervisor domain.
by Alexandre Julliard March 1, 2018

March 1, 2018

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