Fix icon missing issue due to file system permissions

Fix #2, Close #6

Author: GurliGebis

AclHelper.cpp

@@ -0,0 +1,32 @@
+#include "pch.h"
+#include "AclHelper.h"
+
+AclHelper::AclHelper()
+{
+    emptyAcl = (PACL)malloc(sizeof(ACL));
+
+    if (emptyAcl)
+    {
+        InitializeAcl(emptyAcl, sizeof(ACL), ACL_REVISION);
+    }
+}
+
+AclHelper::~AclHelper()
+{
+    if (emptyAcl)
+    {
+        free(emptyAcl);
+    }
+}
+
+DWORD AclHelper::ResetAcl(const wstring& path)
+{
+    if (emptyAcl)
+    {
+        return SetNamedSecurityInfoW(const_cast<LPWSTR>(path.c_str()), SE_FILE_OBJECT, DACL_SECURITY_INFORMATION | UNPROTECTED_DACL_SECURITY_INFORMATION, NULL, NULL, emptyAcl, NULL);
+    }
+    else
+    {
+        return ERROR_OUTOFMEMORY;
+    }
+}

AclHelper.h

@@ -0,0 +1,13 @@
+#pragma once
+
+class AclHelper
+{
+public:
+    AclHelper();
+    ~AclHelper();
+
+    DWORD ResetAcl(const wstring& path);
+
+private:
+    PACL emptyAcl;
+};

EditWithNppExplorerCommandHandler.cpp

@@ -1,17 +1,17 @@
 #include "pch.h"
 #include "EditWithNppExplorerCommandHandler.h"
 
-#include "Helpers.h"
+#include "PathHelper.h"
 
 using namespace NppShell::CommandHandlers;
 using namespace NppShell::Helpers;
 
 const wstring EditWithNppExplorerCommandHandler::GetNppExecutableFullPath()
 {
-    const wstring path = GetInstallationPath();
+    const wstring path = GetApplicationPath();
     const wstring fileName = L"\\notepad++.exe";
 
-    return L"\"" + path + fileName + L"\"";
+    return path + fileName;
 }
 
 const wstring EditWithNppExplorerCommandHandler::Title()
@@ -26,12 +26,12 @@ const wstring EditWithNppExplorerCommandHandler::Icon()
     return fileName;
 }
 
-const wstring EditWithNppExplorerCommandHandler::GetCommandLine()
+const wstring EditWithNppExplorerCommandHandler::GetCommandLine(const wstring& itemName)
 {
     const wstring fileName = GetNppExecutableFullPath();
-    const wstring parameters = L"\"%1\"";
+    const wstring parameters = L"\"" + itemName + L"\"";
 
-    return fileName + L" " + parameters;
+    return L"\"" + fileName + L"\" " + parameters;
 }
 
 IFACEMETHODIMP EditWithNppExplorerCommandHandler::Invoke(IShellItemArray* psiItemArray, IBindCtx* pbc) noexcept try
@@ -54,8 +54,8 @@ IFACEMETHODIMP EditWithNppExplorerCommandHandler::Invoke(IShellItemArray* psiIte
         psiItemArray->GetItemAt(i, &psi);
         RETURN_IF_FAILED(psi->GetDisplayName(SIGDN_FILESYSPATH, &itemName));
 
-        std::wstring cmdline = this->GetCommandLine();
-        cmdline = cmdline.replace(cmdline.find(L"%1"), 2, itemName);
+        const wstring applicationName = GetNppExecutableFullPath();
+        const wstring commandLine = GetCommandLine(itemName);
 
         STARTUPINFO si;
         PROCESS_INFORMATION pi;
@@ -64,9 +64,10 @@ IFACEMETHODIMP EditWithNppExplorerCommandHandler::Invoke(IShellItemArray* psiIte
         si.cb = sizeof(si);
         ZeroMemory(&pi, sizeof(pi));
 
-        wchar_t* command = (LPWSTR)cmdline.c_str();
+        wchar_t* application = (LPWSTR)applicationName.c_str();
+        wchar_t* command = (LPWSTR)commandLine.c_str();
 
-        if (!CreateProcess(nullptr, command, nullptr, nullptr, false, CREATE_NEW_PROCESS_GROUP, nullptr, nullptr, &si, &pi))
+        if (!CreateProcessW(application, command, nullptr, nullptr, false, CREATE_NEW_PROCESS_GROUP, nullptr, nullptr, &si, &pi))
         {
             return S_OK;
         }

EditWithNppExplorerCommandHandler.h

@@ -19,6 +19,6 @@ namespace NppShell::CommandHandlers
 
     private:
         const wstring GetNppExecutableFullPath();
-        const wstring GetCommandLine();
+        const wstring GetCommandLine(const wstring& itemName);
     };
 }

Helpers.cpp

@@ -2,6 +2,8 @@
 #include "Installer.h"
 
 #include "EditWithNppExplorerCommandHandler.h"
+#include "PathHelper.h"
+#include "AclHelper.h"
 
 #define GUID_STRING_SIZE 40
 
@@ -126,7 +128,7 @@ LRESULT CreateRegistryKey(const HKEY hive, const wstring& key, const wstring& na
     return lResult;
 }
 
-LRESULT CleanupRegistry(const wstring guid)
+LRESULT CleanupRegistry(const wstring& guid)
 {
     constexpr int bufferSize = MAX_PATH + GUID_STRING_SIZE;
     WCHAR buffer[bufferSize];
@@ -233,12 +235,24 @@ HRESULT MoveFileToTempAndScheduleDeletion(const wstring& filePath)
     return S_OK;
 }
 
+HRESULT ResetAclPermissionsOnApplicationFolder()
+{
+    // First we get the path where Notepad++ is installed.
+    const wstring applicationPath = GetApplicationPath();
+
+    // Create a new AclHelper
+    AclHelper aclHelper;
+
+    // Reset the ACL of the folder where Notepad++ is installed.
+    aclHelper.ResetAcl(applicationPath);
+}
+
 HRESULT NppShell::Installer::RegisterSparsePackage()
 {
     PackageManager packageManager;
     AddPackageOptions options;
 
-    const wstring externalLocation = GetInstallationPath();
+    const wstring externalLocation = GetContextMenuPath();
     const wstring sparsePkgPath = externalLocation + L"\\NppShell.msix";
 
     Uri externalUri(externalLocation);
@@ -290,12 +304,15 @@ HRESULT NppShell::Installer::UnregisterSparsePackage()
         break;
     }
 
+    // After unregistering the sparse package, we reset the folder permissions of the folder where we are installed.
+    ResetAclPermissionsOnApplicationFolder();
+
     return S_OK;
 }
 
 HRESULT NppShell::Installer::RegisterOldContextMenu()
 {
-    const wstring installationPath = GetInstallationPath();
+    const wstring installationPath = GetContextMenuPath();
     const wstring guid = GetCLSIDString();
 
     CreateRegistryKey(HKEY_LOCAL_MACHINE, ShellKey, L"ExplorerCommandHandler", guid.c_str());
@@ -340,9 +357,11 @@ HRESULT NppShell::Installer::Install()
         result = RegisterOldContextMenu();
     }
 
-    // Ensure NppModernShell files have been moved away.
-    MoveFileToTempAndScheduleDeletion(GetInstallationPath() + L"\\NppModernShell.dll");
-    MoveFileToTempAndScheduleDeletion(GetInstallationPath() + L"\\NppModernShell.msix");
+    // Ensure NppModernShell and NppShell files have been moved away from the main program directory.
+    MoveFileToTempAndScheduleDeletion(GetApplicationPath() + L"\\NppShell.dll");
+    MoveFileToTempAndScheduleDeletion(GetApplicationPath() + L"\\NppShell.msix");
+    MoveFileToTempAndScheduleDeletion(GetApplicationPath() + L"\\NppModernShell.dll");
+    MoveFileToTempAndScheduleDeletion(GetApplicationPath() + L"\\NppModernShell.msix");
 
     SHChangeNotify(SHCNE_ASSOCCHANGED, SHCNF_IDLIST, 0, 0);
 

Installer.cpp

@@ -1,8 +1,6 @@
 #pragma once
 #include "pch.h"
 
-#include "Helpers.h"
-
 namespace NppShell::Installer
 {
     HRESULT RegisterOldContextMenu();
@@ -13,6 +11,6 @@ namespace NppShell::Installer
 
     HRESULT Install();
     HRESULT Uninstall();
+}
 
-    STDAPI CleanupDll();
-}
+STDAPI CleanupDll();

Installer.h

@@ -255,19 +255,21 @@
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClInclude Include="AclHelper.h" />
     <ClInclude Include="EditWithNppExplorerCommandHandler.h" />
     <ClInclude Include="ExplorerCommandBase.h" />
     <ClInclude Include="framework.h" />
-    <ClInclude Include="Helpers.h" />
+    <ClInclude Include="PathHelper.h" />
     <ClInclude Include="Installer.h" />
     <ClInclude Include="pch.h" />
     <ClInclude Include="SimpleFactory.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="AclHelper.cpp" />
     <ClCompile Include="dllmain.cpp" />
     <ClCompile Include="EditWithNppExplorerCommandHandler.cpp" />
     <ClCompile Include="ExplorerCommandBase.cpp" />
-    <ClCompile Include="Helpers.cpp" />
+    <ClCompile Include="PathHelper.cpp" />
     <ClCompile Include="Installer.cpp" />
     <ClCompile Include="pch.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>

NppShell.vcxproj

@@ -10,6 +10,9 @@
     <Filter Include="Factories">
       <UniqueIdentifier>{a0f353df-9c6f-4612-a2d1-98aa7a6d6893}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Helpers">
+      <UniqueIdentifier>{9c186a78-bd74-4ac7-b560-e61aeb6d2350}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="EditWithNppExplorerCommandHandler.h">
@@ -22,11 +25,16 @@
       <Filter>Installer</Filter>
     </ClInclude>
     <ClInclude Include="pch.h" />
-    <ClInclude Include="Helpers.h" />
     <ClInclude Include="framework.h" />
     <ClInclude Include="SimpleFactory.h">
       <Filter>Factories</Filter>
     </ClInclude>
+    <ClInclude Include="PathHelper.h">
+      <Filter>Helpers</Filter>
+    </ClInclude>
+    <ClInclude Include="AclHelper.h">
+      <Filter>Helpers</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="EditWithNppExplorerCommandHandler.cpp">
@@ -39,8 +47,13 @@
       <Filter>Installer</Filter>
     </ClCompile>
     <ClCompile Include="dllmain.cpp" />
-    <ClCompile Include="Helpers.cpp" />
     <ClCompile Include="pch.cpp" />
+    <ClCompile Include="PathHelper.cpp">
+      <Filter>Helpers</Filter>
+    </ClCompile>
+    <ClCompile Include="AclHelper.cpp">
+      <Filter>Helpers</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />

NppShell.vcxproj.filters

@@ -0,0 +1,26 @@
+#include "pch.h"
+#include "PathHelper.h"
+
+using namespace NppShell::Helpers;
+using namespace std::filesystem;
+
+extern HMODULE thisModule;
+
+const path GetThisModulePath()
+{
+    wchar_t pathBuffer[FILENAME_MAX] = { 0 };
+    GetModuleFileName(thisModule, pathBuffer, FILENAME_MAX);
+    return path(pathBuffer);
+}
+
+const wstring NppShell::Helpers::GetApplicationPath()
+{
+    path modulePath = GetThisModulePath();
+    return modulePath.parent_path().parent_path().wstring();
+}
+
+const wstring NppShell::Helpers::GetContextMenuPath()
+{
+    path modulePath = GetThisModulePath();
+    return modulePath.parent_path().wstring();
+}