aboutsummaryrefslogtreecommitdiffhomepage
path: root/win32
diff options
context:
space:
mode:
Diffstat (limited to 'win32')
-rw-r--r--win32/PlatWin.cxx8
-rw-r--r--win32/ScintillaWin.cxx46
2 files changed, 33 insertions, 21 deletions
diff --git a/win32/PlatWin.cxx b/win32/PlatWin.cxx
index 35d66030f..6a2f103ba 100644
--- a/win32/PlatWin.cxx
+++ b/win32/PlatWin.cxx
@@ -1315,7 +1315,7 @@ public:
};
char *LineToItem::AllocWord(const char *text) {
- int chars = strlen(text) + 1;
+ int chars = static_cast<int>(strlen(text) + 1);
int newCount = wordsCount + chars;
if (newCount > wordsSize) {
wordsSize = _ROUND2(newCount * 2, 8192);
@@ -1513,7 +1513,7 @@ PRectangle ListBoxX::GetDesiredRect() {
HDC hdc = ::GetDC(lb);
HFONT oldFont = SelectFont(hdc, fontCopy);
SIZE textSize = {0, 0};
- int len = widestItem ? strlen(widestItem) : 0;
+ int len = static_cast<int>(widestItem ? strlen(widestItem) : 0);
if (unicodeMode) {
const TextWide tbuf(widestItem, len, unicodeMode);
::GetTextExtentPoint32W(hdc, tbuf.buffer, tbuf.tlen, &textSize);
@@ -1631,7 +1631,7 @@ void ListBoxX::Draw(DRAWITEMSTRUCT *pDrawItem) {
ListItemData item = lti.Get(pDrawItem->itemID);
int pixId = item.pixId;
const char *text = item.text;
- int len = strlen(text);
+ int len = static_cast<int>(strlen(text));
RECT rcText = rcBox;
::InsetRect(&rcText, TextInset.x, TextInset.y);
@@ -1690,7 +1690,7 @@ void ListBoxX::SetList(const char *list, char separator, char typesep) {
// the listbox is not visible.
SetRedraw(false);
Clear();
- int size = strlen(list) + 1;
+ size_t size = strlen(list) + 1;
char *words = new char[size];
lti.SetWords(words);
memcpy(words, list, size);
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx
index f86d649c7..9925a64bb 100644
--- a/win32/ScintillaWin.cxx
+++ b/win32/ScintillaWin.cxx
@@ -1345,8 +1345,10 @@ public:
if (lenMixed > utf16Mixed.size()) {
utf16Mixed.resize(lenMixed + 8);
}
- size_t nUtf16Mixed = ::MultiByteToWideChar(65001, 0, mixed, lenMixed,
- &utf16Mixed[0], utf16Mixed.size());
+ size_t nUtf16Mixed = ::MultiByteToWideChar(65001, 0, mixed,
+ static_cast<int>(lenMixed),
+ &utf16Mixed[0],
+ static_cast<int>(utf16Mixed.size()));
if (nUtf16Mixed == 0) {
// Failed to convert -> bad UTF-8
@@ -1359,11 +1361,14 @@ public:
}
int lenFlat = ::LCMapStringW(LOCALE_SYSTEM_DEFAULT,
LCMAP_LINGUISTIC_CASING | LCMAP_LOWERCASE,
- &utf16Mixed[0], nUtf16Mixed, &utf16Folded[0], utf16Folded.size());
+ &utf16Mixed[0],
+ static_cast<int>(nUtf16Mixed),
+ &utf16Folded[0],
+ static_cast<int>(utf16Folded.size()));
size_t lenOut = UTF8Length(&utf16Folded[0], lenFlat);
if (lenOut < sizeFolded) {
- UTF8FromUTF16(&utf16Folded[0], lenFlat, folded, lenOut);
+ UTF8FromUTF16(&utf16Folded[0], lenFlat, folded, static_cast<int>(lenOut));
return lenOut;
} else {
return 0;
@@ -1390,8 +1395,10 @@ public:
if (lenMixed > utf16Mixed.size()) {
utf16Mixed.resize(lenMixed + 8);
}
- size_t nUtf16Mixed = ::MultiByteToWideChar(cp, 0, mixed, lenMixed,
- &utf16Mixed[0], utf16Mixed.size());
+ size_t nUtf16Mixed = ::MultiByteToWideChar(cp, 0, mixed,
+ static_cast<int>(lenMixed),
+ &utf16Mixed[0],
+ static_cast<int>(utf16Mixed.size()));
if (nUtf16Mixed == 0) {
// Failed to convert -> bad input
@@ -1404,7 +1411,10 @@ public:
}
int lenFlat = ::LCMapStringW(LOCALE_SYSTEM_DEFAULT,
LCMAP_LINGUISTIC_CASING | LCMAP_LOWERCASE,
- &utf16Mixed[0], nUtf16Mixed, &utf16Folded[0], utf16Folded.size());
+ &utf16Mixed[0],
+ static_cast<int>(nUtf16Mixed),
+ &utf16Folded[0],
+ static_cast<int>(utf16Folded.size()));
size_t lenOut = ::WideCharToMultiByte(cp, 0,
&utf16Folded[0], lenFlat,
@@ -1413,7 +1423,7 @@ public:
if (lenOut < sizeFolded) {
::WideCharToMultiByte(cp, 0,
&utf16Folded[0], lenFlat,
- folded, lenOut, NULL, 0);
+ folded, static_cast<int>(lenOut), NULL, 0);
return lenOut;
} else {
return 0;
@@ -1468,7 +1478,8 @@ std::string ScintillaWin::CaseMapString(const std::string &s, int caseMapping) {
UINT cpDoc = CodePageOfDocument();
- unsigned int lengthUTF16 = ::MultiByteToWideChar(cpDoc, 0, s.c_str(), s.size(), NULL, 0);
+ unsigned int lengthUTF16 = ::MultiByteToWideChar(cpDoc, 0, s.c_str(),
+ static_cast<int>(s.size()), NULL, 0);
if (lengthUTF16 == 0) // Failed to convert
return s;
@@ -1483,7 +1494,7 @@ std::string ScintillaWin::CaseMapString(const std::string &s, int caseMapping) {
// Change text to UTF-16
std::vector<wchar_t> vwcText(lengthUTF16);
- ::MultiByteToWideChar(cpDoc, 0, s.c_str(), s.size(), &vwcText[0], lengthUTF16);
+ ::MultiByteToWideChar(cpDoc, 0, s.c_str(), static_cast<int>(s.size()), &vwcText[0], lengthUTF16);
// Change case
int charsConverted = ::LCMapStringW(LOCALE_SYSTEM_DEFAULT, mapFlags,
@@ -1494,12 +1505,12 @@ std::string ScintillaWin::CaseMapString(const std::string &s, int caseMapping) {
// Change back to document encoding
unsigned int lengthConverted = ::WideCharToMultiByte(cpDoc, 0,
- &vwcConverted[0], vwcConverted.size(),
+ &vwcConverted[0], static_cast<int>(vwcConverted.size()),
NULL, 0, NULL, 0);
std::vector<char> vcConverted(lengthConverted);
::WideCharToMultiByte(cpDoc, 0,
- &vwcConverted[0], vwcConverted.size(),
- &vcConverted[0], vcConverted.size(), NULL, 0);
+ &vwcConverted[0], static_cast<int>(vwcConverted.size()),
+ &vcConverted[0], static_cast<int>(vcConverted.size()), NULL, 0);
return std::string(&vcConverted[0], vcConverted.size());
@@ -1509,7 +1520,8 @@ std::string ScintillaWin::CaseMapString(const std::string &s, int caseMapping) {
// Change text to UTF-16
wchar_t vwcText[shortSize];
- ::MultiByteToWideChar(cpDoc, 0, s.c_str(), s.size(), vwcText, lengthUTF16);
+ ::MultiByteToWideChar(cpDoc, 0, s.c_str(), static_cast<int>(s.size()),
+ vwcText, lengthUTF16);
// Change case
int charsConverted = ::LCMapStringW(LOCALE_SYSTEM_DEFAULT, mapFlags,
@@ -1613,8 +1625,8 @@ void ScintillaWin::InsertPasteText(const char *text, int len, SelectionPosition
// add the newline if necessary
if ((len > 0) && (text[len-1] != '\n' && text[len-1] != '\r')) {
const char *endline = StringFromEOLMode(pdoc->eolMode);
- pdoc->InsertString(insertPos + len, endline, strlen(endline));
- len += strlen(endline);
+ pdoc->InsertString(insertPos + len, endline, static_cast<int>(strlen(endline)));
+ len += static_cast<int>(strlen(endline));
}
if (sel.MainCaret() == insertPos) {
SetEmptySelection(sel.MainCaret() + len);
@@ -2472,7 +2484,7 @@ STDMETHODIMP ScintillaWin::Drop(LPDATAOBJECT pIDataSource, DWORD grfKeyState,
if (data && convertPastes) {
// Convert line endings of the drop into our local line-endings mode
- int len = strlen(data);
+ int len = static_cast<int>(strlen(data));
char *convertedText = Document::TransformLineEnds(&len, data, len, pdoc->eolMode);
if (dataAllocated)
delete []data;
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-31 03:46:08 +0000