[OMPT-svn-commit] OpenMPT r22334 - in branches/OpenMPT-1.31: . misc mptrack

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

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

Log:
Merged revision(s) 22333 from trunk/OpenMPT:
[Fix] Use mpt::support_long_path in various instances of FindFirstFile.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/misc/mptWine.cpp
   branches/OpenMPT-1.31/mptrack/FolderScanner.cpp
   branches/OpenMPT-1.31/mptrack/Mptrack.cpp
   branches/OpenMPT-1.31/mptrack/View_tre.cpp

Modified: branches/OpenMPT-1.31/misc/mptWine.cpp
==============================================================================
--- branches/OpenMPT-1.31/misc/mptWine.cpp	Thu Nov 28 22:06:45 2024	(r22333)
+++ branches/OpenMPT-1.31/misc/mptWine.cpp	Thu Nov 28 22:07:05 2024	(r22334)
@@ -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: branches/OpenMPT-1.31/mptrack/FolderScanner.cpp
==============================================================================
--- branches/OpenMPT-1.31/mptrack/FolderScanner.cpp	Thu Nov 28 22:06:45 2024	(r22333)
+++ branches/OpenMPT-1.31/mptrack/FolderScanner.cpp	Thu Nov 28 22:07:05 2024	(r22334)
@@ -45,7 +45,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: branches/OpenMPT-1.31/mptrack/Mptrack.cpp
==============================================================================
--- branches/OpenMPT-1.31/mptrack/Mptrack.cpp	Thu Nov 28 22:06:45 2024	(r22333)
+++ branches/OpenMPT-1.31/mptrack/Mptrack.cpp	Thu Nov 28 22:07:05 2024	(r22334)
@@ -1016,7 +1016,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: branches/OpenMPT-1.31/mptrack/View_tre.cpp
==============================================================================
--- branches/OpenMPT-1.31/mptrack/View_tre.cpp	Thu Nov 28 22:06:45 2024	(r22333)
+++ branches/OpenMPT-1.31/mptrack/View_tre.cpp	Thu Nov 28 22:07:05 2024	(r22334)
@@ -2020,9 +2020,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
 			{