Fix experimental code

Author: jet2jet

EasySFTP/MainWnd.cpp

@@ -290,7 +290,7 @@ void CMainWindow::UpdateCurrentFolder(PCUIDLIST_RELATIVE lpidl)
 	}
 }
 
-void CMainWindow::UpdateCurrentFolderAbsolute(PCUIDLIST_ABSOLUTE lpidl, IShellFolder* pFolder)
+HRESULT CMainWindow::UpdateCurrentFolderAbsolute(PCUIDLIST_ABSOLUTE lpidl, IShellFolder* pFolder)
 {
 	HRESULT hr;
 
@@ -305,6 +305,7 @@ void CMainWindow::UpdateCurrentFolderAbsolute(PCUIDLIST_ABSOLUTE lpidl, IShellFo
 		m_wndAddress.ChangeCurrentFolder(m_wndListViewLocal.m_lpidlAbsoluteMe);
 		::SetFocus(m_wndListViewLocal);
 	}
+	return hr;
 }
 
 void CMainWindow::UpdateCurrentFolderAbsolute(LPCWSTR lpszPath)
@@ -387,7 +388,7 @@ void CMainWindow::UpdateServerFolder(PCUIDLIST_RELATIVE lpidl)
 	}
 }
 
-void CMainWindow::UpdateServerFolderAbsolute(PCUIDLIST_ABSOLUTE lpidl, IShellFolder* pFolder)
+HRESULT CMainWindow::UpdateServerFolderAbsolute(PCUIDLIST_ABSOLUTE lpidl, IShellFolder* pFolder)
 {
 	HRESULT hr;
 
@@ -403,6 +404,7 @@ void CMainWindow::UpdateServerFolderAbsolute(PCUIDLIST_ABSOLUTE lpidl, IShellFol
 		SetServerListenerToMe();
 		::SetFocus(m_wndListViewServer);
 	}
+	return hr;
 }
 
 void CMainWindow::UpdateServerFolderAbsolute(LPCWSTR lpszPath)

EasySFTP/MainWnd.h

@@ -61,6 +61,7 @@ class CMainWindow :
 		public ICommDlgBrowser,
 #endif
 		public IServiceProvider,
+		//public IOleCommandTarget,
 		public IInternetHostSecurityManager
 	{
 	public:
@@ -100,6 +101,10 @@ class CMainWindow :
 		STDMETHOD(QueryCustomPolicy)(REFGUID guidKey, BYTE** ppPolicy, DWORD* pcbPolicy,
 			BYTE* pContext, DWORD cbContext, DWORD dwReserved);
 
+		//// IOleCommandTarget
+		//STDMETHOD(QueryStatus)(const GUID* pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[], OLECMDTEXT* pCmdText);
+		//STDMETHOD(Exec)(const GUID* pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT* pvaIn, VARIANT* pvaOut);
+
 	protected:
 		LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam);
 	};
@@ -192,11 +197,11 @@ class CMainWindow :
 	UINT m_uLastStatusTextModeID;
 
 	void UpdateCurrentFolder(PCUIDLIST_RELATIVE lpidl);
-	void UpdateCurrentFolderAbsolute(PCUIDLIST_ABSOLUTE lpidl, IShellFolder* pFolder = NULL);
+	HRESULT UpdateCurrentFolderAbsolute(PCUIDLIST_ABSOLUTE lpidl, IShellFolder* pFolder = NULL);
 	void UpdateCurrentFolderAbsolute(LPCWSTR lpszPath);
 	//void UpdateServerFolder(LPCWSTR lpszPath);
 	void UpdateServerFolder(PCUIDLIST_RELATIVE lpidl);
-	void UpdateServerFolderAbsolute(PCUIDLIST_ABSOLUTE lpidl, IShellFolder* pFolder = NULL);
+	HRESULT UpdateServerFolderAbsolute(PCUIDLIST_ABSOLUTE lpidl, IShellFolder* pFolder = NULL);
 	void UpdateServerFolderAbsolute(LPCWSTR lpszPath);
 	void SetServerListenerToMe();
 	void OnChangeServerFolderFailed();

EasySFTP/MainWnd2.cpp

@@ -705,9 +705,9 @@ STDMETHODIMP CMainWindow::CBrowserLocal::OnDefaultCommand(IShellView* ppshv)
 	hr = GetSelectedIDList(ppshv, 0, NULL, &pidl);
 	if (FAILED(hr))
 		return hr;
-	This()->UpdateCurrentFolderAbsolute(pidl);
+	hr = This()->UpdateCurrentFolderAbsolute(pidl);
 	::CoTaskMemFree(pidl);
-	return S_OK;
+	return hr;
 }
 
 STDMETHODIMP CMainWindow::CBrowserLocal::OnStateChange(IShellView* ppshv, ULONG uChange)
@@ -753,23 +753,23 @@ STDMETHODIMP CMainWindow::CBrowserLocal::IncludeObject(IShellView* ppshv, PCUITE
 	PIDLIST_ABSOLUTE lp;
 	CMainWindow* pThis = This();
 
-	lp = AppendItemIDList(pThis->m_wndListViewLocal.m_lpidlAbsoluteMeCur, pidl);
+	lp = AppendItemIDList(pThis->m_wndListViewLocal.m_lpidlAbsoluteMe, pidl);
 	if (IsMyComputerIDList(lp))
 	{
 		::CoTaskMemFree(lp);
 		return S_OK;
 	}
 	::CoTaskMemFree(lp);
-	//if (pThis->m_wndListViewLocal.m_pView == ppshv)
-	{
-		SFGAOF rgf;
-		HRESULT hr;
-		hr = pThis->m_wndListViewLocal.m_pFolderCur->GetAttributesOf(1, &pidl, &rgf);
-		//if (rgf & (SFGAO_FILESYSTEM))
-			return S_OK;
-		//else
-		//	return S_FALSE;
-	}
+	////if (pThis->m_wndListViewLocal.m_pView == ppshv)
+	//{
+	//	SFGAOF rgf;
+	//	HRESULT hr;
+	//	hr = pThis->m_wndListViewLocal.m_pFolderCur->GetAttributesOf(1, &pidl, &rgf);
+	//	//if (rgf & (SFGAO_FILESYSTEM))
+	//		return S_OK;
+	//	//else
+	//	//	return S_FALSE;
+	//}
 	return S_OK;
 }
 
@@ -787,9 +787,9 @@ STDMETHODIMP CMainWindow::CBrowserServer::OnDefaultCommand(IShellView* ppshv)
 	hr = GetSelectedIDList(ppshv, 0, NULL, &pidl);
 	if (FAILED(hr))
 		return hr;
-	This()->UpdateServerFolderAbsolute(pidl);
+	hr = This()->UpdateServerFolderAbsolute(pidl);
 	::CoTaskMemFree(pidl);
-	return S_OK;
+	return hr;
 }
 
 STDMETHODIMP CMainWindow::CBrowserServer::OnStateChange(IShellView* ppshv, ULONG uChange)
@@ -835,23 +835,23 @@ STDMETHODIMP CMainWindow::CBrowserServer::IncludeObject(IShellView* ppshv, PCUIT
 	PIDLIST_ABSOLUTE lp;
 	CMainWindow* pThis = This();
 
-	lp = AppendItemIDList(pThis->m_wndListViewServer.m_lpidlAbsoluteMeCur, pidl);
+	lp = AppendItemIDList(pThis->m_wndListViewServer.m_lpidlAbsoluteMe, pidl);
 	if (IsMyComputerIDList(lp))
 	{
 		::CoTaskMemFree(lp);
 		return S_OK;
 	}
 	::CoTaskMemFree(lp);
-	//if (pThis->m_wndListViewServer.m_pView == ppshv)
-	{
-		SFGAOF rgf;
-		HRESULT hr;
-		hr = pThis->m_wndListViewServer.m_pFolderCur->GetAttributesOf(1, &pidl, &rgf);
-		//if (rgf & (SFGAO_FILESYSTEM))
-			return S_OK;
-		//else
-		//	return S_FALSE;
-	}
+	////if (pThis->m_wndListViewServer.m_pView == ppshv)
+	//{
+	//	SFGAOF rgf;
+	//	HRESULT hr;
+	//	hr = pThis->m_wndListViewServer.m_pFolderCur->GetAttributesOf(1, &pidl, &rgf);
+	//	//if (rgf & (SFGAO_FILESYSTEM))
+	//		return S_OK;
+	//	//else
+	//	//	return S_FALSE;
+	//}
 	return S_OK;
 }