Fix deprecated function usages

and fix typo.

Fix notepad-plus-plus#16645, fix notepad-plus-plus#17094

Author: donho

PowerEditor/installer/nativeLang/english.xml

@@ -226,7 +226,7 @@ Translation note:
 					<Item id="43020" name="Paste to (Replace) Bookmarked Lines"/>
 					<Item id="43021" name="Remove Bookmarked Lines"/>
 					<Item id="43051" name="Remove Non-Bookmarked Lines"/>
-					<Item id="43050" name="Inverse Bookmark"/>
+					<Item id="43050" name="Inverse Bookmarks"/>
 					<Item id="43052" name="Find characters in rang&amp;e..."/>
 					<Item id="43053" name="Select All In-betw&amp;een {} [] or ()"/>
 					<Item id="43009" name="Go to &amp;Matching Brace"/>

PowerEditor/installer/nativeLang/english_customizable.xml

@@ -226,7 +226,7 @@ Translation note:
 					<Item id="43020" name="Paste to (Replace) Bookmarked Lines"/>
 					<Item id="43021" name="Remove Bookmarked Lines"/>
 					<Item id="43051" name="Remove Non-Bookmarked Lines"/>
-					<Item id="43050" name="Inverse Bookmark"/>
+					<Item id="43050" name="Inverse Bookmarks"/>
 					<Item id="43052" name="Find characters in rang&amp;e..."/>
 					<Item id="43053" name="Select All In-betw&amp;een {} [] or ()"/>
 					<Item id="43009" name="Go to &amp;Matching Brace"/>

PowerEditor/src/DarkMode/DarkMode.cpp

@@ -160,7 +160,7 @@ void RefreshTitleBarThemeColor(HWND hWnd)
 bool IsColorSchemeChangeMessage(LPARAM lParam)
 {
 	bool is = false;
-	if (lParam && (0 == lstrcmpi(reinterpret_cast<LPCWCH>(lParam), L"ImmersiveColorSet")) && _RefreshImmersiveColorPolicyState)
+	if (lParam && (lstrcmpi(reinterpret_cast<LPCWCH>(lParam), L"ImmersiveColorSet") == 0) && _RefreshImmersiveColorPolicyState)
 	{
 		_RefreshImmersiveColorPolicyState();
 		is = true;

PowerEditor/src/EncodingMapper.cpp

@@ -89,7 +89,7 @@ bool isInListA(const char *token, const char *list)
 				word[j] = '\0';
 				j = 0;
 
-				if (!stricmp(token, word))
+				if (!_stricmp(token, word))
 					return true;
 			}
 		}

PowerEditor/src/MISC/Common/Common.cpp

@@ -282,7 +282,7 @@ bool isInList(const wchar_t *token, const wchar_t *list)
 				word[j] = '\0';
 				j = 0;
 
-				if (!wcsicmp(token, word))
+				if (!_wcsicmp(token, word))
 					return true;
 			}
 		}

PowerEditor/src/MISC/Common/verifySignedfile.cpp

@@ -154,8 +154,8 @@ bool SecurityGuard::verifySignedLibrary(const std::wstring& filepath)
 		CONST wchar_t* msftTEXTest_site = L"http://www.msftncsi.com/ncsi.txt";
 		bool online = false;
 		online = (0 != IsNetworkAlive(&netstatus));
-		online = online && (0 == GetLastError());
-		online = online && (0 == IsDestinationReachable(msftTEXTest_site, &oci));
+		online = online && (GetLastError() == 0);
+		online = online && (IsDestinationReachable(msftTEXTest_site, &oci) == 0);
 		if (!online)
 		{
 			winTEXTrust_data.fdwRevocationChecks = WTD_REVOKE_NONE;

PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp

@@ -337,7 +337,7 @@ bool PluginsManager::loadPlugins(const wchar_t* dir, const PluginViewList* plugi
 		const wchar_t* incompatibleWarningWithSolution = L"%s's version %s is not compatible to this version of Notepad++ (v%s).\r\nAs a result the plugin cannot be loaded.\r\n\r\nGo to Updates section and update your plugin to %s for solving the compatibility issue.";
 
 		wstring foundFileName = foundData.cFileName;
-		if (foundFileName != L"." && foundFileName != L".." && wcsicmp(foundFileName.c_str(), L"Config") != 0)
+		if (foundFileName != L"." && foundFileName != L".." && _wcsicmp(foundFileName.c_str(), L"Config") != 0)
 		{
 			wstring pluginsFullPathFilter = pluginsFolder;
 			pathAppend(pluginsFullPathFilter, foundFileName);
@@ -409,7 +409,7 @@ bool PluginsManager::loadPlugins(const wchar_t* dir, const PluginViewList* plugi
 		while (::FindNextFile(hFindFolder, &foundData))
 		{
 			wstring foundFileName2 = foundData.cFileName;
-			if (foundFileName2 != L"." && foundFileName2 != L".." && wcsicmp(foundFileName2.c_str(), L"Config") != 0)
+			if (foundFileName2 != L"." && foundFileName2 != L".." && _wcsicmp(foundFileName2.c_str(), L"Config") != 0)
 			{
 				wstring pluginsFullPathFilter2 = pluginsFolder;
 				pathAppend(pluginsFullPathFilter2, foundFileName2);
@@ -652,7 +652,7 @@ void PluginsManager::runPluginCommand(const wchar_t *pluginName, int commandID)
 {
 	for (size_t i = 0, len = _pluginsCommands.size() ; i < len ; ++i)
 	{
-		if (!wcsicmp(_pluginsCommands[i]._pluginName.c_str(), pluginName))
+		if (!_wcsicmp(_pluginsCommands[i]._pluginName.c_str(), pluginName))
 		{
 			if (_pluginsCommands[i]._funcID == commandID)
 			{

PowerEditor/src/MISC/PluginsManager/PluginsManager.h

@@ -152,7 +152,7 @@ friend class PluginsAdminDlg;
 
 	bool isInLoadedDlls(const wchar_t *fn) const {
 		for (size_t i = 0; i < _loadedDlls.size(); ++i)
-			if (wcsicmp(fn, _loadedDlls[i]._fileName.c_str()) == 0)
+			if (_wcsicmp(fn, _loadedDlls[i]._fileName.c_str()) == 0)
 				return true;
 		return false;
 	}

PowerEditor/src/MISC/RegExt/regExtDlg.cpp

@@ -208,7 +208,7 @@ intptr_t CALLBACK RegExtDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM lPa
 					{
 						for (int i = 1 ; i < nbExtMax ; ++i)
 						{
-							if (!wcsicmp(ext2Sup, defExtArray[langIndex][i]))
+							if (!_wcsicmp(ext2Sup, defExtArray[langIndex][i]))
 							{
 								::SendDlgItemMessage(_hSelf, IDC_REGEXT_LANGEXT_LIST, LB_ADDSTRING, 0, reinterpret_cast<LPARAM>(ext2Sup));
 								return TRUE;
@@ -256,7 +256,7 @@ intptr_t CALLBACK RegExtDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM lPa
 
 						::SendDlgItemMessage(_hSelf, LOWORD(wParam), LB_GETTEXT, i, reinterpret_cast<LPARAM>(itemName));
 
-						if (!wcsicmp(defExtArray[nbSupportedLang-1][0], itemName))
+						if (!_wcsicmp(defExtArray[nbSupportedLang-1][0], itemName))
 						{
 							::ShowWindow(::GetDlgItem(_hSelf, IDC_REGEXT_LANGEXT_LIST), SW_HIDE);
 							::ShowWindow(::GetDlgItem(_hSelf, IDC_CUSTOMEXT_EDIT), SW_SHOW);

PowerEditor/src/Notepad_plus.cpp

@@ -6307,7 +6307,7 @@ bool Notepad_plus::getIntegralDockingData(tTbData & dockData, int & iCont, bool
 	{
 		const PluginDlgDockingInfo & pddi = dockingData._pluginDockInfo[i];
 
-		if (!wcsicmp(pddi._name.c_str(), dockData.pszModuleName) && (pddi._internalID == dockData.dlgID))
+		if (!_wcsicmp(pddi._name.c_str(), dockData.pszModuleName) && (pddi._internalID == dockData.dlgID))
 		{
 			iCont				= pddi._currContainer;
 			isVisible			= pddi._isVisible;
@@ -8348,19 +8348,19 @@ int Notepad_plus::getQuoteIndexFrom(const wchar_t* quoter) const
 	if (!quoter)
 		return -1;
 
-	if (wcsicmp(quoter, L"Get them all!!!") == 0)
+	if (_wcsicmp(quoter, L"Get them all!!!") == 0)
 		return -2;
 
 	int nbQuote = sizeof(quotes) / sizeof(QuoteParams);
-	if (wcsicmp(quoter, L"random") == 0)
+	if (_wcsicmp(quoter, L"random") == 0)
 	{
 		srand(static_cast<UINT>(time(NULL)));
 		return getRandomNumber(nbQuote);
 	}
 
 	for (int i = 0; i < nbQuote; ++i)
 	{
-		if (wcsicmp(quotes[i]._quoter, quoter) == 0)
+		if (_wcsicmp(quotes[i]._quoter, quoter) == 0)
 			return i;
 	}
 	return -1;