Avoid system wide searching file.

zufuliu · Jan 14, 2019 · cac743c · cac743c
1 parent e8d674c
commit cac743c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/metapath/src/Helpers.c b/metapath/src/Helpers.c
@@ -1220,26 +1220,26 @@ void PathCanonicalizeEx(LPWSTR lpSrc) {
 extern WCHAR tchFavoritesDir[MAX_PATH];
 extern WCHAR szCurDir[MAX_PATH + 40];
 
-DWORD SearchPathEx(LPCWSTR lpPath, LPCWSTR lpFileName, LPCWSTR lpExtension, DWORD nBufferLength, LPWSTR lpBuffer, LPWSTR *lpFilePart) {
+BOOL SearchPathEx(LPCWSTR lpFileName, DWORD nBufferLength, LPWSTR lpBuffer) {
 	DWORD dwRetVal = 0;
 
 	if (StrEqual(lpFileName, L"..") || StrEqual(lpFileName, L".")) {
 		if (StrEqual(lpFileName, L"..") && PathIsRoot(szCurDir)) {
 			lstrcpyn(lpBuffer, L"*.*", nBufferLength);
 			dwRetVal = 1;
-		} else {
-			dwRetVal = SearchPath(szCurDir, lpFileName, lpExtension, nBufferLength, lpBuffer, lpFilePart);
 		}
-	} else {
-		dwRetVal = SearchPath(lpPath, lpFileName, lpExtension, nBufferLength, lpBuffer, lpFilePart);
+	}
 
-		// Search L"Favorites" if no result
-		if (!dwRetVal) {
-			dwRetVal = SearchPath(tchFavoritesDir, lpFileName, lpExtension, nBufferLength, lpBuffer, lpFilePart);
-		}
+	if (!dwRetVal) {
+		dwRetVal = SearchPath(szCurDir, lpFileName, NULL, nBufferLength, lpBuffer, NULL);
+	}
+
+	// Search Favorites if no result
+	if (!dwRetVal) {
+		dwRetVal = SearchPath(tchFavoritesDir, lpFileName, NULL, nBufferLength, lpBuffer, NULL);
 	}
 
-	return dwRetVal;
+	return dwRetVal != 0;
 }
 
 //=============================================================================

diff --git a/metapath/src/Helpers.h b/metapath/src/Helpers.h
@@ -346,8 +346,7 @@ void StrTab2Space(LPWSTR lpsz);
 void PathFixBackslashes(LPWSTR lpsz);
 void ExpandEnvironmentStringsEx(LPWSTR lpSrc, DWORD dwSrc);
 void PathCanonicalizeEx(LPWSTR lpSrc);
-DWORD SearchPathEx(LPCWSTR lpPath, LPCWSTR lpFileName, LPCWSTR lpExtension,
-				   DWORD nBufferLength, LPWSTR lpBuffer, LPWSTR *lpFilePart);
+BOOL SearchPathEx(LPCWSTR lpFileName, DWORD nBufferLength, LPWSTR lpBuffer);
 void FormatNumberStr(LPWSTR lpNumberStr);
 
 void GetDefaultFavoritesDir(LPWSTR lpFavDir, int cchFavDir);

diff --git a/metapath/src/metapath.c b/metapath/src/metapath.c
@@ -3041,7 +3041,7 @@ BOOL DisplayPath(LPCWSTR lpPath, UINT uIdError) {
 	ExpandEnvironmentStringsEx(szTmp, COUNTOF(szTmp));
 
 	WCHAR szPath[MAX_PATH];
-	if (!SearchPathEx(NULL, szTmp, NULL, COUNTOF(szPath), szPath, NULL)) {
+	if (!SearchPathEx(szTmp, COUNTOF(szPath), szPath)) {
 		lstrcpy(szPath, szTmp);
 	}
 
@@ -3120,7 +3120,7 @@ BOOL DisplayLnkFile(LPCWSTR pszLnkFile) {
 	ExpandEnvironmentStringsEx(szTmp, COUNTOF(szTmp));
 
 	WCHAR szPath[MAX_PATH];
-	if (!SearchPathEx(NULL, szTmp, NULL, COUNTOF(szPath), szPath, NULL)) {
+	if (!SearchPathEx(szTmp, COUNTOF(szPath), szPath)) {
 		lstrcpy(szPath, szTmp);
 	}