Index: src/ch/FolderDialog.cpp
===================================================================
diff -u -r4797e4b6b266900bfdcdf4ca6eda47c216ad9db1 -r9ddf8fdd5f641491dd30c49eb90f8f740314b6af
--- src/ch/FolderDialog.cpp	(.../FolderDialog.cpp)	(revision 4797e4b6b266900bfdcdf4ca6eda47c216ad9db1)
+++ src/ch/FolderDialog.cpp	(.../FolderDialog.cpp)	(revision 9ddf8fdd5f641491dd30c49eb90f8f740314b6af)
@@ -24,7 +24,6 @@
 #include "Theme Helpers.h"
 #include "shlobj.h"
 #include "StringHelpers.h"
-#include "FileSupport.h"
 #include "TRecentPathsTools.h"
 #include "resource.h"
 #include "shortcuts.h"
@@ -35,7 +34,7 @@
 static char THIS_FILE[] = __FILE__;
 #endif
 
-// dialog jako taki
+// dialog template
 const unsigned long __g_DlgTemplate[]={ 
 	0x82cf0040, 0x00000000, 0x00000000, 0x011b0000, 0x000000b4, 0x00000000, 0x00540008, 0x00680061, 
 	0x006d006f, 0x00000061 };
@@ -108,14 +107,14 @@
 LRESULT CALLBACK EditWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
 	return InternalWindowProc(__g_pfEdit, hwnd, uMsg, wParam, lParam);
-};
+}
 
 ////////////////////////////////////////////////////////////////////////////
 // procedure for combo box contained in comboboxex
 LRESULT CALLBACK ComboWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
 	return InternalWindowProc(__g_pfBaseCombo, hwnd, uMsg, wParam, lParam);
-};
+}
 
 ////////////////////////////////////////////////////////////////////////////
 // other visual elements' window proc
@@ -149,8 +148,9 @@
 /////////////////////////////////////////////////////////////////////////////
 // CFolderDialog dialog
 
-CFolderDialog::CFolderDialog(CWnd* /*pParent*/ /*=nullptr*/)
-				:ictranslate::CLanguageDialog()
+CFolderDialog::CFolderDialog(CWnd* /*pParent*/ /*=nullptr*/) :
+	ictranslate::CLanguageDialog(),
+	m_fsLocal(GetLogFileData())
 {
 	m_hImages=nullptr;
 	m_hLargeImages=nullptr;
@@ -200,7 +200,7 @@
 	CRect rc(0, 0, 0, 0);
 
 	if (!m_ctlTitle.Create(_T(""), WS_CHILD | WS_VISIBLE, rc, this, IDC_TITLE_STATIC) ||
-		(__g_pfStatic=(WNDPROC)SetWindowLongPtr(m_ctlTitle.GetSafeHwnd(), GWLP_WNDPROC, (LONG_PTR)CustomWindowProc)) == 0)
+		(__g_pfStatic=(WNDPROC)SetWindowLongPtr(m_ctlTitle.GetSafeHwnd(), GWLP_WNDPROC, (LONG_PTR)CustomWindowProc)) == nullptr)
 	{
 		TRACE("Error creating control...");
 		return -1;
@@ -245,7 +245,7 @@
 
 	// listview
 	if (!m_ctlShortcuts.Create(WS_CHILD | WS_VISIBLE | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_EDITLABELS | WS_TABSTOP | LVS_SMALLICON | LVS_SHOWSELALWAYS, rc, this, IDC_SHORTCUT_LIST) ||
-		(__g_pfList=(WNDPROC)SetWindowLongPtr(m_ctlShortcuts.GetSafeHwnd(), GWLP_WNDPROC, (LONG_PTR)CustomWindowProc)) == 0)
+		(__g_pfList=(WNDPROC)SetWindowLongPtr(m_ctlShortcuts.GetSafeHwnd(), GWLP_WNDPROC, (LONG_PTR)CustomWindowProc)) == nullptr)
 	{
 		TRACE("Error creating control...");
 		return -1;
@@ -266,22 +266,22 @@
 	// combobox
 	rc.bottom=rc.top+200;
 	if (!m_ctlPath.Create(WS_CHILD | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN | CBS_SORT | CBS_OWNERDRAWFIXED | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, rc, this, IDC_PATH_COMBOBOXEX) ||
-		(__g_pfCombo=(WNDPROC)SetWindowLongPtr(m_ctlPath.GetSafeHwnd(), GWLP_WNDPROC, (LONG_PTR)CustomWindowProc)) == 0)
+		(__g_pfCombo=(WNDPROC)SetWindowLongPtr(m_ctlPath.GetSafeHwnd(), GWLP_WNDPROC, (LONG_PTR)CustomWindowProc)) == nullptr)
 	{
 		TRACE("Error creating control...");
 		return -1;
 	}
 	HWND hCombo=(HWND)m_ctlPath.SendMessage(CBEM_GETCOMBOCONTROL, 0, 0);
-	if ((__g_pfBaseCombo=(WNDPROC)SetWindowLongPtr(hCombo, GWLP_WNDPROC, (LONG_PTR)ComboWindowProc)) == 0)
+	if ((__g_pfBaseCombo=(WNDPROC)SetWindowLongPtr(hCombo, GWLP_WNDPROC, (LONG_PTR)ComboWindowProc)) == nullptr)
 		return -1;
 	HWND hEdit=(HWND)m_ctlPath.SendMessage(CBEM_GETEDITCONTROL, 0, 0);
-	if ((__g_pfEdit=(WNDPROC)SetWindowLongPtr(hEdit, GWLP_WNDPROC, (LONG_PTR)EditWindowProc)) == 0)
+	if ((__g_pfEdit=(WNDPROC)SetWindowLongPtr(hEdit, GWLP_WNDPROC, (LONG_PTR)EditWindowProc)) == nullptr)
 		return -1;
 
 	// buttons OK & Cancel
 	rc.bottom=rc.top;
 	if (!m_ctlOk.Create(_T(""), WS_CHILD | WS_VISIBLE | BS_DEFPUSHBUTTON, rc, this, IDOK) ||
-		(__g_pfButton=(WNDPROC)SetWindowLongPtr(m_ctlOk.GetSafeHwnd(), GWLP_WNDPROC, (LONG_PTR)CustomWindowProc)) == 0)
+		(__g_pfButton=(WNDPROC)SetWindowLongPtr(m_ctlOk.GetSafeHwnd(), GWLP_WNDPROC, (LONG_PTR)CustomWindowProc)) == nullptr)
 	{
 		TRACE("Error creating control...");
 		return -1;
@@ -574,8 +574,8 @@
 {
 	if (!InitModalIndirect((LPCDLGTEMPLATE)__g_DlgTemplate))
 		return -1;
-	else
-		return ictranslate::CLanguageDialog::DoModal();
+
+	return ictranslate::CLanguageDialog::DoModal();
 }
 
 ///////////////////////////////////////////////////////////////////////////
@@ -662,12 +662,17 @@
 		if (!bSkipFreeSpace)
 		{
 			// get disk free space
-			unsigned long long ullFree, ullTotal;
-			if (GetDynamicFreeSpace(strPath, &ullFree, &ullTotal))
+			try
 			{
+				unsigned long long ullFree = 0, ullTotal = 0;
+
+				m_fsLocal.GetDynamicFreeSpace(chcore::PathFromString(strPath), ullFree, ullTotal);
 				m_strTip += GetResManager().LoadString(IDS_BDFREESPACE_STRING) + GetSizeString(ullFree, false) + _T("\n");
 				m_strTip += GetResManager().LoadString(IDS_BDCAPACITY_STRING) + GetSizeString(ullTotal, false) + _T("\n");
 			}
+			catch (const std::exception&)
+			{
+			}
 		}
 	}
 
@@ -701,12 +706,17 @@
 	m_strTip=sc.m_strName+_T("\r\n")+CString(GetResManager().LoadString(IDS_BDPATH2_STRING))+sc.m_strPath;
 
 	// get disk free space
-	unsigned long long ullFree, ullTotal;
-	if (GetDynamicFreeSpace(sc.m_strPath, &ullFree, &ullTotal))
+	try
 	{
-		m_strTip+=CString(_T("\r\n"))+GetResManager().LoadString(IDS_BDFREESPACE_STRING) + GetSizeString(ullFree, false) + _T("\n");
-		m_strTip+=GetResManager().LoadString(IDS_BDCAPACITY_STRING) + GetSizeString(ullTotal, false);
+		unsigned long long ullFree = 0, ullTotal = 0;
+
+		m_fsLocal.GetDynamicFreeSpace(chcore::PathFromString(sc.m_strPath), ullFree, ullTotal);
+		m_strTip += CString(_T("\r\n")) + GetResManager().LoadString(IDS_BDFREESPACE_STRING) + GetSizeString(ullFree, false) + _T("\n");
+		m_strTip += GetResManager().LoadString(IDS_BDCAPACITY_STRING) + GetSizeString(ullTotal, false);
 	}
+	catch(const std::exception&)
+	{
+	}
 
 	pit->pszText=(LPTSTR)(LPCTSTR)m_strTip;
 	pit->cchTextMax=m_strTip.GetLength()+1;
@@ -873,7 +883,7 @@
 	SHGetFileInfo(sc.m_strPath, FILE_ATTRIBUTE_NORMAL, &sfi, sizeof(sfi), SHGFI_SYSICONINDEX | SHGFI_LARGEICON);
 
 	// add to an array and to shortcuts list
-	m_bdData.cvShortcuts.push_back(sc);
+	m_bdData.cvShortcuts.push_back(sc.ToString());
 	int iIndex = boost::numeric_cast<int>(m_bdData.cvShortcuts.size() - 1);
 	m_ctlShortcuts.InsertItem(iIndex, sc.m_strName, sfi.iIcon);
 	m_ctlShortcuts.SetItem(iIndex, 1, LVIF_TEXT, sc.m_strPath, 0, 0, 0, 0);
@@ -883,7 +893,6 @@
 	if (m_ctlShortcuts.EditLabel(iIndex) == nullptr)
 	{
 		TRACE("Couldn't edit shortcut list's item label\n");
-		return;
 	}
 }
 
@@ -931,7 +940,7 @@
 	CShortcut sc=CShortcut(m_bdData.cvShortcuts.at(pdi->item.iItem));
 	sc.m_strName=pdi->item.pszText;
 
-	m_bdData.cvShortcuts[pdi->item.iItem] = (CString)sc;
+	m_bdData.cvShortcuts[pdi->item.iItem] = sc.ToString();
 	
 	*pResult=1;
 }