May 2022 - Wine-Devel - list.winehq.org

[PATCH 03/13] user32: Perform Unicode conversion in SetMenuItemInfoA.

by Jacek Caban

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/menu.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 6336355691d..14ed4cb10e2 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -4824,6 +4824,7 @@ static BOOL MENU_NormalizeMenuItemInfoStruct( const MENUITEMINFOW *pmii_in, BOOL WINAPI SetMenuItemInfoA(HMENU hmenu, UINT item, BOOL bypos, const MENUITEMINFOA *lpmii) { + WCHAR *strW = NULL; MENUITEMINFOW mii; POPUPMENU *menu; UINT pos; @@ -4833,14 +4834,25 @@ BOOL WINAPI SetMenuItemInfoA(HMENU hmenu, UINT item, BOOL bypos, if (!MENU_NormalizeMenuItemInfoStruct( (const MENUITEMINFOW *)lpmii, &mii )) return FALSE; + if ((mii.fMask & MIIM_STRING) && mii.dwTypeData) + { + const char *str = (const char *)mii.dwTypeData; + UINT len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); + if (!(strW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) return FALSE; + MultiByteToWideChar( CP_ACP, 0, str, -1, strW, len ); + mii.dwTypeData = strW; + } + if (!(menu = find_menu_item(hmenu, item, bypos ? MF_BYPOSITION : 0, &pos))) { /* workaround for Word 95: pretend that SC_TASKLIST item exists */ + HeapFree( GetProcessHeap(), 0, strW ); if (item == SC_TASKLIST && !bypos) return TRUE; return FALSE; } - ret = SetMenuItemInfo_common(&menu->items[pos], &mii, FALSE); + ret = SetMenuItemInfo_common(&menu->items[pos], &mii, TRUE); release_menu_ptr(menu); + HeapFree( GetProcessHeap(), 0, strW ); return ret; } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/18

May 2, 2022

[PATCH 02/13] user32: Use MIIM_CHECKMARKS flag in InsertMenuW.

by Jacek Caban

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/menu.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index cf68aaff31b..6336355691d 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -3892,12 +3892,11 @@ BOOL WINAPI InsertMenuW( HMENU hMenu, UINT pos, UINT flags, return FALSE; MENU_mnu2mnuii( flags, id, str, &mii); + mii.fMask |= MIIM_CHECKMARKS; item = &menu->items[newpos]; ret = SetMenuItemInfo_common( item, &mii, TRUE); - if (ret) - item->hCheckBit = item->hUnCheckBit = 0; - else + if (!ret) RemoveMenu( hMenu, pos, flags ); release_menu_ptr(menu); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/18

May 2, 2022

[PATCH 01/13] user32: Use GetMenuInfo for IsMenu implementation.

by Jacek Caban

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/menu.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index cc6c5c953e9..cf68aaff31b 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -4482,19 +4482,16 @@ HMENU WINAPI LoadMenuIndirectA( LPCVOID template ) /********************************************************************** * IsMenu (USER32.@) */ -BOOL WINAPI IsMenu(HMENU hmenu) +BOOL WINAPI IsMenu( HMENU menu ) { - POPUPMENU *menu; - BOOL is_menu; - - menu = grab_menu_ptr(hmenu); - is_menu = menu != NULL; - release_menu_ptr(menu); + MENUINFO info; - if (!is_menu) - SetLastError(ERROR_INVALID_MENU_HANDLE); + info.cbSize = sizeof(info); + info.fMask = 0; + if (GetMenuInfo( menu, &info )) return TRUE; - return is_menu; + SetLastError(ERROR_INVALID_MENU_HANDLE); + return FALSE; } /********************************************************************** -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/18

May 2, 2022

[PATCH 0/13] MR18: win32u: more menu conversion

by Jacek Caban (＠jacek)

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/18

May 2, 2022

Re: [PATCH v2] ntdll: Avoid reqeuests with null pointer but invalid size.

by Alexandre Julliard

Bernhard Übelacker <bernhardu(a)mailbox.org> writes: > diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c > index cc8bf0c6e82..92b67280500 100644 > --- a/dlls/ntdll/unix/file.c > +++ b/dlls/ntdll/unix/file.c > @@ -4893,7 +4893,7 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, > { > req->code = code; > req->async = server_async( handle, &async->io, event, apc, apc_context, iosb_client_ptr(io) ); > - wine_server_add_data( req, in_buffer, in_size ); > + if (in_buffer) wine_server_add_data( req, in_buffer, in_size ); > if ((code & 3) != METHOD_BUFFERED) wine_server_add_data( req, out_buffer, out_size ); > wine_server_set_reply( req, out_buffer, out_size ); > status = virtual_locked_server_call( req ); It still doesn't make sense to silently ignore the input data. Either it's needed and it should fail without sending the request, or it's not needed and it should never be sent at all. -- Alexandre Julliard julliard(a)winehq.org

May 2, 2022

Re: MR17v1 - programs/cmd: test that read is successful before using its result

by Alexandre Julliard (＠julliard)

Alexandre Julliard (@julliard) commented about programs/cmd/builtins.c: > (lstrcmpW(fd.cFileName, L"..") != 0) && (lstrcmpW(fd.cFileName, L".") != 0)) > { > /* Allocate memory, add to list */ > - DIRECTORY_STACK *toWalk = heap_xalloc(sizeof(DIRECTORY_STACK)); > + DIRECTORY_STACK *toWalk; > + if (wcslen(dirsToWalk->dirName) + 1 + wcslen(fd.cFileName) >= MAX_PATH) > + { > + WINE_TRACE("Skipping too long path %ls\\%ls\n", dirsToWalk->dirName, fd.cFileName); You'd want to use debugstr_w() to avoid debug buffer overflows. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/17#note_522

May 2, 2022

Re: [PATCH vkd3d 6/8] vkd3d-shader/hlsl: Use a more sensible source location in add_constructor().

by Giovanni Mascellani

Hi, Il 28/04/22 20:21, Zebediah Figura ha scritto: > Note that this makes the "loc" parameter to initialize_var_components() > redundant. Right. If that's ok for you, I'd fix it in a follow up. > I think this patch makes sense, although do you happen to have an > example of an error message that's improved this way? No, not really. Ideally initialize_var_components() should never fail, except for memory allocation, for which loc doesn't make much sense any way. My idea is to keep the code "sensible" even when that isn't expected to be apparent to the user. No big deal if the patch is dropped. Giovanni.

May 2, 2022

Re: [PATCH vkd3d 5/8] vkd3d-shader/hlsl: Check argument count for constructors.

by Giovanni Mascellani

Hi, Il 28/04/22 20:21, Zebediah Figura ha scritto: > We already handle this in the caller. Right, I got confused. Please consider this patch retracted. Giovanni.

May 2, 2022

[PATCH 3/3] dwrite/opentype: Do not include base advance to the mark advance offset.

by Nikolay Sivov

This is handled later using attachment chains, after all positional features are applied. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/opentype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index f07b010baae..50e83769715 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4320,7 +4320,7 @@ static BOOL opentype_layout_apply_mark_array(struct scriptshaping_context *conte if (context->is_rtl) context->offsets[context->cur].advanceOffset = mark_x - base_x; else - context->offsets[context->cur].advanceOffset = -context->advances[glyph_pos] + base_x - mark_x; + context->offsets[context->cur].advanceOffset = base_x - mark_x; context->offsets[context->cur].ascenderOffset = base_y - mark_y; opentype_set_glyph_attach_type(context, context->cur, GLYPH_ATTACH_MARK); context->glyph_infos[context->cur].attach_chain = (int)glyph_pos - (int)context->cur; -- 2.35.1

May 2, 2022

[PATCH 2/3] dwrite/opentype: Fix incorrect MarkGlyphSets table handling.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/opentype.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 7df153e681d..f07b010baae 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -475,6 +475,13 @@ struct ot_gdef_classdef_format2 struct ot_gdef_class_range ranges[1]; }; +struct ot_gdef_markglyphsets +{ + uint16_t format; + uint16_t count; + uint32_t offsets[1]; +}; + struct gpos_gsub_header { uint16_t major_version; @@ -3762,7 +3769,7 @@ static BOOL opentype_match_coverage_func(UINT16 glyph, UINT16 glyph_data, const static BOOL opentype_layout_mark_set_covers(const struct scriptshaping_cache *cache, unsigned int set_index, UINT16 glyph) { - unsigned int format, offset = cache->gdef.markglyphsetdef, coverage_offset, set_count; + unsigned int format, offset = cache->gdef.markglyphsetdef, coverage_offset, count; if (!offset) return FALSE; @@ -3771,11 +3778,12 @@ static BOOL opentype_layout_mark_set_covers(const struct scriptshaping_cache *ca if (format == 1) { - set_count = table_read_be_word(&cache->gdef.table, offset + 2); - if (!set_count || set_index >= set_count) + count = table_read_be_word(&cache->gdef.table, offset + FIELD_OFFSET(struct ot_gdef_markglyphsets, count)); + if (!count || set_index >= count) return FALSE; - coverage_offset = table_read_be_dword(&cache->gdef.table, offset + 2 + set_index * sizeof(coverage_offset)); + coverage_offset = table_read_be_dword(&cache->gdef.table, offset + + FIELD_OFFSET(struct ot_gdef_markglyphsets, offsets[set_index])); return opentype_layout_is_glyph_covered(&cache->gdef.table, offset + coverage_offset, glyph) != GLYPH_NOT_COVERED; } else -- 2.35.1

May 2, 2022