From 6078ec73690b2d75235900c65a63e50f00db3b59 Mon Sep 17 00:00:00 2001 From: ozone10 Date: Sun, 8 Jan 2023 10:02:55 +0100 Subject: [PATCH] Replace macro min/max with std::min/std::max ref https://github.com/notepad-plus-plus/notepad-plus-plus/issues/11147#issuecomment-1365724574 Close #12784 --- PowerEditor/gcc/gcc-fixes.h | 10 +------ PowerEditor/src/MISC/Common/Common.h | 2 +- PowerEditor/src/MISC/Common/Sorters.h | 4 +-- PowerEditor/src/NppCommands.cpp | 10 +++---- PowerEditor/src/NppDarkMode.cpp | 10 +++---- .../src/ScintillaComponent/AutoCompletion.cpp | 4 +-- PowerEditor/src/ScintillaComponent/Buffer.cpp | 4 +-- .../src/ScintillaComponent/FindReplaceDlg.cpp | 2 +- .../src/ScintillaComponent/Printer.cpp | 8 +++--- .../ScintillaComponent/SmartHighlighter.cpp | 2 +- .../src/ScintillaComponent/columnEditor.cpp | 2 +- .../src/WinControls/DockingWnd/Gripper.cpp | 8 +++--- .../StaticDialog/RunDlg/RunDlg.cpp | 2 +- .../src/WinControls/WindowsDlg/WinMgr.cpp | 28 +++++++++---------- .../src/WinControls/WindowsDlg/WinMgr.h | 5 ++-- .../src/WinControls/WindowsDlg/WindowsDlg.cpp | 2 +- PowerEditor/visual.net/notepadPlus.vcxproj | 12 ++++---- 17 files changed, 54 insertions(+), 61 deletions(-) diff --git a/PowerEditor/gcc/gcc-fixes.h b/PowerEditor/gcc/gcc-fixes.h index 7b9bd45b8..409b397f9 100644 --- a/PowerEditor/gcc/gcc-fixes.h +++ b/PowerEditor/gcc/gcc-fixes.h @@ -1,18 +1,10 @@ // this file contains fixes needed for Notepad++ to be built by GCC // the makefile automatically includes this file -static constexpr unsigned int max(unsigned int a, unsigned int b) { - return a > b ? a : b; -} - -static constexpr unsigned int min(unsigned int a, unsigned int b) { - return a < b ? a : b; -} - // __try and __except are unknown to GCC, so convert them to something eligible #define __try try #define __except(x) catch(...) #ifndef PROCESSOR_ARCHITECTURE_ARM64 #define PROCESSOR_ARCHITECTURE_ARM64 12 -#endif \ No newline at end of file +#endif diff --git a/PowerEditor/src/MISC/Common/Common.h b/PowerEditor/src/MISC/Common/Common.h index c2cf072c2..3fb50b633 100644 --- a/PowerEditor/src/MISC/Common/Common.h +++ b/PowerEditor/src/MISC/Common/Common.h @@ -132,7 +132,7 @@ protected: { if (_allocLen) delete[] _str; - _allocLen = max(size, initSize); + _allocLen = std::max(size, initSize); _str = new T[_allocLen]; } } diff --git a/PowerEditor/src/MISC/Common/Sorters.h b/PowerEditor/src/MISC/Common/Sorters.h index 83919fe63..aed116b1e 100644 --- a/PowerEditor/src/MISC/Common/Sorters.h +++ b/PowerEditor/src/MISC/Common/Sorters.h @@ -182,7 +182,7 @@ public: { if (aNumIndex >= a.length() || bNumIndex >= b.length()) { - compareResult = a.compare(min(aNumIndex, a.length()), generic_string::npos, b, min(bNumIndex, b.length()), generic_string::npos); + compareResult = a.compare(std::min(aNumIndex, a.length()), generic_string::npos, b, std::min(bNumIndex, b.length()), generic_string::npos); break; } @@ -349,7 +349,7 @@ public: { if (aNumIndex >= a.length() || bNumIndex >= b.length()) { - compareResult = a.compare(min(aNumIndex, a.length()), generic_string::npos, b, min(bNumIndex, b.length()), generic_string::npos); + compareResult = a.compare(std::min(aNumIndex, a.length()), generic_string::npos, b, std::min(bNumIndex, b.length()), generic_string::npos); break; } diff --git a/PowerEditor/src/NppCommands.cpp b/PowerEditor/src/NppCommands.cpp index 449f814aa..8f3125882 100644 --- a/PowerEditor/src/NppCommands.cpp +++ b/PowerEditor/src/NppCommands.cpp @@ -656,12 +656,12 @@ void Notepad_plus::command(int id) size_t rectSelCaret = _pEditView->execute(SCI_GETRECTANGULARSELECTIONCARET); size_t anchorLine = _pEditView->execute(SCI_LINEFROMPOSITION, rectSelAnchor); size_t caretLine = _pEditView->execute(SCI_LINEFROMPOSITION, rectSelCaret); - fromLine = min(anchorLine, caretLine); - toLine = max(anchorLine, caretLine); + fromLine = std::min(anchorLine, caretLine); + toLine = std::max(anchorLine, caretLine); size_t anchorLineOffset = rectSelAnchor - _pEditView->execute(SCI_POSITIONFROMLINE, anchorLine) + _pEditView->execute(SCI_GETRECTANGULARSELECTIONANCHORVIRTUALSPACE); size_t caretLineOffset = rectSelCaret - _pEditView->execute(SCI_POSITIONFROMLINE, caretLine) + _pEditView->execute(SCI_GETRECTANGULARSELECTIONCARETVIRTUALSPACE); - fromColumn = min(anchorLineOffset, caretLineOffset); - toColumn = max(anchorLineOffset, caretLineOffset); + fromColumn = std::min(anchorLineOffset, caretLineOffset); + toColumn = std::max(anchorLineOffset, caretLineOffset); } else { @@ -1622,7 +1622,7 @@ void Notepad_plus::command(int id) if (id == IDM_SEARCH_GOTOMATCHINGBRACE) _pEditView->execute(SCI_GOTOPOS, braceOpposite); else - _pEditView->execute(SCI_SETSEL, min(braceAtCaret, braceOpposite), max(braceAtCaret, braceOpposite) + 1); // + 1 so we always include the ending brace in the selection. + _pEditView->execute(SCI_SETSEL, std::min(braceAtCaret, braceOpposite), std::max(braceAtCaret, braceOpposite) + 1); // + 1 so we always include the ending brace in the selection. } } break; diff --git a/PowerEditor/src/NppDarkMode.cpp b/PowerEditor/src/NppDarkMode.cpp index fab988f7b..e69ff0923 100644 --- a/PowerEditor/src/NppDarkMode.cpp +++ b/PowerEditor/src/NppDarkMode.cpp @@ -567,7 +567,7 @@ namespace NppDarkMode WORD l = 0; ColorRGBToHLS(c, &h, &l, &s); - l = min(240 - l, 211); + l = std::min(240U - l, 211U); COLORREF invert_c = ColorHLSToRGB(h, l, s); @@ -3066,8 +3066,8 @@ namespace NppDarkMode if (saturated) { - result._lightness = 146; - result._saturation = min(240, result._saturation + 100); + result._lightness = 146U; + result._saturation = std::min(240U, result._saturation + 100U); } } else @@ -3076,8 +3076,8 @@ namespace NppDarkMode if (saturated) { - result._lightness = 140; - result._saturation = min(240, result._saturation + 30); + result._lightness = 140U; + result._saturation = std::min(240U, result._saturation + 30U); } } diff --git a/PowerEditor/src/ScintillaComponent/AutoCompletion.cpp b/PowerEditor/src/ScintillaComponent/AutoCompletion.cpp index 2e1805e44..a1550fc1b 100644 --- a/PowerEditor/src/ScintillaComponent/AutoCompletion.cpp +++ b/PowerEditor/src/ScintillaComponent/AutoCompletion.cpp @@ -551,9 +551,9 @@ void AutoCompletion::showPathCompletion() generic_string currentLine; { const intptr_t bufSize = MAX_PATH; - TCHAR buf[bufSize + 1]; + TCHAR buf[bufSize + 1] = { '\0' }; const intptr_t currentPos = _pEditView->execute(SCI_GETCURRENTPOS); - const auto startPos = max(0, currentPos - bufSize); + const auto startPos = std::max(0, currentPos - bufSize); _pEditView->getGenericText(buf, bufSize + 1, startPos, currentPos); currentLine = buf; } diff --git a/PowerEditor/src/ScintillaComponent/Buffer.cpp b/PowerEditor/src/ScintillaComponent/Buffer.cpp index b2adae2f0..3ffd0b304 100644 --- a/PowerEditor/src/ScintillaComponent/Buffer.cpp +++ b/PowerEditor/src/ScintillaComponent/Buffer.cpp @@ -1396,7 +1396,7 @@ LangType FileManager::detectLanguageFromTextBegining(const unsigned char *data, // Is there a \r or \n in the buffer? If so, truncate it auto cr = buf2Test.find("\r"); auto nl = buf2Test.find("\n"); - auto crnl = min(cr, nl); + auto crnl = std::min(cr, nl); if (crnl != std::string::npos && crnl < longestLength) buf2Test = std::string((const char *)data + i, crnl); @@ -1461,7 +1461,7 @@ bool FileManager::loadFileData(Document doc, int64_t fileSize, const TCHAR * fil return false; // size/6 is the normal room Scintilla keeps for editing, but here we limit it to 1MiB when loading (maybe we want to load big files without editing them too much) - int64_t bufferSizeRequested = fileSize +min(1 << 20, fileSize / 6); + int64_t bufferSizeRequested = fileSize + std::min(1LL << 20, fileSize / 6); NppParameters& nppParam = NppParameters::getInstance(); NativeLangSpeaker* pNativeSpeaker = nppParam.getNativeLangSpeaker(); diff --git a/PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp b/PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp index 1fa0d8448..a0dcefe1d 100644 --- a/PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp +++ b/PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp @@ -455,7 +455,7 @@ int FindReplaceDlg::saveComboHistory(int id, int maxcount, vector(::SendMessage(hCombo, CB_GETCOUNT, 0, 0)); - count = min(count, maxcount); + count = std::min(count, maxcount); if (count == CB_ERR) return 0; diff --git a/PowerEditor/src/ScintillaComponent/Printer.cpp b/PowerEditor/src/ScintillaComponent/Printer.cpp index 7fad1c703..1d74eccad 100644 --- a/PowerEditor/src/ScintillaComponent/Printer.cpp +++ b/PowerEditor/src/ScintillaComponent/Printer.cpp @@ -107,10 +107,10 @@ size_t Printer::doPrint(bool justDoIt) userMargins.right = MulDiv(nppGUI._printSettings._marge.right*100, ptDpi.x, 2540); userMargins.bottom = MulDiv(nppGUI._printSettings._marge.bottom*100, ptDpi.y, 2540); - rectMargins.left = max(rectPhysMargins.left, userMargins.left); - rectMargins.top = max(rectPhysMargins.top, userMargins.top); - rectMargins.right = max(rectPhysMargins.right, userMargins.right); - rectMargins.bottom = max(rectPhysMargins.bottom, userMargins.bottom); + rectMargins.left = std::max(rectPhysMargins.left, userMargins.left); + rectMargins.top = std::max(rectPhysMargins.top, userMargins.top); + rectMargins.right = std::max(rectPhysMargins.right, userMargins.right); + rectMargins.bottom = std::max(rectPhysMargins.bottom, userMargins.bottom); } else { diff --git a/PowerEditor/src/ScintillaComponent/SmartHighlighter.cpp b/PowerEditor/src/ScintillaComponent/SmartHighlighter.cpp index 239686ec7..a656bd8bb 100644 --- a/PowerEditor/src/ScintillaComponent/SmartHighlighter.cpp +++ b/PowerEditor/src/ScintillaComponent/SmartHighlighter.cpp @@ -35,7 +35,7 @@ void SmartHighlighter::highlightViewWithWord(ScintillaEditView * pHighlightView, // Get the range of text visible and highlight everything in it intptr_t firstLine = pHighlightView->execute(SCI_GETFIRSTVISIBLELINE); intptr_t nbLineOnScreen = pHighlightView->execute(SCI_LINESONSCREEN); - intptr_t nbLines = min(nbLineOnScreen, MAXLINEHIGHLIGHT) + 1; + intptr_t nbLines = std::min(nbLineOnScreen, MAXLINEHIGHLIGHT) + 1; intptr_t lastLine = firstLine + nbLines; size_t startPos = 0; intptr_t endPos = 0; diff --git a/PowerEditor/src/ScintillaComponent/columnEditor.cpp b/PowerEditor/src/ScintillaComponent/columnEditor.cpp index 6a529d916..e9e17c8b9 100644 --- a/PowerEditor/src/ScintillaComponent/columnEditor.cpp +++ b/PowerEditor/src/ScintillaComponent/columnEditor.cpp @@ -289,7 +289,7 @@ intptr_t CALLBACK ColumnEditorDlg::run_dlgProc(UINT message, WPARAM wParam, LPAR int endNumber = *numbers.rbegin(); int nbEnd = getNbDigits(endNumber, base); int nbInit = getNbDigits(initialNumber, base); - int nb = max(nbInit, nbEnd); + int nb = std::max(nbInit, nbEnd); for (size_t i = cursorLine ; i <= size_t(endLine) ; ++i) diff --git a/PowerEditor/src/WinControls/DockingWnd/Gripper.cpp b/PowerEditor/src/WinControls/DockingWnd/Gripper.cpp index 043110e70..2cf3890a5 100644 --- a/PowerEditor/src/WinControls/DockingWnd/Gripper.cpp +++ b/PowerEditor/src/WinControls/DockingWnd/Gripper.cpp @@ -561,10 +561,10 @@ void Gripper::drawRectangle(const POINT* pPt) if (rcOld.left==rcNew.left && rcOld.right==rcNew.right && rcOld.top== rcNew.top && rcOld.bottom==rcNew.bottom) return; - rc.left = min(rcOld.left, rcNew.left); - rc.top = min(rcOld.top, rcNew.top); - rc.right = max(rcOld.left + rcOld.right, rcNew.left + rcNew.right); - rc.bottom = max(rcOld.top + rcOld.bottom, rcNew.top + rcNew.bottom); + rc.left = std::min(rcOld.left, rcNew.left); + rc.top = std::min(rcOld.top, rcNew.top); + rc.right = std::max(rcOld.left + rcOld.right, rcNew.left + rcNew.right); + rc.bottom = std::max(rcOld.top + rcOld.bottom, rcNew.top + rcNew.bottom); rc.right -= rc.left; rc.bottom-= rc.top; } diff --git a/PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.cpp b/PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.cpp index 45f79302b..0b6402725 100644 --- a/PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.cpp +++ b/PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.cpp @@ -31,7 +31,7 @@ void Command::extractArgs(TCHAR* cmd2Exec, size_t cmd2ExecLen, TCHAR* args, size size_t cmdEntierLen = lstrlen(cmdEntier); - size_t shortest = min(cmd2ExecLen, argsLen); + size_t shortest = std::min(cmd2ExecLen, argsLen); if (cmdEntierLen > shortest) cmdEntierLen = shortest - 1; diff --git a/PowerEditor/src/WinControls/WindowsDlg/WinMgr.cpp b/PowerEditor/src/WinControls/WindowsDlg/WinMgr.cpp index df9c16e09..d52ff8478 100644 --- a/PowerEditor/src/WinControls/WindowsDlg/WinMgr.cpp +++ b/PowerEditor/src/WinControls/WindowsDlg/WinMgr.cpp @@ -143,8 +143,8 @@ CWinMgr::CalcGroup(WINRECT* pGroup, HWND hWnd) RECT rcTotal = pGroup->GetRect(); int w,h; if (pGroup->GetMargins(w,h)) { - w = min(abs(w), RectWidth(rcTotal)/2); - h = min(abs(h), RectHeight(rcTotal)/2); + w = std::min(abs(w), RectWidth(rcTotal)/2); + h = std::min(abs(h), RectHeight(rcTotal)/2); ::InflateRect(&rcTotal, -w, -h); } @@ -161,7 +161,7 @@ CWinMgr::CalcGroup(WINRECT* pGroup, HWND hWnd) SIZEINFO szi; OnGetSizeInfo(szi, wrc, hWnd); int hwMin = bRow ? szi.szMin.cy : szi.szMin.cx; - hwMin = min(hwMin, hwRemaining); // truncate + hwMin = std::min(hwMin, hwRemaining); // truncate wrc->SetHeightOrWidth(hwMin, bRow); // set hwRemaining -= hwMin; // decrement remaining height/width assert(hwRemaining>=0); @@ -223,7 +223,7 @@ CWinMgr::AdjustSize(WINRECT* wrc, BOOL bRow, // int hwCurrent = wrc->GetHeightOrWidth(bRow); // current size int hwExtra = hw - hwCurrent; // amount extra - hwExtra = min(max(hwExtra, 0), hwRemaining); // truncate + hwExtra = std::min(std::max(hwExtra, 0), hwRemaining); // truncate hw = hwCurrent + hwExtra; // new height-or-width wrc->SetHeightOrWidth(hw, bRow); // set... hwRemaining -= hwExtra; // and adjust remaining @@ -287,20 +287,20 @@ CWinMgr::OnGetSizeInfo(SIZEINFO& szi, WINRECT* wrc, HWND hWnd) SIZEINFO szi2; OnGetSizeInfo(szi2, wrc2, hWnd); if (bRow) { - szi.szMin.cx = max(szi.szMin.cx, szi2.szMin.cx); + szi.szMin.cx = std::max(szi.szMin.cx, szi2.szMin.cx); szi.szMin.cy += szi2.szMin.cy; - szi.szMax.cx = min(szi.szMax.cx, szi2.szMax.cx); - szi.szMax.cy = min(szi.szMax.cy + szi2.szMax.cy, SHRT_MAX); - szi.szDesired.cx = max(szi.szDesired.cx, szi2.szDesired.cx); + szi.szMax.cx = std::min(szi.szMax.cx, szi2.szMax.cx); + szi.szMax.cy = std::min(szi.szMax.cy + szi2.szMax.cy, SHRT_MAX); + szi.szDesired.cx = std::max(szi.szDesired.cx, szi2.szDesired.cx); szi.szDesired.cy += szi2.szDesired.cy; } else { szi.szMin.cx += szi2.szMin.cx; - szi.szMin.cy = max(szi.szMin.cy, szi2.szMin.cy); - szi.szMax.cx = min(szi.szMax.cx + szi2.szMax.cx, SHRT_MAX); - szi.szMax.cy = min(szi.szMax.cy, szi2.szMax.cy); + szi.szMin.cy = std::max(szi.szMin.cy, szi2.szMin.cy); + szi.szMax.cx = std::min(szi.szMax.cx + szi2.szMax.cx, SHRT_MAX); + szi.szMax.cy = std::min(szi.szMax.cy, szi2.szMax.cy); szi.szDesired.cx += szi2.szDesired.cx; - szi.szDesired.cy = max(szi.szDesired.cy, szi2.szDesired.cy); + szi.szDesired.cy = std::max(szi.szDesired.cy, szi2.szDesired.cy); } } @@ -308,8 +308,8 @@ CWinMgr::OnGetSizeInfo(SIZEINFO& szi, WINRECT* wrc, HWND hWnd) int w2,h2; wrc->GetMargins(w2,h2); // get margins w2<<=1; h2<<=1; // double - szi.szMin.cx += max(0,w2); // negative margins ==> don't include in min - szi.szMin.cy += max(0,h2); // ditto + szi.szMin.cx += std::max(0,w2); // negative margins ==> don't include in min + szi.szMin.cy += std::max(0,h2); // ditto szi.szDesired.cx += abs(w2); // for desired size, use abs vallue szi.szDesired.cy += abs(h2); // ditto diff --git a/PowerEditor/src/WinControls/WindowsDlg/WinMgr.h b/PowerEditor/src/WinControls/WindowsDlg/WinMgr.h index e69bf82b8..e677a94ec 100644 --- a/PowerEditor/src/WinControls/WindowsDlg/WinMgr.h +++ b/PowerEditor/src/WinControls/WindowsDlg/WinMgr.h @@ -13,6 +13,7 @@ #pragma once +#include #include #include @@ -57,11 +58,11 @@ inline RECT &OffsetRect(RECT& rc, POINT pt) { // handy functions to take the min or max of a SIZE inline SIZE minsize(SIZE a, SIZE b) { - return GetSize(min(a.cx, b.cx), min(a.cy, b.cy)); + return GetSize(std::min(a.cx, b.cx), std::min(a.cy, b.cy)); } inline SIZE maxsize(SIZE a, SIZE b) { - return GetSize(max(a.cx, b.cx), max(a.cy, b.cy)); + return GetSize(std::max(a.cx, b.cx), std::max(a.cy, b.cy)); } ////////////////// diff --git a/PowerEditor/src/WinControls/WindowsDlg/WindowsDlg.cpp b/PowerEditor/src/WinControls/WindowsDlg/WindowsDlg.cpp index 0d4386ae1..0406b98ac 100644 --- a/PowerEditor/src/WinControls/WindowsDlg/WindowsDlg.cpp +++ b/PowerEditor/src/WinControls/WindowsDlg/WindowsDlg.cpp @@ -1147,7 +1147,7 @@ void WindowsMenu::initPopupMenu(HMENU hMenu, DocTabView* pTab) auto curDoc = pTab->getCurrentTabIndex(); size_t nMaxDoc = static_cast(limitId) - firstId + 1; size_t nDoc = pTab->nbItem(); - nDoc = min(nDoc, nMaxDoc); + nDoc = std::min(nDoc, nMaxDoc); UINT id = firstId; UINT guard = firstId + static_cast(nDoc); size_t pos = 0; diff --git a/PowerEditor/visual.net/notepadPlus.vcxproj b/PowerEditor/visual.net/notepadPlus.vcxproj index 4d6c089ac..52006c42a 100755 --- a/PowerEditor/visual.net/notepadPlus.vcxproj +++ b/PowerEditor/visual.net/notepadPlus.vcxproj @@ -130,7 +130,7 @@ Disabled Neither ..\src\WinControls\AboutDlg;..\..\scintilla\include;..\..\lexilla\include;..\include;..\src\WinControls;..\src\WinControls\ImageListSet;..\src\WinControls\OpenSaveFileDialog;..\src\WinControls\SplitterContainer;..\src\WinControls\StaticDialog;..\src\WinControls\TabBar;..\src\WinControls\ToolBar;..\src\MISC\Process;..\src\ScintillaComponent;..\src\MISC;..\src\MISC\SysMsg;..\src\WinControls\StatusBar;..\src;..\src\WinControls\StaticDialog\RunDlg;..\src\tinyxml;..\src\WinControls\ColourPicker;..\src\Win32Explr;..\src\MISC\RegExt;..\src\WinControls\TrayIcon;..\src\WinControls\shortcut;..\src\WinControls\Grid;..\src\WinControls\ContextMenu;..\src\MISC\PluginsManager;..\src\WinControls\Preference;..\src\WinControls\WindowsDlg;..\src\WinControls\TaskList;..\src\WinControls\DockingWnd;..\src\WinControls\TreeView;..\src\WinControls\ToolTip;..\src\MISC\Exception;..\src\MISC\Common;..\src\tinyxml\tinyXmlA;..\src\WinControls\AnsiCharPanel;..\src\WinControls\ClipboardHistory;..\src\WinControls\FindCharsInRange;..\src\WinControls\VerticalFileSwitcher;..\src\WinControls\ProjectPanel;..\src\WinControls\DocumentMap;..\src\WinControls\FunctionList;..\src\uchardet;..\src\WinControls\FileBrowser;..\src\WinControls\ReadDirectoryChanges;..\src\MISC\md5;..\src\WinControls\PluginsAdmin;..\src\json;..\src\MISC\sha2;%(AdditionalIncludeDirectories) - OEMRESOURCE;WIN32;_WIN32_WINNT=0x0600;_WINDOWS;_USE_64BIT_TIME_T;TIXML_USE_STL;TIXMLA_USE_STL;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_NON_CONFORMING_SWPRINTFS=1;_CRT_NON_CONFORMING_WCSTOK;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions) + NOMINMAX;OEMRESOURCE;WIN32;_WIN32_WINNT=0x0600;_WINDOWS;_USE_64BIT_TIME_T;TIXML_USE_STL;TIXMLA_USE_STL;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_NON_CONFORMING_SWPRINTFS=1;_CRT_NON_CONFORMING_WCSTOK;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions) Async UninitializedLocalUsageCheck MultiThreadedDebug @@ -171,7 +171,7 @@ Disabled Neither ..\src\WinControls\AboutDlg;..\..\scintilla\include;..\..\lexilla\include;..\include;..\src\WinControls;..\src\WinControls\ImageListSet;..\src\WinControls\OpenSaveFileDialog;..\src\WinControls\SplitterContainer;..\src\WinControls\StaticDialog;..\src\WinControls\TabBar;..\src\WinControls\ToolBar;..\src\MISC\Process;..\src\ScintillaComponent;..\src\MISC;..\src\MISC\SysMsg;..\src\WinControls\StatusBar;..\src;..\src\WinControls\StaticDialog\RunDlg;..\src\tinyxml;..\src\WinControls\ColourPicker;..\src\Win32Explr;..\src\MISC\RegExt;..\src\WinControls\TrayIcon;..\src\WinControls\shortcut;..\src\WinControls\Grid;..\src\WinControls\ContextMenu;..\src\MISC\PluginsManager;..\src\WinControls\Preference;..\src\WinControls\WindowsDlg;..\src\WinControls\TaskList;..\src\WinControls\DockingWnd;..\src\WinControls\TreeView;..\src\WinControls\ToolTip;..\src\MISC\Exception;..\src\MISC\Common;..\src\tinyxml\tinyXmlA;..\src\WinControls\AnsiCharPanel;..\src\WinControls\ClipboardHistory;..\src\WinControls\FindCharsInRange;..\src\WinControls\VerticalFileSwitcher;..\src\WinControls\ProjectPanel;..\src\WinControls\DocumentMap;..\src\WinControls\FunctionList;..\src\uchardet;..\src\WinControls\FileBrowser;..\src\WinControls\ReadDirectoryChanges;..\src\MISC\md5;..\src\WinControls\PluginsAdmin;..\src\json;..\src\MISC\sha2;%(AdditionalIncludeDirectories) - OEMRESOURCE;WIN32;_WIN32_WINNT=0x0600;_WINDOWS;_USE_64BIT_TIME_T;TIXML_USE_STL;TIXMLA_USE_STL;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_NON_CONFORMING_SWPRINTFS=1;_CRT_NON_CONFORMING_WCSTOK;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions) + NOMINMAX;OEMRESOURCE;WIN32;_WIN32_WINNT=0x0600;_WINDOWS;_USE_64BIT_TIME_T;TIXML_USE_STL;TIXMLA_USE_STL;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_NON_CONFORMING_SWPRINTFS=1;_CRT_NON_CONFORMING_WCSTOK;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions) Async UninitializedLocalUsageCheck MultiThreadedDebug @@ -212,7 +212,7 @@ Disabled Neither ..\src\WinControls\AboutDlg;..\..\scintilla\include;..\..\lexilla\include;..\include;..\src\WinControls;..\src\WinControls\ImageListSet;..\src\WinControls\OpenSaveFileDialog;..\src\WinControls\SplitterContainer;..\src\WinControls\StaticDialog;..\src\WinControls\TabBar;..\src\WinControls\ToolBar;..\src\MISC\Process;..\src\ScintillaComponent;..\src\MISC;..\src\MISC\SysMsg;..\src\WinControls\StatusBar;..\src;..\src\WinControls\StaticDialog\RunDlg;..\src\tinyxml;..\src\WinControls\ColourPicker;..\src\Win32Explr;..\src\MISC\RegExt;..\src\WinControls\TrayIcon;..\src\WinControls\shortcut;..\src\WinControls\Grid;..\src\WinControls\ContextMenu;..\src\MISC\PluginsManager;..\src\WinControls\Preference;..\src\WinControls\WindowsDlg;..\src\WinControls\TaskList;..\src\WinControls\DockingWnd;..\src\WinControls\TreeView;..\src\WinControls\ToolTip;..\src\MISC\Exception;..\src\MISC\Common;..\src\tinyxml\tinyXmlA;..\src\WinControls\AnsiCharPanel;..\src\WinControls\ClipboardHistory;..\src\WinControls\FindCharsInRange;..\src\WinControls\VerticalFileSwitcher;..\src\WinControls\ProjectPanel;..\src\WinControls\DocumentMap;..\src\WinControls\FunctionList;..\src\uchardet;..\src\WinControls\FileBrowser;..\src\WinControls\ReadDirectoryChanges;..\src\MISC\md5;..\src\WinControls\PluginsAdmin;..\src\json;..\src\MISC\sha2;%(AdditionalIncludeDirectories) - OEMRESOURCE;WIN32;_WIN32_WINNT=0x0600;_WINDOWS;_USE_64BIT_TIME_T;TIXML_USE_STL;TIXMLA_USE_STL;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_NON_CONFORMING_SWPRINTFS=1;_CRT_NON_CONFORMING_WCSTOK;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions) + NOMINMAX;OEMRESOURCE;WIN32;_WIN32_WINNT=0x0600;_WINDOWS;_USE_64BIT_TIME_T;TIXML_USE_STL;TIXMLA_USE_STL;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_NON_CONFORMING_SWPRINTFS=1;_CRT_NON_CONFORMING_WCSTOK;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions) Async UninitializedLocalUsageCheck MultiThreadedDebug @@ -254,7 +254,7 @@ Speed false ..\src\WinControls\AboutDlg;..\..\scintilla\include;..\..\lexilla\include;..\include;..\src\WinControls;..\src\WinControls\ImageListSet;..\src\WinControls\OpenSaveFileDialog;..\src\WinControls\SplitterContainer;..\src\WinControls\StaticDialog;..\src\WinControls\TabBar;..\src\WinControls\ToolBar;..\src\MISC\Process;..\src\ScintillaComponent;..\src\MISC;..\src\MISC\SysMsg;..\src\WinControls\StatusBar;..\src;..\src\WinControls\StaticDialog\RunDlg;..\src\tinyxml;..\src\WinControls\ColourPicker;..\src\Win32Explr;..\src\MISC\RegExt;..\src\WinControls\TrayIcon;..\src\WinControls\shortcut;..\src\WinControls\Grid;..\src\WinControls\ContextMenu;..\src\MISC\PluginsManager;..\src\WinControls\Preference;..\src\WinControls\WindowsDlg;..\src\WinControls\TaskList;..\src\WinControls\DockingWnd;..\src\WinControls\TreeView;..\src\WinControls\ToolTip;..\src\MISC\Exception;..\src\MISC\Common;..\src\tinyxml\tinyXmlA;..\src\WinControls\AnsiCharPanel;..\src\WinControls\ClipboardHistory;..\src\WinControls\FindCharsInRange;..\src\WinControls\VerticalFileSwitcher;..\src\WinControls\ProjectPanel;..\src\WinControls\DocumentMap;..\src\WinControls\FunctionList;..\src\uchardet;..\src\WinControls\FileBrowser;..\src\WinControls\ReadDirectoryChanges;..\src\MISC\md5;..\src\WinControls\PluginsAdmin;..\src\json;..\src\MISC\sha2;%(AdditionalIncludeDirectories) - OEMRESOURCE;WIN32;_WIN32_WINNT=0x0600;NDEBUG;_WINDOWS;_USE_64BIT_TIME_T;TIXML_USE_STL;TIXMLA_USE_STL;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_NON_CONFORMING_SWPRINTFS=1;_CRT_NON_CONFORMING_WCSTOK;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions) + NOMINMAX;OEMRESOURCE;WIN32;_WIN32_WINNT=0x0600;NDEBUG;_WINDOWS;_USE_64BIT_TIME_T;TIXML_USE_STL;TIXMLA_USE_STL;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_NON_CONFORMING_SWPRINTFS=1;_CRT_NON_CONFORMING_WCSTOK;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions) false false true @@ -307,7 +307,7 @@ copy ..\src\contextMenu.xml ..\bin\contextMenu.xml Speed false ..\src\WinControls\AboutDlg;..\..\scintilla\include;..\..\lexilla\include;..\include;..\src\WinControls;..\src\WinControls\ImageListSet;..\src\WinControls\OpenSaveFileDialog;..\src\WinControls\SplitterContainer;..\src\WinControls\StaticDialog;..\src\WinControls\TabBar;..\src\WinControls\ToolBar;..\src\MISC\Process;..\src\ScintillaComponent;..\src\MISC;..\src\MISC\SysMsg;..\src\WinControls\StatusBar;..\src;..\src\WinControls\StaticDialog\RunDlg;..\src\tinyxml;..\src\WinControls\ColourPicker;..\src\Win32Explr;..\src\MISC\RegExt;..\src\WinControls\TrayIcon;..\src\WinControls\shortcut;..\src\WinControls\Grid;..\src\WinControls\ContextMenu;..\src\MISC\PluginsManager;..\src\WinControls\Preference;..\src\WinControls\WindowsDlg;..\src\WinControls\TaskList;..\src\WinControls\DockingWnd;..\src\WinControls\TreeView;..\src\WinControls\ToolTip;..\src\MISC\Exception;..\src\MISC\Common;..\src\tinyxml\tinyXmlA;..\src\WinControls\AnsiCharPanel;..\src\WinControls\ClipboardHistory;..\src\WinControls\FindCharsInRange;..\src\WinControls\VerticalFileSwitcher;..\src\WinControls\ProjectPanel;..\src\WinControls\DocumentMap;..\src\WinControls\FunctionList;..\src\uchardet;..\src\WinControls\FileBrowser;..\src\WinControls\ReadDirectoryChanges;..\src\MISC\md5;..\src\WinControls\PluginsAdmin;..\src\json;..\src\MISC\sha2;%(AdditionalIncludeDirectories) - OEMRESOURCE;WIN32;_WIN32_WINNT=0x0600;NDEBUG;_WINDOWS;_USE_64BIT_TIME_T;TIXML_USE_STL;TIXMLA_USE_STL;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_NON_CONFORMING_SWPRINTFS=1;_CRT_NON_CONFORMING_WCSTOK;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions) + NOMINMAX;OEMRESOURCE;WIN32;_WIN32_WINNT=0x0600;NDEBUG;_WINDOWS;_USE_64BIT_TIME_T;TIXML_USE_STL;TIXMLA_USE_STL;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_NON_CONFORMING_SWPRINTFS=1;_CRT_NON_CONFORMING_WCSTOK;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions) false false true @@ -359,7 +359,7 @@ copy ..\src\contextMenu.xml ..\bin64\contextMenu.xml Speed false ..\src\WinControls\AboutDlg;..\..\scintilla\include;..\..\lexilla\include;..\include;..\src\WinControls;..\src\WinControls\ImageListSet;..\src\WinControls\OpenSaveFileDialog;..\src\WinControls\SplitterContainer;..\src\WinControls\StaticDialog;..\src\WinControls\TabBar;..\src\WinControls\ToolBar;..\src\MISC\Process;..\src\ScintillaComponent;..\src\MISC;..\src\MISC\SysMsg;..\src\WinControls\StatusBar;..\src;..\src\WinControls\StaticDialog\RunDlg;..\src\tinyxml;..\src\WinControls\ColourPicker;..\src\Win32Explr;..\src\MISC\RegExt;..\src\WinControls\TrayIcon;..\src\WinControls\shortcut;..\src\WinControls\Grid;..\src\WinControls\ContextMenu;..\src\MISC\PluginsManager;..\src\WinControls\Preference;..\src\WinControls\WindowsDlg;..\src\WinControls\TaskList;..\src\WinControls\DockingWnd;..\src\WinControls\TreeView;..\src\WinControls\ToolTip;..\src\MISC\Exception;..\src\MISC\Common;..\src\tinyxml\tinyXmlA;..\src\WinControls\AnsiCharPanel;..\src\WinControls\ClipboardHistory;..\src\WinControls\FindCharsInRange;..\src\WinControls\VerticalFileSwitcher;..\src\WinControls\ProjectPanel;..\src\WinControls\DocumentMap;..\src\WinControls\FunctionList;..\src\uchardet;..\src\WinControls\FileBrowser;..\src\WinControls\ReadDirectoryChanges;..\src\MISC\md5;..\src\WinControls\PluginsAdmin;..\src\json;..\src\MISC\sha2;%(AdditionalIncludeDirectories) - OEMRESOURCE;WIN32;_WIN32_WINNT=0x0600;NDEBUG;_WINDOWS;_USE_64BIT_TIME_T;TIXML_USE_STL;TIXMLA_USE_STL;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_NON_CONFORMING_SWPRINTFS=1;_CRT_NON_CONFORMING_WCSTOK;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions) + NOMINMAX;OEMRESOURCE;WIN32;_WIN32_WINNT=0x0600;NDEBUG;_WINDOWS;_USE_64BIT_TIME_T;TIXML_USE_STL;TIXMLA_USE_STL;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_NON_CONFORMING_SWPRINTFS=1;_CRT_NON_CONFORMING_WCSTOK;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions) false false true