Fix Occasional errors on copy/move files

Author: thomas694

src/CmdLineContextMenu.cpp

@@ -36,6 +36,8 @@
 //     fixed problem moving items across volumes
 // Version 1.8.4  (c) Nov 2024  thomas694
 //     fixed copy/move files progress dialog, smoother progress bar
+// Version 1.8.5  (c) Jan 2026  thomas694
+//     fix occasional errors on copy/move files
 //
 // DFTContextMenuHandler is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -80,6 +82,19 @@ CCmdLineContextMenu::CCmdLineContextMenu()
 	m_idCmdLast = 0;
 }
 
+CCmdLineContextMenu::~CCmdLineContextMenu() {
+	CancelAndWait();
+}
+
+void CCmdLineContextMenu::CancelAndWait() {
+	if (m_moveFuture.valid()) {
+		m_moveFuture.wait(); 
+	} 
+	if (m_copyFuture.valid()) { 
+		m_copyFuture.wait(); 
+	} 
+}
+
 //***************************************
 //* Date            : 6.2.99
 //* Last Modified   : 2.10.2000
@@ -1688,25 +1703,29 @@ int CCmdLineContextMenu::EmptyFiles()
 
 int CCmdLineContextMenu::StartCopyFilesHere()
 {
-	std::packaged_task<int()> task([&]() {
-		string szFolderDroppedIn = string(m_szFolderDroppedIn);
-		return CopyFilesHere(m_strFilenames, szFolderDroppedIn);
+	auto filenames = m_strFilenames;
+	auto folder = m_szFolderDroppedIn;
+
+	m_copyFuture = std::async(std::launch::async, [this, filenames, folder]() {
+		return CopyFilesHere(filenames, folder);
 		});
-	std::future<int> res = task.get_future();
-	std::thread(std::move(task)).detach();
-	res.wait_for(1s);
+	if (m_copyFuture.wait_for(std::chrono::seconds(1)) == std::future_status::ready) {
+		return m_copyFuture.get();
+	}
 	return 1;
 }
 
 int CCmdLineContextMenu::StartMoveFilesHere()
 {
-	std::packaged_task<int()> task([&]() {
-		string szFolderDroppedIn = string(m_szFolderDroppedIn);
-		return MoveFilesHere(m_strFilenames, szFolderDroppedIn);
-		});
-	std::future<int> res = task.get_future();
-	std::thread(std::move(task)).detach();
-	res.wait_for(1s);
+	auto filenames = m_strFilenames;
+	auto folder = m_szFolderDroppedIn;
+
+	m_moveFuture = std::async(std::launch::async, [this, filenames, folder]() {
+		return this->MoveFilesHere(filenames, folder);
+	});
+	if (m_moveFuture.wait_for(std::chrono::seconds(1)) == std::future_status::ready) {
+		return m_moveFuture.get();
+	}
 	return 1;
 }
 
@@ -1721,26 +1740,17 @@ void CCmdLineContextMenu::DoEvents()
 	double diff = difftime(now, m_lastExec);
 	if (diff < 10) return;
 	m_lastExec = now;
-
 	MSG msg;
-	BOOL result;
 
-	while (PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE))
+	while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE))
 	{
-		result = GetMessage(&msg, NULL, 0, 0);
-		if (result == 0)
+		if (msg.message == WM_QUIT)
 		{
 			PostQuitMessage(msg.wParam);
 			break;
 		}
-		else if (result == -1)
-		{
-		}
-		else
-		{
-			TranslateMessage(&msg);
-			DispatchMessage(&msg);
-		}
+		TranslateMessage(&msg);
+		DispatchMessage(&msg);
 	}
 }
 
@@ -1750,6 +1760,8 @@ int CCmdLineContextMenu::CopyFilesHere(StringArray strFilenames, string szFolder
 	lFiles = strFilenames.size();
 	lDoneItems = lTotalItems = 0;
 
+	CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
+
 	IProgressDialog* pProgressDlg;
 	HRESULT hr = CoCreateInstance(CLSID_ProgressDialog, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&pProgressDlg));
 	if (FAILED(hr)) pProgressDlg = NULL;
@@ -1805,6 +1817,7 @@ int CCmdLineContextMenu::CopyFilesHere(StringArray strFilenames, string szFolder
 		pProgressDlg->Release();
 	}
 
+	CoUninitialize();
 	return 1;
 }
 
@@ -1933,6 +1946,8 @@ int CCmdLineContextMenu::MoveFilesHere(StringArray strFilenames, string szFolder
 	lFiles = strFilenames.size();
 	lDoneItems = lTotalItems = 0;
 
+	CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
+
 	IProgressDialog* pProgressDlg;
 	HRESULT hr = CoCreateInstance(CLSID_ProgressDialog, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&pProgressDlg));
 	if (FAILED(hr)) pProgressDlg = NULL;
@@ -1953,6 +1968,11 @@ int CCmdLineContextMenu::MoveFilesHere(StringArray strFilenames, string szFolder
 	bool isSameVolume = true;
 	if (lFiles > 0) {
 		HANDLE hFile = CreateFile(strFilenames[0].c_str(), GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
+		if (hFile == INVALID_HANDLE_VALUE) {
+			if (pProgressDlg) { pProgressDlg->Release(); }
+			CoUninitialize();
+			return -1;
+		}
 		BY_HANDLE_FILE_INFORMATION fileInfo = {};
 		BOOL ret = GetFileInformationByHandle(hFile, &fileInfo);
 		HANDLE hFile2 = CreateFile(szFolderDroppedIn.c_str(), GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
@@ -2011,5 +2031,6 @@ int CCmdLineContextMenu::MoveFilesHere(StringArray strFilenames, string szFolder
 		pProgressDlg->Release();
 	}
 
+	CoUninitialize();
 	return 1;
 }

src/CmdLineContextMenu.h

@@ -10,6 +10,7 @@
 #include <string>
 #include <vector>
 #include <shlwapi.h>
+#include <future>
 
 #define ID_MENU_ITEM 0
 
@@ -25,6 +26,7 @@ class ATL_NO_VTABLE CCmdLineContextMenu :
 {
 public:
 	CCmdLineContextMenu();
+	~CCmdLineContextMenu();
 
 	// IContextMenu interface
     STDMETHOD(QueryContextMenu)(HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags);
@@ -79,12 +81,16 @@ END_COM_MAP()
 	int MoveFilesHere(StringArray strFilenames, string szFolderDroppedIn);
 	int StartCopyFilesHere();
 	int StartMoveFilesHere();
+	void CancelAndWait();
 
 	string m_strFileName;
 	UINT m_idCmdFirst;
 	UINT m_idCmdLast;
 	StringArray m_strFilenames;
 
+	std::future<int> m_copyFuture;
+	std::future<int> m_moveFuture;
+
 	void DeleteEmptySubfolders(string baseFolder);
 	bool CheckSubfolders(string folder);
 	void FlattenTree(string baseFolder, bool useFolderNames);

src/CmdLineExt.rc

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
-	<assemblyIdentity type='win32' name='DFTContextMenuHandler' version='1.8.4.0' processorArchitecture="amd64" />
+	<assemblyIdentity type='win32' name='DFTContextMenuHandler' version='1.8.5.0' processorArchitecture="amd64" />
 	<asmv3:application>
 		<asmv3:windowsSettings xmlns:ws2="http://schemas.microsoft.com/SMI/2016/WindowsSettings">
 			<ws2:longPathAware>true</ws2:longPathAware>