Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 23:12:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHELL32] -SHChangeNotifyRegister: Don't call CreateFileW with something that is not a filesystem path as this will obviously fail like when we are browsing My Computer.

Browse source 
svn path=/trunk/; revision=75713
This commit is contained in:
Giannis Adamopoulos 2017-08-30 12:49:59 +00:00
parent a051cd5754
commit f89672624d
1 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

23
reactos/dll/win32/shell32/wine/changenotify.c
View file

@ -647,19 +647,25 @@ _AddDirectoryProc(ULONG_PTR arg)
BOOL _OpenDirectory(LPNOTIFYREGISTER item) BOOL _OpenDirectory(LPNOTIFYREGISTER item)
{ {
STRRET strFile; STRRET strFile;
IShellFolder *psfDesktop; IShellFolder *psf;
HRESULT hr; HRESULT hr;
LPCITEMIDLIST child;
ULONG ulAttrs;
// Makes function idempotent // Makes function idempotent
if (item->hDirectory && !(item->hDirectory == INVALID_HANDLE_VALUE)) if (item->hDirectory && !(item->hDirectory == INVALID_HANDLE_VALUE))
return TRUE; return TRUE;
hr = SHGetDesktopFolder(&psfDesktop); hr = SHBindToParent(item->pidl, &IID_IShellFolder, (LPVOID*)&psf, &child);
if (FAILED_UNEXPECTEDLY(hr)) if (FAILED_UNEXPECTEDLY(hr))
return FALSE; return hr;
hr = IShellFolder_GetDisplayNameOf(psfDesktop, item->pidl, SHGDN_FORPARSING, &strFile); ulAttrs = SFGAO_FILESYSTEM | SFGAO_FOLDER;
IShellFolder_Release(psfDesktop); hr = IShellFolder_GetAttributesOf(psf, 1, (LPCITEMIDLIST*)&child, &ulAttrs);
if (SUCCEEDED(hr))
hr = IShellFolder_GetDisplayNameOf(psf, child, SHGDN_FORPARSING, &strFile);
IShellFolder_Release(psf);
if (FAILED_UNEXPECTEDLY(hr)) if (FAILED_UNEXPECTEDLY(hr))
return FALSE; return FALSE;
@ -667,6 +673,13 @@ BOOL _OpenDirectory(LPNOTIFYREGISTER item)
if (FAILED_UNEXPECTEDLY(hr)) if (FAILED_UNEXPECTEDLY(hr))
return FALSE; return FALSE;
if ((ulAttrs & (SFGAO_FILESYSTEM | SFGAO_FOLDER)) != (SFGAO_FILESYSTEM | SFGAO_FOLDER))
{
TRACE("_OpenDirectory ignoring %s\n", debugstr_w(item->wstrDirectory));
item->hDirectory = INVALID_HANDLE_VALUE;
return FALSE;
}
TRACE("_OpenDirectory %s\n", debugstr_w(item->wstrDirectory)); TRACE("_OpenDirectory %s\n", debugstr_w(item->wstrDirectory));
item->hDirectory = CreateFileW(item->wstrDirectory, // pointer to the file name item->hDirectory = CreateFileW(item->wstrDirectory, // pointer to the file name