1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QLocal8Bit::convert{To,From}Unicode[win]: use more of state

Browse Source 
Like other backends we should increment the invalid character count
when we output a replacement character.
And we should also output the NULL character if requested!
The downside here is that convertFromUnicode doesn't even have the
ability to do so. So instead I added a comment explaining why it is not
handled there.

Task-number: QTBUG-118318
Pick-to: 6.6 6.5
Change-Id: I57ba631aa59454e77007ab353277b7e8c2b5526a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
(cherry picked from commit 3c8d71796499a2ca641758dc1e9af4a778c8ef41)
This commit is contained in:
Mårten Nordheim 2023-11-28 17:01:17 +01:00
parent 2a950ce36e
commit 4483e81440
1 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/corelib/text/qstringconverter.cpp
View File

@ -1269,8 +1269,16 @@ QString QLocal8Bit::convertToUnicode_sys(QByteArrayView in, quint32 codePage,
const char *mb = in.data(); const char *mb = in.data();
qsizetype mblen = in.size(); qsizetype mblen = in.size();
if (state && state->flags & QStringConverter::Flag::Stateless) Q_ASSERT(state);
qsizetype &invalidChars = state->invalidChars;
using Flag = QStringConverter::Flag;
const bool useNullForReplacement = !!(state->flags & Flag::ConvertInvalidToNull);
const char16_t replacementCharacter = useNullForReplacement ? QChar::Null
: QChar::ReplacementCharacter;
if (state->flags & Flag::Stateless) {
Q_ASSERT(state->remainingChars == 0);
state = nullptr; state = nullptr;
}
if (!mb || !mblen) if (!mb || !mblen)
return QString(); return QString();
@ -1321,7 +1329,8 @@ QString QLocal8Bit::convertToUnicode_sys(QByteArrayView in, quint32 codePage,
// We couldn't decode any of the characters in the saved state, // We couldn't decode any of the characters in the saved state,
// so output replacement characters // so output replacement characters
for (int i = 0; i < state->remainingChars; ++i) for (int i = 0; i < state->remainingChars; ++i)
out[i] = QChar::ReplacementCharacter; out[i] = replacementCharacter;
invalidChars += state->remainingChars;
out += state->remainingChars; out += state->remainingChars;
outlen -= state->remainingChars; outlen -= state->remainingChars;
state->remainingChars = 0; state->remainingChars = 0;
@ -1407,7 +1416,8 @@ QString QLocal8Bit::convertToUnicode_sys(QByteArrayView in, quint32 codePage,
std::tie(out, outlen) = growOut(1); std::tie(out, outlen) = growOut(1);
if (!out) if (!out)
return {}; return {};
*out = QChar::ReplacementCharacter; *out = replacementCharacter;
++invalidChars;
++out; ++out;
--outlen; --outlen;
++mb; ++mb;
@ -1436,7 +1446,8 @@ QString QLocal8Bit::convertToUnicode_sys(QByteArrayView in, quint32 codePage,
if (!state && mblen > 0) { if (!state && mblen > 0) {
// We have trailing character(s) that could not be converted, and // We have trailing character(s) that could not be converted, and
// nowhere to cache them // nowhere to cache them
sp.resize(sp.size() + mblen, QChar::ReplacementCharacter); sp.resize(sp.size() + mblen, replacementCharacter);
invalidChars += mblen;
} }
return sp; return sp;
} }
@ -1453,8 +1464,18 @@ QByteArray QLocal8Bit::convertFromUnicode_sys(QStringView in, quint32 codePage,
qsizetype uclen = in.size(); qsizetype uclen = in.size();
Q_ASSERT(state); Q_ASSERT(state);
if (state->flags & QStringConverter::Flag::Stateless) // temporary // The Windows API has a *boolean* out-parameter that says if a replacement
// character was used, but it gives us no way to know _how many_ were used.
// Since we cannot simply scan the string for replacement characters
// (which is potentially a question mark, and thus a valid character),
// we simply do not track the number of invalid characters here.
// auto &invalidChars = state->invalidChars;
using Flag = QStringConverter::Flag;
if (state->flags & Flag::Stateless) { // temporary
Q_ASSERT(state->remainingChars == 0);
state = nullptr; state = nullptr;
}
if (!ch) if (!ch)
return QByteArray(); return QByteArray();