https://git.reactos.org/?p=reactos.git;a=commitdiff;h=60959e34aab862d03ea8b20b9a367fc431f5a14a
commit 60959e34aab862d03ea8b20b9a367fc431f5a14a Author: Katayama Hirofumi MZ <[email protected]> AuthorDate: Fri Apr 10 21:57:58 2020 +0900 Commit: Katayama Hirofumi MZ <[email protected]> CommitDate: Fri Apr 10 21:57:58 2020 +0900 [SHELL32] Simplify CChangeNotify::ShouldNotify CORE-13950 --- dll/win32/shell32/shelldesktop/CChangeNotify.cpp | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dll/win32/shell32/shelldesktop/CChangeNotify.cpp b/dll/win32/shell32/shelldesktop/CChangeNotify.cpp index f885dab7305..34c11809381 100644 --- a/dll/win32/shell32/shelldesktop/CChangeNotify.cpp +++ b/dll/win32/shell32/shelldesktop/CChangeNotify.cpp @@ -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; }
