diff options
Diffstat (limited to 'src/corelib/kernel/qsystemerror.cpp')
| -rw-r--r-- | src/corelib/kernel/qsystemerror.cpp | 79 |
1 files changed, 30 insertions, 49 deletions
diff --git a/src/corelib/kernel/qsystemerror.cpp b/src/corelib/kernel/qsystemerror.cpp index 6a250f5f3a..428ce62984 100644 --- a/src/corelib/kernel/qsystemerror.cpp +++ b/src/corelib/kernel/qsystemerror.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include <qglobal.h> #include "qsystemerror_p.h" @@ -45,10 +9,16 @@ #endif #ifdef Q_OS_WIN # include <qt_windows.h> +# include <comdef.h> +#endif +#ifndef QT_BOOTSTRAPPED +# include <qcoreapplication.h> #endif QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + #if !defined(Q_OS_WIN) && QT_CONFIG(thread) && !defined(Q_OS_INTEGRITY) && !defined(Q_OS_QNX) && \ defined(_POSIX_THREAD_SAFE_FUNCTIONS) && _POSIX_VERSION >= 200112L namespace { @@ -61,11 +31,11 @@ namespace { // version in portable code. However, it's impossible to do that if // _GNU_SOURCE is defined so we use C++ overloading to decide what to do // depending on the return type - static inline Q_DECL_UNUSED QString fromstrerror_helper(int, const QByteArray &buf) + [[maybe_unused]] static inline QString fromstrerror_helper(int, const QByteArray &buf) { return QString::fromLocal8Bit(buf); } - static inline Q_DECL_UNUSED QString fromstrerror_helper(const char *str, const QByteArray &) + [[maybe_unused]] static inline QString fromstrerror_helper(const char *str, const QByteArray &) { return QString::fromLocal8Bit(str); } @@ -76,8 +46,8 @@ namespace { static QString windowsErrorString(int errorCode) { QString ret; - wchar_t *string = 0; - FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM, + wchar_t *string = nullptr; + FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM|FORMAT_MESSAGE_IGNORE_INSERTS, NULL, errorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), @@ -89,11 +59,11 @@ static QString windowsErrorString(int errorCode) if (ret.isEmpty() && errorCode == ERROR_MOD_NOT_FOUND) ret = QString::fromLatin1("The specified module could not be found."); - if (ret.endsWith(QLatin1String("\r\n"))) + if (ret.endsWith("\r\n"_L1)) ret.chop(2); if (ret.isEmpty()) ret = QString::fromLatin1("Unknown error 0x%1.") - .arg(unsigned(errorCode), 8, 16, QLatin1Char('0')); + .arg(unsigned(errorCode), 8, 16, '0'_L1); return ret; } #endif @@ -127,18 +97,20 @@ static QString standardLibraryErrorString(int errorCode) break; } } if (s) { - // ######## this breaks moc build currently - // ret = QCoreApplication::translate("QIODevice", s); +#ifndef QT_BOOTSTRAPPED + ret = QCoreApplication::translate("QIODevice", s); +#else ret = QString::fromLatin1(s); +#endif } return ret.trimmed(); } QString QSystemError::string(ErrorScope errorScope, int errorCode) { - switch(errorScope) { + switch (errorScope) { case NativeError: -#if defined (Q_OS_WIN) +#if defined(Q_OS_WIN) return windowsErrorString(errorCode); #endif // else unix: native and standard library are the same case StandardLibraryError: @@ -147,7 +119,7 @@ QString QSystemError::string(ErrorScope errorScope, int errorCode) qWarning("invalid error scope"); Q_FALLTHROUGH(); case NoError: - return QLatin1String("No error"); + return u"No error"_s; } } @@ -162,6 +134,15 @@ QString QSystemError::windowsString(int errorCode) return windowsErrorString(errorCode == -1 ? GetLastError() : errorCode); } +QString QSystemError::windowsComString(HRESULT hr) +{ + const _com_error comError(hr); + QString result = "COM error 0x"_L1 + QString::number(ulong(hr), 16); + if (const wchar_t *msg = comError.ErrorMessage()) + result += ": "_L1 + QString::fromWCharArray(msg); + return result; +} + QString qt_error_string(int code) { return windowsErrorString(code == -1 ? GetLastError() : code); |