From 0e1aef15f086cfbd4949d79d8414be899d1a9954 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Fri, 20 Oct 2023 15:46:13 +0200 Subject: [PATCH] QLocal8Bit::convertFromUnicode[win]: Drop UsedDefaultChar argument We don't use the value, and the docs[0] say that we get the best performance if we don't pass the argument. [0] https://learn.microsoft.com/en-us/windows/win32/api/stringapiset/nf-stringapiset-widechartomultibyte#remarks See table Pick-to: 6.5 Task-number: QTBUG-118185 Task-number: QTBUG-105105 Change-Id: I3eb5e023a936fe3def5169e3fb492a62708bbf44 Reviewed-by: Thiago Macieira Reviewed-by: Edward Welbourne (cherry picked from commit 36a6522b48dd74305e1a57a520651f34f2d91ee4) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/text/qstringconverter.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/corelib/text/qstringconverter.cpp b/src/corelib/text/qstringconverter.cpp index ca95c6cab43..137db8662c5 100644 --- a/src/corelib/text/qstringconverter.cpp +++ b/src/corelib/text/qstringconverter.cpp @@ -1395,15 +1395,15 @@ QByteArray QLocal8Bit::convertFromUnicode_sys(QStringView in, quint32 codePage, return QByteArray(); if (uclen == 0) return QByteArray(""); - BOOL used_def; QByteArray mb(4096, 0); int len; - while (!(len = WideCharToMultiByte(codePage, 0, ch, uclen, mb.data(), mb.size() - 1, 0, - &used_def))) { + while (!(len = WideCharToMultiByte(codePage, 0, ch, uclen, mb.data(), mb.size() - 1, nullptr, + nullptr))) { int r = GetLastError(); if (r == ERROR_INSUFFICIENT_BUFFER) { - mb.resize(1+WideCharToMultiByte(codePage, 0, ch, uclen, 0, 0, 0, &used_def)); - // and try again... + mb.resize(1 + + WideCharToMultiByte(codePage, 0, ch, uclen, nullptr, 0, nullptr, nullptr)); + // and try again... } else { // Fail. Probably can't happen in fact (dwFlags is 0). #ifndef QT_NO_DEBUG