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

Tim Clem : winemac.drv: Simplify control flow in copy_display_modes.
by Alexandre Julliard March 23, 2022

March 23, 2022

Module: wine Branch: master Commit: 5c09278ab6eb7d2611b57bfb2111d043d5d30b2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c09278ab6eb7d2611b57bfb… Author: Tim Clem <tclem(a)codeweavers.com> Date: Tue Mar 22 11:05:59 2022 -0700 winemac.drv: Simplify control flow in copy_display_modes. Introduce a helper function to determine if a mode is preferred over another. Signed-off-by: Tim Clem <tclem(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/display.c | 123 ++++++++++++++++++++++----------------------- 1 file changed, 61 insertions(+), 62 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 2ac8f32fa18..cc3bbc6cffc 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -576,6 +576,65 @@ static CFDictionaryRef create_mode_dict(CGDisplayModeRef display_mode, BOOL is_o return ret; } + + +static BOOL mode_is_preferred(CGDisplayModeRef new_mode, CGDisplayModeRef old_mode, + struct display_mode_descriptor *original_mode_desc) +{ + CFStringRef pixel_encoding; + size_t width_points, height_points; + size_t old_width_pixels, old_height_pixels, new_width_pixels, new_height_pixels; + BOOL old_size_same, new_size_same; + + /* If a given mode is the user's default, then always list it in preference to any similar + modes that may exist. */ + if (display_mode_matches_descriptor(new_mode, original_mode_desc)) + return TRUE; + + pixel_encoding = CGDisplayModeCopyPixelEncoding(new_mode); + if (pixel_encoding) + { + BOOL bpp30 = CFEqual(pixel_encoding, CFSTR(kIO30BitDirectPixels)); + CFRelease(pixel_encoding); + if (bpp30) + { + /* This is an odd pixel encoding. It seems it's only returned + when using kCGDisplayShowDuplicateLowResolutionModes. It's + 32bpp in terms of the actual raster layout, but it's 10 + bits per component. I think that no Windows program is + likely to need it and they will probably be confused by it. + Skip it. */ + return FALSE; + } + } + + if (!old_mode) + return TRUE; + + /* Prefer the original mode over any similar mode. */ + if (display_mode_matches_descriptor(old_mode, original_mode_desc)) + return FALSE; + + /* Otherwise, prefer a mode whose pixel size equals its point size over one which + is scaled. */ + width_points = CGDisplayModeGetWidth(new_mode); + height_points = CGDisplayModeGetHeight(new_mode); + new_width_pixels = CGDisplayModeGetPixelWidth(new_mode); + new_height_pixels = CGDisplayModeGetPixelHeight(new_mode); + old_width_pixels = CGDisplayModeGetPixelWidth(old_mode); + old_height_pixels = CGDisplayModeGetPixelHeight(old_mode); + new_size_same = (new_width_pixels == width_points && new_height_pixels == height_points); + old_size_same = (old_width_pixels == width_points && old_height_pixels == height_points); + + if (new_size_same && !old_size_same) + return TRUE; + + if (!new_size_same && old_size_same) + return FALSE; + + /* Otherwise, prefer the mode with the smaller pixel size. */ + return new_width_pixels < old_width_pixels && new_height_pixels < old_height_pixels; +} #endif @@ -620,72 +679,12 @@ static CFArrayRef copy_display_modes(CGDirectDisplayID display) count = CFArrayGetCount(modes); for (i = 0; i < count; i++) { - BOOL better = TRUE; CGDisplayModeRef new_mode = (CGDisplayModeRef)CFArrayGetValueAtIndex(modes, i); BOOL new_is_original = display_mode_matches_descriptor(new_mode, desc); CFDictionaryRef key = create_mode_dict(new_mode, new_is_original); + CGDisplayModeRef old_mode = (CGDisplayModeRef)CFDictionaryGetValue(modes_by_size, key); - /* If a given mode is the user's default, then always list it in preference to any similar - modes that may exist. */ - if (new_is_original) - better = TRUE; - else - { - CFStringRef pixel_encoding = CGDisplayModeCopyPixelEncoding(new_mode); - CGDisplayModeRef old_mode; - - if (pixel_encoding) - { - BOOL bpp30 = CFEqual(pixel_encoding, CFSTR(kIO30BitDirectPixels)); - CFRelease(pixel_encoding); - if (bpp30) - { - /* This is an odd pixel encoding. It seems it's only returned - when using kCGDisplayShowDuplicateLowResolutionModes. It's - 32bpp in terms of the actual raster layout, but it's 10 - bits per component. I think that no Windows program is - likely to need it and they will probably be confused by it. - Skip it. */ - CFRelease(key); - continue; - } - } - - old_mode = (CGDisplayModeRef)CFDictionaryGetValue(modes_by_size, key); - if (old_mode) - { - BOOL old_is_original = display_mode_matches_descriptor(old_mode, desc); - - if (old_is_original) - better = FALSE; - else - { - /* Otherwise, prefer a mode whose pixel size equals its point size over one which - is scaled. */ - size_t width_points = CGDisplayModeGetWidth(new_mode); - size_t height_points = CGDisplayModeGetHeight(new_mode); - size_t new_width_pixels = CGDisplayModeGetPixelWidth(new_mode); - size_t new_height_pixels = CGDisplayModeGetPixelHeight(new_mode); - size_t old_width_pixels = CGDisplayModeGetPixelWidth(old_mode); - size_t old_height_pixels = CGDisplayModeGetPixelHeight(old_mode); - BOOL new_size_same = (new_width_pixels == width_points && new_height_pixels == height_points); - BOOL old_size_same = (old_width_pixels == width_points && old_height_pixels == height_points); - - if (new_size_same && !old_size_same) - better = TRUE; - else if (!new_size_same && old_size_same) - better = FALSE; - else - { - /* Otherwise, prefer the mode with the smaller pixel size. */ - if (old_width_pixels < new_width_pixels || old_height_pixels < new_height_pixels) - better = FALSE; - } - } - } - } - - if (better) + if (mode_is_preferred(new_mode, old_mode, desc)) CFDictionarySetValue(modes_by_size, key, new_mode); CFRelease(key);

1 0

Conor McCarthy : vkd3d: Remove an invalid NULL check.
by Alexandre Julliard March 23, 2022

March 23, 2022

Module: vkd3d Branch: master Commit: f34168481db519ff8d1578c867587cf38d1fba9e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f34168481db519ff8d1578c… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Mar 23 00:33:01 2022 +1000 vkd3d: Remove an invalid NULL check. The pointer is never NULL. 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/device.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 459aa615..d1629284 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1629,16 +1629,13 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, features->shaderTessellationAndGeometryPointSize = VK_FALSE; descriptor_indexing = &physical_device_info->descriptor_indexing_features; - if (descriptor_indexing) - { - descriptor_indexing->shaderInputAttachmentArrayDynamicIndexing = VK_FALSE; - descriptor_indexing->shaderInputAttachmentArrayNonUniformIndexing = VK_FALSE; + descriptor_indexing->shaderInputAttachmentArrayDynamicIndexing = VK_FALSE; + descriptor_indexing->shaderInputAttachmentArrayNonUniformIndexing = VK_FALSE; - /* We do not use storage buffers currently. */ - features->shaderStorageBufferArrayDynamicIndexing = VK_FALSE; - descriptor_indexing->shaderStorageBufferArrayNonUniformIndexing = VK_FALSE; - descriptor_indexing->descriptorBindingStorageBufferUpdateAfterBind = VK_FALSE; - } + /* We do not use storage buffers currently. */ + features->shaderStorageBufferArrayDynamicIndexing = VK_FALSE; + descriptor_indexing->shaderStorageBufferArrayNonUniformIndexing = VK_FALSE; + descriptor_indexing->descriptorBindingStorageBufferUpdateAfterBind = VK_FALSE; if (vulkan_info->EXT_descriptor_indexing && descriptor_indexing && (descriptor_indexing->descriptorBindingUniformBufferUpdateAfterBind

1 0

Conor McCarthy : vkd3d: Do not enable Vulkan-backed descriptor heaps if required update-after-bind features are missing.
by Alexandre Julliard March 23, 2022

March 23, 2022

Module: vkd3d Branch: master Commit: ae2219a7f72d9d5801c8ae4144e7730a390550b9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ae2219a7f72d9d5801c8ae4… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Mar 23 00:33:00 2022 +1000 vkd3d: Do not enable Vulkan-backed descriptor heaps if required update-after-bind features are missing. descriptorBindingUniformBufferUpdateAfterBind is false for Intel Skylake (and maybe others). 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/device.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index bd471a72..459aa615 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1657,7 +1657,12 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, * use only enough descriptors for the descriptor tables of the currently bound * root signature, and don't require a 32-bit push constant for each table. */ device->use_vk_heaps = vulkan_info->EXT_descriptor_indexing - && !(device->vkd3d_instance->config_flags & VKD3D_CONFIG_FLAG_VIRTUAL_HEAPS); + && !(device->vkd3d_instance->config_flags & VKD3D_CONFIG_FLAG_VIRTUAL_HEAPS) + && descriptor_indexing->descriptorBindingUniformBufferUpdateAfterBind + && descriptor_indexing->descriptorBindingSampledImageUpdateAfterBind + && descriptor_indexing->descriptorBindingStorageImageUpdateAfterBind + && descriptor_indexing->descriptorBindingUniformTexelBufferUpdateAfterBind + && descriptor_indexing->descriptorBindingStorageTexelBufferUpdateAfterBind; if (device->use_vk_heaps) vkd3d_device_vk_heaps_descriptor_limits_init(&vulkan_info->descriptor_limits,

1 0

Francois Gouget : testbot/cgi: Rename FormPage::SaveProperties() to Save().
by Alexandre Julliard March 23, 2022

March 23, 2022

Module: tools Branch: master Commit: e5800b36578db52b920a5a8869132c261ba7431b URL: https://source.winehq.org/git/tools.git/?a=commit;h=e5800b36578db52b920a5a8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 23 14:58:33 2022 +0100 testbot/cgi: Rename FormPage::SaveProperties() to Save(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/FormPage.pm | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index e432fcb..bc8ce47 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -361,7 +361,7 @@ sub SaveProperty($$$) die "Pure virtual function FormPage::SaveProperty called"; } -sub SaveProperties($) +sub Save($) { my ($self) = @_; @@ -394,13 +394,6 @@ sub SaveProperties($) return 1; } -sub Save($) -{ - my ($self) = @_; - - return $self->SaveProperties(); -} - sub OnAction($$) { my ($self, $Action) = @_;

1 0

Francois Gouget : testbot: Shorten the VM property descriptions.
by Alexandre Julliard March 23, 2022

March 23, 2022

Module: tools Branch: master Commit: 4640ca58f779e0cfd140ea7b5463851f2107e56a URL: https://source.winehq.org/git/tools.git/?a=commit;h=4640ca58f779e0cfd140ea7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 23 14:57:44 2022 +0100 testbot: Shorten the VM property descriptions. In context the short names are just as explicit and take less space in the column headers. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/VMs.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 60a52b8..f850daa 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -762,10 +762,10 @@ sub CreateItem($) } my @PropertyDescriptors = ( - CreateBasicPropertyDescriptor("Name", "VM name", 1, 1, "A", 20), + CreateBasicPropertyDescriptor("Name", "Name", 1, 1, "A", 20), CreateBasicPropertyDescriptor("SortOrder", "Display order", !1, 1, "N", 3), - CreateEnumPropertyDescriptor("Type", "Type of VM", !1, 1, ['win32', 'win64', 'build', 'wine']), - CreateEnumPropertyDescriptor("Role", "VM Role", !1, 1, ['extra', 'base', 'winetest', 'retired', 'deleted']), + CreateEnumPropertyDescriptor("Type", "Type", !1, 1, ['win32', 'win64', 'build', 'wine']), + CreateEnumPropertyDescriptor("Role", "Role", !1, 1, ['extra', 'base', 'winetest', 'retired', 'deleted']), CreateBasicPropertyDescriptor("Missions", "Missions", !1, 1, "A", 256), CreateBasicPropertyDescriptor("MissionCaps", "Mission Capabilities", !1, !1, "A", 512), CreateEnumPropertyDescriptor("Status", "Current status", !1, 1, ['dirty', 'reverting', 'sleeping', 'idle', 'running', 'off', 'offline', 'maintenance']),

1 0

Francois Gouget : testbot/cgi: Rename the OK action to Save.
by Alexandre Julliard March 23, 2022

March 23, 2022

Module: tools Branch: master Commit: ee009fec95153ac32cddeaf1e434468d507cdbe3 URL: https://source.winehq.org/git/tools.git/?a=commit;h=ee009fec95153ac32cddeaf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 23 14:58:02 2022 +0100 testbot/cgi: Rename the OK action to Save. Save better reflects what the action does. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/ItemPage.pm | 4 ++-- testbot/web/admin/UserDetails.pl | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index a178aa6..09dfc04 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -116,7 +116,7 @@ sub GetActions($) my ($self) = @_; my @Actions = @{$self->SUPER::GetActions()}; - push @Actions, "OK", "Cancel"; + push @Actions, "Save", "Cancel"; return \@Actions; } @@ -151,7 +151,7 @@ sub OnAction($$) { my ($self, $Action) = @_; - if ($Action eq "OK") + if ($Action eq "Save") { return !1 if (!$self->Save()); exit($self->RedirectToList()); diff --git a/testbot/web/admin/UserDetails.pl b/testbot/web/admin/UserDetails.pl index 8c26930..7f7c710 100644 --- a/testbot/web/admin/UserDetails.pl +++ b/testbot/web/admin/UserDetails.pl @@ -89,7 +89,7 @@ sub OnReject($) exit($self->RedirectToList()); } -sub OnOK($) +sub OnSave($) { my ($self) = @_; @@ -114,9 +114,9 @@ sub OnAction($$) { return $self->OnReject(); } - elsif ($Action eq "OK") + elsif ($Action eq "Save") { - return $self->OnOK(); + return $self->OnSave(); } return $self->SUPER::OnAction($Action);

1 0

Rémi Bernon : dinput/tests: Create a child PDO from the Bus driver.
by Alexandre Julliard March 22, 2022

March 22, 2022

Module: wine Branch: master Commit: 709e31fffc166d029edb0528cfe680232a288093 URL: https://source.winehq.org/git/wine.git/?a=commit;h=709e31fffc166d029edb0528… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 22 11:41:38 2022 +0100 dinput/tests: Create a child PDO from the Bus driver. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/driver.c | 7 + dlls/dinput/tests/driver_bus.c | 409 ++++++++++++++++++++++++++++++++++++++++- dlls/dinput/tests/driver_hid.h | 11 ++ dlls/dinput/tests/hid.c | 17 +- 4 files changed, 438 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=709e31fffc166d029edb…

1 0

Rémi Bernon : dinput/tests: Create a HID device from the Bus device.
by Alexandre Julliard March 22, 2022

March 22, 2022

Module: wine Branch: master Commit: 2a52c8dcd276f41659a9a37c31fb3e486933a351 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a52c8dcd276f41659a9a37c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 22 11:41:39 2022 +0100 dinput/tests: Create a HID device from the Bus device. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/Makefile.in | 8 + dlls/dinput/tests/dinput_test.h | 1 + dlls/dinput/tests/driver_bus.c | 683 ++++++++++++++++++++++++++++++++- dlls/dinput/tests/driver_hid.c | 282 ++++++++++++++ dlls/dinput/tests/driver_hid.h | 19 +- dlls/dinput/tests/driver_hid.spec | 1 + dlls/dinput/tests/driver_hid_poll.c | 283 ++++++++++++++ dlls/dinput/tests/driver_hid_poll.spec | 1 + dlls/dinput/tests/hid.c | 188 ++++++++- 9 files changed, 1450 insertions(+), 16 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2a52c8dcd276f41659a9…

1 0

Alistair Leslie-Hughes : kernelbase: Trace not supported flags in CopyFileExW.
by Alexandre Julliard March 22, 2022

March 22, 2022

Module: wine Branch: master Commit: aa2851f167aa2089fdbb12ec58d6f6b4801edbab URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa2851f167aa2089fdbb12ec… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Mar 12 20:01:29 2022 +1100 kernelbase: Trace not supported flags in CopyFileExW. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/file.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index 2d5a6a8ba9a..569d92345b7 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -518,6 +518,13 @@ BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUT TRACE("%s -> %s, %lx\n", debugstr_w(source), debugstr_w(dest), flags); + if (flags & COPY_FILE_RESTARTABLE) + FIXME("COPY_FILE_RESTARTABLE is not supported\n"); + if (flags & COPY_FILE_COPY_SYMLINK) + FIXME("COPY_FILE_COPY_SYMLINK is not supported\n"); + if (flags & COPY_FILE_OPEN_SOURCE_FOR_WRITE) + FIXME("COPY_FILE_OPEN_SOURCE_FOR_WRITE is not supported\n"); + if ((h1 = CreateFileW( source, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, 0 )) == INVALID_HANDLE_VALUE) {

1 0

Rémi Bernon : dinput/tests: Remove now unused HID test driver.
by Alexandre Julliard March 22, 2022

March 22, 2022

Module: wine Branch: master Commit: dcfd15ff93ab6120d5f1b7d96f5e92fe0d9e3c25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dcfd15ff93ab6120d5f1b7d9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 22 11:41:41 2022 +0100 dinput/tests: Remove now unused HID test driver. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/Makefile.in | 4 - dlls/dinput/tests/driver.c | 939 ------------------------------------------ dlls/dinput/tests/driver.spec | 1 - dlls/dinput/tests/hid.c | 55 +-- 4 files changed, 6 insertions(+), 993 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dcfd15ff93ab6120d5f1…

1 0