December 2022 - Wine-GitLab

Re: [PATCH v4 0/6] MR1857: Draft: comdlg32: IFileDialog navigation bar
by Vladislav Timonin (＠vt) Dec. 28, 2022

Dec. 28, 2022

On Wed Dec 28 19:30:30 2022 +0000, Esme Povirk wrote: > I think removing items from the list like this is confusing. It also > results in the need for a special case "preserving" the first crumb in > the layout code. This is similar to what Windows does, but it indeed does complicate things a little, I'll remove it. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1857#note_20180

1 0

Re: [PATCH v4 0/6] MR1857: Draft: comdlg32: IFileDialog navigation bar
by Esme Povirk (＠madewokherd) Dec. 28, 2022

Dec. 28, 2022

I haven't yet looked at "comdlg32: Add address edit to IFileDialog navigation bar." and the commit after it, as I've hit my mental limit for the day. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1857#note_20179

1 0

Re: [PATCH v4 0/6] MR1857: Draft: comdlg32: IFileDialog navigation bar
by Esme Povirk (＠madewokherd) Dec. 28, 2022

Dec. 28, 2022

Esme Povirk (@madewokherd) commented about dlls/comdlg32/navbar.c: > while (ILRemoveLastID(pidl)); > ILFree(pidl); > > + NAVBAR_OVERFLOW_Clear(info); > + > + /* move the first crumb to overflow menu, if there are at least 2 crumbs */ > + crumb1 = LIST_ENTRY(list_head(&new_crumbs), struct crumb, entry); > + if (crumb1 && crumb1->entry.next != &new_crumbs) > + { > + NAVBAR_OVERFLOW_Insert(info, crumb1->pidl, crumb1->display_name); > + DestroyWindow(crumb1->hwnd); > + > + list_remove(&crumb1->entry); I think removing items from the list like this is confusing. It also results in the need for a special case "preserving" the first crumb in the layout code. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1857#note_20178

1 0

Re: [PATCH v4 0/6] MR1857: Draft: comdlg32: IFileDialog navigation bar
by Esme Povirk (＠madewokherd) Dec. 28, 2022

Dec. 28, 2022

Esme Povirk (@madewokherd) commented about dlls/comdlg32/navbar.c: > hwnd, 0, COMDLG32_hInstance, NULL); > SetWindowSubclass(info->background_hwnd, NAVBAR_BACKGROUND_SubclassProc, 0, (DWORD_PTR)info); > > + info->overflow_hwnd = CreateWindowExW(0, WC_BUTTONW, NULL, For accessibility it'd be good to give this button a title. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1857#note_20177

1 0

Re: [PATCH v4 0/6] MR1857: Draft: comdlg32: IFileDialog navigation bar
by Esme Povirk (＠madewokherd) Dec. 28, 2022

Dec. 28, 2022

Esme Povirk (@madewokherd) commented about dlls/comdlg32/navbar.c: > + > +static LRESULT NAVBAR_OVERFLOW_DrawIcon(HWND hwnd, NAVBAR_INFO *info, UINT msg, WPARAM wparam, LPARAM lparam) > +{ > + DRAWITEMSTRUCT *dis = (DRAWITEMSTRUCT *)lparam; > + ITEMIDLIST *pidl = (ITEMIDLIST *)dis->itemData; > + SHFILEINFOW file_info = {0}; > + IImageList *icon_list; > + > + icon_list = (IImageList *)SHGetFileInfoW((const WCHAR *)pidl, 0, &file_info, sizeof(file_info), > + SHGFI_PIDL | SHGFI_ICON | SHGFI_SMALLICON | SHGFI_SHELLICONSIZE | SHGFI_SYSICONINDEX); > + if (icon_list) > + { > + int icon_width, icon_height; > + > + IImageList_GetIconSize(icon_list, &icon_width, &icon_height); > + DrawIconEx(dis->hDC, dis->rcItem.left - (icon_width / 2), dis->rcItem.top, Drawing outside of rcItem doesn't seem right. Why is this necessary? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1857#note_20176

1 0

Re: [PATCH v4 0/6] MR1857: Draft: comdlg32: IFileDialog navigation bar
by Esme Povirk (＠madewokherd) Dec. 28, 2022

Dec. 28, 2022

Esme Povirk (@madewokherd) commented about dlls/comdlg32/navbar.c: > + menu_item.hbmpItem = HBMMENU_CALLBACK; /* see NAVBAR_OVERFLOW_DrawIcon */ > + > + InsertMenuItemW(info->overflow_menu, -1, TRUE, &menu_item); > +} > + > +static void NAVBAR_OVERFLOW_Clear(NAVBAR_INFO *info) > +{ > + INT i, menu_item_count = GetMenuItemCount(info->overflow_menu); > + MENUITEMINFOW menu_item = {0}; > + > + menu_item.cbSize = sizeof(MENUITEMINFOW); > + menu_item.fMask = MIIM_DATA; > + > + for (i = 0; i < menu_item_count; i++) > + { > + /* deleting an item shifts further indices, so don't use `i` */ It would probably be simpler to delete the items from the end, and slightly more efficient because it removes the need to shift indices. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1857#note_20175

1 0

Re: [PATCH v4 0/6] MR1857: Draft: comdlg32: IFileDialog navigation bar
by Esme Povirk (＠madewokherd) Dec. 28, 2022

Dec. 28, 2022

Esme Povirk (@madewokherd) commented about dlls/comdlg32/navbar.c: > + SendMessageW(info->fwd_btn_hwnd, WM_SETFONT, (WPARAM)gui_font, FALSE); > + icon = ImageList_GetIcon(info->icons, ILI_FORWARD, ILD_NORMAL); > + SendMessageW(info->fwd_btn_hwnd, BM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)icon); > + DestroyIcon(icon); > + > + SetWindowLongPtrW(hwnd, 0, (DWORD_PTR)info); > + > + return DefWindowProcW(hwnd, msg, wparam, lparam); > +} > + > +static LRESULT NAVBAR_Destroy(HWND hwnd, NAVBAR_INFO *info, UINT msg, WPARAM wparam, LPARAM lparam) > +{ > + SetWindowLongPtrW(hwnd, 0, 0); > + ImageList_Destroy(info->icons); > + DestroyWindow(info->back_btn_hwnd); > + DestroyWindow(info->fwd_btn_hwnd); The system will automatically destroy child windows, so I don't think this is needed. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1857#note_20174

1 0

Re: [PATCH v4 0/6] MR1857: Draft: comdlg32: IFileDialog navigation bar
by Esme Povirk (＠madewokherd) Dec. 28, 2022

Dec. 28, 2022

Esme Povirk (@madewokherd) commented about dlls/comdlg32/navbar.c: > + PAINTSTRUCT ps; > + HDC hdc = BeginPaint(hwnd, &ps); > + RECT rc; > + HBRUSH old_brush; > + HBRUSH bg_brush = GetSysColorBrush(COLOR_BTNFACE); > + HBRUSH frame_brush = GetSysColorBrush(COLOR_3DSHADOW); > + > + GetClientRect(hwnd, &rc); > + > + /* clear background to avoid border trailing when resizing */ > + FillRect(hdc, &rc, bg_brush); > + > + /* draw the 1px frame */ > + FrameRect(hdc, &rc, frame_brush); > + > + /* erase the left border, retaining the top and bottom pixels */ I think you could remove the need for this by drawing the left border outside the window. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1857#note_20173

1 0

Re: [PATCH v4 0/6] MR1857: Draft: comdlg32: IFileDialog navigation bar
by Esme Povirk (＠madewokherd) Dec. 28, 2022

Dec. 28, 2022

Esme Povirk (@madewokherd) commented about dlls/comdlg32/navbar.c: > + HWND container_hwnd; > + > + HIMAGELIST icons; > + > + HWND back_btn_hwnd; > + HWND fwd_btn_hwnd; > +} NAVBAR_INFO; > + > +static LRESULT NAVBAR_Create(HWND hwnd, NAVBAR_INFO *info, UINT msg, WPARAM wparam, LPARAM lparam) > +{ > + CREATESTRUCTW *cs = (CREATESTRUCTW*)lparam; > + INT x; > + HGDIOBJ gui_font = GetStockObject(DEFAULT_GUI_FONT); > + HICON icon; > + > + info = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(NAVBAR_INFO)); This ignores the pointer that was passed in. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1857#note_20172

1 0

[PATCH v3 0/6] MR1857: Draft: comdlg32: IFileDialog navigation bar
by Vladislav Timonin (＠vt) Dec. 28, 2022

Dec. 28, 2022

Implements navigation bar featuring: - back/forward buttons - go up button - address crumbs - hides crumbs when there's not enough space to display all of them - always shows at least 2 crumbs - truncating them if needed - first crumb is at least 56px - aligns label to the left if truncated - right clicking on the crumb, or free space, opens a menu with `Copy address as text` and `Edit address` options - reuses existing crumbs to avoid some flickering - overflow menu - first crumb is always moved here - removes the split, if there are no items in the menu - hidden crumbs are moved here - left or right click on the button starts address editing - address edit - accepts an existing path - expands environment variables, e.g. `%APPDATA%\Microsoft` -> `C:\users\%USERNAME%\AppData\Roaming\Microsoft` - errors with a `MessageBox` on nonexistent paths - refresh button - changes into go to button when editing address - DPI scaling Screenshots: ![navbar-crumbs-classic](/uploads/8c9a806b57f8e456fcbfd3cbc1ef3bb7/navbar-crumbs-classic.png) ![navbar-crumbs-light](/uploads/9c8a7acf9b55ae5ac182219edd45b65d/navbar-crumbs-light.png) ![navbar-edit-classic](/uploads/f68309bbc9200a8d8d4e3cd692179409/navbar-edit-classic.png) ![navbar-edit-light](/uploads/6798e79e6d2498a052b0ecbc2545c6e4/navbar-edit-light.png) ![navbar-120dpi-classic](/uploads/72abee382ab6171ff9c1b99a9065c845/navbar-120dpi-classic.png) ![navbar-120dpi-light](/uploads/538a030bc2028f8654d6c35d6f2825dd/navbar-120dpi-light.png) Remaining issues: - crumbs not lighting up when hovered sometimes - can be observed in current file dialog, hovering over dropdown arrow of a file type fixes it for a moment - crumbs flickering on address change sometimes - mostly when there's not enough space to display all of them - `DeferWindowPos` doesn't seem to be atomic in Wine, presumably is in native Windows? - unexpected address conversion for some PIDLs - e.g. `Desktop` -> `C:\users\%USERNAME%\Desktop`, which is an entirely different location - or `My Computer` into an empty string - known folders are not handled by address edit, e.g. `Desktop`, `My Computer` - icons are not DPI scaled - while writing this: ``` 0024:fixme:bitmap:NtGdiCreateBitmap planes = 0 0024:err:system:user_check_not_lock BUG: holding USER lock wine/dlls/win32u/sysparams.c:396: user_check_not_lock: Assertion `0' failed. wine: Assertion failed at address F7FF8549 (thread 0024), starting debugger... ``` - can't reproduce, happened when clicking on an item in overflow menu - race condition? cosmic ray? Addresses following bugs: - https://bugs.winehq.org/show_bug.cgi?id=29912 - https://bugs.winehq.org/show_bug.cgi?id=50338 - https://bugs.winehq.org/show_bug.cgi?id=51855 (partially? no search box) -- v3: comdlg32: Add refresh/go to button to IFileDialog navigation bar. comdlg32: Add address edit to IFileDialog navigation bar. comdlg32: Add breadcrumb overflow menu to IFileDialog navigation bar. comdlg32: Add address breadcrumbs to IFileDialog navigation bar. comdlg32: Add go up button to IFileDialog navigation bar. comdlg32: Add IFileDialog navigation bar. https://gitlab.winehq.org/wine/wine/-/merge_requests/1857

2 7