- Wine-Devel - list.winehq.org

[PATCH vkd3d v2] vkd3d: Implement ID3D12CommandQueue_GetClockCalibration().
by Conor McCarthy Jan. 17, 2022

Jan. 17, 2022

Extends vkd3d_instance_create_info with struct vkd3d_host_time_domain_info to allow host ticks per second to be changed from the default 10000000. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- v2: Do not use a Vk MAX_ENUM value, rearrange a conditional to avoid indentation, use a loop to select host time domain, and introduce an optional instance parameter for host ticks per second. --- include/vkd3d.h | 12 +++++++ libs/vkd3d/command.c | 59 +++++++++++++++++++++++++++++-- libs/vkd3d/device.c | 71 ++++++++++++++++++++++++++++++++++++++ libs/vkd3d/vkd3d_private.h | 4 +++ libs/vkd3d/vulkan_procs.h | 6 ++++ tests/d3d12.c | 4 --- 6 files changed, 150 insertions(+), 6 deletions(-) diff --git a/include/vkd3d.h b/include/vkd3d.h index 61ccf6c3..a2c70116 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -48,6 +48,9 @@ enum vkd3d_structure_type VKD3D_STRUCTURE_TYPE_OPTIONAL_DEVICE_EXTENSIONS_INFO, VKD3D_STRUCTURE_TYPE_APPLICATION_INFO, + /* 1.3 */ + VKD3D_STRUCTURE_TYPE_HOST_TIME_DOMAIN_INFO, + VKD3D_FORCE_32_BIT_ENUM(VKD3D_STRUCTURE_TYPE), }; @@ -109,6 +112,15 @@ struct vkd3d_application_info enum vkd3d_api_version api_version; }; +/* Extends vkd3d_instance_create_info. Available since 1.3. */ +struct vkd3d_host_time_domain_info +{ + enum vkd3d_structure_type type; + const void *next; + + uint64_t ticks_per_second; +}; + struct vkd3d_device_create_info { enum vkd3d_structure_type type; diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 3e252aee..353a61cd 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -6238,13 +6238,68 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_GetTimestampFrequency(ID3D1 return S_OK; } +#define NANOSECONDS_IN_A_SECOND 1000000000 + static HRESULT STDMETHODCALLTYPE d3d12_command_queue_GetClockCalibration(ID3D12CommandQueue *iface, UINT64 *gpu_timestamp, UINT64 *cpu_timestamp) { - FIXME("iface %p, gpu_timestamp %p, cpu_timestamp %p stub!\n", + struct d3d12_command_queue *command_queue = impl_from_ID3D12CommandQueue(iface); + struct d3d12_device *device = command_queue->device; + const struct vkd3d_vk_device_procs *vk_procs; + VkCalibratedTimestampInfoEXT infos[2]; + uint64_t timestamps[2]; + uint64_t deviations[2]; + VkResult vr; + + TRACE("iface %p, gpu_timestamp %p, cpu_timestamp %p.\n", iface, gpu_timestamp, cpu_timestamp); - return E_NOTIMPL; + if (!command_queue->vkd3d_queue->timestamp_bits) + { + WARN("Timestamp queries not supported.\n"); + return E_FAIL; + } + + if (!gpu_timestamp || !cpu_timestamp) + return E_INVALIDARG; + + if (!device->vk_info.EXT_calibrated_timestamps || device->vk_host_time_domain == -1) + { + WARN(!device->vk_info.EXT_calibrated_timestamps + ? "VK_EXT_calibrated_timestamps was not found. Setting timestamps to zero.\n" + : "Device and/or host time domain is not available. Setting timestamps to zero.\n"); + *gpu_timestamp = 0; + *cpu_timestamp = 0; + return S_OK; + } + + vk_procs = &device->vk_procs; + + infos[0].sType = VK_STRUCTURE_TYPE_CALIBRATED_TIMESTAMP_INFO_EXT; + infos[0].pNext = NULL; + infos[0].timeDomain = VK_TIME_DOMAIN_DEVICE_EXT; + infos[1].sType = VK_STRUCTURE_TYPE_CALIBRATED_TIMESTAMP_INFO_EXT; + infos[1].pNext = NULL; + infos[1].timeDomain = device->vk_host_time_domain; + + if ((vr = VK_CALL(vkGetCalibratedTimestampsEXT(command_queue->device->vk_device, + ARRAY_SIZE(infos), infos, timestamps, deviations))) < 0) + { + WARN("Failed to get calibrated timestamps, vr %d.\n", vr); + return E_FAIL; + } + + if (infos[1].timeDomain == VK_TIME_DOMAIN_CLOCK_MONOTONIC_RAW_EXT + || infos[1].timeDomain == VK_TIME_DOMAIN_CLOCK_MONOTONIC_EXT) + { + /* Convert monotonic clock to match Wine's RtlQueryPerformanceFrequency(). */ + timestamps[1] /= NANOSECONDS_IN_A_SECOND / device->vkd3d_instance->host_ticks_per_second; + } + + *gpu_timestamp = timestamps[0]; + *cpu_timestamp = timestamps[1]; + + return S_OK; } static D3D12_COMMAND_QUEUE_DESC * STDMETHODCALLTYPE d3d12_command_queue_GetDesc(ID3D12CommandQueue *iface, diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 661ca1d9..4af26074 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -130,6 +130,7 @@ static const struct vkd3d_optional_extension_info optional_device_extensions[] = VK_EXTENSION(KHR_PUSH_DESCRIPTOR, KHR_push_descriptor), VK_EXTENSION(KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE, KHR_sampler_mirror_clamp_to_edge), /* EXT extensions */ + VK_EXTENSION(EXT_CALIBRATED_TIMESTAMPS, EXT_calibrated_timestamps), VK_EXTENSION(EXT_CONDITIONAL_RENDERING, EXT_conditional_rendering), VK_EXTENSION(EXT_DEBUG_MARKER, EXT_debug_marker), VK_EXTENSION(EXT_DEPTH_CLIP_ENABLE, EXT_depth_clip_enable), @@ -447,12 +448,16 @@ static uint64_t vkd3d_init_config_flags(void) return config_flags; } +/* TICKSPERSEC from Wine */ +#define VKD3D_DEFAULT_HOST_TICKS_PER_SECOND 10000000 + static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, const struct vkd3d_instance_create_info *create_info) { const struct vkd3d_vk_global_procs *vk_global_procs = &instance->vk_global_procs; const struct vkd3d_optional_instance_extensions_info *optional_extensions; const struct vkd3d_application_info *vkd3d_application_info; + const struct vkd3d_host_time_domain_info *time_domain_info; bool *user_extension_supported = NULL; VkApplicationInfo application_info; VkInstanceCreateInfo instance_info; @@ -578,6 +583,11 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, return hr; } + if ((time_domain_info = vkd3d_find_struct(create_info->next, HOST_TIME_DOMAIN_INFO))) + instance->host_ticks_per_second = time_domain_info->ticks_per_second; + else + instance->host_ticks_per_second = VKD3D_DEFAULT_HOST_TICKS_PER_SECOND; + instance->vk_instance = vk_instance; TRACE("Created Vulkan instance %p.\n", vk_instance); @@ -2349,6 +2359,66 @@ static void vkd3d_gpu_descriptor_allocator_cleanup(struct vkd3d_gpu_descriptor_a pthread_mutex_destroy(&allocator->mutex); } +static bool have_vk_time_domain(VkTimeDomainEXT *domains, unsigned int count, VkTimeDomainEXT domain) +{ + unsigned int i; + + for (i = 0; i < count; ++i) + if (domains[i] == domain) + return true; + + return false; +} + +static void vkd3d_time_domains_init(struct d3d12_device *device) +{ + static const VkTimeDomainEXT host_time_domains[] = + { + /* In order of preference */ + VK_TIME_DOMAIN_CLOCK_MONOTONIC_RAW_EXT, + VK_TIME_DOMAIN_CLOCK_MONOTONIC_EXT, + VK_TIME_DOMAIN_QUERY_PERFORMANCE_COUNTER_EXT, + + }; + const struct vkd3d_vk_instance_procs *vk_procs = &device->vkd3d_instance->vk_procs; + VkTimeDomainEXT domains[8]; + unsigned int i; + uint32_t count; + VkResult vr; + + device->vk_host_time_domain = -1; + + if (!device->vk_info.EXT_calibrated_timestamps) + return; + + count = ARRAY_SIZE(domains); + if ((vr = VK_CALL(vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(device->vk_physical_device, + &count, domains))) != VK_SUCCESS && vr != VK_INCOMPLETE) + { + WARN("Failed to get calibrated time domains, vr %d.\n", vr); + return; + } + + if (vr == VK_INCOMPLETE) + FIXME("Calibrated time domain list is incomplete.\n"); + + if (!have_vk_time_domain(domains, count, VK_TIME_DOMAIN_DEVICE_EXT)) + { + WARN("Device time domain not found. Calibrated timestamps will not be available.\n"); + return; + } + + for (i = 0; i < ARRAY_SIZE(host_time_domains); ++i) + { + if (!have_vk_time_domain(domains, count, host_time_domains[i])) + continue; + device->vk_host_time_domain = host_time_domains[i]; + break; + } + if (device->vk_host_time_domain == -1) + WARN("Found no acceptable host time domain. Calibrated timestamps will not be available.\n"); +} + /* ID3D12Device */ static inline struct d3d12_device *impl_from_ID3D12Device(ID3D12Device *iface) { @@ -3910,6 +3980,7 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, vkd3d_render_pass_cache_init(&device->render_pass_cache); vkd3d_gpu_descriptor_allocator_init(&device->gpu_descriptor_allocator); vkd3d_gpu_va_allocator_init(&device->gpu_va_allocator); + vkd3d_time_domains_init(device); for (i = 0; i < ARRAY_SIZE(device->desc_mutex); ++i) pthread_mutex_init(&device->desc_mutex[i], NULL); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 047f4a29..3f5ea21c 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -108,6 +108,7 @@ struct vkd3d_vulkan_info bool KHR_push_descriptor; bool KHR_sampler_mirror_clamp_to_edge; /* EXT device extensions */ + bool EXT_calibrated_timestamps; bool EXT_conditional_rendering; bool EXT_debug_marker; bool EXT_depth_clip_enable; @@ -159,6 +160,8 @@ struct vkd3d_instance VkDebugReportCallbackEXT vk_debug_callback; + uint64_t host_ticks_per_second; + LONG refcount; }; @@ -1195,6 +1198,7 @@ struct d3d12_device struct vkd3d_queue *copy_queue; uint32_t queue_family_indices[VKD3D_MAX_QUEUE_FAMILY_COUNT]; unsigned int queue_family_count; + VkTimeDomainEXT vk_host_time_domain; struct vkd3d_instance *vkd3d_instance; diff --git a/libs/vkd3d/vulkan_procs.h b/libs/vkd3d/vulkan_procs.h index ec29eb45..60556735 100644 --- a/libs/vkd3d/vulkan_procs.h +++ b/libs/vkd3d/vulkan_procs.h @@ -55,6 +55,9 @@ VK_INSTANCE_EXT_PFN(vkGetPhysicalDeviceProperties2KHR) VK_INSTANCE_EXT_PFN(vkCreateDebugReportCallbackEXT) VK_INSTANCE_EXT_PFN(vkDestroyDebugReportCallbackEXT) +/* VK_EXT_calibrated_timestamps */ +VK_INSTANCE_EXT_PFN(vkGetPhysicalDeviceCalibrateableTimeDomainsEXT) + /* Device functions (obtained by vkGetDeviceProcAddr). */ VK_DEVICE_PFN(vkDestroyDevice) /* Load vkDestroyDevice() first. */ VK_DEVICE_PFN(vkAllocateCommandBuffers) @@ -192,6 +195,9 @@ VK_DEVICE_EXT_PFN(vkGetDescriptorSetLayoutSupportKHR) /* VK_KHR_push_descriptor */ VK_DEVICE_EXT_PFN(vkCmdPushDescriptorSetKHR) +/* VK_EXT_calibrated_timestamps */ +VK_DEVICE_EXT_PFN(vkGetCalibratedTimestampsEXT) + /* VK_EXT_conditional_rendering */ VK_DEVICE_EXT_PFN(vkCmdBeginConditionalRenderingEXT) VK_DEVICE_EXT_PFN(vkCmdEndConditionalRenderingEXT) diff --git a/tests/d3d12.c b/tests/d3d12.c index 9d4fb7d4..a4488017 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -36023,19 +36023,15 @@ static void test_clock_calibration(void) return; hr = ID3D12CommandQueue_GetClockCalibration(context.queue, &gpu_times[0], &cpu_times[0]); - todo ok(hr == S_OK, "Failed to retrieve calibrated timestamps, hr %#x.\n", hr); vkd3d_sleep(100); hr = ID3D12CommandQueue_GetClockCalibration(context.queue, &gpu_times[1], &cpu_times[1]); - todo ok(hr == S_OK, "Failed to retrieve calibrated timestamps, hr %#x.\n", hr); - todo ok(gpu_times[1] > gpu_times[0], "Inconsistent GPU timestamps %"PRIu64" and %"PRIu64".\n", gpu_times[0], gpu_times[1]); - todo ok(cpu_times[1] > cpu_times[0], "Inconsistent CPU timestamps %"PRIu64" and %"PRIu64".\n", cpu_times[0], cpu_times[1]); -- 2.34.1

2 2

[PATCH] dxgi: Allow sampling of Vulkan swapchain images for D3D12.
by Conor McCarthy Jan. 17, 2022

Jan. 17, 2022

Psychonauts 2 creates an SRV on a swapchain image and lack of VK_IMAGE_USAGE_SAMPLED_BIT results in failure to create a Vulkan descriptor. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 8d5f2f537..015a32498 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1303,7 +1303,8 @@ static HRESULT d3d12_swapchain_create_user_buffers(struct d3d12_swapchain *swapc image_info.tiling = VK_IMAGE_TILING_OPTIMAL; image_info.usage = VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT - | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; + | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT + | VK_IMAGE_USAGE_SAMPLED_BIT; image_info.sharingMode = VK_SHARING_MODE_EXCLUSIVE; image_info.queueFamilyIndexCount = 0; image_info.pQueueFamilyIndices = NULL; @@ -1792,8 +1793,11 @@ static HRESULT d3d12_swapchain_create_vulkan_swapchain(struct d3d12_swapchain *s usage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; usage |= surface_caps.supportedUsageFlags & VK_IMAGE_USAGE_TRANSFER_SRC_BIT; usage |= surface_caps.supportedUsageFlags & VK_IMAGE_USAGE_TRANSFER_DST_BIT; + usage |= surface_caps.supportedUsageFlags & VK_IMAGE_USAGE_SAMPLED_BIT; if (!(usage & VK_IMAGE_USAGE_TRANSFER_SRC_BIT) || !(usage & VK_IMAGE_USAGE_TRANSFER_DST_BIT)) WARN("Transfer not supported for swapchain images.\n"); + if (!(usage & VK_IMAGE_USAGE_SAMPLED_BIT)) + WARN("Sampling not supported for swapchain images.\n"); vk_swapchain_desc.sType = VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR; vk_swapchain_desc.pNext = NULL; -- 2.34.1

3 2

[PATCH v2] msi: Don't call RegCloseKey with uninitialized value.
by Hans Leidekker Jan. 17, 2022

Jan. 17, 2022

From: Eric Pouech <eric.pouech(a)gmail.com> v2: Initialize variable when declared. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/action.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 9a47c2b068b..8ee9420af55 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -6973,7 +6973,7 @@ static UINT ITERATE_RemoveEnvironmentString( MSIRECORD *rec, LPVOID param ) LPCWSTR name, value, component; WCHAR *p, *q, *deformatted = NULL, *new_value = NULL; DWORD flags, type, size, len, len_value = 0, len_new_value; - HKEY env; + HKEY env = NULL; MSICOMPONENT *comp; MSIRECORD *uirow; int action = 0; -- 2.30.2

1 0

[PATCH 1/4] ddraw/tests: Drop ddraw1 test workarounds for Windows <= 2000
by Alex Henrie Jan. 17, 2022

Jan. 17, 2022

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ddraw/tests/ddraw1.c | 40 ++++++--------------------------------- 1 file changed, 6 insertions(+), 34 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index efbecf04c2d..9d3bd542b70 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -941,15 +941,6 @@ static void test_coop_level_create_device_window(void) device_window = FindWindowA("DirectDrawDeviceWnd", "DirectDrawDeviceWnd"); ok(!device_window, "Unexpected device window found.\n"); - /* Windows versions before 98 / NT5 don't support DDSCL_CREATEDEVICEWINDOW. */ - if (broken(hr == DDERR_INVALIDPARAMS)) - { - win_skip("DDSCL_CREATEDEVICEWINDOW not supported, skipping test.\n"); - IDirectDraw_Release(ddraw); - DestroyWindow(focus_window); - return; - } - hr = IDirectDraw_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); device_window = FindWindowA("DirectDrawDeviceWnd", "DirectDrawDeviceWnd"); @@ -1179,7 +1170,7 @@ static void test_clipper_blt(void) } hr = IDirectDrawSurface_BltFast(dst_surface, 0, 0, src_surface, NULL, DDBLTFAST_WAIT); - ok(hr == DDERR_BLTFASTCANTCLIP || broken(hr == E_NOTIMPL /* NT4 */), "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_BLTFASTCANTCLIP, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawClipper_SetHWnd(clipper, 0, window); ok(SUCCEEDED(hr), "Failed to set clipper window, hr %#x.\n", hr); @@ -3152,13 +3143,6 @@ static void test_coop_level_mode_set(void) hr = IDirectDrawSurface_Restore(primary); ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); hr = set_display_mode(ddraw, param.ddraw_width, param.ddraw_height); - if (hr == DDERR_NOEXCLUSIVEMODE /* NT4 testbot */) - { - win_skip("Broken SetDisplayMode(), skipping remaining tests.\n"); - IDirectDrawSurface_Release(primary); - IDirectDraw_Release(ddraw); - goto done; - } ok(SUCCEEDED(hr), "Failed to set display mode, hr %#x.\n", hr); hr = IDirectDrawSurface_Restore(primary); ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); @@ -3538,7 +3522,6 @@ static void test_coop_level_mode_set(void) ref = IDirectDraw_Release(ddraw); ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); -done: expect_messages = NULL; DestroyWindow(window); UnregisterClassA("ddraw_test_wndproc_wc", GetModuleHandleA(NULL)); @@ -3580,13 +3563,6 @@ static void test_coop_level_mode_set_multi(void) /* With just a single ddraw object, the display mode is restored on * release. */ hr = set_display_mode(ddraw1, 800, 600); - if (hr == DDERR_NOEXCLUSIVEMODE /* NT4 testbot */) - { - win_skip("Broken SetDisplayMode(), skipping test.\n"); - IDirectDraw_Release(ddraw1); - DestroyWindow(window); - return; - } ok(SUCCEEDED(hr), "Failed to set display mode, hr %#x.\n", hr); w = GetSystemMetrics(SM_CXSCREEN); ok(w == 800, "Got unexpected screen width %u.\n", w); @@ -3991,13 +3967,10 @@ static void test_initialize(void) IDirectDraw_Release(ddraw); CoUninitialize(); - if (0) /* This crashes on the W2KPROSP4 testbot. */ - { - CoInitialize(NULL); - hr = CoCreateInstance(&CLSID_DirectDraw, NULL, CLSCTX_INPROC_SERVER, &IID_IDirect3D, (void **)&d3d); - ok(hr == E_NOINTERFACE, "CoCreateInstance returned hr %#x, expected E_NOINTERFACE.\n", hr); - CoUninitialize(); - } + CoInitialize(NULL); + hr = CoCreateInstance(&CLSID_DirectDraw, NULL, CLSCTX_INPROC_SERVER, &IID_IDirect3D, (void **)&d3d); + todo_wine ok(hr == E_NOINTERFACE, "CoCreateInstance returned hr %#x, expected E_NOINTERFACE.\n", hr); + CoUninitialize(); } static void test_coop_level_surf_create(void) @@ -7691,8 +7664,7 @@ static void test_palette_alpha(void) UINT retval; hr = IDirectDrawSurface_GetDC(surface, &dc); - ok(SUCCEEDED(hr) || broken(hr == DDERR_CANTCREATEDC) /* Win2k testbot */, - "Failed to get DC, hr %#x, %s surface.\n", hr, test_data[i].name); + ok(SUCCEEDED(hr), "Failed to get DC, hr %#x, %s surface.\n", hr, test_data[i].name); if (SUCCEEDED(hr)) { retval = GetDIBColorTable(dc, 1, 1, &rgbquad); -- 2.34.1

2 6

[PATCH vkd3d 1/2] vkd3d/tests: Enable on vkd3d the tests for ID3D12CommandQueue::Wait().
by Conor McCarthy Jan. 17, 2022

Jan. 17, 2022

The Wait() implementation was added some time ago and these tests succeed. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- tests/d3d12.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 3b0c4242..c1956fa3 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -33268,12 +33268,6 @@ static void test_queue_wait(void) check_readback_data_uint(&rb, NULL, 0xff00ff00, 0); release_resource_readback(&rb); - if (!vkd3d_test_platform_is_windows()) - { - skip("Wait() is not implemented yet.\n"); /* FIXME */ - goto skip_tests; - } - /* Wait() before CPU signal */ update_buffer_data(cb, 0, sizeof(blue), &blue); queue_wait(queue, fence, 2); @@ -33349,7 +33343,6 @@ static void test_queue_wait(void) check_readback_data_uint(&rb, NULL, 0xff00ff00, 0); release_resource_readback(&rb); -skip_tests: /* Signal() and Wait() in the same command queue */ update_buffer_data(cb, 0, sizeof(blue), &blue); queue_signal(queue, fence, 7); -- 2.34.1

5 5

[PATCH] programs/msi: don't call RegCloseKey with uninitialized value
by Eric Pouech Jan. 17, 2022

Jan. 17, 2022

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/msi/action.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 9a47c2b068b..22f56a0c63f 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -7012,6 +7012,7 @@ static UINT ITERATE_RemoveEnvironmentString( MSIRECORD *rec, LPVOID param ) if (!deformatted) { res = ERROR_OUTOFMEMORY; + env = NULL; goto done; }

1 0

[PATCH 1/2] include/winternl.h: fix prototype definition
by Eric Pouech Jan. 15, 2022

Jan. 15, 2022

https://docs.microsoft.com/en-us/windows-hardware/drivers/ddi/ntifs/nf-ntif… funnily enough, implementation is correct Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- include/winternl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/winternl.h b/include/winternl.h index 0e23fdd97bf..3c075497070 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4374,7 +4374,7 @@ NTSYSAPI NTSTATUS WINAPI RtlLookupAtomInAtomTable(RTL_ATOM_TABLE,const WCHAR*,R NTSYSAPI NTSTATUS WINAPI RtlMakeSelfRelativeSD(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,LPDWORD); NTSYSAPI void WINAPI RtlMapGenericMask(PACCESS_MASK,const GENERIC_MAPPING*); NTSYSAPI NTSTATUS WINAPI RtlMultiByteToUnicodeN(LPWSTR,DWORD,LPDWORD,LPCSTR,DWORD); -NTSYSAPI NTSTATUS WINAPI RtlMultiByteToUnicodeSize(DWORD*,LPCSTR,UINT); +NTSYSAPI NTSTATUS WINAPI RtlMultiByteToUnicodeSize(DWORD*,LPCSTR,ULONG); NTSYSAPI NTSTATUS WINAPI RtlNewSecurityObject(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR*,BOOLEAN,HANDLE,PGENERIC_MAPPING); NTSYSAPI PRTL_USER_PROCESS_PARAMETERS WINAPI RtlNormalizeProcessParams(RTL_USER_PROCESS_PARAMETERS*); NTSYSAPI NTSTATUS WINAPI RtlNormalizeString(ULONG,const WCHAR*,INT,WCHAR*,INT*);

2 2

[PATCH] advapi32: Fix some spec file entries (try 3)
by André Zwing Jan. 15, 2022

Jan. 15, 2022

(including make_specfiles changes now) Signed-off-by: André Zwing <nerv(a)dawncrow.de> --- dlls/advapi32/advapi32.spec | 22 +++++++++---------- .../api-ms-win-core-registry-l2-1-0.spec | 8 +++---- .../api-ms-win-core-registry-l2-2-0.spec | 8 +++---- .../api-ms-win-downlevel-advapi32-l2-1-0.spec | 2 +- .../api-ms-win-security-lsalookup-l2-1-0.spec | 4 ++-- .../api-ms-win-security-lsalookup-l2-1-1.spec | 4 ++-- .../api-ms-win-security-sddl-l1-1-0.spec | 2 +- .../api-ms-win-service-winsvc-l1-1-0.spec | 2 +- .../api-ms-win-service-winsvc-l1-2-0.spec | 2 +- 9 files changed, 27 insertions(+), 27 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 0391643aa6a..cefc8dc2899 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -91,7 +91,7 @@ # @ stub CancelOverlappedAccess @ stdcall -import ChangeServiceConfig2A(long long ptr) @ stdcall -import ChangeServiceConfig2W(long long ptr) -@ stdcall -import ChangeServiceConfigA(long long long long wstr str ptr str str str str) +@ stdcall -import ChangeServiceConfigA(long long long long str str ptr str str str str) @ stdcall -import ChangeServiceConfigW(long long long long wstr wstr ptr wstr wstr wstr wstr) # @ stub CheckForHiberboot @ stdcall -import CheckTokenMembership(long ptr ptr) @@ -129,8 +129,8 @@ # @ stub ConvertStringSDToSDRootDomainW @ stdcall ConvertStringSecurityDescriptorToSecurityDescriptorA(str long ptr ptr) @ stdcall -import ConvertStringSecurityDescriptorToSecurityDescriptorW(wstr long ptr ptr) -@ stdcall ConvertStringSidToSidA(ptr ptr) -@ stdcall -import ConvertStringSidToSidW(ptr ptr) +@ stdcall ConvertStringSidToSidA(str ptr) +@ stdcall -import ConvertStringSidToSidW(wstr ptr) @ stdcall -import ConvertToAutoInheritPrivateObjectSecurity(ptr ptr ptr ptr long ptr) @ stdcall -import CopySid(long ptr ptr) # @ stub CreateCodeAuthzLevel @@ -429,16 +429,16 @@ @ stdcall LogonUserW(wstr wstr wstr long long ptr) @ stdcall LookupAccountNameA(str str ptr ptr ptr ptr ptr) @ stdcall LookupAccountNameW(wstr wstr ptr ptr ptr ptr ptr) -@ stdcall LookupAccountSidA(ptr ptr ptr ptr ptr ptr ptr) +@ stdcall LookupAccountSidA(str ptr ptr ptr ptr ptr ptr) @ stdcall LookupAccountSidLocalA(ptr ptr ptr ptr ptr ptr) @ stdcall LookupAccountSidLocalW(ptr ptr ptr ptr ptr ptr) -@ stdcall LookupAccountSidW(ptr ptr ptr ptr ptr ptr ptr) +@ stdcall LookupAccountSidW(wstr ptr ptr ptr ptr ptr ptr) @ stdcall LookupPrivilegeDisplayNameA(str str str ptr ptr) @ stdcall LookupPrivilegeDisplayNameW(wstr wstr wstr ptr ptr) @ stdcall LookupPrivilegeNameA(str ptr ptr ptr) @ stdcall LookupPrivilegeNameW(wstr ptr ptr ptr) -@ stdcall LookupPrivilegeValueA(ptr ptr ptr) -@ stdcall LookupPrivilegeValueW(ptr ptr ptr) +@ stdcall LookupPrivilegeValueA(str str ptr) +@ stdcall LookupPrivilegeValueW(wstr wstr ptr) @ stdcall LookupSecurityDescriptorPartsA(ptr ptr ptr ptr ptr ptr ptr) @ stdcall LookupSecurityDescriptorPartsW(ptr ptr ptr ptr ptr ptr ptr) @ stdcall LsaAddAccountRights(ptr ptr ptr long) @@ -681,17 +681,17 @@ @ stdcall RegReplaceKeyW(long wstr wstr wstr) @ stdcall -import RegRestoreKeyA(long str long) @ stdcall -import RegRestoreKeyW(long wstr long) -@ stdcall RegSaveKeyA(long ptr ptr) +@ stdcall RegSaveKeyA(long str ptr) @ stdcall -import RegSaveKeyExA(long str ptr long) @ stdcall -import RegSaveKeyExW(long wstr ptr long) -@ stdcall RegSaveKeyW(long ptr ptr) +@ stdcall RegSaveKeyW(long wstr ptr) @ stdcall -import RegSetKeySecurity(long long ptr) @ stdcall -import RegSetKeyValueA(long str str long ptr long) @ stdcall -import RegSetKeyValueW(long wstr wstr long ptr long) -@ stdcall RegSetValueA(long str long ptr long) +@ stdcall RegSetValueA(long str long str long) @ stdcall -import RegSetValueExA(long str long long ptr long) @ stdcall -import RegSetValueExW(long wstr long long ptr long) -@ stdcall RegSetValueW(long wstr long ptr long) +@ stdcall RegSetValueW(long wstr long wstr long) @ stdcall -import RegUnLoadKeyA(long str) @ stdcall -import RegUnLoadKeyW(long wstr) @ stdcall RegisterEventSourceA(str str) diff --git a/dlls/api-ms-win-core-registry-l2-1-0/api-ms-win-core-registry-l2-1-0.spec b/dlls/api-ms-win-core-registry-l2-1-0/api-ms-win-core-registry-l2-1-0.spec index 6d63dd997ff..17cd6e79311 100644 --- a/dlls/api-ms-win-core-registry-l2-1-0/api-ms-win-core-registry-l2-1-0.spec +++ b/dlls/api-ms-win-core-registry-l2-1-0/api-ms-win-core-registry-l2-1-0.spec @@ -25,9 +25,9 @@ @ stdcall RegQueryValueW(long wstr ptr ptr) advapi32.RegQueryValueW @ stdcall RegReplaceKeyA(long str str str) advapi32.RegReplaceKeyA @ stdcall RegReplaceKeyW(long wstr wstr wstr) advapi32.RegReplaceKeyW -@ stdcall RegSaveKeyA(long ptr ptr) advapi32.RegSaveKeyA -@ stdcall RegSaveKeyW(long ptr ptr) advapi32.RegSaveKeyW +@ stdcall RegSaveKeyA(long str ptr) advapi32.RegSaveKeyA +@ stdcall RegSaveKeyW(long wstr ptr) advapi32.RegSaveKeyW @ stdcall RegSetKeyValueA(long str str long ptr long) advapi32.RegSetKeyValueA @ stdcall RegSetKeyValueW(long wstr wstr long ptr long) advapi32.RegSetKeyValueW -@ stdcall RegSetValueA(long str long ptr long) advapi32.RegSetValueA -@ stdcall RegSetValueW(long wstr long ptr long) advapi32.RegSetValueW +@ stdcall RegSetValueA(long str long str long) advapi32.RegSetValueA +@ stdcall RegSetValueW(long wstr long wstr long) advapi32.RegSetValueW diff --git a/dlls/api-ms-win-core-registry-l2-2-0/api-ms-win-core-registry-l2-2-0.spec b/dlls/api-ms-win-core-registry-l2-2-0/api-ms-win-core-registry-l2-2-0.spec index 6d9ae1f4048..7710da384c5 100644 --- a/dlls/api-ms-win-core-registry-l2-2-0/api-ms-win-core-registry-l2-2-0.spec +++ b/dlls/api-ms-win-core-registry-l2-2-0/api-ms-win-core-registry-l2-2-0.spec @@ -23,7 +23,7 @@ @ stdcall RegQueryValueW(long wstr ptr ptr) advapi32.RegQueryValueW @ stdcall RegReplaceKeyA(long str str str) advapi32.RegReplaceKeyA @ stdcall RegReplaceKeyW(long wstr wstr wstr) advapi32.RegReplaceKeyW -@ stdcall RegSaveKeyA(long ptr ptr) advapi32.RegSaveKeyA -@ stdcall RegSaveKeyW(long ptr ptr) advapi32.RegSaveKeyW -@ stdcall RegSetValueA(long str long ptr long) advapi32.RegSetValueA -@ stdcall RegSetValueW(long wstr long ptr long) advapi32.RegSetValueW +@ stdcall RegSaveKeyA(long str ptr) advapi32.RegSaveKeyA +@ stdcall RegSaveKeyW(long wstr ptr) advapi32.RegSaveKeyW +@ stdcall RegSetValueA(long str long str long) advapi32.RegSetValueA +@ stdcall RegSetValueW(long wstr long wstr long) advapi32.RegSetValueW diff --git a/dlls/api-ms-win-downlevel-advapi32-l2-1-0/api-ms-win-downlevel-advapi32-l2-1-0.spec b/dlls/api-ms-win-downlevel-advapi32-l2-1-0/api-ms-win-downlevel-advapi32-l2-1-0.spec index 96e1a042eed..b0dabec0f34 100644 --- a/dlls/api-ms-win-downlevel-advapi32-l2-1-0/api-ms-win-downlevel-advapi32-l2-1-0.spec +++ b/dlls/api-ms-win-downlevel-advapi32-l2-1-0/api-ms-win-downlevel-advapi32-l2-1-0.spec @@ -1,7 +1,7 @@ @ stdcall CloseServiceHandle(long) advapi32.CloseServiceHandle @ stdcall ConvertSidToStringSidW(ptr ptr) advapi32.ConvertSidToStringSidW @ stdcall ConvertStringSecurityDescriptorToSecurityDescriptorW(wstr long ptr ptr) advapi32.ConvertStringSecurityDescriptorToSecurityDescriptorW -@ stdcall ConvertStringSidToSidW(ptr ptr) advapi32.ConvertStringSidToSidW +@ stdcall ConvertStringSidToSidW(wstr ptr) advapi32.ConvertStringSidToSidW @ stdcall CredDeleteW(wstr long long) advapi32.CredDeleteW @ stdcall CredEnumerateW(wstr long ptr ptr) advapi32.CredEnumerateW @ stdcall CredFree(ptr) advapi32.CredFree diff --git a/dlls/api-ms-win-security-lsalookup-l2-1-0/api-ms-win-security-lsalookup-l2-1-0.spec b/dlls/api-ms-win-security-lsalookup-l2-1-0/api-ms-win-security-lsalookup-l2-1-0.spec index 25b293939df..c1c3cd8e2aa 100644 --- a/dlls/api-ms-win-security-lsalookup-l2-1-0/api-ms-win-security-lsalookup-l2-1-0.spec +++ b/dlls/api-ms-win-security-lsalookup-l2-1-0/api-ms-win-security-lsalookup-l2-1-0.spec @@ -1,6 +1,6 @@ @ stdcall LookupAccountNameW(wstr wstr ptr ptr ptr ptr ptr) advapi32.LookupAccountNameW -@ stdcall LookupAccountSidW(ptr ptr ptr ptr ptr ptr ptr) advapi32.LookupAccountSidW +@ stdcall LookupAccountSidW(wstr ptr ptr ptr ptr ptr ptr) advapi32.LookupAccountSidW @ stdcall LookupPrivilegeDisplayNameW(wstr wstr wstr ptr ptr) advapi32.LookupPrivilegeDisplayNameW @ stdcall LookupPrivilegeNameW(wstr ptr ptr ptr) advapi32.LookupPrivilegeNameW -@ stdcall LookupPrivilegeValueW(ptr ptr ptr) advapi32.LookupPrivilegeValueW +@ stdcall LookupPrivilegeValueW(wstr wstr ptr) advapi32.LookupPrivilegeValueW @ stdcall LsaEnumerateTrustedDomains(ptr ptr ptr long ptr) advapi32.LsaEnumerateTrustedDomains diff --git a/dlls/api-ms-win-security-lsalookup-l2-1-1/api-ms-win-security-lsalookup-l2-1-1.spec b/dlls/api-ms-win-security-lsalookup-l2-1-1/api-ms-win-security-lsalookup-l2-1-1.spec index 1a0ed04ace4..c06b1435333 100644 --- a/dlls/api-ms-win-security-lsalookup-l2-1-1/api-ms-win-security-lsalookup-l2-1-1.spec +++ b/dlls/api-ms-win-security-lsalookup-l2-1-1/api-ms-win-security-lsalookup-l2-1-1.spec @@ -1,7 +1,7 @@ @ stdcall LookupAccountNameW(wstr wstr ptr ptr ptr ptr ptr) advapi32.LookupAccountNameW -@ stdcall LookupAccountSidW(ptr ptr ptr ptr ptr ptr ptr) advapi32.LookupAccountSidW +@ stdcall LookupAccountSidW(wstr ptr ptr ptr ptr ptr ptr) advapi32.LookupAccountSidW @ stdcall LookupPrivilegeDisplayNameW(wstr wstr wstr ptr ptr) advapi32.LookupPrivilegeDisplayNameW @ stdcall LookupPrivilegeNameW(wstr ptr ptr ptr) advapi32.LookupPrivilegeNameW -@ stdcall LookupPrivilegeValueW(ptr ptr ptr) advapi32.LookupPrivilegeValueW +@ stdcall LookupPrivilegeValueW(wstr wstr ptr) advapi32.LookupPrivilegeValueW @ stdcall LsaEnumerateTrustedDomains(ptr ptr ptr long ptr) advapi32.LsaEnumerateTrustedDomains @ stub LsaManageSidNameMapping diff --git a/dlls/api-ms-win-security-sddl-l1-1-0/api-ms-win-security-sddl-l1-1-0.spec b/dlls/api-ms-win-security-sddl-l1-1-0/api-ms-win-security-sddl-l1-1-0.spec index 1ac8704c7c3..f2b12d4c629 100644 --- a/dlls/api-ms-win-security-sddl-l1-1-0/api-ms-win-security-sddl-l1-1-0.spec +++ b/dlls/api-ms-win-security-sddl-l1-1-0/api-ms-win-security-sddl-l1-1-0.spec @@ -1,4 +1,4 @@ @ stdcall ConvertSecurityDescriptorToStringSecurityDescriptorW(ptr long long ptr ptr) advapi32.ConvertSecurityDescriptorToStringSecurityDescriptorW @ stdcall ConvertSidToStringSidW(ptr ptr) advapi32.ConvertSidToStringSidW @ stdcall ConvertStringSecurityDescriptorToSecurityDescriptorW(wstr long ptr ptr) advapi32.ConvertStringSecurityDescriptorToSecurityDescriptorW -@ stdcall ConvertStringSidToSidW(ptr ptr) advapi32.ConvertStringSidToSidW +@ stdcall ConvertStringSidToSidW(wstr ptr) advapi32.ConvertStringSidToSidW diff --git a/dlls/api-ms-win-service-winsvc-l1-1-0/api-ms-win-service-winsvc-l1-1-0.spec b/dlls/api-ms-win-service-winsvc-l1-1-0/api-ms-win-service-winsvc-l1-1-0.spec index d902c9d17b1..e68ac850bd4 100644 --- a/dlls/api-ms-win-service-winsvc-l1-1-0/api-ms-win-service-winsvc-l1-1-0.spec +++ b/dlls/api-ms-win-service-winsvc-l1-1-0/api-ms-win-service-winsvc-l1-1-0.spec @@ -1,5 +1,5 @@ @ stdcall ChangeServiceConfig2A(long long ptr) advapi32.ChangeServiceConfig2A -@ stdcall ChangeServiceConfigA(long long long long wstr str ptr str str str str) advapi32.ChangeServiceConfigA +@ stdcall ChangeServiceConfigA(long long long long str str ptr str str str str) advapi32.ChangeServiceConfigA @ stdcall ControlService(long long ptr) advapi32.ControlService @ stub ControlServiceExA @ stdcall CreateServiceA(long str str long long long long str str ptr str str str) advapi32.CreateServiceA diff --git a/dlls/api-ms-win-service-winsvc-l1-2-0/api-ms-win-service-winsvc-l1-2-0.spec b/dlls/api-ms-win-service-winsvc-l1-2-0/api-ms-win-service-winsvc-l1-2-0.spec index aa914b6cf9e..295194f38f3 100644 --- a/dlls/api-ms-win-service-winsvc-l1-2-0/api-ms-win-service-winsvc-l1-2-0.spec +++ b/dlls/api-ms-win-service-winsvc-l1-2-0/api-ms-win-service-winsvc-l1-2-0.spec @@ -1,5 +1,5 @@ @ stdcall ChangeServiceConfig2A(long long ptr) advapi32.ChangeServiceConfig2A -@ stdcall ChangeServiceConfigA(long long long long wstr str ptr str str str str) advapi32.ChangeServiceConfigA +@ stdcall ChangeServiceConfigA(long long long long str str ptr str str str str) advapi32.ChangeServiceConfigA @ stdcall ControlService(long long ptr) advapi32.ControlService @ stub ControlServiceExA @ stdcall CreateServiceA(long str str long long long long str str ptr str str str) advapi32.CreateServiceA -- 2.25.1

1 0

[PATCH] advapi32: Fix some spec file entries (try 2)
by André Zwing Jan. 15, 2022

Jan. 15, 2022

Signed-off-by: André Zwing <nerv(a)dawncrow.de> --- dlls/advapi32/advapi32.spec | 22 +++++++++---------- .../api-ms-win-core-registry-l2-1-0.spec | 8 +++---- .../api-ms-win-core-registry-l2-2-0.spec | 8 +++---- .../api-ms-win-downlevel-advapi32-l2-1-0.spec | 2 +- .../api-ms-win-security-lsalookup-l2-1-0.spec | 4 ++-- .../api-ms-win-security-lsalookup-l2-1-1.spec | 4 ++-- .../api-ms-win-security-sddl-l1-1-0.spec | 2 +- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 0391643aa6a..cefc8dc2899 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -91,7 +91,7 @@ # @ stub CancelOverlappedAccess @ stdcall -import ChangeServiceConfig2A(long long ptr) @ stdcall -import ChangeServiceConfig2W(long long ptr) -@ stdcall -import ChangeServiceConfigA(long long long long wstr str ptr str str str str) +@ stdcall -import ChangeServiceConfigA(long long long long str str ptr str str str str) @ stdcall -import ChangeServiceConfigW(long long long long wstr wstr ptr wstr wstr wstr wstr) # @ stub CheckForHiberboot @ stdcall -import CheckTokenMembership(long ptr ptr) @@ -129,8 +129,8 @@ # @ stub ConvertStringSDToSDRootDomainW @ stdcall ConvertStringSecurityDescriptorToSecurityDescriptorA(str long ptr ptr) @ stdcall -import ConvertStringSecurityDescriptorToSecurityDescriptorW(wstr long ptr ptr) -@ stdcall ConvertStringSidToSidA(ptr ptr) -@ stdcall -import ConvertStringSidToSidW(ptr ptr) +@ stdcall ConvertStringSidToSidA(str ptr) +@ stdcall -import ConvertStringSidToSidW(wstr ptr) @ stdcall -import ConvertToAutoInheritPrivateObjectSecurity(ptr ptr ptr ptr long ptr) @ stdcall -import CopySid(long ptr ptr) # @ stub CreateCodeAuthzLevel @@ -429,16 +429,16 @@ @ stdcall LogonUserW(wstr wstr wstr long long ptr) @ stdcall LookupAccountNameA(str str ptr ptr ptr ptr ptr) @ stdcall LookupAccountNameW(wstr wstr ptr ptr ptr ptr ptr) -@ stdcall LookupAccountSidA(ptr ptr ptr ptr ptr ptr ptr) +@ stdcall LookupAccountSidA(str ptr ptr ptr ptr ptr ptr) @ stdcall LookupAccountSidLocalA(ptr ptr ptr ptr ptr ptr) @ stdcall LookupAccountSidLocalW(ptr ptr ptr ptr ptr ptr) -@ stdcall LookupAccountSidW(ptr ptr ptr ptr ptr ptr ptr) +@ stdcall LookupAccountSidW(wstr ptr ptr ptr ptr ptr ptr) @ stdcall LookupPrivilegeDisplayNameA(str str str ptr ptr) @ stdcall LookupPrivilegeDisplayNameW(wstr wstr wstr ptr ptr) @ stdcall LookupPrivilegeNameA(str ptr ptr ptr) @ stdcall LookupPrivilegeNameW(wstr ptr ptr ptr) -@ stdcall LookupPrivilegeValueA(ptr ptr ptr) -@ stdcall LookupPrivilegeValueW(ptr ptr ptr) +@ stdcall LookupPrivilegeValueA(str str ptr) +@ stdcall LookupPrivilegeValueW(wstr wstr ptr) @ stdcall LookupSecurityDescriptorPartsA(ptr ptr ptr ptr ptr ptr ptr) @ stdcall LookupSecurityDescriptorPartsW(ptr ptr ptr ptr ptr ptr ptr) @ stdcall LsaAddAccountRights(ptr ptr ptr long) @@ -681,17 +681,17 @@ @ stdcall RegReplaceKeyW(long wstr wstr wstr) @ stdcall -import RegRestoreKeyA(long str long) @ stdcall -import RegRestoreKeyW(long wstr long) -@ stdcall RegSaveKeyA(long ptr ptr) +@ stdcall RegSaveKeyA(long str ptr) @ stdcall -import RegSaveKeyExA(long str ptr long) @ stdcall -import RegSaveKeyExW(long wstr ptr long) -@ stdcall RegSaveKeyW(long ptr ptr) +@ stdcall RegSaveKeyW(long wstr ptr) @ stdcall -import RegSetKeySecurity(long long ptr) @ stdcall -import RegSetKeyValueA(long str str long ptr long) @ stdcall -import RegSetKeyValueW(long wstr wstr long ptr long) -@ stdcall RegSetValueA(long str long ptr long) +@ stdcall RegSetValueA(long str long str long) @ stdcall -import RegSetValueExA(long str long long ptr long) @ stdcall -import RegSetValueExW(long wstr long long ptr long) -@ stdcall RegSetValueW(long wstr long ptr long) +@ stdcall RegSetValueW(long wstr long wstr long) @ stdcall -import RegUnLoadKeyA(long str) @ stdcall -import RegUnLoadKeyW(long wstr) @ stdcall RegisterEventSourceA(str str) diff --git a/dlls/api-ms-win-core-registry-l2-1-0/api-ms-win-core-registry-l2-1-0.spec b/dlls/api-ms-win-core-registry-l2-1-0/api-ms-win-core-registry-l2-1-0.spec index 6d63dd997ff..17cd6e79311 100644 --- a/dlls/api-ms-win-core-registry-l2-1-0/api-ms-win-core-registry-l2-1-0.spec +++ b/dlls/api-ms-win-core-registry-l2-1-0/api-ms-win-core-registry-l2-1-0.spec @@ -25,9 +25,9 @@ @ stdcall RegQueryValueW(long wstr ptr ptr) advapi32.RegQueryValueW @ stdcall RegReplaceKeyA(long str str str) advapi32.RegReplaceKeyA @ stdcall RegReplaceKeyW(long wstr wstr wstr) advapi32.RegReplaceKeyW -@ stdcall RegSaveKeyA(long ptr ptr) advapi32.RegSaveKeyA -@ stdcall RegSaveKeyW(long ptr ptr) advapi32.RegSaveKeyW +@ stdcall RegSaveKeyA(long str ptr) advapi32.RegSaveKeyA +@ stdcall RegSaveKeyW(long wstr ptr) advapi32.RegSaveKeyW @ stdcall RegSetKeyValueA(long str str long ptr long) advapi32.RegSetKeyValueA @ stdcall RegSetKeyValueW(long wstr wstr long ptr long) advapi32.RegSetKeyValueW -@ stdcall RegSetValueA(long str long ptr long) advapi32.RegSetValueA -@ stdcall RegSetValueW(long wstr long ptr long) advapi32.RegSetValueW +@ stdcall RegSetValueA(long str long str long) advapi32.RegSetValueA +@ stdcall RegSetValueW(long wstr long wstr long) advapi32.RegSetValueW diff --git a/dlls/api-ms-win-core-registry-l2-2-0/api-ms-win-core-registry-l2-2-0.spec b/dlls/api-ms-win-core-registry-l2-2-0/api-ms-win-core-registry-l2-2-0.spec index 6d9ae1f4048..7710da384c5 100644 --- a/dlls/api-ms-win-core-registry-l2-2-0/api-ms-win-core-registry-l2-2-0.spec +++ b/dlls/api-ms-win-core-registry-l2-2-0/api-ms-win-core-registry-l2-2-0.spec @@ -23,7 +23,7 @@ @ stdcall RegQueryValueW(long wstr ptr ptr) advapi32.RegQueryValueW @ stdcall RegReplaceKeyA(long str str str) advapi32.RegReplaceKeyA @ stdcall RegReplaceKeyW(long wstr wstr wstr) advapi32.RegReplaceKeyW -@ stdcall RegSaveKeyA(long ptr ptr) advapi32.RegSaveKeyA -@ stdcall RegSaveKeyW(long ptr ptr) advapi32.RegSaveKeyW -@ stdcall RegSetValueA(long str long ptr long) advapi32.RegSetValueA -@ stdcall RegSetValueW(long wstr long ptr long) advapi32.RegSetValueW +@ stdcall RegSaveKeyA(long str ptr) advapi32.RegSaveKeyA +@ stdcall RegSaveKeyW(long wstr ptr) advapi32.RegSaveKeyW +@ stdcall RegSetValueA(long str long str long) advapi32.RegSetValueA +@ stdcall RegSetValueW(long wstr long wstr long) advapi32.RegSetValueW diff --git a/dlls/api-ms-win-downlevel-advapi32-l2-1-0/api-ms-win-downlevel-advapi32-l2-1-0.spec b/dlls/api-ms-win-downlevel-advapi32-l2-1-0/api-ms-win-downlevel-advapi32-l2-1-0.spec index 96e1a042eed..b0dabec0f34 100644 --- a/dlls/api-ms-win-downlevel-advapi32-l2-1-0/api-ms-win-downlevel-advapi32-l2-1-0.spec +++ b/dlls/api-ms-win-downlevel-advapi32-l2-1-0/api-ms-win-downlevel-advapi32-l2-1-0.spec @@ -1,7 +1,7 @@ @ stdcall CloseServiceHandle(long) advapi32.CloseServiceHandle @ stdcall ConvertSidToStringSidW(ptr ptr) advapi32.ConvertSidToStringSidW @ stdcall ConvertStringSecurityDescriptorToSecurityDescriptorW(wstr long ptr ptr) advapi32.ConvertStringSecurityDescriptorToSecurityDescriptorW -@ stdcall ConvertStringSidToSidW(ptr ptr) advapi32.ConvertStringSidToSidW +@ stdcall ConvertStringSidToSidW(wstr ptr) advapi32.ConvertStringSidToSidW @ stdcall CredDeleteW(wstr long long) advapi32.CredDeleteW @ stdcall CredEnumerateW(wstr long ptr ptr) advapi32.CredEnumerateW @ stdcall CredFree(ptr) advapi32.CredFree diff --git a/dlls/api-ms-win-security-lsalookup-l2-1-0/api-ms-win-security-lsalookup-l2-1-0.spec b/dlls/api-ms-win-security-lsalookup-l2-1-0/api-ms-win-security-lsalookup-l2-1-0.spec index 25b293939df..c1c3cd8e2aa 100644 --- a/dlls/api-ms-win-security-lsalookup-l2-1-0/api-ms-win-security-lsalookup-l2-1-0.spec +++ b/dlls/api-ms-win-security-lsalookup-l2-1-0/api-ms-win-security-lsalookup-l2-1-0.spec @@ -1,6 +1,6 @@ @ stdcall LookupAccountNameW(wstr wstr ptr ptr ptr ptr ptr) advapi32.LookupAccountNameW -@ stdcall LookupAccountSidW(ptr ptr ptr ptr ptr ptr ptr) advapi32.LookupAccountSidW +@ stdcall LookupAccountSidW(wstr ptr ptr ptr ptr ptr ptr) advapi32.LookupAccountSidW @ stdcall LookupPrivilegeDisplayNameW(wstr wstr wstr ptr ptr) advapi32.LookupPrivilegeDisplayNameW @ stdcall LookupPrivilegeNameW(wstr ptr ptr ptr) advapi32.LookupPrivilegeNameW -@ stdcall LookupPrivilegeValueW(ptr ptr ptr) advapi32.LookupPrivilegeValueW +@ stdcall LookupPrivilegeValueW(wstr wstr ptr) advapi32.LookupPrivilegeValueW @ stdcall LsaEnumerateTrustedDomains(ptr ptr ptr long ptr) advapi32.LsaEnumerateTrustedDomains diff --git a/dlls/api-ms-win-security-lsalookup-l2-1-1/api-ms-win-security-lsalookup-l2-1-1.spec b/dlls/api-ms-win-security-lsalookup-l2-1-1/api-ms-win-security-lsalookup-l2-1-1.spec index 1a0ed04ace4..c06b1435333 100644 --- a/dlls/api-ms-win-security-lsalookup-l2-1-1/api-ms-win-security-lsalookup-l2-1-1.spec +++ b/dlls/api-ms-win-security-lsalookup-l2-1-1/api-ms-win-security-lsalookup-l2-1-1.spec @@ -1,7 +1,7 @@ @ stdcall LookupAccountNameW(wstr wstr ptr ptr ptr ptr ptr) advapi32.LookupAccountNameW -@ stdcall LookupAccountSidW(ptr ptr ptr ptr ptr ptr ptr) advapi32.LookupAccountSidW +@ stdcall LookupAccountSidW(wstr ptr ptr ptr ptr ptr ptr) advapi32.LookupAccountSidW @ stdcall LookupPrivilegeDisplayNameW(wstr wstr wstr ptr ptr) advapi32.LookupPrivilegeDisplayNameW @ stdcall LookupPrivilegeNameW(wstr ptr ptr ptr) advapi32.LookupPrivilegeNameW -@ stdcall LookupPrivilegeValueW(ptr ptr ptr) advapi32.LookupPrivilegeValueW +@ stdcall LookupPrivilegeValueW(wstr wstr ptr) advapi32.LookupPrivilegeValueW @ stdcall LsaEnumerateTrustedDomains(ptr ptr ptr long ptr) advapi32.LsaEnumerateTrustedDomains @ stub LsaManageSidNameMapping diff --git a/dlls/api-ms-win-security-sddl-l1-1-0/api-ms-win-security-sddl-l1-1-0.spec b/dlls/api-ms-win-security-sddl-l1-1-0/api-ms-win-security-sddl-l1-1-0.spec index 1ac8704c7c3..f2b12d4c629 100644 --- a/dlls/api-ms-win-security-sddl-l1-1-0/api-ms-win-security-sddl-l1-1-0.spec +++ b/dlls/api-ms-win-security-sddl-l1-1-0/api-ms-win-security-sddl-l1-1-0.spec @@ -1,4 +1,4 @@ @ stdcall ConvertSecurityDescriptorToStringSecurityDescriptorW(ptr long long ptr ptr) advapi32.ConvertSecurityDescriptorToStringSecurityDescriptorW @ stdcall ConvertSidToStringSidW(ptr ptr) advapi32.ConvertSidToStringSidW @ stdcall ConvertStringSecurityDescriptorToSecurityDescriptorW(wstr long ptr ptr) advapi32.ConvertStringSecurityDescriptorToSecurityDescriptorW -@ stdcall ConvertStringSidToSidW(ptr ptr) advapi32.ConvertStringSidToSidW +@ stdcall ConvertStringSidToSidW(wstr ptr) advapi32.ConvertStringSidToSidW -- 2.25.1

1 0

[PATCH] shlwapi: Fix some spec file entries
by André Zwing Jan. 15, 2022

Jan. 15, 2022

Signed-off-by: André Zwing <nerv(a)dawncrow.de> --- dlls/shlwapi/shlwapi.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 68d0e7f8122..6926fd13835 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -257,7 +257,7 @@ 257 stdcall -noname SHCreateWorkerWindowA(ptr ptr long long ptr long) 258 stub -noname SHRegisterWaitForSingleObject 259 stub -noname SHUnregisterWait -260 stdcall -noname SHQueueUserWorkItem(long long long long long long long) +260 stdcall -noname SHQueueUserWorkItem(long long long long long str long) 261 stub -noname SHCreateTimerQueue 262 stub -noname SHDeleteTimerQueue 263 stdcall -noname SHSetTimerQueueTimer(long ptr ptr long long str long) @@ -288,8 +288,8 @@ 288 stub -noname IUnknown_CPContainerInvokeIndirect 289 stdcall -noname PlaySoundWrapW(wstr long long) 290 stub -noname SHMirrorIcon -291 stdcall -noname SHMessageBoxCheckExA(ptr ptr ptr ptr ptr long str) -292 stdcall -noname SHMessageBoxCheckExW(ptr ptr ptr ptr ptr long wstr) +291 stdcall -noname SHMessageBoxCheckExA(ptr ptr str ptr ptr long str) +292 stdcall -noname SHMessageBoxCheckExW(ptr ptr wstr ptr ptr long wstr) 293 stub -noname SHCancelUserWorkItems 294 stdcall -noname SHGetIniStringW(wstr wstr ptr long wstr) 295 stdcall -noname SHSetIniStringW(wstr wstr wstr wstr) @@ -488,7 +488,7 @@ 488 stub -noname SHConvertGraphicsFile 489 stdcall -noname GlobalAddAtomWrapW(wstr) kernel32.GlobalAddAtomW 490 stdcall -noname GlobalFindAtomWrapW(wstr) kernel32.GlobalFindAtomW -491 stdcall -noname SHGetShellKey(long long long) +491 stdcall -noname SHGetShellKey(long wstr long) 492 stub -noname PrettifyFileDescriptionW 493 stub -noname SHPropertyBag_ReadType 494 stub -noname SHPropertyBag_ReadStr @@ -663,8 +663,8 @@ @ stdcall -import PathRenameExtensionW(wstr wstr) @ stdcall -import PathSearchAndQualifyA(str ptr long) @ stdcall -import PathSearchAndQualifyW(wstr ptr long) -@ stdcall PathSetDlgItemPathA (long long ptr) -@ stdcall PathSetDlgItemPathW (long long ptr) +@ stdcall PathSetDlgItemPathA (long long str) +@ stdcall PathSetDlgItemPathW (long long wstr) @ stdcall -import PathSkipRootA(str) @ stdcall -import PathSkipRootW(wstr) @ stdcall -import PathStripPathA(str) -- 2.25.1

1 0