Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-20 12:29:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHELLFIND] Update status bar text

Browse source
This commit is contained in:
Brock Mammen 2019-08-20 16:34:30 -05:00 committed by Giannis Adamopoulos
parent 8246cd4e1b
commit c46d60360a
2 changed files with 23 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dll/win32/browseui/lang/en-US.rc
View file

@ -318,3 +318,9 @@ BEGIN
IDS_TOOLBAR_ERR_TITLE "Toolbar" IDS_TOOLBAR_ERR_TITLE "Toolbar"
IDS_TOOLBAR_ERR_TEXT "Cannot create toolbar." IDS_TOOLBAR_ERR_TEXT "Cannot create toolbar."
END END
STRINGTABLE
BEGIN
IDS_SEARCH_FOLDER "Searching %s"
IDS_SEARCH_FILES_FOUND "%u files found"
END

29
dll/win32/browseui/shellfind/CFindFolder.cpp
View file

@ -160,15 +160,16 @@ static UINT SearchFile(LPCWSTR lpFilePath, _SearchData *pSearchData)
return uMatches; return uMatches;
} }
static VOID RecursiveFind(LPCWSTR lpPath, _SearchData *pSearchData) static UINT RecursiveFind(LPCWSTR lpPath, _SearchData *pSearchData)
{ {
if (WaitForSingleObject(pSearchData->hStopEvent, 0) != WAIT_TIMEOUT) if (WaitForSingleObject(pSearchData->hStopEvent, 0) != WAIT_TIMEOUT)
return; return 0;
WCHAR szPath[MAX_PATH]; WCHAR szPath[MAX_PATH];
WIN32_FIND_DATAW FindData; WIN32_FIND_DATAW FindData;
HANDLE hFindFile; HANDLE hFindFile;
BOOL bMoreFiles = TRUE; BOOL bMoreFiles = TRUE;
UINT uTotalFound = 0;
PathCombineW(szPath, lpPath, L"*.*"); PathCombineW(szPath, lpPath, L"*.*");
@ -183,11 +184,11 @@ static VOID RecursiveFind(LPCWSTR lpPath, _SearchData *pSearchData)
if (FindData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) if (FindData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
{ {
CStringW* status = new CStringW(); CStringW status;
status->Format(L"Searching '%s'", FindData.cFileName); status.Format(IDS_SEARCH_FOLDER, FindData.cFileName);
PostMessageW(pSearchData->hwnd, WM_SEARCH_UPDATE_STATUS, 0, (LPARAM) status); PostMessageW(pSearchData->hwnd, WM_SEARCH_UPDATE_STATUS, 0, (LPARAM) StrDupW(status.GetBuffer()));
RecursiveFind(szPath, pSearchData); uTotalFound += RecursiveFind(szPath, pSearchData);
} }
else if ((pSearchData->szFileName.IsEmpty() || PathMatchSpecW(FindData.cFileName, pSearchData->szFileName)) else if ((pSearchData->szFileName.IsEmpty() || PathMatchSpecW(FindData.cFileName, pSearchData->szFileName))
&& (pSearchData->szQueryA.IsEmpty() || SearchFile(szPath, pSearchData))) && (pSearchData->szQueryA.IsEmpty() || SearchFile(szPath, pSearchData)))
@ -199,6 +200,8 @@ static VOID RecursiveFind(LPCWSTR lpPath, _SearchData *pSearchData)
if (hFindFile != INVALID_HANDLE_VALUE) if (hFindFile != INVALID_HANDLE_VALUE)
FindClose(hFindFile); FindClose(hFindFile);
return uTotalFound;
} }
DWORD WINAPI CFindFolder::SearchThreadProc(LPVOID lpParameter) DWORD WINAPI CFindFolder::SearchThreadProc(LPVOID lpParameter)
@ -207,12 +210,15 @@ DWORD WINAPI CFindFolder::SearchThreadProc(LPVOID lpParameter)
data->pFindFolder->NotifyConnections(DISPID_SEARCHSTART); data->pFindFolder->NotifyConnections(DISPID_SEARCHSTART);
RecursiveFind(params->szPath, data); UINT uTotalFound = RecursiveFind(data->szPath, data);
data->pFindFolder->NotifyConnections(DISPID_SEARCHCOMPLETE); data->pFindFolder->NotifyConnections(DISPID_SEARCHCOMPLETE);
SHFree(params); CStringW status;
SHFree(lpParameter); status.Format(IDS_SEARCH_FILES_FOUND, uTotalFound);
::PostMessageW(data->hwnd, WM_SEARCH_UPDATE_STATUS, 0, (LPARAM) StrDupW(status.GetBuffer()));
delete data;
return 0; return 0;
} }
@ -296,12 +302,11 @@ LRESULT CFindFolder::AddResult(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bH
LRESULT CFindFolder::UpdateStatus(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) LRESULT CFindFolder::UpdateStatus(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled)
{ {
CStringW *status = (CStringW *) lParam; CComHeapPtr<WCHAR> status((LPWSTR) lParam);
if (m_shellBrowser) if (m_shellBrowser)
{ {
m_shellBrowser->SetStatusTextSB(status->GetBuffer()); m_shellBrowser->SetStatusTextSB(status);
} }
delete status;
return S_OK; return S_OK;
} }