From ffff4f2eb9de4bd1d2b9296f7cc4911119bb4ebf Mon Sep 17 00:00:00 2001 From: Akash Mozumdar Date: Sat, 29 Feb 2020 17:51:09 -0700 Subject: [PATCH] tiny fixes --- GUI/host/hookcode.cpp | 2 +- GUI/mainwindow.cpp | 2 +- extensions/extrawindow.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/GUI/host/hookcode.cpp b/GUI/host/hookcode.cpp index 1bba481..603f111 100644 --- a/GUI/host/hookcode.cpp +++ b/GUI/host/hookcode.cpp @@ -259,7 +259,7 @@ namespace HCode += L'@' + HexString(hp.address); if (hp.type & MODULE_OFFSET) HCode += L':' + std::wstring(hp.module); - if (hp.type & FUNCTION_OFFSET) HCode += L':' + std::wstring(hp.function, hp.function + MAX_MODULE_SIZE); + if (hp.type & FUNCTION_OFFSET) HCode += L':' + StringToWideString(hp.function); return HCode; } diff --git a/GUI/mainwindow.cpp b/GUI/mainwindow.cpp index 0cb33a0..c6df9ed 100644 --- a/GUI/mainwindow.cpp +++ b/GUI/mainwindow.cpp @@ -435,7 +435,7 @@ void MainWindow::FindHooks() SearchParam sp = {}; sp.codepage = Host::defaultCodepage; bool searchForText = false, customSettings = false; - QRegularExpression filter(".", QRegularExpression::DotMatchesEverythingOption); + QRegularExpression filter(".", QRegularExpression::UseUnicodePropertiesOption | QRegularExpression::DotMatchesEverythingOption); QDialog dialog(this, Qt::WindowCloseButtonHint); QFormLayout layout(&dialog); diff --git a/extensions/extrawindow.cpp b/extensions/extrawindow.cpp index 546d211..2e58753 100644 --- a/extensions/extrawindow.cpp +++ b/extensions/extrawindow.cpp @@ -388,7 +388,7 @@ private: for (term = term.left(500); !term.isEmpty(); term.chop(1)) for (const auto& [rootTerm, definition, inflections] : LookupDefinitions(term, foundDefinitions)) definitions.push_back( - QStringLiteral("

%1 (%5/%6)

%2 %3

%4

").arg( + QStringLiteral("

%1 (%5/%6)

%2%3

%4

").arg( term, rootTerm.split("<<")[0], inflections.join(""),