tyler.durden
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix unregister modern context menu syntax error and remove concerning binaries during uninstallation

This commit is contained in:
Don Ho 2023-03-20 00:37:44 +01:00
parent e849406806
commit 9c15bdc236
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PowerEditor/installer/nppSetup.nsi
View File

@ -289,7 +289,7 @@ ${MementoSection} "Context Menu Entry" explorerContextMenu
File /oname=$INSTDIR\NppModernShell.msix "..\bin64\NppModernShell.msix" File /oname=$INSTDIR\NppModernShell.msix "..\bin64\NppModernShell.msix"
File /oname=$INSTDIR\NppModernShell.dll "..\bin64\NppModernShell.dll" File /oname=$INSTDIR\NppModernShell.dll "..\bin64\NppModernShell.dll"
!endif !endif
Exec 'rundll32.exe"$INSTDIR\NppModernShell.dll,RegisterSparsePackage"' Exec 'rundll32.exe "$INSTDIR\NppModernShell.dll",RegisterSparsePackage'
; Make sure old NppShell dll's are unregistered and removed ; Make sure old NppShell dll's are unregistered and removed
Exec 'regsvr32 /u /s "$INSTDIR\NppShell_01.dll"' Exec 'regsvr32 /u /s "$INSTDIR\NppShell_01.dll"'

14
PowerEditor/installer/nsisInclude/uninstall.nsh
View File

@ -41,11 +41,13 @@ Function un.onUninstSuccess
RMDir "$INSTDIR\plugins\" RMDir "$INSTDIR\plugins\"
RMDir "$INSTDIR\updater\" RMDir "$INSTDIR\updater\"
RMDir "$INSTDIR\autoCompletion\" RMDir "$INSTDIR\autoCompletion\"
RMDir "$INSTDIR\functionList\"
RMDir "$INSTDIR\themes\"
RMDir "$INSTDIR\" RMDir "$INSTDIR\"
RMDir "$APPDATA\${APPNAME}\plugins\" RMDir "$APPDATA\${APPNAME}\plugins\"
RMDir "$installPath\userDefineLangs\"
RMDir "$installPath\themes\" ; if files are kept because of $keepUserData, this will not be deleted RMDir "$installPath\themes\" ; if files are kept because of $keepUserData, this will not be deleted
RMDir "$installPath\userDefineLangs\"
RMDir "$installPath\" RMDir "$installPath\"
FunctionEnd FunctionEnd
@ -70,7 +72,9 @@ Section un.explorerContextMenu
Delete "$INSTDIR\NppShell_05.dll" Delete "$INSTDIR\NppShell_05.dll"
Delete "$INSTDIR\NppShell_06.dll" Delete "$INSTDIR\NppShell_06.dll"
Exec 'rundll32.exe"$INSTDIR\NppModernShell.dll,UnregisterSparsePackage"' Exec 'rundll32.exe "$INSTDIR\NppModernShell.dll",UnregisterSparsePackage'
;Delete "$INSTDIR\NppModernShell.dll"
;Delete "$INSTDIR\NppModernShell.msix"
ReadRegStr $muiVerbStrUn HKLM "SOFTWARE\Classes\*\shell\pintohome" MUIVerb ReadRegStr $muiVerbStrUn HKLM "SOFTWARE\Classes\*\shell\pintohome" MUIVerb
${UnStrStr} $nppSubStrUn $muiVerbStrUn "Notepad++" ${UnStrStr} $nppSubStrUn $muiVerbStrUn "Notepad++"
@ -301,6 +305,12 @@ Section Uninstall
SetShellVarContext all ; make context for all user SetShellVarContext all ; make context for all user
${endIf} ${endIf}
; In order to not delete context menu binary before we unregistered it,
; we delete them at the end
Delete "$INSTDIR\NppModernShell.dll"
Delete "$INSTDIR\NppModernShell.msix"
; Remove remaining directories ; Remove remaining directories
RMDir /r "$INSTDIR\plugins\disabled\" RMDir /r "$INSTDIR\plugins\disabled\"
RMDir "$INSTDIR\plugins\APIs\" RMDir "$INSTDIR\plugins\APIs\"