diff --git a/.appveyor.yml b/.appveyor.yml index ea8c87c..3a8d78f 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -24,7 +24,7 @@ before_build: build: project: C:\%arch%\Textractor.sln - parallel: true + parallel: false verbosity: normal after_build: diff --git a/GUI/host/exception.cpp b/GUI/host/exception.cpp index 33880db..a838f3e 100644 --- a/GUI/host/exception.cpp +++ b/GUI/host/exception.cpp @@ -21,12 +21,11 @@ namespace __declspec(noreturn) void Terminate() { - CreateThread(nullptr, 0, [](void* lastError) -> DWORD + WaitForSingleObject(CreateThread(nullptr, 0, [](void* lastError) -> DWORD { MessageBoxW(NULL, (wchar_t*)lastError, L"Textractor ERROR", MB_ICONERROR); // might fail to display if called in main thread and exception was in main event loop abort(); - }, lastError.data(), 0, nullptr); - Sleep(MAXDWORD); + }, lastError.data(), 0, nullptr), INFINITE); } LONG WINAPI ExceptionLogger(EXCEPTION_POINTERS* exception) diff --git a/GUI/mainwindow.cpp b/GUI/mainwindow.cpp index 0f31732..dd9eaa6 100644 --- a/GUI/mainwindow.cpp +++ b/GUI/mainwindow.cpp @@ -613,10 +613,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) } ui.processLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding)); - connect(ui.processCombo, qOverload(&QComboBox::currentIndexChanged), [](QString process) - { - selectedProcessId = ui.processCombo->currentText().split(":")[0].toULong(nullptr, 16); - }); + connect(ui.processCombo, qOverload(&QComboBox::currentIndexChanged), [] { selectedProcessId = ui.processCombo->currentText().split(":")[0].toULong(nullptr, 16); }); connect(ui.ttCombo, qOverload(&QComboBox::activated), this, ViewThread); connect(ui.textOutput, &QPlainTextEdit::selectionChanged, this, CopyUnlessMouseDown); connect(ui.textOutput, &QPlainTextEdit::customContextMenuRequested, this, OutputContextMenu); diff --git a/deploy.ps1 b/deploy.ps1 index 4f37191..9ddd9e1 100644 --- a/deploy.ps1 +++ b/deploy.ps1 @@ -62,9 +62,9 @@ foreach ($language in @{ copy -Force -Recurse -Verbose -Destination "$folder/$arch/$extension.xdll" -Path "Release_$arch/$extension.dll"; } } + &"C:\Program Files (x86)\Windows Kits\10\App Certification Kit\signtool.exe" sign /a /v /t "http://timestamp.digicert.com" /fd SHA256 @(dir "$folder\**\*"); } -&"C:\Program Files (x86)\Windows Kits\10\App Certification Kit\signtool.exe" sign /a /v /t "http://timestamp.digicert.com" /fd SHA256 @(dir "Textractor-*-$version\**\*"); rm -Force -Recurse -Verbose "Runtime"; mkdir -Force -Verbose "Runtime"; diff --git a/extensions/network.h b/extensions/network.h index 5a0db8c..2e21650 100644 --- a/extensions/network.h +++ b/extensions/network.h @@ -116,7 +116,7 @@ namespace JSON ch = text[i + 1]; if (ch == 'u' && isxdigit(text[i + 2]) && isxdigit(text[i + 3]) && isxdigit(text[i + 4]) && isxdigit(text[i + 5])) { - char charCode[] = { text[i + 2], text[i + 3], text[i + 4], text[i + 5], 0 }; + char charCode[] = { (char)text[i + 2], (char)text[i + 3], (char)text[i + 4], (char)text[i + 5], 0 }; unescaped += UTF::FromCodepoint(strtoul(charCode, nullptr, 16)); i += 5; continue;