tyler.durden
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Code enhancement: Fix comparison of different signs integers

This commit is contained in:
Don Ho 2022-02-09 20:06:59 +01:00
parent 785453147b
commit 94154b0f0e
17 changed files with 68 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PowerEditor/src/MISC/RegExt/regExtDlg.cpp
View File

@ -258,7 +258,7 @@ intptr_t CALLBACK RegExtDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM lPa
{ {
const size_t itemNameLen = 32; const size_t itemNameLen = 32;
TCHAR itemName[itemNameLen + 1] = { '\0' }; TCHAR itemName[itemNameLen + 1] = { '\0' };
auto lbTextLen = ::SendDlgItemMessage(_hSelf, LOWORD(wParam), LB_GETTEXTLEN, i, 0); size_t lbTextLen = ::SendDlgItemMessage(_hSelf, LOWORD(wParam), LB_GETTEXTLEN, i, 0);
if (lbTextLen > itemNameLen) if (lbTextLen > itemNameLen)
return TRUE; return TRUE;

16
PowerEditor/src/Notepad_plus.cpp
View File

@ -3601,7 +3601,7 @@ size_t Notepad_plus::getSelectedCharNumber(UniMode u)
for (size_t j = line1; j <= line2; ++j) for (size_t j = line1; j <= line2; ++j)
{ {
size_t stpos = _pEditView->execute(SCI_GETLINESELSTARTPOSITION, j); size_t stpos = _pEditView->execute(SCI_GETLINESELSTARTPOSITION, j);
if (stpos != INVALID_POSITION) if (static_cast<intptr_t>(stpos) != INVALID_POSITION)
{ {
size_t endpos = _pEditView->execute(SCI_GETLINESELENDPOSITION, j); size_t endpos = _pEditView->execute(SCI_GETLINESELENDPOSITION, j);
for (size_t pos = stpos; pos < endpos; ++pos) for (size_t pos = stpos; pos < endpos; ++pos)
@ -5803,30 +5803,30 @@ bool Notepad_plus::dumpFiles(const TCHAR * outdir, const TCHAR * fileprefix)
void Notepad_plus::drawTabbarColoursFromStylerArray() void Notepad_plus::drawTabbarColoursFromStylerArray()
{ {
Style *stActText = getStyleFromName(TABBAR_ACTIVETEXT); Style *stActText = getStyleFromName(TABBAR_ACTIVETEXT);
if (stActText && stActText->_fgColor != -1) if (stActText && static_cast<long>(stActText->_fgColor) != -1)
TabBarPlus::setColour(stActText->_fgColor, TabBarPlus::activeText); TabBarPlus::setColour(stActText->_fgColor, TabBarPlus::activeText);
Style *stActfocusTop = getStyleFromName(TABBAR_ACTIVEFOCUSEDINDCATOR); Style *stActfocusTop = getStyleFromName(TABBAR_ACTIVEFOCUSEDINDCATOR);
if (stActfocusTop && stActfocusTop->_fgColor != -1) if (stActfocusTop && static_cast<long>(stActfocusTop->_fgColor) != -1)
TabBarPlus::setColour(stActfocusTop->_fgColor, TabBarPlus::activeFocusedTop); TabBarPlus::setColour(stActfocusTop->_fgColor, TabBarPlus::activeFocusedTop);
Style *stActunfocusTop = getStyleFromName(TABBAR_ACTIVEUNFOCUSEDINDCATOR); Style *stActunfocusTop = getStyleFromName(TABBAR_ACTIVEUNFOCUSEDINDCATOR);
if (stActunfocusTop && stActunfocusTop->_fgColor != -1) if (stActunfocusTop && static_cast<long>(stActunfocusTop->_fgColor) != -1)
TabBarPlus::setColour(stActunfocusTop->_fgColor, TabBarPlus::activeUnfocusedTop); TabBarPlus::setColour(stActunfocusTop->_fgColor, TabBarPlus::activeUnfocusedTop);
Style *stInact = getStyleFromName(TABBAR_INACTIVETEXT); Style *stInact = getStyleFromName(TABBAR_INACTIVETEXT);
if (stInact && stInact->_fgColor != -1) if (stInact && static_cast<long>(stInact->_fgColor) != -1)
TabBarPlus::setColour(stInact->_fgColor, TabBarPlus::inactiveText); TabBarPlus::setColour(stInact->_fgColor, TabBarPlus::inactiveText);
if (stInact && stInact->_bgColor != -1) if (stInact && static_cast<long>(stInact->_bgColor) != -1)
TabBarPlus::setColour(stInact->_bgColor, TabBarPlus::inactiveBg); TabBarPlus::setColour(stInact->_bgColor, TabBarPlus::inactiveBg);
} }
void Notepad_plus::drawDocumentMapColoursFromStylerArray() void Notepad_plus::drawDocumentMapColoursFromStylerArray()
{ {
Style* docMap = getStyleFromName(VIEWZONE_DOCUMENTMAP); Style* docMap = getStyleFromName(VIEWZONE_DOCUMENTMAP);
if (docMap && docMap->_fgColor != -1) if (docMap && static_cast<long>(docMap->_fgColor) != -1)
ViewZoneDlg::setColour(docMap->_fgColor, ViewZoneDlg::ViewZoneColorIndex::focus); ViewZoneDlg::setColour(docMap->_fgColor, ViewZoneDlg::ViewZoneColorIndex::focus);
if (docMap && docMap->_bgColor != -1) if (docMap && static_cast<long>(docMap->_bgColor) != -1)
ViewZoneDlg::setColour(docMap->_bgColor, ViewZoneDlg::ViewZoneColorIndex::frost); ViewZoneDlg::setColour(docMap->_bgColor, ViewZoneDlg::ViewZoneColorIndex::frost);
} }

2
PowerEditor/src/Parameters.cpp
View File

@ -630,7 +630,7 @@ int base64ToAscii(char *dest, const char *base64Str)
uc2 = (UCHAR)base64IndexArray[base64Str[j+2]]; uc2 = (UCHAR)base64IndexArray[base64Str[j+2]];
uc3 = (UCHAR)base64IndexArray[base64Str[j+3]]; uc3 = (UCHAR)base64IndexArray[base64Str[j+3]];
if ((uc0 == -1) || (uc1 == -1) || (uc2 == -1) || (uc3 == -1)) if ((static_cast<char>(uc0) == -1) || (static_cast<char>(uc1) == -1) || (static_cast<char>(uc2) == -1) || (static_cast<char>(uc3) == -1))
return -1; return -1;
if (base64Str[j+2] == '=') // && (uc3 == '=') if (base64Str[j+2] == '=') // && (uc3 == '=')

4
PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp
View File

@ -499,7 +499,7 @@ bool Finder::notify(SCNotification *notification)
::SendMessage(_scintView.getHSelf(), WM_LBUTTONUP, 0, 0); ::SendMessage(_scintView.getHSelf(), WM_LBUTTONUP, 0, 0);
size_t pos = notification->position; size_t pos = notification->position;
if (pos == INVALID_POSITION) if (static_cast<intptr_t>(pos) == INVALID_POSITION)
pos = _scintView.execute(SCI_GETLINEENDPOSITION, notification->line); pos = _scintView.execute(SCI_GETLINEENDPOSITION, notification->line);
_scintView.execute(SCI_SETSEL, pos, pos); _scintView.execute(SCI_SETSEL, pos, pos);
@ -3494,7 +3494,7 @@ void FindReplaceDlg::enableProjectCheckmarks()
for (int i = 0; i < 3; i++) for (int i = 0; i < 3; i++)
{ {
UINT s = GetMenuState (hMenu, idm [i], MF_BYCOMMAND); UINT s = GetMenuState (hMenu, idm [i], MF_BYCOMMAND);
if (s != -1) if (static_cast<int>(s) != -1)
{ {
if (s & MF_CHECKED) if (s & MF_CHECKED)
{ {

6
PowerEditor/src/ScintillaComponent/ScintillaEditView.cpp
View File

@ -418,7 +418,7 @@ LRESULT ScintillaEditView::scintillaNew_Proc(HWND hwnd, UINT Message, WPARAM wPa
if (selectSize == 0) if (selectSize == 0)
return 0; return 0;
if (selectSize + 1 > sizeof(smallTextBuffer)) if (static_cast<size_t>(selectSize + 1) > sizeof(smallTextBuffer))
selectedStr = new char[selectSize + 1]; selectedStr = new char[selectSize + 1];
getText(selectedStr, range.cpMin, range.cpMax); getText(selectedStr, range.cpMin, range.cpMax);
@ -1940,14 +1940,14 @@ void ScintillaEditView::getCurrentFoldStates(std::vector<size_t> & lineStateVect
do { do {
contractedFoldHeaderLine = execute(SCI_CONTRACTEDFOLDNEXT, contractedFoldHeaderLine); contractedFoldHeaderLine = execute(SCI_CONTRACTEDFOLDNEXT, contractedFoldHeaderLine);
if (contractedFoldHeaderLine != -1) if (static_cast<intptr_t>(contractedFoldHeaderLine) != -1)
{ {
//-- Store contracted line //-- Store contracted line
lineStateVector.push_back(contractedFoldHeaderLine); lineStateVector.push_back(contractedFoldHeaderLine);
//-- Start next search with next line //-- Start next search with next line
++contractedFoldHeaderLine; ++contractedFoldHeaderLine;
} }
} while (contractedFoldHeaderLine != -1); } while (static_cast<intptr_t>(contractedFoldHeaderLine) != -1);
} }
void ScintillaEditView::syncFoldStateWith(const std::vector<size_t> & lineStateVectorNew) void ScintillaEditView::syncFoldStateWith(const std::vector<size_t> & lineStateVectorNew)

30
PowerEditor/src/ScintillaComponent/UserDefineDialog.cpp
View File

@ -37,7 +37,7 @@ GlobalMappers & globalMappper()
return gm; return gm;
} }
void convertTo(TCHAR *dest, int destLen, const TCHAR *toConvert, TCHAR *prefix) void convertTo(TCHAR *dest, int destLen, const TCHAR *toConvert, const TCHAR *prefix)
{ {
bool inGroup = false; bool inGroup = false;
int index = lstrlen(dest); int index = lstrlen(dest);
@ -526,7 +526,6 @@ void CommentStyleDialog::setKeywords2List(int id)
newList[0] = '\0'; newList[0] = '\0';
TCHAR* buffer = new TCHAR[max_char]; TCHAR* buffer = new TCHAR[max_char];
buffer[0] = '\0'; buffer[0] = '\0';
TCHAR intBuffer[10] = {'0', 0};
const int list[] = { const int list[] = {
IDC_COMMENTLINE_OPEN_EDIT, IDC_COMMENTLINE_OPEN_EDIT,
@ -536,11 +535,11 @@ void CommentStyleDialog::setKeywords2List(int id)
IDC_COMMENT_CLOSE_EDIT IDC_COMMENT_CLOSE_EDIT
}; };
for (auto i = 0; i < sizeof(list)/sizeof(int); ++i) for (size_t i = 0; i < sizeof(list)/sizeof(int); ++i)
{ {
generic_itoa(i, intBuffer+1, 10); wstring intStr = std::to_wstring(i);
::GetDlgItemText(_hSelf, list[i], buffer, max_char); ::GetDlgItemText(_hSelf, list[i], buffer, max_char);
convertTo(newList, max_char, buffer, intBuffer); convertTo(newList, max_char, buffer, intStr.c_str());
} }
wcscpy_s(_pUserLang->_keywordLists[index], newList); wcscpy_s(_pUserLang->_keywordLists[index], newList);
@ -549,7 +548,7 @@ void CommentStyleDialog::setKeywords2List(int id)
} }
} }
void CommentStyleDialog::retrieve(TCHAR *dest, const TCHAR *toRetrieve, TCHAR *prefix) const void CommentStyleDialog::retrieve(TCHAR *dest, const TCHAR *toRetrieve, const TCHAR *prefix) const
{ {
int j = 0; int j = 0;
bool begin2Copy = false; bool begin2Copy = false;
@ -589,7 +588,6 @@ void CommentStyleDialog::updateDlg()
{ {
TCHAR* buffer = new TCHAR[max_char]; TCHAR* buffer = new TCHAR[max_char];
buffer[0] = '\0'; buffer[0] = '\0';
TCHAR intBuffer[10] = {'0', 0};
const int list[] = { const int list[] = {
IDC_COMMENTLINE_OPEN_EDIT, IDC_COMMENTLINE_OPEN_EDIT,
@ -599,10 +597,10 @@ void CommentStyleDialog::updateDlg()
IDC_COMMENT_CLOSE_EDIT IDC_COMMENT_CLOSE_EDIT
}; };
for (int i=0; i<sizeof(list)/sizeof(int); ++i) for (size_t i=0; i<sizeof(list)/sizeof(int); ++i)
{ {
generic_itoa(i, intBuffer+1, 10); wstring intStr = std::to_wstring(i);
retrieve(buffer, _pUserLang->_keywordLists[SCE_USER_KWLIST_COMMENTS], intBuffer); retrieve(buffer, _pUserLang->_keywordLists[SCE_USER_KWLIST_COMMENTS], intStr.c_str());
::SendDlgItemMessage(_hSelf, list[i], WM_SETTEXT, 0, reinterpret_cast<LPARAM>(buffer)); ::SendDlgItemMessage(_hSelf, list[i], WM_SETTEXT, 0, reinterpret_cast<LPARAM>(buffer));
} }
@ -659,7 +657,7 @@ void SymbolsStyleDialog::updateDlg()
}; };
TCHAR intBuffer[10] = {'0', 0}; TCHAR intBuffer[10] = {'0', 0};
for (int i = 0; i < sizeof(list)/sizeof(int); ++i) for (int i = 0; static_cast<size_t>(i) < sizeof(list)/sizeof(int); ++i)
{ {
if (i < 10) if (i < 10)
generic_itoa(i, intBuffer + 1, 10); generic_itoa(i, intBuffer + 1, 10);
@ -853,7 +851,7 @@ void SymbolsStyleDialog::setKeywords2List(int id)
IDC_DELIMITER8_BOUNDARYCLOSE_EDIT IDC_DELIMITER8_BOUNDARYCLOSE_EDIT
}; };
for (int i = 0; i < sizeof(list)/sizeof(int); ++i) for (int i = 0; static_cast<size_t>(i) < sizeof(list)/sizeof(int); ++i)
{ {
if (i < 10) if (i < 10)
generic_itoa(i, intBuffer+1, 10); generic_itoa(i, intBuffer+1, 10);
@ -1223,7 +1221,7 @@ intptr_t CALLBACK UserDefineDialog::run_dlgProc(UINT message, WPARAM wParam, LPA
const size_t langNameLen = 256; const size_t langNameLen = 256;
TCHAR langName[langNameLen + 1]; TCHAR langName[langNameLen + 1];
auto cbTextLen = ::SendDlgItemMessage(_hSelf, IDC_LANGNAME_COMBO, CB_GETLBTEXTLEN, i, 0); auto cbTextLen = ::SendDlgItemMessage(_hSelf, IDC_LANGNAME_COMBO, CB_GETLBTEXTLEN, i, 0);
if (cbTextLen > langNameLen) if (static_cast<size_t>(cbTextLen) > langNameLen)
return TRUE; return TRUE;
::SendDlgItemMessage(_hSelf, IDC_LANGNAME_COMBO, CB_GETLBTEXT, i, reinterpret_cast<LPARAM>(langName)); ::SendDlgItemMessage(_hSelf, IDC_LANGNAME_COMBO, CB_GETLBTEXT, i, reinterpret_cast<LPARAM>(langName));
@ -1252,7 +1250,7 @@ intptr_t CALLBACK UserDefineDialog::run_dlgProc(UINT message, WPARAM wParam, LPA
const size_t langNameLen = 256; const size_t langNameLen = 256;
TCHAR langName[langNameLen + 1]; TCHAR langName[langNameLen + 1];
auto cbTextLen = ::SendDlgItemMessage(_hSelf, IDC_LANGNAME_COMBO, CB_GETLBTEXTLEN, i, 0); auto cbTextLen = ::SendDlgItemMessage(_hSelf, IDC_LANGNAME_COMBO, CB_GETLBTEXTLEN, i, 0);
if (cbTextLen > langNameLen) if (static_cast<size_t>(cbTextLen) > langNameLen)
return TRUE; return TRUE;
::SendDlgItemMessage(_hSelf, IDC_LANGNAME_COMBO, CB_GETLBTEXT, i, reinterpret_cast<LPARAM>(langName)); ::SendDlgItemMessage(_hSelf, IDC_LANGNAME_COMBO, CB_GETLBTEXT, i, reinterpret_cast<LPARAM>(langName));
@ -1755,7 +1753,7 @@ intptr_t CALLBACK StylerDlg::dlgProc(HWND hwnd, UINT message, WPARAM wParam, LPA
// for the font size combo // for the font size combo
HWND hFontSizeCombo = ::GetDlgItem(hwnd, IDC_STYLER_COMBO_FONT_SIZE); HWND hFontSizeCombo = ::GetDlgItem(hwnd, IDC_STYLER_COMBO_FONT_SIZE);
for (int j = 0 ; j < int(sizeof(fontSizeStrs))/(3*sizeof(TCHAR)) ; ++j) for (size_t j = 0 ; j < int(sizeof(fontSizeStrs))/(3*sizeof(TCHAR)) ; ++j)
::SendMessage(hFontSizeCombo, CB_ADDSTRING, 0, reinterpret_cast<LPARAM>(fontSizeStrs[j])); ::SendMessage(hFontSizeCombo, CB_ADDSTRING, 0, reinterpret_cast<LPARAM>(fontSizeStrs[j]));
TCHAR size[10]; TCHAR size[10];
@ -1879,7 +1877,7 @@ intptr_t CALLBACK StylerDlg::dlgProc(HWND hwnd, UINT message, WPARAM wParam, LPA
const size_t intStrLen = 3; const size_t intStrLen = 3;
TCHAR intStr[intStrLen]; TCHAR intStr[intStrLen];
auto lbTextLen = ::SendDlgItemMessage(hwnd, LOWORD(wParam), CB_GETLBTEXTLEN, i, 0); auto lbTextLen = ::SendDlgItemMessage(hwnd, LOWORD(wParam), CB_GETLBTEXTLEN, i, 0);
if (lbTextLen > intStrLen - 1) if (static_cast<size_t>(lbTextLen) > intStrLen - 1)
return TRUE; return TRUE;
::SendDlgItemMessage(hwnd, LOWORD(wParam), CB_GETLBTEXT, i, reinterpret_cast<LPARAM>(intStr)); ::SendDlgItemMessage(hwnd, LOWORD(wParam), CB_GETLBTEXT, i, reinterpret_cast<LPARAM>(intStr));

2
PowerEditor/src/ScintillaComponent/UserDefineDialog.h
View File

@ -284,7 +284,7 @@ protected :
intptr_t CALLBACK run_dlgProc(UINT Message, WPARAM wParam, LPARAM lParam); intptr_t CALLBACK run_dlgProc(UINT Message, WPARAM wParam, LPARAM lParam);
void setKeywords2List(int id); void setKeywords2List(int id);
private : private :
void retrieve(TCHAR *dest, const TCHAR *toRetrieve, TCHAR *prefix) const; void retrieve(TCHAR *dest, const TCHAR *toRetrieve, const TCHAR *prefix) const;
}; };
class SymbolsStyleDialog : public SharedParametersDialog class SymbolsStyleDialog : public SharedParametersDialog

12
PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp
View File

@ -120,7 +120,7 @@ intptr_t CALLBACK WordStyleDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM
} }
::SendMessage(_hSwitch2ThemeCombo, CB_SETCURSEL, _currentThemeIndex, 0); ::SendMessage(_hSwitch2ThemeCombo, CB_SETCURSEL, _currentThemeIndex, 0);
for (int i = 0 ; i < sizeof(fontSizeStrs)/(3*sizeof(TCHAR)) ; ++i) for (size_t i = 0 ; i < sizeof(fontSizeStrs)/(3*sizeof(TCHAR)) ; ++i)
::SendMessage(_hFontSizeCombo, CB_ADDSTRING, 0, reinterpret_cast<LPARAM>(fontSizeStrs[i])); ::SendMessage(_hFontSizeCombo, CB_ADDSTRING, 0, reinterpret_cast<LPARAM>(fontSizeStrs[i]));
const std::vector<generic_string> & fontlist = (NppParameters::getInstance()).getFontList(); const std::vector<generic_string> & fontlist = (NppParameters::getInstance()).getFontList();
@ -572,7 +572,7 @@ int WordStyleDlg::whichTabColourIndex()
const size_t styleNameLen = 128; const size_t styleNameLen = 128;
TCHAR styleName[styleNameLen + 1] = { '\0' }; TCHAR styleName[styleNameLen + 1] = { '\0' };
auto lbTextLen = ::SendDlgItemMessage(_hSelf, IDC_STYLES_LIST, LB_GETTEXTLEN, i, 0); auto lbTextLen = ::SendDlgItemMessage(_hSelf, IDC_STYLES_LIST, LB_GETTEXTLEN, i, 0);
if (lbTextLen > styleNameLen) if (static_cast<size_t>(lbTextLen) > styleNameLen)
return -1; return -1;
::SendDlgItemMessage(_hSelf, IDC_STYLES_LIST, LB_GETTEXT, i, reinterpret_cast<LPARAM>(styleName)); ::SendDlgItemMessage(_hSelf, IDC_STYLES_LIST, LB_GETTEXT, i, reinterpret_cast<LPARAM>(styleName));
@ -601,7 +601,7 @@ bool WordStyleDlg::isDocumentMapStyle()
constexpr size_t styleNameLen = 128; constexpr size_t styleNameLen = 128;
TCHAR styleName[styleNameLen + 1] = { '\0' }; TCHAR styleName[styleNameLen + 1] = { '\0' };
const auto lbTextLen = ::SendDlgItemMessage(_hSelf, IDC_STYLES_LIST, LB_GETTEXTLEN, i, 0); const auto lbTextLen = ::SendDlgItemMessage(_hSelf, IDC_STYLES_LIST, LB_GETTEXTLEN, i, 0);
if (lbTextLen > styleNameLen) if (static_cast<size_t>(lbTextLen) > styleNameLen)
return false; return false;
::SendDlgItemMessage(_hSelf, IDC_STYLES_LIST, LB_GETTEXT, i, reinterpret_cast<LPARAM>(styleName)); ::SendDlgItemMessage(_hSelf, IDC_STYLES_LIST, LB_GETTEXT, i, reinterpret_cast<LPARAM>(styleName));
@ -641,7 +641,7 @@ void WordStyleDlg::updateFontSize()
TCHAR intStr[intStrLen]; TCHAR intStr[intStrLen];
auto lbTextLen = ::SendMessage(_hFontSizeCombo, CB_GETLBTEXTLEN, iFontSizeSel, 0); auto lbTextLen = ::SendMessage(_hFontSizeCombo, CB_GETLBTEXTLEN, iFontSizeSel, 0);
if (lbTextLen >= intStrLen) if (static_cast<size_t>(lbTextLen) >= intStrLen)
return; return;
::SendMessage(_hFontSizeCombo, CB_GETLBTEXT, iFontSizeSel, reinterpret_cast<LPARAM>(intStr)); ::SendMessage(_hFontSizeCombo, CB_GETLBTEXT, iFontSizeSel, reinterpret_cast<LPARAM>(intStr));
@ -844,7 +844,7 @@ void WordStyleDlg::setVisualFromStyleList()
if (i == LB_ERR) if (i == LB_ERR)
return; return;
auto lbTextLen = ::SendDlgItemMessage(_hSelf, IDC_LANGUAGES_LIST, LB_GETTEXTLEN, i, 0); auto lbTextLen = ::SendDlgItemMessage(_hSelf, IDC_LANGUAGES_LIST, LB_GETTEXTLEN, i, 0);
if (lbTextLen > strLen) if (static_cast<size_t>(lbTextLen) > strLen)
return; return;
::SendDlgItemMessage(_hSelf, IDC_LANGUAGES_LIST, LB_GETTEXT, i, reinterpret_cast<LPARAM>(str)); ::SendDlgItemMessage(_hSelf, IDC_LANGUAGES_LIST, LB_GETTEXT, i, reinterpret_cast<LPARAM>(str));
@ -855,7 +855,7 @@ void WordStyleDlg::setVisualFromStyleList()
const size_t styleNameLen = 64; const size_t styleNameLen = 64;
TCHAR styleName[styleNameLen + 1] = { '\0' }; TCHAR styleName[styleNameLen + 1] = { '\0' };
lbTextLen = ::SendDlgItemMessage(_hSelf, IDC_STYLES_LIST, LB_GETTEXTLEN, i, 0); lbTextLen = ::SendDlgItemMessage(_hSelf, IDC_STYLES_LIST, LB_GETTEXTLEN, i, 0);
if (lbTextLen > styleNameLen) if (static_cast<size_t>(lbTextLen) > styleNameLen)
return; return;
::SendDlgItemMessage(_hSelf, IDC_STYLES_LIST, LB_GETTEXT, i, reinterpret_cast<LPARAM>(styleName)); ::SendDlgItemMessage(_hSelf, IDC_STYLES_LIST, LB_GETTEXT, i, reinterpret_cast<LPARAM>(styleName));
wcscat_s(str, TEXT(" : ")); wcscat_s(str, TEXT(" : "));

2
PowerEditor/src/WinControls/ContextMenu/ContextMenu.cpp
View File

@ -104,7 +104,7 @@ void ContextMenu::create(HWND hParent, const std::vector<MenuItemUnit> & menuIte
if (mainMenuHandle) if (mainMenuHandle)
{ {
UINT s = ::GetMenuState(mainMenuHandle, item._cmdID, MF_BYCOMMAND); UINT s = ::GetMenuState(mainMenuHandle, item._cmdID, MF_BYCOMMAND);
if (s != -1) if (static_cast<int>(s) != -1)
{ {
bool isEnabled = (s & (MF_DISABLED | MF_GRAYED)) == 0; bool isEnabled = (s & (MF_DISABLED | MF_GRAYED)) == 0;
bool isChecked = (s & (MF_CHECKED)) != 0; bool isChecked = (s & (MF_CHECKED)) != 0;

16
PowerEditor/src/WinControls/Grid/BabyGrid.cpp
View File

@ -1559,7 +1559,7 @@ LRESULT CALLBACK GridProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{ {
//it was found, get the text, modify text delete it from list, add modified to list //it was found, get the text, modify text delete it from list, add modified to list
auto lbTextLen = ::SendMessage(BGHS[SelfIndex].hlist1, LB_GETTEXTLEN, FindResult, 0); auto lbTextLen = ::SendMessage(BGHS[SelfIndex].hlist1, LB_GETTEXTLEN, FindResult, 0);
if (lbTextLen > bufferLen) if (static_cast<size_t>(lbTextLen) > bufferLen)
return TRUE; return TRUE;
SendMessage(BGHS[SelfIndex].hlist1, LB_GETTEXT, FindResult, reinterpret_cast<LPARAM>(buffer)); SendMessage(BGHS[SelfIndex].hlist1, LB_GETTEXT, FindResult, reinterpret_cast<LPARAM>(buffer));
@ -1687,7 +1687,7 @@ LRESULT CALLBACK GridProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
if(j>0) if(j>0)
{ {
auto lbTextLen = ::SendMessage(BGHS[SelfIndex].hlist1, LB_GETTEXTLEN, j-1, 0); auto lbTextLen = ::SendMessage(BGHS[SelfIndex].hlist1, LB_GETTEXTLEN, j-1, 0);
if (lbTextLen > bufferLen) if (static_cast<size_t>(lbTextLen) > bufferLen)
return TRUE; return TRUE;
SendMessage(BGHS[SelfIndex].hlist1, LB_GETTEXT, j - 1, reinterpret_cast<LPARAM>(buffer)); SendMessage(BGHS[SelfIndex].hlist1, LB_GETTEXT, j - 1, reinterpret_cast<LPARAM>(buffer));
buffer[5]=0x00; buffer[5]=0x00;
@ -1790,7 +1790,7 @@ LRESULT CALLBACK GridProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{ {
//it was found, get it //it was found, get it
auto lbTextLen = ::SendMessage(BGHS[SelfIndex].hlist1, LB_GETTEXTLEN, FindResult, 0); auto lbTextLen = ::SendMessage(BGHS[SelfIndex].hlist1, LB_GETTEXTLEN, FindResult, 0);
if (lbTextLen > bufferLen) if (static_cast<size_t>(lbTextLen) > bufferLen)
return TRUE; return TRUE;
SendMessage(BGHS[SelfIndex].hlist1, LB_GETTEXT, FindResult, reinterpret_cast<LPARAM>(buffer)); SendMessage(BGHS[SelfIndex].hlist1, LB_GETTEXT, FindResult, reinterpret_cast<LPARAM>(buffer));
switch (buffer[10]) // no need to call BGM_GETPROTECTION separately for this switch (buffer[10]) // no need to call BGM_GETPROTECTION separately for this
@ -1949,7 +1949,7 @@ LRESULT CALLBACK GridProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{ {
//it was found, get it //it was found, get it
auto lbTextLen = ::SendMessage(BGHS[SelfIndex].hlist1, LB_GETTEXTLEN, FindResult, 0); auto lbTextLen = ::SendMessage(BGHS[SelfIndex].hlist1, LB_GETTEXTLEN, FindResult, 0);
if (lbTextLen > bufferLen) if (static_cast<size_t>(lbTextLen) > bufferLen)
return TRUE; return TRUE;
SendMessage(BGHS[SelfIndex].hlist1, LB_GETTEXT, FindResult, reinterpret_cast<LPARAM>(buffer)); SendMessage(BGHS[SelfIndex].hlist1, LB_GETTEXT, FindResult, reinterpret_cast<LPARAM>(buffer));
switch (buffer[11]) switch (buffer[11])
@ -1981,7 +1981,7 @@ LRESULT CALLBACK GridProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{ {
//it was found, get it //it was found, get it
auto lbTextLen = ::SendMessage(BGHS[SelfIndex].hlist1, LB_GETTEXTLEN, FindResult, 0); auto lbTextLen = ::SendMessage(BGHS[SelfIndex].hlist1, LB_GETTEXTLEN, FindResult, 0);
if (lbTextLen > bufferLen) if (static_cast<size_t>(lbTextLen) > bufferLen)
return TRUE; return TRUE;
SendMessage(BGHS[SelfIndex].hlist1, LB_GETTEXT, FindResult, reinterpret_cast<LPARAM>(buffer)); SendMessage(BGHS[SelfIndex].hlist1, LB_GETTEXT, FindResult, reinterpret_cast<LPARAM>(buffer));
switch (buffer[10]) switch (buffer[10])
@ -3197,7 +3197,7 @@ int BinarySearchListBox(HWND lbhWnd,TCHAR* searchtext)
//is it the head? //is it the head?
auto lbTextLen = ::SendMessage(lbhWnd, LB_GETTEXTLEN, head, 0); auto lbTextLen = ::SendMessage(lbhWnd, LB_GETTEXTLEN, head, 0);
if (lbTextLen > bufLen) if (static_cast<size_t>(lbTextLen) > bufLen)
return 0; return 0;
SendMessage(lbhWnd, LB_GETTEXT, head, reinterpret_cast<LPARAM>(headtext)); SendMessage(lbhWnd, LB_GETTEXT, head, reinterpret_cast<LPARAM>(headtext));
@ -3221,7 +3221,7 @@ int BinarySearchListBox(HWND lbhWnd,TCHAR* searchtext)
//is it the tail? //is it the tail?
lbTextLen = ::SendMessage(lbhWnd, LB_GETTEXTLEN, tail, 0); lbTextLen = ::SendMessage(lbhWnd, LB_GETTEXTLEN, tail, 0);
if (lbTextLen > bufLen) if (static_cast<size_t>(lbTextLen) > bufLen)
return 0; return 0;
SendMessage(lbhWnd, LB_GETTEXT, tail, reinterpret_cast<LPARAM>(tailtext)); SendMessage(lbhWnd, LB_GETTEXT, tail, reinterpret_cast<LPARAM>(tailtext));
tailtext[9] = 0x00; tailtext[9] = 0x00;
@ -3248,7 +3248,7 @@ int BinarySearchListBox(HWND lbhWnd,TCHAR* searchtext)
{ {
finger = head + ((tail - head) / 2); finger = head + ((tail - head) / 2);
lbTextLen = ::SendMessage(lbhWnd, LB_GETTEXTLEN, finger, 0); lbTextLen = ::SendMessage(lbhWnd, LB_GETTEXTLEN, finger, 0);
if (lbTextLen > bufLen) if (static_cast<size_t>(lbTextLen) > bufLen)
return 0; return 0;
SendMessage(lbhWnd, LB_GETTEXT, finger, reinterpret_cast<LPARAM>(tbuffer)); SendMessage(lbhWnd, LB_GETTEXT, finger, reinterpret_cast<LPARAM>(tbuffer));
tbuffer[9] = 0x00; tbuffer[9] = 0x00;

8
PowerEditor/src/WinControls/Preference/preferenceDlg.cpp
View File

@ -323,7 +323,7 @@ bool PreferenceDlg::setListSelection(size_t currentSel) const
TCHAR selStr[selStrLenMax + 1]; TCHAR selStr[selStrLenMax + 1];
auto lbTextLen = ::SendMessage(_hSelf, LB_GETTEXTLEN, currentSel, 0); auto lbTextLen = ::SendMessage(_hSelf, LB_GETTEXTLEN, currentSel, 0);
if (lbTextLen > selStrLenMax) if (static_cast<size_t>(lbTextLen) > selStrLenMax)
return false; return false;
::SendDlgItemMessage(_hSelf, IDC_LIST_DLGTITLE, LB_GETTEXT, currentSel, reinterpret_cast<LPARAM>(selStr)); ::SendDlgItemMessage(_hSelf, IDC_LIST_DLGTITLE, LB_GETTEXT, currentSel, reinterpret_cast<LPARAM>(selStr));
@ -2580,13 +2580,13 @@ intptr_t CALLBACK LanguageSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARA
pDestLst = &_langList; pDestLst = &_langList;
} }
size_t iRemove = ::SendDlgItemMessage(_hSelf, list2Remove, LB_GETCURSEL, 0, 0); size_t iRemove = ::SendDlgItemMessage(_hSelf, list2Remove, LB_GETCURSEL, 0, 0);
if (iRemove == -1) if (static_cast<intptr_t>(iRemove) == -1)
return TRUE; return TRUE;
const size_t sL = 31; const size_t sL = 31;
TCHAR s[sL + 1]; TCHAR s[sL + 1];
auto lbTextLen = ::SendDlgItemMessage(_hSelf, list2Remove, LB_GETTEXTLEN, iRemove, 0); auto lbTextLen = ::SendDlgItemMessage(_hSelf, list2Remove, LB_GETTEXTLEN, iRemove, 0);
if (lbTextLen > sL) if (static_cast<size_t>(lbTextLen) > sL)
return TRUE; return TRUE;
::SendDlgItemMessage(_hSelf, list2Remove, LB_GETTEXT, iRemove, reinterpret_cast<LPARAM>(s)); ::SendDlgItemMessage(_hSelf, list2Remove, LB_GETTEXT, iRemove, reinterpret_cast<LPARAM>(s));
@ -3207,7 +3207,7 @@ intptr_t CALLBACK PrintSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM)
TCHAR intStr[intStrLen]; TCHAR intStr[intStrLen];
auto lbTextLen = ::SendDlgItemMessage(_hSelf, LOWORD(wParam), CB_GETLBTEXTLEN, iSel, 0); auto lbTextLen = ::SendDlgItemMessage(_hSelf, LOWORD(wParam), CB_GETLBTEXTLEN, iSel, 0);
if (lbTextLen >= intStrLen) if (static_cast<size_t>(lbTextLen) >= intStrLen)
return TRUE; return TRUE;
::SendDlgItemMessage(_hSelf, LOWORD(wParam), CB_GETLBTEXT, iSel, reinterpret_cast<LPARAM>(intStr)); ::SendDlgItemMessage(_hSelf, LOWORD(wParam), CB_GETLBTEXT, iSel, reinterpret_cast<LPARAM>(intStr));

4
PowerEditor/src/WinControls/TabBar/TabBar.cpp
View File

@ -160,7 +160,7 @@ void TabBar::activateAt(int index) const
void TabBar::deletItemAt(size_t index) void TabBar::deletItemAt(size_t index)
{ {
if ((index == _nbItem-1)) if (index == _nbItem - 1)
{ {
//prevent invisible tabs. If last visible tab is removed, other tabs are put in view but not redrawn //prevent invisible tabs. If last visible tab is removed, other tabs are put in view but not redrawn
//Therefore, scroll one tab to the left if only one tab visible //Therefore, scroll one tab to the left if only one tab visible
@ -912,7 +912,7 @@ LRESULT TabBarPlus::runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lPara
int nSelTab = TabCtrl_GetCurSel(hwnd); int nSelTab = TabCtrl_GetCurSel(hwnd);
for (int i = 0; i < nTabs; ++i) for (int i = 0; i < nTabs; ++i)
{ {
DRAWITEMSTRUCT dis = { ODT_TAB, id, (UINT)i, ODA_DRAWENTIRE, ODS_DEFAULT, hwnd, hdc }; DRAWITEMSTRUCT dis = { ODT_TAB, id, (UINT)i, ODA_DRAWENTIRE, ODS_DEFAULT, hwnd, hdc, {}, 0 };
TabCtrl_GetItemRect(hwnd, i, &dis.rcItem); TabCtrl_GetItemRect(hwnd, i, &dis.rcItem);
if (i == nFocusTab) if (i == nFocusTab)

4
PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcher.cpp
View File

@ -396,12 +396,12 @@ void VerticalFileSwitcher::updateHeaderArrow()
if (_lastSortingDirection == SORT_DIRECTION_UP) if (_lastSortingDirection == SORT_DIRECTION_UP)
{ {
lvc.fmt = lvc.fmt | HDF_SORTUP & ~HDF_SORTDOWN; lvc.fmt = (lvc.fmt | HDF_SORTUP) & ~HDF_SORTDOWN;
SendMessage(hListView, LVM_SETCOLUMN, _lastSortingColumn, reinterpret_cast<LPARAM>(&lvc)); SendMessage(hListView, LVM_SETCOLUMN, _lastSortingColumn, reinterpret_cast<LPARAM>(&lvc));
} }
else if (_lastSortingDirection == SORT_DIRECTION_DOWN) else if (_lastSortingDirection == SORT_DIRECTION_DOWN)
{ {
lvc.fmt = lvc.fmt & ~HDF_SORTUP | HDF_SORTDOWN; lvc.fmt = (lvc.fmt & ~HDF_SORTUP) | HDF_SORTDOWN;
SendMessage(hListView, LVM_SETCOLUMN, _lastSortingColumn, reinterpret_cast<LPARAM>(&lvc)); SendMessage(hListView, LVM_SETCOLUMN, _lastSortingColumn, reinterpret_cast<LPARAM>(&lvc));
} }
else if (_lastSortingDirection == SORT_DIRECTION_NONE) else if (_lastSortingDirection == SORT_DIRECTION_NONE)

14
PowerEditor/src/WinControls/WindowsDlg/WindowsDlg.cpp
View File

@ -44,7 +44,7 @@ using namespace std;
static const TCHAR *readonlyString = TEXT(" [Read Only]"); static const TCHAR *readonlyString = TEXT(" [Read Only]");
const UINT WDN_NOTIFY = RegisterWindowMessage(TEXT("WDN_NOTIFY")); const UINT WDN_NOTIFY = RegisterWindowMessage(TEXT("WDN_NOTIFY"));
/*
inline static DWORD GetStyle(HWND hWnd) { inline static DWORD GetStyle(HWND hWnd) {
return (DWORD)GetWindowLongPtr(hWnd, GWL_STYLE); return (DWORD)GetWindowLongPtr(hWnd, GWL_STYLE);
} }
@ -70,7 +70,7 @@ inline static BOOL ModifyStyleEx(HWND hWnd, DWORD dwRemove, DWORD dwAdd) {
::SetWindowLongPtr(hWnd, GWL_EXSTYLE, dwNewStyle); ::SetWindowLongPtr(hWnd, GWL_EXSTYLE, dwNewStyle);
return TRUE; return TRUE;
} }
*/
struct NumericStringEquivalence struct NumericStringEquivalence
{ {
@ -133,10 +133,10 @@ struct NumericStringEquivalence
struct BufferEquivalent struct BufferEquivalent
{ {
NumericStringEquivalence _strequiv; NumericStringEquivalence _strequiv;
DocTabView *_pTab; DocTabView* _pTab;
int _iColumn; int _iColumn;
bool _reverse; bool _reverse;
BufferEquivalent(DocTabView *pTab, int iColumn, bool reverse) BufferEquivalent(DocTabView* pTab, int iColumn, bool reverse)
: _pTab(pTab), _iColumn(iColumn), _reverse(reverse) : _pTab(pTab), _iColumn(iColumn), _reverse(reverse)
{} {}
@ -807,6 +807,8 @@ void WindowsDlg::fitColumnsToSize()
void WindowsDlg::resetSelection() void WindowsDlg::resetSelection()
{ {
assert(_pTab != nullptr);
auto curSel = _pTab->getCurrentTabIndex(); auto curSel = _pTab->getCurrentTabIndex();
int pos = 0; int pos = 0;
for (vector<int>::iterator itr = _idxMap.begin(), end = _idxMap.end(); itr != end; ++itr, ++pos) for (vector<int>::iterator itr = _idxMap.begin(), end = _idxMap.end(); itr != end; ++itr, ++pos)
@ -897,7 +899,7 @@ void WindowsDlg::doClose()
vector<int>::iterator kitr = key.begin(); vector<int>::iterator kitr = key.begin();
for (UINT i=0; i<n; ++i, ++kitr) for (UINT i=0; i<n; ++i, ++kitr)
{ {
if (nmdlg.Items[i] == -1) if (static_cast<int>(nmdlg.Items[i]) == -1)
{ {
int oldVal = _idxMap[*kitr]; int oldVal = _idxMap[*kitr];
_idxMap[*kitr] = -1; _idxMap[*kitr] = -1;
@ -1113,7 +1115,7 @@ void WindowsMenu::initPopupMenu(HMENU hMenu, DocTabView *pTab)
mii.wID = id; mii.wID = id;
UINT state = GetMenuState(hMenu, id, MF_BYCOMMAND); UINT state = GetMenuState(hMenu, id, MF_BYCOMMAND);
if (state == -1) if (static_cast<int>(state) == -1)
InsertMenuItem(hMenu, IDM_WINDOW_WINDOWS, FALSE, &mii); InsertMenuItem(hMenu, IDM_WINDOW_WINDOWS, FALSE, &mii);
else else
SetMenuItemInfo(hMenu, id, FALSE, &mii); SetMenuItemInfo(hMenu, id, FALSE, &mii);

2
PowerEditor/src/WinControls/WindowsDlg/WindowsDlg.h
View File

@ -85,7 +85,7 @@ protected :
static RECT _lastKnownLocation; static RECT _lastKnownLocation;
SIZE _szMinButton = {}; SIZE _szMinButton = {};
SIZE _szMinListCtrl = {}; SIZE _szMinListCtrl = {};
DocTabView *_pTab = nullptr; DocTabView* _pTab = nullptr;
std::vector<int> _idxMap; std::vector<int> _idxMap;
int _currentColumn = -1; int _currentColumn = -1;
int _lastSort = -1; int _lastSort = -1;

12
PowerEditor/src/WinControls/shortcut/shortcut.cpp
View File

@ -27,11 +27,9 @@
using namespace std; using namespace std;
const int KEY_STR_LEN = 16;
struct KeyIDNAME { struct KeyIDNAME {
const TCHAR * name; const TCHAR * name = nullptr;
UCHAR id; UCHAR id = 0;
}; };
KeyIDNAME namedKeyArray[] = { KeyIDNAME namedKeyArray[] = {
@ -161,8 +159,8 @@ void Shortcut::setName(const TCHAR * menuName, const TCHAR * shortcutName)
{ {
lstrcpyn(_menuName, menuName, nameLenMax); lstrcpyn(_menuName, menuName, nameLenMax);
TCHAR const * name = shortcutName ? shortcutName : menuName; TCHAR const * name = shortcutName ? shortcutName : menuName;
int i = 0, j = 0; size_t i = 0, j = 0;
while (name[j] != 0 && i < (nameLenMax-1)) while (name[j] != 0 && i < (nameLenMax - 1))
{ {
if (name[j] != '&') if (name[j] != '&')
{ {
@ -274,7 +272,7 @@ void getKeyStrFromVal(UCHAR keyVal, generic_string & str)
{ {
str = TEXT(""); str = TEXT("");
bool found = false; bool found = false;
int i; size_t i;
for (i = 0; i < nbKeys; ++i) for (i = 0; i < nbKeys; ++i)
{ {
if (keyVal == namedKeyArray[i].id) if (keyVal == namedKeyArray[i].id)

2
PowerEditor/src/lastRecentFileList.cpp
View File

@ -38,7 +38,7 @@ void LastRecentFileList::initMenu(HMENU hMenu, int idBase, int posBase, Accelera
_pAccelerator = pAccelerator; _pAccelerator = pAccelerator;
_nativeLangEncoding = NPP_CP_WIN_1252; _nativeLangEncoding = NPP_CP_WIN_1252;
for (int i = 0 ; i < sizeof(_idFreeArray) ; ++i) for (size_t i = 0 ; i < sizeof(_idFreeArray) ; ++i)
_idFreeArray[i] = true; _idFreeArray[i] = true;
} }