tiny fixes

This commit is contained in:
Akash Mozumdar 2020-02-11 23:34:03 -07:00
parent 6f01d46315
commit 666b0a49c0
4 changed files with 6 additions and 5 deletions

View File

@ -20,7 +20,7 @@ int main(int argc, char *argv[])
char buffer[1000] = {}; char buffer[1000] = {};
WinHttpReceiveResponse(request, NULL); WinHttpReceiveResponse(request, NULL);
WinHttpReadData(request, buffer, 1000, DUMMY); WinHttpReadData(request, buffer, 1000, DUMMY);
if (abs(strstr(buffer, "/tag/") - strstr(buffer, VERSION)) > 10) MESSAGE(UPDATE_AVAILABLE); if (abs(strstr(buffer, "/tag/") - strstr(buffer, VERSION)) > 10) TEXTRACTOR_MESSAGE(UPDATE_AVAILABLE);
} }
}).detach(); }).detach();

View File

@ -80,5 +80,5 @@ mkdir -Force -Verbose "Textractor";
copy -Force -Recurse -Verbose -Destination "Textractor" -Path @("Runtime/*", "Textractor--$version/*"); copy -Force -Recurse -Verbose -Destination "Textractor" -Path @("Runtime/*", "Textractor--$version/*");
cd .. cd ..
&"C:\Program Files (x86)\Inno Setup 6\iscc" -DVERSION="$version" installer.iss &"C:\Program Files (x86)\Inno Setup 6\iscc" -DVERSION="$version" installer.iss;
&"C:\Program Files (x86)\Windows Kits\10\App Certification Kit\signtool.exe" sign /a /v /t "http://timestamp.digicert.com" /fd SHA256 "Builds/Textractor-$version-Setup.exe"; &"C:\Program Files (x86)\Windows Kits\10\App Certification Kit\signtool.exe" sign /a /v /t "http://timestamp.digicert.com" /fd SHA256 "Builds/Textractor-$version-Setup.exe";

View File

@ -113,7 +113,8 @@ inline std::wstring FormatString(const wchar_t* format, const Args&... args)
} }
#pragma warning(pop) #pragma warning(pop)
#define MESSAGE(text) MessageBoxW(NULL, FormatArg(text), L"Textractor", MB_OK) template <typename... Args>
inline void TEXTRACTOR_MESSAGE(const wchar_t* format, const Args&... args) { MessageBoxW(NULL, FormatString(format, args...).c_str(), L"Textractor", MB_OK); }
#ifdef _DEBUG #ifdef _DEBUG
#define TEST(...) static auto _ = CreateThread(nullptr, 0, [](auto) { __VA_ARGS__; return 0UL; }, NULL, 0, nullptr); #define TEST(...) static auto _ = CreateThread(nullptr, 0, [](auto) { __VA_ARGS__; return 0UL; }, NULL, 0, nullptr);

View File

@ -232,10 +232,10 @@ void SearchForHooks(SearchParam spUser)
Sleep(1000); Sleep(1000);
for (auto addr : addresses) MH_RemoveHook((void*)addr); for (auto addr : addresses) MH_RemoveHook((void*)addr);
ConsoleOutput(HOOK_SEARCH_FINISHED, sp.maxRecords - recordsAvailable); ConsoleOutput(HOOK_SEARCH_FINISHED, sp.maxRecords - recordsAvailable);
for (int i = 0, j = 0; i < sp.maxRecords; ++i) for (int i = 0, results = 0; i < sp.maxRecords; ++i)
{ {
if (!records[i].address) continue; if (!records[i].address) continue;
if (++j % 100'000 == 0) ConsoleOutput("Textractor: %d results processed", j); if (++results % 100'000 == 0) ConsoleOutput("Textractor: %d results processed", results);
HookParam hp = {}; HookParam hp = {};
hp.offset = records[i].offset; hp.offset = records[i].offset;
hp.type = USING_UNICODE | USING_STRING; hp.type = USING_UNICODE | USING_STRING;