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

[PATCH 1/3] dmscript: Implement unimplemented Script track methods
by Michael Stefaniuc Nov. 21, 2019

Nov. 21, 2019

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmscript/scripttrack.c | 48 +++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/dlls/dmscript/scripttrack.c b/dlls/dmscript/scripttrack.c index 05c8f393a8..7035f2b57a 100644 --- a/dlls/dmscript/scripttrack.c +++ b/dlls/dmscript/scripttrack.c @@ -149,20 +149,22 @@ static HRESULT WINAPI script_track_IsParamSupported(IDirectMusicTrack8 *iface, R return DMUS_E_TYPE_UNSUPPORTED; } -static HRESULT WINAPI script_track_AddNotificationType(IDirectMusicTrack8 *iface, - REFGUID rguidNotificationType) +static HRESULT WINAPI script_track_AddNotificationType(IDirectMusicTrack8 *iface, REFGUID type) { - DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidNotificationType)); - return S_OK; + DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s): method not implemented\n", This, debugstr_dmguid(type)); + + return E_NOTIMPL; } -static HRESULT WINAPI script_track_RemoveNotificationType(IDirectMusicTrack8 *iface, - REFGUID rguidNotificationType) +static HRESULT WINAPI script_track_RemoveNotificationType(IDirectMusicTrack8 *iface, REFGUID type) { - DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidNotificationType)); - return S_OK; + DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s): method not implemented\n", This, debugstr_dmguid(type)); + + return E_NOTIMPL; } static HRESULT WINAPI script_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mtStart, @@ -202,21 +204,25 @@ static HRESULT WINAPI script_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUID return S_OK; } -static HRESULT WINAPI script_track_Compose(IDirectMusicTrack8 *iface, IUnknown *pContext, - DWORD dwTrackGroup, IDirectMusicTrack **ppResultTrack) +static HRESULT WINAPI script_track_Compose(IDirectMusicTrack8 *iface, IUnknown *context, + DWORD group, IDirectMusicTrack **res_track) { - DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %p): stub\n", This, pContext, dwTrackGroup, ppResultTrack); - return S_OK; + DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, group, res_track); + + return E_NOTIMPL; } -static HRESULT WINAPI script_track_Join(IDirectMusicTrack8 *iface, IDirectMusicTrack *pNewTrack, - MUSIC_TIME mtJoin, IUnknown *pContext, DWORD dwTrackGroup, - IDirectMusicTrack **ppResultTrack) +static HRESULT WINAPI script_track_Join(IDirectMusicTrack8 *iface, IDirectMusicTrack *track2, + MUSIC_TIME join, IUnknown *context, DWORD group, IDirectMusicTrack **res_track) { - DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %p, %d, %p): stub\n", This, pNewTrack, mtJoin, pContext, dwTrackGroup, ppResultTrack); - return S_OK; + DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %p, %d, %p, %d, %p): method not implemented\n", This, track2, join, context, + group, res_track); + + return E_NOTIMPL; } static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { -- 2.20.1

1 0

[PATCH v2 0/2] Add emulation for UMIP instructions
by Brendan Shanks Nov. 21, 2019

Nov. 21, 2019

This patch adds emulation for instructions protected by User-Mode Instruction Prevention (currently implemented by AMD Ryzen 3000 CPUs and some rare Intel CPUs). Changes from previous patch: an access violation exception is now raised if the emulated instruction tries to write to an invalid memory address, tests were added for this behavior, and all tests are now in exception.c. Brendan Shanks (2): ntdll: Add emulation for UMIP instructions. ntdll/tests: Add tests for UMIP instructions. dlls/ntdll/Makefile.in | 1 + dlls/ntdll/signal_i386.c | 19 + dlls/ntdll/signal_x86_64.c | 19 + dlls/ntdll/tests/exception.c | 375 +++++++++++++++++ dlls/ntdll/umip.c | 780 +++++++++++++++++++++++++++++++++++ dlls/ntdll/umip.h | 21 + 6 files changed, 1215 insertions(+) create mode 100644 dlls/ntdll/umip.c create mode 100644 dlls/ntdll/umip.h -- 2.23.0

4 9

[PATCH] po: Update Finnish translation.
by Lauri Kenttä Nov. 21, 2019

Nov. 21, 2019

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- po/fi.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/fi.po b/po/fi.po index 77152ebd9e..962af5547a 100644 --- a/po/fi.po +++ b/po/fi.po @@ -621,7 +621,7 @@ msgstr "&Muokatut värit:" #: comdlg32.rc:289 msgid "|S&olid" -msgstr "" +msgstr "|&Tasainen" #: comdlg32.rc:290 msgid "&Red:" @@ -658,11 +658,9 @@ msgid "&Define Custom Colors >>" msgstr "M&äärittele väri >>" #: comdlg32.rc:312 -#, fuzzy -#| msgid "&No" msgctxt "Solid" msgid "&o" -msgstr "&Ei" +msgstr "&T" #: comdlg32.rc:318 regedit.rc:275 regedit.rc:285 msgid "Find" -- 2.24.0

1 0

[PATCH v2] dmstyle: Improved tracing of the DMUS_OBJECTDESC structure.
by Michael Stefaniuc Nov. 21, 2019

Nov. 21, 2019

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- v2: .git/rebase-apply/patch:84: new blank line at EOF. dlls/dmstyle/dmutils.c | 54 ++++++++++++++++++++++++------------------ dlls/dmstyle/dmutils.h | 2 +- dlls/dmstyle/style.c | 2 +- 3 files changed, 33 insertions(+), 25 deletions(-) diff --git a/dlls/dmstyle/dmutils.c b/dlls/dmstyle/dmutils.c index 0432e76f9f..fd3abe5209 100644 --- a/dlls/dmstyle/dmutils.c +++ b/dlls/dmstyle/dmutils.c @@ -40,6 +40,7 @@ #include "dmutils.h" WINE_DEFAULT_DEBUG_CHANNEL(dmfile); +WINE_DECLARE_DEBUG_CHANNEL(dmime); HRESULT IDirectMusicUtils_IPersistStream_ParseDescGeneric (DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_OBJECTDESC pDesc) { @@ -197,7 +198,7 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, TRACE("** DM Reference Begin of Load ***\n"); TRACE("With Desc:\n"); - debugstr_DMUS_OBJECTDESC(&ref_desc); + dump_DMUS_OBJECTDESC(&ref_desc); { LPDIRECTMUSICGETLOADER pGetLoader = NULL; @@ -484,26 +485,33 @@ static const char *debugstr_DMUS_OBJ_FLAGS (DWORD flagmask) { return debugstr_flags(flagmask, flags, ARRAY_SIZE(flags)); } -const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) { - if (pDesc) { - char buffer[1024], *ptr = buffer; - - ptr += sprintf(ptr, "DMUS_OBJECTDESC (%p):\n", pDesc); - ptr += sprintf(ptr, " - dwSize = 0x%08X\n", pDesc->dwSize); - ptr += sprintf(ptr, " - dwValidData = 0x%08X ( %s)\n", pDesc->dwValidData, debugstr_DMUS_OBJ_FLAGS (pDesc->dwValidData)); - if (pDesc->dwValidData & DMUS_OBJ_CLASS) ptr += sprintf(ptr, " - guidClass = %s\n", debugstr_dmguid(&pDesc->guidClass)); - if (pDesc->dwValidData & DMUS_OBJ_OBJECT) ptr += sprintf(ptr, " - guidObject = %s\n", debugstr_guid(&pDesc->guidObject)); - if (pDesc->dwValidData & DMUS_OBJ_DATE) ptr += sprintf(ptr, " - ftDate = %s\n", debugstr_filetime (&pDesc->ftDate)); - if (pDesc->dwValidData & DMUS_OBJ_VERSION) ptr += sprintf(ptr, " - vVersion = %s\n", debugstr_dmversion(&pDesc->vVersion)); - if (pDesc->dwValidData & DMUS_OBJ_NAME) ptr += sprintf(ptr, " - wszName = %s\n", debugstr_w(pDesc->wszName)); - if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) ptr += sprintf(ptr, " - wszCategory = %s\n", debugstr_w(pDesc->wszCategory)); - if (pDesc->dwValidData & DMUS_OBJ_FILENAME) ptr += sprintf(ptr, " - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); - if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = 0x%s\n - pbMemData = %p\n", - wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); - if (pDesc->dwValidData & DMUS_OBJ_STREAM) ptr += sprintf(ptr, " - pStream = %p\n", pDesc->pStream); - - return wine_dbg_sprintf("%s", buffer); - } else { - return wine_dbg_sprintf("(NULL)"); - } +void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *pDesc) +{ + if (!TRACE_ON(dmime)) + return; + + if (pDesc) { + TRACE_(dmime)("DMUS_OBJECTDESC (%p):", pDesc); + TRACE_(dmime)(" - dwSize = 0x%08X\n", pDesc->dwSize); + TRACE_(dmime)(" - dwValidData = 0x%08X ( %s)\n", pDesc->dwValidData, debugstr_DMUS_OBJ_FLAGS (pDesc->dwValidData)); + if (pDesc->dwValidData & DMUS_OBJ_CLASS) + TRACE_(dmime)(" - guidClass = %s\n", debugstr_dmguid(&pDesc->guidClass)); + if (pDesc->dwValidData & DMUS_OBJ_OBJECT) + TRACE_(dmime)(" - guidObject = %s\n", debugstr_guid(&pDesc->guidObject)); + if (pDesc->dwValidData & DMUS_OBJ_DATE) + TRACE_(dmime)(" - ftDate = %s\n", debugstr_filetime (&pDesc->ftDate)); + if (pDesc->dwValidData & DMUS_OBJ_VERSION) + TRACE_(dmime)(" - vVersion = %s\n", debugstr_dmversion(&pDesc->vVersion)); + if (pDesc->dwValidData & DMUS_OBJ_NAME) + TRACE_(dmime)(" - wszName = %s\n", debugstr_w(pDesc->wszName)); + if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) + TRACE_(dmime)(" - wszCategory = %s\n", debugstr_w(pDesc->wszCategory)); + if (pDesc->dwValidData & DMUS_OBJ_FILENAME) + TRACE_(dmime)(" - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); + if (pDesc->dwValidData & DMUS_OBJ_MEMORY) + TRACE_(dmime)(" - llMemLength = 0x%s\n - pbMemData = %p\n", wine_dbgstr_longlong(pDesc->llMemLength), + pDesc->pbMemData); + if (pDesc->dwValidData & DMUS_OBJ_STREAM) + TRACE_(dmime)(" - pStream = %p\n", pDesc->pStream); + } } diff --git a/dlls/dmstyle/dmutils.h b/dlls/dmstyle/dmutils.h index e2902875dc..f2b469806f 100644 --- a/dlls/dmstyle/dmutils.h +++ b/dlls/dmstyle/dmutils.h @@ -58,6 +58,6 @@ extern const char *debugstr_fourcc (DWORD fourcc) DECLSPEC_HIDDEN; extern const char *debugstr_dmguid (const GUID *id) DECLSPEC_HIDDEN; /* dump whole DMUS_OBJECTDESC struct */ -extern const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) DECLSPEC_HIDDEN; +extern void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *pDesc) DECLSPEC_HIDDEN; #endif /* __WINE_DMUTILS_H */ diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index b3a3b83f39..4e84a3edc3 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -234,7 +234,7 @@ static HRESULT WINAPI style_IDirectMusicObject_ParseDescriptor(IDirectMusicObjec desc->guidClass = CLSID_DirectMusicStyle; desc->dwValidData |= DMUS_OBJ_CLASS; - TRACE("returning descriptor:\n%s\n", debugstr_DMUS_OBJECTDESC (desc)); + dump_DMUS_OBJECTDESC(desc); return S_OK; } -- 2.20.1

1 0

[PATCH vkd3d v3] Support RS 1.0 VOLATILE descriptors
by Sveinar Søpler Nov. 21, 2019

Nov. 21, 2019

Rework of this patch to fix bug https://www.winehq.org/pipermail/wine-devel/2019-November/153658.html Original commit message: From: post(a)arntzen-software.no Use EXT_descriptor_indexing's UPDATE_AFTER_BIND feature to support semantics required by RS 1.0 VOLATILE descriptors. We implement this by deferring all updates of desciptor sets until Submit time. This is fine, as command buffers cannot be executed simultaneously on D3D12, so at Submit time, we know that the command buffer is not being executed on the GPU, and updating descriptors for multiple submissions is correct. If EXT_descriptor_indexing is not available, the fallback is the older method, which matches RS 1.1 STATIC descriptor model. Signed-off-by: Sveinar Søpler <cybermax(a)dexter.no> --- v3: Remove some .orig files created by git "fuzz" --- libs/vkd3d/command.c | 359 +++++++++++++++++++++++++++++-------- libs/vkd3d/device.c | 20 ++- libs/vkd3d/state.c | 22 +++ libs/vkd3d/vkd3d_private.h | 19 +- tests/d3d12.c | 2 +- 5 files changed, 339 insertions(+), 83 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 297054b..8d8ba1d 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1341,7 +1341,7 @@ static VkDescriptorPool d3d12_command_allocator_allocate_descriptor_pool( { pool_desc.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO; pool_desc.pNext = NULL; - pool_desc.flags = 0; + pool_desc.flags = device->vk_info.EXT_descriptor_indexing ? VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT_EXT : 0; pool_desc.maxSets = 512; pool_desc.poolSizeCount = ARRAY_SIZE(pool_sizes); pool_desc.pPoolSizes = pool_sizes; @@ -1865,6 +1865,10 @@ static void d3d12_command_list_invalidate_bindings(struct d3d12_command_list *li if (!state) return; + /* Each pipeline state has its own set layout for UAV counters + * based on their implicit usage in the shader. + * Binding a different pipeline state means having to re-remit + * UAV counters in a new descriptor set (and layout). */ if (state->uav_counter_mask) { struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[state->vk_bind_point]; @@ -2209,6 +2213,7 @@ static ULONG STDMETHODCALLTYPE d3d12_command_list_Release(ID3D12GraphicsCommandL if (list->allocator) d3d12_command_allocator_free_command_buffer(list->allocator, list); + vkd3d_free(list->descriptor_updates); vkd3d_free(list); d3d12_device_release(device); @@ -2347,6 +2352,9 @@ static void d3d12_command_list_reset_state(struct d3d12_command_list *list, list->state = NULL; + /* Recycle deferred descriptor update memory if possible. */ + list->descriptor_updates_count = 0; + memset(list->so_counter_buffers, 0, sizeof(list->so_counter_buffers)); memset(list->so_counter_buffer_offsets, 0, sizeof(list->so_counter_buffer_offsets)); @@ -2566,15 +2574,54 @@ static void d3d12_command_list_prepare_descriptors(struct d3d12_command_list *li * time in between. Thus, the contents must not be altered (overwritten * by an update command, or freed) between when the command is recorded * and when the command completes executing on the queue." + * + * Even if we have descriptor indexing and UPDATE_AFTER_BIND, + * we need at the very least a new descriptor set. */ bindings->descriptor_set = d3d12_command_allocator_allocate_descriptor_set(list->allocator, root_signature->vk_set_layout); + bindings->in_use = false; bindings->descriptor_table_dirty_mask |= bindings->descriptor_table_active_mask & root_signature->descriptor_table_mask; bindings->push_descriptor_dirty_mask |= bindings->push_descriptor_active_mask & root_signature->push_descriptor_mask; } +static void d3d12_command_list_prepare_uav_counter_descriptors(struct d3d12_command_list *list, + VkPipelineBindPoint bind_point) +{ + struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point]; + + if (bindings->uav_counter_descriptor_set && !bindings->uav_counter_in_use) + return; + + /* We cannot modify bound descriptor sets. We need a new descriptor set if + * we are about to update resource bindings. + * + * The Vulkan spec says: + * + * "The descriptor set contents bound by a call to + * vkCmdBindDescriptorSets may be consumed during host execution of the + * command, or during shader execution of the resulting draws, or any + * time in between. Thus, the contents must not be altered (overwritten + * by an update command, or freed) between when the command is recorded + * and when the command completes executing on the queue." + * + * Even if we have descriptor indexing and UPDATE_AFTER_BIND, + * we need at the very least a new descriptor set. + */ + + if (list->state->uav_counter_mask) + { + bindings->uav_counter_descriptor_set = d3d12_command_allocator_allocate_descriptor_set(list->allocator, + list->state->vk_set_layout); + } + else + bindings->uav_counter_descriptor_set = VK_NULL_HANDLE; + + bindings->uav_counter_in_use = false; +} + static bool vk_write_descriptor_set_from_d3d12_desc(VkWriteDescriptorSet *vk_descriptor_write, VkDescriptorImageInfo *vk_image_info, const struct d3d12_desc *descriptor, uint32_t descriptor_range_magic, VkDescriptorSet vk_descriptor_set, @@ -2643,26 +2690,61 @@ static bool vk_write_descriptor_set_from_d3d12_desc(VkWriteDescriptorSet *vk_des return true; } -static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list *list, - VkPipelineBindPoint bind_point, unsigned int index, struct d3d12_desc *base_descriptor) +static void d3d12_command_list_defer_update_descriptor_table(struct d3d12_command_list *list, + VkPipelineBindPoint bind_point, uint64_t table_mask, bool uav) { + const struct d3d12_desc *base_descriptor; + unsigned i; + struct d3d12_deferred_descriptor_set_update *update; struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point]; - struct VkWriteDescriptorSet descriptor_writes[24], *current_descriptor_write; - const struct d3d12_root_signature *root_signature = bindings->root_signature; + + for (i = 0; i < ARRAY_SIZE(bindings->descriptor_tables); ++i) + { + if (table_mask & ((uint64_t)1 << i)) + { + if ((base_descriptor = d3d12_desc_from_gpu_handle(bindings->descriptor_tables[i]))) + { + vkd3d_array_reserve((void **)&list->descriptor_updates, &list->descriptor_updates_size, + list->descriptor_updates_count + 1, sizeof(*list->descriptor_updates)); + update = &list->descriptor_updates[list->descriptor_updates_count]; + + update->base_descriptor = base_descriptor; + update->index = i; + update->root_signature = bindings->root_signature; + update->descriptor_set = uav ? bindings->uav_counter_descriptor_set : bindings->descriptor_set; + update->uav = uav; + list->descriptor_updates_count++; + } + else + WARN("Descriptor table %u is not set.\n", i); + } + } +} + +static void d3d12_command_list_resolve_descriptor_table_uav(struct d3d12_command_list *list, + const struct d3d12_deferred_descriptor_set_update *update) +{ + const struct d3d12_root_signature *root_signature = update->root_signature; const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; - struct VkDescriptorImageInfo image_infos[24], *current_image_info; const struct d3d12_root_descriptor_table *descriptor_table; const struct d3d12_root_descriptor_table_range *range; VkDevice vk_device = list->device->vk_device; - unsigned int i, j, descriptor_count; - struct d3d12_desc *descriptor; - - descriptor_table = root_signature_get_descriptor_table(root_signature, index); + unsigned int i, j; + unsigned int uav_counter_count; + const struct d3d12_desc *descriptor; + VkWriteDescriptorSet vk_descriptor_writes[VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS]; + VkBufferView vk_uav_counter_views[VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS]; + VkDescriptorSet vk_descriptor_set; + const struct d3d12_desc *base_descriptor = update->base_descriptor; + descriptor_table = root_signature_get_descriptor_table(root_signature, update->index); descriptor = base_descriptor; - descriptor_count = 0; - current_descriptor_write = descriptor_writes; - current_image_info = image_infos; + + vk_descriptor_set = update->descriptor_set; + if (!vk_descriptor_set) + return; + + /* FIXME: There should be a smarter way than scanning through all the descriptor table ranges for this. */ for (i = 0; i < descriptor_table->range_count; ++i) { range = &descriptor_table->ranges[i]; @@ -2676,20 +2758,74 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list { unsigned int register_idx = range->base_register_idx + j; - /* Track UAV counters. */ + /* Fish out UAV counters. */ if (range->descriptor_magic == VKD3D_DESCRIPTOR_MAGIC_UAV - && register_idx < ARRAY_SIZE(bindings->vk_uav_counter_views)) + && register_idx < ARRAY_SIZE(vk_uav_counter_views)) { VkBufferView vk_counter_view = descriptor->magic == VKD3D_DESCRIPTOR_MAGIC_UAV - ? descriptor->u.view->vk_counter_view : VK_NULL_HANDLE; - if (bindings->vk_uav_counter_views[register_idx] != vk_counter_view) - bindings->uav_counter_dirty_mask |= 1u << register_idx; - bindings->vk_uav_counter_views[register_idx] = vk_counter_view; + ? descriptor->u.view->vk_counter_view : VK_NULL_HANDLE; + vk_uav_counter_views[register_idx] = vk_counter_view; } + } + } + + uav_counter_count = vkd3d_popcount(list->state->uav_counter_mask); + assert(uav_counter_count <= ARRAY_SIZE(vk_descriptor_writes)); + for (i = 0; i < uav_counter_count; ++i) + { + const struct vkd3d_shader_uav_counter_binding *uav_counter = &list->state->uav_counters[i]; + assert(vk_uav_counter_views[uav_counter->register_index]); + + vk_descriptor_writes[i].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; + vk_descriptor_writes[i].pNext = NULL; + vk_descriptor_writes[i].dstSet = vk_descriptor_set; + vk_descriptor_writes[i].dstBinding = uav_counter->binding.binding; + vk_descriptor_writes[i].dstArrayElement = 0; + vk_descriptor_writes[i].descriptorCount = 1; + vk_descriptor_writes[i].descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER; + vk_descriptor_writes[i].pImageInfo = NULL; + vk_descriptor_writes[i].pBufferInfo = NULL; + vk_descriptor_writes[i].pTexelBufferView = &vk_uav_counter_views[uav_counter->register_index]; + } + + VK_CALL(vkUpdateDescriptorSets(vk_device, uav_counter_count, vk_descriptor_writes, 0, NULL)); +} + +static void d3d12_command_list_resolve_descriptor_table_normal(struct d3d12_command_list *list, + const struct d3d12_deferred_descriptor_set_update *update) +{ + const struct d3d12_root_descriptor_table *descriptor_table; + struct VkWriteDescriptorSet descriptor_writes[24], *current_descriptor_write; + struct VkDescriptorImageInfo image_infos[24], *current_image_info; + const struct d3d12_root_signature *root_signature = update->root_signature; + const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; + const struct d3d12_root_descriptor_table_range *range; + VkDevice vk_device = list->device->vk_device; + unsigned int i, j, descriptor_count; + const struct d3d12_desc *descriptor; + const struct d3d12_desc *base_descriptor = update->base_descriptor; + + descriptor_table = root_signature_get_descriptor_table(root_signature, update->index); + + descriptor = update->base_descriptor; + descriptor_count = 0; + current_descriptor_write = descriptor_writes; + current_image_info = image_infos; + for (i = 0; i < descriptor_table->range_count; ++i) + { + range = &descriptor_table->ranges[i]; + + if (range->offset != D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND) + { + descriptor = base_descriptor + range->offset; + } + + for (j = 0; j < range->descriptor_count; ++j, ++descriptor) + { if (!vk_write_descriptor_set_from_d3d12_desc(current_descriptor_write, - current_image_info, descriptor, range->descriptor_magic, - bindings->descriptor_set, range->binding, j)) + current_image_info, descriptor, range->descriptor_magic, + update->descriptor_set, range->binding, j)) continue; ++descriptor_count; @@ -2709,6 +2845,52 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list VK_CALL(vkUpdateDescriptorSets(vk_device, descriptor_count, descriptor_writes, 0, NULL)); } +static void d3d12_command_list_resolve_descriptor_table(struct d3d12_command_list *list, + const struct d3d12_deferred_descriptor_set_update *update) +{ + if (update->uav) + d3d12_command_list_resolve_descriptor_table_uav(list, update); + else + d3d12_command_list_resolve_descriptor_table_normal(list, update); +} + +static void d3d12_command_list_resolve_descriptor_tables(struct d3d12_command_list *list) +{ + unsigned i; + for (i = 0; i < list->descriptor_updates_count; i++) + d3d12_command_list_resolve_descriptor_table(list, &list->descriptor_updates[i]); +} + +static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list *list, + VkPipelineBindPoint bind_point, unsigned int index, struct d3d12_desc *base_descriptor) +{ + struct d3d12_deferred_descriptor_set_update update; + struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point]; + const struct d3d12_root_signature *root_signature = bindings->root_signature; + + update.descriptor_set = bindings->descriptor_set; + update.index = index; + update.root_signature = root_signature; + update.base_descriptor = base_descriptor; + update.uav = false; + d3d12_command_list_resolve_descriptor_table_normal(list, &update); +} + +static void d3d12_command_list_update_uav_counter_descriptor_table(struct d3d12_command_list *list, + VkPipelineBindPoint bind_point, unsigned int index, struct d3d12_desc *base_descriptor) +{ + struct d3d12_deferred_descriptor_set_update update; + struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point]; + const struct d3d12_root_signature *root_signature = bindings->root_signature; + + update.descriptor_set = bindings->uav_counter_descriptor_set; + update.index = index; + update.root_signature = root_signature; + update.base_descriptor = base_descriptor; + update.uav = true; + d3d12_command_list_resolve_descriptor_table_uav(list, &update); +} + static bool vk_write_descriptor_set_from_root_descriptor(VkWriteDescriptorSet *vk_descriptor_write, const struct d3d12_root_parameter *root_parameter, VkDescriptorSet vk_descriptor_set, VkBufferView *vk_buffer_view, const VkDescriptorBufferInfo *vk_buffer_info) @@ -2813,55 +2995,6 @@ done: vkd3d_free(buffer_infos); } -static void d3d12_command_list_update_uav_counter_descriptors(struct d3d12_command_list *list, - VkPipelineBindPoint bind_point) -{ - VkWriteDescriptorSet vk_descriptor_writes[VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS]; - struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point]; - const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; - const struct d3d12_pipeline_state *state = list->state; - VkDevice vk_device = list->device->vk_device; - VkDescriptorSet vk_descriptor_set; - unsigned int uav_counter_count; - unsigned int i; - - if (!state || !(state->uav_counter_mask & bindings->uav_counter_dirty_mask)) - return; - - uav_counter_count = vkd3d_popcount(state->uav_counter_mask); - assert(uav_counter_count <= ARRAY_SIZE(vk_descriptor_writes)); - - vk_descriptor_set = d3d12_command_allocator_allocate_descriptor_set(list->allocator, state->vk_set_layout); - if (!vk_descriptor_set) - return; - - for (i = 0; i < uav_counter_count; ++i) - { - const struct vkd3d_shader_uav_counter_binding *uav_counter = &state->uav_counters[i]; - const VkBufferView *vk_uav_counter_views = bindings->vk_uav_counter_views; - - assert(vk_uav_counter_views[uav_counter->register_index]); - - vk_descriptor_writes[i].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; - vk_descriptor_writes[i].pNext = NULL; - vk_descriptor_writes[i].dstSet = vk_descriptor_set; - vk_descriptor_writes[i].dstBinding = uav_counter->binding.binding; - vk_descriptor_writes[i].dstArrayElement = 0; - vk_descriptor_writes[i].descriptorCount = 1; - vk_descriptor_writes[i].descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER; - vk_descriptor_writes[i].pImageInfo = NULL; - vk_descriptor_writes[i].pBufferInfo = NULL; - vk_descriptor_writes[i].pTexelBufferView = &vk_uav_counter_views[uav_counter->register_index]; - } - - VK_CALL(vkUpdateDescriptorSets(vk_device, uav_counter_count, vk_descriptor_writes, 0, NULL)); - - VK_CALL(vkCmdBindDescriptorSets(list->vk_command_buffer, bind_point, - state->vk_pipeline_layout, state->set_index, 1, &vk_descriptor_set, 0, NULL)); - - bindings->uav_counter_dirty_mask = 0; -} - static void d3d12_command_list_update_descriptors(struct d3d12_command_list *list, VkPipelineBindPoint bind_point) { @@ -2874,31 +3007,86 @@ static void d3d12_command_list_update_descriptors(struct d3d12_command_list *lis if (!rs || !rs->vk_set_layout) return; + if ((bindings->descriptor_table_active_mask | bindings->push_descriptor_dirty_mask | + (list->state->uav_counter_mask & bindings->uav_counter_dirty_mask)) == 0) + { + /* Nothing is dirty, so just return early. */ + return; + } + if (bindings->descriptor_table_dirty_mask || bindings->push_descriptor_dirty_mask) d3d12_command_list_prepare_descriptors(list, bind_point); + if (list->state->uav_counter_mask & bindings->uav_counter_dirty_mask) + d3d12_command_list_prepare_uav_counter_descriptors(list, bind_point); - for (i = 0; i < ARRAY_SIZE(bindings->descriptor_tables); ++i) + if (list->device->vk_info.EXT_descriptor_indexing) + { + d3d12_command_list_defer_update_descriptor_table(list, bind_point, bindings->descriptor_table_dirty_mask, + false); + } + else { - if (bindings->descriptor_table_dirty_mask & ((uint64_t)1 << i)) + /* FIXME: FOR_EACH_BIT */ + for (i = 0; i < ARRAY_SIZE(bindings->descriptor_tables); ++i) { - if ((base_descriptor = d3d12_desc_from_gpu_handle(bindings->descriptor_tables[i]))) - d3d12_command_list_update_descriptor_table(list, bind_point, i, base_descriptor); - else - WARN("Descriptor table %u is not set.\n", i); + if (bindings->descriptor_table_dirty_mask & ((uint64_t) 1 << i)) + { + if ((base_descriptor = d3d12_desc_from_gpu_handle(bindings->descriptor_tables[i]))) + d3d12_command_list_update_descriptor_table(list, bind_point, i, base_descriptor); + else + WARN("Descriptor table %u is not set.\n", i); + } } } bindings->descriptor_table_dirty_mask = 0; + /* Need to go through all descriptor tables here in the root signature, + * not just descriptor_table_dirty_mask. Binding a different shader may not invalidate descriptor tables, + * but it may invalidate the UAV counter set. */ + if (bindings->uav_counter_dirty_mask) + { + if (list->device->vk_info.EXT_descriptor_indexing) + { + d3d12_command_list_defer_update_descriptor_table(list, bind_point, bindings->descriptor_table_active_mask, + true); + } + else + { + /* FIXME: FOR_EACH_BIT */ + for (i = 0; i < ARRAY_SIZE(bindings->descriptor_tables); i++) + { + if (bindings->descriptor_table_active_mask & ((uint64_t) 1 << i)) + { + if ((base_descriptor = d3d12_desc_from_gpu_handle(bindings->descriptor_tables[i]))) + d3d12_command_list_update_uav_counter_descriptor_table(list, bind_point, i, base_descriptor); + else + WARN("Descriptor table %u is not set.\n", i); + } + } + } + } + bindings->uav_counter_dirty_mask = 0; + d3d12_command_list_update_push_descriptors(list, bind_point); - if (bindings->descriptor_set) + /* Don't rebind the same descriptor set as long as we're in same pipeline layout. */ + if (bindings->descriptor_set && bindings->descriptor_set != bindings->descriptor_set_bound) { VK_CALL(vkCmdBindDescriptorSets(list->vk_command_buffer, bind_point, rs->vk_pipeline_layout, rs->main_set, 1, &bindings->descriptor_set, 0, NULL)); bindings->in_use = true; + bindings->descriptor_set_bound = bindings->descriptor_set; } - d3d12_command_list_update_uav_counter_descriptors(list, bind_point); + /* Don't rebind the same descriptor set as long as we're in same pipeline layout. */ + if (bindings->uav_counter_descriptor_set && + bindings->uav_counter_descriptor_set != bindings->uav_counter_descriptor_set_bound) + { + VK_CALL(vkCmdBindDescriptorSets(list->vk_command_buffer, bind_point, + list->state->vk_pipeline_layout, list->state->set_index, 1, &bindings->uav_counter_descriptor_set, 0, NULL)); + bindings->uav_counter_in_use = true; + bindings->uav_counter_descriptor_set_bound = bindings->uav_counter_descriptor_set; + } } static bool d3d12_command_list_update_compute_state(struct d3d12_command_list *list) @@ -4054,6 +4242,11 @@ static void d3d12_command_list_set_root_signature(struct d3d12_command_list *lis bindings->root_signature = root_signature; d3d12_command_list_invalidate_root_parameters(list, bind_point); + + bindings->uav_counter_descriptor_set = VK_NULL_HANDLE; + bindings->descriptor_set_bound = VK_NULL_HANDLE; + bindings->uav_counter_descriptor_set_bound = VK_NULL_HANDLE; + } static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootSignature(ID3D12GraphicsCommandList1 *iface, @@ -5422,6 +5615,9 @@ static HRESULT d3d12_command_list_init(struct d3d12_command_list *list, struct d d3d12_device_add_ref(list->device = device); list->allocator = allocator; + list->descriptor_updates = NULL; + list->descriptor_updates_count = 0; + list->descriptor_updates_size = 0; if (SUCCEEDED(hr = d3d12_command_allocator_allocate_command_buffer(allocator, list))) { @@ -5659,6 +5855,13 @@ static void STDMETHODCALLTYPE d3d12_command_queue_ExecuteCommandLists(ID3D12Comm return; } + /* Descriptors in root signature in 1.0 are VOLATILE by default, so + * the descriptor heap only need to be valid right before we submit them to the GPU. + * If we have EXT_descriptor_indexing enabled with UpdateAfterBind, we update + * descriptor sets here rather than while we're recording the command buffer. + * For each submission of the command buffer, we can modify the descriptor heap as we please. */ + d3d12_command_list_resolve_descriptor_tables(cmd_list); + buffers[i] = cmd_list->vk_command_buffer; } diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 0624318..0a29988 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1436,11 +1436,25 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, } if (vulkan_info->EXT_descriptor_indexing && descriptor_indexing - && (descriptor_indexing->descriptorBindingUniformBufferUpdateAfterBind - || descriptor_indexing->descriptorBindingStorageBufferUpdateAfterBind + && descriptor_indexing->descriptorBindingUniformBufferUpdateAfterBind + && descriptor_indexing->descriptorBindingSampledImageUpdateAfterBind + && descriptor_indexing->descriptorBindingStorageImageUpdateAfterBind + && descriptor_indexing->descriptorBindingUniformTexelBufferUpdateAfterBind) + { + TRACE("Enabling VK_EXT_descriptor_indexing for volatile descriptor updates.\n"); + } + else + { + WARN("VK_EXT_descriptor indexing not supported in sufficient capacity. Volatile descriptor updates will not work.\n"); + vulkan_info->EXT_descriptor_indexing = false; + } + + if (vulkan_info->EXT_descriptor_indexing && descriptor_indexing + && (descriptor_indexing->descriptorBindingUniformBufferUpdateAfterBind || descriptor_indexing->descriptorBindingUniformTexelBufferUpdateAfterBind + || descriptor_indexing->descriptorBindingStorageBufferUpdateAfterBind || descriptor_indexing->descriptorBindingStorageTexelBufferUpdateAfterBind) - && !physical_device_info->descriptor_indexing_properties.robustBufferAccessUpdateAfterBind) + && !physical_device_info->descriptor_indexing_properties.robustBufferAccessUpdateAfterBind) { WARN("Disabling robust buffer access for the update after bind feature.\n"); features->robustBufferAccess = VK_FALSE; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index a321fa4..50cff1f 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -745,21 +745,43 @@ static HRESULT vkd3d_create_descriptor_set_layout(struct d3d12_device *device, VkDescriptorSetLayoutCreateFlags flags, unsigned int binding_count, const VkDescriptorSetLayoutBinding *bindings, VkDescriptorSetLayout *set_layout) { + unsigned int i; const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; VkDescriptorSetLayoutCreateInfo set_desc; VkResult vr; + VkDescriptorSetLayoutBindingFlagsCreateInfoEXT flags_info; + VkDescriptorBindingFlagsEXT *binding_flags = NULL; set_desc.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO; set_desc.pNext = NULL; set_desc.flags = flags; set_desc.bindingCount = binding_count; set_desc.pBindings = bindings; + + if (!(flags & VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR) && device->vk_info.EXT_descriptor_indexing) + { + set_desc.flags |= VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT_EXT; + flags_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_BINDING_FLAGS_CREATE_INFO_EXT; + flags_info.pNext = NULL; + flags_info.bindingCount = binding_count; + binding_flags = vkd3d_malloc(sizeof(*binding_flags) * binding_count); + for (i = 0; i < binding_count; i++) + { + binding_flags[i] = VK_DESCRIPTOR_BINDING_UPDATE_AFTER_BIND_BIT_EXT | + VK_DESCRIPTOR_BINDING_UPDATE_UNUSED_WHILE_PENDING_BIT_EXT; + } + flags_info.pBindingFlags = binding_flags; + set_desc.pNext = &flags_info; + } + if ((vr = VK_CALL(vkCreateDescriptorSetLayout(device->vk_device, &set_desc, NULL, set_layout))) < 0) { WARN("Failed to create Vulkan descriptor set layout, vr %d.\n", vr); + vkd3d_free(binding_flags); return hresult_from_vk_result(vr); } + vkd3d_free(binding_flags); return S_OK; } diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 84b5ff2..9dd0973 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -896,13 +896,16 @@ struct vkd3d_pipeline_bindings const struct d3d12_root_signature *root_signature; VkDescriptorSet descriptor_set; + VkDescriptorSet uav_counter_descriptor_set; + VkDescriptorSet descriptor_set_bound; + VkDescriptorSet uav_counter_descriptor_set_bound; bool in_use; + bool uav_counter_in_use; D3D12_GPU_DESCRIPTOR_HANDLE descriptor_tables[D3D12_MAX_ROOT_COST]; uint64_t descriptor_table_dirty_mask; uint64_t descriptor_table_active_mask; - VkBufferView vk_uav_counter_views[VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS]; uint8_t uav_counter_dirty_mask; /* Needed when VK_KHR_push_descriptor is not available. */ @@ -911,6 +914,16 @@ struct vkd3d_pipeline_bindings uint32_t push_descriptor_active_mask; }; +struct d3d12_deferred_descriptor_set_update +{ + const struct d3d12_desc *base_descriptor; + unsigned int index; + + const struct d3d12_root_signature *root_signature; + VkDescriptorSet descriptor_set; + bool uav; +}; + /* ID3D12CommandList */ struct d3d12_command_list { @@ -954,6 +967,10 @@ struct d3d12_command_list VkBuffer so_counter_buffers[D3D12_SO_BUFFER_SLOT_COUNT]; VkDeviceSize so_counter_buffer_offsets[D3D12_SO_BUFFER_SLOT_COUNT]; + struct d3d12_deferred_descriptor_set_update *descriptor_updates; + size_t descriptor_updates_size; + size_t descriptor_updates_count; + struct vkd3d_private_store private_store; }; diff --git a/tests/d3d12.c b/tests/d3d12.c index 5284138..2c5d4be 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -16177,7 +16177,7 @@ static void test_update_descriptor_heap_after_closing_command_list(void) D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); value = get_readback_uint(&rb, 0, 0, 0); - todo ok(value == 0xff00ff00, "Got unexpected value %#x.\n", value); + ok(value == 0xff00ff00, "Got unexpected value %#x.\n", value); release_resource_readback(&rb); ID3D12DescriptorHeap_Release(cpu_heap); -- 2.17.1

2 2

[PATCH] kernel32/tests: Remove an unused assignment in the comm test.
by Francois Gouget Nov. 21, 2019

Nov. 21, 2019

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/kernel32/tests/comm.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index 97da932d6cb..a43a290947f 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -907,7 +907,6 @@ static void test_waittxempty(void) S(U(ovl_write)).Offset = 0; S(U(ovl_write)).OffsetHigh = 0; ovl_write.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); - before = GetTickCount(); SetLastError(0xdeadbeef); res = WriteFile(hcom, tbuf, sizeof(tbuf), &bytes, &ovl_write); ok((!res && GetLastError() == ERROR_IO_PENDING) || (res && bytes == sizeof(tbuf)), -- 2.20.1

2 2

[PATCH] urlmon/tests: CoInternetCombineIUri() is buggy on Windows 10 1607 to 1709.
by Francois Gouget Nov. 21, 2019

Nov. 21, 2019

It does not check the relative path and thus will accept non-sensical % codes. This is fixed in Windows 10 1809. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/urlmon/tests/uri.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 9d6af349dcc..017bc3e1956 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -10584,7 +10584,8 @@ static void test_CoInternetCombineIUri(void) { hr = pCoInternetCombineIUri(base, relative, uri_combine_tests[i].combine_flags, &result, 0); todo_wine_if(uri_combine_tests[i].todo) - ok(hr == uri_combine_tests[i].expected, + ok(hr == uri_combine_tests[i].expected || + broken(hr == S_OK && uri_combine_tests[i].expected == E_INVALIDARG) /* win10 1607 to 1709 */, "Error: CoInternetCombineIUri returned 0x%08x, expected 0x%08x on uri_combine_tests[%d].\n", hr, uri_combine_tests[i]. expected, i); if(SUCCEEDED(hr) && uri_combine_tests[i].expected) { -- 2.20.1

2 1

[PATCH] gdi32/tests: MoveToEx() does not return the old point.
by Francois Gouget Nov. 21, 2019

Nov. 21, 2019

This behavior goes back to at least Windows XP. Note that Wine depends on MoveToEx() returning the old point. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/gdi32/tests/metafile.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 6adafa37b82..3920b8c0c43 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -2262,16 +2262,15 @@ static void test_mf_Graphics(void) ok( ret, "MoveToEx error %d.\n", GetLastError()); ret = LineTo(hdcMetafile, 2, 2); ok( ret, "LineTo error %d.\n", GetLastError()); + oldpoint.x = oldpoint.y = 11235; ret = MoveToEx(hdcMetafile, 1, 1, &oldpoint); ok( ret, "MoveToEx error %d.\n", GetLastError()); - -/* oldpoint gets garbage under Win XP, so the following test would - * work under Wine but fails under Windows: - * - * ok((oldpoint.x == 2) && (oldpoint.y == 2), - * "MoveToEx: (x, y) = (%ld, %ld), should be (2, 2).\n", - * oldpoint.x, oldpoint.y); - */ + /* Windows 9x and older may have returned oldpoint as per the + * documentation, but it stopped doing so with Windows XP. + */ + ok(broken(oldpoint.x == 11235 && oldpoint.y == 11235), + "MoveToEx: oldpoint = (%d, %d), should be (11235, 11235).\n", + oldpoint.x, oldpoint.y); ret = Ellipse(hdcMetafile, 0, 0, 2, 2); ok( ret, "Ellipse error %d.\n", GetLastError()); -- 2.20.1

2 2

[PATCH] userenv/tests: Windows 10 1809 changed GetUserProfileDirectory().
by Francois Gouget Nov. 21, 2019

Nov. 21, 2019

It is no longer possible to get the required buffer size in the ANSI version, and the Unicode one requires a NULL buffer. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/userenv/tests/userenv.c | 42 +++++++++++++++++++++++++----------- 1 file changed, 30 insertions(+), 12 deletions(-) diff --git a/dlls/userenv/tests/userenv.c b/dlls/userenv/tests/userenv.c index f6cfcc79ecd..a91edeef260 100644 --- a/dlls/userenv/tests/userenv.c +++ b/dlls/userenv/tests/userenv.c @@ -303,7 +303,7 @@ static void test_get_profiles_dir(void) static void test_get_user_profile_dir(void) { BOOL ret; - DWORD error, len; + DWORD error, len, len2; HANDLE token; char *dirA; WCHAR *dirW; @@ -351,18 +351,23 @@ static void test_get_user_profile_dir(void) ret = GetUserProfileDirectoryA( token, dirA, &len ); error = GetLastError(); ok(!ret, "expected failure\n"); - ok(error == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %u\n", error); - ok(len, "expected len > 0\n"); - HeapFree( GetProcessHeap(), 0, dirA ); - - dirA = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); - SetLastError( 0xdeadbeef ); - ret = GetUserProfileDirectoryA( token, dirA, &len ); - ok(ret, "expected success %u\n", GetLastError()); - ok(len, "expected len > 0\n"); - ok(lstrlenA( dirA ) == len - 1, "length mismatch %d != %d - 1\n", lstrlenA( dirA ), len ); - trace("%s\n", dirA); HeapFree( GetProcessHeap(), 0, dirA ); + if (error == ERROR_INSUFFICIENT_BUFFER) + { + ok(len, "expected len > 0\n"); + + dirA = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); + SetLastError( 0xdeadbeef ); + ret = GetUserProfileDirectoryA( token, dirA, &len ); + ok(ret, "expected success %u\n", GetLastError()); + ok(len, "expected len > 0\n"); + ok(lstrlenA( dirA ) == len - 1, "length mismatch %d != %d - 1\n", lstrlenA( dirA ), len ); + trace("%s\n", dirA); + HeapFree( GetProcessHeap(), 0, dirA ); + } + else + ok(broken(error == ERROR_INVALID_PARAMETER) /* win10 1809+ */, + "unexpected error %u\n", error); SetLastError( 0xdeadbeef ); ret = GetUserProfileDirectoryW( NULL, NULL, NULL ); @@ -400,6 +405,19 @@ static void test_get_user_profile_dir(void) ok(lstrlenW( dirW ) == len - 1, "length mismatch %d != %d - 1\n", lstrlenW( dirW ), len ); HeapFree( GetProcessHeap(), 0, dirW ); + len2 = 0; + dirW = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 32 * sizeof(WCHAR) ); + SetLastError( 0xdeadbeef ); + ret = GetUserProfileDirectoryW( token, dirW, &len2 ); + error = GetLastError(); + ok(!ret, "expected failure\n"); + HeapFree( GetProcessHeap(), 0, dirW ); + if (error == ERROR_INSUFFICIENT_BUFFER) + ok(len2 == len, "expected %d, got %d\n", len, len2); + else + ok(broken(error == ERROR_INVALID_PARAMETER) /* win10 1809+ */, + "unexpected error %u\n", error); + CloseHandle( token ); } -- 2.20.1

1 0

[PATCH] comctl32/tests: Trace the iteration counter when a tooltips test fails.
by Francois Gouget Nov. 21, 2019

Nov. 21, 2019

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- Whenever a failure happens in a test case loop, the failure messages MUST include sufficient information to identify the test case. The simplest way to ensure this is to include the loop index in the message. Note that in this case the ExpectedCalls value is not enough to identify a specific test case. See also bug 48091. https://bugs.winehq.org/show_bug.cgi?id=48091 dlls/comctl32/tests/tooltips.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index 0cb7afd6880..082d8403b54 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -197,7 +197,7 @@ static void test_customdraw(void) { 50, 50, 300, 300, NULL, NULL, NULL, 0); - ok(parent != NULL, "Creation of main window failed\n"); + ok(parent != NULL, "%d) Creation of main window failed\n", iterationNumber); /* Make it show */ ShowWindow(parent, SW_SHOWNORMAL); @@ -209,7 +209,7 @@ static void test_customdraw(void) { CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, parent, NULL, GetModuleHandleA(NULL), 0); - ok(hwndTip != NULL, "Creation of tooltip window failed\n"); + ok(hwndTip != NULL, "%d) Creation of tooltip window failed\n", iterationNumber); /* Set up parms for the wndproc to handle */ CD_Stages = 0; @@ -230,7 +230,7 @@ static void test_customdraw(void) { toolInfo.lParam = 0xdeadbeef; GetClientRect (parent, &toolInfo.rect); ret = SendMessageA(hwndTip, TTM_ADDTOOLA, 0, (LPARAM)&toolInfo); - ok(ret, "Failed to add the tool.\n"); + ok(ret, "%d) Failed to add the tool.\n", iterationNumber); /* Make tooltip appear quickly */ SendMessageA(hwndTip, TTM_SETDELAYTIME, TTDT_INITIAL, MAKELPARAM(1,0)); @@ -245,23 +245,23 @@ static void test_customdraw(void) { /* Check CustomDraw results */ ok(CD_Stages == expectedResults[iterationNumber].ExpectedCalls || broken(CD_Stages == (expectedResults[iterationNumber].ExpectedCalls & ~TEST_CDDS_POSTPAINT)), /* nt4 */ - "CustomDraw run %d stages %x, expected %x\n", iterationNumber, CD_Stages, + "%d) CustomDraw stages %x, expected %x\n", iterationNumber, CD_Stages, expectedResults[iterationNumber].ExpectedCalls); } ret = SendMessageA(hwndTip, TTM_GETCURRENTTOOLA, 0, 0); - ok(ret, "Failed to get current tool %#lx.\n", ret); + ok(ret, "%d) Failed to get current tool %#lx.\n", iterationNumber, ret); memset(&toolInfo, 0xcc, sizeof(toolInfo)); toolInfo.cbSize = sizeof(toolInfo); toolInfo.lpszText = NULL; toolInfo.lpReserved = (void *)0xdeadbeef; SendMessageA(hwndTip, TTM_GETCURRENTTOOLA, 0, (LPARAM)&toolInfo); - ok(toolInfo.hwnd == parent, "Unexpected hwnd %p.\n", toolInfo.hwnd); - ok(toolInfo.hinst == GetModuleHandleA(NULL), "Unexpected hinst %p.\n", toolInfo.hinst); - ok(toolInfo.uId == 0x1234abcd, "Unexpected uId %lx.\n", toolInfo.uId); - ok(toolInfo.lParam == 0, "Unexpected lParam %lx.\n", toolInfo.lParam); - ok(toolInfo.lpReserved == (void *)0xdeadbeef, "Unexpected lpReserved %p.\n", toolInfo.lpReserved); + ok(toolInfo.hwnd == parent, "%d) Unexpected hwnd %p.\n", iterationNumber, toolInfo.hwnd); + ok(toolInfo.hinst == GetModuleHandleA(NULL), "%d) Unexpected hinst %p.\n", iterationNumber, toolInfo.hinst); + ok(toolInfo.uId == 0x1234abcd, "%d) Unexpected uId %lx.\n", iterationNumber, toolInfo.uId); + ok(toolInfo.lParam == 0, "%d) Unexpected lParam %lx.\n", iterationNumber, toolInfo.lParam); + ok(toolInfo.lpReserved == (void *)0xdeadbeef, "%d) Unexpected lpReserved %p.\n", iterationNumber, toolInfo.lpReserved); /* Clean up */ DestroyWindow(hwndTip); -- 2.20.1

1 0