February 2024 - Wine-Commits

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

Feb. 29, 2024

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 Feb. 29, 2024

Feb. 29, 2024

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

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

Feb. 29, 2024

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

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

Feb. 29, 2024

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

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

Feb. 29, 2024

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: Remove no longer needed spec workarounds.
by Alexandre Julliard Feb. 29, 2024

Feb. 29, 2024

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

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

Feb. 29, 2024

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 Feb. 29, 2024

Feb. 29, 2024

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

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

Feb. 29, 2024

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

Alexandre Julliard : widl: Use the official definitions for exception flags.
by Alexandre Julliard Feb. 29, 2024

Feb. 29, 2024

Module: wine Branch: master Commit: 64b2e44697b2eb70c671f43602fdd2f184841601 URL: https://gitlab.winehq.org/wine/wine/-/commit/64b2e44697b2eb70c671f43602fdd2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 28 16:25:50 2024 +0100 widl: Use the official definitions for exception flags. --- tools/widl/typegen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 195ef49f102..7abc9905069 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -5147,9 +5147,9 @@ void write_exceptions( FILE *file ) fprintf( file, "{\n"); fprintf( file, " struct __exception_frame *exc_frame = (struct __exception_frame *)frame;\n"); fprintf( file, "\n"); - fprintf( file, " if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND | EH_NESTED_CALL))\n"); + fprintf( file, " if (record->ExceptionFlags & (EXCEPTION_UNWINDING | EXCEPTION_EXIT_UNWIND | EXCEPTION_NESTED_CALL))\n"); fprintf( file, " {\n" ); - fprintf( file, " if (exc_frame->finally_level && (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)))\n"); + fprintf( file, " if (exc_frame->finally_level && (record->ExceptionFlags & (EXCEPTION_UNWINDING | EXCEPTION_EXIT_UNWIND)))\n"); fprintf( file, " {\n" ); fprintf( file, " exc_frame->abnormal_termination = 1;\n"); fprintf( file, " exc_frame->finally( exc_frame );\n");

1 0