Merge branch 'main' into boost_regex

.github/workflows/main.yml

@@ -11,7 +11,7 @@ jobs:
     name: Visual C++ 2019
     runs-on: windows-2019
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Update Version Hash
       run: |
@@ -75,7 +75,7 @@ jobs:
     name: Visual C++ 2022
     runs-on: windows-2022
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Update Version Hash
       run: |
@@ -155,7 +155,7 @@ jobs:
     name: LLVM (Visual C++ 2019)
     runs-on: windows-2019
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Update Version Hash
       run: |
@@ -209,7 +209,7 @@ jobs:
     name: LLVM (Visual C++ 2022)
     runs-on: windows-2022
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Update Version Hash
       run: |
@@ -279,7 +279,7 @@ jobs:
     name: llvm-mingw
     runs-on: windows-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Update Version Hash
       run: |
@@ -343,7 +343,7 @@ jobs:
     name: ucrt GCC and Clang
     runs-on: windows-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Update Version Hash
       run: |
@@ -397,7 +397,7 @@ jobs:
     name: 64-bit GCC and Clang
     runs-on: windows-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Update Version Hash
       run: |
@@ -451,7 +451,7 @@ jobs:
     name: 32-bit GCC and Clang
     runs-on: windows-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Update Version Hash
       run: |

build/install_llvm.bat

@@ -1,8 +1,8 @@
 @ECHO OFF
 @rem used for AppVeyor and GitHub Actions
 
-curl -fsSL -o "LLVM-17.0.2-win64.exe" "https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.2/LLVM-17.0.2-win64.exe"
-"LLVM-17.0.2-win64.exe" /S
+curl -fsSL -o "LLVM-17.0.5-win64.exe" "https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.5/LLVM-17.0.5-win64.exe"
+"LLVM-17.0.5-win64.exe" /S
 
 IF /I "%~1" == "latest" (
 git clone -q --depth=1 --branch=main https://github.com/zufuliu/llvm-utils.git

build/install_mingw.bat

@@ -25,7 +25,7 @@ IF /I "%~1" == "i686" (
 IF /I "%~1" == "llvm" (
   SHIFT
   @rem for CI purpose only, the result binary is dynamic linked against api-ms-win-crt*.dll instead of msvcrt.dll
-  curl -fsSL -o "llvm-mingw-20231003-ucrt-x86_64.zip" "https://github.com/mstorsjo/llvm-mingw/releases/download/20231003/llvm-mingw-20231003-ucrt-x86_64.zip"
-  7z x -y -o"C:\" "llvm-mingw-20231003-ucrt-x86_64.zip" >NUL
-  move /Y "C:\llvm-mingw-20231003-ucrt-x86_64" "C:\llvm-mingw"
+  curl -fsSL -o "llvm-mingw-20231114-ucrt-x86_64.zip" "https://github.com/mstorsjo/llvm-mingw/releases/download/20231114/llvm-mingw-20231114-ucrt-x86_64.zip"
+  7z x -y -o"C:\" "llvm-mingw-20231114-ucrt-x86_64.zip" >NUL
+  move /Y "C:\llvm-mingw-20231114-ucrt-x86_64" "C:\llvm-mingw"
 )

metapath/res/metapath.exe.manifest

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-	<assemblyIdentity name="metapath" processorArchitecture="*" version="4.23.08.4962" type="win32"/>
+	<assemblyIdentity name="metapath" processorArchitecture="*" version="4.23.11.5052" type="win32"/>
 	<description>metapath File Browser</description>
 	<dependency>
 		<dependentAssembly>

metapath/src/Dialogs.c

@@ -363,12 +363,13 @@ INT_PTR CALLBACK GotoDlgProc(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
 		ComboBox_SetExtendedUI(hwndGoto, TRUE);
 
 		for (int i = 0; i < HISTORY_ITEMS; i++) {
-			if (mHistory.psz[i]) {
-				const int iItem = ComboBox_FindStringExact(hwndGoto, -1, mHistory.psz[i]);
+			LPCWSTR path = mHistory.psz[i];
+			if (path) {
+				const int iItem = ComboBox_FindStringExact(hwndGoto, -1, path);
 				if (iItem != CB_ERR) {
 					ComboBox_DeleteString(hwndGoto, iItem);
 				}
-				ComboBox_InsertString(hwndGoto, 0, mHistory.psz[i]);
+				ComboBox_InsertString(hwndGoto, 0, path);
 			}
 		}
 
@@ -1541,6 +1542,7 @@ bool GetFilterDlg(HWND hwnd) {
 typedef struct FILEOPDLGDATA {
 	WCHAR szSource[MAX_PATH];
 	WCHAR szDestination[MAX_PATH];
+	LPMRULIST pmru;
 	UINT wFunc;
 } FILEOPDLGDATA, *LPFILEOPDLGDATA;
 
@@ -1693,7 +1695,7 @@ INT_PTR CALLBACK CopyMoveDlgProc(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lPa
 		SetDlgItemText(hwnd, IDC_SOURCE, lpfod->szSource);
 
 		HWND hwndDest = GetDlgItem(hwnd, IDC_DESTINATION);
-		MRU_LoadToCombobox(hwndDest, MRU_KEY_COPY_MOVE_HISTORY);
+		MRU_AddToCombobox(lpfod->pmru, hwndDest);
 		ComboBox_SetCurSel(hwndDest, 0);
 		ComboBox_LimitText(hwndDest, MAX_PATH - 1);
 		ComboBox_SetExtendedUI(hwndDest, TRUE);
@@ -1742,10 +1744,12 @@ INT_PTR CALLBACK CopyMoveDlgProc(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lPa
 	case WM_NOTIFY: {
 		LPNMHDR pnmhdr = (LPNMHDR)lParam;
 		if (pnmhdr->idFrom == IDC_EMPTY_MRU && (pnmhdr->code == NM_CLICK || pnmhdr->code == NM_RETURN)) {
+			const LPCFILEOPDLGDATA lpfod = (LPCFILEOPDLGDATA)lParam;
 			WCHAR tch[MAX_PATH];
 			HWND hwndDest = GetDlgItem(hwnd, IDC_DESTINATION);
 			ComboBox_GetText(hwndDest, tch, COUNTOF(tch));
-			MRU_ClearCombobox(hwndDest, MRU_KEY_COPY_MOVE_HISTORY);
+			ComboBox_ResetContent(hwnd);
+			MRU_Empty(lpfod->pmru, true);
 			ComboBox_SetText(hwndDest, tch);
 		}
 	}
@@ -1807,10 +1811,12 @@ bool CopyMoveDlg(HWND hwnd, UINT *wFunc) {
 	}
 
 	FILEOPDLGDATA fod;
+	fod.pmru = MRU_Create(MRU_KEY_COPY_MOVE_HISTORY, MRUFlags_FilePath);
 	fod.wFunc = *wFunc;
 	lstrcpy(fod.szSource, PathFindFileName(dli.szFileName));
 
-	if (IDOK == ThemedDialogBoxParam(g_hInstance, MAKEINTRESOURCE(IDD_COPYMOVE), hwnd, CopyMoveDlgProc, (LPARAM)&fod)) {
+	const INT_PTR result = ThemedDialogBoxParam(g_hInstance, MAKEINTRESOURCE(IDD_COPYMOVE), hwnd, CopyMoveDlgProc, (LPARAM)&fod);
+	if (IDOK == result) {
 		WCHAR tchSource[MAX_PATH + 4];
 		WCHAR tchDestination[MAX_PATH + 4];
 
@@ -1826,7 +1832,8 @@ bool CopyMoveDlg(HWND hwnd, UINT *wFunc) {
 		}
 
 		// Save item
-		MRU_AddOneItem(MRU_KEY_COPY_MOVE_HISTORY, fod.szDestination);
+		MRU_Add(fod.pmru, fod.szDestination);
+		MRU_Save(fod.pmru);
 		ExpandEnvironmentStringsEx(fod.szDestination, COUNTOF(fod.szDestination));
 
 		// Double null terminated strings are essential!!!
@@ -1860,9 +1867,10 @@ bool CopyMoveDlg(HWND hwnd, UINT *wFunc) {
 		}
 
 		*wFunc = fod.wFunc; // save state for next call
-		return true;
 	}
-	return false;
+
+	MRU_Destroy(fod.pmru);
+	return result == IDOK;
 }
 
 extern WCHAR tchOpenWithDir[MAX_PATH];