Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 01:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHELL32] Fix CRecycleBin crash caused by PR #7173 (#7330)

Browse source 
PR #7173 (22b913928f) fails to initialize the DELETED_FILE_RECORD struct when constructing a RecycleBin5File instance. This causes _ILCreateRecycleItem to create PIDLs without filenames and the CRecycleBin IShellFolder does not expect this to happen.

Also fixes incorrect usage of SHFileOperationW when restoring deleted files. The previous code might have worked by chance in the past if the string just happened to be double-null terminated as required by this API!
This commit is contained in:
Whindmar Saksit 2024-09-08 22:08:15 +02:00 committed by GitHub
parent 5d44157452
commit bc8c7d185d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 38 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
dll/win32/shell32/shellrecyclebin/recyclebin_v5.cpp
View file

@ -11,6 +11,40 @@
#include <shlwapi.h>
#include "sddl.h"
EXTERN_C HRESULT WINAPI SHUpdateRecycleBinIcon(void);
class CZZWStr
{
LPWSTR m_sz;
public:
~CZZWStr() { SHFree(m_sz); }
CZZWStr() : m_sz(NULL) {}
CZZWStr(const CZZWStr&) = delete;
CZZWStr& operator=(const CZZWStr&) = delete;
bool Initialize(LPCWSTR Str)
{
SIZE_T cch = wcslen(Str) + 1;
m_sz = (LPWSTR)SHAlloc((cch + 1) * sizeof(*Str));
if (!m_sz)
return false;
CopyMemory(m_sz, Str, cch * sizeof(*Str));
m_sz[cch] = UNICODE_NULL; // Double-null terminate
return true;
}
inline LPWSTR c_str() { return m_sz; }
};
static int SHELL_SingleFileOperation(HWND hWnd, UINT Op, LPCWSTR pszFrom, LPCWSTR pszTo, FILEOP_FLAGS Flags)
{
CZZWStr szzFrom, szzTo;
if (!szzFrom.Initialize(pszFrom) || !szzTo.Initialize(pszTo))
return ERROR_OUTOFMEMORY; // Note: Not one of the DE errors but also not in the DE range
SHFILEOPSTRUCTW fos = { hWnd, Op, szzFrom.c_str(), szzTo.c_str(), Flags };
return SHFileOperationW(&fos);
}
static BOOL
IntDeleteRecursive(
IN LPCWSTR FullName)
@ -465,7 +499,6 @@ STDMETHODIMP RecycleBin5::Restore(
PINFO2_HEADER pHeader;
DELETED_FILE_RECORD *pRecord, *pLast;
DWORD dwEntries, i;
SHFILEOPSTRUCTW op;
int res;
TRACE("(%p, %s, %p)\n", this, debugstr_w(pDeletedFileName), pDeletedFile);
@ -490,13 +523,7 @@ STDMETHODIMP RecycleBin5::Restore(
{
if (pRecord->dwRecordUniqueId == pDeletedFile->dwRecordUniqueId)
{
/* Restore file */
ZeroMemory(&op, sizeof(op));
op.wFunc = FO_MOVE;
op.pFrom = pDeletedFileName;
op.pTo = pDeletedFile->FileNameW;
res = SHFileOperationW(&op);
res = SHELL_SingleFileOperation(NULL, FO_MOVE, pDeletedFileName, pDeletedFile->FileNameW, 0);
if (res)
{
ERR("SHFileOperationW failed with 0x%x\n", res);
@ -517,6 +544,8 @@ STDMETHODIMP RecycleBin5::Restore(
m_hInfoMapped = CreateFileMappingW(m_hInfo, NULL, PAGE_READWRITE | SEC_COMMIT, 0, 0, NULL);
if (!m_hInfoMapped)
return HRESULT_FROM_WIN32(GetLastError());
if (dwEntries == 1)
SHUpdateRecycleBinIcon(); // Full --> Empty
return S_OK;
}
pRecord++;

1
dll/win32/shell32/shellrecyclebin/recyclebin_v5_enumerator.cpp
View file

@ -257,6 +257,7 @@ RecycleBin5File::Init(
{
m_recycleBin = prb;
m_recycleBin->AddRef();
m_deletedFile = *pDeletedFile;
WCHAR szUniqueId[32];
StringCchPrintfW(szUniqueId, _countof(szUniqueId), L"%lu", pDeletedFile->dwRecordUniqueId);