Add model capacity of shortcuts.xml & contexMenu.xml for administration

Fix notepad-plus-plus#17872

Author: donho

PowerEditor/bin/change.log

@@ -1,3 +1,28 @@
+Notepad++ v8.9.3 regression fixes, bug-fixes & new improvements:
+
+ 1. Regression fix: a crash in User Defined Language.
+ 2. Regression fix: installing (or removing) plugin re-opens Notepad++ with permanent admin privilege.
+ 3. Regression-fix: wrongly added parenthesis for some multi-bytes characters.
+ 4. Regression-fix: incorrect function list text display for non-UTF8 documents.
+ 5. Regression-fix: ProjectPanel Workspace text localization issue.
+ 6. Regression-fix: Change History margin not enabled by default.
+ 7. Regression-fix: Notepad++ update & plugin download fail behind corporate MITM proxies.
+ 8. Security enhancement: Update cURL to v8.19.0 in auto-updater (WinGUp) to fix cURL security issue (CVE-2025-14819).
+ 9. Improve performance by migrating the XML parser from TinyXML to pugixml.
+10. Update Scintilla to 5.6.0 & Lexilla to 5.4.7.
+11. Fix the issue where printing caused Notepad++ to crash.
+12. Fix Find in Files failing to search file content on disk.
+13. Add disableNppAutoUpdate.xml to disable auto-update when WinGUp (GUP.exe) is present.
+14. Fix a memory leak on exit.
+15. Fix installed auto-completion files not overwritten after update.
+16. Add an option to disable selected text drag-and-drop.
+17. Fix wrong theme-writing path for non-ProgramFiles installations.
+18. Enhancement: prevent XML config files from being overwritten when updating portable package (copy/paste).
+19. Fix incomplete Find dialg tab translation when 1st opêned from Project Panels.
+20. Fix Notepad++ spawning a new Windows Explorer process in Task Manager.
+21. Add Function List & Autocompletion for D language.
+
+
 Notepad++ v8.9.2 regression fixes, bug-fixes & new improvements:
 
  1. Security enhancement: Make updater check interity & authenticity of server-returned XML (XMLDsig).
@@ -28,7 +53,7 @@ Notepad++ v8.9.1 regression fixes, bug-fixes & new improvements:
 
 
 Get more info on
-https://notepad-plus-plus.org/downloads/v8.9.2/
+https://notepad-plus-plus.org/downloads/v8.9.3/
 
 
 Included plugins:
@@ -40,4 +65,4 @@ Included plugins:
 
 Updater (Installer only):
 
-* WinGUp (for Notepad++) v5.4
+* WinGUp (for Notepad++) v5.4.1

PowerEditor/src/Parameters.cpp

@@ -637,6 +637,7 @@ static constexpr ScintillaKeyDefinition scintKeyDefs[]
 };
 
 #define SHORTCUTSXML_FILENAME L"shortcuts.xml"
+#define SHORTCUTSXML_MODEL_FILENAME L"shortcuts.model.xml"
 
 #define SESSION_BACKUP_EXT L".inCaseOfCorruption.bak"
 
@@ -1660,7 +1661,12 @@ bool NppParameters::load()
 
 	if (!doesFileExist(_shortcutsPath.c_str()))
 	{
-		generateXmlFromScratch(_shortcutsPath.c_str(), SHORTCUT_XML_CONTENT);
+		std::wstring srcShortcutsPath(_nppPath);
+		pathAppend(srcShortcutsPath, SHORTCUTSXML_MODEL_FILENAME);
+		if (doesFileExist(srcShortcutsPath.c_str()))
+			::CopyFile(srcShortcutsPath.c_str(), _shortcutsPath.c_str(), TRUE);
+		else
+			generateXmlFromScratch(_shortcutsPath.c_str(), SHORTCUT_XML_CONTENT);
 	}
 
 	_pXmlShortcutDoc = new NppXml::NewDocument();
@@ -1690,7 +1696,13 @@ bool NppParameters::load()
 
 	if (!doesFileExist(_contextMenuPath.c_str()))
 	{
-		generateXmlFromScratch(_contextMenuPath.c_str(), CONTEXTMENU_XML_CONTENT);
+		std::wstring srcContextMenuPath(_nppPath);
+		pathAppend(srcContextMenuPath, L"contextMenu.xml");
+
+		if (doesFileExist(srcContextMenuPath.c_str()))
+			::CopyFile(srcContextMenuPath.c_str(), _contextMenuPath.c_str(), TRUE);
+		else
+			generateXmlFromScratch(_contextMenuPath.c_str(), CONTEXTMENU_XML_CONTENT);
 	}
 
 	_pXmlContextMenuDoc = new NppXml::NewDocument();

PowerEditor/src/resource.h

@@ -19,14 +19,14 @@
 
 //************ Notepad++ version **************************
 
-#define NOTEPAD_PLUS_VERSION L"Notepad++ v8.9.2"
+#define NOTEPAD_PLUS_VERSION L"Notepad++ v8.9.3"
 
 // should be X.Y : ie. if VERSION_DIGITALVALUE == 4, 7, 1, 0 , then X = 4, Y = 71
 // ex : #define VERSION_VALUE L"5.63\0"
-#define VERSION_INTERNAL_VALUE L"8.92\0"
+#define VERSION_INTERNAL_VALUE L"8.93\0"
 
-#define VERSION_PRODUCT_VALUE L"8.9.2\0"
-#define VERSION_DIGITALVALUE 8, 9, 2, 0
+#define VERSION_PRODUCT_VALUE L"8.9.3\0"
+#define VERSION_DIGITALVALUE 8, 9, 3, 0
 
 //**********************************************************