December 2019 - Wine-Devel - list.winehq.org

[PATCH vkd3d v3 0/5] Add more features to CheckFeatureSupport().
by Conor McCarthy Dec. 5, 2019

Dec. 5, 2019

Some games, e.g. Shadow of the Tomb Raider, do not check for success, and if the feature check is unimplemented they will use uninitialised data for the result. Supersedes 174666. Conor McCarthy (5): vkd3d: Implement support for D3D12_FEATURE_D3D12_OPTIONS1. vkd3d: Implement support for D3D12_FEATURE_ARCHITECTURE1. vkd3d: Implement support for D3D12_FEATURE_D3D12_OPTIONS2. vkd3d: Implement support for D3D12_FEATURE_SHADER_CACHE. vkd3d: Implement support for D3D12_FEATURE_COMMAND_QUEUE_PRIORITY. include/vkd3d_d3d12.idl | 53 ++++++++++++++++ libs/vkd3d/device.c | 126 +++++++++++++++++++++++++++++++++++++ libs/vkd3d/vkd3d_private.h | 2 + 3 files changed, 181 insertions(+) -- 2.24.0

1 5

[PATCH 1/2] include/winbase.h: Add STARTUPINFOEX structure definition.
by Paul Gofman Dec. 5, 2019

Dec. 5, 2019

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- include/winbase.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/winbase.h b/include/winbase.h index 2d01dcb606..71f7ea1586 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1736,6 +1736,19 @@ typedef enum _PROC_THREAD_ATTRIBUTE_NUM #define SYMBOLIC_LINK_FLAG_DIRECTORY (0x1) #define VALID_SYMBOLIC_LINK_FLAGS SYMBOLIC_LINK_FLAG_DIRECTORY +typedef struct _STARTUPINFOEXA{ + STARTUPINFOA StartupInfo; + LPPROC_THREAD_ATTRIBUTE_LIST lpAttributeList; +} STARTUPINFOEXA, *LPSTARTUPINFOEXA; + +typedef struct _STARTUPINFOEXW{ + STARTUPINFOW StartupInfo; + LPPROC_THREAD_ATTRIBUTE_LIST lpAttributeList; +} STARTUPINFOEXW, *LPSTARTUPINFOEXW; + +DECL_WINELIB_TYPE_AW(STARTUPINFOEX) +DECL_WINELIB_TYPE_AW(LPSTARTUPINFOEX) + typedef void *PUMS_CONTEXT; typedef void *PUMS_COMPLETION_LIST; typedef PRTL_UMS_SCHEDULER_ENTRY_POINT PUMS_SCHEDULER_ENTRY_POINT; -- 2.23.0

1 1

[PATCH] testbot/LogUtils: GetLogFileNames() should untaint the returned log names.
by Francois Gouget Dec. 5, 2019

Dec. 5, 2019

Otherwise the caller may get an error when trying to use them for file operations (such as unlink). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 32bf0fa61..4a17857f8 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -634,13 +634,21 @@ sub GetLogFileNames($;$) foreach my $FileName (glob("'$Dir/$Glob*'")) { my $LogName = basename($FileName); - if ($LogName !~ s/\.err$// and $LogName !~ /\.report$/ and - $LogName ne $Glob) # 'log' case + $LogName =~ s/\.err$//; + next if ($Seen{$LogName}); + if ($LogName =~ /^([a-zA-Z0-9_]+\.report)$/) + { + $LogName = $1; # untaint + } + elsif ($LogName eq $Glob) # log and old_log cases + { + $LogName = $Glob; # untaint + } + else { # Not a valid log filename (where does this file come from?) next; } - next if ($Seen{$LogName}); $Seen{$LogName} = 1; if ((-f "$Dir/$LogName" and !-z "$Dir/$LogName") or -- 2.20.1

1 0

[PATCH] testbot/WineSendLog: Errors are not new when missing reference reports.
by Francois Gouget Dec. 5, 2019

Dec. 5, 2019

Build logs don't have reference logs so for them every error is new. But test reports should have reference WineTest results and if not reporting the errors as new would cause false positives. So default to "not new" in that case. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineSendLog.pl | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 721122edb..95cc036c9 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -291,8 +291,11 @@ EOF my ($NewGroups, $NewErrors, $_NewIndices) = GetNewLogErrors($RefFileName, $LogErrors->{Groups}, $LogErrors->{Errors}); if (!$NewGroups) { - # There was no reference log (typical of build logs) - # so every error is new + # Test reports should have reference WineTest results and if not + # reporting the errors as new would cause false positives. + next if ($LogName =~ /\.report$/); + + # Build logs don't have reference logs so for them every error is new. $NewGroups = $LogErrors->{Groups}; $NewErrors = $LogErrors->{Errors}; } -- 2.20.1

1 0

[PATCH] testbot/Janitor: Fix extracting the VM name from reference report filenames.
by Francois Gouget Dec. 5, 2019

Dec. 5, 2019

The log name part can contain underscores and uppercase letters when testing locales. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Janitor.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 537a0dc4a..c51637a19 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -308,7 +308,7 @@ if (opendir(my $dh, "$DataDir/latest")) { next if ($Entry eq "." or $Entry eq ".."); - if ($Entry =~ /^(.*)_[a-z0-9]+\.report(?:\.err)?$/) + if ($Entry =~ /^([a-zA-Z0-9_]+)_(?:exe|win|wow)(?:32|64)[a-zA-Z0-9_]*\.report(?:\.err)?$/) { # Keep the reference WineTest reports for all VMs even if they are # retired or scheduled for deletion. -- 2.20.1

1 0

[PATCH vkd3d v3] vkd3d: Add a memory usage info callback optional extension.
by Conor McCarthy Dec. 5, 2019

Dec. 5, 2019

Allows memory usage info to be sent to Wine DXGI. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- Supersedes 173692. v3: Remove total memory from the function parameters. --- include/vkd3d.h | 12 ++++++++++++ libs/vkd3d/command.c | 6 +++--- libs/vkd3d/device.c | 14 +++++++++++++- libs/vkd3d/resource.c | 19 +++++++++++++------ libs/vkd3d/vkd3d_private.h | 20 ++++++++++++++++++++ 5 files changed, 61 insertions(+), 10 deletions(-) diff --git a/include/vkd3d.h b/include/vkd3d.h index e2d9ec8..17c07d1 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -47,6 +47,7 @@ enum vkd3d_structure_type /* 1.2 */ VKD3D_STRUCTURE_TYPE_OPTIONAL_DEVICE_EXTENSIONS_INFO, VKD3D_STRUCTURE_TYPE_APPLICATION_INFO, + VKD3D_STRUCTURE_TYPE_OPTIONAL_DEVICE_CALLBACK_INFO, VKD3D_FORCE_32_BIT_ENUM(VKD3D_STRUCTURE_TYPE), }; @@ -129,6 +130,17 @@ struct vkd3d_optional_device_extensions_info uint32_t extension_count; }; +typedef void (STDMETHODCALLTYPE *PFN_vkd3d_memory_usage_callback)(IUnknown *adapter, + unsigned int non_local, INT64 change); + +struct vkd3d_optional_device_callback_info +{ + enum vkd3d_structure_type type; + const void *next; + + PFN_vkd3d_memory_usage_callback pfn_memory_usage_callback; +}; + /* vkd3d_image_resource_create_info flags */ #define VKD3D_RESOURCE_INITIAL_STATE_TRANSITION 0x00000001 #define VKD3D_RESOURCE_PRESENT_STATE_TRANSITION 0x00000002 diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 75af27d..1b62f9a 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1416,7 +1416,7 @@ static void vkd3d_buffer_destroy(struct vkd3d_buffer *buffer, struct d3d12_devic { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; - VK_CALL(vkFreeMemory(device->vk_device, buffer->vk_memory, NULL)); + vkd3d_free_device_memory(device, buffer->vk_memory_type, buffer->vk_memory_size, buffer->vk_memory); VK_CALL(vkDestroyBuffer(device->vk_device, buffer->vk_buffer, NULL)); } @@ -3232,8 +3232,8 @@ static HRESULT d3d12_command_list_allocate_transfer_buffer(struct d3d12_command_ if (FAILED(hr = vkd3d_create_buffer(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &buffer_desc, &buffer->vk_buffer))) return hr; - if (FAILED(hr = vkd3d_allocate_buffer_memory(device, buffer->vk_buffer, - &heap_properties, D3D12_HEAP_FLAG_NONE, &buffer->vk_memory, NULL, NULL))) + if (FAILED(hr = vkd3d_allocate_buffer_memory(device, buffer->vk_buffer, &heap_properties, + D3D12_HEAP_FLAG_NONE, &buffer->vk_memory, &buffer->vk_memory_type, &buffer->vk_memory_size))) { VK_CALL(vkDestroyBuffer(device->vk_device, buffer->vk_buffer, NULL)); return hr; diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index e3bb2aa..fd593bc 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3390,6 +3390,7 @@ struct d3d12_device *unsafe_impl_from_ID3D12Device(ID3D12Device *iface) static HRESULT d3d12_device_init(struct d3d12_device *device, struct vkd3d_instance *instance, const struct vkd3d_device_create_info *create_info) { + const struct vkd3d_optional_device_callback_info *optional_callback; const struct vkd3d_vk_device_procs *vk_procs; HRESULT hr; size_t i; @@ -3407,6 +3408,17 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, device->vk_device = VK_NULL_HANDLE; + device->parent = create_info->parent; + + device->pfn_memory_usage_callback = NULL; + optional_callback = vkd3d_find_struct(create_info->next, OPTIONAL_DEVICE_CALLBACK_INFO); + if (optional_callback) + { + device->pfn_memory_usage_callback = optional_callback->pfn_memory_usage_callback; + if (device->pfn_memory_usage_callback) + TRACE("Found memory callback function %p.\n", device->pfn_memory_usage_callback); + } + if (FAILED(hr = vkd3d_create_vk_device(device, create_info))) goto out_free_instance; @@ -3434,7 +3446,7 @@ 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); - if ((device->parent = create_info->parent)) + if (device->parent) IUnknown_AddRef(device->parent); return S_OK; diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index f40d986..f5fccfa 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -147,6 +147,8 @@ static HRESULT vkd3d_allocate_device_memory(struct d3d12_device *device, if (vk_memory_type) *vk_memory_type = allocate_info.memoryTypeIndex; + d3d12_device_update_memory_usage(device, allocate_info.memoryTypeIndex, allocate_info.allocationSize); + return S_OK; } @@ -161,6 +163,7 @@ HRESULT vkd3d_allocate_buffer_memory(struct d3d12_device *device, VkBuffer vk_bu VkMemoryRequirements2 memory_requirements2; VkMemoryRequirements *memory_requirements; VkBufferMemoryRequirementsInfo2 info; + uint32_t type; VkResult vr; HRESULT hr; @@ -196,16 +199,18 @@ HRESULT vkd3d_allocate_buffer_memory(struct d3d12_device *device, VkBuffer vk_bu } if (FAILED(hr = vkd3d_allocate_device_memory(device, heap_properties, heap_flags, - memory_requirements, dedicated_allocation, vk_memory, vk_memory_type))) + memory_requirements, dedicated_allocation, vk_memory, &type))) return hr; if ((vr = VK_CALL(vkBindBufferMemory(device->vk_device, vk_buffer, *vk_memory, 0))) < 0) { WARN("Failed to bind memory, vr %d.\n", vr); - VK_CALL(vkFreeMemory(device->vk_device, *vk_memory, NULL)); + vkd3d_free_device_memory(device, type, memory_requirements->size, *vk_memory); *vk_memory = VK_NULL_HANDLE; } + if (vk_memory_type) + *vk_memory_type = type; if (vk_memory_size) *vk_memory_size = memory_requirements->size; @@ -223,6 +228,7 @@ static HRESULT vkd3d_allocate_image_memory(struct d3d12_device *device, VkImage VkMemoryRequirements2 memory_requirements2; VkMemoryRequirements *memory_requirements; VkImageMemoryRequirementsInfo2 info; + uint32_t type; VkResult vr; HRESULT hr; @@ -258,17 +264,19 @@ static HRESULT vkd3d_allocate_image_memory(struct d3d12_device *device, VkImage } if (FAILED(hr = vkd3d_allocate_device_memory(device, heap_properties, heap_flags, - memory_requirements, dedicated_allocation, vk_memory, vk_memory_type))) + memory_requirements, dedicated_allocation, vk_memory, &type))) return hr; if ((vr = VK_CALL(vkBindImageMemory(device->vk_device, vk_image, *vk_memory, 0))) < 0) { WARN("Failed to bind memory, vr %d.\n", vr); - VK_CALL(vkFreeMemory(device->vk_device, *vk_memory, NULL)); + vkd3d_free_device_memory(device, type, memory_requirements->size, *vk_memory); *vk_memory = VK_NULL_HANDLE; return hresult_from_vk_result(vr); } + if (vk_memory_type) + *vk_memory_type = type; if (vk_memory_size) *vk_memory_size = memory_requirements->size; @@ -318,13 +326,12 @@ static ULONG STDMETHODCALLTYPE d3d12_heap_AddRef(ID3D12Heap *iface) static void d3d12_heap_destroy(struct d3d12_heap *heap) { struct d3d12_device *device = heap->device; - const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; TRACE("Destroying heap %p.\n", heap); vkd3d_private_store_destroy(&heap->private_store); - VK_CALL(vkFreeMemory(device->vk_device, heap->vk_memory, NULL)); + vkd3d_free_device_memory(device, heap->vk_memory_type, heap->desc.SizeInBytes, heap->vk_memory); pthread_mutex_destroy(&heap->mutex); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 9ff6bba..28801ba 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -839,6 +839,8 @@ struct vkd3d_buffer { VkBuffer vk_buffer; VkDeviceMemory vk_memory; + VkDeviceSize vk_memory_size; + uint32_t vk_memory_type; }; /* ID3D12CommandAllocator */ @@ -1129,6 +1131,7 @@ struct d3d12_device VkPipelineCache vk_pipeline_cache; VkPhysicalDeviceMemoryProperties memory_properties; + PFN_vkd3d_memory_usage_callback pfn_memory_usage_callback; D3D12_FEATURE_DATA_D3D12_OPTIONS feature_options; @@ -1199,6 +1202,23 @@ static inline pthread_mutex_t *d3d12_device_get_descriptor_mutex(struct d3d12_de return &device->desc_mutex[idx & (ARRAY_SIZE(device->desc_mutex) - 1)]; } +static inline void d3d12_device_update_memory_usage(struct d3d12_device *device, uint32_t vk_memory_type, int64_t change) +{ + unsigned int non_local = !(device->memory_properties.memoryTypes[vk_memory_type].propertyFlags & VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT); + + if (device->pfn_memory_usage_callback) + device->pfn_memory_usage_callback(device->parent, non_local, change); +} + +static inline void vkd3d_free_device_memory(struct d3d12_device *device, + uint32_t type, VkDeviceSize size, VkDeviceMemory vk_memory) +{ + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + + VK_CALL(vkFreeMemory(device->vk_device, vk_memory, NULL)); + d3d12_device_update_memory_usage(device, type, -(int64_t)size); +} + /* utils */ enum vkd3d_format_type { -- 2.24.0

1 0

[PATCH 3/3] bcrypt: Add more BCryptSignHash tests.
by Hans Leidekker Dec. 5, 2019

Dec. 5, 2019

From: Derek Lesho <dlesho(a)codeweavers.com> v2: Verify signature. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/tests/bcrypt.c | 49 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index d125e0c89d..198acbf721 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -2049,6 +2049,9 @@ static void test_BCryptSignHash(void) { static UCHAR hash[] = {0x7e,0xe3,0x74,0xe7,0xc5,0x0b,0x6b,0x70,0xdb,0xab,0x32,0x6d,0x1d,0x51,0xd6,0x74,0x79,0x8e,0x5b,0x4b}; + static UCHAR hash_sha256[] = + {0x25,0x2f,0x10,0xc8,0x36,0x10,0xeb,0xca,0x1a,0x05,0x9c,0x0b,0xae,0x82,0x55,0xeb,0xa2,0xf9,0x5b,0xe4, + 0xd1,0xd7,0xbC,0xfA,0x89,0xd7,0x24,0x8a,0x82,0xd9,0xf1,0x11}; BCRYPT_PKCS1_PADDING_INFO pad; BCRYPT_ALG_HANDLE alg; BCRYPT_KEY_HANDLE key; @@ -2056,6 +2059,8 @@ static void test_BCryptSignHash(void) NTSTATUS ret; ULONG len; + /* RSA */ + ret = pBCryptOpenAlgorithmProvider(&alg, BCRYPT_RSA_ALGORITHM, NULL, 0); if (ret) { @@ -2087,6 +2092,14 @@ static void test_BCryptSignHash(void) len = 0; memset(sig, 0, sizeof(sig)); + + /* inference of padding info on RSA not supported */ + ret = pBCryptSignHash(key, NULL, hash, sizeof(hash), sig, sizeof(sig), &len, 0); + ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + + ret = pBCryptSignHash(key, &pad, hash, sizeof(hash), sig, 0, &len, BCRYPT_PAD_PKCS1); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); + ret = pBCryptSignHash(key, &pad, hash, sizeof(hash), sig, sizeof(sig), &len, BCRYPT_PAD_PKCS1); ok(!ret, "got %08x\n", ret); ok(len == 64, "got %u\n", len); @@ -2099,6 +2112,42 @@ static void test_BCryptSignHash(void) ret = pBCryptCloseAlgorithmProvider(alg, 0); ok(!ret, "got %08x\n", ret); + + /* ECDSA */ + + ret = pBCryptOpenAlgorithmProvider(&alg, BCRYPT_ECDSA_P256_ALGORITHM, NULL, 0); + if (ret) + { + win_skip("failed to open ECDSA provider: %08x\n", ret); + return; + } + + ret = pBCryptGenerateKeyPair(alg, &key, 256, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + ret = pBCryptFinalizeKeyPair(key, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + memset(sig, 0, sizeof(sig)); + len = 0; + + /* automatically detects padding info */ + ret = pBCryptSignHash(key, NULL, hash, sizeof(hash), sig, sizeof(sig), &len, 0); + ok (!ret, "got %08x\n", ret); + ok (len == 64, "got %u\n", len); + + ret = pBCryptVerifySignature(key, NULL, hash, sizeof(hash), sig, len, 0); + ok(!ret, "got %08x\n", ret); + + /* mismatch info (SHA-1 != SHA-256) */ + ret = pBCryptSignHash(key, &pad, hash_sha256, sizeof(hash_sha256), sig, sizeof(sig), &len, BCRYPT_PAD_PKCS1); + ok (ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + + ret = pBCryptDestroyKey(key); + ok(!ret, "got %08x\n", ret); + + ret = pBCryptCloseAlgorithmProvider(alg, 0); + ok(!ret, "got %08x\n", ret); } static void test_BCryptEnumAlgorithms(void) -- 2.20.1

1 0

[PATCH 2/3] bcrypt: Handle SHA1 hash in key_asymmetric_verify.
by Hans Leidekker Dec. 5, 2019

Dec. 5, 2019

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/gnutls.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 379d76a32e..2f048d6c86 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -1064,6 +1064,7 @@ NTSTATUS key_asymmetric_verify( struct key *key, void *padding, UCHAR *hash, ULO /* only the hash size must match, not the actual hash function */ switch (hash_len) { + case 20: hash_alg = GNUTLS_DIG_SHA1; break; case 32: hash_alg = GNUTLS_DIG_SHA256; break; case 48: hash_alg = GNUTLS_DIG_SHA384; break; -- 2.20.1

1 0

[PATCH] testbot/LogUtils: Fix GetNewLogErrors() when there are no errors.
by Francois Gouget Dec. 5, 2019

Dec. 5, 2019

Don't use $Groups if it is undefined. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This fixes WineSendLog and thus the patch status and Marvin emails. testbot/lib/WineTestBot/LogUtils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 51932965c..32bf0fa61 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -889,7 +889,7 @@ sub GetNewLogErrors($$$) my ($RefFileName, $Groups, $Errors) = @_; my (@NewGroups, %NewErrors, %NewIndices); - return (\@NewGroups, \%NewErrors, \%NewIndices) if (!@$Groups); + return (\@NewGroups, \%NewErrors, \%NewIndices) if (!$Groups or !@$Groups); my ($RefGroups, $RefErrors) = GetLogErrors($RefFileName); return (undef, undef) if (!$RefGroups); -- 2.20.1

1 0

[PATCH] testbot/web: Abuse the Status field to show more details about accounts.
by Francois Gouget Dec. 5, 2019

Dec. 5, 2019

This allows quickly identifying accounts that have been approved but where the user did not pick a password. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/WineTestBot.css | 8 ++++++ testbot/web/admin/UsersList.pl | 47 ++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+) diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index 1456036c0..f58835583 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -387,6 +387,14 @@ pre .boterror { color: #e55600; } .canceled { color: black; } +.userrequest { color: #e55600; } +.userapproved { color: green; } +.useradmin { color: black; } +.userdevel { color: black; } +.usernone { color: red; } +.userdisabled { color: red; } +.userdeleted { color: red; } + .log-info { background-color: #d9ffcc; } .log-skip { color: blue; } .log-todo { color: #d08000; } diff --git a/testbot/web/admin/UsersList.pl b/testbot/web/admin/UsersList.pl index f46949d24..279907041 100644 --- a/testbot/web/admin/UsersList.pl +++ b/testbot/web/admin/UsersList.pl @@ -25,6 +25,7 @@ package UsersListPage; use ObjectModel::CGI::CollectionPage; our @ISA = qw(ObjectModel::CGI::CollectionPage); +use URI::Escape; use WineTestBot::CGI::Sessions; use WineTestBot::Config; use WineTestBot::Users; @@ -55,6 +56,52 @@ sub DisplayProperty($$$) $PropertyName eq "Status" || $PropertyName eq "RealName"; } +sub GenerateDataCell($$$$$) +{ + my ($self, $CollectionBlock, $Item, $PropertyDescriptor, $DetailsPage) = @_; + + my $PropertyName = $PropertyDescriptor->GetName(); + if ($PropertyName eq "Status") + { + my $Status = $Item->Status; + my ($Class, $Label); + if ($Status eq "disabled") + { + ($Class, $Label) = ('userdisabled', 'disabled'); + } + elsif ($Status eq "deleted") + { + ($Class, $Label) = ('userdeleted', 'deleted'); + } + elsif ($Item->WaitingForApproval()) + { + ($Class, $Label) = ('userrequest', 'request'); + } + elsif (!$Item->Activated()) + { + ($Class, $Label) = ('userapproved', 'approved'); + } + elsif ($Item->HasRole("admin")) + { + ($Class, $Label) = ('useradmin', 'admin'); + } + elsif ($Item->HasRole("wine-devel")) + { + ($Class, $Label) = ('userdevel', 'wine-devel'); + } + else + { + ($Class, $Label) = ('usernone', 'none'); + } + print "<td><a href='/admin/UserDetails.pl?Key=", uri_escape($Item->GetKey()), + "'><span class='$Class'>$Label</span></a></td>"; + } + else + { + $self->SUPER::GenerateDataCell($CollectionBlock, $Item, $PropertyDescriptor, $DetailsPage); + } +} + sub GetActions($$) { my ($self, $CollectionBlock) = @_; -- 2.20.1

1 0