Index: src/ch/MainWnd.cpp
===================================================================
diff -u -rcdf6a22ddf857f56ce2e27e26d8cd6f0b8034b2e -rebabad67cdda34ed4e36ab794e10d0ade8124bf3
--- src/ch/MainWnd.cpp	(.../MainWnd.cpp)	(revision cdf6a22ddf857f56ce2e27e26d8cd6f0b8034b2e)
+++ src/ch/MainWnd.cpp	(.../MainWnd.cpp)	(revision ebabad67cdda34ed4e36ab794e10d0ade8124bf3)
@@ -1110,7 +1110,6 @@
 		pTask->UpdateTime();
 
 		// save progress before killed
-		TCHAR szPath[_MAX_PATH];
 		GetConfig()->get_string(PP_PAUTOSAVEDIRECTORY, szPath, _MAX_PATH);
 		GetApp()->ExpandPath(szPath);
 		pTask->Store(szPath, false);
@@ -1126,7 +1125,7 @@
 			PlaySound(szPath, NULL, SND_FILENAME | SND_ASYNC);
 		}
 
-		CTime tm=CTime::GetCurrentTime();
+		tm=CTime::GetCurrentTime();
 		pTask->m_log.logi(GetResManager()->LoadString(IDS_OTFTHREADFINISHED_STRING), tm.GetDay(), tm.GetMonth(), tm.GetYear(), tm.GetHour(), tm.GetMinute(), tm.GetSecond());
 
 		// we have been killed - the last operation
@@ -1147,7 +1146,7 @@
 
 		if (e->m_iType == E_ERROR && GetConfig()->get_bool(PP_SNDPLAYSOUNDS))
 		{
-			TCHAR szPath[_MAX_PATH];
+			szPath[_MAX_PATH];
 			GetConfig()->get_string(PP_SNDERRORSOUNDPATH, szPath, _MAX_PATH);
 			GetApp()->ExpandPath(szPath);
 			PlaySound(szPath, NULL, SND_FILENAME | SND_ASYNC);
@@ -1671,7 +1670,7 @@
 
 	// buffer with: dst path and src paths separated by single '\0'
 	TCHAR *pBuffer=static_cast<TCHAR*>(pCopyDataStruct->lpData);
-	unsigned long ulLen=pCopyDataStruct->cbData;
+	unsigned long ulLen=pCopyDataStruct->cbData / sizeof(TCHAR);
 
 	CString str, strDstPath;
 	CStringArray astrFiles;
@@ -2084,32 +2083,32 @@
 
 void CMainWnd::OnPopupRegisterdll() 
 {
-	DWORD dwErr;
-	if ((dwErr=RegisterShellExtDll(_T("chext.dll"), true)) == 0)
+	HRESULT hResult = RegisterShellExtDll(_T("chext.dll"), true);
+	if(SUCCEEDED(hResult))
 		MsgBox(IDS_REGISTEROK_STRING, MB_ICONINFORMATION | MB_OK);
 	else
 	{
 		TCHAR szStr[256], szText[768];
-		FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, dwErr, 0, szStr, 256, NULL);
+		FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, hResult, 0, szStr, 256, NULL);
 		while (szStr[_tcslen(szStr)-1] == _T('\n') || szStr[_tcslen(szStr)-1] == _T('\r') || szStr[_tcslen(szStr)-1] == _T('.'))
 			szStr[_tcslen(szStr)-1]=_T('\0');
-		_sntprintf(szText, 768, GetResManager()->LoadString(IDS_REGISTERERR_STRING), dwErr, szStr);
+		_sntprintf(szText, 768, GetResManager()->LoadString(IDS_REGISTERERR_STRING), hResult, szStr);
 		AfxMessageBox(szText, MB_ICONERROR | MB_OK);
 	}
 }
 
 void CMainWnd::OnPopupUnregisterdll() 
 {
-	DWORD dwErr;
-	if ((dwErr=RegisterShellExtDll(_T("chext.dll"), false)) == 0)
+	HRESULT hResult = RegisterShellExtDll(_T("chext.dll"), false);
+	if(SUCCEEDED(hResult))
 		MsgBox(IDS_UNREGISTEROK_STRING, MB_ICONINFORMATION | MB_OK);
 	else
 	{
 		TCHAR szStr[256], szText[768];
-		FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, dwErr, 0, szStr, 256, NULL);
+		FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, hResult, 0, szStr, 256, NULL);
 		while (szStr[_tcslen(szStr)-1] == _T('\n') || szStr[_tcslen(szStr)-1] == _T('\r') || szStr[_tcslen(szStr)-1] == _T('.'))
 			szStr[_tcslen(szStr)-1]=_T('\0');
-		_sntprintf(szText, 768, GetResManager()->LoadString(IDS_UNREGISTERERR_STRING), dwErr, szStr);
+		_sntprintf(szText, 768, GetResManager()->LoadString(IDS_UNREGISTERERR_STRING), hResult, szStr);
 		AfxMessageBox(szText, MB_ICONERROR | MB_OK);
 	}
 }