February 2022 - Wine-commits

Dmitry Timoshkov : comctl32/tests: Add iItem and uChanged to LVN_ITEMCHANGING/LVN_ITEMCHANGED context.
by Alexandre Julliard 21 Feb '22

21 Feb '22

Module: wine Branch: master Commit: 8961e7220b9fe3e7dc6a43528ccb13f7dc9a8564 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8961e7220b9fe3e7dc6a4352… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 11 17:24:36 2022 +0300 comctl32/tests: Add iItem and uChanged to LVN_ITEMCHANGING/LVN_ITEMCHANGED context. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listview.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 5485cd4b4e2..bc89e8938be 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -472,7 +472,17 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP if (defwndproc_counter) msg.flags |= defwinproc; msg.wParam = wParam; msg.lParam = lParam; - if (message == WM_NOTIFY && lParam) msg.id = ((NMHDR*)lParam)->code; + if (message == WM_NOTIFY && lParam) + { + NMLISTVIEW *nmlv = (NMLISTVIEW *)lParam; + + msg.id = nmlv->hdr.code; + if (msg.id == LVN_ITEMCHANGING || msg.id == LVN_ITEMCHANGED) + { + msg.wParam = nmlv->iItem; + msg.lParam = nmlv->uChanged; + } + } if (message == WM_COMMAND) msg.id = HIWORD(wParam); /* log system messages, except for painting */

1 0

Francois Gouget : testbot/VMs: Make sure $VM->Errors does not overflow.
by Alexandre Julliard 21 Feb '22

21 Feb '22

Module: tools Branch: master Commit: 4241f084ebdebbbceaae690a5e6fb3fde315e987 URL: https://source.winehq.org/git/tools.git/?a=commit;h=4241f084ebdebbbceaae690… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 21 16:36:38 2022 +0100 testbot/VMs: Make sure $VM->Errors does not overflow. The Errors field definition only allows two digits which sounds like more than enough for a count of consecutive errors but can overflow in a few days if the VM hosts are knocked out, which then causes the scripts to die. It would be easy to increase the maximum number of digits but that would only postpone the issue so add VM::AddError() to make sure the field does not overflow. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 3 +-- testbot/bin/WineRunBuild.pl | 3 +-- testbot/bin/WineRunReconfig.pl | 3 +-- testbot/bin/WineRunTask.pl | 3 +-- testbot/bin/WineRunWineTest.pl | 3 +-- testbot/lib/WineTestBot/Engine/Scheduler.pm | 6 ++---- testbot/lib/WineTestBot/VMs.pm | 9 +++++++++ 7 files changed, 16 insertions(+), 14 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 47839b6..a025085 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -189,8 +189,7 @@ sub FatalError($) } $VM->ChildDeadline(undef); $VM->ChildPid(undef); - my $Errors = ($VM->Errors || 0) + 1; - $VM->Errors($Errors); + my $Errors = $VM->AddError(); my ($ErrProperty, $SaveErrMessage) = $VM->Save(); if (defined $SaveErrMessage) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 8585882..50696b7 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -241,8 +241,7 @@ sub WrapUpAndExit($;$$$$) $VM->Status($NewVMStatus); if ($NewVMStatus eq 'offline') { - my $Errors = ($VM->Errors || 0) + 1; - $VM->Errors($Errors); + $VM->AddError(); } else { diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 73595c1..5d9381d 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -243,8 +243,7 @@ sub WrapUpAndExit($;$$$$) $VM->Status($NewVMStatus); if ($NewVMStatus eq 'offline') { - my $Errors = ($VM->Errors || 0) + 1; - $VM->Errors($Errors); + $VM->AddError(); } else { diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index ac9091d..72faf10 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -275,8 +275,7 @@ sub WrapUpAndExit($;$$$$) $VM->Status($NewVMStatus); if ($NewVMStatus eq 'offline') { - my $Errors = ($VM->Errors || 0) + 1; - $VM->Errors($Errors); + $VM->AddError(); } else { diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index c9a57bb..c1a37ae 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -272,8 +272,7 @@ sub WrapUpAndExit($;$$$$) $VM->Status($NewVMStatus); if ($NewVMStatus eq 'offline') { - my $Errors = ($VM->Errors || 0) + 1; - $VM->Errors($Errors); + $VM->AddError(); } else { diff --git a/testbot/lib/WineTestBot/Engine/Scheduler.pm b/testbot/lib/WineTestBot/Engine/Scheduler.pm index 800d136..f606c0d 100644 --- a/testbot/lib/WineTestBot/Engine/Scheduler.pm +++ b/testbot/lib/WineTestBot/Engine/Scheduler.pm @@ -272,8 +272,7 @@ sub _CheckAndClassifyVMs() $FoundVMErrors = 1; if ($VM->Status eq "reverting" or $VM->Status eq "sleeping") { - my $Errors = ($VM->Errors || 0) + 1; - $VM->Errors($Errors); + my $Errors = $VM->AddError(); $VM->Status("offline"); NotifyAdministrator("Putting the $VMKey VM offline", "The last $Errors revert operations timed out.\n\n". @@ -360,8 +359,7 @@ sub _CheckAndClassifyVMs() $FoundVMErrors = 1; $VM->ChildDeadline(undef); $VM->ChildPid(undef); - my $Errors = ($VM->Errors || 0) + 1; - $VM->Errors($Errors); + my $Errors = $VM->AddError(); if ($Errors >= $MaxVMErrors) { $VM->Status("offline"); diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 596499a..60a52b8 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -264,6 +264,15 @@ sub Status($;$) return $NewStatus; } +sub AddError($) +{ + my ($self) = @_; + + my $Errors = ($self->Errors || 0) + 1; + $self->Errors($Errors) if ($Errors <= 99); + return $Errors; +} + =pod =over 12

1 0

Francois Gouget : testbot/LibvirtTool: Limit the administrator notifications for offline VMs.
by Alexandre Julliard 21 Feb '22

21 Feb '22

Module: tools Branch: master Commit: e88b169dd2b1ccb939b12fd09af3e90beed38a80 URL: https://source.winehq.org/git/tools.git/?a=commit;h=e88b169dd2b1ccb939b12fd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 21 16:36:40 2022 +0100 testbot/LibvirtTool: Limit the administrator notifications for offline VMs. Tweak the notification to reflect that. This also means the LibvirtTool monitor should not announce that the VM is working again since it may very well still be broken, for instance if the required snapshot is missing. Instead announce the VM works again only when a revert was successful. So now the administrator gets: * $MaxVMErrors-1 messages that the VM is offline * 1 message that the VM needs maintenance * 1 message when the VM works again Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index a025085..c027d6b 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -196,19 +196,22 @@ sub FatalError($) { LogMsg "Could not put the $VMKey VM offline: $SaveErrMessage ($ErrProperty)\n"; } - elsif ($Errors >= $MaxVMErrors) + elsif ($Errors < $MaxVMErrors) { - NotifyAdministrator("The $VMKey VM needs maintenance", - "Got $Errors consecutive errors working on the $VMKey VM:\n". + NotifyAdministrator("Putting the $VMKey VM offline ($Errors)", + "Could not perform the $Action operation on the $VMKey VM:\n". "\n$ErrMessage\n". - "It probably needs fixing to get back online."); + "Got $Errors consecutive errors.\n". + "The VM has been put offline and the TestBot will try to regain access to it."); } - else + elsif ($Errors == $MaxVMErrors) { - NotifyAdministrator("Putting the $VMKey VM offline", - "Could not perform the $Action operation on the $VMKey VM:\n". + NotifyAdministrator("The $VMKey VM needs maintenance", + "Got $Errors consecutive errors working on the $VMKey VM:\n". "\n$ErrMessage\n". - "The VM has been put offline and the TestBot will try to regain access to it."); + "It probably needs fixing to get back online.\n". + "* Spacing out attempts to revive it.\n". + "* No further error notification will be sent until it starts working again.\n"); } exit 1; } @@ -405,10 +408,11 @@ sub Monitor() } if ($IsReady) { + # The VM may well still be broken, for instance if the required snapshot + # does not exist. But only revert can tell. For this reason, let revert + # announce when the VM works again. return 1 if (ChangeStatus("offline", "off", "done")); - NotifyAdministrator("The $VMKey VM is working again", - "The $VMKey VM started working again after ". - PrettyElapsed($Start) ."."); + LogMsg("Switching $VMKey from offline to off after ". PrettyElapsed($Start) ."."); return 0; } @@ -821,9 +825,15 @@ sub Revert() Debug(Elapsed($Start), " Sleeping ${Sleep}s\n"); LogMsg "Letting $VMKey settle down for ${Sleep}s\n"; sleep($Sleep); - CheckBootCount($TA); - return ChangeStatus($CurrentStatus, "idle", "done"); + + return 1 if (ChangeStatus($CurrentStatus, "idle", "done")); + if ($VM->Errors) + { + NotifyAdministrator("The $VMKey VM is working again", + "After ". $VM->Errors ." consecutive errors $VMKey was successfully reverted to $Config->{snapshot} in ". PrettyElapsed($Start) ." and is now idle."); + } + return 0; }

1 0

Francois Gouget : testbot: Build 32 and 64 bit Windows versions of TestAgentd.
by Alexandre Julliard 21 Feb '22

21 Feb '22

Module: tools Branch: master Commit: 674f4d6b56eeeb1c1d68123d2c3294629510d665 URL: https://source.winehq.org/git/tools.git/?a=commit;h=674f4d6b56eeeb1c1d68123… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 21 18:33:10 2022 +0100 testbot: Build 32 and 64 bit Windows versions of TestAgentd. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Janitor.pl | 2 +- testbot/bin/LibvirtTool.pl | 3 ++- testbot/bin/WineRunReconfig.pl | 3 ++- testbot/lib/Build/Utils.pm | 15 +++++++++++---- testbot/src/testagentd/Makefile | 34 ++++++++++++++++++++++------------ 5 files changed, 38 insertions(+), 19 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 1b5bb33..ab72ac1 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -319,7 +319,7 @@ if (opendir(my $dh, "$DataDir/latest")) # Needed to analyze Wine patches next if ($Entry eq "winefiles.txt" or $Entry eq "wine-parentsrc.txt"); # Needed to update Windows VMs - next if ($Entry eq "TestAgentd.exe"); + next if ($Entry =~ /^TestAgentd(?:32|64)\.exe$/); # Needed to run the tests next if ($Entry =~ /^TestLauncher(?:32|64)\.exe$/); next if ($Entry =~ /^winetest(?:64)?-latest\.exe$/); diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index c027d6b..00d1ce4 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -619,7 +619,8 @@ sub CreateSnapshot($$$$) FatalError("The $VMKey TestAgent server is too old to be upgraded: $Version\n"); } - if (!$TA->Upgrade("$DataDir/latest/TestAgentd.exe")) + my $Bits = ($VM->Type =~ /64/) ? "64" : "32"; + if (!$TA->Upgrade("$DataDir/latest/TestAgentd$Bits.exe")) { my $ErrMessage = $TA->GetLastError(); FatalError("Could not upgrade the $VMKey TestAgent: $ErrMessage\n"); diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 5d9381d..04308f3 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -467,7 +467,8 @@ if ($NewStatus eq "completed") if ($VM->Type eq "build") { # Only needed for the Windows VMs and only built by the build VMs. - push @FileNames, "../src/testagentd/TestAgentd.exe"; + push @FileNames, "../src/testagentd/TestAgentd32.exe", + "../src/testagentd/TestAgentd64.exe"; } foreach my $FileName (@FileNames) { diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 9d16963..9e73cba 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -260,8 +260,12 @@ sub BuildNativeTestAgentd() sub BuildWindowsTestAgentd() { - my $WindowsTestAgentd = "$::RootDir/src/testagentd/TestAgentd.exe"; - my $Before = GetMTime($WindowsTestAgentd); + my %Files; + foreach my $Bits ("32", "64") + { + $Files{"Path$Bits"} = "$::RootDir/src/testagentd/TestAgent$Bits.exe"; + $Files{"Before$Bits"} = GetMTime($Files{"Path$Bits"}); + } InfoMsg "\nRebuilding the Windows TestAgentd\n"; my $CPUCount = GetCPUCount(); @@ -273,9 +277,12 @@ sub BuildWindowsTestAgentd() return !1; } - if ($Before != GetMTime($WindowsTestAgentd)) + foreach my $Bits ("32", "64") { - LogMsg "Updated TestAgentd.exe\n"; + if ($Files{"Before$Bits"} != GetMTime($Files{"Path$Bits"})) + { + LogMsg "Updated ". basename($Files{"Path$Bits"}) ."\n"; + } } return 1; } diff --git a/testbot/src/testagentd/Makefile b/testbot/src/testagentd/Makefile index 7808af2..645e268 100644 --- a/testbot/src/testagentd/Makefile +++ b/testbot/src/testagentd/Makefile @@ -2,10 +2,12 @@ builddir = ../../bin/build CROSSCC32 = i686-w64-mingw32-gcc CROSSSTRIP32 = i686-w64-mingw32-strip +CROSSCC64 = x86_64-w64-mingw32-gcc +CROSSSTRIP64 = x86_64-w64-mingw32-strip all: build iso build: $(builddir)/testagentd -windows: TestAgentd.exe +windows: TestAgentd32.exe TestAgentd64.exe UNIX_SOURCES = testagentd.c platform_unix.c @@ -20,25 +22,33 @@ $(builddir)/testagentd: $(UNIX_SOURCES:.c=.o) WIN_SOURCES = testagentd.c platform_windows.c -TestAgentd.exe: $(WIN_SOURCES:.c=.obj) - $(CROSSCC32) -o $@ $(WIN_SOURCES:.c=.obj) -lws2_32 +TestAgentd32.exe: $(WIN_SOURCES:.c=.obj32) + $(CROSSCC32) -o $@ $(WIN_SOURCES:.c=.obj32) -lws2_32 $(CROSSSTRIP32) $@ -.SUFFIXES: .obj -.c.obj: +.SUFFIXES: .obj32 +.c.obj32: $(CROSSCC32) -Wall -g -c -o $@ $< -testagentd.o testagentd.obj: platform.h -platform_unix.o: platform.h list.h -platform_windows.obj: platform.h list.h +TestAgentd64.exe: $(WIN_SOURCES:.c=.obj64) + $(CROSSCC64) -o $@ $(WIN_SOURCES:.c=.obj64) -lws2_32 + $(CROSSSTRIP64) $@ + +.SUFFIXES: .obj64 +.c.obj64: + $(CROSSCC64) -Wall -g -c -o $@ $< +testagentd.o testagentd.obj32 testagentd.obj64: platform.h +platform_unix.o: platform.h list.h +platform_windows.obj32 platform_windows.obj64: platform.h list.h + iso: winetestbot.iso -winetestbot.iso: TestAgentd.exe +winetestbot.iso: windows rm -rf winetest mkdir winetest - cp TestAgentd.exe winetest + cp TestAgentd32.exe TestAgentd64.exe winetest mkisofs="mkisofs"; \ type mkisofs >/dev/null 2>&1 || mkisofs="genisoimage"; \ "$$mkisofs" -quiet -J -r -V "WineTestBot" -input-charset "ascii" -o "winetestbot.iso" winetest @@ -47,6 +57,6 @@ winetestbot.iso: TestAgentd.exe clean: rm -f $(UNIX_SOURCES:.c=.o) - rm -f $(WIN_SOURCES:.c=.obj) - rm -f TestAgentd.exe + rm -f $(WIN_SOURCES:.c=.obj32) $(WIN_SOURCES:.c=.obj64) + rm -f TestAgentd32.exe TestAgentd64.exe rm -f winetestbot.iso

1 0

Francois Gouget : testbot/LibvirtTool: Reduce the Windows boot delay on live snapshots.
by Alexandre Julliard 21 Feb '22

21 Feb '22

Module: tools Branch: master Commit: bc0a6f5c1db047a18b35eec53fdd854624bd5951 URL: https://source.winehq.org/git/tools.git/?a=commit;h=bc0a6f5c1db047a18b35eec… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 21 18:33:12 2022 +0100 testbot/LibvirtTool: Reduce the Windows boot delay on live snapshots. Reducing the boot delay helps ensure there will be enough time for Windows to complete the reboot before the task times out, which may allow the TestBot to retrieve the report/logs/diagnostic information. Note that on 64-bit Windows this requires a 64-bit TestAgentd in order to be able to run bcdedit.exe. Also this only works on recent versions of Windows which is okay since a failure to change the boot delay will not prevent the tests from running. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 00d1ce4..ef662cd 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -651,6 +651,15 @@ sub CreateSnapshot($$$$) { FatalError("Could not reset the $VMKey Windows desktop background color\n"); } + + # Reduce the boot delay. The way to do this depends on the Windows + # version so this only works on recent ones :-( + my $PTA = GetPrivilegedTA($TA); + if (RunAndWait($PTA, ["bcdedit.exe", "/set", "{bootmgr}", "timeout", "1"])) + { + Error("Could not change the Windows boot delay on $VMKey\n"); + } + $Reboot = 1; }

1 0

Conor McCarthy : vkd3d: Use device descriptor limits when creating descriptor pools.
by Alexandre Julliard 21 Feb '22

21 Feb '22

Module: vkd3d Branch: master Commit: 65e353d5df50f28760b3c0bc999ea1c11aee2fec URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=65e353d5df50f28760b3c0b… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Feb 22 01:18:57 2022 +1000 vkd3d: Use device descriptor limits when creating descriptor pools. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 13 ++----------- libs/vkd3d/device.c | 36 ++++++++++++++++++++++++++++++++++++ libs/vkd3d/vkd3d_private.h | 20 ++++++++++++++++++++ 3 files changed, 58 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 61e1810..e7375fb 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1351,15 +1351,6 @@ static bool d3d12_command_allocator_add_transfer_buffer(struct d3d12_command_all static VkDescriptorPool d3d12_command_allocator_allocate_descriptor_pool( struct d3d12_command_allocator *allocator) { - static const VkDescriptorPoolSize pool_sizes[] = - { - {VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1024}, - {VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER, 1024}, - {VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, 1024}, - {VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER, 1024}, - {VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, 1024}, - {VK_DESCRIPTOR_TYPE_SAMPLER, 1024}, - }; struct d3d12_device *device = allocator->device; const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; struct VkDescriptorPoolCreateInfo pool_desc; @@ -1379,8 +1370,8 @@ static VkDescriptorPool d3d12_command_allocator_allocate_descriptor_pool( pool_desc.pNext = NULL; pool_desc.flags = 0; pool_desc.maxSets = 512; - pool_desc.poolSizeCount = ARRAY_SIZE(pool_sizes); - pool_desc.pPoolSizes = pool_sizes; + pool_desc.poolSizeCount = ARRAY_SIZE(device->vk_pool_sizes); + pool_desc.pPoolSizes = device->vk_pool_sizes; if ((vr = VK_CALL(vkCreateDescriptorPool(vk_device, &pool_desc, NULL, &vk_pool))) < 0) { ERR("Failed to create descriptor pool, vr %d.\n", vr); diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 3360fd6..59fa9af 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1277,6 +1277,16 @@ static void vkd3d_init_feature_level(struct vkd3d_vulkan_info *vk_info, TRACE("Max feature level: %#x.\n", vk_info->max_feature_level); } +static void vkd3d_device_descriptor_limits_init(struct vkd3d_device_descriptor_limits *limits, + const VkPhysicalDeviceLimits *device_limits) +{ + limits->uniform_buffer_max_descriptors = device_limits->maxDescriptorSetUniformBuffers; + limits->sampled_image_max_descriptors = device_limits->maxDescriptorSetSampledImages; + limits->storage_buffer_max_descriptors = device_limits->maxDescriptorSetStorageBuffers; + limits->storage_image_max_descriptors = device_limits->maxDescriptorSetStorageImages; + limits->sampler_max_descriptors = min(device_limits->maxDescriptorSetSamplers, VKD3D_MAX_DESCRIPTOR_SET_SAMPLERS); +} + static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, const struct vkd3d_device_create_info *create_info, struct vkd3d_physical_device_info *physical_device_info, @@ -1504,6 +1514,9 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, features->robustBufferAccess = VK_FALSE; } + vkd3d_device_descriptor_limits_init(&vulkan_info->descriptor_limits, + &physical_device_info->properties2.properties.limits); + return S_OK; } @@ -2419,6 +2432,27 @@ static void vkd3d_time_domains_init(struct d3d12_device *device) WARN("Found no acceptable host time domain. Calibrated timestamps will not be available.\n"); } +static void vkd3d_init_descriptor_pool_sizes(VkDescriptorPoolSize *pool_sizes, + const struct vkd3d_device_descriptor_limits *limits) +{ + pool_sizes[0].type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER; + pool_sizes[0].descriptorCount = min(limits->uniform_buffer_max_descriptors, + VKD3D_MAX_VIRTUAL_HEAP_DESCRIPTORS_PER_TYPE); + pool_sizes[1].type = VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER; + pool_sizes[1].descriptorCount = min(limits->sampled_image_max_descriptors, + VKD3D_MAX_VIRTUAL_HEAP_DESCRIPTORS_PER_TYPE); + pool_sizes[2].type = VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE; + pool_sizes[2].descriptorCount = pool_sizes[1].descriptorCount; + pool_sizes[3].type = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER; + pool_sizes[3].descriptorCount = min(limits->storage_image_max_descriptors, + VKD3D_MAX_VIRTUAL_HEAP_DESCRIPTORS_PER_TYPE); + pool_sizes[4].type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE; + pool_sizes[4].descriptorCount = pool_sizes[3].descriptorCount; + pool_sizes[5].type = VK_DESCRIPTOR_TYPE_SAMPLER; + pool_sizes[5].descriptorCount = min(limits->sampler_max_descriptors, + VKD3D_MAX_VIRTUAL_HEAP_DESCRIPTORS_PER_TYPE); +}; + /* ID3D12Device */ static inline struct d3d12_device *impl_from_ID3D12Device(ID3D12Device *iface) { @@ -3979,6 +4013,8 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, for (i = 0; i < ARRAY_SIZE(device->desc_mutex); ++i) vkd3d_mutex_init(&device->desc_mutex[i]); + vkd3d_init_descriptor_pool_sizes(device->vk_pool_sizes, &device->vk_info.descriptor_limits); + if ((device->parent = create_info->parent)) IUnknown_AddRef(device->parent); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 67989c1..ca7a3f2 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -62,6 +62,12 @@ #define VKD3D_MAX_SHADER_STAGES 5u #define VKD3D_MAX_VK_SYNC_OBJECTS 4u #define VKD3D_MAX_DESCRIPTOR_SETS 64u +/* D3D12 binding tier 3 has a limit of 2048 samplers. */ +#define VKD3D_MAX_DESCRIPTOR_SET_SAMPLERS 2048u +/* The main limitation here is the simple descriptor pool recycling scheme + * requiring each pool to contain all descriptor types used by vkd3d. Limit + * this number to prevent excessive pool memory use. */ +#define VKD3D_MAX_VIRTUAL_HEAP_DESCRIPTORS_PER_TYPE (16 * 1024u) struct d3d12_command_list; struct d3d12_device; @@ -95,6 +101,15 @@ HRESULT hresult_from_errno(int rc); HRESULT hresult_from_vk_result(VkResult vr); HRESULT hresult_from_vkd3d_result(int vkd3d_result); +struct vkd3d_device_descriptor_limits +{ + unsigned int uniform_buffer_max_descriptors; + unsigned int sampled_image_max_descriptors; + unsigned int storage_buffer_max_descriptors; + unsigned int storage_image_max_descriptors; + unsigned int sampler_max_descriptors; +}; + struct vkd3d_vulkan_info { /* KHR instance extensions */ @@ -130,6 +145,7 @@ struct vkd3d_vulkan_info VkPhysicalDeviceLimits device_limits; VkPhysicalDeviceSparseProperties sparse_properties; + struct vkd3d_device_descriptor_limits descriptor_limits; VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT texel_buffer_alignment_properties; @@ -1299,6 +1315,8 @@ struct vkd3d_uav_clear_state HRESULT vkd3d_uav_clear_state_init(struct vkd3d_uav_clear_state *state, struct d3d12_device *device); void vkd3d_uav_clear_state_cleanup(struct vkd3d_uav_clear_state *state, struct d3d12_device *device); +#define VKD3D_DESCRIPTOR_POOL_COUNT 6 + /* ID3D12Device */ struct d3d12_device { @@ -1352,6 +1370,8 @@ struct d3d12_device const struct vkd3d_format_compatibility_list *format_compatibility_lists; struct vkd3d_null_resources null_resources; struct vkd3d_uav_clear_state uav_clear_state; + + VkDescriptorPoolSize vk_pool_sizes[VKD3D_DESCRIPTOR_POOL_COUNT]; }; HRESULT d3d12_device_create(struct vkd3d_instance *instance,

1 0

Conor McCarthy : vkd3d: Use device descriptor limits for unbounded descriptor ranges.
by Alexandre Julliard 21 Feb '22

21 Feb '22

Module: vkd3d Branch: master Commit: 0d777e7fcae92f91b905f4e592815d1d05f2dfaa URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0d777e7fcae92f91b905f4e… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Feb 22 01:18:58 2022 +1000 vkd3d: Use device descriptor limits for unbounded descriptor ranges. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/state.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 73 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 1d4f91e..91f6e27 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -331,14 +331,25 @@ struct d3d12_root_signature_info size_t root_constant_count; size_t root_descriptor_count; + unsigned int cbv_count; + unsigned int srv_count; + unsigned int uav_count; + unsigned int sampler_count; + unsigned int cbv_unbounded_range_count; + unsigned int srv_unbounded_range_count; + unsigned int uav_unbounded_range_count; + unsigned int sampler_unbounded_range_count; + size_t cost; }; static HRESULT d3d12_root_signature_info_count_descriptors(struct d3d12_root_signature_info *info, const D3D12_ROOT_DESCRIPTOR_TABLE *table, bool use_array) { + bool cbv_unbounded_range = false, srv_unbounded_range = false, uav_unbounded_range = false; + bool sampler_unbounded_range = false; bool unbounded = false; - unsigned int i; + unsigned int i, count; for (i = 0; i < table->NumDescriptorRanges; ++i) { @@ -365,8 +376,12 @@ static HRESULT d3d12_root_signature_info_count_descriptors(struct d3d12_root_sig return E_INVALIDARG; } + count = range->NumDescriptors; if (range->NumDescriptors == UINT_MAX) + { unbounded = true; + count = 0; + } binding_count = use_array ? 1 : range->NumDescriptors; @@ -378,14 +393,22 @@ static HRESULT d3d12_root_signature_info_count_descriptors(struct d3d12_root_sig * root signature, we create descriptor set layouts with two bindings for * each SRV and UAV. */ info->binding_count += binding_count; + info->srv_count += count * 2u; + srv_unbounded_range |= unbounded; break; case D3D12_DESCRIPTOR_RANGE_TYPE_UAV: /* As above. */ info->binding_count += binding_count; + info->uav_count += count * 2u; + uav_unbounded_range |= unbounded; break; case D3D12_DESCRIPTOR_RANGE_TYPE_CBV: + info->cbv_count += count; + cbv_unbounded_range |= unbounded; break; case D3D12_DESCRIPTOR_RANGE_TYPE_SAMPLER: + info->sampler_count += count; + sampler_unbounded_range |= unbounded; break; default: FIXME("Unhandled descriptor type %#x.\n", range->RangeType); @@ -401,6 +424,11 @@ static HRESULT d3d12_root_signature_info_count_descriptors(struct d3d12_root_sig return E_FAIL; } + info->srv_unbounded_range_count += srv_unbounded_range * 2u; + info->uav_unbounded_range_count += uav_unbounded_range * 2u; + info->cbv_unbounded_range_count += cbv_unbounded_range; + info->sampler_unbounded_range_count += sampler_unbounded_range; + return S_OK; } @@ -427,16 +455,19 @@ static HRESULT d3d12_root_signature_info_from_desc(struct d3d12_root_signature_i case D3D12_ROOT_PARAMETER_TYPE_CBV: ++info->root_descriptor_count; + ++info->cbv_count; ++info->binding_count; info->cost += 2; break; case D3D12_ROOT_PARAMETER_TYPE_SRV: ++info->root_descriptor_count; + ++info->srv_count; ++info->binding_count; info->cost += 2; break; case D3D12_ROOT_PARAMETER_TYPE_UAV: ++info->root_descriptor_count; + ++info->uav_count; ++info->binding_count; info->cost += 2; break; @@ -453,6 +484,7 @@ static HRESULT d3d12_root_signature_info_from_desc(struct d3d12_root_signature_i } info->binding_count += desc->NumStaticSamplers; + info->sampler_count += desc->NumStaticSamplers; return S_OK; } @@ -675,14 +707,44 @@ static uint32_t vkd3d_descriptor_magic_from_d3d12(D3D12_DESCRIPTOR_RANGE_TYPE ty } } -static unsigned int vk_binding_count_from_descriptor_range(const struct d3d12_root_descriptor_table_range *range) +static unsigned int vk_binding_count_from_descriptor_range(const struct d3d12_root_descriptor_table_range *range, + const struct d3d12_root_signature_info *info, const struct vkd3d_device_descriptor_limits *limits) { + unsigned int count, limit; + if (range->descriptor_count != UINT_MAX) return range->descriptor_count; - /* TODO: Calculate an upper bound from unbounded set counts and Vulkan - * device limits. */ - return 1024; + switch (range->type) + { + case VKD3D_SHADER_DESCRIPTOR_TYPE_CBV: + limit = limits->uniform_buffer_max_descriptors; + count = (limit - min(info->cbv_count, limit)) / info->cbv_unbounded_range_count; + break; + case VKD3D_SHADER_DESCRIPTOR_TYPE_SRV: + limit = limits->sampled_image_max_descriptors; + count = (limit - min(info->srv_count, limit)) / info->srv_unbounded_range_count; + break; + case VKD3D_SHADER_DESCRIPTOR_TYPE_UAV: + limit = limits->storage_image_max_descriptors; + count = (limit - min(info->uav_count, limit)) / info->uav_unbounded_range_count; + break; + case VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER: + limit = limits->sampler_max_descriptors; + count = (limit - min(info->sampler_count, limit)) / info->sampler_unbounded_range_count; + break; + default: + ERR("Unhandled type %#x.\n", range->type); + return 1; + } + + if (!count) + { + WARN("Descriptor table exceeds type %#x limit of %u.\n", range->type, limit); + count = 1; + } + + return min(count, VKD3D_MAX_VIRTUAL_HEAP_DESCRIPTORS_PER_TYPE); } static HRESULT d3d12_root_signature_init_descriptor_array_binding(struct d3d12_root_signature *root_signature, @@ -802,8 +864,10 @@ static HRESULT validate_descriptor_register_ranges(const struct d3d12_root_descr } static HRESULT d3d12_root_signature_init_root_descriptor_tables(struct d3d12_root_signature *root_signature, - const D3D12_ROOT_SIGNATURE_DESC *desc, struct vkd3d_descriptor_set_context *context) + const D3D12_ROOT_SIGNATURE_DESC *desc, const struct d3d12_root_signature_info *info, + struct vkd3d_descriptor_set_context *context) { + const struct d3d12_device *device = root_signature->device; struct d3d12_root_descriptor_table *table; unsigned int i, j, k, range_count; uint32_t vk_binding; @@ -904,7 +968,8 @@ static HRESULT d3d12_root_signature_init_root_descriptor_tables(struct d3d12_roo } range->binding = context->descriptor_binding; - range->vk_binding_count = vk_binding_count_from_descriptor_range(range); + range->vk_binding_count = vk_binding_count_from_descriptor_range(range, + info, &device->vk_info.descriptor_limits); if (FAILED(hr = d3d12_root_signature_init_descriptor_array_binding(root_signature, range, p->ShaderVisibility, context))) @@ -1224,7 +1289,7 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa goto fail; if (FAILED(hr = d3d12_root_signature_init_static_samplers(root_signature, device, desc, &context))) goto fail; - if (FAILED(hr = d3d12_root_signature_init_root_descriptor_tables(root_signature, desc, &context))) + if (FAILED(hr = d3d12_root_signature_init_root_descriptor_tables(root_signature, desc, &info, &context))) goto fail; if (FAILED(hr = d3d12_root_signature_append_descriptor_set_layout(root_signature, &context, 0)))

1 0

Zebediah Figura : wined3d: Set a valid map pointer in adapter_gl_alloc_bo() if possible.
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: wine Branch: master Commit: 5dd3b178ce8cbebf84de3f418115a47798144dbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=5dd3b178ce8cbebf84de3f41… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Feb 18 15:50:25 2022 +0100 wined3d: Set a valid map pointer in adapter_gl_alloc_bo() if possible. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index cb0c34823aa..4e93e25452d 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4646,6 +4646,18 @@ static bool adapter_gl_alloc_bo(struct wined3d_device *device, struct wined3d_re return false; } + if (bo_gl->memory) + { + struct wined3d_allocator_chunk_gl *chunk = wined3d_allocator_chunk_gl(bo_gl->memory->chunk); + + wined3d_allocator_chunk_gl_lock(chunk); + + if ((bo_gl->b.map_ptr = chunk->c.map_ptr)) + ++chunk->c.map_count; + + wined3d_allocator_chunk_gl_unlock(chunk); + } + addr->buffer_object = &bo_gl->b; addr->addr = NULL;

1 0

Alistair Leslie-Hughes : include: Add AACMFTEncoder coclass.
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: wine Branch: master Commit: a9b3adaac0d16bea511fd8e3502bac63fcf1fc5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9b3adaac0d16bea511fd8e3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 18 16:46:13 2022 +1100 include: Add AACMFTEncoder coclass. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmcodecdsp.idl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/wmcodecdsp.idl b/include/wmcodecdsp.idl index 2d74790179c..ae2a42419b4 100644 --- a/include/wmcodecdsp.idl +++ b/include/wmcodecdsp.idl @@ -44,3 +44,8 @@ coclass CMSH264DecoderMFT {} uuid(2eeb4adf-4578-4d10-bca7-bb955f56320a) ] coclass CWMADecMediaObject {}; + +[ + uuid(93af0c51-2275-45d2-a35b-f2ba21caed00) +] +coclass AACMFTEncoder {};

1 0

Rémi Bernon : dinput: Also trace report buffers on immediate ReadFile success.
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: wine Branch: master Commit: f6ef943b9cea7cb82d8c748690fd3354da81ccf7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6ef943b9cea7cb82d8c7486… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 18 10:31:13 2022 +0100 dinput: Also trace report buffers on immediate ReadFile success. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 68db935c44a..4987a9f9872 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -1226,24 +1226,23 @@ static HRESULT hid_joystick_read( IDirectInputDevice8W *iface ) BOOL ret; ret = GetOverlappedResult( impl->device, &impl->read_ovl, &count, FALSE ); - if (ret && TRACE_ON(dinput)) + + EnterCriticalSection( &impl->base.crit ); + while (ret) { - TRACE( "read size %lu report:\n", count ); - for (i = 0; i < count;) + if (TRACE_ON(dinput)) { - char buffer[256], *buf = buffer; - buf += sprintf(buf, "%08lx ", i); - do + TRACE( "iface %p, size %lu, report:\n", iface, count ); + for (i = 0; i < count;) { - buf += sprintf(buf, " %02x", (BYTE)report_buf[i] ); - } while (++i % 16 && i < count); - TRACE("%s\n", buffer); + char buffer[256], *buf = buffer; + buf += sprintf(buf, "%08lx ", i); + do { buf += sprintf(buf, " %02x", (BYTE)report_buf[i] ); } + while (++i % 16 && i < count); + TRACE("%s\n", buffer); + } } - } - EnterCriticalSection( &impl->base.crit ); - while (ret) - { count = impl->usages_count; memset( impl->usages_buf, 0, count * sizeof(*impl->usages_buf) ); status = HidP_GetUsagesEx( HidP_Input, 0, impl->usages_buf, &count,

1 0