From 655eff3fef5fca3a52798e9b8708061c5deb2bbb Mon Sep 17 00:00:00 2001 From: Martin Fuchs Date: Sun, 14 Mar 2004 12:11:19 +0000 Subject: [PATCH] move create_absolute_pidl() member function implementation from Enry into WinEntry svn path=/branches/lean-explorer/; revision=8707 --- reactos/subsys/system/explorer/shell/entries.cpp | 13 ------------- reactos/subsys/system/explorer/shell/entries.h | 2 +- reactos/subsys/system/explorer/shell/winfs.cpp | 12 ++++++++++++ reactos/subsys/system/explorer/shell/winfs.h | 1 + 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/reactos/subsys/system/explorer/shell/entries.cpp b/reactos/subsys/system/explorer/shell/entries.cpp index eda33e3cb8a..0f89dbcc39a 100644 --- a/reactos/subsys/system/explorer/shell/entries.cpp +++ b/reactos/subsys/system/explorer/shell/entries.cpp @@ -315,19 +315,6 @@ void Entry::smart_scan(int scan_flags) } -ShellPath Entry::create_absolute_pidl() const -{ - CONTEXT("Entry::create_absolute_pidl()"); - - TCHAR path[MAX_PATH]; - - if (get_path(path)) - return ShellPath(path); - - return ShellPath(); -} - - void Entry::extract_icon() { TCHAR path[MAX_PATH]; diff --git a/reactos/subsys/system/explorer/shell/entries.h b/reactos/subsys/system/explorer/shell/entries.h index a17e2719ca5..7d5565fa6b0 100644 --- a/reactos/subsys/system/explorer/shell/entries.h +++ b/reactos/subsys/system/explorer/shell/entries.h @@ -102,7 +102,7 @@ public: virtual const void* get_next_path_component(const void*) {return NULL;} virtual Entry* find_entry(const void*) {return NULL;} virtual bool get_path(PTSTR path) const = 0; - virtual ShellPath create_absolute_pidl() const; + virtual ShellPath create_absolute_pidl() const {return (LPCITEMIDLIST)NULL;} virtual HRESULT GetUIObjectOf(HWND hWnd, REFIID riid, LPVOID* ppvOut); virtual BOOL launch_entry(HWND hwnd, UINT nCmdShow=SW_SHOWNORMAL); }; diff --git a/reactos/subsys/system/explorer/shell/winfs.cpp b/reactos/subsys/system/explorer/shell/winfs.cpp index f555b0becb2..0c050a18ee6 100644 --- a/reactos/subsys/system/explorer/shell/winfs.cpp +++ b/reactos/subsys/system/explorer/shell/winfs.cpp @@ -189,3 +189,15 @@ bool WinEntry::get_path(PTSTR path) const return true; } + +ShellPath WinEntry::create_absolute_pidl() const +{ + CONTEXT("WinEntry::create_absolute_pidl()"); + + TCHAR path[MAX_PATH]; + + if (get_path(path)) + return ShellPath(path); + + return ShellPath(); +} diff --git a/reactos/subsys/system/explorer/shell/winfs.h b/reactos/subsys/system/explorer/shell/winfs.h index 529be7f86d1..9bb47da6527 100644 --- a/reactos/subsys/system/explorer/shell/winfs.h +++ b/reactos/subsys/system/explorer/shell/winfs.h @@ -35,6 +35,7 @@ protected: WinEntry() : Entry(ET_WINDOWS) {} virtual bool get_path(PTSTR path) const; + virtual ShellPath create_absolute_pidl() const; };