Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.cpp
Modified: trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp
Modified: trunk/reactos/subsys/system/explorer/shell/shellbrowser.h
Modified: trunk/reactos/subsys/system/explorer/shell/shellfs.h
Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp
--- trunk/reactos/subsys/system/explorer/shell/mainframe.cpp 2005-04-02 22:19:12 UTC (rev 14463)
+++ trunk/reactos/subsys/system/explorer/shell/mainframe.cpp 2005-04-03 09:16:20 UTC (rev 14464)
@@ -1,5 +1,5 @@
/*
- * Copyright 2003, 2004 Martin Fuchs
+ * Copyright 2003, 2004, 2005 Martin Fuchs
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -1652,17 +1652,16 @@
void SDIMainFrame::jump_to(LPCITEMIDLIST path, int mode)
{
-/*@@todo
if (_shellBrowser.get() && (_shellpath_info._open_mode&~OWM_PIDL)==(mode&~OWM_PIDL)) {
ShellPath shell_path = path;
_shellBrowser->jump_to(shell_path);
_shellpath_info._shell_path = shell_path;
- } else */{
+ } else {
_shellpath_info._open_mode = mode;
_shellpath_info._shell_path = path;
- _shellpath_info._root_shell_path = DesktopFolderPath(); //@@
+ _shellpath_info._root_shell_path = SpecialFolderPath(CSIDL_DRIVES, _hwnd); //@@
update_shell_browser();
}
--- trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp 2005-04-02 22:19:12 UTC (rev 14463)
+++ trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp 2005-04-03 09:16:20 UTC (rev 14464)
@@ -1,5 +1,5 @@
/*
- * Copyright 2003, 2004 Martin Fuchs
+ * Copyright 2003, 2004, 2005 Martin Fuchs
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -71,7 +71,7 @@
_hWndFrame = hWndFrame;
- const String& root_name = GetDesktopFolder().get_name(_create_info._root_shell_path, SHGDN_FORPARSING);
+ const String& root_name = GetDesktopFolder().get_name(_create_info._root_shell_path, SHGDN_FORADDRESSBAR);
_root._drive_type = DRIVE_UNKNOWN;
lstrcpy(_root._volname, root_name);
--- trunk/reactos/subsys/system/explorer/shell/shellbrowser.h 2005-04-02 22:19:12 UTC (rev 14463)
+++ trunk/reactos/subsys/system/explorer/shell/shellbrowser.h 2005-04-03 09:16:20 UTC (rev 14464)
@@ -1,5 +1,5 @@
/*
- * Copyright 2003, 2004 Martin Fuchs
+ * Copyright 2003, 2004, 2005 Martin Fuchs
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -135,6 +135,9 @@
void UpdateFolderView(IShellFolder* folder);
HTREEITEM select_entry(HTREEITEM hitem, Entry* entry, bool expand=true);
+ // for SDIMainFrame
+ void jump_to(LPCITEMIDLIST pidl);
+
protected:
HWND _hwnd;
HWND _left_hwnd;
@@ -158,9 +161,6 @@
void InitializeTree(HIMAGELIST himl);
bool InitDragDrop();
-
- // for SDIMainFrame
- void jump_to(LPCITEMIDLIST pidl);
};
--- trunk/reactos/subsys/system/explorer/shell/shellfs.h 2005-04-02 22:19:12 UTC (rev 14463)
+++ trunk/reactos/subsys/system/explorer/shell/shellfs.h 2005-04-03 09:16:20 UTC (rev 14464)
@@ -1,5 +1,5 @@
/*
- * Copyright 2003, 2004 Martin Fuchs
+ * Copyright 2003, 2004, 2005 Martin Fuchs
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -58,7 +58,7 @@
{
CONTEXT("ShellDirectory::ShellDirectory()");
- lstrcpy(_data.cFileName, root_folder.get_name(shell_path, SHGDN_FORPARSING));
+ lstrcpy(_data.cFileName, root_folder.get_name(shell_path, SHGDN_FORADDRESSBAR));
_data.dwFileAttributes = FILE_ATTRIBUTE_DIRECTORY;
_shell_attribs = SFGAO_FOLDER;
--- trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp 2005-04-02 22:19:12 UTC (rev 14463)
+++ trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp 2005-04-03 09:16:20 UTC (rev 14464)
@@ -1898,7 +1898,7 @@
break;
case IDC_DRIVES:
- ///@todo exclude removeable drives
+ ///@todo exclude removable drives
CreateSubmenu(id, CSIDL_DRIVES, ResString(IDS_DRIVES));
break;