update to current N++ version notepad-plus-plus/notepad-plus-plus@a4a8f72

Author: chcg

NppPlugin/include/Common.h

@@ -14,43 +14,27 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
+
 #pragma once
-#include <vector>
-#include <string>
-#include <sstream>
+
 #include <windows.h>
+
 #include <commctrl.h>
-#include <iso646.h>
-#include <cstdint>
-#include <unordered_set>
-#include <algorithm>
 #include <tchar.h>
 
+#include <algorithm>
+#include <locale>
+#include <sstream>
+#include <string>
+#include <unordered_set>
+#include <vector>
+
+#if defined(_MSC_VER)
 #pragma deprecated(PathFileExists)  // Use doesFileExist, doesDirectoryExist or doesPathExist (for file or directory) instead.
 #pragma deprecated(PathIsDirectory) // Use doesDirectoryExist instead.
-
-
-const bool dirUp = true;
-const bool dirDown = false;
-
-#define NPP_CP_WIN_1252           1252
-#define NPP_CP_DOS_437            437
-#define NPP_CP_BIG5               950
-
-#define LINKTRIGGERED WM_USER+555
-
-#define BCKGRD_COLOR (RGB(255,102,102))
-#define TXT_COLOR    (RGB(255,255,255))
-
-#ifndef __MINGW32__
-#define WCSTOK wcstok
-#else
-#define WCSTOK wcstok_s
 #endif
 
 
-#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);
 std::wstring getFolderName(HWND parent, const wchar_t *defaultDir = NULL);
@@ -68,12 +52,12 @@ std::vector<std::wstring> tokenizeString(const std::wstring & tokenString, const
 void ClientRectToScreenRect(HWND hWnd, RECT* rect);
 void ScreenRectToClientRect(HWND hWnd, RECT* rect);
 
-std::wstring string2wstring(const std::string & rString, UINT codepage);
-std::string wstring2string(const std::wstring & rwString, UINT codepage);
-bool isInList(const wchar_t *token, const wchar_t *list);
+std::wstring string2wstring(const std::string& rString, UINT codepage = CP_UTF8);
+std::string wstring2string(const std::wstring& rwString, UINT codepage = CP_UTF8);
+bool isInList(const wchar_t* token, const wchar_t* list);
 std::wstring BuildMenuFileName(int filenameLen, unsigned int pos, const std::wstring &filename, bool ordinalNumber = true);
 
-std::string getFileContent(const wchar_t *file2read);
+std::string getFileContent(const wchar_t* file2read, bool* pbFailed = nullptr);
 std::wstring relativeFilePathToFullFilePath(const wchar_t *relativeFilePath);
 void writeFileContent(const wchar_t *file2write, const char *content2write);
 bool matchInList(const wchar_t *fileName, const std::vector<std::wstring> & patterns);
@@ -88,12 +72,12 @@ 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, 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 wchar_t* char2wchar(const char* mbcs2Convert, size_t codepage, int lenMbcs = -1, int* pLenWc = nullptr, int* pBytesNotProcessed = NULL);
+	const wchar_t* char2wchar(const char* mbcs2Convert, size_t codepage, intptr_t* mstart, intptr_t* mend, int mbcsLen = 0);
+	size_t getSizeW() const { return _wideCharStr.size(); }
+	const char* wchar2char(const wchar_t* wcharStr2Convert, size_t codepage, int lenWc = -1, int* pLenMbcs = nullptr);
+	const char* wchar2char(const wchar_t* wcharStr2Convert, size_t codepage, intptr_t* mstart, intptr_t* mend, int wcharLenIn = 0, int* lenOut = nullptr);
+	size_t getSizeA() const { return _multiByteStr.size(); }
 
 	const char* encode(UINT fromCodepage, UINT toCodepage, const char* txt2Encode, int lenIn = -1, int* pLenOut = NULL, int* pBytesNotProcessed = NULL) {
 		int lenWc = 0;
@@ -144,7 +128,7 @@ class WcharMbcsConvertor final
 		operator const T* () const { return _str; }
 
 	protected:
-		static const int initSize = 1024;
+		static constexpr int initSize = 1024;
 		size_t _allocLen = 0;
 		size_t _dataLen = 0;
 		T* _str = nullptr;
@@ -154,8 +138,6 @@ class WcharMbcsConvertor final
 	StringBuffer<wchar_t> _wideCharStr;
 };
 
-#define REBARBAND_SIZE sizeof(REBARBANDINFO)
-
 std::wstring pathRemoveFileSpec(std::wstring & path);
 std::wstring pathAppend(std::wstring &strDest, const std::wstring & str2append);
 COLORREF getCtrlBgColor(HWND hWnd);
@@ -168,6 +150,8 @@ void stringJoin(const std::vector<std::wstring>& strings, const std::wstring& se
 std::wstring stringTakeWhileAdmissable(const std::wstring& input, const std::wstring& admissable);
 double stodLocale(const std::wstring& str, _locale_t loc, size_t* idx = NULL);
 
+const std::locale& getSysLocale();
+
 bool str2Clipboard(const std::wstring &str2cpy, HWND hwnd);
 std::wstring strFromClipboard();
 class Buffer;
@@ -178,11 +162,11 @@ std::wstring GetLastErrorAsString(DWORD errorCode = 0);
 std::wstring intToString(int val);
 std::wstring uintToString(unsigned int val);
 
-HWND CreateToolTip(int toolID, HWND hDlg, HINSTANCE hInst, const PTSTR pszText, bool isRTL);
-HWND CreateToolTipRect(int toolID, HWND hWnd, HINSTANCE hInst, const PTSTR pszText, const RECT rc);
+HWND CreateToolTip(int toolID, HWND hDlg, HINSTANCE hInst, const PWSTR pszText, bool isRTL);
+HWND CreateToolTipRect(int toolID, HWND hWnd, HINSTANCE hInst, const PWSTR pszText, const RECT rc);
 
 bool isCertificateValidated(const std::wstring & fullFilePath, const std::wstring & subjectName2check);
-bool isAssoCommandExisting(LPCTSTR FullPathName);
+bool isAssoCommandExisting(LPCWSTR FullPathName);
 
 bool deleteFileOrFolder(const std::wstring& f2delete);
 
@@ -233,42 +217,43 @@ class Version final
 {
 public:
 	Version() = default;
-	Version(const std::wstring& versionStr);
+	explicit Version(const std::wstring& versionStr);
 
 	void setVersionFrom(const std::wstring& filePath);
-	std::wstring toString();
-	bool isNumber(const std::wstring& s) const {
+	std::wstring toString() const;
+	static bool isNumber(const std::wstring& s) {
+		static const auto& loc = std::locale::classic();
 		return !s.empty() &&
-			find_if(s.begin(), s.end(), [](wchar_t c) { return !_istdigit(c); }) == s.end();
-	};
+			find_if(s.begin(), s.end(), [](auto c) { return !std::isdigit(c, loc); }) == s.end();
+	}
 
 	int compareTo(const Version& v2c) const;
 
 	bool operator < (const Version& v2c) const {
 		return compareTo(v2c) == -1;
-	};
+	}
 
 	bool operator <= (const Version& v2c) const {
 		int r = compareTo(v2c);
 		return r == -1 || r == 0;
-	};
+	}
 
 	bool operator > (const Version& v2c) const {
 		return compareTo(v2c) == 1;
-	};
+	}
 
 	bool operator >= (const Version& v2c) const {
 		int r = compareTo(v2c);
 		return r == 1 || r == 0;
-	};
+	}
 
 	bool operator == (const Version& v2c) const {
 		return compareTo(v2c) == 0;
-	};
+	}
 
 	bool operator != (const Version& v2c) const {
 		return compareTo(v2c) != 0;
-	};
+	}
 
 	bool empty() const {
 		return _major == 0 && _minor == 0 && _patch == 0 && _build == 0;
@@ -300,26 +285,25 @@ bool isWindowVisibleOnAnyMonitor(const RECT& rectWndIn);
 bool isCoreWindows();
 
 
-#define IDT_HIDE_TOOLTIP 1001
-
 class ControlInfoTip final
 {
 public:
-	ControlInfoTip() {};
+	ControlInfoTip() = default;
 	~ControlInfoTip() {
 		if (_hWndInfoTip) {
 			hide();
 		}
-	};
+	}
+
 	bool init(HINSTANCE hInst, HWND ctrl2attached, HWND ctrl2attachedParent, const std::wstring& tipStr, bool isRTL, unsigned int remainTimeMillisecond = 0, int maxWidth = 200); // remainTimeMillisecond = 0: no timeout
 
 	bool isValid() const {
 		return _hWndInfoTip != nullptr;
-	};
+	}
 
 	HWND getTipHandle() const {
 		return _hWndInfoTip;
-	};
+	}
 
 	enum showPosition {beginning, middle, end};
 	void show(showPosition pos = middle) const;
@@ -334,9 +318,38 @@ class ControlInfoTip final
 	ControlInfoTip& operator=(const ControlInfoTip&) = delete;
 };
 
+DWORD invokeNppUacOp(const std::wstring& strCmdLineParams);
+bool fileTimeToYMD(const FILETIME& ft, int& yyyymmdd);
+void expandEnv(std::wstring& path2Expand);
 
-#define NPP_UAC_SAVE_SIGN L"#UAC-SAVE#"
-#define NPP_UAC_SETFILEATTRIBUTES_SIGN L"#UAC-SETFILEATTRIBUTES#"
-#define NPP_UAC_MOVEFILE_SIGN L"#UAC-MOVEFILE#"
-#define NPP_UAC_CREATEEMPTYFILE_SIGN L"#UAC-CREATEEMPTYFILE#"
-DWORD invokeNppUacOp(std::wstring& strCmdLineParams);
+class ScopedCOMInit final // never use this in DllMain
+{
+public:
+	ScopedCOMInit() {
+		HRESULT hr = ::CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED); // attempt STA init 1st (older CoInitialize(NULL))
+		if (hr == RPC_E_CHANGED_MODE) {
+			hr = ::CoInitializeEx(nullptr, COINIT_MULTITHREADED); // STA init failed, switch to MTA
+		}
+		if (SUCCEEDED(hr)) {
+			// S_OK or S_FALSE, both needs subsequent CoUninitialize()
+			_bInitialized = true;
+		}
+	}
+
+	~ScopedCOMInit() {
+		if (_bInitialized) {
+			_bInitialized = false;
+			::CoUninitialize();
+		}
+	}
+
+	bool isInitialized() const {
+		return _bInitialized;
+	}
+
+private:
+	bool _bInitialized = false;
+
+	ScopedCOMInit(const ScopedCOMInit&) = delete;
+	ScopedCOMInit& operator=(const ScopedCOMInit&) = delete;
+};

NppPlugin/include/DockingDlgInterface.h

@@ -17,17 +17,19 @@
 
 #pragma once
 
-#include "dockingResource.h"
-#include "Docking.h"
+#include <windows.h>
 
-#include <array>
-#include <assert.h>
 #include <shlwapi.h>
-#include "Common.h"
-#include "StaticDialog.h"
-#include "NppDarkMode.h"
 
+#include <array>
+#include <cassert>
+#include <string>
 
+#include "Docking.h"
+#include "Notepad_plus_msgs.h"
+#include "NppDarkMode.h"
+#include "StaticDialog.h"
+#include "dockingResource.h"
 
 class DockingDlgInterface : public StaticDialog
 {
@@ -101,6 +103,8 @@ protected :
 	bool _isFloating = true;
 	bool _isClosed = false;
 
+	using StaticDialog::create;
+
 	intptr_t CALLBACK run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam) override {
 		switch (message)
 		{
@@ -149,5 +153,5 @@ protected :
 				break;
 		}
 		return FALSE;
-	};
+	}
 };

NppPlugin/include/Notepad_plus_msgs.h

@@ -917,7 +917,7 @@ enum Platform { PF_UNKNOWN, PF_X86, PF_X64, PF_IA64, PF_ARM64 };
 
 		// Standard flags for main parent usually used in NPPN_DARKMODECHANGED.
 		constexpr ULONG dmfHandleChange = 0x0000000CUL;
-	};
+	}
 
 	// ULONG NPPM_DARKMODESUBCLASSANDTHEME(ULONG dmFlags, HWND hwnd)
 	// Add support for generic dark mode to plugin dialog. Subclassing is applied automatically unless DWS_USEOWNDARKMODE flag is used.

NppPlugin/include/NppDarkMode.h

@@ -44,7 +44,6 @@ namespace NppDarkMode
 	struct Options
 	{
 		bool enable = false;
-		bool enableMenubar = false;
 		bool enablePlugin = false;
 	};
 
@@ -90,7 +89,6 @@ namespace NppDarkMode
 	void initAdvancedOptions();
 
 	bool isEnabled();
-	bool isDarkMenuEnabled();
 	bool isEnabledForPlugins();
 	bool isExperimentalActive();
 	bool isExperimentalSupported();
@@ -176,11 +174,6 @@ namespace NppDarkMode
 	void handleSettingChange(HWND hwnd, LPARAM lParam, bool isFromBtn = false);
 	bool isDarkModeReg();
 
-	// processes messages related to UAH / custom menubar drawing.
-	// return true if handled, false to continue with normal processing in your wndproc
-	bool runUAHWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam, LRESULT* lr);
-	void drawUAHMenuNCBottomLine(HWND hWnd);
-
 	// from DarkMode.h
 	void initExperimentalDarkMode();
 	void setDarkMode(bool useDark, bool fixDarkScrollbar);
@@ -216,6 +209,7 @@ namespace NppDarkMode
 	ULONG autoSubclassAndThemePlugin(HWND hwnd, ULONG dmFlags);
 	void autoSubclassCtlColor(HWND hWnd);
 	void autoSubclassAndThemeWindowNotify(HWND hwnd);
+	void autoSubclassWindowMenuBar(HWND hWnd);
 
 	void setDarkTitleBar(HWND hwnd);
 	void setDarkExplorerTheme(HWND hwnd);