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

[SHELL32] Simplify CChangeNotify::ShouldNotify

Browse source 
CORE-13950
This commit is contained in:
Katayama Hirofumi MZ 2020-04-10 21:57:58 +09:00
parent 59c48a5d33
commit 60959e34aa
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
dll/win32/shell32/shelldesktop/CChangeNotify.cpp
View file

@ -536,7 +536,6 @@ BOOL CChangeNotify::DoDelivery(HANDLE hTicket, DWORD dwOwnerPID)
BOOL CChangeNotify::ShouldNotify(LPDELITICKET pTicket, LPNOTIFSHARE pShared)
{
BOOL ret;
LPITEMIDLIST pidl, pidl1 = NULL, pidl2 = NULL;
WCHAR szPath[MAX_PATH], szPath1[MAX_PATH], szPath2[MAX_PATH];
INT cch, cch1, cch2;
@ -544,24 +543,23 @@ BOOL CChangeNotify::ShouldNotify(LPDELITICKET pTicket, LPNOTIFSHARE pShared)
if (!pShared->ibPidl)
return TRUE;
ret = FALSE;
pidl = (LPITEMIDLIST)((LPBYTE)pShared + pShared->ibPidl);
if (!ret && pTicket->ibOffset1)
if (pTicket->ibOffset1)
{
pidl1 = (LPITEMIDLIST)((LPBYTE)pTicket + pTicket->ibOffset1);
if (ILIsEqual(pidl, pidl1) || ILIsParent(pidl, pidl1, !pShared->fRecursive))
ret = TRUE;
return TRUE;
}
if (!ret && pTicket->ibOffset2)
if (pTicket->ibOffset2)
{
pidl2 = (LPITEMIDLIST)((LPBYTE)pTicket + pTicket->ibOffset2);
if (ILIsEqual(pidl, pidl2) || ILIsParent(pidl, pidl2, !pShared->fRecursive))
ret = TRUE;
return TRUE;
}
if (!ret && SHGetPathFromIDListW(pidl, szPath))
if (SHGetPathFromIDListW(pidl, szPath))
{
PathAddBackslashW(szPath);
cch = lstrlenW(szPath);
@ -574,11 +572,11 @@ BOOL CChangeNotify::ShouldNotify(LPDELITICKET pTicket, LPNOTIFSHARE pShared)
{
szPath1[cch] = 0;
if (lstrcmpiW(szPath, szPath1) == 0)
ret = TRUE;
return TRUE;
}
}
if (!ret && pidl2 && SHGetPathFromIDListW(pidl2, szPath2))
if (pidl2 && SHGetPathFromIDListW(pidl2, szPath2))
{
PathAddBackslashW(szPath2);
cch2 = lstrlenW(szPath2);
@ -586,10 +584,10 @@ BOOL CChangeNotify::ShouldNotify(LPDELITICKET pTicket, LPNOTIFSHARE pShared)
{
szPath2[cch] = 0;
if (lstrcmpiW(szPath, szPath2) == 0)
ret = TRUE;
return TRUE;
}
}
}
return ret;
return FALSE;
}