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

[SHELL32] Return ERROR_INVALID_DRIVE if the drive type is unknown or there is no volume mounted (#2703)

Browse source 
Return ERROR_INVALID_DRIVE if the drive is either unknown or unmounted.
This commit is contained in:
Charles Ambrye 2020-05-09 05:54:15 -07:00 committed by GitHub
parent e2fdfae24f
commit e978ec6125
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dll/win32/shell32/folders/CDrivesFolder.cpp
View file

@ -582,6 +582,7 @@ HRESULT WINAPI CDrivesFolder::ParseDisplayName(HWND hwndOwner, LPBC pbc, LPOLEST
HRESULT hr = E_INVALIDARG; HRESULT hr = E_INVALIDARG;
LPCWSTR szNext = NULL; LPCWSTR szNext = NULL;
LPITEMIDLIST pidlTemp = NULL; LPITEMIDLIST pidlTemp = NULL;
WCHAR volumePathName[MAX_PATH];
TRACE("(%p)->(HWND=%p,%p,%p=%s,%p,pidl=%p,%p)\n", this, TRACE("(%p)->(HWND=%p,%p,%p=%s,%p,pidl=%p,%p)\n", this,
hwndOwner, pbc, lpszDisplayName, debugstr_w (lpszDisplayName), hwndOwner, pbc, lpszDisplayName, debugstr_w (lpszDisplayName),
@ -598,6 +599,13 @@ HRESULT WINAPI CDrivesFolder::ParseDisplayName(HWND hwndOwner, LPBC pbc, LPOLEST
if (PathGetDriveNumberW(lpszDisplayName) < 0) if (PathGetDriveNumberW(lpszDisplayName) < 0)
return E_INVALIDARG; return E_INVALIDARG;
/* check if this drive actually exists */
if (!GetVolumePathNameW(lpszDisplayName, volumePathName, _countof(volumePathName)) ||
GetDriveTypeW(volumePathName) < DRIVE_REMOVABLE)
{
return HRESULT_FROM_WIN32(ERROR_INVALID_DRIVE);
}
pidlTemp = _ILCreateDrive(lpszDisplayName); pidlTemp = _ILCreateDrive(lpszDisplayName);
if (!pidlTemp) if (!pidlTemp)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;