February 2024 - Wine-commits

Zebediah Figura : shell32/tests: Add a few more tests for the New menu.
by Alexandre Julliard 29 Feb '24

29 Feb '24

Module: wine Branch: master Commit: 820b5ff0d1e14c780cb9bb63d25cb9db5dd582a6 URL: https://gitlab.winehq.org/wine/wine/-/commit/820b5ff0d1e14c780cb9bb63d25cb9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 28 23:05:48 2024 -0600 shell32/tests: Add a few more tests for the New menu. --- dlls/shell32/tests/shlview.c | 89 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 79 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index 0de7f2768c1..2cacc3b8f87 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -1478,25 +1478,94 @@ if (0) static void test_newmenu(void) { - IUnknown *unk, *unk2; + CMINVOKECOMMANDINFO invoke_info = {.cbSize = sizeof(CMINVOKECOMMANDINFO)}; + IObjectWithSite *ows; + WCHAR path[MAX_PATH]; + IShellExtInit *init; + IContextMenu3 *menu; + MENUITEMINFOA info; + ITEMIDLIST *pidl; + IUnknown *unk; + HMENU hmenu; HRESULT hr; + ULONG ref; + int count; + BOOL ret; + + hmenu = CreatePopupMenu(); hr = CoCreateInstance(&CLSID_NewMenu, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); ok(hr == S_OK, "Failed to create NewMenu object, hr %#lx.\n", hr); - - hr = IUnknown_QueryInterface(unk, &IID_IShellExtInit, (void **)&unk2); + hr = IUnknown_QueryInterface(unk, &IID_IShellExtInit, (void **)&init); ok(hr == S_OK, "Failed to get IShellExtInit, hr %#lx.\n", hr); - IUnknown_Release(unk2); + hr = IUnknown_QueryInterface(unk, &IID_IContextMenu3, (void **)&menu); + ok(hr == S_OK, "Failed to get IContextMenu3, hr %#lx.\n", hr); + hr = IUnknown_QueryInterface(unk, &IID_IObjectWithSite, (void **)&ows); + ok(hr == S_OK, "Failed to get IObjectWithSite, hr %#lx.\n", hr); + + GetTempPathW(ARRAY_SIZE(path), path); + hr = SHParseDisplayName(path, NULL, &pidl, 0, NULL); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IShellExtInit_Initialize(init, NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); + + hr = IShellExtInit_Initialize(init, pidl, NULL, NULL); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IContextMenu3_QueryContextMenu(menu, hmenu, 0, 1, 1000, CMF_EXPLORE); + ok(hr == 0x40, "Got hr %#lx.\n", hr); + + count = GetMenuItemCount(hmenu); + ok(count == 1, "Got count %d.\n", count); + + info.cbSize = sizeof(info); + info.fMask = MIIM_ID | MIIM_FTYPE | MIIM_SUBMENU; + ret = GetMenuItemInfoA(hmenu, 0, TRUE, &info); + ok(ret == TRUE, "Got error %lu.\n", GetLastError()); + ok(info.wID == 1, "Got ID %u.\n", info.wID); + ok(!info.fType, "Got type %#x.\n", info.fType); + ok(!!info.hSubMenu, "Got sub-menu %p.\n", info.hSubMenu); + + invoke_info.lpVerb = (const char *)1234; + hr = IContextMenu3_InvokeCommand(menu, &invoke_info); + ok(hr == E_FAIL, "Got hr %#lx.\n", hr); - hr = IUnknown_QueryInterface(unk, &IID_IContextMenu3, (void **)&unk2); + ILFree(pidl); + IObjectWithSite_Release(ows); + IContextMenu3_Release(menu); + IShellExtInit_Release(init); + ref = IUnknown_Release(unk); + ok(!ref, "Got refcount %ld.\n", ref); + + /* Test with a virtual folder that can't create new items. */ + + hmenu = CreatePopupMenu(); + + hr = CoCreateInstance(&CLSID_NewMenu, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Failed to create NewMenu object, hr %#lx.\n", hr); + hr = IUnknown_QueryInterface(unk, &IID_IShellExtInit, (void **)&init); + ok(hr == S_OK, "Failed to get IShellExtInit, hr %#lx.\n", hr); + hr = IUnknown_QueryInterface(unk, &IID_IContextMenu3, (void **)&menu); ok(hr == S_OK, "Failed to get IContextMenu3, hr %#lx.\n", hr); - IUnknown_Release(unk2); - hr = IUnknown_QueryInterface(unk, &IID_IObjectWithSite, (void **)&unk2); - ok(hr == S_OK, "Failed to get IObjectWithSite, hr %#lx.\n", hr); - IUnknown_Release(unk2); + hr = SHGetKnownFolderIDList(&FOLDERID_ComputerFolder, 0, NULL, &pidl); + ok(hr == S_OK, "Got hr %#lx.\n", hr); - IUnknown_Release(unk); + hr = IShellExtInit_Initialize(init, pidl, NULL, NULL); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IContextMenu3_QueryContextMenu(menu, hmenu, 0, 1, 1000, CMF_EXPLORE); + ok(hr == 0, "Got hr %#lx.\n", hr); + + count = GetMenuItemCount(hmenu); + ok(!count, "Got count %d.\n", count); + + ILFree(pidl); + IContextMenu3_Release(menu); + IShellExtInit_Release(init); + ref = IUnknown_Release(unk); + ok(!ref, "Got refcount %ld.\n", ref); } static void test_folder_flags(void)

1 0

Daniel Lehman : oleaut32/tests: Add tests for IPersistStream::GetSizeMax.
by Alexandre Julliard 29 Feb '24

29 Feb '24

Module: wine Branch: master Commit: beececd101d9314b305326e6aff6e49e6f8ebab5 URL: https://gitlab.winehq.org/wine/wine/-/commit/beececd101d9314b305326e6aff6e4… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon Feb 26 22:09:16 2024 -0800 oleaut32/tests: Add tests for IPersistStream::GetSizeMax. --- dlls/oleaut32/tests/olepicture.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index c6ab4ed0a19..e340eacf272 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -1206,6 +1206,7 @@ static void test_load_save_bmp(void) LARGE_INTEGER offset; HRESULT hr; LONG size; + ULARGE_INTEGER maxsize; desc.cbSizeofstruct = sizeof(desc); desc.picType = PICTYPE_BITMAP; @@ -1251,6 +1252,13 @@ static void test_load_save_bmp(void) hr = IPicture_QueryInterface(pic, &IID_IPersistStream, (void **)&src_stream); ok(hr == S_OK, "QueryInterface error %#lx\n", hr); + maxsize.QuadPart = 0; + hr = IPersistStream_GetSizeMax(src_stream, &maxsize); + todo_wine + ok(hr == S_OK, "GetSizeMax error %#lx\n", hr); + todo_wine + ok(maxsize.QuadPart == 74, "expected 74, got %s\n", wine_dbgstr_longlong(maxsize.QuadPart)); + hr = IPersistStream_Save(src_stream, dst_stream, TRUE); ok(hr == S_OK, "Save error %#lx\n", hr); @@ -1282,6 +1290,7 @@ static void test_load_save_icon(void) LARGE_INTEGER offset; HRESULT hr; LONG size; + ULARGE_INTEGER maxsize; desc.cbSizeofstruct = sizeof(desc); desc.picType = PICTYPE_ICON; @@ -1326,6 +1335,13 @@ static void test_load_save_icon(void) hr = IPicture_QueryInterface(pic, &IID_IPersistStream, (void **)&src_stream); ok(hr == S_OK, "QueryInterface error %#lx\n", hr); + maxsize.QuadPart = 0; + hr = IPersistStream_GetSizeMax(src_stream, &maxsize); + todo_wine + ok(hr == S_OK, "GetSizeMax error %#lx\n", hr); + todo_wine + ok(maxsize.QuadPart == 774, "expected 774, got %s\n", wine_dbgstr_longlong(maxsize.QuadPart)); + hr = IPersistStream_Save(src_stream, dst_stream, TRUE); ok(hr == S_OK, "Saveerror %#lx\n", hr); @@ -1358,6 +1374,7 @@ static void test_load_save_empty_picture(void) LARGE_INTEGER offset; HRESULT hr; LONG size; + ULARGE_INTEGER maxsize; memset(&pic, 0, sizeof(pic)); desc.cbSizeofstruct = sizeof(desc); @@ -1394,6 +1411,17 @@ static void test_load_save_empty_picture(void) hr = IPicture_QueryInterface(pic, &IID_IPersistStream, (void **)&src_stream); ok(hr == S_OK, "QueryInterface error %#lx\n", hr); + maxsize.QuadPart = 0; + hr = IPersistStream_GetSizeMax(src_stream, &maxsize); + todo_wine + ok(hr == S_OK, "GetSizeMax error %#lx\n", hr); + todo_wine + ok(maxsize.QuadPart == 8, "expected 8, got %s\n", wine_dbgstr_longlong(maxsize.QuadPart)); + + hr = IPersistStream_GetSizeMax(src_stream, NULL); + todo_wine + ole_expect(hr, E_INVALIDARG); + hr = IPersistStream_Save(src_stream, dst_stream, TRUE); ok(hr == S_OK, "Save error %#lx\n", hr);

1 0

Daniel Lehman : oleaut32: Implement GetSizeMax for empty picture.
by Alexandre Julliard 29 Feb '24

29 Feb '24

Module: wine Branch: master Commit: 8c5b08d81c91f01809a52a66d498fb50e55d3bee URL: https://gitlab.winehq.org/wine/wine/-/commit/8c5b08d81c91f01809a52a66d498fb… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon Feb 26 22:09:16 2024 -0800 oleaut32: Implement GetSizeMax for empty picture. --- dlls/oleaut32/olepicture.c | 57 ++++++++++++++++++++++++++++++++++++---- dlls/oleaut32/tests/olepicture.c | 3 --- 2 files changed, 52 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 36de9c355f3..6e0db65a101 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -1836,12 +1836,59 @@ static HRESULT WINAPI OLEPictureImpl_Save( return hResult; } -static HRESULT WINAPI OLEPictureImpl_GetSizeMax( - IPersistStream* iface,ULARGE_INTEGER*pcbSize) +static HRESULT WINAPI OLEPictureImpl_GetSizeMax(IPersistStream *iface, ULARGE_INTEGER *size) { - OLEPictureImpl *This = impl_from_IPersistStream(iface); - FIXME("(%p,%p),stub!\n",This,pcbSize); - return E_NOTIMPL; + HRESULT hr = E_NOTIMPL; + OLEPictureImpl *This = impl_from_IPersistStream(iface); + unsigned int datasize = This->datalen; + + FIXME("(%p,%p), partial stub!\n", This, size); + + if (!size) + return E_INVALIDARG; + + switch (This->desc.picType) { + case PICTYPE_NONE: + hr = S_OK; + break; + case PICTYPE_ICON: + FIXME("(%p), PICTYPE_ICON not implemented!\n",This); + break; + case PICTYPE_BITMAP: + if (This->bIsDirty || !This->data) { + switch (This->keepOrigFormat ? This->loadtime_format : BITMAP_FORMAT_BMP) { + case BITMAP_FORMAT_BMP: + FIXME("(%p), PICTYPE_BITMAP (format BMP) not implemented!\n",This); + break; + case BITMAP_FORMAT_JPEG: + FIXME("(%p), PICTYPE_BITMAP (format JPEG) not implemented!\n",This); + break; + case BITMAP_FORMAT_GIF: + FIXME("(%p), PICTYPE_BITMAP (format GIF) not implemented!\n",This); + break; + case BITMAP_FORMAT_PNG: + FIXME("(%p), PICTYPE_BITMAP (format PNG) not implemented!\n",This); + break; + default: + FIXME("(%p), PICTYPE_BITMAP (format UNKNOWN, using BMP?) not implemented!\n",This); + break; + } + } + break; + case PICTYPE_METAFILE: + FIXME("(%p), PICTYPE_METAFILE not implemented!\n",This); + break; + case PICTYPE_ENHMETAFILE: + FIXME("(%p), PICTYPE_ENHMETAFILE not implemented!\n",This); + break; + default: + FIXME("(%p), [unknown type] not implemented!\n",This); + break; + } + + size->HighPart = 0; + size->LowPart = datasize + 8; + return hr; } diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index e340eacf272..a269491fd3f 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -1413,13 +1413,10 @@ static void test_load_save_empty_picture(void) maxsize.QuadPart = 0; hr = IPersistStream_GetSizeMax(src_stream, &maxsize); - todo_wine ok(hr == S_OK, "GetSizeMax error %#lx\n", hr); - todo_wine ok(maxsize.QuadPart == 8, "expected 8, got %s\n", wine_dbgstr_longlong(maxsize.QuadPart)); hr = IPersistStream_GetSizeMax(src_stream, NULL); - todo_wine ole_expect(hr, E_INVALIDARG); hr = IPersistStream_Save(src_stream, dst_stream, TRUE);

1 0

Noah Berner : comctl32/tests: Fix test that fails on Feb 29th.
by Alexandre Julliard 29 Feb '24

29 Feb '24

Module: wine Branch: master Commit: 2dcc8ec08d4a7f8d19567842cc7c0a243a4e3f94 URL: https://gitlab.winehq.org/wine/wine/-/commit/2dcc8ec08d4a7f8d19567842cc7c0a… Author: Noah Berner <noah(a)berner.io> Date: Thu Feb 29 17:03:24 2024 +0100 comctl32/tests: Fix test that fails on Feb 29th. --- dlls/comctl32/tests/monthcal.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 58060e66e35..5460e30dfc4 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -469,6 +469,7 @@ static void test_monthcal(void) ok(limits == GDTR_MIN, "got 0x%08lx\n", limits); GetSystemTime(st); + st[0].wDay = 25; st[1] = st[0]; st[1].wYear++; r = SendMessageA(hwnd, MCM_SETRANGE, 0, (LPARAM)st); @@ -480,6 +481,7 @@ static void test_monthcal(void) /* flags are 0, set min limit */ GetSystemTime(st); + st[0].wDay = 25; st[1] = st[0]; st[1].wYear++;

1 0

Jacek Caban : winevulkan: Update to VK spec version 1.3.278.
by Alexandre Julliard 29 Feb '24

29 Feb '24

Module: wine Branch: master Commit: f380e34a5e94371f691179711e6ce4697be0da61 URL: https://gitlab.winehq.org/wine/wine/-/commit/f380e34a5e94371f691179711e6ce4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 20 21:07:13 2024 +0100 winevulkan: Update to VK spec version 1.3.278. The new spec uses length attribute for some static arrays. Change is_dynamic_array to account account for that. Eventually we could use the new information to improve conversion thunks. --- dlls/winevulkan/make_vulkan | 5 +- dlls/winevulkan/vulkan_thunks.c | 192 +++++++++++++++++++++++++++++++++++----- dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 55 +++++++++++- 4 files changed, 228 insertions(+), 26 deletions(-)

1 0

Jacek Caban : winevulkan: Remove no longer needed spec workarounds.
by Alexandre Julliard 29 Feb '24

29 Feb '24

Module: wine Branch: master Commit: 7995f3813c9df22a752d59500b3a9f3e625b1fa0 URL: https://gitlab.winehq.org/wine/wine/-/commit/7995f3813c9df22a752d59500b3a9f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 20 21:26:32 2024 +0100 winevulkan: Remove no longer needed spec workarounds. --- dlls/winevulkan/make_vulkan | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 6501c7ad6c9..bf7e0f6408d 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2032,14 +2032,11 @@ class VkStruct(Sequence): # Those structs seem to be broken in spec, they are specified as # returned only, but documented as input structs. - if name in ["VkSubpassShadingPipelineCreateInfoHUAWEI", - "VkPipelineShaderStageRequiredSubgroupSizeCreateInfo"]: + if name in ["VkPipelineShaderStageRequiredSubgroupSizeCreateInfo"]: returnedonly = False # Those structs don't have returnedonly in spec, but they could (should?). - if name in ["VkSurfaceCapabilitiesPresentBarrierNV", - "VkCooperativeMatrixPropertiesNV", - "VkPerformanceValueINTEL"]: + if name in ["VkSurfaceCapabilitiesPresentBarrierNV"]: returnedonly = True structextends = struct.attrib.get("structextends")

1 0

Jacek Caban : winevulkan: Rename wine_device_memory mapping to vm_map.
by Alexandre Julliard 29 Feb '24

29 Feb '24

Module: wine Branch: master Commit: 84e462070658464576e73c8a836ccab8fb296734 URL: https://gitlab.winehq.org/wine/wine/-/commit/84e462070658464576e73c8a836cca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 21 14:28:49 2024 +0100 winevulkan: Rename wine_device_memory mapping to vm_map. To avoid conflict with handle mapping macros. --- dlls/winevulkan/vulkan.c | 12 ++++++------ dlls/winevulkan/vulkan_private.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 01d2a0c20a0..9d7498d8803 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1703,7 +1703,7 @@ VkResult wine_vkAllocateMemory(VkDevice handle, const VkMemoryAllocateInfo *allo return result; } - memory->mapping = mapping; + memory->vm_map = mapping; *ret = (VkDeviceMemory)(uintptr_t)memory; return VK_SUCCESS; } @@ -1719,10 +1719,10 @@ void wine_vkFreeMemory(VkDevice handle, VkDeviceMemory memory_handle, const VkAl device->funcs.p_vkFreeMemory(device->host_device, memory->host_memory, NULL); - if (memory->mapping) + if (memory->vm_map) { SIZE_T alloc_size = 0; - NtFreeVirtualMemory(GetCurrentProcess(), &memory->mapping, &alloc_size, MEM_RELEASE); + NtFreeVirtualMemory(GetCurrentProcess(), &memory->vm_map, &alloc_size, MEM_RELEASE); } free(memory); @@ -1751,9 +1751,9 @@ VkResult wine_vkMapMemory2KHR(VkDevice handle, const VkMemoryMapInfoKHR *map_inf VkResult result; info.memory = memory->host_memory; - if (memory->mapping) + if (memory->vm_map) { - *data = (char *)memory->mapping + info.offset; + *data = (char *)memory->vm_map + info.offset; TRACE("returning %p\n", *data); return VK_SUCCESS; } @@ -1799,7 +1799,7 @@ VkResult wine_vkUnmapMemory2KHR(VkDevice handle, const VkMemoryUnmapInfoKHR *unm struct wine_device_memory *memory = wine_device_memory_from_handle(unmap_info->memory); VkMemoryUnmapInfoKHR info; - if (memory->mapping) + if (memory->vm_map) return VK_SUCCESS; if (!device->funcs.p_vkUnmapMemory2KHR) diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index 4e4d665299f..8ef065ac514 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -175,7 +175,7 @@ static inline struct wine_cmd_pool *wine_cmd_pool_from_handle(VkCommandPool hand struct wine_device_memory { VkDeviceMemory host_memory; - void *mapping; + void *vm_map; }; static inline struct wine_device_memory *wine_device_memory_from_handle(VkDeviceMemory handle)

1 0

Jacek Caban : winevulkan: Use handle map for memory objects.
by Alexandre Julliard 29 Feb '24

29 Feb '24

Module: wine Branch: master Commit: 64914849ac42cebd6d6f6b88ae8b16d22e493184 URL: https://gitlab.winehq.org/wine/wine/-/commit/64914849ac42cebd6d6f6b88ae8b16… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 21 14:48:13 2024 +0100 winevulkan: Use handle map for memory objects. --- dlls/winevulkan/vulkan.c | 2 ++ dlls/winevulkan/vulkan_private.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 9d7498d8803..673a982548d 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1703,6 +1703,7 @@ VkResult wine_vkAllocateMemory(VkDevice handle, const VkMemoryAllocateInfo *allo return result; } + WINE_VK_ADD_NON_DISPATCHABLE_MAPPING(device->phys_dev->instance, memory, memory->host_memory, memory); memory->vm_map = mapping; *ret = (VkDeviceMemory)(uintptr_t)memory; return VK_SUCCESS; @@ -1717,6 +1718,7 @@ void wine_vkFreeMemory(VkDevice handle, VkDeviceMemory memory_handle, const VkAl return; memory = wine_device_memory_from_handle(memory_handle); + WINE_VK_REMOVE_HANDLE_MAPPING(device->phys_dev->instance, memory); device->funcs.p_vkFreeMemory(device->host_device, memory->host_memory, NULL); if (memory->vm_map) diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index 8ef065ac514..fd5d58870cc 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -176,6 +176,8 @@ struct wine_device_memory { VkDeviceMemory host_memory; void *vm_map; + + struct wine_vk_mapping mapping; }; static inline struct wine_device_memory *wine_device_memory_from_handle(VkDeviceMemory handle)

1 0

Jacek Caban : winevulkan: Refactor extra extensions handling in wine_vk_device_convert_create_info.
by Alexandre Julliard 29 Feb '24

29 Feb '24

Module: wine Branch: master Commit: d8e0c8adea7fc6201ed0c322c01ecdcb6aa98c26 URL: https://gitlab.winehq.org/wine/wine/-/commit/d8e0c8adea7fc6201ed0c322c01ecd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 21 17:25:39 2024 +0100 winevulkan: Refactor extra extensions handling in wine_vk_device_convert_create_info. --- dlls/winevulkan/vulkan.c | 37 +++++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 673a982548d..93a36f28469 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -391,10 +391,21 @@ static void wine_vk_device_get_queues(struct wine_device *device, } } +static const char *find_extension(const char *const *extensions, uint32_t count, const char *ext) +{ + while (count--) + { + if (!strcmp(extensions[count], ext)) + return extensions[count]; + } + return NULL; +} + static VkResult wine_vk_device_convert_create_info(struct wine_phys_dev *phys_dev, struct conversion_context *ctx, const VkDeviceCreateInfo *src, VkDeviceCreateInfo *dst) { - unsigned int i; + const char *extra_extensions[2], * const*extensions = src->ppEnabledExtensionNames; + unsigned int i, extra_count = 0, extensions_count = src->enabledExtensionCount; *dst = *src; @@ -402,10 +413,10 @@ static VkResult wine_vk_device_convert_create_info(struct wine_phys_dev *phys_de dst->enabledLayerCount = 0; dst->ppEnabledLayerNames = NULL; - TRACE("Enabled %u extensions.\n", dst->enabledExtensionCount); - for (i = 0; i < dst->enabledExtensionCount; i++) + TRACE("Enabled %u extensions.\n", extensions_count); + for (i = 0; i < extensions_count; i++) { - const char *extension_name = dst->ppEnabledExtensionNames[i]; + const char *extension_name = extensions[i]; TRACE("Extension %u: %s.\n", i, debugstr_a(extension_name)); if (!wine_vk_device_extension_supported(extension_name)) { @@ -415,15 +426,21 @@ static VkResult wine_vk_device_convert_create_info(struct wine_phys_dev *phys_de } if (phys_dev->external_memory_align) + { + if (!find_extension(extensions, extensions_count, "VK_KHR_external_memory")) + extra_extensions[extra_count++] = "VK_KHR_external_memory"; + if (!find_extension(extensions, extensions_count, "VK_EXT_external_memory_host")) + extra_extensions[extra_count++] = "VK_EXT_external_memory_host"; + } + + if (extra_count) { const char **new_extensions; - new_extensions = conversion_context_alloc(ctx, (dst->enabledExtensionCount + 2) * - sizeof(*dst->ppEnabledExtensionNames)); - memcpy(new_extensions, src->ppEnabledExtensionNames, - dst->enabledExtensionCount * sizeof(*dst->ppEnabledExtensionNames)); - new_extensions[dst->enabledExtensionCount++] = "VK_KHR_external_memory"; - new_extensions[dst->enabledExtensionCount++] = "VK_EXT_external_memory_host"; + dst->enabledExtensionCount += extra_count; + new_extensions = conversion_context_alloc(ctx, dst->enabledExtensionCount * sizeof(*new_extensions)); + memcpy(new_extensions, extensions, extensions_count * sizeof(*new_extensions)); + memcpy(new_extensions + extensions_count, extra_extensions, extra_count * sizeof(*new_extensions)); dst->ppEnabledExtensionNames = new_extensions; }

1 0

Alexandre Julliard : msvcp90: Use the official definitions for exception flags.
by Alexandre Julliard 29 Feb '24

29 Feb '24

Module: wine Branch: master Commit: 35ef1be8ef6fe2c4b1d7687250ddb5061adc8435 URL: https://gitlab.winehq.org/wine/wine/-/commit/35ef1be8ef6fe2c4b1d7687250ddb5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 28 16:23:57 2024 +0100 msvcp90: Use the official definitions for exception flags. --- dlls/msvcp90/exception.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index c881b37cd97..052172d2d09 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -1094,7 +1094,7 @@ static void exception_ptr_rethrow(const exception_ptr *ep) return; } - RaiseException(ep->rec->ExceptionCode, ep->rec->ExceptionFlags & (~EH_UNWINDING), + RaiseException(ep->rec->ExceptionCode, ep->rec->ExceptionFlags & ~EXCEPTION_UNWINDING, ep->rec->NumberParameters, ep->rec->ExceptionInformation); } @@ -1424,7 +1424,7 @@ void __cdecl __ExceptionPtrCopyException(exception_ptr *ep, memset(ep->rec, 0, sizeof(EXCEPTION_RECORD)); ep->rec->ExceptionCode = CXX_EXCEPTION; - ep->rec->ExceptionFlags = EH_NONCONTINUABLE; + ep->rec->ExceptionFlags = EXCEPTION_NONCONTINUABLE; ep->rec->NumberParameters = 3; ep->rec->ExceptionInformation[0] = CXX_FRAME_MAGIC_VC6; ep->rec->ExceptionInformation[2] = (ULONG_PTR)type; @@ -1462,7 +1462,7 @@ void __cdecl __ExceptionPtrCopyException(exception_ptr *ep, memset(ep->rec, 0, sizeof(EXCEPTION_RECORD)); ep->rec->ExceptionCode = CXX_EXCEPTION; - ep->rec->ExceptionFlags = EH_NONCONTINUABLE; + ep->rec->ExceptionFlags = EXCEPTION_NONCONTINUABLE; ep->rec->NumberParameters = 4; ep->rec->ExceptionInformation[0] = CXX_FRAME_MAGIC_VC6; ep->rec->ExceptionInformation[2] = (ULONG_PTR)type;

1 0