- Wine-Commits - list.winehq.org

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

Alexandre Julliard : include: Remove the private definitions of the exception flags.
by Alexandre Julliard Feb. 29, 2024

Feb. 29, 2024

Module: wine Branch: master Commit: c67053bcce84d08731ba8363047d8bf2b643f865 URL: https://gitlab.winehq.org/wine/wine/-/commit/c67053bcce84d08731ba8363047d8b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 28 16:27:03 2024 +0100 include: Remove the private definitions of the exception flags. --- include/winternl.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/include/winternl.h b/include/winternl.h index cccbc149480..057ffcb87d8 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3866,14 +3866,6 @@ typedef struct _RTL_PROCESS_MODULE_INFORMATION_EX #define THREAD_CREATE_FLAGS_ACCESS_CHECK_IN_TARGET 0x00000020 #define THREAD_CREATE_FLAGS_INITIAL_THREAD 0x00000080 -#define EH_NONCONTINUABLE 0x01 -#define EH_UNWINDING 0x02 -#define EH_EXIT_UNWIND 0x04 -#define EH_STACK_INVALID 0x08 -#define EH_NESTED_CALL 0x10 -#define EH_TARGET_UNWIND 0x20 -#define EH_COLLIDED_UNWIND 0x40 - #ifdef __WINESRC__ /* Wine-specific exceptions codes */

1 0

Zebediah Figura : shell32: Return an initial "New" menu.
by Alexandre Julliard Feb. 29, 2024

Feb. 29, 2024

Module: wine Branch: master Commit: e564b0d775406aa3da2cc23d68ff4be28fbcdb3b URL: https://gitlab.winehq.org/wine/wine/-/commit/e564b0d775406aa3da2cc23d68ff4b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 25 23:27:51 2024 -0600 shell32: Return an initial "New" menu. --- dlls/shell32/new_menu.c | 47 +++++++++- dlls/shell32/shell32.rc | 2 + dlls/shell32/shell32_main.c | 13 +++ dlls/shell32/shell32_main.h | 2 + dlls/shell32/shlview_cmenu.c | 10 +-- dlls/shell32/shresdef.h | 2 + po/ar.po | 210 ++++++++++++++++++++++--------------------- po/ast.po | 210 ++++++++++++++++++++++--------------------- po/bg.po | 210 ++++++++++++++++++++++--------------------- po/ca.po | 210 ++++++++++++++++++++++--------------------- po/cs.po | 210 ++++++++++++++++++++++--------------------- po/da.po | 210 ++++++++++++++++++++++--------------------- po/de.po | 210 ++++++++++++++++++++++--------------------- po/el.po | 210 ++++++++++++++++++++++--------------------- po/en.po | 210 ++++++++++++++++++++++--------------------- po/en_US.po | 210 ++++++++++++++++++++++--------------------- po/eo.po | 210 ++++++++++++++++++++++--------------------- po/es.po | 210 ++++++++++++++++++++++--------------------- po/fa.po | 210 ++++++++++++++++++++++--------------------- po/fi.po | 210 ++++++++++++++++++++++--------------------- po/fr.po | 210 ++++++++++++++++++++++--------------------- po/he.po | 210 ++++++++++++++++++++++--------------------- po/hi.po | 210 ++++++++++++++++++++++--------------------- po/hr.po | 210 ++++++++++++++++++++++--------------------- po/hu.po | 210 ++++++++++++++++++++++--------------------- po/it.po | 210 ++++++++++++++++++++++--------------------- po/ja.po | 210 ++++++++++++++++++++++--------------------- po/ka.po | 210 ++++++++++++++++++++++--------------------- po/ko.po | 210 ++++++++++++++++++++++--------------------- po/lt.po | 210 ++++++++++++++++++++++--------------------- po/ml.po | 210 ++++++++++++++++++++++--------------------- po/nb_NO.po | 210 ++++++++++++++++++++++--------------------- po/nl.po | 210 ++++++++++++++++++++++--------------------- po/or.po | 210 ++++++++++++++++++++++--------------------- po/pa.po | 210 ++++++++++++++++++++++--------------------- po/pl.po | 210 ++++++++++++++++++++++--------------------- po/pt_BR.po | 210 ++++++++++++++++++++++--------------------- po/pt_PT.po | 210 ++++++++++++++++++++++--------------------- po/rm.po | 210 ++++++++++++++++++++++--------------------- po/ro.po | 210 ++++++++++++++++++++++--------------------- po/ru.po | 210 ++++++++++++++++++++++--------------------- po/si.po | 210 ++++++++++++++++++++++--------------------- po/sk.po | 210 ++++++++++++++++++++++--------------------- po/sl.po | 210 ++++++++++++++++++++++--------------------- po/sr_RS(a)cyrillic.po | 210 ++++++++++++++++++++++--------------------- po/sr_RS(a)latin.po | 210 ++++++++++++++++++++++--------------------- po/sv.po | 210 ++++++++++++++++++++++--------------------- po/ta.po | 210 ++++++++++++++++++++++--------------------- po/te.po | 210 ++++++++++++++++++++++--------------------- po/th.po | 210 ++++++++++++++++++++++--------------------- po/tr.po | 210 ++++++++++++++++++++++--------------------- po/uk.po | 210 ++++++++++++++++++++++--------------------- po/wa.po | 210 ++++++++++++++++++++++--------------------- po/wine.pot | 210 ++++++++++++++++++++++--------------------- po/zh_CN.po | 210 ++++++++++++++++++++++--------------------- po/zh_TW.po | 210 ++++++++++++++++++++++--------------------- 56 files changed, 5413 insertions(+), 5163 deletions(-)

1 0

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

Feb. 29, 2024

Module: wine Branch: master Commit: b0a7439b30d35cdbb01603546917abcd1f95a4a8 URL: https://gitlab.winehq.org/wine/wine/-/commit/b0a7439b30d35cdbb01603546917ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 28 16:25:34 2024 +0100 winedbg: Use the official definitions for exception flags. --- programs/winedbg/info.c | 2 +- programs/winedbg/tgt_active.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index 5e724afc0ed..48b783aeb3e 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -1095,7 +1095,7 @@ void info_win32_exception(void) dbg_printf("0x%08lx", rec->ExceptionCode); break; } - if (rec->ExceptionFlags & EH_STACK_INVALID) + if (rec->ExceptionFlags & EXCEPTION_STACK_INVALID) dbg_printf(", invalid program stack"); switch (addr.Mode) diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 17578857133..9587ef450d2 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -275,7 +275,7 @@ static DWORD dbg_handle_exception(const EXCEPTION_RECORD* rec, BOOL first_chance } if (first_chance && !is_debug && !DBG_IVAR(BreakOnFirstChance) && - !(rec->ExceptionFlags & EH_STACK_INVALID)) + !(rec->ExceptionFlags & EXCEPTION_STACK_INVALID)) { /* pass exception to program except for debug exceptions */ return DBG_EXCEPTION_NOT_HANDLED;

1 0

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

Feb. 29, 2024

Module: wine Branch: master Commit: 8605708e025dc1877c2b6512b612917fa247523d URL: https://gitlab.winehq.org/wine/wine/-/commit/8605708e025dc1877c2b6512b61291… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 28 16:24:53 2024 +0100 winecrt0: Use the official definitions for exception flags. --- dlls/winecrt0/exception.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winecrt0/exception.c b/dlls/winecrt0/exception.c index 3187189dd1c..58cf91172ac 100644 --- a/dlls/winecrt0/exception.c +++ b/dlls/winecrt0/exception.c @@ -100,7 +100,7 @@ DWORD __cdecl __wine_exception_handler( EXCEPTION_RECORD *record, __WINE_FRAME *wine_frame = (__WINE_FRAME *)frame; EXCEPTION_POINTERS ptrs; - if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND | EH_NESTED_CALL)) + if (record->ExceptionFlags & (EXCEPTION_UNWINDING | EXCEPTION_EXIT_UNWIND | EXCEPTION_NESTED_CALL)) return ExceptionContinueSearch; ptrs.ExceptionRecord = record; @@ -125,7 +125,7 @@ DWORD __cdecl __wine_exception_ctx_handler( EXCEPTION_RECORD *record, __WINE_FRAME *wine_frame = (__WINE_FRAME *)frame; EXCEPTION_POINTERS ptrs; - if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND | EH_NESTED_CALL)) + if (record->ExceptionFlags & (EXCEPTION_UNWINDING | EXCEPTION_EXIT_UNWIND | EXCEPTION_NESTED_CALL)) return ExceptionContinueSearch; ptrs.ExceptionRecord = record; @@ -147,7 +147,7 @@ DWORD __cdecl __wine_exception_handler_page_fault( EXCEPTION_RECORD *record, CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **pdispatcher ) { - if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND | EH_NESTED_CALL)) + if (record->ExceptionFlags & (EXCEPTION_UNWINDING | EXCEPTION_EXIT_UNWIND | EXCEPTION_NESTED_CALL)) return ExceptionContinueSearch; if (record->ExceptionCode != STATUS_ACCESS_VIOLATION) return ExceptionContinueSearch; @@ -159,7 +159,7 @@ DWORD __cdecl __wine_exception_handler_all( EXCEPTION_RECORD *record, CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **pdispatcher ) { - if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND | EH_NESTED_CALL)) + if (record->ExceptionFlags & (EXCEPTION_UNWINDING | EXCEPTION_EXIT_UNWIND | EXCEPTION_NESTED_CALL)) return ExceptionContinueSearch; unwind_frame( record, frame ); } @@ -169,7 +169,7 @@ DWORD __cdecl __wine_finally_handler( EXCEPTION_RECORD *record, CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **pdispatcher ) { - if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)) + if (record->ExceptionFlags & (EXCEPTION_UNWINDING | EXCEPTION_EXIT_UNWIND)) { __WINE_FRAME *wine_frame = (__WINE_FRAME *)frame; wine_frame->u.finally_func( FALSE ); @@ -182,7 +182,7 @@ DWORD __cdecl __wine_finally_ctx_handler( EXCEPTION_RECORD *record, CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **pdispatcher ) { - if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)) + if (record->ExceptionFlags & (EXCEPTION_UNWINDING | EXCEPTION_EXIT_UNWIND)) { __WINE_FRAME *wine_frame = (__WINE_FRAME *)frame; wine_frame->u.finally_func_ctx( FALSE, wine_frame->ctx );

1 0

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

Feb. 29, 2024

Module: wine Branch: master Commit: 3282eda5255cdd4aff7aae8fa277af2ca800c510 URL: https://gitlab.winehq.org/wine/wine/-/commit/3282eda5255cdd4aff7aae8fa277af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 28 16:24:37 2024 +0100 win32u: Use the official definitions for exception flags. --- dlls/win32u/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/main.c b/dlls/win32u/main.c index e06386da693..ace2c9d0cd3 100644 --- a/dlls/win32u/main.c +++ b/dlls/win32u/main.c @@ -2187,7 +2187,7 @@ void __cdecl __wine_spec_unimplemented_stub( const char *module, const char *fun EXCEPTION_RECORD record; record.ExceptionCode = EXCEPTION_WINE_STUB; - record.ExceptionFlags = EH_NONCONTINUABLE; + record.ExceptionFlags = EXCEPTION_NONCONTINUABLE; record.ExceptionRecord = NULL; record.ExceptionAddress = __wine_spec_unimplemented_stub; record.NumberParameters = 2;

1 0