deblan-mirror/wails
1
0
Fork 0
mirror of https://github.com/wailsapp/wails.git synced 2026-03-14 14:45:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

rabbit suggestions

Browse source
This commit is contained in:
popaprozac 2025-04-24 16:10:14 -07:00
commit d1d57c132c
1 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

23
v3/pkg/services/badge/badge_windows.go
View file

@ -17,7 +17,6 @@ import (
var (
ole32 = syscall.NewLazyDLL("ole32.dll")
shobjidl = syscall.NewLazyDLL("shell32.dll")
coCreateInstance = ole32.NewProc("CoCreateInstance")
)
@ -59,6 +58,13 @@ type taskbarList3Vtbl struct {
}
func newTaskbarList3() (*ITaskbarList3, error) {
const COINIT_APARTMENTTHREADED = 0x2
coInit := ole32.NewProc("CoInitializeEx")
if hr, _, _ := coInit.Call(0, COINIT_APARTMENTTHREADED); hr != 0 && hr != 0x1 {
return nil, syscall.Errno(hr)
}
var taskbar *ITaskbarList3
hr, _, _ := coCreateInstance.Call(
uintptr(unsafe.Pointer(&CLSID_TaskbarList)),
@ -72,6 +78,12 @@ func newTaskbarList3() (*ITaskbarList3, error) {
return nil, syscall.Errno(hr)
}
if r, _, _ := syscall.SyscallN(taskbar.lpVtbl.HrInit, uintptr(unsafe.Pointer(taskbar))); r != 0 {
syscall.SyscallN(taskbar.lpVtbl.Release, uintptr(unsafe.Pointer(taskbar)))
ole32.NewProc("CoUninitialize").Call()
return nil, syscall.Errno(r)
}
return taskbar, nil
}
@ -110,6 +122,11 @@ func (w *windowsBadge) Startup(ctx context.Context, options application.ServiceO
}
func (w *windowsBadge) Shutdown() error {
if w.taskbar != nil {
syscall.SyscallN(w.taskbar.lpVtbl.Release, uintptr(unsafe.Pointer(w.taskbar)))
ole32.NewProc("CoUninitialize").Call()
}
return nil
}
@ -169,7 +186,7 @@ func (w *windowsBadge) RemoveBadge() error {
return w.taskbar.SetOverlayIcon(syscall.Handle(hwnd), 0, nil)
}
func createBadgeIcon() (uintptr, error) {
func createBadgeIcon() (w32.HICON, error) {
const size = 32
img := image.NewRGBA(image.Rect(0, 0, size, size))
@ -209,5 +226,5 @@ func createBadgeIcon() (uintptr, error) {
}
hicon, err := w32.CreateSmallHIconFromImage(buf.Bytes())
return uintptr(hicon), err
return hicon, err
}