chenx221/Textractor_test
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

small fixes

Browse Source
This commit is contained in:
Akash Mozumdar 2021-02-21 14:15:59 -07:00
parent ad83eb290a
commit bf97055155
5 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.appveyor.yml
View File

@ -24,7 +24,7 @@ before_build:
build: build:
project: C:\%arch%\Textractor.sln project: C:\%arch%\Textractor.sln
parallel: true parallel: false
verbosity: normal verbosity: normal
after_build: after_build:

5
GUI/host/exception.cpp
View File

@ -21,12 +21,11 @@ namespace
__declspec(noreturn) void Terminate() __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 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(); abort();
}, lastError.data(), 0, nullptr); }, lastError.data(), 0, nullptr), INFINITE);
Sleep(MAXDWORD);
} }
LONG WINAPI ExceptionLogger(EXCEPTION_POINTERS* exception) LONG WINAPI ExceptionLogger(EXCEPTION_POINTERS* exception)

5
GUI/mainwindow.cpp
View File

@ -613,10 +613,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
} }
ui.processLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding)); ui.processLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding));
connect(ui.processCombo, qOverload<const QString&>(&QComboBox::currentIndexChanged), [](QString process) connect(ui.processCombo, qOverload<int>(&QComboBox::currentIndexChanged), [] { selectedProcessId = ui.processCombo->currentText().split(":")[0].toULong(nullptr, 16); });
{
selectedProcessId = ui.processCombo->currentText().split(":")[0].toULong(nullptr, 16);
});
connect(ui.ttCombo, qOverload<int>(&QComboBox::activated), this, ViewThread); connect(ui.ttCombo, qOverload<int>(&QComboBox::activated), this, ViewThread);
connect(ui.textOutput, &QPlainTextEdit::selectionChanged, this, CopyUnlessMouseDown); connect(ui.textOutput, &QPlainTextEdit::selectionChanged, this, CopyUnlessMouseDown);
connect(ui.textOutput, &QPlainTextEdit::customContextMenuRequested, this, OutputContextMenu); connect(ui.textOutput, &QPlainTextEdit::customContextMenuRequested, this, OutputContextMenu);

2
deploy.ps1
View File

@ -62,9 +62,9 @@ foreach ($language in @{
copy -Force -Recurse -Verbose -Destination "$folder/$arch/$extension.xdll" -Path "Release_$arch/$extension.dll"; 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"; rm -Force -Recurse -Verbose "Runtime";
mkdir -Force -Verbose "Runtime"; mkdir -Force -Verbose "Runtime";

2
extensions/network.h
View File

@ -116,7 +116,7 @@ namespace JSON
ch = text[i + 1]; ch = text[i + 1];
if (ch == 'u' && isxdigit(text[i + 2]) && isxdigit(text[i + 3]) && isxdigit(text[i + 4]) && isxdigit(text[i + 5])) 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<C>::FromCodepoint(strtoul(charCode, nullptr, 16)); unescaped += UTF<C>::FromCodepoint(strtoul(charCode, nullptr, 16));
i += 5; i += 5;
continue; continue;