Skip to content

Improve Pageant compatibility #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lowjoel wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Improve Pageant compatibility #63

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ae81d7
Lock the Pageant thread for the event loop
lowjoel Oct 17, 2025
6e86c0d
Improve error handling for Pageant initialisation
lowjoel Oct 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions pkg/pageant/pageant.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"log"
"os"
"reflect"
"runtime"
"syscall"
"unsafe"

Expand Down Expand Up @@ -149,29 +150,39 @@ func (a *Pageant) handleCopyMessage(cdata *copyDataStruct) error {
return nil
}

func initInstance(hInstance winapi.HINSTANCE, nCmdShow int) bool {
func initInstance(hInstance winapi.HINSTANCE, nCmdShow int) error {
classNameUTF16, err := syscall.UTF16PtrFromString(className)
if err != nil {
return err
}

hWnd := winapi.CreateWindowEx(
winapi.WS_EX_TRANSPARENT|winapi.WS_EX_TOOLWINDOW|winapi.WS_EX_TOPMOST|winapi.WS_EX_NOACTIVATE,
syscall.StringToUTF16Ptr(className),
syscall.StringToUTF16Ptr(className),
classNameUTF16,
classNameUTF16,
winapi.WS_POPUP,
0, 0, 0, 0,
0, 0, hInstance, nil)
if hWnd == 0 {
return false
return errors.New("cannot create window")
}

winapi.ShowWindow(hWnd, winapi.SW_SHOW)
return true
return nil
}

func (a *Pageant) RunAgent() {
runtime.LockOSThread()
defer runtime.UnlockOSThread()

hInstance := winapi.GetModuleHandle(nil)
a.myRegisterClass(hInstance)

if initInstance(hInstance, winapi.SW_SHOW) == false {
if err := initInstance(hInstance, winapi.SW_SHOW); err != nil {
log.Printf("pageant: %v\n", err)
return
}

var msg winapi.MSG
for winapi.GetMessage(&msg, 0, 0, 0) != 0 {
winapi.TranslateMessage(&msg)
Expand Down