Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [SHELL32] Improve CChangeNotify::ShouldNotify more
by Katayama Hirofumi MZ 11 Apr '20

11 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ddc1a46456f6061c321a2… commit ddc1a46456f6061c321a272aaa71bd4442c5edb6 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Apr 11 11:55:06 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Apr 11 11:55:06 2020 +0900 [SHELL32] Improve CChangeNotify::ShouldNotify more Improved non-recursive cases. CORE-13950 --- dll/win32/shell32/shelldesktop/CChangeNotify.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dll/win32/shell32/shelldesktop/CChangeNotify.cpp b/dll/win32/shell32/shelldesktop/CChangeNotify.cpp index 0692ff86989..910e664c8c1 100644 --- a/dll/win32/shell32/shelldesktop/CChangeNotify.cpp +++ b/dll/win32/shell32/shelldesktop/CChangeNotify.cpp @@ -576,7 +576,9 @@ BOOL CChangeNotify::ShouldNotify(LPDELITICKET pTicket, LPNOTIFSHARE pShared) { PathAddBackslashW(szPath1); cch1 = lstrlenW(szPath1); - if (cch < cch1) + if (cch < cch1 && + (pShared->fRecursive || + wcschr(&szPath1[cch], L'\\') == &szPath1[cch1 - 1])) { szPath1[cch] = 0; if (lstrcmpiW(szPath, szPath1) == 0) @@ -588,7 +590,9 @@ BOOL CChangeNotify::ShouldNotify(LPDELITICKET pTicket, LPNOTIFSHARE pShared) { PathAddBackslashW(szPath2); cch2 = lstrlenW(szPath2); - if (cch < cch2) + if (cch < cch2 && + (pShared->fRecursive || + wcschr(&szPath2[cch], L'\\') == &szPath2[cch2 - 1])) { szPath2[cch] = 0; if (lstrcmpiW(szPath, szPath2) == 0)

1 0

[reactos] 01/01: [SHELL32] Check pidl->mkid.cb == 0 at CChangeNotify::ShouldNotify
by Katayama Hirofumi MZ 11 Apr '20

11 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2a32094aa03aece50fbc1… commit 2a32094aa03aece50fbc16a371986a9664216d83 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Apr 11 09:27:45 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Apr 11 09:27:45 2020 +0900 [SHELL32] Check pidl->mkid.cb == 0 at CChangeNotify::ShouldNotify CORE-13950 --- dll/win32/shell32/shelldesktop/CChangeNotify.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dll/win32/shell32/shelldesktop/CChangeNotify.cpp b/dll/win32/shell32/shelldesktop/CChangeNotify.cpp index af4825cdaf8..0692ff86989 100644 --- a/dll/win32/shell32/shelldesktop/CChangeNotify.cpp +++ b/dll/win32/shell32/shelldesktop/CChangeNotify.cpp @@ -550,6 +550,8 @@ BOOL CChangeNotify::ShouldNotify(LPDELITICKET pTicket, LPNOTIFSHARE pShared) return TRUE; pidl = (LPITEMIDLIST)((LPBYTE)pShared + pShared->ibPidl); + if (pidl->mkid.cb == 0 && pShared->fRecursive) + return TRUE; if (pTicket->ibOffset1) {

1 0

[reactos] 01/01: [CMAKE][CONFIGURE] Enable runtime checks on MSVC by default. Remove RTC switch from configure.cmd, now MSVC runtime checks are supposed to be enabled/disabled via CMake define (-DRUNTIME_CHECKS=1) Prepare for adding more dynamic analysis options
by Victor Perevertkin 10 Apr '20

10 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=92dfec219d8c53a84c68c… commit 92dfec219d8c53a84c68ca069abbc170fc8bdb49 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Thu Apr 9 04:40:17 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Sat Apr 11 02:48:12 2020 +0300 [CMAKE][CONFIGURE] Enable runtime checks on MSVC by default. Remove RTC switch from configure.cmd, now MSVC runtime checks are supposed to be enabled/disabled via CMake define (-DRUNTIME_CHECKS=1) Prepare for adding more dynamic analysis options --- boot/environ/CMakeLists.txt | 10 ++++++++-- boot/freeldr/freeldr/CMakeLists.txt | 7 +++++-- configure.cmd | 12 +++--------- dll/keyboard/CMakeLists.txt | 1 + ntoskrnl/ntkrnlmp/CMakeLists.txt | 5 ++++- sdk/cmake/config-amd64.cmake | 1 + sdk/cmake/config-arm.cmake | 4 ++++ sdk/cmake/config.cmake | 9 ++++++--- sdk/cmake/msvc.cmake | 4 ---- 9 files changed, 32 insertions(+), 21 deletions(-) diff --git a/boot/environ/CMakeLists.txt b/boot/environ/CMakeLists.txt index daa621ac216..9bafea5eef7 100644 --- a/boot/environ/CMakeLists.txt +++ b/boot/environ/CMakeLists.txt @@ -103,9 +103,12 @@ set_entrypoint(bootmgfw EfiEntry) target_link_libraries(bootmgfw bootlib cportlib cmlib rtl libcntpr) +# dynamic analysis switches if(STACK_PROTECTOR) target_link_libraries(bootmgfw gcc_ssp) -elseif(RUNTIME_CHECKS) +endif() + +if(RUNTIME_CHECKS) target_link_libraries(bootmgfw runtmchk) endif() @@ -148,9 +151,12 @@ endif() target_link_libraries(rosload bootlib cportlib cmlib rtl libcntpr) +# dynamic analysis switches if(STACK_PROTECTOR) target_link_libraries(rosload gcc_ssp) -elseif(RUNTIME_CHECKS) +endif() + +if(RUNTIME_CHECKS) target_link_libraries(rosload runtmchk) endif() diff --git a/boot/freeldr/freeldr/CMakeLists.txt b/boot/freeldr/freeldr/CMakeLists.txt index ec6010cb81f..254dfa073ef 100644 --- a/boot/freeldr/freeldr/CMakeLists.txt +++ b/boot/freeldr/freeldr/CMakeLists.txt @@ -265,7 +265,7 @@ endif() add_executable(freeldr_pe ${FREELDR_BASE_SOURCE}) add_executable(freeldr_pe_dbg EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE}) -set_target_properties(freeldr_pe freeldr_pe_dbg +set_target_properties(freeldr_pe freeldr_pe_dbg PROPERTIES ENABLE_EXPORTS TRUE DEFINE_SYMBOL "") @@ -308,10 +308,13 @@ endif() target_link_libraries(freeldr_pe freeldr_common cportlib cmlib rtl libcntpr) target_link_libraries(freeldr_pe_dbg freeldr_common cportlib cmlib rtl libcntpr) +# dynamic analysis switches if(STACK_PROTECTOR) target_link_libraries(freeldr_pe gcc_ssp) target_link_libraries(freeldr_pe_dbg gcc_ssp) -elseif(RUNTIME_CHECKS) +endif() + +if(RUNTIME_CHECKS) target_link_libraries(freeldr_pe runtmchk) target_link_libraries(freeldr_pe_dbg runtmchk) add_target_link_flags(freeldr_pe "/MERGE:.rtc=.text") diff --git a/configure.cmd b/configure.cmd index 1cee20afc3f..c0fa3ac00d4 100755 --- a/configure.cmd +++ b/configure.cmd @@ -13,7 +13,7 @@ if /I "%1" == "/?" ( :help echo Help for configure script echo Syntax: path\to\source\configure.cmd [script-options] [Cmake-options] - echo Available script-options: Codeblocks, Eclipse, Makefiles, clang, VSSolution, RTC + echo Available script-options: Codeblocks, Eclipse, Makefiles, clang, VSSolution echo Cmake-options: -DVARIABLE:TYPE=VALUE goto quit ) @@ -62,7 +62,6 @@ if defined ROS_ARCH ( ) set BUILD_ENVIRONMENT=VS set VS_SOLUTION=0 - set VS_RUNTIME_CHECKS=0 echo Detected Visual Studio Environment !BUILD_ENVIRONMENT!!VS_VERSION!-!ARCH! ) else ( echo Error: Unable to detect build environment. Configure script failure. @@ -90,8 +89,6 @@ REM Parse command line parameters echo. && echo Error: Creation of VS Solution files is not supported in a MinGW environment. echo Please run this command in a [Developer] Command Prompt for Visual Studio. goto quit - ) else if /I "%1" == "RTC" ( - echo. && echo Warning: RTC switch is ignored outside of a Visual Studio environment. && echo. ) else if /I "%1" NEQ "" ( echo %1| find /I "-D" > NUL if %ERRORLEVEL% == 0 ( @@ -128,9 +125,6 @@ REM Parse command line parameters ) else if "!ARCH!" == "arm" ( set CMAKE_ARCH=-A ARM ) - ) else if /I "%1" == "RTC" ( - echo Runtime checks enabled - set VS_RUNTIME_CHECKS=1 ) else if /I "%1" NEQ "" ( echo %1| find /I "-D" > NUL if %ERRORLEVEL% == 0 ( @@ -197,9 +191,9 @@ if EXIST CMakeCache.txt ( if "%BUILD_ENVIRONMENT%" == "MinGW" ( cmake -G %CMAKE_GENERATOR% -DENABLE_CCACHE:BOOL=0 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=%MINGW_TOOCHAIN_FILE% -DARCH:STRING=%ARCH% %BUILD_TOOLS_FLAG% %* "%REACTOS_SOURCE_DIR%" ) else if %USE_CLANG_CL% == 1 ( - cmake -G %CMAKE_GENERATOR% -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=%ARCH% %BUILD_TOOLS_FLAG% -DUSE_CLANG_CL:BOOL=1 -DRUNTIME_CHECKS:BOOL=%VS_RUNTIME_CHECKS% %* "%REACTOS_SOURCE_DIR%" + cmake -G %CMAKE_GENERATOR% -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=%ARCH% %BUILD_TOOLS_FLAG% -DUSE_CLANG_CL:BOOL=1 %* "%REACTOS_SOURCE_DIR%" ) else ( - cmake -G %CMAKE_GENERATOR% %CMAKE_ARCH% -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=%ARCH% %BUILD_TOOLS_FLAG% -DRUNTIME_CHECKS:BOOL=%VS_RUNTIME_CHECKS% %* "%REACTOS_SOURCE_DIR%" + cmake -G %CMAKE_GENERATOR% %CMAKE_ARCH% -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=%ARCH% %BUILD_TOOLS_FLAG% %* "%REACTOS_SOURCE_DIR%" ) if %ERRORLEVEL% NEQ 0 ( diff --git a/dll/keyboard/CMakeLists.txt b/dll/keyboard/CMakeLists.txt index 406e314b78f..088cb6acad3 100644 --- a/dll/keyboard/CMakeLists.txt +++ b/dll/keyboard/CMakeLists.txt @@ -107,6 +107,7 @@ foreach(_keyboard_layout ${_keyboard_layouts}) set_property(TARGET ${_keyboard_layout} PROPERTY C_STANDARD 99) endif() + # dynamic analysis switches if (STACK_PROTECTOR) target_link_libraries(${_keyboard_layout} gcc_ssp) endif() diff --git a/ntoskrnl/ntkrnlmp/CMakeLists.txt b/ntoskrnl/ntkrnlmp/CMakeLists.txt index 5807f794ff8..2853f45fe75 100644 --- a/ntoskrnl/ntkrnlmp/CMakeLists.txt +++ b/ntoskrnl/ntkrnlmp/CMakeLists.txt @@ -34,9 +34,12 @@ else() set_image_base(ntkrnlmp 0x80800000) endif() +# dynamic analysis switches if(STACK_PROTECTOR) target_link_libraries(ntkrnlmp gcc_ssp) -elseif(RUNTIME_CHECKS) +endif() + +if(RUNTIME_CHECKS) target_link_libraries(ntkrnlmp runtmchk) endif() diff --git a/sdk/cmake/config-amd64.cmake b/sdk/cmake/config-amd64.cmake index 76439fbb6d0..058d4518acb 100644 --- a/sdk/cmake/config-amd64.cmake +++ b/sdk/cmake/config-amd64.cmake @@ -44,4 +44,5 @@ set(USERMODE TRUE CACHE BOOL if(MSVC) set(_PREFAST_ FALSE CACHE BOOL "Whether to enable PREFAST while compiling.") + option(RUNTIME_CHECKS "Whether to enable runtime checks on MSVC" ON) endif() diff --git a/sdk/cmake/config-arm.cmake b/sdk/cmake/config-arm.cmake index 7fd6a5d5aef..b9f2e2028f9 100644 --- a/sdk/cmake/config-arm.cmake +++ b/sdk/cmake/config-arm.cmake @@ -43,3 +43,7 @@ set(BUILD_MP TRUE CACHE BOOL set(NEWSPRINTF FALSE CACHE BOOL "Whether to compile the new sprintf.") + +if(MSVC) + option(RUNTIME_CHECKS "Whether to enable runtime checks on MSVC" ON) +endif() diff --git a/sdk/cmake/config.cmake b/sdk/cmake/config.cmake index 4c2305479ac..d9897426bd8 100644 --- a/sdk/cmake/config.cmake +++ b/sdk/cmake/config.cmake @@ -83,9 +83,12 @@ set(_PREFAST_ FALSE CACHE BOOL "Whether to enable PREFAST while compiling.") set(_VS_ANALYZE_ FALSE CACHE BOOL "Whether to enable static analysis while compiling.") -else() -set(STACK_PROTECTOR FALSE CACHE BOOL -"Whether to enbable the GCC stack checker while compiling") + + option(RUNTIME_CHECKS "Whether to enable runtime checks on MSVC" ON) +endif() + +if(GCC) + option(STACK_PROTECTOR "Whether to enable the GCC stack checker while compiling" OFF) endif() set(USE_DUMMY_PSEH FALSE CACHE BOOL diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index d18c42251ea..0662fd24692 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -151,10 +151,6 @@ if(MSVC_IDE AND (NOT DEFINED USE_FOLDER_STRUCTURE)) set(USE_FOLDER_STRUCTURE TRUE) endif() -if(NOT DEFINED RUNTIME_CHECKS) - set(RUNTIME_CHECKS FALSE) -endif() - if(RUNTIME_CHECKS) add_definitions(-D__RUNTIME_CHECKS__) add_compile_flags("/RTC1")

1 0

[reactos] 01/01: [SHELL32] Make "Unable to get notification window" quiet
by Katayama Hirofumi MZ 10 Apr '20

10 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2a6bccb4ce84092f4725e… commit 2a6bccb4ce84092f4725e7bd64e33f09941522ea Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Apr 11 08:45:23 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Apr 11 08:45:23 2020 +0900 [SHELL32] Make "Unable to get notification window" quiet CORE-13950 --- dll/win32/shell32/shelldesktop/CChangeNotify.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dll/win32/shell32/shelldesktop/CChangeNotify.cpp b/dll/win32/shell32/shelldesktop/CChangeNotify.cpp index 34c11809381..af4825cdaf8 100644 --- a/dll/win32/shell32/shelldesktop/CChangeNotify.cpp +++ b/dll/win32/shell32/shelldesktop/CChangeNotify.cpp @@ -45,6 +45,12 @@ DoGetNewDeliveryWorker(void) return s_hwndNewWorker; HWND hwndShell = GetShellWindow(); + if (hwndShell == NULL) + { + TRACE("GetShellWindow() returned NULL\n"); + return NULL; + } + HWND hwndWorker = (HWND)SendMessageW(hwndShell, WM_GETDELIWORKERWND, 0, 0); if (!IsWindow(hwndWorker)) {

1 0

[reactos] 01/01: [DEVMGR] Remove ATLASSERTs from ListDevicesByType and RecurseChildDevices
by Eric Kohl 10 Apr '20

10 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=de5f67726be1b385ad297… commit de5f67726be1b385ad29766dfec6082f0e26b2c7 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Fri Apr 10 20:58:02 2020 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Fri Apr 10 20:58:02 2020 +0200 [DEVMGR] Remove ATLASSERTs from ListDevicesByType and RecurseChildDevices Suggested by Mark Jansen. Thanks! --- dll/win32/devmgr/devmgmt/DeviceView.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dll/win32/devmgr/devmgmt/DeviceView.cpp b/dll/win32/devmgr/devmgmt/DeviceView.cpp index 214c5f711a3..8a59b6ef85e 100644 --- a/dll/win32/devmgr/devmgmt/DeviceView.cpp +++ b/dll/win32/devmgr/devmgmt/DeviceView.cpp @@ -458,7 +458,6 @@ CDeviceView::ListDevicesByType() ClassNode = GetClassNode(&ClassGuid); if (ClassNode == nullptr) { - ATLASSERT(FALSE); ClassIndex++; continue; } @@ -511,7 +510,6 @@ CDeviceView::ListDevicesByType() DeviceNode = GetDeviceNode(DeviceInfoData.DevInst); if (DeviceNode == nullptr) { - ATLASSERT(bClassUnknown == true); DeviceIndex++; continue; } @@ -616,7 +614,6 @@ CDeviceView::RecurseChildDevices( DeviceNode = dynamic_cast<CDeviceNode *>(GetDeviceNode(Device)); if (DeviceNode == nullptr) { - ATLASSERT(FALSE); return false; } @@ -651,7 +648,6 @@ CDeviceView::RecurseChildDevices( DeviceNode = dynamic_cast<CDeviceNode *>(GetDeviceNode(Device)); if (DeviceNode == nullptr) { - ATLASSERT(FALSE); continue; }

1 0

[reactos] 01/01: [NETSHELL] Disable the 'Delete' menu item for physical network interfaces
by Eric Kohl 10 Apr '20

10 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eb1fd0c090386dc1288a5… commit eb1fd0c090386dc1288a51c837b245ba7f0f8e1b Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Fri Apr 10 19:34:38 2020 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Fri Apr 10 19:39:47 2020 +0200 [NETSHELL] Disable the 'Delete' menu item for physical network interfaces CORE-16821 --- dll/shellext/netshell/connectmanager.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dll/shellext/netshell/connectmanager.cpp b/dll/shellext/netshell/connectmanager.cpp index 2cb697ce450..78e2059df51 100644 --- a/dll/shellext/netshell/connectmanager.cpp +++ b/dll/shellext/netshell/connectmanager.cpp @@ -293,7 +293,13 @@ CNetConnection::GetProperties(NETCON_PROPERTIES **ppProps) /* Enable 'Rename' and 'Delete' for Adminstrators only */ if (IsUserAdmin()) { - pProperties->dwCharacter |= (NCCF_ALLOW_RENAME | NCCF_ALLOW_REMOVAL); + pProperties->dwCharacter |= NCCF_ALLOW_RENAME; + + /* Virtual network interfaces can be deleted */ + if (IfEntry.dwType == IF_TYPE_TUNNEL) + { + pProperties->dwCharacter |= NCCF_ALLOW_REMOVAL; + } } else {

1 0

[reactos] 01/01: [ZIPFLDR] CORE-16823 fr-FR Translate 'Click next to extract'
by Joachim Henze 10 Apr '20

10 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3b3c5153e78cd91b7abc2… commit 3b3c5153e78cd91b7abc205d2055e7fa1ff261ac Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Fri Apr 10 18:59:15 2020 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Fri Apr 10 18:59:15 2020 +0200 [ZIPFLDR] CORE-16823 fr-FR Translate 'Click next to extract' --- dll/shellext/zipfldr/lang/fr-FR.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/shellext/zipfldr/lang/fr-FR.rc b/dll/shellext/zipfldr/lang/fr-FR.rc index 76c114e2efb..777d6cbb788 100644 --- a/dll/shellext/zipfldr/lang/fr-FR.rc +++ b/dll/shellext/zipfldr/lang/fr-FR.rc @@ -16,7 +16,7 @@ BEGIN EDITTEXT IDC_DIRECTORY,6,24,222,12,ES_AUTOHSCROLL PUSHBUTTON "Parcourir...",IDC_BROWSE,174,42,54,14 PUSHBUTTON "Mot de passe",IDC_PASSWORD,174,66,54,14 - LTEXT "Click 'Next' to extract",IDC_STATUSTEXT,6,114,100,8 + LTEXT "Appuyez sur 'Suivant' pour extraire",IDC_STATUSTEXT,6,114,150,8 CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,6,126,222,6 END

1 0

[reactos] 01/01: [STOBJECT] CORE-16598 fr-FR translation of 'Adjust Power Settings'
by Joachim Henze 10 Apr '20

10 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d93b1f978433f1f79cba8… commit d93b1f978433f1f79cba8ad4a44a5e7b5b922b67 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Fri Apr 10 18:32:04 2020 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Fri Apr 10 18:32:04 2020 +0200 [STOBJECT] CORE-16598 fr-FR translation of 'Adjust Power Settings' --- dll/shellext/stobject/lang/fr-FR.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/shellext/stobject/lang/fr-FR.rc b/dll/shellext/stobject/lang/fr-FR.rc index f0dfd9db9f8..47b0f41b925 100644 --- a/dll/shellext/stobject/lang/fr-FR.rc +++ b/dll/shellext/stobject/lang/fr-FR.rc @@ -15,7 +15,7 @@ END STRINGTABLE BEGIN //Power related strings - IDS_PWR_PROPERTIES "&Adjust Power Properties" + IDS_PWR_PROPERTIES "&Modifier les paramètres d'alimentation" IDS_PWR_METER "&Open Power Meter" IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" IDS_PWR_PERCENT_REMAINING "%u%% remaining"

1 0

[reactos] 01/01: [BROWSEUI] Add 'm_' prefix to CExplorerBand members (#2524)
by Katayama Hirofumi MZ 10 Apr '20

10 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d04f2e5209588e2b72988… commit d04f2e5209588e2b72988f155cf2207cecabb185 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Apr 10 23:08:31 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Apr 10 23:08:31 2020 +0900 [BROWSEUI] Add 'm_' prefix to CExplorerBand members (#2524) Add 'm_' prefix to the variable members of class CExplorerBand for readability. CORE-13950 --- dll/win32/browseui/explorerband.cpp | 159 +++++++++++++++++++----------------- dll/win32/browseui/explorerband.h | 31 +++---- 2 files changed, 98 insertions(+), 92 deletions(-) diff --git a/dll/win32/browseui/explorerband.cpp b/dll/win32/browseui/explorerband.cpp index 76bd7aa939c..fa915c8d89b 100644 --- a/dll/win32/browseui/explorerband.cpp +++ b/dll/win32/browseui/explorerband.cpp @@ -2,6 +2,7 @@ * ReactOS Explorer * * Copyright 2016 Sylvain Deverre <deverre dot sylv at gmail dot com> + * Copyright 2020 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -143,16 +144,20 @@ Cleanup: return hr; } -CExplorerBand::CExplorerBand() : - pSite(NULL), fVisible(FALSE), bNavigating(FALSE), dwBandID(0), pidlCurrent(NULL) +CExplorerBand::CExplorerBand() + : m_pSite(NULL) + , m_fVisible(FALSE) + , m_bNavigating(FALSE) + , m_dwBandID(0) + , m_pidlCurrent(NULL) { } CExplorerBand::~CExplorerBand() { - if(pidlCurrent) + if (m_pidlCurrent) { - ILFree(pidlCurrent); + ILFree(m_pidlCurrent); } } @@ -164,7 +169,7 @@ void CExplorerBand::InitializeExplorerBand() CComPtr<IWebBrowser2> browserService; SHChangeNotifyEntry shcne; - hr = SHGetDesktopFolder(&pDesktop); + hr = SHGetDesktopFolder(&m_pDesktop); if (FAILED_UNEXPECTEDLY(hr)) return; @@ -180,18 +185,18 @@ void CExplorerBand::InitializeExplorerBand() TreeView_SetImageList(m_hWnd, (HIMAGELIST)piml, TVSIL_NORMAL); // Insert the root node - hRoot = InsertItem(0, pDesktop, pidl, pidl, FALSE); - if (!hRoot) + m_hRoot = InsertItem(0, m_pDesktop, pidl, pidl, FALSE); + if (!m_hRoot) { ERR("Failed to create root item\n"); return; } - NodeInfo* pNodeInfo = GetNodeInfo(hRoot); + NodeInfo* pNodeInfo = GetNodeInfo(m_hRoot); // Insert child nodes - InsertSubitems(hRoot, pNodeInfo); - TreeView_Expand(m_hWnd, hRoot, TVE_EXPAND); + InsertSubitems(m_hRoot, pNodeInfo); + TreeView_Expand(m_hWnd, m_hRoot, TVE_EXPAND); // Navigate to current folder position NavigateToCurrentFolder(); @@ -199,23 +204,23 @@ void CExplorerBand::InitializeExplorerBand() // Register shell notification shcne.pidl = pidl; shcne.fRecursive = TRUE; - shellRegID = SHChangeNotifyRegister( + m_shellRegID = SHChangeNotifyRegister( m_hWnd, SHCNRF_ShellLevel | SHCNRF_InterruptLevel | SHCNRF_RecursiveInterrupt, SHCNE_DISKEVENTS | SHCNE_RENAMEFOLDER | SHCNE_RMDIR | SHCNE_MKDIR, WM_USER_SHELLEVENT, 1, &shcne); - if (!shellRegID) + if (!m_shellRegID) { ERR("Something went wrong, error %08x\n", GetLastError()); } // Register browser connection endpoint - hr = IUnknown_QueryService(pSite, SID_SWebBrowserApp, IID_PPV_ARG(IWebBrowser2, &browserService)); + hr = IUnknown_QueryService(m_pSite, SID_SWebBrowserApp, IID_PPV_ARG(IWebBrowser2, &browserService)); if (FAILED_UNEXPECTEDLY(hr)) return; - hr = AtlAdvise(browserService, dynamic_cast<IDispatch*>(this), DIID_DWebBrowserEvents, &adviseCookie); + hr = AtlAdvise(browserService, dynamic_cast<IDispatch*>(this), DIID_DWebBrowserEvents, &m_adviseCookie); if (FAILED_UNEXPECTEDLY(hr)) return; @@ -229,16 +234,16 @@ void CExplorerBand::DestroyExplorerBand() TRACE("Cleaning up explorer band ...\n"); - hr = IUnknown_QueryService(pSite, SID_SWebBrowserApp, IID_PPV_ARG(IWebBrowser2, &browserService)); + hr = IUnknown_QueryService(m_pSite, SID_SWebBrowserApp, IID_PPV_ARG(IWebBrowser2, &browserService)); if (FAILED_UNEXPECTEDLY(hr)) return; - hr = AtlUnadvise(browserService, DIID_DWebBrowserEvents, adviseCookie); + hr = AtlUnadvise(browserService, DIID_DWebBrowserEvents, m_adviseCookie); /* Remove all items of the treeview */ RevokeDragDrop(m_hWnd); TreeView_DeleteAllItems(m_hWnd); - pDesktop = NULL; - hRoot = NULL; + m_pDesktop = NULL; + m_hRoot = NULL; TRACE("Cleanup done !\n"); } @@ -262,7 +267,7 @@ HRESULT CExplorerBand::ExecuteCommand(CComPtr<IContextMenu>& menu, UINT nCmd) HWND browserWnd; HRESULT hr; - hr = IUnknown_QueryService(pSite, SID_SShellBrowser, IID_PPV_ARG(IOleWindow, &pBrowserOleWnd)); + hr = IUnknown_QueryService(m_pSite, SID_SShellBrowser, IID_PPV_ARG(IOleWindow, &pBrowserOleWnd)); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -287,7 +292,7 @@ HRESULT CExplorerBand::UpdateBrowser(LPITEMIDLIST pidlGoto) CComPtr<IShellBrowser> pBrowserService; HRESULT hr; - hr = IUnknown_QueryService(pSite, SID_STopLevelBrowser, IID_PPV_ARG(IShellBrowser, &pBrowserService)); + hr = IUnknown_QueryService(m_pSite, SID_STopLevelBrowser, IID_PPV_ARG(IShellBrowser, &pBrowserService)); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -295,10 +300,10 @@ HRESULT CExplorerBand::UpdateBrowser(LPITEMIDLIST pidlGoto) if (FAILED_UNEXPECTEDLY(hr)) return hr; - if(pidlCurrent) + if (m_pidlCurrent) { - ILFree(pidlCurrent); - pidlCurrent = ILClone(pidlGoto); + ILFree(m_pidlCurrent); + m_pidlCurrent = ILClone(pidlGoto); } return hr; } @@ -309,7 +314,7 @@ BOOL CExplorerBand::OnTreeItemExpanding(LPNMTREEVIEW pnmtv) NodeInfo *pNodeInfo; if (pnmtv->action == TVE_COLLAPSE) { - if (pnmtv->itemNew.hItem == hRoot) + if (pnmtv->itemNew.hItem == m_hRoot) { // Prenvent root from collapsing pnmtv->itemNew.mask |= TVIF_STATE; @@ -356,7 +361,7 @@ void CExplorerBand::OnSelectionChanged(LPNMTREEVIEW pnmtv) NodeInfo* pNodeInfo = GetNodeInfo(pnmtv->itemNew.hItem); /* Prevents navigation if selection is initiated inside the band */ - if (bNavigating) + if (m_bNavigating) return; UpdateBrowser(pNodeInfo->absolutePidl); @@ -461,9 +466,9 @@ Cleanup: IUnknown_SetSite(contextMenu, NULL); if (treeMenu) DestroyMenu(treeMenu); - bNavigating = TRUE; - TreeView_SelectItem(m_hWnd, oldSelected); - bNavigating = FALSE; + m_bNavigating = TRUE; + TreeView_SelectItem(m_hWnd, m_oldSelected); + m_bNavigating = FALSE; return TRUE; } @@ -479,13 +484,13 @@ LRESULT CExplorerBand::ContextMenuHack(UINT uMsg, WPARAM wParam, LPARAM lParam, info.hItem = NULL; // Save the current location - oldSelected = TreeView_GetSelection(m_hWnd); + m_oldSelected = TreeView_GetSelection(m_hWnd); // Move to the item selected by the treeview (don't change right pane) TreeView_HitTest(m_hWnd, &info); - bNavigating = TRUE; + m_bNavigating = TRUE; TreeView_SelectItem(m_hWnd, info.hItem); - bNavigating = FALSE; + m_bNavigating = FALSE; } return FALSE; /* let the wndproc process the message */ } @@ -534,15 +539,15 @@ LRESULT CExplorerBand::OnShellEvent(UINT uMsg, WPARAM wParam, LPARAM lParam, BOO LRESULT CExplorerBand::OnSetFocus(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { - bFocused = TRUE; - IUnknown_OnFocusChangeIS(pSite, reinterpret_cast<IUnknown*>(this), TRUE); + m_bFocused = TRUE; + IUnknown_OnFocusChangeIS(m_pSite, reinterpret_cast<IUnknown*>(this), TRUE); bHandled = FALSE; return TRUE; } LRESULT CExplorerBand::OnKillFocus(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { - IUnknown_OnFocusChangeIS(pSite, reinterpret_cast<IUnknown*>(this), FALSE); + IUnknown_OnFocusChangeIS(m_pSite, reinterpret_cast<IUnknown*>(this), FALSE); bHandled = FALSE; return TRUE; } @@ -651,15 +656,15 @@ BOOL CExplorerBand::InsertSubitems(HTREEITEM hItem, NodeInfo *pNodeInfo) return FALSE; } - if (!pDesktop->CompareIDs(NULL, pidlSub, entry)) + if (!m_pDesktop->CompareIDs(NULL, pidlSub, entry)) { // We are the desktop, so use pDesktop as pFolder - pFolder = pDesktop; + pFolder = m_pDesktop; } else { // Get an IShellFolder of our pidl - hr = pDesktop->BindToObject(entry, NULL, IID_PPV_ARG(IShellFolder, &pFolder)); + hr = m_pDesktop->BindToObject(entry, NULL, IID_PPV_ARG(IShellFolder, &pFolder)); if (!SUCCEEDED(hr)) { ILFree(pidlSub); @@ -730,7 +735,7 @@ BOOL CExplorerBand::NavigateToPIDL(LPITEMIDLIST dest, HTREEITEM *item, BOOL bExp return FALSE; found = FALSE; - current = hRoot; + current = m_hRoot; parent = NULL; while(!found) { @@ -742,7 +747,7 @@ BOOL CExplorerBand::NavigateToPIDL(LPITEMIDLIST dest, HTREEITEM *item, BOOL bExp return FALSE; } // If we found our node, give it back - if (!pDesktop->CompareIDs(0, nodeData->absolutePidl, dest)) + if (!m_pDesktop->CompareIDs(0, nodeData->absolutePidl, dest)) { if (bSelect) TreeView_SelectItem(m_hWnd, current); @@ -818,7 +823,7 @@ BOOL CExplorerBand::NavigateToCurrentFolder() BOOL result; explorerPidl = NULL; - hr = IUnknown_QueryService(pSite, SID_STopLevelBrowser, IID_PPV_ARG(IBrowserService, &pBrowserService)); + hr = IUnknown_QueryService(m_pSite, SID_STopLevelBrowser, IID_PPV_ARG(IBrowserService, &pBrowserService)); if (!SUCCEEDED(hr)) { ERR("Can't get IBrowserService !\n"); @@ -831,10 +836,10 @@ BOOL CExplorerBand::NavigateToCurrentFolder() ERR("Unable to get browser PIDL !\n"); return FALSE; } - bNavigating = TRUE; + m_bNavigating = TRUE; /* find PIDL into our explorer */ result = NavigateToPIDL(explorerPidl, &dummy, TRUE, FALSE, TRUE); - bNavigating = FALSE; + m_bNavigating = FALSE; return result; } @@ -851,7 +856,7 @@ BOOL CExplorerBand::DeleteItem(LPITEMIDLIST idl) parentNode = TreeView_GetParent(m_hWnd, toDelete); // Navigate to parent when deleting child item - if (!pDesktop->CompareIDs(0, idl, pidlCurrent)) + if (!m_pDesktop->CompareIDs(0, idl, m_pidlCurrent)) { TreeView_SelectItem(m_hWnd, parentNode); } @@ -1009,7 +1014,7 @@ int CALLBACK CExplorerBand::CompareTreeItems(LPARAM p1, LPARAM p2, LPARAM p3) if (_ILIsSpecialFolder(info1->relativePidl) && !_ILIsSpecialFolder(info2->relativePidl)) { HRESULT hr; - hr = pThis->pDesktop->CompareIDs(0, info1->absolutePidl, info2->absolutePidl); + hr = pThis->m_pDesktop->CompareIDs(0, info1->absolutePidl, info2->absolutePidl); if (!hr) return 0; return (hr > 0) ? -1 : 1; } @@ -1048,7 +1053,7 @@ HRESULT STDMETHODCALLTYPE CExplorerBand::ResizeBorderDW(const RECT *prcBorder, I HRESULT STDMETHODCALLTYPE CExplorerBand::ShowDW(BOOL fShow) { - fVisible = fShow; + m_fVisible = fShow; ShowWindow(fShow); return S_OK; } @@ -1061,7 +1066,7 @@ HRESULT STDMETHODCALLTYPE CExplorerBand::GetBandInfo(DWORD dwBandID, DWORD dwVie { return E_INVALIDARG; } - this->dwBandID = dwBandID; + this->m_dwBandID = dwBandID; if (pdbi->dwMask & DBIM_MINSIZE) { @@ -1110,7 +1115,7 @@ HRESULT STDMETHODCALLTYPE CExplorerBand::SetSite(IUnknown *pUnkSite) HRESULT hr; HWND parentWnd; - if (pUnkSite == pSite) + if (pUnkSite == m_pSite) return S_OK; TRACE("SetSite called \n"); @@ -1121,9 +1126,9 @@ HRESULT STDMETHODCALLTYPE CExplorerBand::SetSite(IUnknown *pUnkSite) m_hWnd = NULL; } - if (pUnkSite != pSite) + if (pUnkSite != m_pSite) { - pSite = NULL; + m_pSite = NULL; } if(!pUnkSite) @@ -1136,7 +1141,7 @@ HRESULT STDMETHODCALLTYPE CExplorerBand::SetSite(IUnknown *pUnkSite) return E_INVALIDARG; } - pSite = pUnkSite; + m_pSite = pUnkSite; if (m_hWnd) { @@ -1163,7 +1168,7 @@ HRESULT STDMETHODCALLTYPE CExplorerBand::GetSite(REFIID riid, void **ppvSite) { if (!ppvSite) return E_POINTER; - *ppvSite = pSite; + *ppvSite = m_pSite; return S_OK; } @@ -1186,7 +1191,7 @@ HRESULT STDMETHODCALLTYPE CExplorerBand::Exec(const GUID *pguidCmdGroup, DWORD n HRESULT STDMETHODCALLTYPE CExplorerBand::QueryService(REFGUID guidService, REFIID riid, void **ppvObject) { /* FIXME: we probably want to handle more services here */ - return IUnknown_QueryService(pSite, SID_SShellBrowser, riid, ppvObject); + return IUnknown_QueryService(m_pSite, SID_SShellBrowser, riid, ppvObject); } @@ -1209,7 +1214,7 @@ HRESULT STDMETHODCALLTYPE CExplorerBand::UIActivateIO(BOOL fActivate, LPMSG lpMs HRESULT STDMETHODCALLTYPE CExplorerBand::HasFocusIO() { - return bFocused ? S_OK : S_FALSE; + return m_bFocused ? S_OK : S_FALSE; } HRESULT STDMETHODCALLTYPE CExplorerBand::TranslateAcceleratorIO(LPMSG lpMsg) @@ -1446,8 +1451,8 @@ HRESULT STDMETHODCALLTYPE CExplorerBand::Invoke(DISPID dispIdMember, REFIID riid HRESULT STDMETHODCALLTYPE CExplorerBand::DragEnter(IDataObject *pObj, DWORD glfKeyState, POINTL pt, DWORD *pdwEffect) { ERR("Entering drag\n"); - pCurObject = pObj; - oldSelected = TreeView_GetSelection(m_hWnd); + m_pCurObject = pObj; + m_oldSelected = TreeView_GetSelection(m_hWnd); return DragOver(glfKeyState, pt, pdwEffect); } @@ -1470,15 +1475,15 @@ HRESULT STDMETHODCALLTYPE CExplorerBand::DragOver(DWORD glfKeyState, POINTL pt, if (info.hItem) { - bNavigating = TRUE; + m_bNavigating = TRUE; TreeView_SelectItem(m_hWnd, info.hItem); - bNavigating = FALSE; + m_bNavigating = FALSE; // Delegate to shell folder - if (pDropTarget && info.hItem != childTargetNode) + if (m_pDropTarget && info.hItem != m_childTargetNode) { - pDropTarget = NULL; + m_pDropTarget = NULL; } - if (info.hItem != childTargetNode) + if (info.hItem != m_childTargetNode) { nodeInfo = GetNodeInfo(info.hItem); if (!nodeInfo) @@ -1492,10 +1497,10 @@ HRESULT STDMETHODCALLTYPE CExplorerBand::DragOver(DWORD glfKeyState, POINTL pt, return E_FAIL; #endif if(_ILIsDesktop(nodeInfo->absolutePidl)) - pShellFldr = pDesktop; + pShellFldr = m_pDesktop; else { - hr = pDesktop->BindToObject(nodeInfo->absolutePidl, 0, IID_PPV_ARG(IShellFolder, &pShellFldr)); + hr = m_pDesktop->BindToObject(nodeInfo->absolutePidl, 0, IID_PPV_ARG(IShellFolder, &pShellFldr)); if (!SUCCEEDED(hr)) { /* Don't allow dnd since we couldn't get our folder object */ @@ -1504,7 +1509,7 @@ HRESULT STDMETHODCALLTYPE CExplorerBand::DragOver(DWORD glfKeyState, POINTL pt, return E_FAIL; } } - hr = pShellFldr->CreateViewObject(m_hWnd, IID_PPV_ARG(IDropTarget, &pDropTarget)); + hr = pShellFldr->CreateViewObject(m_hWnd, IID_PPV_ARG(IDropTarget, &m_pDropTarget)); if (!SUCCEEDED(hr)) { /* Don't allow dnd since we couldn't get our drop target */ @@ -1512,18 +1517,18 @@ HRESULT STDMETHODCALLTYPE CExplorerBand::DragOver(DWORD glfKeyState, POINTL pt, *pdwEffect = DROPEFFECT_NONE; return E_FAIL; } - hr = pDropTarget->DragEnter(pCurObject, glfKeyState, pt, pdwEffect); - childTargetNode = info.hItem; + hr = m_pDropTarget->DragEnter(m_pCurObject, glfKeyState, pt, pdwEffect); + m_childTargetNode = info.hItem; } - if (pDropTarget) + if (m_pDropTarget) { - hr = pDropTarget->DragOver(glfKeyState, pt, pdwEffect); + hr = m_pDropTarget->DragOver(glfKeyState, pt, pdwEffect); } } else { - childTargetNode = NULL; - pDropTarget = NULL; + m_childTargetNode = NULL; + m_pDropTarget = NULL; *pdwEffect = DROPEFFECT_NONE; } return S_OK; @@ -1531,22 +1536,22 @@ HRESULT STDMETHODCALLTYPE CExplorerBand::DragOver(DWORD glfKeyState, POINTL pt, HRESULT STDMETHODCALLTYPE CExplorerBand::DragLeave() { - bNavigating = TRUE; - TreeView_SelectItem(m_hWnd, oldSelected); - bNavigating = FALSE; - childTargetNode = NULL; - if (pCurObject) + m_bNavigating = TRUE; + TreeView_SelectItem(m_hWnd, m_oldSelected); + m_bNavigating = FALSE; + m_childTargetNode = NULL; + if (m_pCurObject) { - pCurObject = NULL; + m_pCurObject = NULL; } return S_OK; } HRESULT STDMETHODCALLTYPE CExplorerBand::Drop(IDataObject *pObj, DWORD glfKeyState, POINTL pt, DWORD *pdwEffect) { - if (!pDropTarget) + if (!m_pDropTarget) return E_FAIL; - pDropTarget->Drop(pObj, glfKeyState, pt, pdwEffect); + m_pDropTarget->Drop(pObj, glfKeyState, pt, pdwEffect); DragLeave(); return S_OK; } diff --git a/dll/win32/browseui/explorerband.h b/dll/win32/browseui/explorerband.h index 33d84dde3ba..29c6160431f 100644 --- a/dll/win32/browseui/explorerband.h +++ b/dll/win32/browseui/explorerband.h @@ -2,6 +2,7 @@ * ReactOS Explorer * * Copyright 2016 Sylvain Deverre <deverre dot sylv at gmail dot com> + * Copyright 2020 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -51,27 +52,27 @@ private: }; // *** BaseBarSite information *** - CComPtr<IUnknown> pSite; - CComPtr<IShellFolder> pDesktop; + CComPtr<IUnknown> m_pSite; + CComPtr<IShellFolder> m_pDesktop; // *** tree explorer band stuff *** - BOOL fVisible; - BOOL bNavigating; - BOOL bFocused; - DWORD dwBandID; - HIMAGELIST hImageList; - HTREEITEM hRoot; - HTREEITEM oldSelected; - LPITEMIDLIST pidlCurrent; + BOOL m_fVisible; + BOOL m_bNavigating; + BOOL m_bFocused; + DWORD m_dwBandID; + HIMAGELIST m_hImageList; + HTREEITEM m_hRoot; + HTREEITEM m_oldSelected; + LPITEMIDLIST m_pidlCurrent; // *** notification cookies *** - DWORD adviseCookie; - ULONG shellRegID; + DWORD m_adviseCookie; + ULONG m_shellRegID; // *** Drop target information *** - CComPtr<IDropTarget> pDropTarget; - HTREEITEM childTargetNode; - CComPtr<IDataObject> pCurObject; + CComPtr<IDropTarget> m_pDropTarget; + HTREEITEM m_childTargetNode; + CComPtr<IDataObject> m_pCurObject; void InitializeExplorerBand(); void DestroyExplorerBand();

1 0

[reactos] 01/01: [SHELL32] Simplify CChangeNotify::ShouldNotify
by Katayama Hirofumi MZ 10 Apr '20

10 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=60959e34aab862d03ea8b… commit 60959e34aab862d03ea8b20b9a367fc431f5a14a Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Apr 10 21:57:58 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> 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; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs