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

simplify

Browse source
This commit is contained in:
Katayama Hirofumi MZ 2024-05-16 11:01:54 +09:00
parent e3748bd0f0
commit d70431e740
1 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
dll/win32/shell32/CDefView.cpp
View file

@ -2346,21 +2346,17 @@ LRESULT CDefView::OnChangeNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &
// Translate PIDLs. // Translate PIDLs.
// SHSimpleIDListFromPathW creates fake PIDLs (lacking some attributes) // SHSimpleIDListFromPathW creates fake PIDLs (lacking some attributes)
CComHeapPtr<ITEMIDLIST_ABSOLUTE> pidl0, pidl1; CComHeapPtr<ITEMIDLIST_ABSOLUTE> pidl0(Pidls[0]), pidl1(Pidls[1]);
WCHAR path0[MAX_PATH], path1[MAX_PATH]; WCHAR path[MAX_PATH];
if (Pidls[0]) if (pidl0 && SHGetPathFromIDListW(pidl0, path) && PathFileExistsW(path))
{ {
if (SHGetPathFromIDListW(Pidls[0], path0) && PathFileExistsW(path0)) pidl0.Free();
pidl0.Attach(ILCreateFromPathW(path0)); pidl0.Attach(ILCreateFromPathW(path));
else
pidl0.Attach(ILClone(Pidls[0]));
} }
if (Pidls[1]) if (pidl1 && SHGetPathFromIDListW(pidl1, path) && PathFileExistsW(path))
{ {
if (SHGetPathFromIDListW(Pidls[1], path1) && PathFileExistsW(path1)) pidl1.Free();
pidl1.Attach(ILCreateFromPathW(path1)); pidl1.Attach(ILCreateFromPathW(path));
else
pidl1.Attach(ILClone(Pidls[1]));
} }
PITEMID_CHILD child0 = NULL, child1 = NULL; PITEMID_CHILD child0 = NULL, child1 = NULL;
@ -2417,8 +2413,6 @@ LRESULT CDefView::OnChangeNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &
break; break;
} }
ILFree(Pidls[0]);
ILFree(Pidls[1]);
SHChangeNotification_Unlock(hLock); SHChangeNotification_Unlock(hLock);
return TRUE; return TRUE;
} }