marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

If the unixfs is rooted at the Desktop folder, forward 

ParseDisplayName calls to it instead of to MyComputer.
oldstable
Michael Jung 2005-06-29 11:17:33 +00:00 committed by Alexandre Julliard
parent cafb57383d
commit 9393580ab5
3 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/shell32/shell32_main.h
View File

@ -227,6 +227,7 @@ UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpOperation,
extern WCHAR swShell32Name[MAX_PATH];
BOOL UNIXFS_is_rooted_at_desktop(void);
extern const GUID CLSID_UnixFolder;
extern const GUID CLSID_UnixDosFolder;

7
dlls/shell32/shfldr_desktop.c
View File

@ -186,8 +186,11 @@ static HRESULT WINAPI ISF_Desktop_fnParseDisplayName (IShellFolder2 * iface,
}
else if (PathGetDriveNumberW (lpszDisplayName) >= 0)
{
/* it's a filesystem path with a drive. Let MyComputer parse it */
pidlTemp = _ILCreateMyComputer ();
/* it's a filesystem path with a drive. Let MyComputer/UnixDosFolder parse it */
if (UNIXFS_is_rooted_at_desktop())
pidlTemp = _ILCreateGuid(PT_GUID, &CLSID_UnixDosFolder);
else
pidlTemp = _ILCreateMyComputer ();
szNext = lpszDisplayName;
}
else if (PathIsUNCW(lpszDisplayName))

30
dlls/shell32/shfldr_unixfs.c
View File

@ -106,6 +106,36 @@ typedef struct _UnixFolder {
DWORD m_dwPathMode;
} UnixFolder;
/******************************************************************************
* UNIXFS_is_rooted_at_desktop [Internal]
*
* Checks if the unixfs namespace extension is rooted at desktop level.
*
* RETURNS
* TRUE, if unixfs is rooted at desktop level
* FALSE, if not.
*/
BOOL UNIXFS_is_rooted_at_desktop(void) {
HKEY hKey;
WCHAR *pwszCLSID_UnixDosFolder, wszRootedAtDesktop[69 + CHARS_IN_GUID] = {
'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\',
'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\',
'E','x','p','l','o','r','e','r','\\','D','e','s','k','t','o','p','\\',
'N','a','m','e','S','p','a','c','e','\\',0 };
if (FAILED(StringFromCLSID(&CLSID_UnixDosFolder, &pwszCLSID_UnixDosFolder)))
return FALSE;
lstrcatW(wszRootedAtDesktop, pwszCLSID_UnixDosFolder);
CoTaskMemFree(pwszCLSID_UnixDosFolder);
if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, wszRootedAtDesktop, 0, KEY_READ, &hKey) != ERROR_SUCCESS)
return FALSE;
RegCloseKey(hKey);
return TRUE;
}
/******************************************************************************
* UNIXFS_is_pidl_of_type [INTERNAL]
*