Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-30 09:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

- retrieve folder names for personal and bit bucket folder

Browse source 
- fix a few bugs in mydocuments shell folder code
- add a hack to get the path working

svn path=/trunk/; revision=30747
This commit is contained in:
Johannes Anderwald 2007-11-25 17:46:11 +00:00
parent 6a5dc65df6
commit 93ad35126d
3 changed files with 30 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
reactos/dll/win32/shell32/classes.c
View file

@ -365,6 +365,16 @@ BOOL HCR_GetClassNameW(REFIID riid, LPWSTR szDest, DWORD len)
if(LoadStringW(shell32_hInstance, IDS_MYCOMPUTER, szDest, buflen))
ret = TRUE;
}
else if (IsEqualIID(riid, &CLSID_MyDocuments))
{
if(LoadStringW(shell32_hInstance, IDS_PERSONAL, szDest, buflen))
ret = TRUE;
}
else if (IsEqualIID(riid, &CLSID_RecycleBin))
{
if(LoadStringW(shell32_hInstance, IDS_RECYCLEBIN_FOLDER_NAME, szDest, buflen))
ret = TRUE;
}
}
TRACE("-- %s\n", debugstr_w(szDest));
return ret;

11
reactos/dll/win32/shell32/recyclebin.c
View file

@ -388,6 +388,17 @@ static HRESULT WINAPI RecycleBin_GetDisplayNameOf(IShellFolder2 *This, LPCITEMID
PDELETED_FILE_DETAILS_W pFileDetails;
TRACE("(%p, %p, %x, %p)\n", This, pidl, (unsigned int)uFlags, pName);
if (_ILIsBitBucket (pidl))
{
WCHAR pszPath[100];
HCR_GetClassNameW(&CLSID_RecycleBin, pszPath, MAX_PATH);
pName->uType = STRRET_WSTR;
pName->u.pOleStr = StrDupW(pszPath);
return S_OK;
}
pFileDetails = UnpackDetailsFromPidl(pidl);
pName->uType = STRRET_WSTR;
pName->u.pOleStr = StrDupW(&pFileDetails->FileName[0]);

23
reactos/dll/win32/shell32/shlfldr_mydocuments.c
View file

@ -207,7 +207,7 @@ WINAPI ISF_MyDocuments_fnParseDisplayName (IShellFolder2 * iface,
}
}
else
pidlTemp = _ILCreateMyComputer();
pidlTemp = _ILCreateMyDocuments();
szNext = NULL;
}
@ -367,12 +367,9 @@ static HRESULT WINAPI ISF_MyDocuments_fnGetAttributesOf (IShellFolder2 * iface,
{
IGenericSFImpl *This = (IGenericSFImpl *)iface;
HRESULT hr = S_OK;
static const DWORD dwDesktopAttributes =
static const DWORD dwMyDocumentsAttributes =
SFGAO_STORAGE | SFGAO_HASPROPSHEET | SFGAO_STORAGEANCESTOR |
SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_FILESYSTEM | SFGAO_HASSUBFOLDER;
static const DWORD dwMyComputerAttributes =
SFGAO_CANRENAME | SFGAO_CANDELETE | SFGAO_HASPROPSHEET |
SFGAO_DROPTARGET | SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_HASSUBFOLDER;
TRACE ("(%p)->(cidl=%d apidl=%p mask=%p (0x%08x))\n",
This, cidl, apidl, rgfInOut, rgfInOut ? *rgfInOut : 0);
@ -386,14 +383,12 @@ static HRESULT WINAPI ISF_MyDocuments_fnGetAttributesOf (IShellFolder2 * iface,
*rgfInOut = ~0;
if(cidl == 0) {
*rgfInOut &= dwDesktopAttributes;
*rgfInOut &= dwMyDocumentsAttributes;
} else {
while (cidl > 0 && *apidl) {
pdump (*apidl);
if (_ILIsDesktop(*apidl)) {
*rgfInOut &= dwDesktopAttributes;
} else if (_ILIsMyComputer(*apidl)) {
*rgfInOut &= dwMyComputerAttributes;
if (_ILIsMyDocuments(*apidl)) {
*rgfInOut &= dwMyDocumentsAttributes;
} else {
SHELL32_GetItemAttributes (_IShellFolder_ (This), *apidl, rgfInOut);
}
@ -509,13 +504,13 @@ WINAPI ISF_MyDocuments_fnGetDisplayNameOf (IShellFolder2 * iface,
if (!pszPath)
return E_OUTOFMEMORY;
if (_ILIsMyDocuments (pidl))
if (_ILIsMyDocuments (pidl) || _ILIsDesktop(pidl))
{
if ((GET_SHGDN_RELATION (dwFlags) == SHGDN_NORMAL) &&
(GET_SHGDN_FOR (dwFlags) & SHGDN_FORPARSING))
strcpyW(pszPath, This->sPathTarget);
else
HCR_GetClassNameW(&CLSID_ShellDesktop, pszPath, MAX_PATH);
HCR_GetClassNameW(&CLSID_MyDocuments, pszPath, MAX_PATH);
}
else if (_ILIsPidlSimple (pidl))
{
@ -534,7 +529,7 @@ WINAPI ISF_MyDocuments_fnGetDisplayNameOf (IShellFolder2 * iface,
* Exception: The MyComputer folder doesn't have this key,
* but any other filesystem backed folder it needs it.
*/
if (IsEqualIID (clsid, &CLSID_MyComputer))
if (IsEqualIID (clsid, &CLSID_MyDocuments))
{
bWantsForParsing = TRUE;
}
@ -903,7 +898,7 @@ HRESULT WINAPI ISF_MyDocuments_Constructor (
{
IGenericSFImpl *sf;
if (!SHGetSpecialFolderPathW( 0, szMyPath, CSIDL_DESKTOPDIRECTORY, TRUE ))
if (!SHGetSpecialFolderPathW( 0, szMyPath, CSIDL_PERSONAL, TRUE ))
return E_UNEXPECTED;
sf = LocalAlloc( LMEM_ZEROINIT, sizeof (IGenericSFImpl) );