Change ComPtr from atl to wrl

Author: funap

Explorer.vcxproj

@@ -105,7 +105,7 @@
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
-      <AdditionalDependencies>Comctl32.lib;Mpr.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Comctl32.lib;Shlwapi.lib;Mpr.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <Midl>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -119,7 +119,7 @@
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <PostBuildEvent>
-      <Command>copy "$(TargetPath)" "D:\Applications\Notepad++x86\plugins\Explorer</Command>
+      <Command>copy /Y "$(TargetPath)" "D:\apps\Notepad++\plugins\Explorer"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -140,7 +140,7 @@
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
-      <AdditionalDependencies>Comctl32.lib;Mpr.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Comctl32.lib;Shlwapi.lib;Mpr.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <Midl>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -174,7 +174,7 @@
       <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;shlwapi.lib;Msimg32.lib;Comctl32.lib;Mpr.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Comctl32.lib;Shlwapi.lib;Msimg32.lib;Mpr.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -193,7 +193,7 @@
       <Culture>0x0407</Culture>
     </ResourceCompile>
     <PostBuildEvent>
-      <Command>copy "$(TargetPath)" "D:\Applications\Notepad++x86\plugins\Explorer</Command>
+      <Command>copy /Y "$(TargetPath)" "D:\apps\Notepad++\plugins\Explorer"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -213,7 +213,7 @@
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;shlwapi.lib;Msimg32.lib;Comctl32.lib;Mpr.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Comctl32.lib;Shlwapi.lib;Msimg32.lib;Mpr.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>

src/Explorer/ContextMenu.h

@@ -31,8 +31,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "Explorer.h"
 
-struct __declspec(uuid("000214e6-0000-0000-c000-000000000046")) IShellFolder;
-
 class ContextMenu
 {
 public:

src/Explorer/Explorer.cpp

@@ -26,9 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <shlwapi.h>
 #include <shlobj.h>
 #include <dbt.h>
-#include <atlbase.h>
-
 #include <ranges>
+#include <wrl/client.h>
 
 #include "NppInterface.h"
 #include "ExplorerDialog.h"
@@ -241,10 +240,10 @@ extern "C" __declspec(dllexport) void setInfo(NppData notpadPlusData)
     helpDlg     .init(g_hInst, g_nppData._nppHandle);
 
     explorerDlg.VisibleChanged([](bool visible) {
-        ::SendMessage(g_nppData._nppHandle, NPPM_SETMENUITEMCHECK, funcItem[0]._cmdID, (LPARAM)visible);
+        ::SendMessage(g_nppData._nppHandle, NPPM_SETMENUITEMCHECK, funcItem[DOCKABLE_EXPLORER_INDEX]._cmdID, (LPARAM)visible);
     });
     favesDlg.VisibleChanged([](bool visible) {
-        ::SendMessage(g_nppData._nppHandle, NPPM_SETMENUITEMCHECK, funcItem[1]._cmdID, (LPARAM)visible);
+        ::SendMessage(g_nppData._nppHandle, NPPM_SETMENUITEMCHECK, funcItem[DOCKABLE_FAVORTIES_INDEX]._cmdID, (LPARAM)visible);
     });
 
     /* Subclassing for Notepad */
@@ -896,46 +895,40 @@ void ExtractIcons(LPCTSTR currentPath, LPCTSTR fileName, DevType type, LPINT piI
 }
 
 // Resolve files if they are shortcuts
-HRESULT ResolveShortCut(const std::wstring &shortcutPath, LPTSTR lpszFilePath, int maxBuf)
+HRESULT ResolveShortCut(const std::wstring &shortcutPath, LPWSTR lpszFilePath, int maxBuf)
 {
-    HRESULT hRes = S_FALSE;
-    CComPtr<IShellLink> ipShellLink;
-    lpszFilePath[0] = '\0';
-
-    // Get a pointer to the IShellLink interface
-    hRes = CoCreateInstance(CLSID_ShellLink,
-                            nullptr,
-                            CLSCTX_INPROC_SERVER,
-                            IID_IShellLink,
-                            (void**)&ipShellLink);
-
-    if (hRes == S_OK) {
-        // Get a pointer to the IPersistFile interface
-        CComQIPtr<IPersistFile> ipPersistFile(ipShellLink);
-
-        // Open the shortcut file and initialize it from its contents
-        hRes = ipPersistFile->Load(shortcutPath.c_str(), STGM_READ);
-        if (hRes == S_OK) {
-            // Try to find the target of a shortcut, even if it has been moved or renamed
-            hRes = ipShellLink->Resolve(nullptr, SLR_UPDATE);
-            if (hRes == S_OK) {
-                // Get the path to the shortcut target
-                WCHAR szPath[MAX_PATH];
-                hRes = ipShellLink->GetPath(szPath, MAX_PATH, nullptr, SLGP_RAWPATH);
-                if (hRes == S_OK) {
-                    _tcsncpy(lpszFilePath, szPath, maxBuf);
-
-                    if (::PathIsDirectory(lpszFilePath) != FALSE) {
-                        if (lpszFilePath[wcslen(lpszFilePath) - 1] != '\\') {
-                            wcsncat(lpszFilePath, L"\\", MAX_PATH);
-                        }
-                    }
-                }
-            }
-        }
+    Microsoft::WRL::ComPtr<IShellLink> shellLink;
+    HRESULT hr = CoCreateInstance(CLSID_ShellLink, nullptr, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&shellLink));
+    if (FAILED(hr)) {
+        return hr;
+    }
+
+    Microsoft::WRL::ComPtr<IPersistFile> persistFile;
+    hr = shellLink.As(&persistFile);
+    if (FAILED(hr)) {
+        return hr;
+    }
+
+    hr = persistFile->Load(shortcutPath.c_str(), STGM_READ);
+    if (FAILED(hr)) {
+        return hr;
+    }
+
+    hr = shellLink->Resolve(nullptr, SLR_UPDATE);
+    if (FAILED(hr)) {
+        return hr;
+    }
+
+    hr = shellLink->GetPath(lpszFilePath, maxBuf, nullptr, SLGP_RAWPATH);
+    if (FAILED(hr)) {
+        return hr;
+    }
+
+    if (::PathIsDirectory(lpszFilePath) && lpszFilePath[wcslen(lpszFilePath) - 1] != L'\\') {
+        wcsncat_s(lpszFilePath, maxBuf, L"\\", 1);
     }
 
-    return hRes;
+    return S_OK;
 }
 
 

src/Explorer/Explorer.h

@@ -175,7 +175,7 @@ HIMAGELIST GetSmallImageList(BOOL bSystem);
 void ExtractIcons(LPCTSTR currentPath, LPCTSTR fileName, DevType type, LPINT iIconNormal, LPINT iIconSelected, LPINT iIconOverlayed);
 
 /* Resolve Links */
-HRESULT ResolveShortCut(const std::wstring& shortcutPath, LPTSTR lpszFilePath, int maxBuf);
+HRESULT ResolveShortCut(const std::wstring& shortcutPath, LPWSTR lpszFilePath, int maxBuf);
 
 /* current open files */
 void UpdateDocs();