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

[SHELL32]

Browse source 
- Import SHCreateShellFolderView implementation and fixes for -Ex from Wine
CORE-7334 #resolve

svn path=/trunk/; revision=60731
This commit is contained in:
Thomas Faber 2013-10-22 19:01:07 +00:00
parent 9a3424b618
commit 508dc39a87
1 changed files with 21 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
reactos/dll/win32/shell32/shellord.cpp
View file

@ -1009,21 +1009,18 @@ HRESULT WINAPI SHCreateShellFolderViewEx(
LPCSFV psvcbi, /* [in] shelltemplate struct */
IShellView **ppv) /* [out] IShellView pointer */
{
IShellView * psf;
IShellView *psf;
HRESULT hRes;
TRACE("sf=%p pidl=%p cb=%p mode=0x%08x parm=%p\n",
psvcbi->pshf, psvcbi->pidl, psvcbi->pfnCallback,
psvcbi->fvm, psvcbi->psvOuter);
psvcbi->pshf, psvcbi->pidl, psvcbi->pfnCallback,
psvcbi->fvm, psvcbi->psvOuter);
*ppv = NULL;
hRes = IShellView_Constructor(psvcbi->pshf, &psf);
if (FAILED(hRes))
return hRes;
if (!psf)
return E_OUTOFMEMORY;
psf->AddRef();
hRes = psf->QueryInterface(IID_IShellView, (LPVOID *)ppv);
psf->Release();
@ -1914,25 +1911,24 @@ HRESULT WINAPI SHCreateStdEnumFmtEtc(
*/
HRESULT WINAPI SHCreateShellFolderView(const SFV_CREATE *pcsfv, IShellView **ppsv)
{
HRESULT ret = S_OK;
IShellView *psf;
HRESULT hRes;
FIXME("SHCreateShellFolderView() stub\n");
*ppsv = NULL;
if (!pcsfv || pcsfv->cbSize != sizeof(*pcsfv))
return E_INVALIDARG;
if (!pcsfv || sizeof(*pcsfv) != pcsfv->cbSize)
ret = E_INVALIDARG;
else
{
LPVOID lpdata = 0;/*LocalAlloc(LMEM_ZEROINIT, 0x4E4);*/
TRACE("sf=%p outer=%p callback=%p\n",
pcsfv->pshf, pcsfv->psvOuter, pcsfv->psfvcb);
if (!lpdata)
ret = E_OUTOFMEMORY;
else
{
/* Initialize and return unknown lpdata structure */
}
}
hRes = IShellView_Constructor(pcsfv->pshf, &psf);
if (FAILED(hRes))
return hRes;
return ret;
hRes = psf->QueryInterface(IID_IShellView, (LPVOID *)ppsv);
psf->Release();
return hRes;
}
/*************************************************************************
@ -2113,8 +2109,8 @@ HRESULT WINAPI SHEmptyRecycleBinW(HWND hwnd, LPCWSTR pszRootPath, DWORD dwFlags)
if (!(dwFlags & SHERB_NOCONFIRMATION))
{
/* FIXME
* enumerate available files
* show confirmation dialog
* enumerate available files
* show confirmation dialog
*/
FIXME("show confirmation dialog\n");
}
@ -2137,7 +2133,7 @@ HRESULT WINAPI SHEmptyRecycleBinW(HWND hwnd, LPCWSTR pszRootPath, DWORD dwFlags)
if (!(dwFlags & SHERB_NOSOUND))
{
dwSize = sizeof(szPath);
ret = RegGetValueW(HKEY_CURRENT_USER,
ret = RegGetValueW(HKEY_CURRENT_USER,
L"AppEvents\\Schemes\\Apps\\Explorer\\EmptyRecycleBin\\.Current",
NULL,
RRF_RT_REG_EXPAND_SZ,