From 66bffbabf37c9bf60b2cf3668f33972864efb0fd Mon Sep 17 00:00:00 2001 From: albertony <12441419+albertony@users.noreply.github.com> Date: Wed, 9 Dec 2020 23:36:34 +0100 Subject: [PATCH] Use ansi codepage for internal multibyte strings on windows (fixes #976, fixes #974, fixes #444) --- src/gui/src/CommandProcess.cpp | 19 +++---- src/gui/src/Fingerprint.cpp | 4 +- src/gui/src/IpcClient.cpp | 8 ++- src/gui/src/MainWindow.cpp | 3 +- src/gui/src/SslCertificate.cpp | 45 +++++++--------- src/gui/src/SslCertificate.h | 8 +-- src/lib/barrier/win32/DaemonApp.cpp | 3 +- src/lib/common/win32/DataDirectories.cpp | 28 ++-------- src/lib/common/win32/KnownFolderPaths.cpp | 63 +++++++++++++++++++++++ src/lib/common/win32/KnownFolderPaths.h | 24 +++++++++ src/lib/ipc/IpcLogOutputter.cpp | 3 +- src/lib/platform/MSWindowsScreen.cpp | 12 ++--- 12 files changed, 139 insertions(+), 81 deletions(-) create mode 100644 src/lib/common/win32/KnownFolderPaths.cpp create mode 100644 src/lib/common/win32/KnownFolderPaths.h diff --git a/src/gui/src/CommandProcess.cpp b/src/gui/src/CommandProcess.cpp index c85e847bf37..ca053e54a08 100644 --- a/src/gui/src/CommandProcess.cpp +++ b/src/gui/src/CommandProcess.cpp @@ -30,20 +30,20 @@ CommandProcess::CommandProcess(QString cmd, QStringList arguments, QString input QString CommandProcess::run() { QProcess process; + QString standardOutput, standardError; process.setReadChannel(QProcess::StandardOutput); process.start(m_Command, m_Arguments); bool success = process.waitForStarted(); - QString output, error; if (success) { if (!m_Input.isEmpty()) { - process.write(m_Input.toStdString().c_str()); + process.write(m_Input.toLocal8Bit()); } if (process.waitForFinished()) { - output = process.readAllStandardOutput().trimmed(); - error = process.readAllStandardError().trimmed(); + standardOutput = QString::fromLocal8Bit(process.readAllStandardOutput().trimmed()); + standardError = QString::fromLocal8Bit(process.readAllStandardError().trimmed()); } } @@ -51,13 +51,14 @@ QString CommandProcess::run() if (!error.isEmpty() || !success || code != 0) { throw std::runtime_error( - QString("Code: %1\nError: %2") - .arg(process.exitCode()) - .arg(error.isEmpty() ? "Unknown" : error) - .toStdString()); + std::string( + QString("Code: %1\nError: %2") + .arg(process.exitCode()) + .arg(standardError.isEmpty() ? "Unknown" : standardError) + .toLocal8Bit().constData())); } emit finished(); - return output; + return standardOutput; } diff --git a/src/gui/src/Fingerprint.cpp b/src/gui/src/Fingerprint.cpp index 24c8a1a35b8..177a4b737f2 100644 --- a/src/gui/src/Fingerprint.cpp +++ b/src/gui/src/Fingerprint.cpp @@ -17,8 +17,6 @@ #include "Fingerprint.h" -#include "common/DataDirectories.h" - #include #include @@ -125,7 +123,7 @@ void Fingerprint::persistDirectory() QString Fingerprint::directoryPath() { - auto profileDir = QString::fromStdString(DataDirectories::profile()); + auto profilePath = QString::fromLocal8Bit(DataDirectories::profile()); return QString("%1/%2") .arg(profileDir) diff --git a/src/gui/src/IpcClient.cpp b/src/gui/src/IpcClient.cpp index 1b0e147adaf..b8b1bcb1df9 100644 --- a/src/gui/src/IpcClient.cpp +++ b/src/gui/src/IpcClient.cpp @@ -104,14 +104,12 @@ void IpcClient::sendCommand(const QString& command, ElevateMode const elevate) stream.writeRawData(kIpcMsgCommand, 4); - std::string stdStringCommand = command.toStdString(); - const char* charCommand = stdStringCommand.c_str(); - int length = (int)strlen(charCommand); + QByteArray utf8Command = command.toUtf8(); char lenBuf[4]; - intToBytes(length, lenBuf, 4); + intToBytes(utf8Command.size(), lenBuf, 4); stream.writeRawData(lenBuf, 4); - stream.writeRawData(charCommand, length); + stream.writeRawData(utf8Command.constData(), utf8Command.size()); char elevateBuf[1]; // Refer to enum ElevateMode documentation for why this flag is mapped this way diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp index 9ca104bb25e..aff54627277 100644 --- a/src/gui/src/MainWindow.cpp +++ b/src/gui/src/MainWindow.cpp @@ -526,7 +526,8 @@ void MainWindow::startBarrier() // launched the process (e.g. when launched with elevation). setting the // profile dir on launch ensures it uses the same profile dir is used // no matter how its relaunched. - args << "--profile-dir" << QString::fromStdString("\"" + DataDirectories::profile() + "\""); + auto profilePath = QString::fromLocal8Bit(DataDirectories::profile()); + args << "--profile-dir \"" << profilePath << "\""; #endif if ((barrierType() == barrierClient && !clientArgs(args, app)) diff --git a/src/gui/src/SslCertificate.cpp b/src/gui/src/SslCertificate.cpp index 08863ae6e7b..20ae651808e 100644 --- a/src/gui/src/SslCertificate.cpp +++ b/src/gui/src/SslCertificate.cpp @@ -43,13 +43,13 @@ static const char kConfigFile[] = "barrier.conf"; SslCertificate::SslCertificate(QObject *parent) : QObject(parent) { - m_ProfileDir = DataDirectories::profile(); - if (m_ProfileDir.empty()) { + m_ProfileDir = QString::fromLocal8Bit(DataDirectories::profile()); + if (m_ProfileDir.isEmpty()) { emit error(tr("Failed to get profile directory.")); } } -std::pair SslCertificate::runTool(const QStringList& args) +std::pair SslCertificate::runTool(const QStringList& args) { QString program; #if defined(Q_OS_WIN) @@ -68,17 +68,15 @@ std::pair SslCertificate::runTool(const QStringList& args) #endif QProcess process; + QString standardOutput, standardError; process.setEnvironment(environment); process.start(program, args); - bool success = process.waitForStarted(); - std::string output; - QString standardError; if (success && process.waitForFinished()) { - output = process.readAllStandardOutput().trimmed().toStdString(); - standardError = process.readAllStandardError().trimmed(); + standardOutput = QString::fromLocal8Bit(process.readAllStandardOutput().trimmed()); + standardError = QString::fromLocal8Bit(process.readAllStandardError().trimmed()); } int code = process.exitCode(); @@ -89,15 +87,15 @@ std::pair SslCertificate::runTool(const QStringList& args) .arg(program) .arg(process.exitCode()) .arg(standardError.isEmpty() ? "Unknown" : standardError)); - return {false, output}; + return {false, standardOutput}; } - return {true, output}; + return {true, standardOutput}; } void SslCertificate::generateCertificate() { - auto filename = QString::fromStdString(getCertificatePath()); + auto filename = getCertificatePath(); QFile file(filename); if (!file.exists() || !isCertificateValid(filename)) { @@ -122,7 +120,7 @@ void SslCertificate::generateCertificate() arguments.append("-newkey"); arguments.append("rsa:2048"); - QDir sslDir(QString::fromStdString(getCertificateDirectory())); + QDir sslDir(getCertificateDirectory()); if (!sslDir.exists()) { sslDir.mkpath("."); } @@ -159,20 +157,17 @@ void SslCertificate::generateFingerprint(const QString& certificateFilename) auto ret = runTool(arguments); bool success = ret.first; - std::string output = ret.second; - if (!success) { return; } // find the fingerprint from the tool output - auto i = output.find_first_of('='); - if (i != std::string::npos) { - i++; - auto fingerprint = output.substr( - i, output.size() - i); + QString fingerprint = ret.second; + auto i = fingerprint.indexOf('='); + if (i != -1) { + fingerprint.remove(0, i+1); - Fingerprint::local().trust(QString::fromStdString(fingerprint), false); + Fingerprint::local().trust(fingerprint, false); emit info(tr("SSL fingerprint generated.")); } else { @@ -180,14 +175,14 @@ void SslCertificate::generateFingerprint(const QString& certificateFilename) } } -std::string SslCertificate::getCertificatePath() +QString SslCertificate::getCertificatePath() { - return getCertificateDirectory() + QDir::separator().toLatin1() + kCertificateFilename; + return getCertificateDirectory() + QDir::separator() + kCertificateFilename; } -std::string SslCertificate::getCertificateDirectory() +QString SslCertificate::getCertificateDirectory() { - return m_ProfileDir + QDir::separator().toLatin1() + kSslDir; + return m_ProfileDir + QDir::separator() + kSslDir; } bool SslCertificate::isCertificateValid(const QString& path) @@ -198,7 +193,7 @@ bool SslCertificate::isCertificateValid(const QString& path) BIO* bio = BIO_new(BIO_s_file()); - auto ret = BIO_read_filename(bio, path.toStdString().c_str()); + auto ret = BIO_read_filename(bio, path.toLocal8Bit().constData()); if (!ret) { emit info(tr("Could not read from default certificate file.")); BIO_free_all(bio); diff --git a/src/gui/src/SslCertificate.h b/src/gui/src/SslCertificate.h index b29a6b167ae..3ff3ff5cb6f 100644 --- a/src/gui/src/SslCertificate.h +++ b/src/gui/src/SslCertificate.h @@ -36,13 +36,13 @@ public slots: void generateFinished(); private: - std::pair runTool(const QStringList& args); + std::pair runTool(const QStringList& args); void generateFingerprint(const QString& certificateFilename); - std::string getCertificatePath(); - std::string getCertificateDirectory(); + QString getCertificatePath(); + QString getCertificateDirectory(); bool isCertificateValid(const QString& path); private: - std::string m_ProfileDir; + QString m_ProfileDir; }; diff --git a/src/lib/barrier/win32/DaemonApp.cpp b/src/lib/barrier/win32/DaemonApp.cpp index 88e6b4ef0af..f8cf591afda 100644 --- a/src/lib/barrier/win32/DaemonApp.cpp +++ b/src/lib/barrier/win32/DaemonApp.cpp @@ -34,6 +34,7 @@ #include "base/log_outputters.h" #include "base/Log.h" #include "common/DataDirectories.h" +#include "base/Unicode.h" #include "arch/win32/ArchMiscWindows.h" #include "arch/win32/XArchWindows.h" @@ -257,7 +258,7 @@ DaemonApp::handleIpcMessage(const Event& e, void*) switch (m->type()) { case kIpcCommand: { IpcCommandMessage* cm = static_cast(m); - String command = cm->command(); + String command = Unicode::UTF8ToText(cm->command()); // if empty quotes, clear. if (command == "\"\"") { diff --git a/src/lib/common/win32/DataDirectories.cpp b/src/lib/common/win32/DataDirectories.cpp index 15cb64e1377..3e86c59b8e8 100644 --- a/src/lib/common/win32/DataDirectories.cpp +++ b/src/lib/common/win32/DataDirectories.cpp @@ -16,34 +16,12 @@ */ #include "../DataDirectories.h" - -#include - -std::string unicode_to_mb(const WCHAR* utfStr) -{ - int utfLength = lstrlenW(utfStr); - int mbLength = WideCharToMultiByte(CP_UTF8, 0, utfStr, utfLength, NULL, 0, NULL, NULL); - std::string mbStr(mbLength, 0); - WideCharToMultiByte(CP_UTF8, 0, utfStr, utfLength, &mbStr[0], mbLength, NULL, NULL); - return mbStr; -} - -std::string known_folder_path(const KNOWNFOLDERID& id) -{ - std::string path; - WCHAR* buffer; - HRESULT result = SHGetKnownFolderPath(id, 0, NULL, &buffer); - if (result == S_OK) { - path = unicode_to_mb(buffer); - CoTaskMemFree(buffer); - } - return path; -} +#include "KnownFolderPaths.h" const std::string& DataDirectories::profile() { if (_profile.empty()) - _profile = known_folder_path(FOLDERID_LocalAppData) + "\\Barrier"; + _profile = localAppDataPath() + "\\Barrier"; return _profile; } const std::string& DataDirectories::profile(const std::string& path) @@ -55,7 +33,7 @@ const std::string& DataDirectories::profile(const std::string& path) const std::string& DataDirectories::global() { if (_global.empty()) - _global = known_folder_path(FOLDERID_ProgramData) + "\\Barrier"; + _global = programDataPath() + "\\Barrier"; return _global; } const std::string& DataDirectories::global(const std::string& path) diff --git a/src/lib/common/win32/KnownFolderPaths.cpp b/src/lib/common/win32/KnownFolderPaths.cpp new file mode 100644 index 00000000000..23ccc84a27e --- /dev/null +++ b/src/lib/common/win32/KnownFolderPaths.cpp @@ -0,0 +1,63 @@ +/* +* barrier -- mouse and keyboard sharing utility +* Copyright (C) 2018 Debauchee Open Source Group +* +* This package is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* found in the file LICENSE that should have accompanied this file. +* +* This package is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +*/ + +#include "KnownFolderPaths.h" + +#define WIN32_LEAN_AND_MEAN +#include +#include + +static std::string wide_to_mb(const wchar_t* source, int length) +{ + int ansiLength = WideCharToMultiByte(CP_ACP, 0, source, length, NULL, 0, NULL, NULL); + if (ansiLength > 0) { + std::string ansiString(ansiLength, 0); + ansiLength = WideCharToMultiByte(CP_ACP, 0, source, length, &ansiString[0], ansiLength, NULL, NULL); + if (ansiLength > 0) { + return ansiString; + } + } + return {}; +} + +static std::string known_folder_path(const KNOWNFOLDERID& id) +{ + std::string path; + WCHAR* buffer; + HRESULT result = SHGetKnownFolderPath(id, 0, NULL, &buffer); + if (result == S_OK) { + auto length = lstrlenW(buffer); + path = wide_to_mb(buffer, length); + CoTaskMemFree(buffer); + } + return path; +} + +std::string desktopPath() +{ + return known_folder_path(FOLDERID_Desktop); +} + +std::string localAppDataPath() +{ + return known_folder_path(FOLDERID_LocalAppData); +} + +std::string programDataPath() +{ + return known_folder_path(FOLDERID_ProgramData); +} diff --git a/src/lib/common/win32/KnownFolderPaths.h b/src/lib/common/win32/KnownFolderPaths.h new file mode 100644 index 00000000000..81b650ec57c --- /dev/null +++ b/src/lib/common/win32/KnownFolderPaths.h @@ -0,0 +1,24 @@ +/* +* barrier -- mouse and keyboard sharing utility +* Copyright (C) 2018 Debauchee Open Source Group +* +* This package is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* found in the file LICENSE that should have accompanied this file. +* +* This package is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +*/ + +#pragma once + +#include + +std::string desktopPath(); +std::string localAppDataPath(); +std::string programDataPath(); diff --git a/src/lib/ipc/IpcLogOutputter.cpp b/src/lib/ipc/IpcLogOutputter.cpp index 223f52f72ad..c895dc126a2 100644 --- a/src/lib/ipc/IpcLogOutputter.cpp +++ b/src/lib/ipc/IpcLogOutputter.cpp @@ -29,6 +29,7 @@ #include "base/EventQueue.h" #include "base/TMethodEventJob.h" #include "base/TMethodJob.h" +#include "base/Unicode.h" enum EIpcLogOutputter { kBufferMaxSize = 1000, @@ -196,7 +197,7 @@ IpcLogOutputter::sendBuffer() return; } - IpcLogLineMessage message(getChunk(kMaxSendLines)); + IpcLogLineMessage message(Unicode::textToUTF8(getChunk(kMaxSendLines))); m_sending = true; m_ipcServer.send(message, kIpcClientGui); m_sending = false; diff --git a/src/lib/platform/MSWindowsScreen.cpp b/src/lib/platform/MSWindowsScreen.cpp index fd494c9878b..352368acc60 100644 --- a/src/lib/platform/MSWindowsScreen.cpp +++ b/src/lib/platform/MSWindowsScreen.cpp @@ -41,9 +41,9 @@ #include "base/IEventQueue.h" #include "base/TMethodEventJob.h" #include "base/TMethodJob.h" +#include "common/win32/KnownFolderPaths.h" #include -#include #include #include @@ -1916,14 +1916,12 @@ const std::string& MSWindowsScreen::getDropTarget() const { if (m_dropTargetPath.empty()) { - // SHGetFolderPath is deprecated in vista, but use it for xp support. - char desktopPath[MAX_PATH]; - if (SUCCEEDED(SHGetFolderPath(NULL, CSIDL_DESKTOP, NULL, 0, desktopPath))) { - m_dropTargetPath = std::string(desktopPath); - LOG((CLOG_INFO "using desktop for drop target: %s", m_dropTargetPath.c_str())); + m_dropTargetPath = desktopPath(); + if (!m_dropTargetPath.empty()) { + LOG((CLOG_DEBUG "using desktop for drop target: %s", m_dropTargetPath.c_str())); } else { - LOG((CLOG_ERR "failed to get desktop path, no drop target available, error=%d", GetLastError())); + LOG((CLOG_ERR "failed to get desktop path, no drop target available")); } } return m_dropTargetPath;