[OMPT-svn-commit] OpenMPT r22333 - in trunk/OpenMPT: misc mptrack

[<sv...@op...>]

Author: sagamusix
Date: Thu Nov 28 22:06:45 2024
New Revision: 22333
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22333

Log:
[Fix] Use mpt::support_long_path in various instances of FindFirstFile.

Modified:
   trunk/OpenMPT/misc/mptWine.cpp
   trunk/OpenMPT/mptrack/FolderScanner.cpp
   trunk/OpenMPT/mptrack/Mptrack.cpp
   trunk/OpenMPT/mptrack/View_tre.cpp

Modified: trunk/OpenMPT/misc/mptWine.cpp
==============================================================================
--- trunk/OpenMPT/misc/mptWine.cpp	Thu Nov 28 21:54:02 2024	(r22332)
+++ trunk/OpenMPT/misc/mptWine.cpp	Thu Nov 28 22:06:45 2024	(r22333)
@@ -657,7 +657,7 @@
 		path = path.WithTrailingSlash();
 		HANDLE hFind = NULL;
 		WIN32_FIND_DATA wfd = {};
-		hFind = FindFirstFile((path + P_("*.*")).AsNative().c_str(), &wfd);
+		hFind = FindFirstFile(mpt::support_long_path((path + P_("*.*")).AsNative()).c_str(), &wfd);
 		if(hFind != NULL && hFind != INVALID_HANDLE_VALUE)
 		{
 			do

Modified: trunk/OpenMPT/mptrack/FolderScanner.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/FolderScanner.cpp	Thu Nov 28 21:54:02 2024	(r22332)
+++ trunk/OpenMPT/mptrack/FolderScanner.cpp	Thu Nov 28 22:06:45 2024	(r22333)
@@ -49,7 +49,7 @@
 			m_currentPath = m_paths.back();
 			m_paths.pop_back();
 			m_currentPath = m_currentPath.WithTrailingSlash();
-			m_hFind = FindFirstFile((m_currentPath + m_filter).AsNative().c_str(), &m_wfd);
+			m_hFind = FindFirstFile(mpt::support_long_path((m_currentPath + m_filter).AsNative()).c_str(), &m_wfd);
 		}
 
 		BOOL nextFile = FALSE;

Modified: trunk/OpenMPT/mptrack/Mptrack.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/Mptrack.cpp	Thu Nov 28 21:54:02 2024	(r22332)
+++ trunk/OpenMPT/mptrack/Mptrack.cpp	Thu Nov 28 22:06:45 2024	(r22333)
@@ -1041,7 +1041,7 @@
 			const mpt::PathString searchPattern = oldTunings + P_("*.*");
 			WIN32_FIND_DATA FindFileData;
 			HANDLE hFind;
-			hFind = FindFirstFile(searchPattern.AsNative().c_str(), &FindFileData);
+			hFind = FindFirstFile(mpt::support_long_path(searchPattern.AsNative()).c_str(), &FindFileData);
 			if(hFind != INVALID_HANDLE_VALUE)
 			{
 				do

Modified: trunk/OpenMPT/mptrack/View_tre.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/View_tre.cpp	Thu Nov 28 21:54:02 2024	(r22332)
+++ trunk/OpenMPT/mptrack/View_tre.cpp	Thu Nov 28 22:06:45 2024	(r22333)
@@ -2057,9 +2057,8 @@
 
 		LinkResolver linkResolver;
 		HANDLE hFind;
-		WIN32_FIND_DATA wfd;
-		MemsetZero(wfd);
-		if((hFind = FindFirstFile(path.AsNative().c_str(), &wfd)) != INVALID_HANDLE_VALUE)
+		WIN32_FIND_DATA wfd{};
+		if((hFind = FindFirstFile(mpt::support_long_path(path.AsNative()).c_str(), &wfd)) != INVALID_HANDLE_VALUE)
 		{
 			do
 			{