August 2021 - Wine-Commits - list.winehq.org

Rémi Bernon : xinput1_3: Read the controller state in the update thread.
by Alexandre Julliard Aug. 11, 2021

Aug. 11, 2021

Module: wine Branch: master Commit: 43f0c8096b2d81052a30d8542372adc46dab8292 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43f0c8096b2d81052a30d854… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 10 13:27:24 2021 +0200 xinput1_3: Read the controller state in the update thread. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/main.c | 235 +++++++++++++++++++++++++------------------------- 1 file changed, 118 insertions(+), 117 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=43f0c8096b2d81052a30…

1 0

Georg Lehmann : winevulkan: Update to VK spec version 1.2.188.
by Alexandre Julliard Aug. 11, 2021

Aug. 11, 2021

Module: wine Branch: master Commit: cd1a612b1d179d274b99ba8f72916e5c851c7da8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd1a612b1d179d274b99ba8f… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Tue Aug 10 21:05:58 2021 +0200 winevulkan: Update to VK spec version 1.2.188. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 1 + dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 20 +++++++++++++------- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 5e683d42de7..55b5b71691e 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -64,7 +64,7 @@ from enum import Enum LOGGER = logging.Logger("vulkan") LOGGER.addHandler(logging.StreamHandler()) -VK_XML_VERSION = "1.2.185" +VK_XML_VERSION = "1.2.188" WINE_VK_VERSION = (1, 2) # Filenames to create. diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 11cc9bf8220..fd3ed950930 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -8093,6 +8093,7 @@ static const char * const vk_device_extensions[] = "VK_EXT_index_type_uint8", "VK_EXT_inline_uniform_block", "VK_EXT_line_rasterization", + "VK_EXT_load_store_op_none", "VK_EXT_memory_budget", "VK_EXT_memory_priority", "VK_EXT_multi_draw", diff --git a/dlls/winevulkan/winevulkan.json b/dlls/winevulkan/winevulkan.json index 018bad1c3d4..71f737293fa 100644 --- a/dlls/winevulkan/winevulkan.json +++ b/dlls/winevulkan/winevulkan.json @@ -2,6 +2,6 @@ "file_format_version": "1.0.0", "ICD": { "library_path": ".\\winevulkan.dll", - "api_version": "1.2.185" + "api_version": "1.2.188" } } diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index 6f80ae95ca6..983d3143f89 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -452,7 +452,9 @@ #define VK_EXT_GLOBAL_PRIORITY_QUERY_EXTENSION_NAME "VK_EXT_global_priority_query" #define VK_EXT_MULTI_DRAW_SPEC_VERSION 1 #define VK_EXT_MULTI_DRAW_EXTENSION_NAME "VK_EXT_multi_draw" -#define VK_KHR_ACCELERATION_STRUCTURE_SPEC_VERSION 11 +#define VK_EXT_LOAD_STORE_OP_NONE_SPEC_VERSION 1 +#define VK_EXT_LOAD_STORE_OP_NONE_EXTENSION_NAME "VK_EXT_load_store_op_none" +#define VK_KHR_ACCELERATION_STRUCTURE_SPEC_VERSION 12 #define VK_KHR_ACCELERATION_STRUCTURE_EXTENSION_NAME "VK_KHR_acceleration_structure" #define VK_KHR_RAY_TRACING_PIPELINE_SPEC_VERSION 1 #define VK_KHR_RAY_TRACING_PIPELINE_EXTENSION_NAME "VK_KHR_ray_tracing_pipeline" @@ -473,7 +475,7 @@ #define VK_API_VERSION_1_0 VK_MAKE_API_VERSION(0, 1, 0, 0) #define VK_API_VERSION_1_1 VK_MAKE_API_VERSION(0, 1, 1, 0) #define VK_API_VERSION_1_2 VK_MAKE_API_VERSION(0, 1, 2, 0) -#define VK_HEADER_VERSION 185 +#define VK_HEADER_VERSION 187 #define VK_HEADER_VERSION_COMPLETE VK_MAKE_API_VERSION(0, 1, 2, VK_HEADER_VERSION) #define VK_DEFINE_HANDLE(object) typedef struct object##_T* object; #define VK_USE_64_BIT_PTR_DEFINES 0 @@ -703,7 +705,7 @@ typedef VkFlags VkToolPurposeFlagsEXT; typedef VkFlags VkValidationCacheCreateFlagsEXT; typedef VkFlags VkViSurfaceCreateFlagsNN; typedef VkFlags VkVideoBeginCodingFlagsKHR; -typedef VkFlags VkVideoCapabilitiesFlagsKHR; +typedef VkFlags VkVideoCapabilityFlagsKHR; typedef VkFlags VkVideoChromaSubsamplingFlagsKHR; typedef VkFlags VkVideoCodecOperationFlagsKHR; typedef VkFlags VkVideoCodingControlFlagsKHR; @@ -711,10 +713,10 @@ typedef VkFlags VkVideoCodingQualityPresetFlagsKHR; typedef VkFlags VkVideoComponentBitDepthFlagsKHR; typedef VkFlags VkVideoDecodeFlagsKHR; typedef VkFlags VkVideoDecodeH264CreateFlagsEXT; -typedef VkFlags VkVideoDecodeH264FieldLayoutFlagsEXT; +typedef VkFlags VkVideoDecodeH264PictureLayoutFlagsEXT; typedef VkFlags VkVideoDecodeH265CreateFlagsEXT; typedef VkFlags VkVideoEncodeFlagsKHR; -typedef VkFlags VkVideoEncodeH264CapabilitiesFlagsEXT; +typedef VkFlags VkVideoEncodeH264CapabilityFlagsEXT; typedef VkFlags VkVideoEncodeH264CreateFlagsEXT; typedef VkFlags VkVideoEncodeH264InputModeFlagsEXT; typedef VkFlags VkVideoEncodeH264OutputModeFlagsEXT; @@ -868,6 +870,7 @@ typedef enum VkAttachmentLoadOp VK_ATTACHMENT_LOAD_OP_LOAD = 0, VK_ATTACHMENT_LOAD_OP_CLEAR = 1, VK_ATTACHMENT_LOAD_OP_DONT_CARE = 2, + VK_ATTACHMENT_LOAD_OP_NONE_EXT = 1000400000, VK_ATTACHMENT_LOAD_OP_MAX_ENUM = 0x7fffffff, } VkAttachmentLoadOp; @@ -875,7 +878,8 @@ typedef enum VkAttachmentStoreOp { VK_ATTACHMENT_STORE_OP_STORE = 0, VK_ATTACHMENT_STORE_OP_DONT_CARE = 1, - VK_ATTACHMENT_STORE_OP_NONE_QCOM = 1000301000, + VK_ATTACHMENT_STORE_OP_NONE_EXT = 1000301000, + VK_ATTACHMENT_STORE_OP_NONE_QCOM = VK_ATTACHMENT_STORE_OP_NONE_EXT, VK_ATTACHMENT_STORE_OP_MAX_ENUM = 0x7fffffff, } VkAttachmentStoreOp; @@ -1419,6 +1423,7 @@ typedef enum VkDriverId VK_DRIVER_ID_MOLTENVK = 14, VK_DRIVER_ID_COREAVI_PROPRIETARY = 15, VK_DRIVER_ID_JUICE_PROPRIETARY = 16, + VK_DRIVER_ID_VERISILICON_PROPRIETARY = 17, VK_DRIVER_ID_AMD_PROPRIETARY_KHR = VK_DRIVER_ID_AMD_PROPRIETARY, VK_DRIVER_ID_AMD_OPEN_SOURCE_KHR = VK_DRIVER_ID_AMD_OPEN_SOURCE, VK_DRIVER_ID_MESA_RADV_KHR = VK_DRIVER_ID_MESA_RADV, @@ -1981,9 +1986,10 @@ typedef VkGeometryFlagBitsKHR VkGeometryFlagBitsNV; typedef enum VkGeometryInstanceFlagBitsKHR { VK_GEOMETRY_INSTANCE_TRIANGLE_FACING_CULL_DISABLE_BIT_KHR = 0x00000001, - VK_GEOMETRY_INSTANCE_TRIANGLE_FRONT_COUNTERCLOCKWISE_BIT_KHR = 0x00000002, + VK_GEOMETRY_INSTANCE_TRIANGLE_FLIP_FACING_BIT_KHR = 0x00000002, VK_GEOMETRY_INSTANCE_FORCE_OPAQUE_BIT_KHR = 0x00000004, VK_GEOMETRY_INSTANCE_FORCE_NO_OPAQUE_BIT_KHR = 0x00000008, + VK_GEOMETRY_INSTANCE_TRIANGLE_FRONT_COUNTERCLOCKWISE_BIT_KHR = VK_GEOMETRY_INSTANCE_TRIANGLE_FLIP_FACING_BIT_KHR, VK_GEOMETRY_INSTANCE_TRIANGLE_CULL_DISABLE_BIT_NV = VK_GEOMETRY_INSTANCE_TRIANGLE_FACING_CULL_DISABLE_BIT_KHR, VK_GEOMETRY_INSTANCE_TRIANGLE_FRONT_COUNTERCLOCKWISE_BIT_NV = VK_GEOMETRY_INSTANCE_TRIANGLE_FRONT_COUNTERCLOCKWISE_BIT_KHR, VK_GEOMETRY_INSTANCE_FORCE_OPAQUE_BIT_NV = VK_GEOMETRY_INSTANCE_FORCE_OPAQUE_BIT_KHR,

1 0

Zebediah Figura : kernelbase: Implement reading performance counter name strings.
by Alexandre Julliard Aug. 11, 2021

Aug. 11, 2021

Module: wine Branch: master Commit: aaf66e57de36749b77571759b7386a791e0789a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aaf66e57de36749b77571759… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Aug 11 00:20:07 2021 -0500 kernelbase: Implement reading performance counter name strings. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 18 ++++++++++++------ dlls/kernelbase/registry.c | 30 +++++++++++++++++++++++++++--- 2 files changed, 39 insertions(+), 9 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 3f3d7a4ac7a..811117beadc 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -3785,7 +3785,7 @@ static void test_performance_keys(void) size = 0xdeadbeef; ret = RegQueryValueExA(keys[i], "cOuNtEr", NULL, NULL, NULL, &size); - todo_wine + todo_wine_if (keys[i] != HKEY_PERFORMANCE_DATA) { ok(!ret, "got %u\n", ret); ok(size > 0 && size < 0xdeadbeef, "got size %u\n", size); @@ -3795,15 +3795,19 @@ static void test_performance_keys(void) size = 0; ret = RegQueryValueExA(keys[i], "cOuNtEr", NULL, &type, buffer, &size); todo_wine_if (keys[i] != HKEY_PERFORMANCE_DATA) + { ok(ret == ERROR_MORE_DATA, "got %u\n", ret); - todo_wine ok(size > 0, "got size %u\n", size); + ok(size > 0, "got size %u\n", size); + } type = 0xdeadbeef; size = buffer_size; ret = RegQueryValueExA(keys[i], "cOuNtEr", NULL, &type, buffer, &size); todo_wine_if (keys[i] != HKEY_PERFORMANCE_DATA) + { ok(!ret, "got %u\n", ret); - todo_wine ok(type == REG_MULTI_SZ, "got type %u\n", type); + ok(type == REG_MULTI_SZ, "got type %u\n", type); + } if (type == REG_MULTI_SZ) test_counter_values(buffer, keys[i]); @@ -3811,14 +3815,16 @@ static void test_performance_keys(void) size = buffer_size; ret = RegQueryValueExA(keys[i], "cOuNtErwine", NULL, &type, buffer, &size); todo_wine_if (keys[i] != HKEY_PERFORMANCE_DATA) + { ok(!ret, "got %u\n", ret); - todo_wine ok(type == REG_MULTI_SZ, "got type %u\n", type); + ok(type == REG_MULTI_SZ, "got type %u\n", type); + } if (type == REG_MULTI_SZ) test_counter_values(buffer, keys[i]); size = 0; ret = RegQueryValueExW(keys[i], L"cOuNtEr", NULL, NULL, NULL, &size); - todo_wine + todo_wine_if (keys[i] != HKEY_PERFORMANCE_DATA) { ok(!ret, "got %u\n", ret); ok(size > 0, "got size %u\n", size); @@ -3828,7 +3834,7 @@ static void test_performance_keys(void) type = 0xdeadbeef; ret = RegQueryValueExW(keys[i], L"cOuNtEr", NULL, &type, bufferW, &size); - todo_wine + todo_wine_if (keys[i] != HKEY_PERFORMANCE_DATA) { ok(!ret, "got %u\n", ret); ok(type == REG_MULTI_SZ, "got type %u\n", type); diff --git a/dlls/kernelbase/registry.c b/dlls/kernelbase/registry.c index 3a551ecbec5..31698cb0948 100644 --- a/dlls/kernelbase/registry.c +++ b/dlls/kernelbase/registry.c @@ -1204,6 +1204,27 @@ LONG WINAPI RegSetKeyValueA( HKEY hkey, LPCSTR subkey, LPCSTR name, DWORD type, return ret; } +/* FIXME: we should read data from system32/perf009c.dat (or perf###c depending + * on locale) instead */ +static DWORD query_perf_names( DWORD *type, void *data, DWORD *ret_size, BOOL unicode ) +{ + static const WCHAR names[] = L"1\0" "1847\0" "1846\0End Marker\0"; + DWORD size = *ret_size; + + if (type) *type = REG_MULTI_SZ; + *ret_size = sizeof(names); + if (!unicode) *ret_size /= sizeof(WCHAR); + + if (!data) return ERROR_SUCCESS; + if (size < *ret_size) return ERROR_MORE_DATA; + + if (unicode) + memcpy( data, names, sizeof(names) ); + else + RtlUnicodeToMultiByteN( data, size, NULL, names, sizeof(names) ); + return ERROR_SUCCESS; +} + struct perf_provider { HMODULE perflib; @@ -1338,7 +1359,7 @@ static DWORD collect_data(struct perf_provider *provider, const WCHAR *query, vo #define MAX_SERVICE_NAME 260 -static DWORD query_perf_data(const WCHAR *query, DWORD *type, void *data, DWORD *ret_size) +static DWORD query_perf_data( const WCHAR *query, DWORD *type, void *data, DWORD *ret_size, BOOL unicode ) { DWORD err, i, data_size; HKEY root; @@ -1347,6 +1368,9 @@ static DWORD query_perf_data(const WCHAR *query, DWORD *type, void *data, DWORD if (!ret_size) return ERROR_INVALID_PARAMETER; + if (!wcsnicmp( query, L"counter", 7 )) + return query_perf_names( type, data, ret_size, unicode ); + data_size = *ret_size; *ret_size = 0; @@ -1480,7 +1504,7 @@ LSTATUS WINAPI DECLSPEC_HOTPATCH RegQueryValueExW( HKEY hkey, LPCWSTR name, LPDW if ((data && !count) || reserved) return ERROR_INVALID_PARAMETER; if (hkey == HKEY_PERFORMANCE_DATA) - return query_perf_data(name, type, data, count); + return query_perf_data( name, type, data, count, TRUE ); if (!(hkey = get_special_root_hkey( hkey, 0 ))) return ERROR_INVALID_HANDLE; @@ -1587,7 +1611,7 @@ LSTATUS WINAPI DECLSPEC_HOTPATCH RegQueryValueExA( HKEY hkey, LPCSTR name, LPDWO if (hkey == HKEY_PERFORMANCE_DATA) { - DWORD ret = query_perf_data( nameW.Buffer, type, data, count ); + DWORD ret = query_perf_data( nameW.Buffer, type, data, count, FALSE ); RtlFreeUnicodeString( &nameW ); return ret; }

1 0

Zebediah Figura : kernelbase: Return performance data when querying HKEY_PERFORMANCE_(NLS)TEXT as well.
by Alexandre Julliard Aug. 11, 2021

Aug. 11, 2021

Module: wine Branch: master Commit: a3931375dd44567d79c9179174030e1c28d0c763 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3931375dd44567d79c91791… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Aug 11 00:20:09 2021 -0500 kernelbase: Return performance data when querying HKEY_PERFORMANCE_(NLS)TEXT as well. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=33037 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 134 ++++++++++++----------------------------- dlls/kernelbase/registry.c | 11 +++- 2 files changed, 46 insertions(+), 99 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 4da2ce100ab..bccc5706131 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -3700,21 +3700,18 @@ static void test_performance_keys(void) size = 0; ret = RegQueryValueExA(keys[i], names[j], NULL, NULL, NULL, &size); - todo_wine_if (keys[i] != HKEY_PERFORMANCE_DATA) - ok(ret == ERROR_MORE_DATA, "got %u\n", ret); + ok(ret == ERROR_MORE_DATA, "got %u\n", ret); ok(!size, "got size %u\n", size); size = 10; ret = RegQueryValueExA(keys[i], names[j], NULL, NULL, buffer, &size); - todo_wine_if (keys[i] != HKEY_PERFORMANCE_DATA) - ok(ret == ERROR_MORE_DATA, "got %u\n", ret); - todo_wine_if (keys[i] == HKEY_PERFORMANCE_DATA) + ok(ret == ERROR_MORE_DATA, "got %u\n", ret); + todo_wine ok(size == 10, "got size %u\n", size); size = buffer_size; ret = RegQueryValueExA(keys[i], names[j], NULL, NULL, NULL, &size); - todo_wine_if (keys[i] != HKEY_PERFORMANCE_DATA) - ok(ret == ERROR_MORE_DATA, "got %u\n", ret); + ok(ret == ERROR_MORE_DATA, "got %u\n", ret); QueryPerformanceCounter(&perftime1); NtQuerySystemTime(&systime1); @@ -3722,18 +3719,9 @@ static void test_performance_keys(void) size = buffer_size; type = 0xdeadbeef; ret = RegQueryValueExA(keys[i], names[j], NULL, &type, buffer, &size); - todo_wine_if (keys[i] != HKEY_PERFORMANCE_DATA) - { - ok(!ret, "got %u\n", ret); - ok(type == REG_BINARY, "got type %u\n", type); - ok(size >= sizeof(PERF_DATA_BLOCK) && size < buffer_size, "got size %u\n", size); - } - - if (ret) - { - winetest_pop_context(); - continue; - } + ok(!ret, "got %u\n", ret); + ok(type == REG_BINARY, "got type %u\n", type); + ok(size >= sizeof(PERF_DATA_BLOCK) && size < buffer_size, "got size %u\n", size); QueryPerformanceCounter(&perftime2); NtQuerySystemTime(&systime2); @@ -3785,129 +3773,81 @@ static void test_performance_keys(void) size = 0xdeadbeef; ret = RegQueryValueExA(keys[i], "cOuNtEr", NULL, NULL, NULL, &size); - todo_wine_if (keys[i] != HKEY_PERFORMANCE_DATA) - { - ok(!ret, "got %u\n", ret); - ok(size > 0 && size < 0xdeadbeef, "got size %u\n", size); - } + ok(!ret, "got %u\n", ret); + ok(size > 0 && size < 0xdeadbeef, "got size %u\n", size); type = 0xdeadbeef; size = 0; ret = RegQueryValueExA(keys[i], "cOuNtEr", NULL, &type, buffer, &size); - todo_wine_if (keys[i] != HKEY_PERFORMANCE_DATA) - { - ok(ret == ERROR_MORE_DATA, "got %u\n", ret); - ok(size > 0, "got size %u\n", size); - } + ok(ret == ERROR_MORE_DATA, "got %u\n", ret); + ok(size > 0, "got size %u\n", size); type = 0xdeadbeef; size = buffer_size; ret = RegQueryValueExA(keys[i], "cOuNtEr", NULL, &type, buffer, &size); - todo_wine_if (keys[i] != HKEY_PERFORMANCE_DATA) - { - ok(!ret, "got %u\n", ret); - ok(type == REG_MULTI_SZ, "got type %u\n", type); - } - if (type == REG_MULTI_SZ) - test_counter_values(buffer, keys[i]); + ok(!ret, "got %u\n", ret); + ok(type == REG_MULTI_SZ, "got type %u\n", type); + test_counter_values(buffer, keys[i]); type = 0xdeadbeef; size = buffer_size; ret = RegQueryValueExA(keys[i], "cOuNtErwine", NULL, &type, buffer, &size); - todo_wine_if (keys[i] != HKEY_PERFORMANCE_DATA) - { - ok(!ret, "got %u\n", ret); - ok(type == REG_MULTI_SZ, "got type %u\n", type); - } - if (type == REG_MULTI_SZ) - test_counter_values(buffer, keys[i]); + ok(!ret, "got %u\n", ret); + ok(type == REG_MULTI_SZ, "got type %u\n", type); + test_counter_values(buffer, keys[i]); size = 0; ret = RegQueryValueExW(keys[i], L"cOuNtEr", NULL, NULL, NULL, &size); - todo_wine_if (keys[i] != HKEY_PERFORMANCE_DATA) - { - ok(!ret, "got %u\n", ret); - ok(size > 0, "got size %u\n", size); - } + ok(!ret, "got %u\n", ret); + ok(size > 0, "got size %u\n", size); bufferW = malloc(size); type = 0xdeadbeef; ret = RegQueryValueExW(keys[i], L"cOuNtEr", NULL, &type, bufferW, &size); - todo_wine_if (keys[i] != HKEY_PERFORMANCE_DATA) - { - ok(!ret, "got %u\n", ret); - ok(type == REG_MULTI_SZ, "got type %u\n", type); - } - if (type == REG_MULTI_SZ) - { - WideCharToMultiByte(CP_ACP, 0, bufferW, size / sizeof(WCHAR), buffer, buffer_size, NULL, NULL); - test_counter_values(buffer, keys[i]); - } + ok(!ret, "got %u\n", ret); + ok(type == REG_MULTI_SZ, "got type %u\n", type); + WideCharToMultiByte(CP_ACP, 0, bufferW, size / sizeof(WCHAR), buffer, buffer_size, NULL, NULL); + test_counter_values(buffer, keys[i]); /* test the "Help" value */ size = 0xdeadbeef; ret = RegQueryValueExA(keys[i], "hElP", NULL, NULL, NULL, &size); - todo_wine_if (keys[i] != HKEY_PERFORMANCE_DATA) - { - ok(!ret, "got %u\n", ret); - ok(size > 0 && size < 0xdeadbeef, "got size %u\n", size); - } + ok(!ret, "got %u\n", ret); + ok(size > 0 && size < 0xdeadbeef, "got size %u\n", size); type = 0xdeadbeef; size = 0; ret = RegQueryValueExA(keys[i], "hElP", NULL, &type, buffer, &size); - todo_wine_if (keys[i] != HKEY_PERFORMANCE_DATA) - { - ok(ret == ERROR_MORE_DATA, "got %u\n", ret); - ok(size > 0, "got size %u\n", size); - } + ok(ret == ERROR_MORE_DATA, "got %u\n", ret); + ok(size > 0, "got size %u\n", size); type = 0xdeadbeef; size = buffer_size; ret = RegQueryValueExA(keys[i], "hElP", NULL, &type, buffer, &size); - todo_wine_if (keys[i] != HKEY_PERFORMANCE_DATA) - { - ok(!ret, "got %u\n", ret); - ok(type == REG_MULTI_SZ, "got type %u\n", type); - } - if (type == REG_MULTI_SZ) - test_help_values(buffer, keys[i]); + test_help_values(buffer, keys[i]); type = 0xdeadbeef; size = buffer_size; ret = RegQueryValueExA(keys[i], "hElPwine", NULL, &type, buffer, &size); - todo_wine_if (keys[i] != HKEY_PERFORMANCE_DATA) - { - ok(!ret, "got %u\n", ret); - ok(type == REG_MULTI_SZ, "got type %u\n", type); - } - if (type == REG_MULTI_SZ) - test_help_values(buffer, keys[i]); + ok(!ret, "got %u\n", ret); + ok(type == REG_MULTI_SZ, "got type %u\n", type); + test_help_values(buffer, keys[i]); size = 0; ret = RegQueryValueExW(keys[i], L"hElP", NULL, NULL, NULL, &size); - todo_wine_if (keys[i] != HKEY_PERFORMANCE_DATA) - { - ok(!ret, "got %u\n", ret); - ok(size > 0, "got size %u\n", size); - } + ok(!ret, "got %u\n", ret); + ok(size > 0, "got size %u\n", size); bufferW = malloc(size); type = 0xdeadbeef; ret = RegQueryValueExW(keys[i], L"hElP", NULL, &type, bufferW, &size); - todo_wine_if (keys[i] != HKEY_PERFORMANCE_DATA) - { - ok(!ret, "got %u\n", ret); - ok(type == REG_MULTI_SZ, "got type %u\n", type); - } - if (type == REG_MULTI_SZ) - { - WideCharToMultiByte(CP_ACP, 0, bufferW, size / sizeof(WCHAR), buffer, buffer_size, NULL, NULL); - test_help_values(buffer, keys[i]); - } + ok(!ret, "got %u\n", ret); + ok(type == REG_MULTI_SZ, "got type %u\n", type); + WideCharToMultiByte(CP_ACP, 0, bufferW, size / sizeof(WCHAR), buffer, buffer_size, NULL, NULL); + test_help_values(buffer, keys[i]); /* test other registry APIs */ diff --git a/dlls/kernelbase/registry.c b/dlls/kernelbase/registry.c index c3d5cdbc6e0..a8f0643e8bf 100644 --- a/dlls/kernelbase/registry.c +++ b/dlls/kernelbase/registry.c @@ -354,6 +354,13 @@ static inline HKEY get_special_root_hkey( HKEY hkey, REGSAM access ) } } +static BOOL is_perf_key( HKEY key ) +{ + return HandleToUlong(key) == HandleToUlong(HKEY_PERFORMANCE_DATA) + || HandleToUlong(key) == HandleToUlong(HKEY_PERFORMANCE_TEXT) + || HandleToUlong(key) == HandleToUlong(HKEY_PERFORMANCE_NLSTEXT); +} + /****************************************************************************** * RemapPredefinedHandleInternal (kernelbase.@) @@ -1526,7 +1533,7 @@ LSTATUS WINAPI DECLSPEC_HOTPATCH RegQueryValueExW( HKEY hkey, LPCWSTR name, LPDW if ((data && !count) || reserved) return ERROR_INVALID_PARAMETER; - if (hkey == HKEY_PERFORMANCE_DATA) + if (is_perf_key( hkey )) return query_perf_data( name, type, data, count, TRUE ); if (!(hkey = get_special_root_hkey( hkey, 0 ))) return ERROR_INVALID_HANDLE; @@ -1632,7 +1639,7 @@ LSTATUS WINAPI DECLSPEC_HOTPATCH RegQueryValueExA( HKEY hkey, LPCSTR name, LPDWO if ((status = RtlAnsiStringToUnicodeString( &nameW, &nameA, TRUE ))) return RtlNtStatusToDosError(status); - if (hkey == HKEY_PERFORMANCE_DATA) + if (is_perf_key( hkey )) { DWORD ret = query_perf_data( nameW.Buffer, type, data, count, FALSE ); RtlFreeUnicodeString( &nameW );

1 0

Nikolay Sivov : d3dcompiler: Improve D3D11_SHADER_DESC returned by reflection interface.
by Alexandre Julliard Aug. 11, 2021

Aug. 11, 2021

Module: wine Branch: master Commit: 741c73d1375b7381a929e0e6042be2a2813894c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=741c73d1375b7381a929e0e6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 11 12:17:09 2021 +0300 d3dcompiler: Improve D3D11_SHADER_DESC returned by reflection interface. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/reflection.c | 70 ++++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 8b893fe76db..97abad4da30 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -387,7 +387,7 @@ static ULONG STDMETHODCALLTYPE d3dcompiler_shader_reflection_Release(ID3D11Shade static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetDesc(ID3D11ShaderReflection *iface, D3D11_SHADER_DESC *desc) { - struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); + struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface); FIXME("iface %p, desc %p partial stub!\n", iface, desc); @@ -397,41 +397,41 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetDesc(ID3D11Sha return E_FAIL; } - desc->Version = This->version; - desc->Creator = This->creator; - desc->Flags = This->flags; - desc->ConstantBuffers = This->constant_buffer_count; - desc->BoundResources = This->bound_resource_count; - desc->InputParameters = This->isgn ? This->isgn->element_count : 0; - desc->OutputParameters = This->osgn ? This->osgn->element_count : 0; - desc->InstructionCount = This->instruction_count; - desc->TempRegisterCount = This->temp_register_count; - desc->TempArrayCount = This->temp_array_count; - desc->DefCount = 0; - desc->DclCount = This->dcl_count; - desc->TextureNormalInstructions = This->texture_normal_instructions; - desc->TextureLoadInstructions = This->texture_load_instructions; - desc->TextureCompInstructions = This->texture_comp_instructions; - desc->TextureBiasInstructions = This->texture_bias_instructions; - desc->TextureGradientInstructions = This->texture_gradient_instructions; - desc->FloatInstructionCount = This->float_instruction_count; - desc->IntInstructionCount = This->int_instruction_count; - desc->UintInstructionCount = This->uint_instruction_count; - desc->StaticFlowControlCount = This->static_flow_control_count; - desc->DynamicFlowControlCount = This->dynamic_flow_control_count; - desc->MacroInstructionCount = 0; - desc->ArrayInstructionCount = This->array_instruction_count; - desc->CutInstructionCount = This->cut_instruction_count; - desc->EmitInstructionCount = This->emit_instruction_count; - desc->GSOutputTopology = This->gs_output_topology; - desc->GSMaxOutputVertexCount = This->gs_max_output_vertex_count; - desc->InputPrimitive = This->input_primitive; - desc->PatchConstantParameters = This->pcsg ? This->pcsg->element_count : 0; + desc->Version = reflection->version; + desc->Creator = reflection->creator; + desc->Flags = reflection->flags; + desc->ConstantBuffers = reflection->constant_buffer_count; + desc->BoundResources = reflection->bound_resource_count; + desc->InputParameters = reflection->isgn ? reflection->isgn->element_count : 0; + desc->OutputParameters = reflection->osgn ? reflection->osgn->element_count : 0; + desc->InstructionCount = reflection->instruction_count; + desc->TempRegisterCount = reflection->temp_register_count; + desc->TempArrayCount = reflection->temp_array_count; + desc->DefCount = reflection->def_count; + desc->DclCount = reflection->dcl_count; + desc->TextureNormalInstructions = reflection->texture_normal_instructions; + desc->TextureLoadInstructions = reflection->texture_load_instructions; + desc->TextureCompInstructions = reflection->texture_comp_instructions; + desc->TextureBiasInstructions = reflection->texture_bias_instructions; + desc->TextureGradientInstructions = reflection->texture_gradient_instructions; + desc->FloatInstructionCount = reflection->float_instruction_count; + desc->IntInstructionCount = reflection->int_instruction_count; + desc->UintInstructionCount = reflection->uint_instruction_count; + desc->StaticFlowControlCount = reflection->static_flow_control_count; + desc->DynamicFlowControlCount = reflection->dynamic_flow_control_count; + desc->MacroInstructionCount = reflection->macro_instruction_count; + desc->ArrayInstructionCount = reflection->array_instruction_count; + desc->CutInstructionCount = reflection->cut_instruction_count; + desc->EmitInstructionCount = reflection->emit_instruction_count; + desc->GSOutputTopology = reflection->gs_output_topology; + desc->GSMaxOutputVertexCount = reflection->gs_max_output_vertex_count; + desc->InputPrimitive = reflection->input_primitive; + desc->PatchConstantParameters = reflection->pcsg ? reflection->pcsg->element_count : 0; desc->cGSInstanceCount = 0; - desc->cControlPoints = This->c_control_points; - desc->HSOutputPrimitive = This->hs_output_primitive; - desc->HSPartitioning = This->hs_partitioning; - desc->TessellatorDomain = This->tessellator_domain; + desc->cControlPoints = reflection->c_control_points; + desc->HSOutputPrimitive = reflection->hs_output_primitive; + desc->HSPartitioning = reflection->hs_partitioning; + desc->TessellatorDomain = reflection->tessellator_domain; desc->cBarrierInstructions = 0; desc->cInterlockedInstructions = 0; desc->cTextureStoreInstructions = 0;

1 0

Rémi Bernon : xinput1_3: Update the controller list in the update thread.
by Alexandre Julliard Aug. 11, 2021

Aug. 11, 2021

Module: wine Branch: master Commit: 8bf147b99096c0a940b55ccc42e05f36c39a6fbb URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bf147b99096c0a940b55ccc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 10 13:27:23 2021 +0200 xinput1_3: Update the controller list in the update thread. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/main.c | 49 ++++++++++++++++++++++--------------------------- 1 file changed, 22 insertions(+), 27 deletions(-) diff --git a/dlls/xinput1_3/main.c b/dlls/xinput1_3/main.c index 63f125ae528..45ccb5f79db 100644 --- a/dlls/xinput1_3/main.c +++ b/dlls/xinput1_3/main.c @@ -118,7 +118,6 @@ static struct xinput_controller controllers[XUSER_MAX_COUNT] = {{ &controller_critsect_debug[3], -1, 0, 0, 0, 0 }}, }; -static DWORD last_check = 0; static HANDLE stop_event; static HANDLE done_event; @@ -296,12 +295,8 @@ failed: return FALSE; } -static BOOL WINAPI start_update_thread_once( INIT_ONCE *once, void *param, void **context ); - -static void HID_find_gamepads(void) +static void update_controller_list(void) { - static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; - char buffer[sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W) + MAX_PATH * sizeof(WCHAR)]; SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail = (SP_DEVICE_INTERFACE_DETAIL_DATA_W *)buffer; SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}; @@ -314,20 +309,6 @@ static void HID_find_gamepads(void) GUID guid; int i; - InitOnceExecuteOnce(&init_once, start_update_thread_once, NULL, NULL); - - idx = GetTickCount(); - if ((idx - last_check) < 2000) return; - - EnterCriticalSection(&xinput_crit); - - if ((idx - last_check) < 2000) - { - LeaveCriticalSection(&xinput_crit); - return; - } - last_check = idx; - HidD_GetHidGuid(&guid); set = SetupDiGetClassDevsW(&guid, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT); @@ -368,7 +349,6 @@ static void HID_find_gamepads(void) } SetupDiDestroyDeviceInfoList(set); - LeaveCriticalSection(&xinput_crit); } static void controller_destroy(struct xinput_controller *controller) @@ -541,14 +521,18 @@ static void HID_update_state(struct xinput_controller *controller, XINPUT_STATE static DWORD WINAPI hid_update_thread_proc(void *param) { HANDLE events[1]; - DWORD count, ret; + DWORD count, ret = WAIT_TIMEOUT; do { + EnterCriticalSection(&xinput_crit); + if (ret == WAIT_TIMEOUT) update_controller_list(); + count = 0; events[count++] = stop_event; + LeaveCriticalSection(&xinput_crit); } - while ((ret = WaitForMultipleObjectsEx( count, events, FALSE, INFINITE, TRUE )) < count - 1); + while ((ret = WaitForMultipleObjectsEx( count, events, FALSE, 2000, TRUE )) < count - 1 || ret == WAIT_TIMEOUT); if (ret != count - 1) ERR("update thread exited unexpectedly, ret %u\n", ret); SetEvent(done_event); @@ -569,9 +553,20 @@ static BOOL WINAPI start_update_thread_once( INIT_ONCE *once, void *param, void if (!thread) ERR("failed to create update thread, error %u\n", GetLastError()); CloseHandle(thread); + /* do it once now, to resolve delayed imports and populate the initial list */ + EnterCriticalSection(&xinput_crit); + update_controller_list(); + LeaveCriticalSection(&xinput_crit); + return TRUE; } +static void start_update_thread(void) +{ + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + InitOnceExecuteOnce(&init_once, start_update_thread_once, NULL, NULL); +} + static BOOL controller_lock(struct xinput_controller *controller) { if (!controller->device) return FALSE; @@ -617,7 +612,7 @@ void WINAPI DECLSPEC_HOTPATCH XInputEnable(BOOL enable) to the controllers. Setting to true will send the last vibration value (sent to XInputSetState) to the controller and allow messages to be sent */ - HID_find_gamepads(); + start_update_thread(); for (index = 0; index < XUSER_MAX_COUNT; index++) { @@ -634,7 +629,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH XInputSetState(DWORD index, XINPUT_VIBRATION *vib TRACE("(index %u, vibration %p)\n", index, vibration); - HID_find_gamepads(); + start_update_thread(); if (index >= XUSER_MAX_COUNT) return ERROR_BAD_ARGUMENTS; if (!controller_lock(&controllers[index])) return ERROR_DEVICE_NOT_CONNECTED; @@ -652,7 +647,7 @@ static DWORD xinput_get_state(DWORD index, XINPUT_STATE *state) { if (!state) return ERROR_BAD_ARGUMENTS; - HID_find_gamepads(); + start_update_thread(); if (index >= XUSER_MAX_COUNT) return ERROR_BAD_ARGUMENTS; if (!controller_lock(&controllers[index])) return ERROR_DEVICE_NOT_CONNECTED; @@ -908,7 +903,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH XInputGetCapabilities(DWORD index, DWORD flags, X { TRACE("(index %u, flags 0x%x, capabilities %p)\n", index, flags, capabilities); - HID_find_gamepads(); + start_update_thread(); if (index >= XUSER_MAX_COUNT) return ERROR_BAD_ARGUMENTS;

1 0

Zebediah Figura : kernelbase: Do not map HKEY_PERFORMANCE_DATA to \Registry\PerfData.
by Alexandre Julliard Aug. 11, 2021

Aug. 11, 2021

Module: wine Branch: master Commit: a8367f1d53c0f2b9b83cbbc3d207a2aa5ca63f67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8367f1d53c0f2b9b83cbbc3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Aug 11 00:20:06 2021 -0500 kernelbase: Do not map HKEY_PERFORMANCE_DATA to \Registry\PerfData. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 23 +++++++++-------------- dlls/advapi32/tests/security.c | 2 +- dlls/kernelbase/registry.c | 31 +++++++++++++++++++------------ 3 files changed, 29 insertions(+), 27 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 7e1348bf33d..3f3d7a4ac7a 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -3903,26 +3903,21 @@ static void test_performance_keys(void) todo_wine ok(ret == ERROR_INVALID_HANDLE, "got %u\n", ret); ret = RegOpenKeyA(keys[i], "Global", &key); - todo_wine_if (keys[i] == HKEY_PERFORMANCE_DATA) - ok(ret == ERROR_INVALID_HANDLE, "got %u\n", ret); + ok(ret == ERROR_INVALID_HANDLE, "got %u\n", ret); ret = RegOpenKeyExA(keys[i], "Global", 0, KEY_READ, &key); - todo_wine_if (keys[i] == HKEY_PERFORMANCE_DATA) - ok(ret == ERROR_INVALID_HANDLE, "got %u\n", ret); + ok(ret == ERROR_INVALID_HANDLE, "got %u\n", ret); size = 0; ret = RegQueryValueA(keys[i], "Global", NULL, (LONG *)&size); - todo_wine_if (keys[i] == HKEY_PERFORMANCE_DATA) - ok(ret == ERROR_INVALID_HANDLE, "got %u\n", ret); + ok(ret == ERROR_INVALID_HANDLE, "got %u\n", ret); ret = RegSetValueA(keys[i], "Global", REG_SZ, "dummy", 5); - todo_wine_if (keys[i] == HKEY_PERFORMANCE_DATA) - ok(ret == ERROR_INVALID_HANDLE, "got %u\n", ret); + ok(ret == ERROR_INVALID_HANDLE, "got %u\n", ret); ret = RegQueryInfoKeyA(keys[i], NULL, NULL, NULL, &key_count, NULL, NULL, &value_count, NULL, NULL, NULL, NULL); - todo_wine_if (keys[i] != HKEY_PERFORMANCE_DATA) - ok(!ret, "got %u\n", ret); + todo_wine ok(!ret, "got %u\n", ret); todo_wine ok(!key_count, "got %u subkeys\n", key_count); todo_wine ok(value_count == 2, "got %u values\n", value_count); @@ -3941,7 +3936,7 @@ static void test_performance_keys(void) } ret = RegSetValueExA(HKEY_PERFORMANCE_DATA, "Global", 0, REG_SZ, (const BYTE *)"dummy", 5); - todo_wine ok(ret == ERROR_INVALID_HANDLE, "got %u\n", ret); + ok(ret == ERROR_INVALID_HANDLE, "got %u\n", ret); ret = RegSetValueExA(HKEY_PERFORMANCE_TEXT, "Global", 0, REG_SZ, (const BYTE *)"dummy", 5); todo_wine ok(ret == ERROR_BADKEY, "got %u\n", ret); @@ -3952,7 +3947,7 @@ static void test_performance_keys(void) if (pRegSetKeyValueW) { ret = pRegSetKeyValueW(HKEY_PERFORMANCE_DATA, NULL, L"Global", REG_SZ, L"dummy", 10); - todo_wine ok(ret == ERROR_INVALID_HANDLE, "got %u\n", ret); + ok(ret == ERROR_INVALID_HANDLE, "got %u\n", ret); ret = pRegSetKeyValueW(HKEY_PERFORMANCE_TEXT, NULL, L"Global", REG_SZ, L"dummy", 10); todo_wine ok(ret == ERROR_BADKEY, "got %u\n", ret); @@ -3962,7 +3957,7 @@ static void test_performance_keys(void) } ret = RegEnumKeyA(HKEY_PERFORMANCE_DATA, 0, buffer, buffer_size); - todo_wine ok(ret == ERROR_INVALID_HANDLE, "got %u\n", ret); + ok(ret == ERROR_INVALID_HANDLE, "got %u\n", ret); ret = RegEnumKeyA(HKEY_PERFORMANCE_TEXT, 0, buffer, buffer_size); todo_wine ok(ret == ERROR_NO_MORE_ITEMS, "got %u\n", ret); @@ -4101,7 +4096,7 @@ static void test_perflib_key(void) RtlInitUnicodeString(&string, L"\\Registry\\PerfData"); InitializeObjectAttributes(&attr, &string, OBJ_CASE_INSENSITIVE, NULL, NULL); ret = NtOpenKey((HANDLE *)&key, KEY_READ, &attr); - todo_wine ok(ret == STATUS_OBJECT_NAME_NOT_FOUND, "got %#x\n", ret); + ok(ret == STATUS_OBJECT_NAME_NOT_FOUND, "got %#x\n", ret); free(buffer); } diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index d32bf27bd83..c73e28a98e6 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -7948,7 +7948,7 @@ static void test_pseudo_handle_security(void) ret = GetSecurityInfo(keys[i], SE_REGISTRY_KEY, DACL_SECURITY_INFORMATION, NULL, NULL, NULL, NULL, &sd_ptr); if (keys[i] == HKEY_PERFORMANCE_DATA) - todo_wine ok(ret == ERROR_INVALID_HANDLE, "key %p: got error %u\n", keys[i], ret); + ok(ret == ERROR_INVALID_HANDLE, "key %p: got error %u\n", keys[i], ret); else if (keys[i] == HKEY_DYN_DATA) todo_wine ok(ret == ERROR_CALL_NOT_IMPLEMENTED || broken(ret == ERROR_INVALID_HANDLE) /* <7 */, "key %p: got error %u\n", keys[i], ret); diff --git a/dlls/kernelbase/registry.c b/dlls/kernelbase/registry.c index d9d62e81b31..3a551ecbec5 100644 --- a/dlls/kernelbase/registry.c +++ b/dlls/kernelbase/registry.c @@ -56,7 +56,7 @@ static const WCHAR * const root_key_names[] = NULL, /* HKEY_CURRENT_USER is determined dynamically */ L"\\Registry\\Machine", L"\\Registry\\User", - L"\\Registry\\PerfData", + NULL, /* HKEY_PERFORMANCE_DATA is not a real key */ L"\\Registry\\Machine\\System\\CurrentControlSet\\Hardware Profiles\\Current", L"\\Registry\\DynData" }; @@ -330,21 +330,28 @@ static HKEY create_special_root_hkey( HKEY hkey, DWORD access ) /* map the hkey from special root to normal key if necessary */ static inline HKEY get_special_root_hkey( HKEY hkey, REGSAM access ) { - HKEY ret = hkey; + unsigned int index = HandleToUlong(hkey) - HandleToUlong(HKEY_SPECIAL_ROOT_FIRST); + DWORD wow64_flags = access & (KEY_WOW64_32KEY | KEY_WOW64_64KEY); - if ((HandleToUlong(hkey) >= HandleToUlong(HKEY_SPECIAL_ROOT_FIRST)) - && (HandleToUlong(hkey) <= HandleToUlong(HKEY_SPECIAL_ROOT_LAST))) + switch (HandleToUlong(hkey)) { - REGSAM mask = 0; + case (LONG)(LONG_PTR)HKEY_CLASSES_ROOT: + if (wow64_flags) + return create_special_root_hkey( hkey, MAXIMUM_ALLOWED | wow64_flags ); + /* fall through */ - if (HandleToUlong(hkey) == HandleToUlong(HKEY_CLASSES_ROOT)) - mask = KEY_WOW64_32KEY | KEY_WOW64_64KEY; + case (LONG)(LONG_PTR)HKEY_CURRENT_USER: + case (LONG)(LONG_PTR)HKEY_LOCAL_MACHINE: + case (LONG)(LONG_PTR)HKEY_USERS: + case (LONG)(LONG_PTR)HKEY_CURRENT_CONFIG: + case (LONG)(LONG_PTR)HKEY_DYN_DATA: + if (special_root_keys[index]) + return special_root_keys[index]; + return create_special_root_hkey( hkey, MAXIMUM_ALLOWED ); - if ((access & mask) || - !(ret = special_root_keys[HandleToUlong(hkey) - HandleToUlong(HKEY_SPECIAL_ROOT_FIRST)])) - ret = create_special_root_hkey( hkey, MAXIMUM_ALLOWED | (access & mask) ); + default: + return hkey; } - return ret; } @@ -1565,7 +1572,7 @@ LSTATUS WINAPI DECLSPEC_HOTPATCH RegQueryValueExA( HKEY hkey, LPCSTR name, LPDWO hkey, debugstr_a(name), reserved, type, data, count, count ? *count : 0 ); if ((data && !count) || reserved) return ERROR_INVALID_PARAMETER; - if (hkey != HKEY_PERFORMANCE_DATA && !(hkey = get_special_root_hkey( hkey, 0 ))) + if (!(hkey = get_special_root_hkey( hkey, 0 ))) return ERROR_INVALID_HANDLE; if (count) datalen = *count;

1 0

Zebediah Figura : advapi32/tests: Expand tests for performance keys.
by Alexandre Julliard Aug. 11, 2021

Aug. 11, 2021

Module: wine Branch: master Commit: 7817238a8760da5d43968cee02dd36b202d69c69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7817238a8760da5d43968cee… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Aug 11 00:20:05 2021 -0500 advapi32/tests: Expand tests for performance keys. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 517 +++++++++++++++++++++++++++-------------- 1 file changed, 338 insertions(+), 179 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7817238a8760da5d4396…

1 0

Zebediah Figura : vkd3d-shader: Fold constant casts from int to float.
by Alexandre Julliard Aug. 11, 2021

Aug. 11, 2021

Module: vkd3d Branch: master Commit: b956efcaa4b0df349edb1f73d75a89d047ee4640 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b956efcaa4b0df349edb1f7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 9 21:56:15 2021 -0500 vkd3d-shader: Fold constant casts from int to float. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_codegen.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 7e3e4d7..398be34 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -371,6 +371,11 @@ static bool fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, voi switch (arg1->node.data_type->base_type) { + case HLSL_TYPE_INT: + for (i = 0; i < dimx; ++i) + res->value.f[i] = arg1->value.i[i]; + break; + case HLSL_TYPE_UINT: for (i = 0; i < dimx; ++i) res->value.f[i] = arg1->value.u[i];

1 0

Zebediah Figura : vkd3d-shader: Fold negations of constant integers.
by Alexandre Julliard Aug. 11, 2021

Aug. 11, 2021

Module: vkd3d Branch: master Commit: ae3df158d8825274e1054ae5333f2119611b736a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ae3df158d8825274e1054ae… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 9 21:56:16 2021 -0500 vkd3d-shader: Fold negations of constant integers. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_codegen.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 398be34..bef9ea8 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -401,6 +401,11 @@ static bool fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, voi { switch (expr->op) { + case HLSL_IR_UNOP_NEG: + for (i = 0; i < instr->data_type->dimx; ++i) + res->value.u[i] = -arg1->value.u[i]; + break; + case HLSL_IR_BINOP_ADD: for (i = 0; i < instr->data_type->dimx; ++i) res->value.u[i] = arg1->value.u[i] + arg2->value.u[i];

1 0