Index: src/ch/CustomCopyDlg.cpp
===================================================================
diff -u -re701ed2460c2558eeefab55a1f3ed1d2c89a56c0 -r66e9ad9a512cec46d691cb1ba012424dc7ac8897
--- src/ch/CustomCopyDlg.cpp	(.../CustomCopyDlg.cpp)	(revision e701ed2460c2558eeefab55a1f3ed1d2c89a56c0)
+++ src/ch/CustomCopyDlg.cpp	(.../CustomCopyDlg.cpp)	(revision 66e9ad9a512cec46d691cb1ba012424dc7ac8897)
@@ -155,7 +155,7 @@
 	CString strText;
 	cbi.mask=CBEIF_IMAGE | CBEIF_TEXT;
 
-	for (i=0;i<(int)m_ccData.m_vRecent.size();i++)
+	for (int i=0;i<(int)m_ccData.m_vRecent.size();i++)
 	{
 		cbi.iItem=i;
 		strText=m_ccData.m_vRecent.at(i);
@@ -180,7 +180,7 @@
 	m_ctlOperation.SetCurSel(m_ccData.m_iOperation);
 
 	// fill priority combo
-	for (i=0;i<7;i++)
+	for (int i=0;i<7;i++)
 	{
 		m_ctlPriority.AddString(GetResManager()->LoadString(IDS_PRIORITY0_STRING+i));
 	}
@@ -343,7 +343,7 @@
 
 	// refresh the entries in filters' list
 	m_ctlFilters.DeleteAllItems();
-	for (i=0;i<m_ccData.m_afFilters.GetSize();i++)
+	for (int i=0;i<m_ccData.m_afFilters.GetSize();i++)
 		AddFilter(m_ccData.m_afFilters.GetAt(i), i);
 }
 
Index: src/ch/DirTreeCtrl.cpp
===================================================================
diff -u -r3493e9fc470285b0a0b417d50be281467a071eb7 -r66e9ad9a512cec46d691cb1ba012424dc7ac8897
--- src/ch/DirTreeCtrl.cpp	(.../DirTreeCtrl.cpp)	(revision 3493e9fc470285b0a0b417d50be281467a071eb7)
+++ src/ch/DirTreeCtrl.cpp	(.../DirTreeCtrl.cpp)	(revision 66e9ad9a512cec46d691cb1ba012424dc7ac8897)
@@ -194,7 +194,7 @@
 					   MB_PRECOMPOSED,
 					   szBuff,
 					   -1,
-					   (USHORT *)szOleChar,
+					   szOleChar,
 					   sizeof(szOleChar));
 
    hr=lpsfDeskTop->ParseDisplayName(NULL,
Index: src/ch/ExceptionEx.h
===================================================================
diff -u -r3493e9fc470285b0a0b417d50be281467a071eb7 -r66e9ad9a512cec46d691cb1ba012424dc7ac8897
--- src/ch/ExceptionEx.h	(.../ExceptionEx.h)	(revision 3493e9fc470285b0a0b417d50be281467a071eb7)
+++ src/ch/ExceptionEx.h	(.../ExceptionEx.h)	(revision 66e9ad9a512cec46d691cb1ba012424dc7ac8897)
@@ -86,12 +86,12 @@
 		// call base class RegisterInfo
 
 		// function has to register the info to be displayed (called from within GetInfo)
-		RegisterProp(pInfo+0, _T("Source file"), PropType::dtString, &m_szSourceFile);
-		RegisterProp(pInfo+1, _T("Line"), PropType::dtDword, &m_dwSourceLine);
-		RegisterProp(pInfo+2, _T("Function"), PropType::dtString, &m_szFunction);
-		RegisterProp(pInfo+3, _T("Reason"), PropType::dtPtrToString, &m_pszReason);
-		RegisterProp(pInfo+4, _T("App error"), PropType::dtDword, &m_dwReason);
-		RegisterProp(pInfo+5, _T("System error"), PropType::dtSysError, &m_dwError);
+		RegisterProp(pInfo+0, _T("Source file"), dtString, &m_szSourceFile);
+		RegisterProp(pInfo+1, _T("Line"), dtDword, &m_dwSourceLine);
+		RegisterProp(pInfo+2, _T("Function"), dtString, &m_szFunction);
+		RegisterProp(pInfo+3, _T("Reason"), dtPtrToString, &m_pszReason);
+		RegisterProp(pInfo+4, _T("App error"), dtDword, &m_dwReason);
+		RegisterProp(pInfo+5, _T("System error"), dtSysError, &m_dwError);
 
 		return 6;
 	};
@@ -136,31 +136,31 @@
 			// format this line
 			switch(pepi[i].eType)
 			{
-			case PropType::dtString:
+			case dtString:
 				{
 					if (pszDesc)
 						_stprintf(szData, _T("\r\n\t%s: %s"), pepi[i].szName, (TCHAR*)pepi[i].pData);
 					else
 						_stprintf(szData, _T("%s: %s\r\n"), pepi[i].szName, (TCHAR*)pepi[i].pData);
 					break;
 				}
-			case PropType::dtPtrToString:
+			case dtPtrToString:
 				{
 					if (pszDesc)
 						_stprintf(szData, _T("\r\n\t%s: %s"), pepi[i].szName, *((TCHAR**)pepi[i].pData));
 					else
 						_stprintf(szData, _T("%s: %s\r\n"), pepi[i].szName, *((TCHAR**)pepi[i].pData));
 					break;
 				}
-			case PropType::dtDword:
+			case dtDword:
 				{
 					if (pszDesc)
 						_stprintf(szData, _T("\r\n\t%s: %lu"), pepi[i].szName, *((DWORD*)pepi[i].pData));
 					else
 						_stprintf(szData, _T("%s: %lu\r\n"), pepi[i].szName, *((DWORD*)pepi[i].pData));
 					break;
 				}
-			case PropType::dtSysError:
+			case dtSysError:
 				{
 					// get info about the last error (always treated as a system error)
 					TCHAR szSystem[512];
Index: src/ch/FileEx.cpp
===================================================================
diff -u -r3493e9fc470285b0a0b417d50be281467a071eb7 -r66e9ad9a512cec46d691cb1ba012424dc7ac8897
--- src/ch/FileEx.cpp	(.../FileEx.cpp)	(revision 3493e9fc470285b0a0b417d50be281467a071eb7)
+++ src/ch/FileEx.cpp	(.../FileEx.cpp)	(revision 66e9ad9a512cec46d691cb1ba012424dc7ac8897)
@@ -20,7 +20,7 @@
 
 #include "stdafx.h"
 #include "FileEx.h"
-#include "crc32.h"
+#include "../libicpf/crc32.h"
 #ifndef DISABLE_CRYPT
 #include "crypt.h"
 #endif
Index: src/ch/FileEx.h
===================================================================
diff -u -r3493e9fc470285b0a0b417d50be281467a071eb7 -r66e9ad9a512cec46d691cb1ba012424dc7ac8897
--- src/ch/FileEx.h	(.../FileEx.h)	(revision 3493e9fc470285b0a0b417d50be281467a071eb7)
+++ src/ch/FileEx.h	(.../FileEx.h)	(revision 66e9ad9a512cec46d691cb1ba012424dc7ac8897)
@@ -83,7 +83,7 @@
 		size_t tIndex=CExceptionEx::RegisterInfo(pInfo);
 
 		// function has to register the info to be displayed (called from within GetInfo)
-		RegisterProp(pInfo+tIndex+0, _T("Filename"), PropType::dtPtrToString, &m_pszFilename);
+		RegisterProp(pInfo+tIndex+0, _T("Filename"), dtPtrToString, &m_pszFilename);
 
 		return 1;
 	};
Index: src/ch/FilterDlg.cpp
===================================================================
diff -u -re701ed2460c2558eeefab55a1f3ed1d2c89a56c0 -r66e9ad9a512cec46d691cb1ba012424dc7ac8897
--- src/ch/FilterDlg.cpp	(.../FilterDlg.cpp)	(revision e701ed2460c2558eeefab55a1f3ed1d2c89a56c0)
+++ src/ch/FilterDlg.cpp	(.../FilterDlg.cpp)	(revision 66e9ad9a512cec46d691cb1ba012424dc7ac8897)
@@ -121,7 +121,7 @@
 	}
 
 	// strings <, <=, ...
-	for (i=0;i<5;i++)
+	for (int i=0;i<5;i++)
 	{
 		pszData=GetResManager()->LoadString(IDS_LT_STRING+i);
 		m_ctlSizeType1.AddString(pszData);
@@ -130,7 +130,7 @@
 		m_ctlDateType2.AddString(pszData);
 	}
 
-	for (i=0;i<3;i++)
+	for (int i=0;i<3;i++)
 	{
 		m_ctlDateType.AddString(GetResManager()->LoadString(IDS_DATECREATED_STRING+i));
 	}
@@ -140,12 +140,12 @@
 
 	CString strData;
 	m_ctlFilter.SetCurSel(m_ctlFilter.AddString(m_ffFilter.GetCombinedMask(strData)));
-	for (i=0;i<m_astrAddMask.GetSize();i++)
+	for (int i=0;i<m_astrAddMask.GetSize();i++)
 		m_ctlFilter.AddString(m_astrAddMask.GetAt(i));
 
 	m_bExclude=m_ffFilter.m_bUseExcludeMask;
 	m_ctlExcludeMask.SetCurSel(m_ctlExcludeMask.AddString(m_ffFilter.GetCombinedExcludeMask(strData)));
-	for (i=0;i<m_astrAddExcludeMask.GetSize();i++)
+	for (int i=0;i<m_astrAddExcludeMask.GetSize();i++)
 		m_ctlExcludeMask.AddString(m_astrAddExcludeMask.GetAt(i));
 
 	// size
@@ -228,7 +228,7 @@
 	m_ctlDateType2.ResetContent();
 
 	// strings <, <=, ...
-	for (i=0;i<5;i++)
+	for (int i=0;i<5;i++)
 	{
 		pszData=GetResManager()->LoadString(IDS_LT_STRING+i);
 		m_ctlSizeType1.AddString(pszData);
@@ -244,7 +244,7 @@
 
 	iPos[0]=m_ctlDateType.GetCurSel();
 	m_ctlDateType.ResetContent();
-	for (i=0;i<3;i++)
+	for (int i=0;i<3;i++)
 	{
 		m_ctlDateType.AddString(GetResManager()->LoadString(IDS_DATECREATED_STRING+i));
 	}
Index: src/ch/FolderDialog.cpp
===================================================================
diff -u -re701ed2460c2558eeefab55a1f3ed1d2c89a56c0 -r66e9ad9a512cec46d691cb1ba012424dc7ac8897
--- src/ch/FolderDialog.cpp	(.../FolderDialog.cpp)	(revision e701ed2460c2558eeefab55a1f3ed1d2c89a56c0)
+++ src/ch/FolderDialog.cpp	(.../FolderDialog.cpp)	(revision 66e9ad9a512cec46d691cb1ba012424dc7ac8897)
@@ -455,7 +455,7 @@
 	
 	// update shortcuts' list
 	CShortcut sc;
-	for (i=0;i<(int)m_bdData.cvShortcuts.size();i++)
+	for (int i=0;i<(int)m_bdData.cvShortcuts.size();i++)
 	{
 		sc=CString(m_bdData.cvShortcuts.at(i));
 		sfi.iIcon=-1;
@@ -1243,7 +1243,7 @@
 
 ////////////////////////////////////////////////////////////////////////////
 // hit testing in a gripper cause
-UINT CFolderDialog::OnNcHitTest(CPoint point) 
+LRESULT CFolderDialog::OnNcHitTest(CPoint point) 
 {
 	UINT uiRes=CHLanguageDialog::OnNcHitTest(point);
 	if (uiRes == HTCLIENT)
Index: src/ch/FolderDialog.h
===================================================================
diff -u -r3493e9fc470285b0a0b417d50be281467a071eb7 -r66e9ad9a512cec46d691cb1ba012424dc7ac8897
--- src/ch/FolderDialog.h	(.../FolderDialog.h)	(revision 3493e9fc470285b0a0b417d50be281467a071eb7)
+++ src/ch/FolderDialog.h	(.../FolderDialog.h)	(revision 66e9ad9a512cec46d691cb1ba012424dc7ac8897)
@@ -154,7 +154,7 @@
 	afx_msg void OnItemchangedShortcutList(NMHDR* pNMHDR, LRESULT* pResult);
 	afx_msg void OnGetShortcutInfoTip(NMHDR* pNMHDR, LRESULT* pResult);
 	afx_msg void OnPaint();
-	afx_msg UINT OnNcHitTest(CPoint point);
+	afx_msg LRESULT OnNcHitTest(CPoint point);
 	afx_msg void OnSize(UINT nType, int cx, int cy);
 	afx_msg void OnGetMinMaxInfo(MINMAXINFO FAR* lpMMI);
 	//}}AFX_MSG
Index: src/ch/MainWnd.cpp
===================================================================
diff -u -r7eeed050f9517138ba18670a1112119921975c1e -r66e9ad9a512cec46d691cb1ba012424dc7ac8897
--- src/ch/MainWnd.cpp	(.../MainWnd.cpp)	(revision 7eeed050f9517138ba18670a1112119921975c1e)
+++ src/ch/MainWnd.cpp	(.../MainWnd.cpp)	(revision 66e9ad9a512cec46d691cb1ba012424dc7ac8897)
@@ -2050,7 +2050,7 @@
 		m_tasks.GetAt(i)->SetKillFlag();
 
 	// wait for finishing
-	for (i=0;i<m_tasks.GetSize();i++)
+	for (int i=0;i<m_tasks.GetSize();i++)
 	{
 		while (!m_tasks.GetAt(i)->GetKilledFlag())
 			Sleep(10);
@@ -2065,7 +2065,7 @@
 
 	// delete all tasks
 	int iSize=m_tasks.GetSize();
-	for (i=0;i<iSize;i++)
+	for (int i=0;i<iSize;i++)
 		delete m_tasks.GetAt(i);
 
 	(static_cast< CArray<CTask*, CTask*>* >(&m_tasks))->RemoveAll();
Index: src/ch/MiniViewDlg.cpp
===================================================================
diff -u -re701ed2460c2558eeefab55a1f3ed1d2c89a56c0 -r66e9ad9a512cec46d691cb1ba012424dc7ac8897
--- src/ch/MiniViewDlg.cpp	(.../MiniViewDlg.cpp)	(revision e701ed2460c2558eeefab55a1f3ed1d2c89a56c0)
+++ src/ch/MiniViewDlg.cpp	(.../MiniViewDlg.cpp)	(revision 66e9ad9a512cec46d691cb1ba012424dc7ac8897)
@@ -21,6 +21,7 @@
 #include "stdafx.h"
 #include "MiniViewDlg.h"
 #include "ch.h"
+#include <assert.h>
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -738,6 +739,9 @@
 
 void CMiniViewDlg::ResizeDialog()
 {
+	if(!IsWindowVisible())
+		return;
+
 	// remember pos of listbox
 	CRect rcList, rcWindow, rcClient;
 	m_ctlStatus.GetWindowRect(&rcList);
@@ -753,13 +757,19 @@
 
 	NONCLIENTMETRICS ncm;
 	ncm.cbSize=sizeof(NONCLIENTMETRICS);
-	SystemParametersInfo(SPI_GETNONCLIENTMETRICS, ncm.cbSize, &ncm, 0);
+	if(!SystemParametersInfo(SPI_GETNONCLIENTMETRICS, ncm.cbSize, &ncm, 0))
+	{
+		TRACE(_T("Last error: %lu"), GetLastError());
+
+		assert(false);		// function call failed
+		return;
+	}
 	
 	CFont font;
 	font.CreateFontIndirect(&ncm.lfSmCaptionFont);
 	dc.SelectObject(&font);
 
-	CSize sSize=dc.GetTextExtent(strTitle);
+	CSize sSize=dc.GetOutputTextExtent(strTitle);
 
 	int iEdgeWidth=1;
 	int iBoxWidth=static_cast<int>(static_cast<double>(((9+2)-2*iEdgeWidth))*(2.0/3.0))+1;
Index: src/ch/ResourceManager.cpp
===================================================================
diff -u -r3493e9fc470285b0a0b417d50be281467a071eb7 -r66e9ad9a512cec46d691cb1ba012424dc7ac8897
--- src/ch/ResourceManager.cpp	(.../ResourceManager.cpp)	(revision 3493e9fc470285b0a0b417d50be281467a071eb7)
+++ src/ch/ResourceManager.cpp	(.../ResourceManager.cpp)	(revision 66e9ad9a512cec46d691cb1ba012424dc7ac8897)
@@ -236,7 +236,7 @@
 			// establish path to the base file
 			if (_tcslen(GetBaseFile()) != 0)
 			{
-				TCHAR* pszName=_tcsrchr(pszFile, _T('\\'));
+				const TCHAR* pszName=_tcsrchr(pszFile, _T('\\'));
 				if (pszName)
 				{
 					_tcsncpy(szData, pszFile, pszName-pszFile+1);
Index: src/ch/ShortcutsDlg.cpp
===================================================================
diff -u -re701ed2460c2558eeefab55a1f3ed1d2c89a56c0 -r66e9ad9a512cec46d691cb1ba012424dc7ac8897
--- src/ch/ShortcutsDlg.cpp	(.../ShortcutsDlg.cpp)	(revision e701ed2460c2558eeefab55a1f3ed1d2c89a56c0)
+++ src/ch/ShortcutsDlg.cpp	(.../ShortcutsDlg.cpp)	(revision 66e9ad9a512cec46d691cb1ba012424dc7ac8897)
@@ -116,7 +116,7 @@
 
 	// update shortcut list
 	CShortcut sc;
-	for (i=0;i<(int)m_cvShortcuts.size();i++)
+	for (int i=0;i<(int)m_cvShortcuts.size();i++)
 	{
 		sc=CString(m_cvShortcuts.at(i));
 		sfi.iIcon=-1;
Index: src/ch/StaticEx.cpp
===================================================================
diff -u -r3493e9fc470285b0a0b417d50be281467a071eb7 -r66e9ad9a512cec46d691cb1ba012424dc7ac8897
--- src/ch/StaticEx.cpp	(.../StaticEx.cpp)	(revision 3493e9fc470285b0a0b417d50be281467a071eb7)
+++ src/ch/StaticEx.cpp	(.../StaticEx.cpp)	(revision 66e9ad9a512cec46d691cb1ba012424dc7ac8897)
@@ -58,7 +58,7 @@
 		{
 			CREATESTRUCT* pcs=(CREATESTRUCT*)lParam;
 
-			TCHAR* pSep=_tcsrchr(pcs->lpszName, _T('|'));
+			const TCHAR* pSep=_tcsrchr(pcs->lpszName, _T('|'));
 
 			if (!(pcs->style & SES_LINK) || pSep == NULL || pSep-pcs->lpszName < 0)
 			{
@@ -136,7 +136,7 @@
 			LONG lStyle=::GetWindowLong(hwnd, GWL_STYLE);
 
 			LPCTSTR psz=(LPCTSTR)lParam;
-			TCHAR* pSep=_tcsrchr(psz, _T('|'));
+			const TCHAR* pSep=_tcsrchr(psz, _T('|'));
 
 			if (!(lStyle & SES_LINK) || pSep == NULL || pSep-psz < 0)
 			{
Index: src/ch/Structs.cpp
===================================================================
diff -u -r7eeed050f9517138ba18670a1112119921975c1e -r66e9ad9a512cec46d691cb1ba012424dc7ac8897
--- src/ch/Structs.cpp	(.../Structs.cpp)	(revision 7eeed050f9517138ba18670a1112119921975c1e)
+++ src/ch/Structs.cpp	(.../Structs.cpp)	(revision 66e9ad9a512cec46d691cb1ba012424dc7ac8897)
@@ -1250,7 +1250,7 @@
 		GetAt(i)->SetKillFlag();		// send an info about finishing
 
 	// wait for finishing and get rid of it
-	for (i=0;i<GetSize();i++)
+	for (int i=0;i<GetSize();i++)
 	{
 		pTask=GetAt(i);
 
Index: src/ch/Structs.h
===================================================================
diff -u -r3493e9fc470285b0a0b417d50be281467a071eb7 -r66e9ad9a512cec46d691cb1ba012424dc7ac8897
--- src/ch/Structs.h	(.../Structs.h)	(revision 3493e9fc470285b0a0b417d50be281467a071eb7)
+++ src/ch/Structs.h	(.../Structs.h)	(revision 66e9ad9a512cec46d691cb1ba012424dc7ac8897)
@@ -24,7 +24,7 @@
 #include "DestPath.h"
 #include "DataBuffer.h"
 //#include "LogFile.h"
-#include <log.h>
+#include "../libicpf/log.h"
 
 #define ST_NULL_STATUS		0x00000000
 
Index: src/ch/af_defs.h
===================================================================
diff -u -r3493e9fc470285b0a0b417d50be281467a071eb7 -r66e9ad9a512cec46d691cb1ba012424dc7ac8897
--- src/ch/af_defs.h	(.../af_defs.h)	(revision 3493e9fc470285b0a0b417d50be281467a071eb7)
+++ src/ch/af_defs.h	(.../af_defs.h)	(revision 66e9ad9a512cec46d691cb1ba012424dc7ac8897)
@@ -23,6 +23,6 @@
 #define IMID_LOGFILE			0x0001000000000002
 
 // callbacks
-typedef (*PFNNOTIFYCALLBACK)(ULONGLONG, UINT, WPARAM, LPARAM);
+typedef void(*PFNNOTIFYCALLBACK)(ULONGLONG, UINT, WPARAM, LPARAM);
 
 #endif
\ No newline at end of file
Index: src/ch/ch.h
===================================================================
diff -u -r3493e9fc470285b0a0b417d50be281467a071eb7 -r66e9ad9a512cec46d691cb1ba012424dc7ac8897
--- src/ch/ch.h	(.../ch.h)	(revision 3493e9fc470285b0a0b417d50be281467a071eb7)
+++ src/ch/ch.h	(.../ch.h)	(revision 66e9ad9a512cec46d691cb1ba012424dc7ac8897)
@@ -34,7 +34,7 @@
 
 #include "CfgProperties.h"
 //#include "LogFile.h"
-#include <log.h>
+#include "../libicpf/log.h"
 
 using namespace std;
 
Index: src/ch/ch.rc
===================================================================
diff -u -r4ee5b2305c2ed7776e64e7fbd52952ccfd2a8dd8 -r66e9ad9a512cec46d691cb1ba012424dc7ac8897
--- src/ch/ch.rc	(.../ch.rc)	(revision 4ee5b2305c2ed7776e64e7fbd52952ccfd2a8dd8)
+++ src/ch/ch.rc	(.../ch.rc)	(revision 66e9ad9a512cec46d691cb1ba012424dc7ac8897)
@@ -84,8 +84,7 @@
         MENUITEM "&Unregister shell extension dll", ID_POPUP_UNREGISTERDLL
         MENUITEM SEPARATOR
         MENUITEM "Monitor clipboard",           ID_POPUP_MONITORING, CHECKED
-        MENUITEM "Shutdown after finished",     ID_POPUP_SHUTAFTERFINISHED
-        , CHECKED
+        MENUITEM "Shutdown after finished",     ID_POPUP_SHUTAFTERFINISHED, CHECKED
         MENUITEM SEPARATOR
         MENUITEM "&Options...",                 ID_POPUP_OPTIONS
         MENUITEM "&Help...",                    ID_POPUP_HELP
@@ -116,119 +115,73 @@
 //
 
 IDD_BUFFERSIZE_DIALOG DIALOGEX 0, 0, 344, 127
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Buffer size settings"
 FONT 8, "Tahoma", 0, 0, 0x1
 BEGIN
-    EDITTEXT        IDC_DEFAULTSIZE_EDIT,35,17,97,14,ES_AUTOHSCROLL | NOT 
-                    WS_BORDER,WS_EX_CLIENTEDGE,HIDC_DEFAULTSIZE_EDIT
-    COMBOBOX        IDC_DEFAULTMULTIPLIER_COMBO,134,18,31,56,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0,
-                    HIDC_DEFAULTMULTIPLIER_COMBO
-    EDITTEXT        IDC_ONEDISKSIZE_EDIT,35,49,97,14,ES_AUTOHSCROLL | NOT 
-                    WS_BORDER,WS_EX_CLIENTEDGE,HIDC_ONEDISKSIZE_EDIT
-    COMBOBOX        IDC_ONEDISKMULTIPLIER_COMBO,134,50,31,56,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0,
-                    HIDC_ONEDISKMULTIPLIER_COMBO
-    EDITTEXT        IDC_TWODISKSSIZE_EDIT,35,81,97,14,ES_AUTOHSCROLL | NOT 
-                    WS_BORDER,WS_EX_CLIENTEDGE,HIDC_TWODISKSSIZE_EDIT
-    COMBOBOX        IDC_TWODISKSMULTIPLIER_COMBO,134,82,31,56,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0,
-                    HIDC_TWODISKSMULTIPLIER_COMBO
-    EDITTEXT        IDC_CDROMSIZE_EDIT,206,18,97,14,ES_AUTOHSCROLL | NOT 
-                    WS_BORDER,WS_EX_CLIENTEDGE,HIDC_CDROMSIZE_EDIT
-    COMBOBOX        IDC_CDROMMULTIPLIER_COMBO,306,18,31,56,CBS_DROPDOWNLIST | 
-                    WS_VSCROLL | WS_TABSTOP,0,HIDC_CDROMMULTIPLIER_COMBO
-    EDITTEXT        IDC_LANSIZE_EDIT,206,51,97,14,ES_AUTOHSCROLL | NOT 
-                    WS_BORDER,WS_EX_CLIENTEDGE,HIDC_LANSIZE_EDIT
-    COMBOBOX        IDC_LANMULTIPLIER_COMBO,306,52,31,56,CBS_DROPDOWNLIST | 
-                    WS_VSCROLL | WS_TABSTOP,0,HIDC_LANMULTIPLIER_COMBO
+    EDITTEXT        IDC_DEFAULTSIZE_EDIT,35,17,97,14,ES_AUTOHSCROLL | NOT WS_BORDER,WS_EX_CLIENTEDGE,HIDC_DEFAULTSIZE_EDIT
+    COMBOBOX        IDC_DEFAULTMULTIPLIER_COMBO,134,18,31,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0,HIDC_DEFAULTMULTIPLIER_COMBO
+    EDITTEXT        IDC_ONEDISKSIZE_EDIT,35,49,97,14,ES_AUTOHSCROLL | NOT WS_BORDER,WS_EX_CLIENTEDGE,HIDC_ONEDISKSIZE_EDIT
+    COMBOBOX        IDC_ONEDISKMULTIPLIER_COMBO,134,50,31,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0,HIDC_ONEDISKMULTIPLIER_COMBO
+    EDITTEXT        IDC_TWODISKSSIZE_EDIT,35,81,97,14,ES_AUTOHSCROLL | NOT WS_BORDER,WS_EX_CLIENTEDGE,HIDC_TWODISKSSIZE_EDIT
+    COMBOBOX        IDC_TWODISKSMULTIPLIER_COMBO,134,82,31,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0,HIDC_TWODISKSMULTIPLIER_COMBO
+    EDITTEXT        IDC_CDROMSIZE_EDIT,206,18,97,14,ES_AUTOHSCROLL | NOT WS_BORDER,WS_EX_CLIENTEDGE,HIDC_CDROMSIZE_EDIT
+    COMBOBOX        IDC_CDROMMULTIPLIER_COMBO,306,18,31,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0,HIDC_CDROMMULTIPLIER_COMBO
+    EDITTEXT        IDC_LANSIZE_EDIT,206,51,97,14,ES_AUTOHSCROLL | NOT WS_BORDER,WS_EX_CLIENTEDGE,HIDC_LANSIZE_EDIT
+    COMBOBOX        IDC_LANMULTIPLIER_COMBO,306,52,31,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0,HIDC_LANMULTIPLIER_COMBO
     DEFPUSHBUTTON   "&OK",IDOK,176,106,50,14,0,0,HIDOK
     PUSHBUTTON      "&Cancel",IDCANCEL,229,106,50,14,0,0,HIDCANCEL
     LTEXT           "Default",IDC_001_STATIC,35,7,127,8
-    LTEXT           "For copying inside one disk boundary",IDC_002_STATIC,35,
-                    38,130,8
-    LTEXT           "For copying between two different disks",IDC_003_STATIC,
-                    35,70,132,8
+    LTEXT           "For copying inside one disk boundary",IDC_002_STATIC,35,38,130,8
+    LTEXT           "For copying between two different disks",IDC_003_STATIC,35,70,132,8
     LTEXT           "For copying with CD-ROM use",IDC_004_STATIC,206,7,131,8
-    LTEXT           "For copying with network use",IDC_005_STATIC,206,40,131,
-                    8
-    CONTROL         "Use only default buffer",IDC_ONLYDEFAULT_CHECK,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,200,83,137,10,0,
-                    HIDC_ONLYDEFAULT_CHECK
+    LTEXT           "For copying with network use",IDC_005_STATIC,206,40,131,8
+    CONTROL         "Use only default buffer",IDC_ONLYDEFAULT_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,200,83,137,10,0,HIDC_ONLYDEFAULT_CHECK
     ICON            IDI_CD_ICON,IDC_006_STATIC,179,13,20,20,SS_REALSIZEIMAGE
-    ICON            IDI_NET_ICON,IDC_007_STATIC,179,44,20,20,
-                    SS_REALSIZEIMAGE
+    ICON            IDI_NET_ICON,IDC_007_STATIC,179,44,20,20,SS_REALSIZEIMAGE
     ICON            IDI_HDD_ICON,IDC_008_STATIC,7,43,20,20,SS_REALSIZEIMAGE
     ICON            IDI_HDD2_ICON,IDC_009_STATIC,7,73,20,20,SS_REALSIZEIMAGE
     ICON            IDI_TRIBE_ICON,IDC_010_STATIC,7,9,20,20,SS_REALSIZEIMAGE
-    PUSHBUTTON      "&Help",IDC_HELP_BUTTON,287,106,50,14,0,0,
-                    HIDC_HELP_BUTTON
+    PUSHBUTTON      "&Help",IDC_HELP_BUTTON,287,106,50,14,0,0,HIDC_HELP_BUTTON
 END
 
 IDD_FEEDBACK_DSTFILE_DIALOG DIALOGEX 0, 0, 290, 111
-STYLE DS_SYSMODAL | DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | 
-    WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SYSMODAL | DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Copy handler - error opening file"
 FONT 8, "Tahoma", 0, 0, 0x1
 BEGIN
-    PUSHBUTTON      "&Retry",IDC_RETRY_BUTTON,7,90,53,14,0,0,
-                    HIDC_RETRY_BUTTON
-    PUSHBUTTON      "&Ignore",IDC_IGNORE_BUTTON,63,90,50,14,0,0,
-                    HIDC_IGNORE_BUTTON
-    PUSHBUTTON      "I&gnore all",IDC_IGNORE_ALL_BUTTON,114,90,62,14,0,0,
-                    HIDC_IGNORE_ALL_BUTTON
-    DEFPUSHBUTTON   "&Wait",IDC_WAIT_BUTTON,178,90,50,14,0,0,
-                    HIDC_WAIT_BUTTON
+    PUSHBUTTON      "&Retry",IDC_RETRY_BUTTON,7,90,53,14,0,0,HIDC_RETRY_BUTTON
+    PUSHBUTTON      "&Ignore",IDC_IGNORE_BUTTON,63,90,50,14,0,0,HIDC_IGNORE_BUTTON
+    PUSHBUTTON      "I&gnore all",IDC_IGNORE_ALL_BUTTON,114,90,62,14,0,0,HIDC_IGNORE_ALL_BUTTON
+    DEFPUSHBUTTON   "&Wait",IDC_WAIT_BUTTON,178,90,50,14,0,0,HIDC_WAIT_BUTTON
     PUSHBUTTON      "&Cancel",IDCANCEL,233,90,50,14,0,0,HIDCANCEL
-    EDITTEXT        IDC_FILENAME_EDIT,44,23,239,17,ES_AUTOHSCROLL | 
-                    ES_READONLY | NOT WS_BORDER,0,HIDC_FILENAME_EDIT
-    EDITTEXT        IDC_MESSAGE_EDIT,44,57,239,24,ES_MULTILINE | 
-                    ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | NOT 
-                    WS_BORDER,0,HIDC_MESSAGE_EDIT
+    EDITTEXT        IDC_FILENAME_EDIT,44,23,239,17,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,0,HIDC_FILENAME_EDIT
+    EDITTEXT        IDC_MESSAGE_EDIT,44,57,239,24,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,0,HIDC_MESSAGE_EDIT
     ICON            IDI_ERR_ICON,IDC_001_STATIC,11,15,20,20,SS_REALSIZEIMAGE
-    LTEXT           "Cannot open file for writing:",IDC_002_STATIC,38,13,245,
-                    8
+    LTEXT           "Cannot open file for writing:",IDC_002_STATIC,38,13,245,8
     LTEXT           "Error description:",IDC_003_STATIC,38,46,245,8
 END
 
 IDD_FEEDBACK_IGNOREWAITRETRY_DIALOG DIALOGEX 0, 0, 294, 242
-STYLE DS_SYSMODAL | DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | 
-    WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SYSMODAL | DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Copy handler - error opening file"
 FONT 8, "Tahoma", 0, 0, 0x1
 BEGIN
-    PUSHBUTTON      "&Retry",IDC_RETRY_BUTTON,7,221,50,14,0,0,
-                    HIDC_RETRY_BUTTON
-    PUSHBUTTON      "&Ignore",IDC_IGNORE_BUTTON,60,221,50,14,0,0,
-                    HIDC_IGNORE_BUTTON
-    PUSHBUTTON      "I&gnore all",IDC_IGNORE_ALL_BUTTON,110,221,69,14,0,0,
-                    HIDC_IGNORE_ALL_BUTTON
-    DEFPUSHBUTTON   "&Wait",IDC_WAIT_BUTTON,183,221,50,14,0,0,
-                    HIDC_WAIT_BUTTON
+    PUSHBUTTON      "&Retry",IDC_RETRY_BUTTON,7,221,50,14,0,0,HIDC_RETRY_BUTTON
+    PUSHBUTTON      "&Ignore",IDC_IGNORE_BUTTON,60,221,50,14,0,0,HIDC_IGNORE_BUTTON
+    PUSHBUTTON      "I&gnore all",IDC_IGNORE_ALL_BUTTON,110,221,69,14,0,0,HIDC_IGNORE_ALL_BUTTON
+    DEFPUSHBUTTON   "&Wait",IDC_WAIT_BUTTON,183,221,50,14,0,0,HIDC_WAIT_BUTTON
     PUSHBUTTON      "&Cancel",IDCANCEL,237,221,50,14,0,0,HIDCANCEL
-    EDITTEXT        IDC_MESSAGE_EDIT,49,19,238,23,ES_MULTILINE | 
-                    ES_AUTOVSCROLL | ES_READONLY | NOT WS_BORDER,0,
-                    HIDC_MESSAGE_EDIT
-    EDITTEXT        IDC_FILENAME_EDIT,111,54,176,14,ES_AUTOHSCROLL | 
-                    ES_READONLY | NOT WS_BORDER,0,HIDC_FILENAME_EDIT
-    EDITTEXT        IDC_FILESIZE_EDIT,111,69,176,14,ES_AUTOHSCROLL | 
-                    ES_READONLY | NOT WS_BORDER,0,HIDC_FILESIZE_EDIT
-    EDITTEXT        IDC_CREATETIME_EDIT,111,84,176,14,ES_AUTOHSCROLL | 
-                    ES_READONLY | NOT WS_BORDER,0,HIDC_CREATETIME_EDIT
-    EDITTEXT        IDC_MODIFY_TIME_EDIT,111,99,176,14,ES_AUTOHSCROLL | 
-                    ES_READONLY | NOT WS_BORDER,0,HIDC_MODIFY_TIME_EDIT
-    EDITTEXT        IDC_DEST_FILENAME_EDIT,111,130,176,14,ES_AUTOHSCROLL | 
-                    ES_READONLY | NOT WS_BORDER,0,HIDC_DEST_FILENAME_EDIT
-    EDITTEXT        IDC_DEST_FILESIZE_EDIT,111,145,176,14,ES_AUTOHSCROLL | 
-                    ES_READONLY | NOT WS_BORDER,0,HIDC_DEST_FILESIZE_EDIT
-    EDITTEXT        IDC_DEST_CREATETIME_EDIT,111,160,176,14,ES_AUTOHSCROLL | 
-                    ES_READONLY | NOT WS_BORDER,0,HIDC_DEST_CREATETIME_EDIT
-    EDITTEXT        IDC_DEST_MODIFYTIME_EDIT,111,175,176,14,ES_AUTOHSCROLL | 
-                    ES_READONLY | NOT WS_BORDER,0,HIDC_DEST_MODIFYTIME_EDIT
-    LTEXT           "Cannot open source file for reading - reason:",
-                    IDC_001_STATIC,49,10,238,8
+    EDITTEXT        IDC_MESSAGE_EDIT,49,19,238,23,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | NOT WS_BORDER,0,HIDC_MESSAGE_EDIT
+    EDITTEXT        IDC_FILENAME_EDIT,111,54,176,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,0,HIDC_FILENAME_EDIT
+    EDITTEXT        IDC_FILESIZE_EDIT,111,69,176,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,0,HIDC_FILESIZE_EDIT
+    EDITTEXT        IDC_CREATETIME_EDIT,111,84,176,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,0,HIDC_CREATETIME_EDIT
+    EDITTEXT        IDC_MODIFY_TIME_EDIT,111,99,176,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,0,HIDC_MODIFY_TIME_EDIT
+    EDITTEXT        IDC_DEST_FILENAME_EDIT,111,130,176,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,0,HIDC_DEST_FILENAME_EDIT
+    EDITTEXT        IDC_DEST_FILESIZE_EDIT,111,145,176,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,0,HIDC_DEST_FILESIZE_EDIT
+    EDITTEXT        IDC_DEST_CREATETIME_EDIT,111,160,176,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,0,HIDC_DEST_CREATETIME_EDIT
+    EDITTEXT        IDC_DEST_MODIFYTIME_EDIT,111,175,176,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,0,HIDC_DEST_MODIFYTIME_EDIT
+    LTEXT           "Cannot open source file for reading - reason:",IDC_001_STATIC,49,10,238,8
     LTEXT           "Name:",IDC_002_STATIC,53,54,53,8
     LTEXT           "Size:",IDC_003_STATIC,53,69,53,8
     LTEXT           "Created:",IDC_004_STATIC,53,84,53,8
@@ -240,49 +193,31 @@
     LTEXT           "Created:",IDC_010_STATIC,53,160,53,8
     LTEXT           "Last modified:",IDC_011_STATIC,53,175,53,8
     LTEXT           "Source file found:",IDC_012_STATIC,49,118,81,8
-    LTEXT           "What would you like to do ?",IDC_013_STATIC,39,204,248,
-                    8
+    LTEXT           "What would you like to do ?",IDC_013_STATIC,39,204,248,8
 END
 
 IDD_FEEDBACK_REPLACE_FILES_DIALOG DIALOGEX 0, 0, 294, 258
-STYLE DS_SYSMODAL | DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | 
-    WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SYSMODAL | DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Copy handler - smaller destination file found"
 FONT 8, "Tahoma", 0, 0, 0x1
 BEGIN
-    DEFPUSHBUTTON   "Co&py rest",IDC_COPY_REST_BUTTON,7,237,62,14,0,0,
-                    HIDC_COPY_REST_BUTTON
-    PUSHBUTTON      "R&ecopy",IDC_RECOPY_BUTTON,69,237,74,14,0,0,
-                    HIDC_RECOPY_BUTTON
-    PUSHBUTTON      "&Ignore",IDC_IGNORE_BUTTON,143,237,58,14,0,0,
-                    HIDC_IGNORE_BUTTON
+    DEFPUSHBUTTON   "Co&py rest",IDC_COPY_REST_BUTTON,7,237,62,14,0,0,HIDC_COPY_REST_BUTTON
+    PUSHBUTTON      "R&ecopy",IDC_RECOPY_BUTTON,69,237,74,14,0,0,HIDC_RECOPY_BUTTON
+    PUSHBUTTON      "&Ignore",IDC_IGNORE_BUTTON,143,237,58,14,0,0,HIDC_IGNORE_BUTTON
     PUSHBUTTON      "&Cancel",IDCANCEL,237,237,50,14,0,0,HIDCANCEL
-    PUSHBUTTON      "Cop&y rest all",IDC_COPY_REST_ALL_BUTTON,7,222,83,14,0,
-                    0,HIDC_COPY_REST_ALL_BUTTON
-    PUSHBUTTON      "Recopy &all",IDC_RECOPY_ALL_BUTTON,91,222,110,14,0,0,
-                    HIDC_RECOPY_ALL_BUTTON
-    PUSHBUTTON      "I&gnore all",IDC_IGNORE_ALL_BUTTON,201,222,86,14,0,0,
-                    HIDC_IGNORE_ALL_BUTTON
-    EDITTEXT        IDC_FILENAME_EDIT,111,62,176,14,ES_AUTOHSCROLL | 
-                    ES_READONLY | NOT WS_BORDER,0,HIDC_FILENAME_EDIT
-    EDITTEXT        IDC_FILESIZE_EDIT,111,77,176,14,ES_AUTOHSCROLL | 
-                    ES_READONLY | NOT WS_BORDER,0,HIDC_FILESIZE_EDIT
-    EDITTEXT        IDC_CREATETIME_EDIT,111,92,176,14,ES_AUTOHSCROLL | 
-                    ES_READONLY | NOT WS_BORDER,0,HIDC_CREATETIME_EDIT
-    EDITTEXT        IDC_MODIFY_TIME_EDIT,111,107,176,14,ES_AUTOHSCROLL | 
-                    ES_READONLY | NOT WS_BORDER,0,HIDC_MODIFY_TIME_EDIT
-    EDITTEXT        IDC_DEST_FILENAME_EDIT,111,138,176,14,ES_AUTOHSCROLL | 
-                    ES_READONLY | NOT WS_BORDER,0,HIDC_DEST_FILENAME_EDIT
-    EDITTEXT        IDC_DEST_FILESIZE_EDIT,111,153,176,14,ES_AUTOHSCROLL | 
-                    ES_READONLY | NOT WS_BORDER,0,HIDC_DEST_FILESIZE_EDIT
-    EDITTEXT        IDC_DEST_CREATETIME_EDIT,111,168,176,14,ES_AUTOHSCROLL | 
-                    ES_READONLY | NOT WS_BORDER,0,HIDC_DEST_CREATETIME_EDIT
-    EDITTEXT        IDC_DEST_MODIFYTIME_EDIT,111,183,176,14,ES_AUTOHSCROLL | 
-                    ES_READONLY | NOT WS_BORDER,0,HIDC_DEST_MODIFYTIME_EDIT
-    ICON            IDI_QUESTION_ICON,IDC_001_STATIC,10,15,20,20,
-                    SS_REALSIZEIMAGE
-    LTEXT           "Destination file exists and is smaller than source file.\nPossible reasons:\n- copying/moving source file wasn't finished (copy rest)\n- file being copied is in another version than destination file (recopy)",
-                    IDC_002_STATIC,41,7,246,41
+    PUSHBUTTON      "Cop&y rest all",IDC_COPY_REST_ALL_BUTTON,7,222,83,14,0,0,HIDC_COPY_REST_ALL_BUTTON
+    PUSHBUTTON      "Recopy &all",IDC_RECOPY_ALL_BUTTON,91,222,110,14,0,0,HIDC_RECOPY_ALL_BUTTON
+    PUSHBUTTON      "I&gnore all",IDC_IGNORE_ALL_BUTTON,201,222,86,14,0,0,HIDC_IGNORE_ALL_BUTTON
+    EDITTEXT        IDC_FILENAME_EDIT,111,62,176,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,0,HIDC_FILENAME_EDIT
+    EDITTEXT        IDC_FILESIZE_EDIT,111,77,176,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,0,HIDC_FILESIZE_EDIT
+    EDITTEXT        IDC_CREATETIME_EDIT,111,92,176,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,0,HIDC_CREATETIME_EDIT
+    EDITTEXT        IDC_MODIFY_TIME_EDIT,111,107,176,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,0,HIDC_MODIFY_TIME_EDIT
+    EDITTEXT        IDC_DEST_FILENAME_EDIT,111,138,176,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,0,HIDC_DEST_FILENAME_EDIT
+    EDITTEXT        IDC_DEST_FILESIZE_EDIT,111,153,176,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,0,HIDC_DEST_FILESIZE_EDIT
+    EDITTEXT        IDC_DEST_CREATETIME_EDIT,111,168,176,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,0,HIDC_DEST_CREATETIME_EDIT
+    EDITTEXT        IDC_DEST_MODIFYTIME_EDIT,111,183,176,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,0,HIDC_DEST_MODIFYTIME_EDIT
+    ICON            IDI_QUESTION_ICON,IDC_001_STATIC,10,15,20,20,SS_REALSIZEIMAGE
+    LTEXT           "Destination file exists and is smaller than source file.\nPossible reasons:\n- copying/moving source file wasn't finished (copy rest)\n- file being copied is in another version than destination file (recopy)",IDC_002_STATIC,41,7,246,41
     LTEXT           "Name:",IDC_003_STATIC,48,62,61,8
     LTEXT           "Size:",IDC_004_STATIC,48,77,61,8
     LTEXT           "Created:",IDC_005_STATIC,48,92,61,8
@@ -293,45 +228,29 @@
     LTEXT           "Created:",IDC_010_STATIC,48,168,61,8
     LTEXT           "Last modified:",IDC_011_STATIC,48,183,61,8
     LTEXT           "Destination file:",IDC_012_STATIC,41,125,246,8
-    LTEXT           "What would you like to do ?",IDC_013_STATIC,41,203,246,
-                    8
+    LTEXT           "What would you like to do ?",IDC_013_STATIC,41,203,246,8
 END
 
 IDD_FEEDBACK_SMALL_REPLACE_FILES_DIALOG DIALOGEX 0, 0, 294, 258
-STYLE DS_SYSMODAL | DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | 
-    WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SYSMODAL | DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Copy handler - destination file found"
 FONT 8, "Tahoma", 0, 0, 0x1
 BEGIN
-    PUSHBUTTON      "R&ecopy",IDC_RECOPY_BUTTON,7,237,143,14,0,0,
-                    HIDC_RECOPY_BUTTON
-    DEFPUSHBUTTON   "&Ignore",IDC_IGNORE_BUTTON,151,237,86,14,0,0,
-                    HIDC_IGNORE_BUTTON
+    PUSHBUTTON      "R&ecopy",IDC_RECOPY_BUTTON,7,237,143,14,0,0,HIDC_RECOPY_BUTTON
+    DEFPUSHBUTTON   "&Ignore",IDC_IGNORE_BUTTON,151,237,86,14,0,0,HIDC_IGNORE_BUTTON
     PUSHBUTTON      "&Cancel",IDCANCEL,237,237,50,14,0,0,HIDCANCEL
-    PUSHBUTTON      "Recopy &all",IDC_RECOPY_ALL_BUTTON,7,222,143,14,0,0,
-                    HIDC_RECOPY_ALL_BUTTON
-    PUSHBUTTON      "I&gnore all",IDC_IGNORE_ALL_BUTTON,151,222,136,14,0,0,
-                    HIDC_IGNORE_ALL_BUTTON
-    EDITTEXT        IDC_FILENAME_EDIT,111,64,173,14,ES_AUTOHSCROLL | 
-                    ES_READONLY | NOT WS_BORDER,0,HIDC_FILENAME_EDIT
-    EDITTEXT        IDC_FILESIZE_EDIT,111,79,173,14,ES_AUTOHSCROLL | 
-                    ES_READONLY | NOT WS_BORDER,0,HIDC_FILESIZE_EDIT
-    EDITTEXT        IDC_CREATETIME_EDIT,111,94,173,14,ES_AUTOHSCROLL | 
-                    ES_READONLY | NOT WS_BORDER,0,HIDC_CREATETIME_EDIT
-    EDITTEXT        IDC_MODIFY_TIME_EDIT,111,109,173,14,ES_AUTOHSCROLL | 
-                    ES_READONLY | NOT WS_BORDER,0,HIDC_MODIFY_TIME_EDIT
-    EDITTEXT        IDC_DEST_FILENAME_EDIT,111,138,173,14,ES_AUTOHSCROLL | 
-                    ES_READONLY | NOT WS_BORDER,0,HIDC_DEST_FILENAME_EDIT
-    EDITTEXT        IDC_DEST_FILESIZE_EDIT,111,153,173,14,ES_AUTOHSCROLL | 
-                    ES_READONLY | NOT WS_BORDER,0,HIDC_DEST_FILESIZE_EDIT
-    EDITTEXT        IDC_DEST_CREATETIME_EDIT,111,168,173,14,ES_AUTOHSCROLL | 
-                    ES_READONLY | NOT WS_BORDER,0,HIDC_DEST_CREATETIME_EDIT
-    EDITTEXT        IDC_DEST_MODIFYTIME_EDIT,111,183,173,14,ES_AUTOHSCROLL | 
-                    ES_READONLY | NOT WS_BORDER,0,HIDC_DEST_MODIFYTIME_EDIT
-    ICON            IDI_QUESTION_ICON,IDC_001_STATIC,10,15,20,20,
-                    SS_REALSIZEIMAGE
-    LTEXT           "Destination file exists and has equal or greater size than source file.\nPossible reasons:\n- file being copied is in another version than destination one (recopy/ignore)\n- source and destination files are identical (ignore)",
-                    IDC_002_STATIC,41,7,246,44
+    PUSHBUTTON      "Recopy &all",IDC_RECOPY_ALL_BUTTON,7,222,143,14,0,0,HIDC_RECOPY_ALL_BUTTON
+    PUSHBUTTON      "I&gnore all",IDC_IGNORE_ALL_BUTTON,151,222,136,14,0,0,HIDC_IGNORE_ALL_BUTTON
+    EDITTEXT        IDC_FILENAME_EDIT,111,64,173,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,0,HIDC_FILENAME_EDIT
+    EDITTEXT        IDC_FILESIZE_EDIT,111,79,173,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,0,HIDC_FILESIZE_EDIT
+    EDITTEXT        IDC_CREATETIME_EDIT,111,94,173,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,0,HIDC_CREATETIME_EDIT
+    EDITTEXT        IDC_MODIFY_TIME_EDIT,111,109,173,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,0,HIDC_MODIFY_TIME_EDIT
+    EDITTEXT        IDC_DEST_FILENAME_EDIT,111,138,173,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,0,HIDC_DEST_FILENAME_EDIT
+    EDITTEXT        IDC_DEST_FILESIZE_EDIT,111,153,173,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,0,HIDC_DEST_FILESIZE_EDIT
+    EDITTEXT        IDC_DEST_CREATETIME_EDIT,111,168,173,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,0,HIDC_DEST_CREATETIME_EDIT
+    EDITTEXT        IDC_DEST_MODIFYTIME_EDIT,111,183,173,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,0,HIDC_DEST_MODIFYTIME_EDIT
+    ICON            IDI_QUESTION_ICON,IDC_001_STATIC,10,15,20,20,SS_REALSIZEIMAGE
+    LTEXT           "Destination file exists and has equal or greater size than source file.\nPossible reasons:\n- file being copied is in another version than destination one (recopy/ignore)\n- source and destination files are identical (ignore)",IDC_002_STATIC,41,7,246,44
     LTEXT           "Name:",IDC_003_STATIC,48,64,61,8
     LTEXT           "Size:",IDC_004_STATIC,48,79,61,8
     LTEXT           "Created:",IDC_005_STATIC,48,94,61,8
@@ -342,108 +261,72 @@
     LTEXT           "Created:",IDC_010_STATIC,48,168,61,8
     LTEXT           "Last modified:",IDC_011_STATIC,48,183,61,8
     LTEXT           "Destination file:",IDC_012_STATIC,41,125,246,8
-    LTEXT           "What would you like to do ?",IDC_013_STATIC,41,203,246,
-                    8
+    LTEXT           "What would you like to do ?",IDC_013_STATIC,41,203,246,8
 END
 
 IDD_MINIVIEW_DIALOG DIALOGEX 0, 0, 90, 23
-STYLE DS_ABSALIGN | DS_SYSMODAL | DS_SETFONT | DS_MODALFRAME | 
-    DS_SETFOREGROUND | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION
+STYLE DS_ABSALIGN | DS_SYSMODAL | DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION
 EXSTYLE WS_EX_TOOLWINDOW
 CAPTION "Status"
 FONT 8, "Tahoma", 0, 0, 0x1
 BEGIN
-    LISTBOX         IDC_PROGRESS_LIST,7,7,76,9,LBS_OWNERDRAWFIXED | 
-                    LBS_NOINTEGRALHEIGHT | LBS_NOSEL | NOT WS_BORDER | 
-                    WS_TABSTOP,0,HIDC_PROGRESS_LIST
+    LISTBOX         IDC_PROGRESS_LIST,7,7,76,9,LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_NOSEL | NOT WS_BORDER | WS_TABSTOP,0,HIDC_PROGRESS_LIST
 END
 
 IDD_OPTIONS_DIALOG DIALOGEX 0, 0, 396, 214
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Options"
 FONT 8, "Tahoma", 0, 0, 0x1
 BEGIN
     DEFPUSHBUTTON   "&OK",IDOK,173,193,50,14,0,0,HIDOK
     PUSHBUTTON      "&Cancel",IDCANCEL,227,193,50,14,0,0,HIDCANCEL
-    LISTBOX         IDC_PROPERTIES_LIST,7,7,382,179,LBS_OWNERDRAWFIXED | 
-                    LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | 
-                    WS_TABSTOP,0,HIDC_PROPERTIES_LIST
-    PUSHBUTTON      "&Apply",IDC_APPLY_BUTTON,283,193,50,14,0,0,
-                    HIDC_APPLY_BUTTON
-    PUSHBUTTON      "&Help",IDC_HELP_BUTTON,339,193,50,14,0,0,
-                    HIDC_HELP_BUTTON
+    LISTBOX         IDC_PROPERTIES_LIST,7,7,382,179,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP,0,HIDC_PROPERTIES_LIST
+    PUSHBUTTON      "&Apply",IDC_APPLY_BUTTON,283,193,50,14,0,0,HIDC_APPLY_BUTTON
+    PUSHBUTTON      "&Help",IDC_HELP_BUTTON,339,193,50,14,0,0,HIDC_HELP_BUTTON
 END
 
 IDD_REPLACE_PATHS_DIALOG DIALOGEX 0, 0, 342, 148
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Partial replace of source paths"
 FONT 8, "Tahoma", 0, 0, 0x1
 BEGIN
-    LISTBOX         IDC_PATHS_LIST,7,17,328,52,LBS_SORT | 
-                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP,0,
-                    HIDC_PATHS_LIST
-    EDITTEXT        IDC_SOURCE_EDIT,7,70,328,14,ES_AUTOHSCROLL,0,
-                    HIDC_SOURCE_EDIT
-    EDITTEXT        IDC_DESTINATION_EDIT,7,98,309,14,ES_AUTOHSCROLL,0,
-                    HIDC_DESTINATION_EDIT
-    PUSHBUTTON      "...",IDC_BROWSE_BUTTON,319,98,16,14,0,0,
-                    HIDC_BROWSE_BUTTON
+    LISTBOX         IDC_PATHS_LIST,7,17,328,52,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP,0,HIDC_PATHS_LIST
+    EDITTEXT        IDC_SOURCE_EDIT,7,70,328,14,ES_AUTOHSCROLL,0,HIDC_SOURCE_EDIT
+    EDITTEXT        IDC_DESTINATION_EDIT,7,98,309,14,ES_AUTOHSCROLL,0,HIDC_DESTINATION_EDIT
+    PUSHBUTTON      "...",IDC_BROWSE_BUTTON,319,98,16,14,0,0,HIDC_BROWSE_BUTTON
     DEFPUSHBUTTON   "OK",IDOK,173,127,50,14,0,0,HIDOK
     PUSHBUTTON      "&Cancel",IDCANCEL,229,127,50,14,0,0,HIDCANCEL
     LTEXT           "Source paths:",IDC_001_STATIC,7,7,328,8
     LTEXT           "Change to:",IDC_002_STATIC,7,89,328,8
-    PUSHBUTTON      "&Help",IDC_HELP_BUTTON,285,127,50,14,0,0,
-                    HIDC_HELP_BUTTON
+    PUSHBUTTON      "&Help",IDC_HELP_BUTTON,285,127,50,14,0,0,HIDC_HELP_BUTTON
 END
 
 IDD_STATUS_DIALOG DIALOGEX 0, 0, 478, 250
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_MINIMIZEBOX | 
-    WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_APPWINDOW
 CAPTION "Status"
 FONT 8, "Tahoma", 0, 0, 0x1
 BEGIN
-    CONTROL         "List1",IDC_STATUS_LIST,"SysListView32",LVS_REPORT | 
-                    LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | 
-                    WS_BORDER | WS_TABSTOP,7,19,224,171,0,HIDC_STATUS_LIST
-    PUSHBUTTON      "&Pause",IDC_PAUSE_BUTTON,7,196,44,14,0,0,
-                    HIDC_PAUSE_BUTTON
-    PUSHBUTTON      "&Restart",IDC_RESTART_BUTTON,97,196,44,14,0,0,
-                    HIDC_RESTART_BUTTON
-    PUSHBUTTON      "&Cancel",IDC_CANCEL_BUTTON,142,196,44,14,0,0,
-                    HIDC_CANCEL_BUTTON
-    PUSHBUTTON      "&Remove",IDC_DELETE_BUTTON,187,196,44,14,0,0,
-                    HIDC_DELETE_BUTTON
-    PUSHBUTTON      "Pause/all",IDC_PAUSE_ALL_BUTTON,7,213,71,14,0,0,
-                    HIDC_PAUSE_ALL_BUTTON
-    PUSHBUTTON      "Resume/all",IDC_START_ALL_BUTTON,79,213,71,14,0,0,
-                    HIDC_START_ALL_BUTTON
-    PUSHBUTTON      "Cancel/all",IDC_CANCEL_ALL_BUTTON,7,229,71,14,0,0,
-                    HIDC_CANCEL_ALL_BUTTON
-    PUSHBUTTON      "Remove/all",IDC_REMOVE_FINISHED_BUTTON,79,229,71,14,0,0,
-                    HIDC_REMOVE_FINISHED_BUTTON
-    PUSHBUTTON      "Restart/all",IDC_RESTART_ALL_BUTTON,151,229,71,14,0,0,
-                    HIDC_RESTART_ALL_BUTTON
-    PUSHBUTTON      "&Advanced >",IDC_ADVANCED_BUTTON,160,212,71,14,0,0,
-                    HIDC_ADVANCED_BUTTON
-    PUSHBUTTON      "",IDC_STICK_BUTTON,471,243,7,7,BS_CENTER | BS_VCENTER | 
-                    BS_FLAT,0,HIDC_STICK_BUTTON
-    PUSHBUTTON      "&<<",IDC_ROLL_UNROLL_BUTTON,212,7,19,12,0,0,
-                    HIDC_ROLL_UNROLL_BUTTON
-    PUSHBUTTON      "...",IDC_SET_BUFFERSIZE_BUTTON,458,72,13,14,0,0,
-                    HIDC_SET_BUFFERSIZE_BUTTON
-    PUSHBUTTON      ">",IDC_SET_PRIORITY_BUTTON,458,88,13,14,0,0,
-                    HIDC_SET_PRIORITY_BUTTON
-    PUSHBUTTON      "View log",IDC_SHOW_LOG_BUTTON,249,116,60,14,0,0,
-                    HIDC_SHOW_LOG_BUTTON
+    CONTROL         "List1",IDC_STATUS_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,19,224,171,0,HIDC_STATUS_LIST
+    PUSHBUTTON      "&Pause",IDC_PAUSE_BUTTON,7,196,44,14,0,0,HIDC_PAUSE_BUTTON
+    PUSHBUTTON      "&Restart",IDC_RESTART_BUTTON,97,196,44,14,0,0,HIDC_RESTART_BUTTON
+    PUSHBUTTON      "&Cancel",IDC_CANCEL_BUTTON,142,196,44,14,0,0,HIDC_CANCEL_BUTTON
+    PUSHBUTTON      "&Remove",IDC_DELETE_BUTTON,187,196,44,14,0,0,HIDC_DELETE_BUTTON
+    PUSHBUTTON      "Pause/all",IDC_PAUSE_ALL_BUTTON,7,213,71,14,0,0,HIDC_PAUSE_ALL_BUTTON
+    PUSHBUTTON      "Resume/all",IDC_START_ALL_BUTTON,79,213,71,14,0,0,HIDC_START_ALL_BUTTON
+    PUSHBUTTON      "Cancel/all",IDC_CANCEL_ALL_BUTTON,7,229,71,14,0,0,HIDC_CANCEL_ALL_BUTTON
+    PUSHBUTTON      "Remove/all",IDC_REMOVE_FINISHED_BUTTON,79,229,71,14,0,0,HIDC_REMOVE_FINISHED_BUTTON
+    PUSHBUTTON      "Restart/all",IDC_RESTART_ALL_BUTTON,151,229,71,14,0,0,HIDC_RESTART_ALL_BUTTON
+    PUSHBUTTON      "&Advanced >",IDC_ADVANCED_BUTTON,160,212,71,14,0,0,HIDC_ADVANCED_BUTTON
+    PUSHBUTTON      "",IDC_STICK_BUTTON,471,243,7,7,BS_CENTER | BS_VCENTER | BS_FLAT,0,HIDC_STICK_BUTTON
+    PUSHBUTTON      "&<<",IDC_ROLL_UNROLL_BUTTON,212,7,19,12,0,0,HIDC_ROLL_UNROLL_BUTTON
+    PUSHBUTTON      "...",IDC_SET_BUFFERSIZE_BUTTON,458,72,13,14,0,0,HIDC_SET_BUFFERSIZE_BUTTON
+    PUSHBUTTON      ">",IDC_SET_PRIORITY_BUTTON,458,88,13,14,0,0,HIDC_SET_PRIORITY_BUTTON
+    PUSHBUTTON      "View log",IDC_SHOW_LOG_BUTTON,249,116,60,14,0,0,HIDC_SHOW_LOG_BUTTON
     LTEXT           "Operations list:",IDC_001_STATIC,7,7,197,8
-    CONTROL         "Progress1",IDC_ALL_PROGRESS,"msctls_progress32",0x1,312,
-                    234,159,9
+    CONTROL         "Progress1",IDC_ALL_PROGRESS,"msctls_progress32",PBS_SMOOTH,312,234,159,9
     LTEXT           "Progress:",IDC_002_STATIC,249,235,62,8
-    CONTROL         "Progress2",IDC_TASK_PROGRESS,"msctls_progress32",0x0,
-                    312,181,159,6
+    CONTROL         "Progress2",IDC_TASK_PROGRESS,"msctls_progress32",0x0,312,181,159,6
     LTEXT           "Progress:",IDC_003_STATIC,249,179,62,8
     LTEXT           "Destination object:",IDC_004_STATIC,249,59,62,8
     LTEXT           "Source object:",IDC_005_STATIC,249,47,62,8
@@ -456,140 +339,85 @@
     LTEXT           "Transfer:",IDC_012_STATIC,249,220,62,8
     LTEXT           "Processed:",IDC_013_STATIC,249,205,62,8
     CTEXT           "Global statistics",IDC_014_STATIC,293,191,84,8
-    CTEXT           "Current selection statistics",IDC_015_STATIC,293,7,113,
-                    8
+    CTEXT           "Current selection statistics",IDC_015_STATIC,293,7,113,8
     CONTROL         "",IDC_016_STATIC,"Static",SS_ETCHEDHORZ,384,194,87,1
     CONTROL         "",IDC_017_STATIC,"Static",SS_ETCHEDHORZ,411,10,61,1
     CONTROL         "",IDC_018_STATIC,"Static",SS_ETCHEDHORZ,249,194,37,1
     CONTROL         "",IDC_019_STATIC,"Static",SS_ETCHEDHORZ,249,10,38,1
     LTEXT           "Time:",IDC_020_STATIC,249,152,62,8
-    PUSHBUTTON      "&Resume",IDC_RESUME_BUTTON,52,196,44,14,0,0,
-                    HIDC_RESUME_BUTTON
-    EDITTEXT        IDC_ERRORS_EDIT,312,104,159,26,ES_MULTILINE | 
-                    ES_AUTOVSCROLL | ES_READONLY | NOT WS_BORDER | 
-                    WS_VSCROLL,WS_EX_STATICEDGE,HIDC_ERRORS_EDIT
+    PUSHBUTTON      "&Resume",IDC_RESUME_BUTTON,52,196,44,14,0,0,HIDC_RESUME_BUTTON
+    EDITTEXT        IDC_ERRORS_EDIT,312,104,159,26,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | NOT WS_BORDER | WS_VSCROLL,WS_EX_STATICEDGE,HIDC_ERRORS_EDIT
     LTEXT           "Associated file:",IDC_021_STATIC,249,19,62,8
-    CONTROL         "",IDC_ASSOCIATEDFILES__STATIC,"STATICEX",0x4,312,17,159,
-                    12,WS_EX_STATICEDGE,HIDC_ASSOCIATEDFILES__STATIC
-    CONTROL         "",IDC_OPERATION_STATIC,"STATICEX",0x4,312,32,159,12,
-                    WS_EX_STATICEDGE,HIDC_OPERATION_STATIC
-    CONTROL         "",IDC_SOURCE_STATIC,"STATICEX",0x4,312,45,159,12,
-                    WS_EX_STATICEDGE,HIDC_SOURCE_STATIC
-    CONTROL         "",IDC_DESTINATION_STATIC,"STATICEX",0x4,312,58,159,12,
-                    WS_EX_STATICEDGE,HIDC_DESTINATION_STATIC
-    CONTROL         "",IDC_PROGRESS_STATIC,"STATICEX",0x4,312,135,159,12,
-                    WS_EX_STATICEDGE,HIDC_PROGRESS_STATIC
-    CONTROL         "",IDC_TIME_STATIC,"STATICEX",0x4,312,150,159,12,
-                    WS_EX_STATICEDGE,HIDC_TIME_STATIC
-    CONTROL         "",IDC_TRANSFER_STATIC,"STATICEX",0x4,312,165,159,12,
-                    WS_EX_STATICEDGE,HIDC_TRANSFER_STATIC
-    CONTROL         "",IDC_OVERALL_PROGRESS_STATIC,"STATICEX",0x4,312,203,
-                    159,12,WS_EX_STATICEDGE,HIDC_OVERALL_PROGRESS_STATIC
-    CONTROL         "",IDC_OVERALL_TRANSFER_STATIC,"STATICEX",0x4,312,218,
-                    159,12,WS_EX_STATICEDGE,HIDC_OVERALL_TRANSFER_STATIC
-    CONTROL         "",IDC_BUFFERSIZE_STATIC,"STATICEX",0x4,312,74,143,12,
-                    WS_EX_STATICEDGE,HIDC_BUFFERSIZE_STATIC
-    CONTROL         "",IDC_PRIORITY_STATIC,"STATICEX",0x4,312,88,143,12,
-                    WS_EX_STATICEDGE,HIDC_PRIORITY_STATIC
+    CONTROL         "",IDC_ASSOCIATEDFILES__STATIC,"STATICEX",0x4,312,17,159,12,WS_EX_STATICEDGE,HIDC_ASSOCIATEDFILES__STATIC
+    CONTROL         "",IDC_OPERATION_STATIC,"STATICEX",0x4,312,32,159,12,WS_EX_STATICEDGE,HIDC_OPERATION_STATIC
+    CONTROL         "",IDC_SOURCE_STATIC,"STATICEX",0x4,312,45,159,12,WS_EX_STATICEDGE,HIDC_SOURCE_STATIC
+    CONTROL         "",IDC_DESTINATION_STATIC,"STATICEX",0x4,312,58,159,12,WS_EX_STATICEDGE,HIDC_DESTINATION_STATIC
+    CONTROL         "",IDC_PROGRESS_STATIC,"STATICEX",0x4,312,135,159,12,WS_EX_STATICEDGE,HIDC_PROGRESS_STATIC
+    CONTROL         "",IDC_TIME_STATIC,"STATICEX",0x4,312,150,159,12,WS_EX_STATICEDGE,HIDC_TIME_STATIC
+    CONTROL         "",IDC_TRANSFER_STATIC,"STATICEX",0x4,312,165,159,12,WS_EX_STATICEDGE,HIDC_TRANSFER_STATIC
+    CONTROL         "",IDC_OVERALL_PROGRESS_STATIC,"STATICEX",0x4,312,203,159,12,WS_EX_STATICEDGE,HIDC_OVERALL_PROGRESS_STATIC
+    CONTROL         "",IDC_OVERALL_TRANSFER_STATIC,"STATICEX",0x4,312,218,159,12,WS_EX_STATICEDGE,HIDC_OVERALL_TRANSFER_STATIC
+    CONTROL         "",IDC_BUFFERSIZE_STATIC,"STATICEX",0x4,312,74,143,12,WS_EX_STATICEDGE,HIDC_BUFFERSIZE_STATIC
+    CONTROL         "",IDC_PRIORITY_STATIC,"STATICEX",0x4,312,88,143,12,WS_EX_STATICEDGE,HIDC_PRIORITY_STATIC
 END
 
 IDD_FEEDBACK_NOTENOUGHPLACE_DIALOG DIALOGEX 0, 0, 254, 138
-STYLE DS_SYSMODAL | DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | 
-    WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SYSMODAL | DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Copy handler - not enough free space"
 FONT 8, "Tahoma", 0, 0, 0x1
 BEGIN
-    PUSHBUTTON      "&Retry",IDC_RETRY_BUTTON,78,117,57,14,0,0,
-                    HIDC_RETRY_BUTTON
-    PUSHBUTTON      "C&ontinue",IDC_IGNORE_BUTTON,136,117,57,14,0,0,
-                    HIDC_IGNORE_BUTTON
+    PUSHBUTTON      "&Retry",IDC_RETRY_BUTTON,78,117,57,14,0,0,HIDC_RETRY_BUTTON
+    PUSHBUTTON      "C&ontinue",IDC_IGNORE_BUTTON,136,117,57,14,0,0,HIDC_IGNORE_BUTTON
     PUSHBUTTON      "&Cancel",IDCANCEL,197,117,50,14,0,0,HIDCANCEL
-    LISTBOX         IDC_FILES_LIST,41,35,206,44,LBS_NOINTEGRALHEIGHT | 
-                    WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,0,HIDC_FILES_LIST
-    LTEXT           "",IDC_REQUIRED_STATIC,108,85,139,8,0,0,
-                    HIDC_REQUIRED_STATIC
-    LTEXT           "",IDC_AVAILABLE_STATIC,108,97,139,8,0,0,
-                    HIDC_AVAILABLE_STATIC
-    ICON            IDI_WARNING_ICON,IDC_001_STATIC,9,11,20,20,
-                    SS_REALSIZEIMAGE
+    LISTBOX         IDC_FILES_LIST,41,35,206,44,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,0,HIDC_FILES_LIST
+    LTEXT           "",IDC_REQUIRED_STATIC,108,85,139,8,0,0,HIDC_REQUIRED_STATIC
+    LTEXT           "",IDC_AVAILABLE_STATIC,108,97,139,8,0,0,HIDC_AVAILABLE_STATIC
+    ICON            IDI_WARNING_ICON,IDC_001_STATIC,9,11,20,20,SS_REALSIZEIMAGE
     LTEXT           "Required space:",IDC_003_STATIC,41,85,59,8
     LTEXT           "Space available:",IDC_004_STATIC,41,97,59,8
     LTEXT           "",IDC_HEADER_STATIC,41,7,206,24
 END
 
 IDD_SHUTDOWN_DIALOG DIALOGEX 0, 0, 186, 86
-STYLE DS_SYSMODAL | DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | 
-    WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SYSMODAL | DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Copy handler"
 FONT 8, "Tahoma", 0, 0, 0x1
 BEGIN
     DEFPUSHBUTTON   "&Cancel",IDCANCEL,67,65,50,14,0,0,HIDCANCEL
-    ICON            IDI_SHUTDOWN_ICON,IDC_001_STATIC,7,10,20,20,
-                    SS_REALSIZEIMAGE
-    LTEXT           "All copy/move operations were finished. Attempt to shut down the system will be performed in:",
-                    IDC_002_STATIC,37,7,142,24
+    ICON            IDI_SHUTDOWN_ICON,IDC_001_STATIC,7,10,20,20,SS_REALSIZEIMAGE
+    LTEXT           "All copy/move operations were finished. Attempt to shut down the system will be performed in:",IDC_002_STATIC,37,7,142,24
     CTEXT           "",IDC_TIME_STATIC,7,35,172,8
-    CONTROL         "Progress1",IDC_TIME_PROGRESS,"msctls_progress32",0x1,7,
-                    48,172,9
+    CONTROL         "Progress1",IDC_TIME_PROGRESS,"msctls_progress32",PBS_SMOOTH,7,48,172,9
 END
 
 IDD_CUSTOM_COPY_DIALOG DIALOGEX 0, 0, 349, 319
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_APPWINDOW
 CAPTION "Copying/moving parameters"
 FONT 8, "Tahoma", 0, 0, 0x1
 BEGIN
-    CONTROL         "List1",IDC_FILES_LIST,"SysListView32",LVS_REPORT | 
-                    LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | 
-                    LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,16,279,57,
-                    0,HIDC_FILES_LIST
-    PUSHBUTTON      "Add &file(s)...",IDC_ADDFILE_BUTTON,289,15,53,14,0,0,
-                    HIDC_ADDFILE_BUTTON
-    PUSHBUTTON      "Add f&older...",IDC_ADDDIR_BUTTON,289,30,53,14,0,0,
-                    HIDC_ADDDIR_BUTTON
-    PUSHBUTTON      "&Delete",IDC_REMOVEFILEFOLDER_BUTTON,289,45,53,14,0,0,
-                    HIDC_REMOVEFILEFOLDER_BUTTON
-    PUSHBUTTON      "&Import...",IDC_IMPORT_BUTTON,289,60,53,14,0,0,
-                    HIDC_IMPORT_BUTTON
-    CONTROL         "",IDC_DESTPATH_COMBOBOXEX,"ComboBoxEx32",CBS_DROPDOWN | 
-                    CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP,7,
-                    86,314,136,0,HIDC_DESTPATH_COMBOBOXEX
-    PUSHBUTTON      "...",IDC_DESTBROWSE_BUTTON,324,85,18,14,0,0,
-                    HIDC_DESTBROWSE_BUTTON
-    COMBOBOX        IDC_OPERATION_COMBO,13,124,117,143,CBS_DROPDOWNLIST | 
-                    WS_VSCROLL | WS_TABSTOP,0,HIDC_OPERATION_COMBO
-    COMBOBOX        IDC_PRIORITY_COMBO,137,124,122,75,CBS_DROPDOWNLIST | 
-                    WS_VSCROLL | WS_TABSTOP,0,HIDC_PRIORITY_COMBO
-    EDITTEXT        IDC_COUNT_EDIT,262,124,80,14,ES_AUTOHSCROLL,0,
-                    HIDC_COUNT_EDIT
-    CONTROL         "Spin1",IDC_COUNT_SPIN,"msctls_updown32",UDS_SETBUDDYINT | 
-                    UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,331,124,
-                    11,14
-    LISTBOX         IDC_BUFFERSIZES_LIST,13,152,275,20,LBS_NOINTEGRALHEIGHT | 
-                    LBS_MULTICOLUMN | LBS_NOSEL | WS_VSCROLL | WS_TABSTOP,0,
-                    HIDC_BUFFERSIZES_LIST
-    PUSHBUTTON      "&Change...",IDC_BUFFERSIZES_BUTTON,292,152,50,14,0,0,
-                    HIDC_BUFFERSIZES_BUTTON
-    CONTROL         "Filtering",IDC_FILTERS_CHECK,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,7,177,61,10,0,HIDC_FILTERS_CHECK
-    CONTROL         "List2",IDC_FILTERS_LIST,"SysListView32",LVS_REPORT | 
-                    WS_BORDER | WS_TABSTOP,13,190,303,46,0,HIDC_FILTERS_LIST
-    PUSHBUTTON      "+",IDC_ADDFILTER_BUTTON,320,190,22,14,0,0,
-                    HIDC_ADDFILTER_BUTTON
-    PUSHBUTTON      "-",IDC_REMOVEFILTER_BUTTON,320,206,22,14,0,0,
-                    HIDC_REMOVEFILTER_BUTTON
-    CONTROL         "Advanced options",IDC_ADVANCED_CHECK,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,242,84,10,0,
-                    HIDC_ADVANCED_CHECK
-    CONTROL         "Do not create destination directories - copy files loosely to destination folder",
-                    IDC_IGNOREFOLDERS_CHECK,"Button",BS_AUTOCHECKBOX | 
-                    BS_NOTIFY | WS_TABSTOP,13,255,329,10,0,
-                    HIDC_IGNOREFOLDERS_CHECK
-    CONTROL         "Do not copy/move contents of files - only create it (empty)",
-                    IDC_ONLYSTRUCTURE_CHECK,"Button",BS_AUTOCHECKBOX | 
-                    BS_NOTIFY | WS_TABSTOP,13,277,329,10,0,
-                    HIDC_ONLYSTRUCTURE_CHECK
+    CONTROL         "List1",IDC_FILES_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,16,279,57,0,HIDC_FILES_LIST
+    PUSHBUTTON      "Add &file(s)...",IDC_ADDFILE_BUTTON,289,15,53,14,0,0,HIDC_ADDFILE_BUTTON
+    PUSHBUTTON      "Add f&older...",IDC_ADDDIR_BUTTON,289,30,53,14,0,0,HIDC_ADDDIR_BUTTON
+    PUSHBUTTON      "&Delete",IDC_REMOVEFILEFOLDER_BUTTON,289,45,53,14,0,0,HIDC_REMOVEFILEFOLDER_BUTTON
+    PUSHBUTTON      "&Import...",IDC_IMPORT_BUTTON,289,60,53,14,0,0,HIDC_IMPORT_BUTTON
+    CONTROL         "",IDC_DESTPATH_COMBOBOXEX,"ComboBoxEx32",CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP,7,86,314,136,0,HIDC_DESTPATH_COMBOBOXEX
+    PUSHBUTTON      "...",IDC_DESTBROWSE_BUTTON,324,85,18,14,0,0,HIDC_DESTBROWSE_BUTTON
+    COMBOBOX        IDC_OPERATION_COMBO,13,124,117,143,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0,HIDC_OPERATION_COMBO
+    COMBOBOX        IDC_PRIORITY_COMBO,137,124,122,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0,HIDC_PRIORITY_COMBO
+    EDITTEXT        IDC_COUNT_EDIT,262,124,80,14,ES_AUTOHSCROLL,0,HIDC_COUNT_EDIT
+    CONTROL         "Spin1",IDC_COUNT_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,331,124,11,14
+    LISTBOX         IDC_BUFFERSIZES_LIST,13,152,275,20,LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_NOSEL | WS_VSCROLL | WS_TABSTOP,0,HIDC_BUFFERSIZES_LIST
+    PUSHBUTTON      "&Change...",IDC_BUFFERSIZES_BUTTON,292,152,50,14,0,0,HIDC_BUFFERSIZES_BUTTON
+    CONTROL         "Filtering",IDC_FILTERS_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,177,61,10,0,HIDC_FILTERS_CHECK
+    CONTROL         "List2",IDC_FILTERS_LIST,"SysListView32",LVS_REPORT | WS_BORDER | WS_TABSTOP,13,190,303,46,0,HIDC_FILTERS_LIST
+    PUSHBUTTON      "+",IDC_ADDFILTER_BUTTON,320,190,22,14,0,0,HIDC_ADDFILTER_BUTTON
+    PUSHBUTTON      "-",IDC_REMOVEFILTER_BUTTON,320,206,22,14,0,0,HIDC_REMOVEFILTER_BUTTON
+    CONTROL         "Advanced options",IDC_ADVANCED_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,242,84,10,0,HIDC_ADVANCED_CHECK
+    CONTROL         "Do not create destination directories - copy files loosely to destination folder",IDC_IGNOREFOLDERS_CHECK,
+                    "Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,13,255,329,10,0,HIDC_IGNOREFOLDERS_CHECK
+    CONTROL         "Do not copy/move contents of files - only create it (empty)",IDC_ONLYSTRUCTURE_CHECK,
+                    "Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,13,277,329,10,0,HIDC_ONLYSTRUCTURE_CHECK
     PUSHBUTTON      "&OK",IDOK,186,298,50,14,0,0,HIDOK
     PUSHBUTTON      "&Cancel",IDCANCEL,239,298,50,14,0,0,HIDCANCEL
     LTEXT           "Source files/folders:",IDC_001_STATIC,7,7,335,8
@@ -604,193 +432,121 @@
     CONTROL         "",IDC_BAR2_STATIC,"Static",SS_ETCHEDHORZ,105,107,237,1
     CTEXT           "Standard options",IDC_007_STATIC,20,104,80,8
     CONTROL         "",IDC_BAR1_STATIC,"Static",SS_ETCHEDHORZ,7,107,8,1
-    CONTROL         "Create directory structure in destination folder (relatively to root directory)",
-                    IDC_FORCEDIRECTORIES_CHECK,"Button",BS_AUTOCHECKBOX | 
-                    BS_NOTIFY | WS_TABSTOP,13,266,329,10,0,
-                    HIDC_FORCEDIRECTORIES_CHECK
-    PUSHBUTTON      "&Help",IDC_HELP_BUTTON,292,298,50,14,0,0,
-                    HIDC_HELP_BUTTON
+    CONTROL         "Create directory structure in destination folder (relatively to root directory)",IDC_FORCEDIRECTORIES_CHECK,
+                    "Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,13,266,329,10,0,HIDC_FORCEDIRECTORIES_CHECK
+    PUSHBUTTON      "&Help",IDC_HELP_BUTTON,292,298,50,14,0,0,HIDC_HELP_BUTTON
 END
 
 IDD_FILTER_DIALOG DIALOGEX 0, 0, 291, 266
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Filtering settings"
 FONT 8, "Tahoma", 0, 0, 0x1
 BEGIN
-    CONTROL         "Include mask (separate by vertical lines ie. *.jpg|*.gif)",
-                    IDC_FILTER_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
-                    7,277,10,0,HIDC_FILTER_CHECK
-    COMBOBOX        IDC_FILTER_COMBO,15,19,269,98,CBS_DROPDOWN | WS_VSCROLL | 
-                    WS_TABSTOP,0,HIDC_FILTER_COMBO
-    CONTROL         "Exclude mask",IDC_EXCLUDEMASK_CHECK,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,35,277,10,0,
-                    HIDC_EXCLUDEMASK_CHECK
-    COMBOBOX        IDC_FILTEREXCLUDE_COMBO,15,48,269,170,CBS_DROPDOWN | 
-                    WS_VSCROLL | WS_TABSTOP,0,HIDC_FILTEREXCLUDE_COMBO
-    CONTROL         "Filtering by size",IDC_SIZE_CHECK,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,66,277,10,0,
-                    HIDC_SIZE_CHECK
-    COMBOBOX        IDC_SIZETYPE1_COMBO,63,81,34,140,CBS_DROPDOWNLIST | 
-                    WS_VSCROLL | WS_TABSTOP,0,HIDC_SIZETYPE1_COMBO
-    EDITTEXT        IDC_SIZE1_EDIT,100,80,77,14,ES_AUTOHSCROLL,0,
-                    HIDC_SIZE1_EDIT
-    CONTROL         "Spin1",IDC_SIZE1_SPIN,"msctls_updown32",UDS_SETBUDDYINT | 
-                    UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,166,80,11,
-                    14,0,HIDC_SIZE1_SPIN
-    COMBOBOX        IDC_SIZE1MULTI_COMBO,180,81,34,135,CBS_DROPDOWNLIST | 
-                    WS_VSCROLL | WS_TABSTOP,0,HIDC_SIZE1MULTI_COMBO
-    CONTROL         "and",IDC_SIZE2_CHECK,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,30,101,32,10,0,HIDC_SIZE2_CHECK
-    COMBOBOX        IDC_SIZETYPE2_COMBO,63,99,34,137,CBS_DROPDOWNLIST | 
-                    WS_VSCROLL | WS_TABSTOP,0,HIDC_SIZETYPE2_COMBO
-    EDITTEXT        IDC_SIZE2_EDIT,100,98,77,14,ES_AUTOHSCROLL,0,
-                    HIDC_SIZE2_EDIT
-    CONTROL         "Spin1",IDC_SIZE2_SPIN,"msctls_updown32",UDS_SETBUDDYINT | 
-                    UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,166,98,11,
-                    14,0,HIDC_SIZE2_SPIN
-    COMBOBOX        IDC_SIZE2MULTI_COMBO,180,99,34,143,CBS_DROPDOWNLIST | 
-                    WS_VSCROLL | WS_TABSTOP,0,HIDC_SIZE2MULTI_COMBO
-    CONTROL         "Filtering by date",IDC_DATE_CHECK,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,124,277,10,0,
-                    HIDC_DATE_CHECK
-    COMBOBOX        IDC_DATETYPE_COMBO,32,138,151,133,CBS_DROPDOWNLIST | 
-                    WS_VSCROLL | WS_TABSTOP,0,HIDC_DATETYPE_COMBO
-    COMBOBOX        IDC_DATE1TYPE_COMBO,58,158,48,104,CBS_DROPDOWNLIST | 
-                    WS_VSCROLL | WS_TABSTOP,0,HIDC_DATE1TYPE_COMBO
+    CONTROL         "Include mask (separate by vertical lines ie. *.jpg|*.gif)",IDC_FILTER_CHECK,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,277,10,0,HIDC_FILTER_CHECK
+    COMBOBOX        IDC_FILTER_COMBO,15,19,269,98,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP,0,HIDC_FILTER_COMBO
+    CONTROL         "Exclude mask",IDC_EXCLUDEMASK_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,35,277,10,0,HIDC_EXCLUDEMASK_CHECK
+    COMBOBOX        IDC_FILTEREXCLUDE_COMBO,15,48,269,170,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP,0,HIDC_FILTEREXCLUDE_COMBO
+    CONTROL         "Filtering by size",IDC_SIZE_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,66,277,10,0,HIDC_SIZE_CHECK
+    COMBOBOX        IDC_SIZETYPE1_COMBO,63,81,34,140,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0,HIDC_SIZETYPE1_COMBO
+    EDITTEXT        IDC_SIZE1_EDIT,100,80,77,14,ES_AUTOHSCROLL,0,HIDC_SIZE1_EDIT
+    CONTROL         "Spin1",IDC_SIZE1_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,166,80,11,14,0,HIDC_SIZE1_SPIN
+    COMBOBOX        IDC_SIZE1MULTI_COMBO,180,81,34,135,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0,HIDC_SIZE1MULTI_COMBO
+    CONTROL         "and",IDC_SIZE2_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,30,101,32,10,0,HIDC_SIZE2_CHECK
+    COMBOBOX        IDC_SIZETYPE2_COMBO,63,99,34,137,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0,HIDC_SIZETYPE2_COMBO
+    EDITTEXT        IDC_SIZE2_EDIT,100,98,77,14,ES_AUTOHSCROLL,0,HIDC_SIZE2_EDIT
+    CONTROL         "Spin1",IDC_SIZE2_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,166,98,11,14,0,HIDC_SIZE2_SPIN
+    COMBOBOX        IDC_SIZE2MULTI_COMBO,180,99,34,143,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0,HIDC_SIZE2MULTI_COMBO
+    CONTROL         "Filtering by date",IDC_DATE_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,124,277,10,0,HIDC_DATE_CHECK
+    COMBOBOX        IDC_DATETYPE_COMBO,32,138,151,133,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0,HIDC_DATETYPE_COMBO
+    COMBOBOX        IDC_DATE1TYPE_COMBO,58,158,48,104,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0,HIDC_DATE1TYPE_COMBO
     CONTROL         "DateTimePicker1",IDC_DATE1_DATETIMEPICKER,
-                    "SysDateTimePick32",DTS_RIGHTALIGN | DTS_UPDOWN | 
-                    DTS_SHOWNONE | WS_TABSTOP,108,157,109,15,0,
-                    HIDC_DATE1_DATETIMEPICKER
+                    "SysDateTimePick32",DTS_RIGHTALIGN | DTS_UPDOWN | DTS_SHOWNONE | WS_TABSTOP,108,157,109,15,0,HIDC_DATE1_DATETIMEPICKER
     CONTROL         "DateTimePicker2",IDC_TIME1_DATETIMEPICKER,
-                    "SysDateTimePick32",DTS_RIGHTALIGN | DTS_UPDOWN | 
-                    DTS_SHOWNONE | WS_TABSTOP,220,157,64,15,0,
-                    HIDC_TIME1_DATETIMEPICKER
-    CONTROL         "and",IDC_DATE2_CHECK,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,25,176,30,10,0,HIDC_DATE2_CHECK
-    COMBOBOX        IDC_DATE2TYPE_COMBO,58,174,48,107,CBS_DROPDOWNLIST | 
-                    WS_VSCROLL | WS_TABSTOP,0,HIDC_DATE2TYPE_COMBO
+                    "SysDateTimePick32",DTS_RIGHTALIGN | DTS_UPDOWN | DTS_SHOWNONE | WS_TABSTOP,220,157,64,15,0,HIDC_TIME1_DATETIMEPICKER
+    CONTROL         "and",IDC_DATE2_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,176,30,10,0,HIDC_DATE2_CHECK
+    COMBOBOX        IDC_DATE2TYPE_COMBO,58,174,48,107,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0,HIDC_DATE2TYPE_COMBO
     CONTROL         "DateTimePicker1",IDC_DATE2_DATETIMEPICKER,
-                    "SysDateTimePick32",DTS_RIGHTALIGN | DTS_UPDOWN | 
-                    DTS_SHOWNONE | WS_TABSTOP,108,173,109,15,0,
-                    HIDC_DATE2_DATETIMEPICKER
+                    "SysDateTimePick32",DTS_RIGHTALIGN | DTS_UPDOWN | DTS_SHOWNONE | WS_TABSTOP,108,173,109,15,0,HIDC_DATE2_DATETIMEPICKER
     CONTROL         "DateTimePicker2",IDC_TIME2_DATETIMEPICKER,
-                    "SysDateTimePick32",DTS_RIGHTALIGN | DTS_UPDOWN | 
-                    DTS_SHOWNONE | WS_TABSTOP,220,173,64,15,0,
-                    HIDC_TIME2_DATETIMEPICKER
-    CONTROL         "By attributes",IDC_ATTRIBUTES_CHECK,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,199,277,10,0,
-                    HIDC_ATTRIBUTES_CHECK
-    CONTROL         "Archive",IDC_ARCHIVE_CHECK,"Button",BS_AUTO3STATE | 
-                    WS_TABSTOP,29,212,81,10,0,HIDC_ARCHIVE_CHECK
-    CONTROL         "Read only",IDC_READONLY_CHECK,"Button",BS_AUTO3STATE | 
-                    WS_TABSTOP,29,224,81,10,0,HIDC_READONLY_CHECK
-    CONTROL         "Hidden",IDC_HIDDEN_CHECK,"Button",BS_AUTO3STATE | 
-                    WS_TABSTOP,117,212,68,10,0,HIDC_HIDDEN_CHECK
-    CONTROL         "System",IDC_SYSTEM_CHECK,"Button",BS_AUTO3STATE | 
-                    WS_TABSTOP,117,224,68,10,0,HIDC_SYSTEM_CHECK
-    CONTROL         "Directory",IDC_DIRECTORY_CHECK,"Button",BS_AUTO3STATE | 
-                    NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,191,212,93,10,
-                    0,HIDC_DIRECTORY_CHECK
+                    "SysDateTimePick32",DTS_RIGHTALIGN | DTS_UPDOWN | DTS_SHOWNONE | WS_TABSTOP,220,173,64,15,0,HIDC_TIME2_DATETIMEPICKER
+    CONTROL         "By attributes",IDC_ATTRIBUTES_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,199,277,10,0,HIDC_ATTRIBUTES_CHECK
+    CONTROL         "Archive",IDC_ARCHIVE_CHECK,"Button",BS_AUTO3STATE | WS_TABSTOP,29,212,81,10,0,HIDC_ARCHIVE_CHECK
+    CONTROL         "Read only",IDC_READONLY_CHECK,"Button",BS_AUTO3STATE | WS_TABSTOP,29,224,81,10,0,HIDC_READONLY_CHECK
+    CONTROL         "Hidden",IDC_HIDDEN_CHECK,"Button",BS_AUTO3STATE | WS_TABSTOP,117,212,68,10,0,HIDC_HIDDEN_CHECK
+    CONTROL         "System",IDC_SYSTEM_CHECK,"Button",BS_AUTO3STATE | WS_TABSTOP,117,224,68,10,0,HIDC_SYSTEM_CHECK
+    CONTROL         "Directory",IDC_DIRECTORY_CHECK,"Button",BS_AUTO3STATE | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,191,212,93,10,0,HIDC_DIRECTORY_CHECK
     DEFPUSHBUTTON   "&OK",IDOK,127,245,50,14,0,0,HIDOK
     PUSHBUTTON      "&Cancel",IDCANCEL,179,245,50,14,0,0,HIDCANCEL
     CONTROL         "",IDC_001_STATIC,"Static",SS_ETCHEDHORZ,7,238,276,1
-    PUSHBUTTON      "&Help",IDC_HELP_BUTTON,234,245,50,14,0,0,
-                    HIDC_HELP_BUTTON
+    PUSHBUTTON      "&Help",IDC_HELP_BUTTON,234,245,50,14,0,0,HIDC_HELP_BUTTON
 END
 
 IDD_SHORTCUTEDIT_DIALOG DIALOGEX 0, 0, 324, 206
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Shortcuts editing"
 FONT 8, "Tahoma", 0, 0, 0x1
 BEGIN
-    CONTROL         "List1",IDC_SHORTCUT_LIST,"SysListView32",LVS_REPORT | 
-                    LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | 
-                    LVS_AUTOARRANGE | LVS_EDITLABELS | WS_BORDER | 
-                    WS_TABSTOP,7,16,261,88,0,HIDC_SHORTCUT_LIST
-    EDITTEXT        IDC_NAME_EDIT,77,123,228,14,ES_AUTOHSCROLL,0,
-                    HIDC_NAME_EDIT
-    CONTROL         "",IDC_PATH_COMBOBOXEX,"ComboBoxEx32",CBS_DROPDOWN | 
-                    CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP,77,
-                    142,205,89,0,HIDC_PATH_COMBOBOXEX
-    PUSHBUTTON      "...",IDC_BROWSE_BUTTON,286,142,18,13,0,0,
-                    HIDC_BROWSE_BUTTON
+    CONTROL         "List1",IDC_SHORTCUT_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_EDITLABELS | WS_BORDER | WS_TABSTOP,7,16,261,88,0,HIDC_SHORTCUT_LIST
+    EDITTEXT        IDC_NAME_EDIT,77,123,228,14,ES_AUTOHSCROLL,0,HIDC_NAME_EDIT
+    CONTROL         "",IDC_PATH_COMBOBOXEX,"ComboBoxEx32",CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP,77,142,205,89,0,HIDC_PATH_COMBOBOXEX
+    PUSHBUTTON      "...",IDC_BROWSE_BUTTON,286,142,18,13,0,0,HIDC_BROWSE_BUTTON
     PUSHBUTTON      "&Add",IDC_ADD_BUTTON,17,160,50,14,0,0,HIDC_ADD_BUTTON
-    PUSHBUTTON      "&Update",IDC_CHANGE_BUTTON,69,160,50,14,0,0,
-                    HIDC_CHANGE_BUTTON
-    PUSHBUTTON      "&Delete",IDC_DELETE_BUTTON,121,160,50,14,0,0,
-                    HIDC_DELETE_BUTTON
+    PUSHBUTTON      "&Update",IDC_CHANGE_BUTTON,69,160,50,14,0,0,HIDC_CHANGE_BUTTON
+    PUSHBUTTON      "&Delete",IDC_DELETE_BUTTON,121,160,50,14,0,0,HIDC_DELETE_BUTTON
     DEFPUSHBUTTON   "&OK",IDOK,156,185,50,14,0,0,HIDOK
     PUSHBUTTON      "&Cancel",IDCANCEL,211,185,50,14,0,0,HIDCANCEL
     LTEXT           "Shortcuts:",IDC_001_STATIC,7,7,310,8
     LTEXT           "Name:",IDC_002_STATIC,18,126,53,8
     LTEXT           "Path:",IDC_003_STATIC,18,145,56,8
     GROUPBOX        "Shortcut properties",IDC_004_STATIC,7,111,310,70
     PUSHBUTTON      "Move up",IDC_UP_BUTTON,272,47,45,14,0,0,HIDC_UP_BUTTON
-    PUSHBUTTON      "Move down",IDC_DOWN_BUTTON,272,63,45,14,0,0,
-                    HIDC_DOWN_BUTTON
-    PUSHBUTTON      "&Help",IDC_HELP_BUTTON,267,185,50,14,0,0,
-                    HIDC_HELP_BUTTON
+    PUSHBUTTON      "Move down",IDC_DOWN_BUTTON,272,63,45,14,0,0,HIDC_DOWN_BUTTON
+    PUSHBUTTON      "&Help",IDC_HELP_BUTTON,267,185,50,14,0,0,HIDC_HELP_BUTTON
 END
 
 IDD_RECENTEDIT_DIALOG DIALOGEX 0, 0, 324, 190
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Recent paths"
 FONT 8, "Tahoma", 0, 0, 0x1
 BEGIN
-    CONTROL         "List1",IDC_RECENT_LIST,"SysListView32",LVS_LIST | 
-                    LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | 
-                    LVS_AUTOARRANGE | LVS_EDITLABELS | WS_BORDER | 
-                    WS_TABSTOP,7,16,310,88,0,HIDC_RECENT_LIST
-    EDITTEXT        IDC_PATH_EDIT,20,123,266,14,ES_AUTOHSCROLL,0,
-                    HIDC_PATH_EDIT
-    PUSHBUTTON      "...",IDC_BROWSE_BUTTON,290,123,18,14,0,0,
-                    HIDC_BROWSE_BUTTON
+    CONTROL         "List1",IDC_RECENT_LIST,"SysListView32",LVS_LIST | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_EDITLABELS | WS_BORDER | WS_TABSTOP,7,16,310,88,0,HIDC_RECENT_LIST
+    EDITTEXT        IDC_PATH_EDIT,20,123,266,14,ES_AUTOHSCROLL,0,HIDC_PATH_EDIT
+    PUSHBUTTON      "...",IDC_BROWSE_BUTTON,290,123,18,14,0,0,HIDC_BROWSE_BUTTON
     PUSHBUTTON      "&Add",IDC_ADD_BUTTON,20,141,50,14,0,0,HIDC_ADD_BUTTON
-    PUSHBUTTON      "&Update",IDC_CHANGE_BUTTON,72,141,50,14,0,0,
-                    HIDC_CHANGE_BUTTON
-    PUSHBUTTON      "&Delete",IDC_DELETE_BUTTON,124,141,50,14,0,0,
-                    HIDC_DELETE_BUTTON
+    PUSHBUTTON      "&Update",IDC_CHANGE_BUTTON,72,141,50,14,0,0,HIDC_CHANGE_BUTTON
+    PUSHBUTTON      "&Delete",IDC_DELETE_BUTTON,124,141,50,14,0,0,HIDC_DELETE_BUTTON
     DEFPUSHBUTTON   "&OK",IDOK,156,169,50,14,0,0,HIDOK
     PUSHBUTTON      "&Cancel",IDCANCEL,211,169,50,14,0,0,HIDCANCEL
     LTEXT           "Recently used paths:",IDC_001_STATIC,7,7,310,8
     GROUPBOX        "Path",IDC_002_STATIC,7,110,310,51
-    PUSHBUTTON      "&Help",IDC_HELP_BUTTON,267,169,50,14,0,0,
-                    HIDC_HELP_BUTTON
+    PUSHBUTTON      "&Help",IDC_HELP_BUTTON,267,169,50,14,0,0,HIDC_HELP_BUTTON
 END
 
 IDD_ABOUTBOX DIALOGEX 0, 0, 369, 150
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "About ..."
 FONT 8, "Tahoma", 0, 0, 0x1
 BEGIN
     DEFPUSHBUTTON   "&OK",IDOK,306,129,56,14,WS_GROUP,0,HIDOK
     ICON            IDR_MAINFRAME,IDC_STATIC,11,14,21,20
-    CTEXT           "Copyright (C) 2001-2007 J�zef Starosczyk",
-                    IDC_COPYRIGHT_STATIC,40,80,322,8
-    CONTROL         "http://www.copyhandler.com|http://www.copyhandler.com",
-                    IDC_HOMEPAGELINK_STATIC,"STATICEX",0x1,257,7,105,8
-    CONTROL         "ixen@copyhandler.com|mailto:ixen@copyhandler.com",
-                    IDC_CONTACT1LINK_STATIC,"STATICEX",0x1,257,41,105,8
+    CTEXT           "Copyright (C) 2001-2007 J�zef Starosczyk",IDC_COPYRIGHT_STATIC,40,80,322,8
+    CONTROL         "http://www.copyhandler.com|http://www.copyhandler.com",IDC_HOMEPAGELINK_STATIC,
+                    "STATICEX",0x1,257,7,105,8
+    CONTROL         "ixen@copyhandler.com|mailto:ixen@copyhandler.com",IDC_CONTACT1LINK_STATIC,
+                    "STATICEX",0x1,257,41,105,8
     CONTROL         "",IDC_PROGRAM_STATICEX,"STATICEX",0x30,39,7,122,10
     CONTROL         "",IDC_FULLVERSION_STATICEX,"STATICEX",0x10,39,20,109,8
-    CONTROL         "Home page:",IDC_HOMEPAGE_STATICEX,"STATICEX",0x10,185,7,
-                    68,8
-    CONTROL         "Contact:",IDC_CONTACT_STATICEX,"STATICEX",0x10,185,29,
-                    68,8
+    CONTROL         "Home page:",IDC_HOMEPAGE_STATICEX,"STATICEX",0x10,185,7,68,8
+    CONTROL         "Contact:",IDC_CONTACT_STATICEX,"STATICEX",0x10,185,29,68,8
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,39,92,323,1
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,39,120,323,1
-    CONTROL         "This program is free software and may be distributed according to the terms of the GNU General Public License version 2.",
-                    IDC_LICENSE_STATICEX,"STATICEX",0x90,46,98,310,16
-    CONTROL         "Author:",IDC_CONTACTAUTHOR_STATICEX,"STATICEX",0x50,185,
-                    41,68,8
-    CONTROL         "support@copyhandler.com|mailto:support@copyhandler.com",
-                    IDC_CONTACT2LINK_STATIC,"STATICEX",0x1,257,55,105,8
-    CONTROL         "Support:",IDC_CONTACTSUPPORT_STATICEX,"STATICEX",0x50,
-                    185,55,68,8
+    CONTROL         "This program is free software and may be distributed according to the terms of the GNU General Public License version 2.",IDC_LICENSE_STATICEX,
+                    "STATICEX",0x90,46,98,310,16
+    CONTROL         "Author:",IDC_CONTACTAUTHOR_STATICEX,"STATICEX",0x50,185,41,68,8
+    CONTROL         "support@copyhandler.com|mailto:support@copyhandler.com",IDC_CONTACT2LINK_STATIC,
+                    "STATICEX",0x1,257,55,105,8
+    CONTROL         "Support:",IDC_CONTACTSUPPORT_STATICEX,"STATICEX",0x50,185,55,68,8
 END
 
 
@@ -994,13 +750,6 @@
 
 IDR_POPUP_TOOLBAR       BITMAP                  "res\\main_toolbar.bmp"
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// RT_MANIFEST
-//
-
-IDR_MANIFEST            RT_MANIFEST             "res\\manifest.txt"
-
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
 //
Index: src/ch/resource.h
===================================================================
diff -u -r4ee5b2305c2ed7776e64e7fbd52952ccfd2a8dd8 -r66e9ad9a512cec46d691cb1ba012424dc7ac8897
--- src/ch/resource.h	(.../resource.h)	(revision 4ee5b2305c2ed7776e64e7fbd52952ccfd2a8dd8)
+++ src/ch/resource.h	(.../resource.h)	(revision 66e9ad9a512cec46d691cb1ba012424dc7ac8897)
@@ -2,7 +2,6 @@
 // Microsoft Visual C++ generated include file.
 // Used by ch.rc
 //
-#define IDR_MANIFEST                    1
 #define RT_TEXT                         25
 #define IDD_ABOUTBOX                    100
 #define IDR_MAINFRAME                   128
Index: src/chext/clipboard.cpp
===================================================================
diff -u -r3493e9fc470285b0a0b417d50be281467a071eb7 -r66e9ad9a512cec46d691cb1ba012424dc7ac8897
--- src/chext/clipboard.cpp	(.../clipboard.cpp)	(revision 3493e9fc470285b0a0b417d50be281467a071eb7)
+++ src/chext/clipboard.cpp	(.../clipboard.cpp)	(revision 66e9ad9a512cec46d691cb1ba012424dc7ac8897)
@@ -44,7 +44,7 @@
 	
 	// get files and put it in a table
 	UINT uiSize;
-	for (i=0;i<uiFilesCount;i++)
+	for (UINT i=0;i<uiFilesCount;i++)
 	{
 		uiSize=DragQueryFile(hdrop, i, szPath, _MAX_PATH);
 		_tcscpy(*pszBuffer+uiOffset, szPath);
Fisheye: Tag 66e9ad9a512cec46d691cb1ba012424dc7ac8897 refers to a dead (removed) revision in file `src/chext/dlldata.c'.
Fisheye: No comparison available.  Pass `N' to diff?