fix #386

update to N++ 8.8.2 pre

Author: chcg

NppPlugin/include/Common.h

@@ -48,7 +48,7 @@ const bool dirDown = false;
 #endif
 
 
-#define NPP_INTERNAL_FUCTION_STR L"Notepad++::InternalFunction"
+#define NPP_INTERNAL_FUNCTION_STR L"Notepad++::InternalFunction"
 
 
 std::wstring folderBrowser(HWND parent, const std::wstring & title = L"", int outputCtrlID = 0, const wchar_t *defaultStr = NULL);
@@ -87,17 +87,18 @@ class WcharMbcsConvertor final
 		return instance;
 	}
 
-	const wchar_t * char2wchar(const char *mbStr, size_t codepage, int lenMbcs =-1, int* pLenOut=NULL, int* pBytesNotProcessed=NULL);
-	const wchar_t * char2wchar(const char *mbcs2Convert, size_t codepage, intptr_t* mstart, intptr_t* mend);
-	const char * wchar2char(const wchar_t *wcStr, size_t codepage, int lenIn = -1, int* pLenOut = NULL);
-	const char * wchar2char(const wchar_t *wcStr, size_t codepage, intptr_t* mstart, intptr_t* mend);
+	const wchar_t* char2wchar(const char* mbStr, size_t codepage, int lenMbcs = -1, int* pLenOut = NULL, int* pBytesNotProcessed = NULL);
+	const wchar_t* char2wchar(const char* mbcs2Convert, size_t codepage, intptr_t* mstart, intptr_t* mend, int len = 0);
+	size_t getSizeW() { return _wideCharStr.size(); };
+	const char* wchar2char(const wchar_t* wcStr, size_t codepage, int lenIn = -1, int* pLenOut = NULL);
+	const char* wchar2char(const wchar_t* wcStr, size_t codepage, intptr_t* mstart, intptr_t* mend, int lenIn = 0, int* lenOut = nullptr);
+	size_t getSizeA() { return _multiByteStr.size(); };
 
-	const char * encode(UINT fromCodepage, UINT toCodepage, const char *txt2Encode, int lenIn = -1, int* pLenOut=NULL, int* pBytesNotProcessed=NULL)
-	{
+	const char* encode(UINT fromCodepage, UINT toCodepage, const char* txt2Encode, int lenIn = -1, int* pLenOut = NULL, int* pBytesNotProcessed = NULL) {
 		int lenWc = 0;
-        const wchar_t * strW = char2wchar(txt2Encode, fromCodepage, lenIn, &lenWc, pBytesNotProcessed);
-        return wchar2char(strW, toCodepage, lenWc, pLenOut);
-    }
+		const wchar_t* strW = char2wchar(txt2Encode, fromCodepage, lenIn, &lenWc, pBytesNotProcessed);
+		return wchar2char(strW, toCodepage, lenWc, pLenOut);
+	}
 
 protected:
 	WcharMbcsConvertor() = default;
@@ -112,46 +113,46 @@ class WcharMbcsConvertor final
 	WcharMbcsConvertor(WcharMbcsConvertor&&) = delete;
 	WcharMbcsConvertor& operator= (WcharMbcsConvertor&&) = delete;
 
-	template <class T>
-	class StringBuffer final
+	template <class T> class StringBuffer final
 	{
 	public:
 		~StringBuffer() { if (_allocLen) delete[] _str; }
 
-		void sizeTo(size_t size)
-		{
-			if (_allocLen < size)
+		void sizeTo(size_t size) {
+			if (_allocLen < size + 1)
 			{
 				if (_allocLen)
 					delete[] _str;
-				_allocLen = std::max<size_t>(size, initSize);
-				_str = new T[_allocLen];
+				_allocLen = std::max<size_t>(size + 1, initSize);
+				_str = new T[_allocLen]{};
 			}
+			_dataLen = size;
 		}
 
-		void empty()
-		{
+		void empty() {
 			static T nullStr = 0; // routines may return an empty string, with null terminator, without allocating memory; a pointer to this null character will be returned in that case
 			if (_allocLen == 0)
 				_str = &nullStr;
 			else
 				_str[0] = 0;
+			_dataLen = 0;
 		}
 
+		size_t size() const { return _dataLen; }
 		operator T* () { return _str; }
 		operator const T* () const { return _str; }
 
 	protected:
 		static const int initSize = 1024;
 		size_t _allocLen = 0;
+		size_t _dataLen = 0;
 		T* _str = nullptr;
 	};
 
 	StringBuffer<char> _multiByteStr;
 	StringBuffer<wchar_t> _wideCharStr;
 };
 
-
 #define REBARBAND_SIZE sizeof(REBARBANDINFO)
 
 std::wstring pathRemoveFileSpec(std::wstring & path);

NppPlugin/include/Docking.h

@@ -1,5 +1,5 @@
 // This file is part of Notepad++ project
-// Copyright (C)2024 Don HO <[email protected]>
+// Copyright (C)2025 Don HO <[email protected]>
 
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -48,18 +48,18 @@
 
 
 struct tTbData {
-	HWND hClient = nullptr;                // client Window Handle
+	HWND hClient = nullptr;                  // client Window Handle
 	const wchar_t* pszName = nullptr;        // name of plugin (shown in window)
-	int dlgID = 0;                         // a funcItem provides the function pointer to start a dialog. Please parse here these ID
+	int dlgID = 0;                           // a funcItem provides the function pointer to start a dialog. Please parse here these ID
 
 	// user modifications
-	UINT uMask = 0;                        // mask params: look to above defines
-	HICON hIconTab = nullptr;              // icon for tabs
-	const wchar_t* pszAddInfo = nullptr;     // for plugin to display additional informations
+	UINT uMask = 0;                          // mask params: look to above defines
+	HICON hIconTab = nullptr;                // icon for tabs
+	const wchar_t* pszAddInfo = nullptr;     // for plugin to display additional information
 
 	// internal data, do not use !!!
-	RECT rcFloat = {};                     // floating position
-	int iPrevCont = 0;                     // stores the privious container (toggling between float and dock)
+	RECT rcFloat = {};                       // floating position
+	int iPrevCont = 0;                       // stores the privious container (toggling between float and dock)
 	const wchar_t* pszModuleName = nullptr;  // it's the plugin file name. It's used to identify the plugin
 };
 

NppPlugin/include/DockingDlgInterface.h

@@ -20,6 +20,7 @@
 #include "dockingResource.h"
 #include "Docking.h"
 
+#include <array>
 #include <assert.h>
 #include <shlwapi.h>
 #include "Common.h"
@@ -41,7 +42,7 @@ class DockingDlgInterface : public StaticDialog
 		_moduleName = ::PathFindFileName(temp);
 	}
 
-	void create(tTbData* data, bool isRTL = false) {
+	virtual void create(tTbData* data, bool isRTL = false) {
 		assert(data != nullptr);
 		StaticDialog::create(_dlgID, isRTL);
 		wchar_t temp[MAX_PATH];
@@ -56,7 +57,12 @@ class DockingDlgInterface : public StaticDialog
 		data->uMask = 0;
 
 		// additional info
-		data->pszAddInfo = NULL;
+		data->pszAddInfo = nullptr;
+	}
+
+	virtual void create(tTbData* data, std::array<int, 3> iconIDs, bool isRTL = false) {
+		create(data, isRTL);
+		_iconIDs = iconIDs;
 	}
 
 	virtual void updateDockingDlg() {
@@ -82,12 +88,17 @@ class DockingDlgInterface : public StaticDialog
 		return _moduleName.c_str();
 	}
 
+	const std::array<int, 3>& getIconIDs() const {
+		return _iconIDs;
+	}
+
 protected :
 	int	_dlgID = -1;
-	bool _isFloating = true;
 	int _iDockedPos = 0;
 	std::wstring _moduleName;
 	std::wstring _pluginName;
+	std::array<int, 3> _iconIDs{};
+	bool _isFloating = true;
 	bool _isClosed = false;
 
 	intptr_t CALLBACK run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam) override {
@@ -100,14 +111,14 @@ protected :
 					break;
 				}
 
-				RECT rc = {};
+				RECT rc{};
 				getClientRect(rc);
-				::FillRect(reinterpret_cast<HDC>(wParam), &rc, NppDarkMode::getDarkerBackgroundBrush());
+				::FillRect(reinterpret_cast<HDC>(wParam), &rc, NppDarkMode::getDlgBackgroundBrush());
 				return TRUE;
 			}
-			case WM_NOTIFY: 
+			case WM_NOTIFY:
 			{
-				LPNMHDR	pnmh = reinterpret_cast<LPNMHDR>(lParam);
+				auto* pnmh = reinterpret_cast<LPNMHDR>(lParam);
 
 				if (pnmh->hwndFrom == _hParent)
 				{