feat(windows): simplify tray controls and allow installer-user config edits
This commit is contained in:
1 parent
d59b2d5463
commit
ae5e979761
18 files changed
+611
-88
No files matched your search
@@ -13,9 +13,54 @@ import (
|
||||
"time"
|
||||
"unsafe"
|
||||
|
||||
"github.com/rvbox/rvbox/internal/client/windowsservice"
|
||||
winapi "golang.org/x/sys/windows"
|
||||
)
|
||||
|
||||
func TestNativeTrayReadOnlyServiceQuery_HP_WINTRAY_07(t *testing.T) {
|
||||
status, err := windowsservice.Query()
|
||||
if err != nil {
|
||||
t.Fatalf("unprivileged read-only SCM query: %v", err)
|
||||
}
|
||||
if !status.Installed && status.State != windowsservice.StateStopped {
|
||||
t.Fatalf("missing service state=%#v", status)
|
||||
}
|
||||
if status.Installed && status.State == windowsservice.StateUnknown {
|
||||
t.Fatalf("installed service state=%#v", status)
|
||||
}
|
||||
}
|
||||
|
||||
func TestNativeTrayMenuFlagsAndRefresh_HP_WINTRAY_08(t *testing.T) {
|
||||
runtime.LockOSThread()
|
||||
defer runtime.UnlockOSThread()
|
||||
menu, _, err := procCreatePopup.Call()
|
||||
if menu == 0 {
|
||||
t.Fatal(err)
|
||||
}
|
||||
defer procDestroyMenu.Call(menu)
|
||||
w := &trayWindow{menu: menu, status: MenuStatus{Label: "Status: running", AutoStart: true, StartupKnown: true, CanStop: true}}
|
||||
for _, item := range trayMenu(w.status) {
|
||||
flags, text := menuItemFlags(item)
|
||||
if ok, _, err := procAppendMenu.Call(menu, flags, uintptr(item.Action), uintptr(unsafe.Pointer(text))); ok == 0 {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
getState := user32Tray.NewProc("GetMenuState")
|
||||
banner, _, _ := getState.Call(menu, 0, trayMFByPosition)
|
||||
auto, _, _ := getState.Call(menu, 7, trayMFByPosition)
|
||||
if banner == ^uintptr(0) || banner&trayMFDisabled == 0 || auto&trayMFChecked == 0 {
|
||||
t.Fatalf("initial menu flags banner=%#x auto=%#x", banner, auto)
|
||||
}
|
||||
w.status = MenuStatus{Label: "Status: stopped", StartupKnown: true, CanStart: true}
|
||||
w.refreshMenu()
|
||||
auto, _, _ = getState.Call(menu, 7, trayMFByPosition)
|
||||
start, _, _ := getState.Call(menu, 5, trayMFByPosition)
|
||||
stop, _, _ := getState.Call(menu, 6, trayMFByPosition)
|
||||
if auto&trayMFChecked != 0 || start&trayMFDisabled != 0 || stop&trayMFDisabled == 0 {
|
||||
t.Fatalf("updated menu flags start=%#x stop=%#x auto=%#x", start, stop, auto)
|
||||
}
|
||||
}
|
||||
|
||||
func trayTestName() string {
|
||||
return fmt.Sprintf(`\\.\pipe\rvbox-tray-test-%d-%d`, winapi.GetCurrentProcessId(), time.Now().UnixNano())
|
||||
}
|
||||
@@ -206,7 +251,7 @@ func TestNativeTrayWindowLifecycle_HP_WINTRAY_04(t *testing.T) {
|
||||
defer cancel()
|
||||
ready := make(chan *trayWindow, 1)
|
||||
done := make(chan error, 1)
|
||||
go runTrayMessageLoop(ctx, io.Discard, "RVBox native tray test", ready, done)
|
||||
go runTrayMessageLoop(ctx, io.Discard, "RVBox native tray test", ready, done, "")
|
||||
var window *trayWindow
|
||||
select {
|
||||
case window = <-ready:
|
||||
|
||||
Reference in new issue
Block a user