From 6a4ef408f204df17d6a32e7b3b979adb452c8cf5 Mon Sep 17 00:00:00 2001 From: mere-human <9664141+mere-human@users.noreply.github.com> Date: Sat, 19 Jun 2021 14:29:51 +0300 Subject: [PATCH] Fix GCC compiler warnings in Notepad++ Fix #10037, close #10048 --- PowerEditor/gcc/makefile | 2 +- PowerEditor/src/Notepad_plus.cpp | 2 +- PowerEditor/src/NppBigSwitch.cpp | 2 +- PowerEditor/src/NppDarkMode.cpp | 6 ++-- PowerEditor/src/NppIO.cpp | 2 +- PowerEditor/src/ScintillaComponent/Buffer.cpp | 2 +- .../src/ScintillaComponent/FindReplaceDlg.cpp | 2 +- .../ScintillaComponent/ScintillaEditView.cpp | 32 +++++++++---------- PowerEditor/src/Utf8_16.cpp | 2 +- .../WinControls/FileBrowser/fileBrowser.cpp | 2 +- .../src/WinControls/Grid/ShortcutMapper.cpp | 2 +- .../WinControls/ProjectPanel/ProjectPanel.cpp | 4 +-- .../WinControls/StaticDialog/RunDlg/RunDlg.h | 2 +- .../WinControls/StaticDialog/StaticDialog.cpp | 2 +- 14 files changed, 32 insertions(+), 32 deletions(-) diff --git a/PowerEditor/gcc/makefile b/PowerEditor/gcc/makefile index 4723d4a02..50c94699f 100644 --- a/PowerEditor/gcc/makefile +++ b/PowerEditor/gcc/makefile @@ -257,7 +257,7 @@ UNICODE = -DUNICODE -D_UNICODE CXX = $(CROSS_COMPILE)g++ #CXXFLAGS = -O2 $(INCLUDESPECIAL) -CXXFLAGS = $(INCLUDESPECIAL) -D_WIN32_WINNT=0x0600 -DTIXML_USE_STL -DTIXMLA_USE_STL $(UNICODE) -std=c++17 -fpermissive +CXXFLAGS = $(INCLUDESPECIAL) -D_WIN32_WINNT=0x0600 -DTIXML_USE_STL -DTIXMLA_USE_STL $(UNICODE) -std=c++17 -fpermissive -Wno-conversion-null INCLUDES = $(patsubst %,-I%,$(DIRS)) -I./include LDFLAGS = -Wl,--subsystem,windows -municode -mwindows LIBS = -lcomdlg32 -lcomctl32 -lgdi32 -lole32 -loleacc -lshell32 -lshlwapi -ldbghelp -lversion -lcrypt32 -lsensapi -lwininet -lwintrust -luuid -luxtheme diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp index 93c0f2540..7749af9f0 100644 --- a/PowerEditor/src/Notepad_plus.cpp +++ b/PowerEditor/src/Notepad_plus.cpp @@ -2659,7 +2659,7 @@ bool isUrlTextChar(TCHAR const c) case '{': case '}': case '?': - case '\0x7f': + case '\u007F': return false; } return true; diff --git a/PowerEditor/src/NppBigSwitch.cpp b/PowerEditor/src/NppBigSwitch.cpp index 26b0ebedd..4f42713df 100644 --- a/PowerEditor/src/NppBigSwitch.cpp +++ b/PowerEditor/src/NppBigSwitch.cpp @@ -1331,7 +1331,7 @@ LRESULT Notepad_plus::process(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa case NPPM_CREATESCINTILLAHANDLE: { - return (LRESULT)_scintillaCtrls4Plugins.createSintilla((lParam == NULL?hwnd:reinterpret_cast(lParam))); + return (LRESULT)_scintillaCtrls4Plugins.createSintilla((lParam ? reinterpret_cast(lParam) : hwnd)); } case NPPM_INTERNAL_GETSCINTEDTVIEW: diff --git a/PowerEditor/src/NppDarkMode.cpp b/PowerEditor/src/NppDarkMode.cpp index 00bb51bfe..712f70366 100644 --- a/PowerEditor/src/NppDarkMode.cpp +++ b/PowerEditor/src/NppDarkMode.cpp @@ -1060,7 +1060,7 @@ namespace NppDarkMode { if (NppDarkMode::isEnabled()) { - int msg = NULL; + UINT msg = 0; switch (type) { case NppDarkMode::ToolTipsType::toolbar: @@ -1073,7 +1073,7 @@ namespace NppDarkMode msg = TVM_GETTOOLTIPS; break; default: - msg = NULL; + msg = 0; break; } @@ -1083,7 +1083,7 @@ namespace NppDarkMode } else { - auto hTips = reinterpret_cast(SendMessage(hwnd, msg, NULL, NULL)); + auto hTips = reinterpret_cast(SendMessage(hwnd, msg, 0, 0)); if (hTips != nullptr) { SetWindowTheme(hTips, L"DarkMode_Explorer", NULL); diff --git a/PowerEditor/src/NppIO.cpp b/PowerEditor/src/NppIO.cpp index 5a130b894..7beb0e690 100644 --- a/PowerEditor/src/NppIO.cpp +++ b/PowerEditor/src/NppIO.cpp @@ -323,7 +323,7 @@ BufferID Notepad_plus::doOpen(const generic_string& fileName, bool isRecursive, SCNotification scnN; scnN.nmhdr.code = NPPN_FILEBEFORELOAD; scnN.nmhdr.hwndFrom = _pPublicInterface->getHSelf(); - scnN.nmhdr.idFrom = NULL; + scnN.nmhdr.idFrom = 0; _pluginsManager.notify(&scnN); if (encoding == -1) diff --git a/PowerEditor/src/ScintillaComponent/Buffer.cpp b/PowerEditor/src/ScintillaComponent/Buffer.cpp index 20b8b8567..2df55beb6 100644 --- a/PowerEditor/src/ScintillaComponent/Buffer.cpp +++ b/PowerEditor/src/ScintillaComponent/Buffer.cpp @@ -585,7 +585,7 @@ void FileManager::closeBuffer(BufferID id, ScintillaEditView * identifier) BufferID FileManager::loadFile(const TCHAR * filename, Document doc, int encoding, const TCHAR *backupFileName, FILETIME fileNameTimestamp) { bool ownDoc = false; - if (doc == NULL) + if (!doc) { doc = (Document)_pscratchTilla->execute(SCI_CREATEDOCUMENT); ownDoc = true; diff --git a/PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp b/PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp index 054f5d9de..8e53b38d0 100644 --- a/PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp +++ b/PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp @@ -56,7 +56,7 @@ void delLeftWordInEdit(HWND hEdit) TCHAR str[FINDREPLACE_MAXLENGTH]; ::SendMessage(hEdit, WM_GETTEXT, FINDREPLACE_MAXLENGTH - 1, reinterpret_cast(str)); WORD cursor; - ::SendMessage(hEdit, EM_GETSEL, (WPARAM)&cursor, NULL); + ::SendMessage(hEdit, EM_GETSEL, (WPARAM)&cursor, 0); WORD wordstart = cursor; while (wordstart > 0) { TCHAR c = str[wordstart - 1]; diff --git a/PowerEditor/src/ScintillaComponent/ScintillaEditView.cpp b/PowerEditor/src/ScintillaComponent/ScintillaEditView.cpp index b89b375a8..4b17d6703 100644 --- a/PowerEditor/src/ScintillaComponent/ScintillaEditView.cpp +++ b/PowerEditor/src/ScintillaComponent/ScintillaEditView.cpp @@ -346,7 +346,7 @@ LRESULT ScintillaEditView::scintillaNew_Proc(HWND hwnd, UINT Message, WPARAM wPa { case WM_MOUSEHWHEEL : { - ::CallWindowProc(_scintillaDefaultProc, hwnd, WM_HSCROLL, ((short)HIWORD(wParam) > 0)?SB_LINERIGHT:SB_LINELEFT, NULL); + ::CallWindowProc(_scintillaDefaultProc, hwnd, WM_HSCROLL, ((short)HIWORD(wParam) > 0)?SB_LINERIGHT:SB_LINELEFT, 0); break; } @@ -361,9 +361,9 @@ LRESULT ScintillaEditView::scintillaNew_Proc(HWND hwnd, UINT Message, WPARAM wPa if (LOWORD(wParam) & MK_SHIFT) { // move 3 columns at a time - ::CallWindowProc(_scintillaDefaultProc, hwnd, WM_HSCROLL, ((short)HIWORD(wParam) < 0) ? SB_LINERIGHT : SB_LINELEFT, NULL); - ::CallWindowProc(_scintillaDefaultProc, hwnd, WM_HSCROLL, ((short)HIWORD(wParam) < 0) ? SB_LINERIGHT : SB_LINELEFT, NULL); - ::CallWindowProc(_scintillaDefaultProc, hwnd, WM_HSCROLL, ((short)HIWORD(wParam) < 0) ? SB_LINERIGHT : SB_LINELEFT, NULL); + ::CallWindowProc(_scintillaDefaultProc, hwnd, WM_HSCROLL, ((short)HIWORD(wParam) < 0) ? SB_LINERIGHT : SB_LINELEFT, 0); + ::CallWindowProc(_scintillaDefaultProc, hwnd, WM_HSCROLL, ((short)HIWORD(wParam) < 0) ? SB_LINERIGHT : SB_LINELEFT, 0); + ::CallWindowProc(_scintillaDefaultProc, hwnd, WM_HSCROLL, ((short)HIWORD(wParam) < 0) ? SB_LINERIGHT : SB_LINELEFT, 0); return TRUE; } @@ -2822,7 +2822,7 @@ void ScintillaEditView::currentLinesDown() const void ScintillaEditView::changeCase(__inout wchar_t * const strWToConvert, const int & nbChars, const TextCase & caseToConvert) const { - if (strWToConvert == nullptr || nbChars == NULL) + if (strWToConvert == nullptr || nbChars == 0) return; switch (caseToConvert) @@ -2831,7 +2831,7 @@ void ScintillaEditView::changeCase(__inout wchar_t * const strWToConvert, const { for (int i = 0; i < nbChars; ++i) { - strWToConvert[i] = (WCHAR)(UINT_PTR)::CharUpperW((LPWSTR)strWToConvert[i]); + strWToConvert[i] = (WCHAR)(UINT_PTR)::CharUpperW(reinterpret_cast(strWToConvert[i])); } break; } //case UPPERCASE @@ -2839,7 +2839,7 @@ void ScintillaEditView::changeCase(__inout wchar_t * const strWToConvert, const { for (int i = 0; i < nbChars; ++i) { - strWToConvert[i] = (WCHAR)(UINT_PTR)::CharLowerW((LPWSTR)strWToConvert[i]); + strWToConvert[i] = (WCHAR)(UINT_PTR)::CharLowerW(reinterpret_cast(strWToConvert[i])); } break; } //case LOWERCASE @@ -2851,12 +2851,12 @@ void ScintillaEditView::changeCase(__inout wchar_t * const strWToConvert, const if (::IsCharAlphaW(strWToConvert[i])) { if ((i < 1) ? true : !::IsCharAlphaNumericW(strWToConvert[i - 1])) - strWToConvert[i] = (WCHAR)(UINT_PTR)::CharUpperW((LPWSTR)strWToConvert[i]); + strWToConvert[i] = (WCHAR)(UINT_PTR)::CharUpperW(reinterpret_cast(strWToConvert[i])); else if (caseToConvert == TITLECASE_FORCE) - strWToConvert[i] = (WCHAR)(UINT_PTR)::CharLowerW((LPWSTR)strWToConvert[i]); + strWToConvert[i] = (WCHAR)(UINT_PTR)::CharLowerW(reinterpret_cast(strWToConvert[i])); //An exception if ((i < 2) ? false : (strWToConvert[i - 1] == L'\'' && ::IsCharAlphaW(strWToConvert[i - 2]))) - strWToConvert[i] = (WCHAR)(UINT_PTR)::CharLowerW((LPWSTR)strWToConvert[i]); + strWToConvert[i] = (WCHAR)(UINT_PTR)::CharLowerW(reinterpret_cast(strWToConvert[i])); } } break; @@ -2873,12 +2873,12 @@ void ScintillaEditView::changeCase(__inout wchar_t * const strWToConvert, const { if (isNewSentence) { - strWToConvert[i] = (WCHAR)(UINT_PTR)::CharUpperW((LPWSTR)strWToConvert[i]); + strWToConvert[i] = (WCHAR)(UINT_PTR)::CharUpperW(reinterpret_cast(strWToConvert[i])); isNewSentence = false; } else if (caseToConvert == SENTENCECASE_FORCE) { - strWToConvert[i] = (WCHAR)(UINT_PTR)::CharLowerW((LPWSTR)strWToConvert[i]); + strWToConvert[i] = (WCHAR)(UINT_PTR)::CharLowerW(reinterpret_cast(strWToConvert[i])); } wasEolR = false; wasEolN = false; @@ -2919,9 +2919,9 @@ void ScintillaEditView::changeCase(__inout wchar_t * const strWToConvert, const for (int i = 0; i < nbChars; ++i) { if (::IsCharLowerW(strWToConvert[i])) - strWToConvert[i] = (WCHAR)(UINT_PTR)::CharUpperW((LPWSTR)strWToConvert[i]); + strWToConvert[i] = (WCHAR)(UINT_PTR)::CharUpperW(reinterpret_cast(strWToConvert[i])); else - strWToConvert[i] = (WCHAR)(UINT_PTR)::CharLowerW((LPWSTR)strWToConvert[i]); + strWToConvert[i] = (WCHAR)(UINT_PTR)::CharLowerW(reinterpret_cast(strWToConvert[i])); } break; } //case INVERTCASE @@ -2932,9 +2932,9 @@ void ScintillaEditView::changeCase(__inout wchar_t * const strWToConvert, const if (::IsCharAlphaW(strWToConvert[i])) { if (std::rand() & true) - strWToConvert[i] = (WCHAR)(UINT_PTR)::CharUpperW((LPWSTR)strWToConvert[i]); + strWToConvert[i] = (WCHAR)(UINT_PTR)::CharUpperW(reinterpret_cast(strWToConvert[i])); else - strWToConvert[i] = (WCHAR)(UINT_PTR)::CharLowerW((LPWSTR)strWToConvert[i]); + strWToConvert[i] = (WCHAR)(UINT_PTR)::CharLowerW(reinterpret_cast(strWToConvert[i])); } } break; diff --git a/PowerEditor/src/Utf8_16.cpp b/PowerEditor/src/Utf8_16.cpp index d12b1c080..98cf4ffa8 100644 --- a/PowerEditor/src/Utf8_16.cpp +++ b/PowerEditor/src/Utf8_16.cpp @@ -222,7 +222,7 @@ void Utf8_16_Read::determineEncoding() m_nSkip = 3; } // try to detect UTF-16 little-endian without BOM - else if (m_nLen > 1 && m_nLen % 2 == 0 && m_pBuf[0] != NULL && m_pBuf[1] == NULL && IsTextUnicode(m_pBuf, static_cast(m_nLen), &uniTest)) + else if (m_nLen > 1 && m_nLen % 2 == 0 && m_pBuf[0] != 0 && m_pBuf[1] == 0 && IsTextUnicode(m_pBuf, static_cast(m_nLen), &uniTest)) { m_eEncoding = uni16LE_NoBOM; m_nSkip = 0; diff --git a/PowerEditor/src/WinControls/FileBrowser/fileBrowser.cpp b/PowerEditor/src/WinControls/FileBrowser/fileBrowser.cpp index c970e1cdd..9be7f3dbf 100644 --- a/PowerEditor/src/WinControls/FileBrowser/fileBrowser.cpp +++ b/PowerEditor/src/WinControls/FileBrowser/fileBrowser.cpp @@ -745,7 +745,7 @@ BrowserNodeType FileBrowser::getNodeType(HTREEITEM hItem) return browserNodeType_file; } // Root - else if (tvItem.lParam != NULL && !reinterpret_cast(tvItem.lParam)->_rootPath.empty()) + else if (tvItem.lParam && !reinterpret_cast(tvItem.lParam)->_rootPath.empty()) { return browserNodeType_root; } diff --git a/PowerEditor/src/WinControls/Grid/ShortcutMapper.cpp b/PowerEditor/src/WinControls/Grid/ShortcutMapper.cpp index a962c1ce5..980ea3187 100644 --- a/PowerEditor/src/WinControls/Grid/ShortcutMapper.cpp +++ b/PowerEditor/src/WinControls/Grid/ShortcutMapper.cpp @@ -1119,7 +1119,7 @@ INT_PTR CALLBACK ShortcutMapper::run_dlgProc(UINT message, WPARAM wParam, LPARAM bool ShortcutMapper::findKeyConflicts(__inout_opt generic_string * const keyConflictLocation, const KeyCombo & itemKeyComboToTest, const size_t & itemIndexToTest) const { - if (itemKeyComboToTest._key == NULL) //no key assignment + if (itemKeyComboToTest._key == 0) //no key assignment return false; bool retIsConflict = false; //returns true when a conflict is found diff --git a/PowerEditor/src/WinControls/ProjectPanel/ProjectPanel.cpp b/PowerEditor/src/WinControls/ProjectPanel/ProjectPanel.cpp index 6998c22c2..7f02b87e9 100644 --- a/PowerEditor/src/WinControls/ProjectPanel/ProjectPanel.cpp +++ b/PowerEditor/src/WinControls/ProjectPanel/ProjectPanel.cpp @@ -510,7 +510,7 @@ void ProjectPanel::buildProjectXml(TiXmlNode *node, HTREEITEM hItem, const TCHAR { tvItem.hItem = hItemNode; SendMessage(_treeView.getHSelf(), TVM_GETITEM, 0, reinterpret_cast(&tvItem)); - if (tvItem.lParam != NULL) + if (tvItem.lParam) { generic_string *fn = (generic_string *)tvItem.lParam; generic_string newFn = getRelativePath(*fn, fn2write); @@ -871,7 +871,7 @@ NodeType ProjectPanel::getNodeType(HTREEITEM hItem) return nodeType_project; } // Folder - else if (tvItem.lParam == NULL) + else if (!tvItem.lParam) { return nodeType_folder; } diff --git a/PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.h b/PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.h index c6615fb90..5adeb0b9b 100644 --- a/PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.h +++ b/PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.h @@ -39,7 +39,7 @@ void expandNppEnvironmentStrs(const TCHAR *strSrc, TCHAR *stringDest, size_t str class Command { public : Command() = default; - explicit Command(TCHAR *cmd) : _cmdLine(cmd){}; + explicit Command(const TCHAR *cmd) : _cmdLine(cmd){}; explicit Command(const generic_string& cmd) : _cmdLine(cmd){}; HINSTANCE run(HWND hWnd); HINSTANCE run(HWND hWnd, const TCHAR* cwd); diff --git a/PowerEditor/src/WinControls/StaticDialog/StaticDialog.cpp b/PowerEditor/src/WinControls/StaticDialog/StaticDialog.cpp index e7f675d9b..bc2bd6999 100644 --- a/PowerEditor/src/WinControls/StaticDialog/StaticDialog.cpp +++ b/PowerEditor/src/WinControls/StaticDialog/StaticDialog.cpp @@ -25,7 +25,7 @@ StaticDialog::~StaticDialog() if (isCreated()) { // Prevent run_dlgProc from doing anything, since its virtual - ::SetWindowLongPtr(_hSelf, GWLP_USERDATA, NULL); + ::SetWindowLongPtr(_hSelf, GWLP_USERDATA, 0); destroy(); } }