[SHELLFIND] Fix directory search upon non-empty word/phrase query (#3130)

If the search phrase was not empty, it must not match the directory. CORE-17244
This commit is contained in:
Katayama Hirofumi MZ 2020-09-07 15:48:25 +09:00 committed by GitHub
parent f562f9c5c6
commit 2dd4f8714d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -280,8 +280,9 @@ static UINT RecursiveFind(LPCWSTR lpPath, _SearchData *pSearchData)
if (FindData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
{
CStringW status;
if (FileNameMatch(FindData.cFileName, pSearchData)
&& AttribHiddenMatch(FindData.dwFileAttributes, pSearchData))
if (pSearchData->szQueryW.IsEmpty() &&
FileNameMatch(FindData.cFileName, pSearchData) &&
AttribHiddenMatch(FindData.dwFileAttributes, pSearchData))
{
PostMessageW(pSearchData->hwnd, WM_SEARCH_ADD_RESULT, 0, (LPARAM) StrDupW(szPath));
uTotalFound++;