February 2024 - Wine-commits

Jacek Caban : winevulkan: Use VK_EXT_map_memory_placed for memory mapping on wow64.
by Alexandre Julliard 29 Feb '24

29 Feb '24

Module: wine Branch: master Commit: 1999e4f3f51c805a96e93fdf62bec0b200912229 URL: https://gitlab.winehq.org/wine/wine/-/commit/1999e4f3f51c805a96e93fdf62bec0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 26 20:49:51 2024 +0100 winevulkan: Use VK_EXT_map_memory_placed for memory mapping on wow64. --- dlls/winevulkan/vulkan.c | 122 +++++++++++++++++++++++++++++++++++++-- dlls/winevulkan/vulkan_private.h | 2 + 2 files changed, 119 insertions(+), 5 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 93a36f28469..0a6224476e2 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -223,6 +223,7 @@ static void wine_vk_physical_device_free(struct wine_phys_dev *phys_dev) static struct wine_phys_dev *wine_vk_physical_device_alloc(struct wine_instance *instance, VkPhysicalDevice phys_dev, VkPhysicalDevice handle) { + BOOL have_memory_placed = FALSE, have_map_memory2 = FALSE; struct wine_phys_dev *object; uint32_t num_host_properties, num_properties = 0; VkExtensionProperties *host_properties = NULL; @@ -281,6 +282,10 @@ static struct wine_phys_dev *wine_vk_physical_device_alloc(struct wine_instance } if (!strcmp(host_properties[i].extensionName, "VK_EXT_external_memory_host")) have_external_memory_host = TRUE; + else if (!strcmp(host_properties[i].extensionName, "VK_EXT_map_memory_placed")) + have_memory_placed = TRUE; + else if (!strcmp(host_properties[i].extensionName, "VK_KHR_map_memory2")) + have_map_memory2 = TRUE; } TRACE("Host supported extensions %u, Wine supported extensions %u\n", num_host_properties, num_properties); @@ -301,7 +306,38 @@ static struct wine_phys_dev *wine_vk_physical_device_alloc(struct wine_instance } object->extension_count = num_properties; - if (use_external_memory() && have_external_memory_host) + if (zero_bits && have_memory_placed && have_map_memory2) + { + VkPhysicalDeviceMapMemoryPlacedFeaturesEXT map_placed_feature = + { + .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAP_MEMORY_PLACED_FEATURES_EXT, + }; + VkPhysicalDeviceFeatures2 features = + { + .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2, + .pNext = &map_placed_feature, + }; + + instance->funcs.p_vkGetPhysicalDeviceFeatures2KHR(phys_dev, &features); + if (map_placed_feature.memoryMapPlaced && map_placed_feature.memoryUnmapReserve) + { + VkPhysicalDeviceMapMemoryPlacedPropertiesEXT map_placed_props = + { + .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAP_MEMORY_PLACED_PROPERTIES_EXT, + }; + VkPhysicalDeviceProperties2 props = + { + .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2, + .pNext = &map_placed_props, + }; + + instance->funcs.p_vkGetPhysicalDeviceProperties2(phys_dev, &props); + object->map_placed_align = map_placed_props.minPlacedMemoryMapAlignment; + TRACE( "Using placed map with alignment %u\n", object->map_placed_align ); + } + } + + if (zero_bits && have_external_memory_host && !object->map_placed_align) { VkPhysicalDeviceExternalMemoryHostPropertiesEXT host_mem_props = { @@ -425,7 +461,23 @@ static VkResult wine_vk_device_convert_create_info(struct wine_phys_dev *phys_de } } - if (phys_dev->external_memory_align) + if (phys_dev->map_placed_align) + { + VkPhysicalDeviceMapMemoryPlacedFeaturesEXT *map_placed_features; + map_placed_features = conversion_context_alloc(ctx, sizeof(*map_placed_features)); + map_placed_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAP_MEMORY_PLACED_FEATURES_EXT; + map_placed_features->pNext = (void *)dst->pNext; + map_placed_features->memoryMapPlaced = VK_TRUE; + map_placed_features->memoryMapRangePlaced = VK_FALSE; + map_placed_features->memoryUnmapReserve = VK_TRUE; + dst->pNext = map_placed_features; + + if (!find_extension(extensions, extensions_count, "VK_EXT_map_memory_placed")) + extra_extensions[extra_count++] = "VK_EXT_map_memory_placed"; + if (!find_extension(extensions, extensions_count, "VK_KHR_map_memory2")) + extra_extensions[extra_count++] = "VK_KHR_map_memory2"; + } + else if (phys_dev->external_memory_align) { if (!find_extension(extensions, extensions_count, "VK_KHR_external_memory")) extra_extensions[extra_count++] = "VK_KHR_external_memory"; @@ -1721,6 +1773,7 @@ VkResult wine_vkAllocateMemory(VkDevice handle, const VkMemoryAllocateInfo *allo } WINE_VK_ADD_NON_DISPATCHABLE_MAPPING(device->phys_dev->instance, memory, memory->host_memory, memory); + memory->size = info.allocationSize; memory->vm_map = mapping; *ret = (VkDeviceMemory)(uintptr_t)memory; return VK_SUCCESS; @@ -1735,6 +1788,17 @@ void wine_vkFreeMemory(VkDevice handle, VkDeviceMemory memory_handle, const VkAl return; memory = wine_device_memory_from_handle(memory_handle); + if (memory->vm_map && !device->phys_dev->external_memory_align) + { + const VkMemoryUnmapInfoKHR info = + { + .sType = VK_STRUCTURE_TYPE_MEMORY_UNMAP_INFO_KHR, + .memory = memory->host_memory, + .flags = VK_MEMORY_UNMAP_RESERVE_BIT_EXT, + }; + device->funcs.p_vkUnmapMemory2KHR(device->host_device, &info); + } + WINE_VK_REMOVE_HANDLE_MAPPING(device->phys_dev->instance, memory); device->funcs.p_vkFreeMemory(device->host_device, memory->host_memory, NULL); @@ -1767,6 +1831,10 @@ VkResult wine_vkMapMemory2KHR(VkDevice handle, const VkMemoryMapInfoKHR *map_inf struct wine_device *device = wine_device_from_handle(handle); struct wine_device_memory *memory = wine_device_memory_from_handle(map_info->memory); VkMemoryMapInfoKHR info = *map_info; + VkMemoryMapPlacedInfoEXT placed_info = + { + .sType = VK_STRUCTURE_TYPE_MEMORY_MAP_PLACED_INFO_EXT, + }; VkResult result; info.memory = memory->host_memory; @@ -1777,6 +1845,24 @@ VkResult wine_vkMapMemory2KHR(VkDevice handle, const VkMemoryMapInfoKHR *map_inf return VK_SUCCESS; } + if (device->phys_dev->map_placed_align) + { + SIZE_T alloc_size = memory->size; + + placed_info.pNext = info.pNext; + info.pNext = &placed_info; + info.offset = 0; + info.size = VK_WHOLE_SIZE; + info.flags |= VK_MEMORY_MAP_PLACED_BIT_EXT; + + if (NtAllocateVirtualMemory(GetCurrentProcess(), &placed_info.pPlacedAddress, zero_bits, &alloc_size, + MEM_RESERVE, PAGE_READWRITE)) + { + ERR("NtAllocateVirtualMemory failed\n"); + return VK_ERROR_OUT_OF_HOST_MEMORY; + } + } + if (device->funcs.p_vkMapMemory2KHR) { result = device->funcs.p_vkMapMemory2KHR(device->host_device, &info, data); @@ -1788,6 +1874,20 @@ VkResult wine_vkMapMemory2KHR(VkDevice handle, const VkMemoryMapInfoKHR *map_inf info.size, info.flags, data); } + if (placed_info.pPlacedAddress) + { + if (result != VK_SUCCESS) + { + SIZE_T alloc_size = 0; + ERR("vkMapMemory2EXT failed: %d\n", result); + NtFreeVirtualMemory(GetCurrentProcess(), &placed_info.pPlacedAddress, &alloc_size, MEM_RELEASE); + return result; + } + memory->vm_map = placed_info.pPlacedAddress; + *data = (char *)memory->vm_map + map_info->offset; + TRACE("Using placed mapping %p\n", memory->vm_map); + } + #ifdef _WIN64 if (NtCurrentTeb()->WowTebOffset && result == VK_SUCCESS && (UINT_PTR)*data >> 32) { @@ -1817,20 +1917,32 @@ VkResult wine_vkUnmapMemory2KHR(VkDevice handle, const VkMemoryUnmapInfoKHR *unm struct wine_device *device = wine_device_from_handle(handle); struct wine_device_memory *memory = wine_device_memory_from_handle(unmap_info->memory); VkMemoryUnmapInfoKHR info; + VkResult result; - if (memory->vm_map) + if (memory->vm_map && device->phys_dev->external_memory_align) return VK_SUCCESS; if (!device->funcs.p_vkUnmapMemory2KHR) { - assert(!unmap_info->pNext); + assert(!unmap_info->pNext && !memory->vm_map); device->funcs.p_vkUnmapMemory(device->host_device, memory->host_memory); return VK_SUCCESS; } info = *unmap_info; info.memory = memory->host_memory; - return device->funcs.p_vkUnmapMemory2KHR(device->host_device, &info); + if (memory->vm_map) + info.flags |= VK_MEMORY_UNMAP_RESERVE_BIT_EXT; + + result = device->funcs.p_vkUnmapMemory2KHR(device->host_device, &info); + + if (result == VK_SUCCESS && memory->vm_map) + { + SIZE_T size = 0; + NtFreeVirtualMemory(GetCurrentProcess(), &memory->vm_map, &size, MEM_RELEASE); + memory->vm_map = NULL; + } + return result; } VkResult wine_vkCreateBuffer(VkDevice handle, const VkBufferCreateInfo *create_info, diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index fd5d58870cc..1697298a3d0 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -130,6 +130,7 @@ struct wine_phys_dev uint32_t extension_count; uint32_t external_memory_align; + uint32_t map_placed_align; struct wine_vk_mapping mapping; }; @@ -175,6 +176,7 @@ static inline struct wine_cmd_pool *wine_cmd_pool_from_handle(VkCommandPool hand struct wine_device_memory { VkDeviceMemory host_memory; + VkDeviceSize size; void *vm_map; struct wine_vk_mapping mapping;

1 0

Paul Gofman : mciavi32: Force debug info in critical sections.
by Alexandre Julliard 29 Feb '24

29 Feb '24

Module: wine Branch: master Commit: 497992c4ea1687153525c08e243c3221a98c0a19 URL: https://gitlab.winehq.org/wine/wine/-/commit/497992c4ea1687153525c08e243c32… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Feb 28 16:29:47 2024 -0600 mciavi32: Force debug info in critical sections. --- dlls/mciavi32/mciavi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mciavi32/mciavi.c b/dlls/mciavi32/mciavi.c index 15322b9a35a..a62c791cc9c 100644 --- a/dlls/mciavi32/mciavi.c +++ b/dlls/mciavi32/mciavi.c @@ -83,7 +83,7 @@ static DWORD MCIAVI_drvOpen(LPCWSTR str, LPMCI_OPEN_DRIVER_PARMSW modp) if (!wma) return 0; - InitializeCriticalSection(&wma->cs); + InitializeCriticalSectionEx(&wma->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); wma->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": WINE_MCIAVI.cs"); wma->hStopEvent = CreateEventW(NULL, FALSE, FALSE, NULL); wma->wDevID = modp->wDeviceID;

1 0

Paul Gofman : winmm: Force debug info in critical sections.
by Alexandre Julliard 29 Feb '24

29 Feb '24

Module: wine Branch: master Commit: b466a40ffbab932a3d7b8816fbeffe0e759050c8 URL: https://gitlab.winehq.org/wine/wine/-/commit/b466a40ffbab932a3d7b8816fbeffe… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Feb 28 16:31:15 2024 -0600 winmm: Force debug info in critical sections. --- dlls/winmm/waveform.c | 4 ++-- dlls/winmm/winmm.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 8c0cc4d879c..f7fe81710e0 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -261,7 +261,7 @@ static inline void WINMM_DecomposeHWAVE(HWAVE hwave, UINT *mmdevice_index, static void WINMM_InitDevice(WINMM_Device *device) { - InitializeCriticalSection(&device->lock); + InitializeCriticalSectionEx(&device->lock, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); device->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": WINMM_Device.lock"); } @@ -549,7 +549,7 @@ static HRESULT WINMM_InitMMDevice(EDataFlow flow, IMMDevice *device, dev->index = index; - InitializeCriticalSection(&dev->lock); + InitializeCriticalSectionEx(&dev->lock, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); dev->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": WINMM_Device.lock"); return S_OK; diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 033a9b3cd29..73050e0affb 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -1408,7 +1408,7 @@ MMRESULT WINAPI midiStreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID, return ret; } - InitializeCriticalSection(&lpMidiStrm->lock); + InitializeCriticalSectionEx(&lpMidiStrm->lock, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); lpMidiStrm->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": WINMM_MidiStream.lock"); lpMidiStrm->hEvent = CreateEventW(NULL, FALSE, FALSE, NULL);

1 0

Paul Gofman : winebus.sys: Force debug info in critical sections.
by Alexandre Julliard 29 Feb '24

29 Feb '24

Module: wine Branch: master Commit: ee5828da6a4f4905151846c4c8abef65bbc20e13 URL: https://gitlab.winehq.org/wine/wine/-/commit/ee5828da6a4f4905151846c4c8abef… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Feb 28 16:31:48 2024 -0600 winebus.sys: Force debug info in critical sections. --- dlls/winebus.sys/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index fa0a9a998d7..dceba4747b8 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -315,7 +315,7 @@ static DEVICE_OBJECT *bus_create_hid_device(struct device_desc *desc, UINT64 uni ext->unix_device = unix_device; list_init(&ext->reports); - InitializeCriticalSection(&ext->cs); + InitializeCriticalSectionEx(&ext->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); ext->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": cs"); /* add to list of pnp devices */

1 0

Paul Gofman : windows.security.credentials.ui.userconsentverifier: Force debug info in critical sections.
by Alexandre Julliard 29 Feb '24

29 Feb '24

Module: wine Branch: master Commit: c064fdeb8d57a819080564f9d3f16e58eb496ddd URL: https://gitlab.winehq.org/wine/wine/-/commit/c064fdeb8d57a819080564f9d3f16e… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Feb 28 16:32:21 2024 -0600 windows.security.credentials.ui.userconsentverifier: Force debug info in critical sections. --- dlls/windows.security.credentials.ui.userconsentverifier/async.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windows.security.credentials.ui.userconsentverifier/async.c b/dlls/windows.security.credentials.ui.userconsentverifier/async.c index aba1a02dc96..89edb50ce3c 100644 --- a/dlls/windows.security.credentials.ui.userconsentverifier/async.c +++ b/dlls/windows.security.credentials.ui.userconsentverifier/async.c @@ -354,7 +354,7 @@ static HRESULT async_info_create( IUnknown *invoker, IUnknown *param, async_oper if ((impl->invoker = invoker)) IUnknown_AddRef( impl->invoker ); if ((impl->param = param)) IUnknown_AddRef( impl->param ); - InitializeCriticalSection( &impl->cs ); + InitializeCriticalSectionEx( &impl->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); impl->cs.DebugInfo->Spare[0] = (DWORD_PTR)( __FILE__ ": async_info.cs" ); *out = &impl->IWineAsyncInfoImpl_iface;

1 0

Paul Gofman : amstream: Avoid leaking critical section debug info in filter_Release().
by Alexandre Julliard 29 Feb '24

29 Feb '24

Module: wine Branch: master Commit: ce2457d5a9f4356b1c62317b2af5ef582b6607b2 URL: https://gitlab.winehq.org/wine/wine/-/commit/ce2457d5a9f4356b1c62317b2af5ef… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Feb 28 16:37:05 2024 -0600 amstream: Avoid leaking critical section debug info in filter_Release(). --- dlls/amstream/filter.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c index 0ca0f2e2a1c..dbd6fb4f0d2 100644 --- a/dlls/amstream/filter.c +++ b/dlls/amstream/filter.c @@ -254,6 +254,8 @@ static ULONG WINAPI filter_Release(IMediaStreamFilter *iface) free(filter->streams); if (filter->clock) IReferenceClock_Release(filter->clock); + if (filter->cs.DebugInfo) + filter->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&filter->cs); free(filter); }

1 0

Paul Gofman : amstream: Force debug info in critical sections.
by Alexandre Julliard 29 Feb '24

29 Feb '24

Module: wine Branch: master Commit: 1d3b312f225f79bec74d3d265128ead455467e2a URL: https://gitlab.winehq.org/wine/wine/-/commit/1d3b312f225f79bec74d3d265128ea… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Feb 28 16:33:23 2024 -0600 amstream: Force debug info in critical sections. --- dlls/amstream/filter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c index dbd6fb4f0d2..8a7e4fc372c 100644 --- a/dlls/amstream/filter.c +++ b/dlls/amstream/filter.c @@ -1102,7 +1102,7 @@ HRESULT filter_create(IUnknown *outer, void **out) object->refcount = 1; list_init(&object->free_events); list_init(&object->used_events); - InitializeCriticalSection(&object->cs); + InitializeCriticalSectionEx(&object->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); object->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": MediaStreamFilter.cs"); TRACE("Created media stream filter %p.\n", object);

1 0

Zebediah Figura : wine.inf: Add ShellNew registry entries for Folder.
by Alexandre Julliard 29 Feb '24

29 Feb '24

Module: wine Branch: master Commit: 227408c4fc894bc0e42290d719025dd91222c221 URL: https://gitlab.winehq.org/wine/wine/-/commit/227408c4fc894bc0e42290d719025d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 26 23:10:58 2024 -0600 wine.inf: Add ShellNew registry entries for Folder. --- dlls/shell32/shell32.rc | 2 ++ dlls/shell32/shresdef.h | 1 + loader/wine.inf.in | 3 ++ po/ar.po | 94 ++++++++++++++++++++++++------------------------- po/ast.po | 94 ++++++++++++++++++++++++------------------------- po/bg.po | 94 ++++++++++++++++++++++++------------------------- po/ca.po | 94 ++++++++++++++++++++++++------------------------- po/cs.po | 94 ++++++++++++++++++++++++------------------------- po/da.po | 94 ++++++++++++++++++++++++------------------------- po/de.po | 94 ++++++++++++++++++++++++------------------------- po/el.po | 94 ++++++++++++++++++++++++------------------------- po/en.po | 94 ++++++++++++++++++++++++------------------------- po/en_US.po | 94 ++++++++++++++++++++++++------------------------- po/eo.po | 94 ++++++++++++++++++++++++------------------------- po/es.po | 94 ++++++++++++++++++++++++------------------------- po/fa.po | 94 ++++++++++++++++++++++++------------------------- po/fi.po | 94 ++++++++++++++++++++++++------------------------- po/fr.po | 94 ++++++++++++++++++++++++------------------------- po/he.po | 94 ++++++++++++++++++++++++------------------------- po/hi.po | 94 ++++++++++++++++++++++++------------------------- po/hr.po | 94 ++++++++++++++++++++++++------------------------- po/hu.po | 94 ++++++++++++++++++++++++------------------------- po/it.po | 94 ++++++++++++++++++++++++------------------------- po/ja.po | 94 ++++++++++++++++++++++++------------------------- po/ka.po | 94 ++++++++++++++++++++++++------------------------- po/ko.po | 94 ++++++++++++++++++++++++------------------------- po/lt.po | 94 ++++++++++++++++++++++++------------------------- po/ml.po | 94 ++++++++++++++++++++++++------------------------- po/nb_NO.po | 94 ++++++++++++++++++++++++------------------------- po/nl.po | 94 ++++++++++++++++++++++++------------------------- po/or.po | 94 ++++++++++++++++++++++++------------------------- po/pa.po | 94 ++++++++++++++++++++++++------------------------- po/pl.po | 94 ++++++++++++++++++++++++------------------------- po/pt_BR.po | 94 ++++++++++++++++++++++++------------------------- po/pt_PT.po | 94 ++++++++++++++++++++++++------------------------- po/rm.po | 94 ++++++++++++++++++++++++------------------------- po/ro.po | 94 ++++++++++++++++++++++++------------------------- po/ru.po | 94 ++++++++++++++++++++++++------------------------- po/si.po | 94 ++++++++++++++++++++++++------------------------- po/sk.po | 94 ++++++++++++++++++++++++------------------------- po/sl.po | 94 ++++++++++++++++++++++++------------------------- po/sr_RS(a)cyrillic.po | 94 ++++++++++++++++++++++++------------------------- po/sr_RS(a)latin.po | 94 ++++++++++++++++++++++++------------------------- po/sv.po | 94 ++++++++++++++++++++++++------------------------- po/ta.po | 94 ++++++++++++++++++++++++------------------------- po/te.po | 94 ++++++++++++++++++++++++------------------------- po/th.po | 94 ++++++++++++++++++++++++------------------------- po/tr.po | 94 ++++++++++++++++++++++++------------------------- po/uk.po | 94 ++++++++++++++++++++++++------------------------- po/wa.po | 94 ++++++++++++++++++++++++------------------------- po/wine.pot | 94 ++++++++++++++++++++++++------------------------- po/zh_CN.po | 94 ++++++++++++++++++++++++------------------------- po/zh_TW.po | 94 ++++++++++++++++++++++++------------------------- 53 files changed, 2356 insertions(+), 2350 deletions(-)

1 0

Zebediah Figura : shell32: Enumerate the ShellNew key for Folder.
by Alexandre Julliard 29 Feb '24

29 Feb '24

Module: wine Branch: master Commit: c2ee8627ff6f8bed6623440003cafb074812a9a0 URL: https://gitlab.winehq.org/wine/wine/-/commit/c2ee8627ff6f8bed6623440003cafb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 26 23:13:01 2024 -0600 shell32: Enumerate the ShellNew key for Folder. --- dlls/shell32/new_menu.c | 97 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) diff --git a/dlls/shell32/new_menu.c b/dlls/shell32/new_menu.c index 6a4d54e1b73..fbbf42ee0a1 100644 --- a/dlls/shell32/new_menu.c +++ b/dlls/shell32/new_menu.c @@ -35,6 +35,12 @@ struct new_menu IObjectWithSite IObjectWithSite_iface; LONG refcount; + struct + { + WCHAR *name; + } *items; + size_t item_count; + ITEMIDLIST *pidl; }; @@ -87,6 +93,9 @@ static ULONG WINAPI ext_init_Release(IShellExtInit *iface) if (!refcount) { + for (unsigned int i = 0; i < menu->item_count; ++i) + free(menu->items[i].name); + free(menu->items); ILFree(menu->pidl); free(menu); } @@ -141,6 +150,84 @@ static ULONG WINAPI context_menu_Release(IContextMenu3 *iface) return IShellExtInit_Release(&menu->IShellExtInit_iface); } +static WCHAR *load_mui_string(HKEY key, const WCHAR *value) +{ + WCHAR *string; + DWORD size; + + if (RegLoadMUIStringW(key, value, NULL, 0, &size, 0, NULL) != ERROR_MORE_DATA) + return NULL; + string = malloc(size + sizeof(WCHAR)); + RegLoadMUIStringW(key, value, string, size + sizeof(WCHAR), NULL, 0, NULL); + string[size / sizeof(WCHAR)] = 0; + return string; +} + +static void add_menu_item(struct new_menu *menu, HMENU hmenu, const WCHAR *ext, UINT id) +{ + HKEY ext_key, shellnew_key, config_key; + WCHAR *menu_text, *item_name; + MENUITEMINFOW info; + DWORD ret; + + if ((ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, ext, 0, KEY_READ, &ext_key))) + { + ERR("Failed to open %s, error %lu.\n", debugstr_w(ext), ret); + return; + } + + if ((ret = RegOpenKeyExW(ext_key, L"ShellNew", 0, KEY_READ, &shellnew_key))) + { + ERR("Failed to open ShellNew key, error %lu.\n", ret); + RegCloseKey(ext_key); + return; + } + RegCloseKey(ext_key); + + if (RegQueryValueExW(shellnew_key, L"Directory", NULL, NULL, NULL, NULL)) + { + FIXME("Ignoring non-directory item for extension %s.\n", debugstr_w(ext)); + RegCloseKey(shellnew_key); + return; + } + + if (!RegOpenKeyExW(shellnew_key, L"Config", 0, KEY_READ, &config_key)) + { + FIXME("Ignoring Config key for extension %s.\n", debugstr_w(ext)); + RegCloseKey(config_key); + } + + if (!(item_name = load_mui_string(shellnew_key, L"ItemName"))) + { + ERR("Missing ItemName value for extension %s.\n", debugstr_w(ext)); + RegCloseKey(shellnew_key); + return; + } + + if (!(menu_text = load_mui_string(shellnew_key, L"MenuText"))) + { + ERR("Missing MenuText value for extension %s.\n", debugstr_w(ext)); + free(item_name); + RegCloseKey(shellnew_key); + return; + } + + info.cbSize = sizeof(info); + info.fMask = MIIM_ID | MIIM_FTYPE | MIIM_STATE | MIIM_STRING; + info.dwTypeData = menu_text; + info.fState = MFS_ENABLED; + info.wID = id; + info.fType = MFT_STRING; + InsertMenuItemW(hmenu, menu->item_count, MF_BYPOSITION, &info); + + menu->items = realloc(menu->items, (menu->item_count + 1) * sizeof(*menu->items)); + menu->items[menu->item_count].name = item_name; + ++menu->item_count; + + free(menu_text); + RegCloseKey(shellnew_key); +} + static HRESULT WINAPI context_menu_QueryContextMenu(IContextMenu3 *iface, HMENU hmenu, UINT index, UINT min_id, UINT max_id, UINT flags) { @@ -161,6 +248,16 @@ static HRESULT WINAPI context_menu_QueryContextMenu(IContextMenu3 *iface, submenu = CreatePopupMenu(); new_string = shell_get_resource_string(IDS_NEW_MENU); + /* Native apparently hardcodes "Folder" and "Briefcase". + * The remaining entries come from scanning all extension registry keys + * (not the file types). Then, for e.g. .txt, it looks up a ShellNew key in + * both .txt/txtfile [possibly an accident] and .txt itself. + * + * FIXME: For now only implement Folder. We don't currently have any other + * builtin verbs anyway. */ + + add_menu_item(menu, submenu, L"Folder", min_id + 1); + info.cbSize = sizeof(info); info.fMask = MIIM_ID | MIIM_FTYPE | MIIM_STATE | MIIM_STRING | MIIM_SUBMENU; info.dwTypeData = new_string;

1 0

Zebediah Figura : shell32: Implement InvokeCommand() for the new menu.
by Alexandre Julliard 29 Feb '24

29 Feb '24

Module: wine Branch: master Commit: 9d9c3960efc47a007ac73144118ed0d9ad24974c URL: https://gitlab.winehq.org/wine/wine/-/commit/9d9c3960efc47a007ac73144118ed0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 26 23:13:23 2024 -0600 shell32: Implement InvokeCommand() for the new menu. --- dlls/shell32/new_menu.c | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/new_menu.c b/dlls/shell32/new_menu.c index fbbf42ee0a1..95d0bd90679 100644 --- a/dlls/shell32/new_menu.c +++ b/dlls/shell32/new_menu.c @@ -275,9 +275,41 @@ static HRESULT WINAPI context_menu_QueryContextMenu(IContextMenu3 *iface, static HRESULT WINAPI context_menu_InvokeCommand(IContextMenu3 *iface, CMINVOKECOMMANDINFO *info) { - FIXME("iface %p, info %p, stub!\n", iface, info); + struct new_menu *menu = impl_from_IContextMenu3(iface); + WCHAR path[MAX_PATH], name[MAX_PATH]; + unsigned int id; - return E_NOTIMPL; + TRACE("menu %p, info %p.\n", menu, info); + + id = (UINT_PTR)info->lpVerb - 1; + + if (id >= menu->item_count) + { + ERR("Invalid verb %p.\n", info->lpVerb); + return E_FAIL; + } + + if (!SHGetPathFromIDListW(menu->pidl, path)) + { + ERR("Failed to get path.\n"); + return E_FAIL; + } + + for (unsigned int i = 0;; ++i) + { + if (!i) + swprintf(name, ARRAY_SIZE(name), L"%s/%s", path, menu->items[id].name); + else + swprintf(name, ARRAY_SIZE(name), L"%s/%s (%u)", path, menu->items[id].name, i); + + if (CreateDirectoryW(name, NULL)) + return S_OK; + if (GetLastError() != ERROR_ALREADY_EXISTS) + { + WARN("Failed to create %s, error %lu.\n", debugstr_w(name), GetLastError()); + return HRESULT_FROM_WIN32(GetLastError()); + } + } } static HRESULT WINAPI context_menu_GetCommandString(IContextMenu3 *iface,

1 0