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

[SHELL32]

Browse source 
- Fix some broken casts & stack corruption

svn path=/trunk/; revision=62229
This commit is contained in:
Thomas Faber 2014-02-17 16:53:41 +00:00
parent e40d9a0062
commit ed736d630e
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
reactos/dll/win32/shell32/filedefext.cpp
View file

@ -95,7 +95,7 @@ LPCWSTR CFileVersionInfo::GetString(LPCWSTR pwszName)
return pwszResult;
}
VS_FIXEDFILEINFO *CFileVersionInfo::GetFixedInfo()
{
if (!m_pInfo)
@ -532,15 +532,15 @@ CFileDefExt::InitFileAttr(HWND hwndDlg)
{
/* For directories files have to be counted */
_CountFolderAndFilesData *data = reinterpret_cast<_CountFolderAndFilesData*> (HeapAlloc(GetProcessHeap(), 0, sizeof(_CountFolderAndFilesData)));
_CountFolderAndFilesData *data = static_cast<_CountFolderAndFilesData*>(HeapAlloc(GetProcessHeap(), 0, sizeof(_CountFolderAndFilesData)));
data->This = this;
data->pwszBuf = reinterpret_cast<LPWSTR> (HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * MAX_PATH));
data->pwszBuf = static_cast<LPWSTR>(HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * MAX_PATH));
data->cchBufMax = MAX_PATH;
data->hwndDlg = hwndDlg;
this->AddRef();
StringCchCopyW(data->pwszBuf, MAX_PATH, m_wszPath);
SHCreateThread(reinterpret_cast<LPTHREAD_START_ROUTINE> (CFileDefExt::_CountFolderAndFilesThreadProc), reinterpret_cast<LPVOID> (data), NULL, NULL);
SHCreateThread(CFileDefExt::_CountFolderAndFilesThreadProc, data, NULL, NULL);
/* Update size field */
if (SH_FormatFileSizeWithBytes(&m_DirSize, wszBuf, _countof(wszBuf)))
@ -683,7 +683,7 @@ CFileDefExt::GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
if (!MoveFileW(pFileDefExt->m_wszPath, wszBuf))
ERR("MoveFileW failed\n");
}
SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR);
return TRUE;
}
@ -866,7 +866,7 @@ CFileDefExt::CFileDefExt():
CFileDefExt::~CFileDefExt()
{
}
HRESULT WINAPI
@ -976,7 +976,7 @@ CFileDefExt::GetSite(REFIID iid, void **ppvSite)
return E_NOTIMPL;
}
DWORD
DWORD WINAPI
CFileDefExt::_CountFolderAndFilesThreadProc(LPVOID lpParameter)
{
_CountFolderAndFilesData *data = reinterpret_cast<_CountFolderAndFilesData*>(lpParameter);

2
reactos/dll/win32/shell32/filedefext.h
View file

@ -83,7 +83,7 @@ private:
DWORD m_cFolders;
ULARGE_INTEGER m_DirSize;
static DWORD _CountFolderAndFilesThreadProc(LPVOID lpParameter);
static DWORD WINAPI _CountFolderAndFilesThreadProc(LPVOID lpParameter);
public:
CFileDefExt();