Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 16:36:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHELL32] Improve "Empty Recycle Bin" sound code (#4927)

Browse source 
Split off from PR #4755. This change doesn't require WINMM fixes (#4635).

- Remove `MAX_PATH` limit
- Use ATL classes
- Play the sound asynchronously
This commit is contained in:
Thamatip Chitpong 2022-12-10 03:14:09 +07:00 committed by GitHub
parent f0c20caf32
commit 7ca2710d64
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 54 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
dll/win32/shell32/folders/CRecycleBin.cpp
View file

@ -1018,6 +1018,57 @@ TRASH_TrashFile(LPCWSTR wszPath)
return DeleteFileToRecycleBin(wszPath);
}
static void TRASH_PlayEmptyRecycleBinSound()
{
CRegKey regKey;
CHeapPtr<WCHAR> pszValue;
CHeapPtr<WCHAR> pszSndPath;
DWORD dwType, dwSize;
LONG lError;
lError = regKey.Open(HKEY_CURRENT_USER,
L"AppEvents\\Schemes\\Apps\\Explorer\\EmptyRecycleBin\\.Current",
KEY_READ);
if (lError != ERROR_SUCCESS)
return;
lError = regKey.QueryValue(NULL, &dwType, NULL, &dwSize);
if (lError != ERROR_SUCCESS)
return;
if (!pszValue.AllocateBytes(dwSize))
return;
lError = regKey.QueryValue(NULL, &dwType, pszValue, &dwSize);
if (lError != ERROR_SUCCESS)
return;
if (dwType == REG_EXPAND_SZ)
{
dwSize = ExpandEnvironmentStringsW(pszValue, NULL, 0);
if (dwSize == 0)
return;
if (!pszSndPath.Allocate(dwSize))
return;
if (ExpandEnvironmentStringsW(pszValue, pszSndPath, dwSize) == 0)
return;
}
else if (dwType == REG_SZ)
{
/* The type is REG_SZ, no need to expand */
pszSndPath.Attach(pszValue.Detach());
}
else
{
/* Invalid type */
return;
}
PlaySoundW(pszSndPath, NULL, SND_FILENAME | SND_ASYNC | SND_NODEFAULT);
}
/*************************************************************************
* SHUpdateCRecycleBinIcon [SHELL32.@]
*
@ -1064,8 +1115,8 @@ HRESULT WINAPI SHEmptyRecycleBinA(HWND hwnd, LPCSTR pszRootPath, DWORD dwFlags)
HRESULT WINAPI SHEmptyRecycleBinW(HWND hwnd, LPCWSTR pszRootPath, DWORD dwFlags)
{
WCHAR szPath[MAX_PATH] = {0}, szBuffer[MAX_PATH];
DWORD dwSize, dwType, count;
WCHAR szBuffer[MAX_PATH];
DWORD count;
LONG ret;
IShellFolder *pDesktop, *pRecycleBin;
PIDLIST_ABSOLUTE pidlRecycleBin;
@ -1157,22 +1208,7 @@ HRESULT WINAPI SHEmptyRecycleBinW(HWND hwnd, LPCWSTR pszRootPath, DWORD dwFlags)
if (!(dwFlags & SHERB_NOSOUND))
{
dwSize = sizeof(szPath);
ret = RegGetValueW(HKEY_CURRENT_USER,
L"AppEvents\\Schemes\\Apps\\Explorer\\EmptyRecycleBin\\.Current",
NULL,
RRF_RT_REG_SZ,
&dwType,
(PVOID)szPath,
&dwSize);
if (ret != ERROR_SUCCESS)
return S_OK;
if (dwType != REG_EXPAND_SZ) /* type dismatch */
return S_OK;
szPath[_countof(szPath)-1] = L'\0';
PlaySoundW(szPath, NULL, SND_FILENAME);
TRASH_PlayEmptyRecycleBinSound();
}
return S_OK;
}