Release v0.2.1: support remote input, safe updates and high-DPI windows
This commit is contained in:
+122
@@ -0,0 +1,122 @@
|
||||
#include "app.h"
|
||||
#include "ui_geometry.h"
|
||||
#include <commctrl.h>
|
||||
#include <iostream>
|
||||
namespace ks {
|
||||
struct InputRegressionAccess {
|
||||
static void setup(App &a) { a.hookBindings = {{Toggle,{MOD_CONTROL,VK_F12}}, {Case,{MOD_CONTROL|MOD_SHIFT,'U'}}}; }
|
||||
static void click() { MSLLHOOKSTRUCT m{}; m.flags=LLMHF_INJECTED; App::mouseProc(HC_ACTION,WM_LBUTTONDOWN,(LPARAM)&m); }
|
||||
};
|
||||
}
|
||||
int main(int argc, char **argv) {
|
||||
if (argc == 2 && std::string(argv[1]) == "--update-check") {
|
||||
try {
|
||||
auto result = ks::runUpdate(false, {});
|
||||
std::cout << "Live update check: " << ks::utf8(result.state) << " " << ks::utf8(result.version)
|
||||
<< " " << ks::utf8(result.error) << '\n';
|
||||
return result.state == L"current" || result.state == L"available" ? 0 : 1;
|
||||
} catch (const std::exception &e) { std::cerr << e.what() << '\n'; return 1; }
|
||||
}
|
||||
auto temp=std::filesystem::temp_directory_path()/(L"KSwitcher-input-tests-"+std::to_wstring(GetCurrentProcessId()));
|
||||
int checks=0;
|
||||
auto require=[&](bool ok,const char* text) { if(!ok) throw std::runtime_error(text); ++checks; };
|
||||
try {
|
||||
INITCOMMONCONTROLSEX controls{sizeof(controls),ICC_STANDARD_CLASSES|ICC_LISTVIEW_CLASSES};
|
||||
InitCommonControlsEx(&controls);
|
||||
{
|
||||
ks::App app(GetModuleHandleW(nullptr),true,temp);
|
||||
ks::InputRegressionAccess::setup(app);
|
||||
// Message-only window: no hooks, synthetic input, clipboard changes or visible editor.
|
||||
app.window=CreateWindowExW(0,L"STATIC",L"Input tests",0,0,0,0,0,HWND_MESSAGE,nullptr,nullptr,nullptr);
|
||||
require(app.window!=nullptr,"message-only test window");
|
||||
auto event=[](DWORD vk,DWORD scan=0,bool own=false) {
|
||||
KBDLLHOOKSTRUCT k{}; k.vkCode=vk; k.scanCode=scan;
|
||||
k.flags=LLKHF_INJECTED|LLKHF_LOWER_IL_INJECTED;
|
||||
k.dwExtraInfo=own?ks::inputMarker():123; return k;
|
||||
};
|
||||
auto commands=[&] { MSG m{}; int n=0; while(PeekMessageW(&m,app.window,WM_HOTKEY,WM_HOTKEY,PM_REMOVE)) ++n; return n; };
|
||||
auto f12=event(VK_F12);
|
||||
require(!app.handleKeyboard(event(VK_LCONTROL),true,0),"remote modifier passes through");
|
||||
require(app.handleKeyboard(f12,true,MOD_CONTROL),"remote Ctrl+F12 handled");
|
||||
require(app.handleKeyboard(f12,true,MOD_CONTROL),"remote repeat suppressed");
|
||||
require(commands()==1,"one command per press");
|
||||
require(!app.handleKeyboard(event(VK_F12,0,true),false,0),"own key-up bypasses latch");
|
||||
require(app.handleKeyboard(f12,true,MOD_CONTROL),"own key-up leaves remote latch intact");
|
||||
require(commands()==0,"no repeat after own key-up");
|
||||
require(app.handleKeyboard(f12,false,0),"remote release consumed after modifier release");
|
||||
require(app.handleKeyboard(f12,true,MOD_CONTROL),"second remote press handled");
|
||||
require(commands()==1,"second remote press dispatches");
|
||||
app.handleKeyboard(f12,false,0);
|
||||
require(app.handleKeyboard(event('U'),true,MOD_CONTROL|MOD_SHIFT),"combined modifiers");
|
||||
app.handleKeyboard(event('U'),false,0);
|
||||
require(!app.handleKeyboard(f12,true,MOD_CONTROL|MOD_SHIFT),"exact modifiers only");
|
||||
app.resetInput();
|
||||
app.handleKeyboard(event('A',0x1e),true,0);
|
||||
require(app.run.keys==L"a"||app.run.keys==L"A","external scan recorded with current CapsLock");
|
||||
auto keys=app.run.keys; auto version=app.inputVersion.load();
|
||||
for(WORD key:{WORD('V'),WORD(VK_SHIFT),WORD(VK_LEFT),WORD(VK_F15),WORD(0xE8)})
|
||||
for(bool up:{false,true}) {
|
||||
auto i=ks::keyboardInput(key,up?KEYEVENTF_KEYUP:0);
|
||||
require(i.ki.dwExtraInfo==ks::inputMarker(),"all generated events tagged");
|
||||
require(!app.handleKeyboard(event(key,0,true),!up,MOD_CONTROL),"own events bypass handling");
|
||||
}
|
||||
require(app.run.keys==keys&&app.inputVersion==version,"own input preserves transaction and run");
|
||||
app.handleKeyboard(event(VK_BACK),true,0);
|
||||
require(app.run.keys.empty(),"remote backspace recorded");
|
||||
app.handleKeyboard(event('B'),true,MOD_SHIFT);
|
||||
require(!app.run.keys.empty(),"VK-only remote input resolves scan code");
|
||||
require(app.inputVersion>version,"remote input invalidates pending transaction");
|
||||
app.handleKeyboard(event(VK_PACKET,0x1e),true,0);
|
||||
require(app.run.keys.empty(),"Unicode packet is not a physical scan code");
|
||||
app.handleKeyboard(event('A',0x1e),true,0);
|
||||
ks::InputRegressionAccess::click();
|
||||
require(app.run.keys.empty(),"remote mouse resets recorded input");
|
||||
auto physical=f12; physical.flags=0; physical.dwExtraInfo=ks::inputMarker();
|
||||
require(app.handleKeyboard(physical,true,MOD_CONTROL),"physical hotkey still works");
|
||||
app.handleKeyboard(physical,false,0);
|
||||
auto fitted=ks::fitWindowRect({-2500,-800,-500,1200},{0,0,1200,800});
|
||||
require(fitted.left==0&&fitted.top==0&&fitted.right==1200&&fitted.bottom==800,"oversized disconnected-monitor window fits work area");
|
||||
fitted=ks::fitWindowRect({2000,2000,2600,2400},{-1920,0,0,1080});
|
||||
require(fitted.left==-600&&fitted.top==680&&fitted.right==0,"negative-coordinate monitor supported");
|
||||
ks::showSettings(app,false);
|
||||
auto settings=app.settingsWindow;
|
||||
require(settings&&!IsWindowVisible(settings),"settings layout tested without changing user focus");
|
||||
RECT frame{},client{},cancel{};
|
||||
GetWindowRect(settings,&frame);
|
||||
MONITORINFO monitor{sizeof(monitor)};
|
||||
GetMonitorInfoW(MonitorFromWindow(settings,MONITOR_DEFAULTTONEAREST),&monitor);
|
||||
require(frame.left>=monitor.rcWork.left&&frame.top>=monitor.rcWork.top&&frame.right<=monitor.rcWork.right&&frame.bottom<=monitor.rcWork.bottom,"initial settings frame fits active work area");
|
||||
UINT dpi=GetDpiForWindow(settings);
|
||||
std::cout << "Hidden Settings layout checked at " << dpi << " DPI\n";
|
||||
GetWindowRect(GetDlgItem(settings,IDCANCEL),&cancel);
|
||||
require(cancel.right-cancel.left==MulDiv(100,dpi,96),"controls use actual window DPI");
|
||||
SetWindowPos(settings,nullptr,0,0,480,360,SWP_NOMOVE|SWP_NOZORDER|SWP_NOACTIVATE);
|
||||
SCROLLINFO scroll{sizeof(scroll),SIF_ALL};
|
||||
GetScrollInfo(settings,SB_VERT,&scroll);
|
||||
require(scroll.nMax+1>(int)scroll.nPage,"small settings window has vertical scrolling");
|
||||
GetScrollInfo(settings,SB_HORZ,&scroll);
|
||||
require(scroll.nMax+1>(int)scroll.nPage,"small settings window has horizontal scrolling");
|
||||
SendMessageW(settings,WM_VSCROLL,SB_BOTTOM,0);
|
||||
SendMessageW(settings,WM_HSCROLL,SB_RIGHT,0);
|
||||
GetClientRect(settings,&client);
|
||||
GetWindowRect(GetDlgItem(settings,IDCANCEL),&cancel);
|
||||
MapWindowPoints(nullptr,settings,(POINT*)&cancel,2);
|
||||
require(cancel.left>=0&&cancel.top>=0&&cancel.right<=client.right&&cancel.bottom<=client.bottom,"bottom actions reachable by scrolling");
|
||||
SendMessageW(settings,WM_VSCROLL,SB_TOP,0);
|
||||
SendMessageW(settings,WM_HSCROLL,SB_LEFT,0);
|
||||
SendMessageW(GetDlgItem(settings,IDCANCEL),WM_SETFOCUS,0,0);
|
||||
GetWindowRect(GetDlgItem(settings,IDCANCEL),&cancel);
|
||||
MapWindowPoints(nullptr,settings,(POINT*)&cancel,2);
|
||||
require(cancel.left>=0&&cancel.top>=0&&cancel.right<=client.right&&cancel.bottom<=client.bottom,"keyboard focus reveals off-screen action");
|
||||
SetWindowPos(settings,nullptr,-20000,-20000,0,0,SWP_NOSIZE|SWP_NOZORDER|SWP_NOACTIVATE);
|
||||
SendMessageW(settings,WM_DISPLAYCHANGE,0,0);
|
||||
GetWindowRect(settings,&frame);
|
||||
GetMonitorInfoW(MonitorFromWindow(settings,MONITOR_DEFAULTTONEAREST),&monitor);
|
||||
require(frame.left>=monitor.rcWork.left&&frame.top>=monitor.rcWork.top&&frame.right<=monitor.rcWork.right&&frame.bottom<=monitor.rcWork.bottom,"display change recovers off-screen window");
|
||||
DestroyWindow(settings);
|
||||
DestroyWindow(app.window); app.window=nullptr;
|
||||
}
|
||||
std::filesystem::remove_all(temp);
|
||||
std::cout<<"Passed "<<checks<<" input regression checks\n"; return 0;
|
||||
} catch(const std::exception &e) { std::cerr<<e.what()<<'\n'; return 1; }
|
||||
}
|
||||
@@ -0,0 +1,87 @@
|
||||
param([string]$Executable = (Join-Path $PSScriptRoot '../build/KSwitcher.exe'), [switch]$Network)
|
||||
$ErrorActionPreference='Stop'
|
||||
. (Join-Path $PSScriptRoot '../resources/update.ps1') -Library
|
||||
$script:checks=0
|
||||
function Assert($Value,[string]$Name) { if (!$Value) { throw $Name }; ++$script:checks }
|
||||
function Reject([scriptblock]$Action,[string]$Name) { $rejected=$false; try { & $Action } catch { $rejected=$true }; Assert $rejected $Name }
|
||||
$root=Join-Path ([IO.Path]::GetTempPath()) ('KSwitcher-update-tests-'+[guid]::NewGuid().ToString('N'))
|
||||
[IO.Directory]::CreateDirectory($root) | Out-Null
|
||||
try {
|
||||
Assert ((Get-StableVersion 'v0.10.0') -gt (Get-StableVersion 'v0.2.9')) 'numeric versions'
|
||||
Assert ($null -eq (Get-StableVersion 'v1.0.0-beta')) 'prerelease rejected'
|
||||
Assert ($null -eq (Get-StableVersion 'v1.0.0;whoami')) 'invalid version rejected'
|
||||
$assets=@(
|
||||
@{name='KSwitcher-win-x64.zip';browser_download_url='https://gitea.hrynco.com/hrynco/hrynco-kswitcher/releases/download/v0.2.1/KSwitcher-win-x64.zip'},
|
||||
@{name='SHA256SUMS.txt';browser_download_url='https://gitea.hrynco.com/hrynco/hrynco-kswitcher/releases/download/v0.2.1/SHA256SUMS.txt'}
|
||||
)
|
||||
$release=@{draft=$false;prerelease=$false;tag_name='v0.2.1';assets=$assets}
|
||||
Assert ((Select-Release @($release) ([version]'0.2.0')).version -eq 'v0.2.1') 'newer release'
|
||||
Assert ($null -eq (Select-Release @($release) ([version]'0.2.1'))) 'same version'
|
||||
Assert ($null -eq (Select-Release @($release) ([version]'0.3.0'))) 'no downgrade'
|
||||
$draft=@{draft=$true;prerelease=$false;tag_name='v9.0.0';assets=$assets}
|
||||
Assert ((Select-Release @($draft,$release) ([version]'0.2.0')).version -eq 'v0.2.1') 'draft ignored'
|
||||
Reject { Select-Release @(@{draft=$false;prerelease=$false;tag_name='v2.0.0';assets=@()}) ([version]'0.2.0') } 'incomplete release rejected'
|
||||
foreach ($url in @('http://gitea.hrynco.com/hrynco/hrynco-kswitcher/releases/download/v1/a','https://evil.example/a','https://gitea.hrynco.com/other/a','https://gitea.hrynco.com:8443/hrynco/hrynco-kswitcher/releases/download/v1/a')) {
|
||||
Reject { Assert-ReleaseUrl $url } 'untrusted URL rejected'
|
||||
}
|
||||
$source=Join-Path $root 'source'; [IO.Directory]::CreateDirectory($source) | Out-Null
|
||||
Copy-Item -LiteralPath $Executable -Destination (Join-Path $source 'KSwitcher.exe')
|
||||
foreach ($name in @('LICENSE','json-LICENSE.txt','README.md')) { [IO.File]::WriteAllText((Join-Path $source $name),'fixture') }
|
||||
[IO.Directory]::CreateDirectory((Join-Path $source 'dictionaries')) | Out-Null
|
||||
[IO.File]::WriteAllText((Join-Path $source 'dictionaries/en.txt'),'new dictionary')
|
||||
Add-Type -AssemblyName System.IO.Compression.FileSystem
|
||||
$archive=Join-Path $root 'release.zip'
|
||||
[IO.Compression.ZipFile]::CreateFromDirectory($source,$archive)
|
||||
$sum=Join-Path $root 'SHA256SUMS.txt'
|
||||
((Get-FileHash -LiteralPath $archive -Algorithm SHA256).Hash+' KSwitcher-win-x64.zip') | Set-Content -LiteralPath $sum
|
||||
Assert-Checksum $archive $sum; ++$script:checks
|
||||
$stage=Join-Path $root 'stage'
|
||||
Expand-Release $archive $stage ([version]'0.2.1'); ++$script:checks
|
||||
Reject { Expand-Release $archive (Join-Path $root 'wrong-version') ([version]'9.0.0') } 'version mismatch rejected'
|
||||
('0'*64+' KSwitcher-win-x64.zip') | Set-Content -LiteralPath $sum
|
||||
Reject { Assert-Checksum $archive $sum } 'corrupt package rejected'
|
||||
$bad=Join-Path $root 'bad.zip'
|
||||
$z=[IO.Compression.ZipFile]::Open($bad,[IO.Compression.ZipArchiveMode]::Create)
|
||||
$null=$z.CreateEntry('../escape.exe'); $z.Dispose()
|
||||
Reject { Expand-Release $bad (Join-Path $root 'badstage') ([version]'0.2.1') } 'zip traversal rejected'
|
||||
$target=Join-Path $root 'install'; $backup=Join-Path $root 'backup'
|
||||
[IO.Directory]::CreateDirectory((Join-Path $target 'data')) | Out-Null
|
||||
[IO.Directory]::CreateDirectory((Join-Path $target 'dictionaries')) | Out-Null
|
||||
[IO.File]::WriteAllText((Join-Path $target 'data/settings.json'),'personal settings')
|
||||
[IO.File]::WriteAllText((Join-Path $target 'dictionaries/en.txt'),'personal dictionary')
|
||||
[IO.File]::WriteAllText((Join-Path $target 'KSwitcher.exe'),'old binary fixture')
|
||||
$changed=[Collections.Generic.List[string]]::new()
|
||||
Install-Files $stage $target $backup $changed
|
||||
Assert ((Get-FileHash -LiteralPath (Join-Path $target 'KSwitcher.exe')).Hash -eq (Get-FileHash -LiteralPath $Executable).Hash) 'replacement installed'
|
||||
Assert ([IO.File]::ReadAllText((Join-Path $target 'data/settings.json')) -eq 'personal settings') 'settings preserved'
|
||||
Assert ([IO.File]::ReadAllText((Join-Path $target 'dictionaries/en.txt')) -eq 'personal dictionary') 'dictionary preserved'
|
||||
Undo-Files $target $backup $changed
|
||||
Assert ([IO.File]::ReadAllText((Join-Path $target 'KSwitcher.exe')) -eq 'old binary fixture') 'rollback restores original'
|
||||
Assert (!(Test-Path -LiteralPath (Join-Path $target 'README.md'))) 'rollback removes newly introduced files'
|
||||
# Fail after the original exe has moved to backup, as if the staged file vanished.
|
||||
$stage2=Join-Path $root 'stage2'; [IO.Directory]::CreateDirectory($stage2) | Out-Null
|
||||
[IO.File]::WriteAllText((Join-Path $stage2 'KSwitcher.exe'),'new binary fixture')
|
||||
$locked=[IO.File]::Open((Join-Path $stage2 'KSwitcher.exe'),[IO.FileMode]::Open,[IO.FileAccess]::Read,[IO.FileShare]::None)
|
||||
$changed2=[Collections.Generic.List[string]]::new()
|
||||
try { Reject { Install-Files $stage2 $target $backup $changed2 } 'locked staged file fails safely' } finally { $locked.Dispose() }
|
||||
Undo-Files $target $backup $changed2
|
||||
Assert ([IO.File]::ReadAllText((Join-Path $target 'KSwitcher.exe')) -eq 'old binary fixture') 'partial install rollback'
|
||||
if ($Network) {
|
||||
$metadata=Join-Path $root 'live-releases.json'
|
||||
Receive-File 'https://gitea.hrynco.com/api/v1/repos/hrynco/hrynco-kswitcher/releases?limit=100' $metadata 2MB
|
||||
$live=Select-Release (Get-Content -LiteralPath $metadata -Raw | ConvertFrom-Json) ([version]'0.0.0')
|
||||
Assert ($null -ne $live) 'live repository exposes a complete stable release'
|
||||
$liveZip=Join-Path $root 'live.zip'; $liveSum=Join-Path $root 'live-sums.txt'
|
||||
Receive-File $live.zip $liveZip 50MB
|
||||
Receive-File $live.checksum $liveSum 64KB
|
||||
Assert-Checksum $liveZip $liveSum; ++$script:checks
|
||||
Expand-Release $liveZip (Join-Path $root 'live-stage') (Get-StableVersion $live.version); ++$script:checks
|
||||
Reject { Receive-File 'https://gitea.hrynco.com/api/v1/repos/hrynco/kswitcher-updater-missing-test-repository' (Join-Path $root 'missing') 2MB } 'server failure reported'
|
||||
Write-Output "Downloaded and validated $($live.version) in a disposable test directory; no application was updated."
|
||||
}
|
||||
Write-Output "Passed $script:checks updater regression checks"
|
||||
} finally {
|
||||
if ([IO.Path]::GetDirectoryName($root) -eq [IO.Path]::GetTempPath().TrimEnd('\') -and (Split-Path -Leaf $root) -like 'KSwitcher-update-tests-*') {
|
||||
Remove-Item -LiteralPath $root -Recurse -Force
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user