February 2022 - Wine-Devel - list.winehq.org

[tools] testbot/LibvirtTool: Tweak some sleep traces.
by Francois Gouget Feb. 2, 2022

Feb. 2, 2022

Show the sleep time and make them more consistent. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/LibvirtTool.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 0635f5ff51..b186e19c39 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -552,7 +552,7 @@ sub CreateSnapshot($$) if ($SleepAfterBoot != 0) { - Debug(Elapsed($Start), " Sleeping for the $SnapshotName snapshot\n"); + Debug(Elapsed($Start), " Sleeping ${SleepAfterBoot}s for the $SnapshotName snapshot\n"); LogMsg "Letting $VMKey settle down for the $SnapshotName snapshot\n"; sleep($SleepAfterBoot); } @@ -601,7 +601,7 @@ sub Revert() } if ($ExtraTimeout) { - Debug(Elapsed($Start), " Extend the $VMKey revert deadline by $ExtraTimeout\n"); + Debug(Elapsed($Start), " Extending the $VMKey revert deadline by ${ExtraTimeout}s\n"); my $Deadline = $VM->ChildDeadline || (time() + $VMToolTimeout); $VM->ChildDeadline($Deadline + $ExtraTimeout); $VM->Save(); -- 2.30.2

1 0

[tools] testbot/testagentd: Avoid wildcards when cleaning up object files.
by Francois Gouget Feb. 2, 2022

Feb. 2, 2022

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/src/testagentd/Makefile | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/testbot/src/testagentd/Makefile b/testbot/src/testagentd/Makefile index b2f9e82aa0..7808af2a8f 100644 --- a/testbot/src/testagentd/Makefile +++ b/testbot/src/testagentd/Makefile @@ -8,16 +8,20 @@ build: $(builddir)/testagentd windows: TestAgentd.exe -$(builddir)/testagentd: testagentd.o platform_unix.o - $(CC) -o $@ testagentd.o platform_unix.o +UNIX_SOURCES = testagentd.c platform_unix.c + +$(builddir)/testagentd: $(UNIX_SOURCES:.c=.o) + $(CC) -o $@ $(UNIX_SOURCES:.c=.o) strip $@ .c.o: $(CC) -Wall -g -c -o $@ $< -TestAgentd.exe: testagentd.obj platform_windows.obj - $(CROSSCC32) -o $@ testagentd.obj platform_windows.obj -lws2_32 +WIN_SOURCES = testagentd.c platform_windows.c + +TestAgentd.exe: $(WIN_SOURCES:.c=.obj) + $(CROSSCC32) -o $@ $(WIN_SOURCES:.c=.obj) -lws2_32 $(CROSSSTRIP32) $@ .SUFFIXES: .obj @@ -28,6 +32,7 @@ testagentd.o testagentd.obj: platform.h platform_unix.o: platform.h list.h platform_windows.obj: platform.h list.h + iso: winetestbot.iso winetestbot.iso: TestAgentd.exe @@ -41,6 +46,7 @@ winetestbot.iso: TestAgentd.exe clean: - rm -f *.obj *.o + rm -f $(UNIX_SOURCES:.c=.o) + rm -f $(WIN_SOURCES:.c=.obj) rm -f TestAgentd.exe rm -f winetestbot.iso -- 2.30.2

1 0

[tools 1/2] testbot/SetWinLocale: Add support for UTF-8 system locales.
by Francois Gouget Feb. 2, 2022

Feb. 2, 2022

Unicode-only locales, such as Hindi (India), can only be used as a system locale if activating Windows 10's beta support for the UTF-8 code page. In such cases the Powershell's Set-WinSystemLocale API automatically and unconditionally sets the ACP&co code pages to UTF-8. In contrast intl.cpl has no support for UTF-8 (or for explicitly modifying the code pages) and refuses to use a Unicode-only system locale. So to keep a consistent SetWinLocale behavior, reset the system locale to en-US if it requires UTF-8 support and the --utf8 option was not specified. Also note that UTF-8 is only supported on Windows 10+ and that forcing UTF-8 through the registry makes Windows unbootable. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Interestingly even English locales can be Unicode-only: see en-AE. --- testbot/bin/SetWinLocale | 11 ++++++++++- testbot/bin/SetWinLocale.ps1 | 30 ++++++++++++++++++++++++------ 2 files changed, 34 insertions(+), 7 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 9f89280ab9..78c838465f 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -524,6 +524,9 @@ if (defined $Usage) print " --system SYS Specifies the system locale (see --defaults).\n"; print " . This requires elevated privileges.\n"; print " . Only takes effect after a reboot.\n"; + print " . Windows only allows using a Unicode-only locale (such as\n"; + print " hi-IN) as the system locale when setting the code pages to\n"; + print " UTF-8.\n"; print " . Windows 10 GUI: Time & language -> Language ->\n"; print " Administrative Language Settings -> Change system locale.\n"; print " . APIs: GetSystemDefaultLCID(), GetThreadLocale().\n"; @@ -841,7 +844,7 @@ sub SetWinLocales($$$$$$$$) my $Cmd = ["powershell.exe", "-ExecutionPolicy", "ByPass", "-File", "$name0.ps1", "locales", $Locale || ".", $CountryId || ".", - $System || ".", $UTF8 ? "true" : "false", $MUI || ".", + $System || ".", $UTF8 ? "force" : "no", $MUI || ".", $KeyboardIds ? $KeyboardIds->[0] : ".", $SysCopy ? "true" : "false", $DefCopy ? "true" : "false", $OptUseIntl ? "true" : "false"]; @@ -853,6 +856,12 @@ sub SetWinLocales($$$$$$$$) { $Line =~ s/\r$//; Info("$Line\n"); + if ($Line eq "Setting the system locale to en-US instead") + { + # For the final checks + $OptSystem = "en-US"; + $LCIDSystem = "0409"; + } } } diff --git a/testbot/bin/SetWinLocale.ps1 b/testbot/bin/SetWinLocale.ps1 index 00e9a1af14..a79d3c92fd 100644 --- a/testbot/bin/SetWinLocale.ps1 +++ b/testbot/bin/SetWinLocale.ps1 @@ -190,7 +190,7 @@ function SetCodePages($Value) $SWC_Success = $True -function SetWinCulture([string]$Locale, [string]$CountryId, [string]$System, [bool]$UTF8, [string]$MUI, [string]$KeyboardId, [bool]$SysCopy, [bool]$DefCopy) +function SetWinCulture([string]$Locale, [string]$CountryId, [string]$System, [string]$UTF8, [string]$MUI, [string]$KeyboardId, [bool]$SysCopy, [bool]$DefCopy) { $Cmd = Get-Command Set-Culture -ErrorAction SilentlyContinue if ($Cmd -eq $null) { @@ -201,8 +201,22 @@ function SetWinCulture([string]$Locale, [string]$CountryId, [string]$System, [bo if ($Locale) { Set-Culture $Locale } if ($CountryId) { Set-WinHomeLocation $CountryId } - if ($System) { Set-WinSystemLocale $System } - if ($UTF8) { SetCodePages(65001) } + if ($System) + { + Set-WinSystemLocale $System + $ACP = Get-ItemProperty -Path $HKLM_CODE_PAGE -Name "ACP" -ErrorAction SilentlyContinue + if ($ACP.ACP -eq "65001") + { + Write-Output "$System is a UTF-8 system locale" + if ($UTF8 -eq "no") + { + Write-Output "Setting the system locale to en-US instead" + Set-WinSystemLocale "en-US" + } + $UTF8 = "" + } + } + if ($UTF8 -eq "force") { SetCodePages(65001) } if ($MUI) { Set-WinUILanguageOverride $MUI } if ($KeyboardId) { Set-WinDefaultInputMethodOverride $KeyboardId } if ($SysCopy -or $DefCopy) @@ -253,7 +267,7 @@ function SetLocales($Argv) $Locale = GetStringArg($Argv[1]) $CountryId = GetStringArg($Argv[2]) $System = GetStringArg($Argv[3]) - $UTF8 = $Argv[4] -eq "true" + $UTF8 = GetStringArg($Argv[4]) $MUI = GetStringArg($Argv[5]) $KeyboardId = GetStringArg($Argv[6]) $SysCopy = $Argv[7] -ne "false" @@ -272,7 +286,7 @@ function SetLocales($Argv) RunIntlCpl "$Name0.xml" Remove-Item -Path "$Name0.xml" - if ($UTF8) { SetCodePages(65001) } + if ($UTF8 -eq "force") { SetCodePages(65001) } exit 0 } @@ -298,7 +312,11 @@ function ShowUsage() Write-Output " LOCALE Is the BCP-47 locale to use for formats, date and time." Write-Output " COUNTRYID Is the numerical country code." Write-Output " SYSTEM Is the BCP-47 locale to use as the system locale." - Write-Output " UTF8 If set to 'true' the code pages will be changed to UTF-8." + Write-Output " UTF8 If set to 'force' the code pages will be changed to UTF-8" + Write-Output " regardless of the system locale." + Write-Output " If set to 'allow' the code pages will be set to match the system" + Write-Output " locale even if that implies using UTF-8. This is the default." + Write-Output " If set to 'no' Unicode-only locales will be replaced with en-US." Write-Output " MUI Is the BCP-47 locale to use for the display language." Write-Output " KEYBOARDID Is the keyboard identifier to set as the default." Write-Output " SYSCOPY If 'true' the locale settings will be copied to the system accounts" -- 2.30.2

1 1

[PATCH vkd3d 1/2] vkd3d: Use device descriptor limits when creating descriptor pools.
by Conor McCarthy Feb. 2, 2022

Feb. 2, 2022

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/command.c | 13 ++----------- libs/vkd3d/device.c | 39 ++++++++++++++++++++++++++++++++++++++ libs/vkd3d/vkd3d_private.h | 18 ++++++++++++++++++ 3 files changed, 59 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index f1ec6be3..0973b204 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 4bcb5efc..212b0b74 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,29 @@ 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, unsigned int count, + const struct vkd3d_device_descriptor_limits *limits) +{ + assert(count == 6); + + 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 +4015,9 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, for (i = 0; i < ARRAY_SIZE(device->desc_mutex); ++i) pthread_mutex_init(&device->desc_mutex[i], NULL); + vkd3d_init_descriptor_pool_sizes(device->vk_pool_sizes, ARRAY_SIZE(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 d21cd411..5da00685 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -59,6 +59,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; @@ -92,6 +98,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 */ @@ -127,6 +142,7 @@ struct vkd3d_vulkan_info VkPhysicalDeviceLimits device_limits; VkPhysicalDeviceSparseProperties sparse_properties; + struct vkd3d_device_descriptor_limits descriptor_limits; VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT texel_buffer_alignment_properties; @@ -1218,6 +1234,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[6]; }; HRESULT d3d12_device_create(struct vkd3d_instance *instance, -- 2.34.1

1 1

[PATCH vkd3d v4 1/6] tests: Test matrix multiplication.
by Giovanni Mascellani Feb. 2, 2022

Feb. 2, 2022

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v2: * Split to many individual tests --- Makefile.am | 2 + tests/hlsl-mul.shader_test | 290 +++++++++++++++++++++++++++++++++++++ 2 files changed, 292 insertions(+) create mode 100644 tests/hlsl-mul.shader_test diff --git a/Makefile.am b/Makefile.am index 82807a42..95c2aaa7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -71,6 +71,7 @@ vkd3d_shader_tests = \ tests/hlsl-invalid.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ + tests/hlsl-mul.shader_test \ tests/hlsl-nested-arrays.shader_test \ tests/hlsl-numeric-types.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ @@ -302,6 +303,7 @@ XFAIL_TESTS = \ tests/hlsl-intrinsic-override.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ + tests/hlsl-mul.shader_test \ tests/hlsl-nested-arrays.shader_test \ tests/hlsl-numeric-types.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ diff --git a/tests/hlsl-mul.shader_test b/tests/hlsl-mul.shader_test new file mode 100644 index 00000000..7b453187 --- /dev/null +++ b/tests/hlsl-mul.shader_test @@ -0,0 +1,290 @@ + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float4x4 x = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + float4 y = float4(1.0, 2.0, 3.0, 4.0); + + return mul(x, y); +} + +[test] +draw quad +probe all rgba (30.0, 70.0, 110.0, 150.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float4 x = float4(1.0, 2.0, 3.0, 4.0); + float4x4 y = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + + return mul(x, y); +} + +[test] +draw quad +probe all rgba (90.0, 100.0, 110.0, 120.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float4x4 x = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + float3 y = float3(1.0, 2.0, 3.0); + + return mul(x, y); +} + +[test] +draw quad +probe all rgba (14.0, 38.0, 62.0, 86.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float3 x = float3(1.0, 2.0, 3.0); + float4x4 y = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + + return mul(x, y); +} + +[test] +draw quad +probe all rgba (38.0, 44.0, 50.0, 56.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float3x3 x = float3x3(1.0, 2.0, 3.0, + 4.0, 5.0, 6.0, + 7.0, 8.0, 9.0); + float4 y = float4(1.0, 2.0, 3.0, 4.0); + + return float4(mul(x, y), 0.0); +} + +[test] +draw quad +probe all rgba (14.0, 32.0, 50.0, 0.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float4 x = float4(1.0, 2.0, 3.0, 4.0); + float3x3 y = float3x3(1.0, 2.0, 3.0, + 4.0, 5.0, 6.0, + 7.0, 8.0, 9.0); + + return float4(mul(x, y), 0.0); +} + +[test] +draw quad +probe all rgba (30.0, 36.0, 42.0, 0.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float x = 10.0; + float4x4 y = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + + return mul(x, y)[1]; +} + +[test] +draw quad +probe all rgba (50.0, 60.0, 70.0, 80.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float4x4 x = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + float y = 10.0; + + return mul(x, y)[1]; +} + +[test] +draw quad +probe all rgba (50.0, 60.0, 70.0, 80.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float1 x = float1(10.0); + float4x4 y = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + + return mul(x, y); +} + +[test] +draw quad +probe all rgba (10.0, 20.0, 30.0, 40.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float4x4 x = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + float1 y = float1(10.0); + + return mul(x, y); +} + +[test] +draw quad +probe all rgba (10.0, 50.0, 90.0, 130.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float1x1 x = float1x1(10.0); + float4x4 y = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + + return mul(x, y); +} + +[test] +draw quad +probe all rgba (10.0, 20.0, 30.0, 40.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float4x4 x = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + float1x1 y = float1x1(10.0); + + return mul(x, y); +} + +[test] +draw quad +probe all rgba (10.0, 50.0, 90.0, 130.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float1x4 x = float1x4(1.0, 2.0, 3.0, 4.0); + float4x4 y = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + + return mul(x, y); +} + +[test] +draw quad +probe all rgba (90.0, 100.0, 110.0, 120.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float4x4 x = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + float1x4 y = float1x4(1.0, 2.0, 3.0, 4.0); + + return mul(x, y)[1]; +} + +[test] +draw quad +probe all rgba (5.0, 10.0, 15.0, 20.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float4x1 x = float4x1(1.0, 2.0, 3.0, 4.0); + float4x4 y = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + + return mul(x, y)[1]; +} + +[test] +draw quad +probe all rgba (2.0, 4.0, 6.0, 8.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float4x4 x = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + float4x1 y = float4x1(1.0, 2.0, 3.0, 4.0); + + return mul(x, y); +} + +[test] +draw quad +probe all rgba (30.0, 70.0, 110.0, 150.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float3x3 x = float3x3(1.0, 2.0, 3.0, + 4.0, 5.0, 6.0, + 7.0, 8.0, 9.0); + float4x4 y = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + + return mul(x, y)[1]; +} + +[test] +draw quad +probe all rgba (83.0, 98.0, 113.0, 128.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float4x4 x = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + float3x3 y = float3x3(1.0, 2.0, 3.0, + 4.0, 5.0, 6.0, + 7.0, 8.0, 9.0); + + return float4(mul(x, y)[1], 0.0); +} + +[test] +draw quad +probe all rgba (78.0, 96.0, 114.0, 0.0) -- 2.34.1

3 19

[PATCH 0/7] Some bug fixes to programs/cmd in interactive mode
by Eric Pouech Feb. 2, 2022

Feb. 2, 2022

The following series: - extends current test harness by adding interactive tests capability - fixes a couple of bugs (with tests in interactive mode) A+ --- Eric Pouech (7): programs/cmd/tests: don't output more data than available programs/cmd/tests: added ability to run tests in interactive mode programs/cmd/tests: some interactive test about input echo programs/cmd/tests: added support for multi-line input programs/cmd: handle white space only lines within ( ) block programs/cmd: expand commandline before parsing it (interactive mode) programs/cmd: detect badly quoted operand in 'if' statement programs/cmd/builtins.c | 10 ++ programs/cmd/tests/batch.c | 111 ++++++++++++++---- programs/cmd/tests/interactive_builtins.cmd | 42 +++++++ .../cmd/tests/interactive_builtins.cmd.exp | 67 +++++++++++ programs/cmd/tests/rsrc.rc | 10 ++ programs/cmd/wcmdmain.c | 34 ++++-- 6 files changed, 244 insertions(+), 30 deletions(-) create mode 100644 programs/cmd/tests/interactive_builtins.cmd create mode 100644 programs/cmd/tests/interactive_builtins.cmd.exp

2 8

[v2 PATCH 07/17] mfreadwrite: Use correct integral types.
by Nikolay Sivov Feb. 2, 2022

Feb. 2, 2022

From: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: reduced the size of the last hunk dlls/mfreadwrite/reader.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index be77e1c5b1d..8ba00e86ff6 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -87,7 +87,7 @@ struct media_stream struct stream_transform decoder; IMFVideoSampleAllocatorEx *allocator; IMFVideoSampleAllocatorNotify notify_cb; - unsigned int id; + DWORD id; unsigned int index; enum media_stream_state state; unsigned int flags; @@ -162,9 +162,9 @@ struct source_reader unsigned int first_audio_stream_index; unsigned int first_video_stream_index; unsigned int last_read_index; - unsigned int stream_count; + DWORD stream_count; unsigned int flags; - unsigned int queue; + DWORD queue; enum media_source_state source_state; struct media_stream *streams; struct list responses; @@ -368,8 +368,8 @@ static void source_reader_response_ready(struct source_reader *reader, struct st static void source_reader_copy_sample_buffer(IMFSample *src, IMFSample *dst) { IMFMediaBuffer *buffer; - unsigned int flags; LONGLONG time; + DWORD flags; HRESULT hr; IMFSample_CopyAllItems(src, (IMFAttributes *)dst); @@ -1057,7 +1057,7 @@ static BOOL source_reader_get_read_result(struct source_reader *reader, struct m return !request_sample; } -static HRESULT source_reader_get_next_selected_stream(struct source_reader *reader, unsigned int *stream_index) +static HRESULT source_reader_get_next_selected_stream(struct source_reader *reader, DWORD *stream_index) { unsigned int i, first_selected = ~0u, requests = ~0u; BOOL selected, stream_drained; @@ -1095,7 +1095,7 @@ static HRESULT source_reader_get_next_selected_stream(struct source_reader *read return first_selected == ~0u ? MF_E_MEDIA_SOURCE_NO_STREAMS_SELECTED : S_OK; } -static HRESULT source_reader_get_stream_read_index(struct source_reader *reader, unsigned int index, unsigned int *stream_index) +static HRESULT source_reader_get_stream_read_index(struct source_reader *reader, unsigned int index, DWORD *stream_index) { BOOL selected; HRESULT hr; @@ -1814,7 +1814,8 @@ static HRESULT WINAPI src_reader_SetCurrentPosition(IMFSourceReader *iface, REFG { struct source_reader *reader = impl_from_IMFSourceReader(iface); struct source_reader_async_command *command; - unsigned int i, flags; + unsigned int i; + DWORD flags; HRESULT hr; TRACE("%p, %s, %p.\n", iface, debugstr_guid(format), position); @@ -1871,8 +1872,8 @@ static HRESULT WINAPI src_reader_SetCurrentPosition(IMFSourceReader *iface, REFG static HRESULT source_reader_read_sample(struct source_reader *reader, DWORD index, DWORD flags, DWORD *actual_index, DWORD *stream_flags, LONGLONG *timestamp, IMFSample **sample) { - unsigned int actual_index_tmp; struct media_stream *stream; + DWORD actual_index_tmp; LONGLONG timestamp_tmp; DWORD stream_index; HRESULT hr = S_OK; @@ -1931,7 +1932,7 @@ static HRESULT source_reader_read_sample(struct source_reader *reader, DWORD ind } static HRESULT source_reader_read_sample_async(struct source_reader *reader, unsigned int index, unsigned int flags, - unsigned int *actual_index, unsigned int *stream_flags, LONGLONG *timestamp, IMFSample **sample) + DWORD *actual_index, DWORD *stream_flags, LONGLONG *timestamp, IMFSample **sample) { struct source_reader_async_command *command; HRESULT hr; @@ -2166,7 +2167,7 @@ static const IMFSourceReaderVtbl srcreader_vtbl = static DWORD reader_get_first_stream_index(IMFPresentationDescriptor *descriptor, const GUID *major) { - unsigned int count, i; + DWORD count, i; BOOL selected; HRESULT hr; GUID guid; @@ -2415,8 +2416,9 @@ static HRESULT bytestream_get_url_hint(IMFByteStream *stream, WCHAR const **url) { mp4vmagic, L".m4v", mp4mask }, }; unsigned char buffer[4 * sizeof(unsigned int)], pattern[4 * sizeof(unsigned int)]; - unsigned int i, j, length = 0, caps = 0; IMFAttributes *attributes; + DWORD length = 0, caps = 0; + unsigned int i, j; QWORD position; HRESULT hr; @@ -2424,12 +2426,13 @@ static HRESULT bytestream_get_url_hint(IMFByteStream *stream, WCHAR const **url) if (SUCCEEDED(IMFByteStream_QueryInterface(stream, &IID_IMFAttributes, (void **)&attributes))) { - IMFAttributes_GetStringLength(attributes, &MF_BYTESTREAM_CONTENT_TYPE, &length); + UINT32 string_length = 0; + IMFAttributes_GetStringLength(attributes, &MF_BYTESTREAM_CONTENT_TYPE, &string_length); IMFAttributes_Release(attributes); - } - if (length) - return S_OK; + if (string_length) + return S_OK; + } if (FAILED(hr = IMFByteStream_GetCapabilities(stream, &caps))) return hr; -- 2.34.1

1 0

[v2 PATCH 10/17] mfplay: Use correct integral type.
by Nikolay Sivov Feb. 2, 2022

Feb. 2, 2022

From: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplay/player.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 5abee9d7de8..d7ec7085def 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -657,16 +657,17 @@ static HRESULT WINAPI media_item_GetPresentationAttribute(IMFPMediaItem *iface, static HRESULT WINAPI media_item_GetCharacteristics(IMFPMediaItem *iface, MFP_MEDIAITEM_CHARACTERISTICS *flags) { struct media_item *item = impl_from_IMFPMediaItem(iface); + DWORD value = 0; HRESULT hr; TRACE("%p, %p.\n", iface, flags); *flags = 0; - if (SUCCEEDED(hr = IMFMediaSource_GetCharacteristics(item->source, flags))) + if (SUCCEEDED(hr = IMFMediaSource_GetCharacteristics(item->source, &value))) { - *flags &= (MFP_MEDIAITEM_IS_LIVE | MFP_MEDIAITEM_CAN_SEEK | - MFP_MEDIAITEM_CAN_PAUSE | MFP_MEDIAITEM_HAS_SLOW_SEEK); + *flags = value & (MFP_MEDIAITEM_IS_LIVE | MFP_MEDIAITEM_CAN_SEEK | + MFP_MEDIAITEM_CAN_PAUSE | MFP_MEDIAITEM_HAS_SLOW_SEEK); } return hr; -- 2.34.1

1 0

[PATCH] winhttp: Use lock in send_frame().
by Paul Gofman Feb. 2, 2022

Feb. 2, 2022

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- While web socket sends are not actually supposed to be queued before the previous one completed, send for pongs or socket shutdown may be called in parallel. Only the first call will go for synchronous send attempt but the next queued call have a chance of hitting socket_send() before the first sync one returns. The sync outside of send_frame() (which is needed if the send wasn't completed synchronously) is provided by the queueing logic around pending_sends counter. dlls/winhttp/request.c | 12 +++++++++--- dlls/winhttp/winhttp_private.h | 1 + 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 728b1895ba7..756b40d8987 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3111,6 +3111,7 @@ HINTERNET WINAPI WinHttpWebSocketCompleteUpgrade( HINTERNET hrequest, DWORD_PTR socket->hdr.callback = request->hdr.callback; socket->hdr.notify_mask = request->hdr.notify_mask; socket->hdr.context = context; + InitializeSRWLock( &socket->send_lock ); addref_object( &request->hdr ); socket->request = request; @@ -3153,6 +3154,8 @@ static DWORD send_frame( struct socket *socket, enum socket_opcode opcode, USHOR TRACE( "sending %02x frame, len %u.\n", opcode, len ); + AcquireSRWLockExclusive( &socket->send_lock ); + if (opcode == SOCKET_OPCODE_CLOSE) len += sizeof(status); hdr[0] = final ? (char)FIN_BIT : 0; @@ -3188,7 +3191,8 @@ static DWORD send_frame( struct socket *socket, enum socket_opcode opcode, USHOR if (!(new = realloc( socket->send_frame_buffer, new_size ))) { ERR("Out of memory, buffer_size %u.\n", buffer_size); - return ERROR_OUTOFMEMORY; + ret = ERROR_OUTOFMEMORY; + goto done; } socket->send_frame_buffer = new; socket->send_frame_buffer_size = new_size; @@ -3231,13 +3235,15 @@ static DWORD send_frame( struct socket *socket, enum socket_opcode opcode, USHOR memmove( socket->send_frame_buffer, socket->send_frame_buffer + sent_size, offset - sent_size ); socket->bytes_in_send_frame_buffer = offset - sent_size; } - return ret; + goto done; } assert( sent_size == offset ); offset = 0; buflen -= len; } - return ERROR_SUCCESS; +done: + ReleaseSRWLockExclusive( &socket->send_lock ); + return ret; } static DWORD complete_send_frame( struct socket *socket, WSAOVERLAPPED *ovr, const char *buf ) diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 3e4e1eb298d..732f0afaa88 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -259,6 +259,7 @@ struct socket unsigned int send_remaining_size; unsigned int bytes_in_send_frame_buffer; unsigned int client_buffer_offset; + SRWLOCK send_lock; }; struct send_request -- 2.34.1

2 2

[PATCH] mountmgr: Fix long type warning.
by Huw Davies Feb. 2, 2022

Feb. 2, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/mountmgr.sys/cred.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mountmgr.sys/cred.c b/dlls/mountmgr.sys/cred.c index 9fb9e433881..5c95dff5cab 100644 --- a/dlls/mountmgr.sys/cred.c +++ b/dlls/mountmgr.sys/cred.c @@ -64,7 +64,7 @@ NTSTATUS query_symbol_file( void *args ) if (!(query_cfstring = CFStringCreateWithFormat(kCFAllocatorDefault, NULL, CFSTR("com_apple_xcode_dsym_uuids == \"%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X\""), - id->Data1, id->Data2, id->Data3, id->Data4[0], + (unsigned int)id->Data1, id->Data2, id->Data3, id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3], id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7] ))) return STATUS_NO_MEMORY; -- 2.23.0

1 0