From: Florian Will florian.will@gmail.com
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=29912 --- dlls/comdlg32/itemdlg.c | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-)
diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 95778c2f358..256d3fe99dd 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -40,6 +40,7 @@ #define IDC_NAV_TOOLBAR 200 #define IDC_NAVBACK 201 #define IDC_NAVFORWARD 202 +#define IDC_NAVPARENTFOLDER 203
#include <initguid.h> /* This seems to be another version of IID_IFileDialogCustomize. If @@ -1895,7 +1896,8 @@ static void init_toolbar(FileDialogImpl *This, HWND hwnd) { HWND htoolbar; TBADDBITMAP tbab; - TBBUTTON button[2]; + int view_icons_index, num_toolbar_items = 2; + TBBUTTON button[4];
htoolbar = CreateWindowExW(0, TOOLBARCLASSNAMEW, NULL, TBSTYLE_FLAT | WS_CHILD | WS_VISIBLE, 0, 0, 0, 0, @@ -1905,6 +1907,9 @@ static void init_toolbar(FileDialogImpl *This, HWND hwnd) tbab.nID = IDB_HIST_LARGE_COLOR; SendMessageW(htoolbar, TB_ADDBITMAP, 0, (LPARAM)&tbab);
+ tbab.nID = IDB_VIEW_LARGE_COLOR; + view_icons_index = SendMessageW(htoolbar, TB_ADDBITMAP, 0, (LPARAM)&tbab); + button[0].iBitmap = HIST_BACK; button[0].idCommand = IDC_NAVBACK; button[0].fsState = TBSTATE_ENABLED; @@ -1919,7 +1924,26 @@ static void init_toolbar(FileDialogImpl *This, HWND hwnd) button[1].dwData = 0; button[1].iString = 0;
- SendMessageW(htoolbar, TB_ADDBUTTONSW, 2, (LPARAM)button); + if (view_icons_index >= 0) + { + button[2].iBitmap = 0; + button[2].idCommand = 0; + button[2].fsState = TBSTATE_ENABLED; + button[2].fsStyle = BTNS_SEP; + button[2].dwData = 0; + button[2].iString = 0; + + button[3].iBitmap = view_icons_index + VIEW_PARENTFOLDER; + button[3].idCommand = IDC_NAVPARENTFOLDER; + button[3].fsState = TBSTATE_ENABLED; + button[3].fsStyle = BTNS_BUTTON; + button[3].dwData = 0; + button[3].iString = 0; + + num_toolbar_items += 2; + } + + SendMessageW(htoolbar, TB_ADDBUTTONSW, num_toolbar_items, (LPARAM)button); SendMessageW(htoolbar, TB_SETBUTTONSIZE, 0, MAKELPARAM(24,24)); SendMessageW(htoolbar, TB_AUTOSIZE, 0, 0); } @@ -2160,6 +2184,13 @@ static LRESULT on_browse_forward(FileDialogImpl *This) return FALSE; }
+static LRESULT on_browse_parentfolder(FileDialogImpl *This) +{ + TRACE("%p\n", This); + IExplorerBrowser_BrowseToIDList(This->peb, NULL, SBSP_PARENT); + return FALSE; +} + static LRESULT on_command_filetype(FileDialogImpl *This, WPARAM wparam, LPARAM lparam) { if(HIWORD(wparam) == CBN_SELCHANGE) @@ -2218,6 +2249,7 @@ static LRESULT on_wm_command(FileDialogImpl *This, WPARAM wparam, LPARAM lparam) case psh1: return on_command_opendropdown(This, wparam, lparam); case IDC_NAVBACK: return on_browse_back(This); case IDC_NAVFORWARD: return on_browse_forward(This); + case IDC_NAVPARENTFOLDER: return on_browse_parentfolder(This); case IDC_FILETYPE: return on_command_filetype(This, wparam, lparam); default: TRACE("Unknown command.\n"); }