@yufengtadian/freedom-cli 1.13.1 → 1.13.3

package/templates/go/pkg/freedom/syscap_windows.go

@@ -26,7 +26,7 @@ import (
 var comInitDone atomic.Bool
 
 var (
-	ole32          = syscall.NewLazyDLL("ole32.dll")
+	ole32                = syscall.NewLazyDLL("ole32.dll")
 	procCoCreateInstance = ole32.NewProc("CoCreateInstance")
 	procCoTaskMemFree    = ole32.NewProc("CoTaskMemFree")
 	procCoInitializeEx   = ole32.NewProc("CoInitializeEx")
@@ -102,6 +102,7 @@ func comVtable(ppv uintptr, index uint32) uintptr {
 }
 
 // comVtableImpl 是实际的 vtable 查找实现，通过单独函数隔离 vet 检查。
+//
 //go:noinline
 func comVtableImpl(ppv uintptr, index uint32) uintptr {
 	// 读取 vtable 指针：COM 对象首 8 字节是指针数组。
@@ -146,10 +147,10 @@ var (
 
 // ITaskbarList3 vtable 索引（0=QueryInterface,1=AddRef,2=Release）。
 const (
-	tb3HrInit             = 3
-	tb3SetProgressValue   = 8
-	tb3SetProgressState   = 9
-	tb3SetOverlayIcon     = 17
+	tb3HrInit           = 3
+	tb3SetProgressValue = 8
+	tb3SetProgressState = 9
+	tb3SetOverlayIcon   = 17
 )
 
 // TBPFLAG 任务栏进度条状态。
@@ -170,7 +171,7 @@ func taskbarList3() uintptr {
 	hr, _, _ := procCoCreateInstance.Call(
 		uintptr(unsafe.Pointer(&clsidTaskbarList)),
 		0,
-		0x1 /*CLSCTX_INPROC_SERVER*/,
+		0x1, /*CLSCTX_INPROC_SERVER*/
 		uintptr(unsafe.Pointer(&iidTaskbarList3)),
 		uintptr(unsafe.Pointer(&ppv)),
 	)
@@ -265,11 +266,11 @@ const (
 	dwmwaSystemBackdropType     = 38
 	dwmwaBorderColor            = 34
 
-	dwmsbtAuto          = 0
-	dwmsbtNone          = 1
-	dwmsbtMainWindow    = 2 // Mica
-	dwmsbtTransientWin  = 3 // Acrylic
-	dwmsbtTabbedWindow  = 4
+	dwmsbtAuto         = 0
+	dwmsbtNone         = 1
+	dwmsbtMainWindow   = 2 // Mica
+	dwmsbtTransientWin = 3 // Acrylic
+	dwmsbtTabbedWindow = 4
 
 	dwmwcpDefault    = 0
 	dwmwcpDoNotRound = 1
@@ -401,9 +402,9 @@ func hiconFromPNG(pngData []byte) uintptr {
 	}
 
 	type iconInfo struct {
-		fIcon                 int32
-		xHotspot, yHotspot    uint32
-		hbmMask, hbmColor     uintptr
+		fIcon              int32
+		xHotspot, yHotspot uint32
+		hbmMask, hbmColor  uintptr
 	}
 	ii := iconInfo{fIcon: 1, hbmMask: hbmMask, hbmColor: hbmColor}
 	hicon, _, _ := procCreateIconIndirect.Call(uintptr(unsafe.Pointer(&ii)))
@@ -412,7 +413,6 @@ func hiconFromPNG(pngData []byte) uintptr {
 	return hicon
 }
 
-
 // syscallMessageBox 调用系统消息框。返回按钮标识（ok/yes/no/cancel）。
 func syscallMessageBox(hwnd uintptr, title, message, buttons, icon string) (string, error) {
 	var flags uintptr
@@ -465,33 +465,33 @@ var procMessageBoxW = user32win.NewProc("MessageBoxW")
 
 // IFileOpenDialog / IFileSaveDialog / IShellItem COM 常量。
 var (
-	clsidFileOpenDialog  = comGUIDFromString("{DC1C5A9C-E88A-4DDE-A5A1-60F82A20AEF7}")
-	clsidFileSaveDialog  = comGUIDFromString("{C0B4E2F3-BA21-4773-8DBA-335EC946EB8B}")
-	iidIFileOpenDialog   = comGUIDFromString("{D57C7288-D4AD-4768-BE02-9D969532D960}")
-	iidIFileSaveDialog   = comGUIDFromString("{84BCCD23-5FDE-4CDB-AEA4-AF64B83D78AB}")
-	iidIShellItem        = comGUIDFromString("{43826D1E-E718-42EE-BC55-A1E261C37BFE}")
+	clsidFileOpenDialog = comGUIDFromString("{DC1C5A9C-E88A-4DDE-A5A1-60F82A20AEF7}")
+	clsidFileSaveDialog = comGUIDFromString("{C0B4E2F3-BA21-4773-8DBA-335EC946EB8B}")
+	iidIFileOpenDialog  = comGUIDFromString("{D57C7288-D4AD-4768-BE02-9D969532D960}")
+	iidIFileSaveDialog  = comGUIDFromString("{84BCCD23-5FDE-4CDB-AEA4-AF64B83D78AB}")
+	iidIShellItem       = comGUIDFromString("{43826D1E-E718-42EE-BC55-A1E261C37BFE}")
 )
 
 // IFileDialog vtable 索引（IModalWindow: 0-3, IFileDialog: 4-20）。
 const (
-	ifdSetFileTypes   = 4
+	ifdSetFileTypes     = 4
 	ifdSetFileTypeIndex = 5
-	ifdSetOptions     = 9
-	ifdSetTitle       = 17
-	ifdSetFileName    = 15
-	ifdGetResult      = 20
-	ifdShow           = 3 // IModalWindow::Show
+	ifdSetOptions       = 9
+	ifdSetTitle         = 17
+	ifdSetFileName      = 15
+	ifdGetResult        = 20
+	ifdShow             = 3 // IModalWindow::Show
 )
 
 // IFOS 选项（IFileDialogOptions）。
 const (
-	fosOverwritePrompt  = 0x00000002
-	fosStrictFileTypes  = 0x00000004
-	fosNoChangeDir      = 0x00000008
-	fosForceFileSystem  = 0x00000040
-	fosAllowMultiSelect = 0x00000200
-	fosPathMustExist    = 0x00000800
-	fosFileMustExist    = 0x00001000
+	fosOverwritePrompt   = 0x00000002
+	fosStrictFileTypes   = 0x00000004
+	fosNoChangeDir       = 0x00000008
+	fosForceFileSystem   = 0x00000040
+	fosAllowMultiSelect  = 0x00000200
+	fosPathMustExist     = 0x00000800
+	fosFileMustExist     = 0x00001000
 	fosDefaultNoMiniMode = 0x20000000
 )
 

package/templates/go/pkg/freedom/sysint_windows.go

@@ -34,7 +34,7 @@ var (
 		"alt": modAlt, "option": modAlt,
 		"ctrl": modControl, "control": modControl,
 		"shift": modShift,
-		"win": modWin, "cmd": modWin, "meta": modWin, "super": modWin,
+		"win":   modWin, "cmd": modWin, "meta": modWin, "super": modWin,
 	}
 	hotkeyVKs = map[string]uint32{}
 )
@@ -230,7 +230,7 @@ const (
 	keyRead  = 0x101
 	regSz    = 1
 
-	runKeyPath = `Software\Microsoft\Windows\CurrentVersion\Run`
+	runKeyPath  = `Software\Microsoft\Windows\CurrentVersion\Run`
 	classesBase = `Software\Classes`
 )
 

package/templates/go/pkg/freedom/tray_windows.go

@@ -39,12 +39,12 @@ const (
 	tpmRightButton = 0x00000002
 	tpmLeftAlign   = 0x00000000
 
-	mfString    = 0x00000000
-	mfSeparator = 0x00000800
-	mfChecked   = 0x00000008
-	mfGrayed    = 0x00000001
-	mfEnabled   = 0x00000000
-	mfPopup     = 0x00000010
+	mfString     = 0x00000000
+	mfSeparator  = 0x00000800
+	mfChecked    = 0x00000008
+	mfGrayed     = 0x00000001
+	mfEnabled    = 0x00000000
+	mfPopup      = 0x00000010
 	mfByPosition = 0x00000400
 )
 
@@ -52,19 +52,19 @@ var (
 	shell32              = syscall.NewLazyDLL("shell32.dll")
 	procShellNotifyIconW = shell32.NewProc("Shell_NotifyIconW")
 
-	procRegisterClassExW   = user32win.NewProc("RegisterClassExW")
-	procCreateWindowExW    = user32win.NewProc("CreateWindowExW")
-	procDefWindowProcW     = user32win.NewProc("DefWindowProcW")
-	procCreatePopupMenu    = user32win.NewProc("CreatePopupMenu")
-	procCreateMenu         = user32win.NewProc("CreateMenu")
-	procAppendMenuW        = user32win.NewProc("AppendMenuW")
-	procInsertMenuW        = user32win.NewProc("InsertMenuW")
-	procDestroyMenu        = user32win.NewProc("DestroyMenu")
-	procTrackPopupMenu     = user32win.NewProc("TrackPopupMenu")
-	procGetCursorPos       = user32win.NewProc("GetCursorPos")
+	procRegisterClassExW    = user32win.NewProc("RegisterClassExW")
+	procCreateWindowExW     = user32win.NewProc("CreateWindowExW")
+	procDefWindowProcW      = user32win.NewProc("DefWindowProcW")
+	procCreatePopupMenu     = user32win.NewProc("CreatePopupMenu")
+	procCreateMenu          = user32win.NewProc("CreateMenu")
+	procAppendMenuW         = user32win.NewProc("AppendMenuW")
+	procInsertMenuW         = user32win.NewProc("InsertMenuW")
+	procDestroyMenu         = user32win.NewProc("DestroyMenu")
+	procTrackPopupMenu      = user32win.NewProc("TrackPopupMenu")
+	procGetCursorPos        = user32win.NewProc("GetCursorPos")
 	procSetForegroundWindow = user32win.NewProc("SetForegroundWindow")
-	procSetMenu            = user32win.NewProc("SetMenu")
-	procDrawMenuBar        = user32win.NewProc("DrawMenuBar")
+	procSetMenu             = user32win.NewProc("SetMenu")
+	procDrawMenuBar         = user32win.NewProc("DrawMenuBar")
 )
 
 // ---- 结构 ----

package/templates/go/pkg/freedom/updater.go

@@ -178,9 +178,9 @@ func (a *App) CheckUpdate(ctx context.Context) (*UpdateInfo, error) {
 	if !updateURLAllowed(m.URL) {
 		return nil, fmt.Errorf("freedom: artifact URL scheme rejected: %q", m.URL)
 	}
-	cmp, err := compareVersions(Version, m.Version)
+	cmp, err := compareVersions(a.appVersion(), m.Version)
 	if err != nil {
-		return nil, fmt.Errorf("freedom: current version %q uncomparable: %w", Version, err)
+		return nil, fmt.Errorf("freedom: current version %q uncomparable: %w", a.appVersion(), err)
 	}
 	a.upMu.Lock()
 	if cmp >= 0 {
@@ -333,7 +333,7 @@ func (a *App) updateCheckAsync() interface{} {
 			return
 		}
 		if info == nil {
-			a.Emit("update.upToDate", map[string]string{"current": Version})
+			a.Emit("update.upToDate", map[string]string{"current": a.appVersion()})
 			return
 		}
 		a.Emit("update.available", info)

package/templates/go/pkg/freedom/window_other.go

@@ -9,10 +9,13 @@ import "fmt"
 // 前端仍可通过 window.freedom.window.isFrameless() 感知当前是否无边框。
 func (a *App) applyTitleBar() {}
 
+// setWindowIcon 在 macOS / Linux 上为空实现：图标由应用包（.icns / .desktop）决定。
+func (a *App) setWindowIcon() {}
+
 // installWindowEvents / uninstallWindowEvents 在非 Windows 平台为空实现
 // （窗口事件与关闭拦截依赖 WndProc 子类化，仅 Windows 提供）。
 func (a *App) installWindowEvents()   {}
-func (a *App) uninstallWindowEvents()  {}
+func (a *App) uninstallWindowEvents() {}
 
 // windowControl 处理前端 window.freedom.window.* 请求（macOS / Linux 占位实现）。
 // 动作集与 window_windows.go 保持一致：查询类返回中性值，动作类静默 no-op，
@@ -23,6 +26,9 @@ func windowControl(hwnd uintptr, action string, mode TitleBarMode, paramsJSON st
 		// 仅 frameless 返回 true（与 window_windows.go 语义一致）；
 		// hidden 模式回退原生标题栏，前端不应自绘按钮。
 		return mode == TitleBarFrameless, nil
+	case "appIcon":
+		// macOS / Linux 暂不提供 exe 内嵌图标提取，前端隐藏标题栏图标。
+		return "", nil
 	case "isMaximized", "isMinimized", "isVisible", "isFocused", "isFullscreen":
 		if action == "isVisible" {
 			return true, nil

package/templates/go/pkg/freedom/window_windows.go

@@ -3,8 +3,14 @@
 package freedom
 
 import (
+	"bytes"
+	"encoding/base64"
+	"encoding/binary"
 	"encoding/json"
 	"fmt"
+	"image"
+	"image/color"
+	"image/png"
 	"syscall"
 	"unsafe"
 )
@@ -34,6 +40,12 @@ var (
 	procGetModuleHandle = kernel32.NewProc("GetModuleHandleW")
 	procLoadImage       = user32win.NewProc("LoadImageW")
 	procDestroyIcon     = user32win.NewProc("DestroyIcon")
+	// PE 资源读取（exeIconData 提取内嵌 RT_ICON 用）与标题栏图标设置。
+	procFindResource   = kernel32.NewProc("FindResourceW")
+	procSizeofResource = kernel32.NewProc("SizeofResource")
+	procLoadResource   = kernel32.NewProc("LoadResource")
+	procLockResource   = kernel32.NewProc("LockResource")
+	procSendMessage    = user32win.NewProc("SendMessageW")
 
 	dwmapi                     = syscall.NewLazyDLL("dwmapi.dll")
 	procDwmExtendFrameIntoArea = dwmapi.NewProc("DwmExtendFrameIntoClientArea")
@@ -44,8 +56,8 @@ var (
 	procSetWindowSubclass = comctl32.NewProc("SetWindowSubclass")
 	procDefSubclassProc   = comctl32.NewProc("DefSubclassProc")
 
-	procGetWindowRect   = user32win.NewProc("GetWindowRect")
-	procGetClientRect   = user32win.NewProc("GetClientRect")
+	procGetWindowRect       = user32win.NewProc("GetWindowRect")
+	procGetClientRect       = user32win.NewProc("GetClientRect")
 	procBringWindowToTop    = user32win.NewProc("BringWindowToTop")
 	procIsIconic            = user32win.NewProc("IsIconic")
 	procIsWindowVisible     = user32win.NewProc("IsWindowVisible")
@@ -57,12 +69,12 @@ var (
 	procEnumDisplayMonitors = user32win.NewProc("EnumDisplayMonitors")
 
 	// W6 审查修复追加：PNG→HICON 绘制（gdi32）、图标合成、子类化摘除、单实例互斥量。
-	gdi32                  = syscall.NewLazyDLL("gdi32.dll")
-	procCreateDIBSection   = gdi32.NewProc("CreateDIBSection")
-	procDeleteObject       = gdi32.NewProc("DeleteObject")
-	procCreateIconIndirect = user32win.NewProc("CreateIconIndirect")
+	gdi32                    = syscall.NewLazyDLL("gdi32.dll")
+	procCreateDIBSection     = gdi32.NewProc("CreateDIBSection")
+	procDeleteObject         = gdi32.NewProc("DeleteObject")
+	procCreateIconIndirect   = user32win.NewProc("CreateIconIndirect")
 	procRemoveWindowSubclass = comctl32.NewProc("RemoveWindowSubclass")
-	procCreateMutexW       = kernel32.NewProc("CreateMutexW")
+	procCreateMutexW         = kernel32.NewProc("CreateMutexW")
 
 	shcore               = syscall.NewLazyDLL("shcore.dll")
 	procGetDpiForMonitor = shcore.NewProc("GetDpiForMonitor")
@@ -90,20 +102,20 @@ var (
 	procGlobalSize   = kernel32.NewProc("GlobalSize")
 	procGlobalFree   = kernel32.NewProc("GlobalFree")
 
-	procFindWindowW        = user32win.NewProc("FindWindowW")
+	procFindWindowW         = user32win.NewProc("FindWindowW")
 	procSendMessageTimeoutW = user32win.NewProc("SendMessageTimeoutW")
 
 	procShellExecuteW = shell32.NewProc("ShellExecuteW")
-	shlwapi            = syscall.NewLazyDLL("shlwapi.dll")
-	procSHDeleteKeyW   = shlwapi.NewProc("SHDeleteKeyW")
+	shlwapi           = syscall.NewLazyDLL("shlwapi.dll")
+	procSHDeleteKeyW  = shlwapi.NewProc("SHDeleteKeyW")
 
-	advapi32              = syscall.NewLazyDLL("advapi32.dll")
-	procRegOpenKeyExW     = advapi32.NewProc("RegOpenKeyExW")
-	procRegCreateKeyExW   = advapi32.NewProc("RegCreateKeyExW")
-	procRegSetValueExW    = advapi32.NewProc("RegSetValueExW")
-	procRegQueryValueExW  = advapi32.NewProc("RegQueryValueExW")
-	procRegDeleteValueW   = advapi32.NewProc("RegDeleteValueW")
-	procRegCloseKey       = advapi32.NewProc("RegCloseKey")
+	advapi32             = syscall.NewLazyDLL("advapi32.dll")
+	procRegOpenKeyExW    = advapi32.NewProc("RegOpenKeyExW")
+	procRegCreateKeyExW  = advapi32.NewProc("RegCreateKeyExW")
+	procRegSetValueExW   = advapi32.NewProc("RegSetValueExW")
+	procRegQueryValueExW = advapi32.NewProc("RegQueryValueExW")
+	procRegDeleteValueW  = advapi32.NewProc("RegDeleteValueW")
+	procRegCloseKey      = advapi32.NewProc("RegCloseKey")
 
 	procSetProcessDpiAwarenessContext = user32win.NewProc("SetProcessDpiAwarenessContext")
 )
@@ -140,6 +152,11 @@ const (
 
 	smCXSmall = 13 // SM_CXSMICON
 	smCYSmall = 14 // SM_CYSMICON
+
+	smCXIcon  = 11     // SM_CXICON：任务栏 / Alt-Tab 大图标尺寸
+	smCYIcon  = 12     // SM_CYICON
+	wmSetIcon = 0x0080 // WM_SETICON：设置窗口大/小图标（ICON_BIG=1 / ICON_SMALL=0）
+	rtIcon    = 3      // RT_ICON：ICO 内嵌单幅图像资源类型
 )
 
 // gwlStyle = GWL_STYLE（-16）。用变量声明，避免 uintptr 常量转换溢出。
@@ -205,6 +222,9 @@ func windowControl(hwnd uintptr, action string, mode TitleBarMode, paramsJSON st
 		// 仅 frameless 返回 true：hidden 模式保留 DWM 原生按钮，
 		// 前端若据 isFrameless 自绘按钮会与原生按钮重叠。
 		return mode == TitleBarFrameless, nil
+	case "appIcon":
+		// exe 内嵌图标 → PNG data URL（无边框自绘标题栏用）；无图标时返回 ""。
+		return exeAppIconDataURL(), nil
 
 	// ---- W1 对标 Tauri：位置 / 尺寸 ----
 	case "setPosition":
@@ -509,6 +529,154 @@ func loadExeIcon(cx, cy uintptr) uintptr {
 	return 0
 }
 
+// exeIconData 读取当前 exe 内嵌的 RT_ICON 资源原始字节。
+// 不依赖 RT_GROUP_ICON 的 ID（不同注入工具写入的资源 ID 可能不同）：
+// 先按 rcedit 约定 RT_ICON ID=1 读取，失败回退 ID=0，与 loadExeIcon 的 ID 假设解耦。
+func exeIconData() []byte {
+	hInst, _, _ := procGetModuleHandle.Call(0)
+	if hInst == 0 {
+		return nil
+	}
+	for _, id := range []uintptr{1, 0} {
+		// FindResourceW(hModule, MAKEINTRESOURCE(id), MAKEINTRESOURCE(RT_ICON))
+		hRes, _, _ := procFindResource.Call(hInst, id, rtIcon)
+		if hRes == 0 {
+			continue
+		}
+		size, _, _ := procSizeofResource.Call(hInst, hRes)
+		if size == 0 {
+			continue
+		}
+		hData, _, _ := procLoadResource.Call(hInst, hRes)
+		if hData == 0 {
+			continue
+		}
+		ptr, _, _ := procLockResource.Call(hData)
+		if ptr == 0 {
+			continue
+		}
+		return unsafe.Slice((*byte)(unsafe.Pointer(ptr)), size)
+	}
+	return nil
+}
+
+// isPNG 判断字节流是否为 PNG 编码（.ico 内嵌 PNG 时 RT_ICON 数据即 PNG）。
+func isPNG(b []byte) bool {
+	return len(b) >= 8 && b[0] == 0x89 && b[1] == 'P' && b[2] == 'N' && b[3] == 'G'
+}
+
+// exeAppIconDataURL 从当前 exe 的 PE 资源图标（RT_ICON）提取为 PNG data URL，
+// 供无边框模式前端自绘标题栏显示应用图标——不依赖 resources 文件夹里的任何文件。
+// 无法提取时返回空字符串（前端隐藏图标）。
+func exeAppIconDataURL() string {
+	data := exeIconData()
+	if len(data) == 0 {
+		return ""
+	}
+	if isPNG(data) {
+		return "data:image/png;base64," + base64.StdEncoding.EncodeToString(data)
+	}
+	img, err := dibToPNG(data)
+	if err != nil {
+		return ""
+	}
+	return "data:image/png;base64," + base64.StdEncoding.EncodeToString(img)
+}
+
+// setWindowIcon 把 exe 内嵌的应用程序图标同步到窗口标题栏与任务栏：
+//   - native 模式：标题栏图标（ICON_SMALL）与任务栏 / Alt-Tab 图标（ICON_BIG）均来自 exe 图标，
+//     保证「标题栏图标 = exe 图标」；
+//   - frameless 模式：无标题栏，但任务栏 / Alt-Tab 仍显示 exe 图标。
+//
+// 图标经 LoadImageW 从 PE 资源 RT_GROUP_ICON 加载，不依赖 resources 里的图标文件；
+// exe 未注入图标时静默跳过（保留系统默认图标）。
+func (a *App) setWindowIcon() {
+	hwnd := a.WindowHandle()
+	if hwnd == 0 {
+		return
+	}
+	cxIcon, _, _ := procGetSystemMetrics.Call(smCXIcon)
+	cyIcon, _, _ := procGetSystemMetrics.Call(smCYIcon)
+	cxSmall, _, _ := procGetSystemMetrics.Call(smCXSmall)
+	cySmall, _, _ := procGetSystemMetrics.Call(smCYSmall)
+	big := loadExeIcon(cxIcon, cyIcon)
+	small := loadExeIcon(cxSmall, cySmall)
+	if big != 0 {
+		procSendMessage.Call(hwnd, wmSetIcon, 1 /* ICON_BIG */, big)
+		procDestroyIcon.Call(big)
+	}
+	if small != 0 {
+		procSendMessage.Call(hwnd, wmSetIcon, 0 /* ICON_SMALL */, small)
+		procDestroyIcon.Call(small)
+	}
+}
+
+// dibToPNG 将 ICO 内嵌的 DIB 图像（BITMAPINFOHEADER 起始的裸 DIB，即 .ico 未内嵌
+// PNG 时的 RT_ICON 数据）纯 Go 解析为 PNG 字节，不依赖 GDI 绘图 API。
+// 支持 32/24 bpp；透明由 AND mask 决定（对应位=1 表示透明）。
+func dibToPNG(data []byte) ([]byte, error) {
+	if len(data) < 40 {
+		return nil, fmt.Errorf("DIB too short: %d bytes", len(data))
+	}
+	biSize := binary.LittleEndian.Uint32(data[0:4])
+	if biSize < 40 {
+		return nil, fmt.Errorf("unsupported BITMAPINFOHEADER size %d", biSize)
+	}
+	width := int(binary.LittleEndian.Uint32(data[4:8]))
+	heightRaw := int32(binary.LittleEndian.Uint32(data[8:12]))
+	bitCount := binary.LittleEndian.Uint16(data[14:16])
+	if width <= 0 || heightRaw == 0 {
+		return nil, fmt.Errorf("bad dimensions %dx%d", width, heightRaw)
+	}
+	bpp := (int(bitCount) + 7) / 8
+	if bpp != 3 && bpp != 4 {
+		return nil, fmt.Errorf("unsupported bitcount %d", bitCount)
+	}
+	height := int(heightRaw)
+	if height < 0 {
+		height = -height
+	}
+	// ICO 的 DIB 高度可能为实际像素高度的 2 倍（上方 XOR + 下方 AND mask），
+	// 此时需折半，否则图像会被纵向拉伸。
+	pixelRowBytes := (width*bpp + 3) &^ 3
+	andRowBytes := ((width + 31) / 32) * 4
+	pxLen := pixelRowBytes * height
+	if pxLen > len(data)-int(biSize) && height%2 == 0 {
+		height /= 2
+		pxLen = pixelRowBytes * height
+	}
+	pxStart := int(biSize)
+	andStart := pxStart + pxLen
+	// AND mask 是否存在以实际数据长度为准：ICO 的 DIB 若数据不足（无 AND mask 段），
+	// andStart+andRowBytes*height 会超出 len(data)，下方读取将越界 panic 崩掉壳进程。
+	hasAndMask := andStart+andRowBytes*height <= len(data)
+	img := image.NewRGBA(image.Rect(0, 0, width, height))
+	for y := 0; y < height; y++ {
+		srcY := height - 1 - y // DIB 自底向上：数据首行是图像末行
+		row := pxStart + srcY*pixelRowBytes
+		andRow := andStart + srcY*andRowBytes
+		for x := 0; x < width; x++ {
+			off := row + x*bpp
+			if off+bpp > len(data) {
+				return nil, fmt.Errorf("DIB data truncated at x=%d,y=%d", x, y)
+			}
+			b := data[off]
+			g := data[off+1]
+			r := data[off+2]
+			alpha := uint8(255)
+			if hasAndMask && (data[andRow+x/8]>>uint(7-x%8))&1 == 1 {
+				alpha = 0
+			}
+			img.SetRGBA(x, y, color.RGBA{R: r, G: g, B: b, A: alpha})
+		}
+	}
+	var buf bytes.Buffer
+	if err := png.Encode(&buf, img); err != nil {
+		return nil, err
+	}
+	return buf.Bytes(), nil
+}
+
 // applyTitleBar 依据配置调整窗口标题栏（Windows 实现）。
 func (a *App) applyTitleBar() {
 	hwnd := a.WindowHandle()

package/templates/go/third_party/webview_go/CHANGELOG.md

@@ -0,0 +1,15 @@
+# Changelog
+
+### Migrating from v0.1.1 to v0.10.0
+
+1. `Webview.Open()` has been removed. Use other webview APIs to create a window, open a link and run main UI loop.
+2. `Webview.Debug()` and `webview.Debugf()` have been removed. Use your favorite logging library to debug webview apps.
+3. `Webview.Settings` struct has been removed. Title, URL and size are controlled via other API setters and can be updated at any time, not only when webview is created.
+4. `Webview.Loop()` has been removed. Use `Run()` instead.
+5. `WebView.Run()`, `WebView.Terminate()`, `WebView.SetTitle()`, `WebView.Dispatch()` stayed the same.
+6. `WebView.Exit()` has been renamed to `WebView.Destroy()`
+7. `WebView.SetColor()` and `WebView.SetFullScreen()` have been removed. Use `Window()` to get native window handle and probably write some Cgo code to adjust native window to your taste.
+8. `Webview.Dialog` has been removed. But it is likely to be brought back as a standalone module.
+9. `WebView.Eval()` remained the same.
+10. `WebView.InjectCSS()` has been removed. Use eval to inject style tag with CSS inside.
+11. `WebView.Bind()` kept the name, but changed the semantics. Only functions can be bound. Not the structs, like in Lorca.

package/templates/go/third_party/webview_go/FREEDOM-PATCH.md

@@ -0,0 +1,32 @@
+From: https://github.com/webview/webview_go
+Upstream commit: 6173450d4dd6 (v0.0.0-20240831120633)
+License: MIT (see LICENSE)
+
+Why this copy exists
+------------------
+Upstream hardcodes the CGO dependency name as `pkg-config: gtk+-3.0 webkit2gtk-4.0`.
+Ubuntu 24.04 / Debian 13 removed the webkit2gtk-4.0 dev package (libsoup2 line) and ship
+the API-compatible webkit2gtk-4.1 instead, so `go build` fails there with
+"Package webkit2gtk-4.0 was not found".
+
+What was changed (the only two deltas)
+--------------------------------------
+1. webview.go: dropped the hardcoded linux `pkg-config:` line (comment marks the spot).
+2. webkit2_40.go / webkit2_41.go: the same directive, split by mutually exclusive build
+   tags. Default stays 4.0 (unchanged behaviour on old distros and in CI artifacts);
+   `-tags webkit2_41` selects 4.1.
+
+Nothing else was touched: examples/ and webview_test.go were deleted, no code change.
+
+Who flips the tag
+-----------------
+- repo/dev + CI: build.sh sources tools/webkit-env.sh (appends -tags=webkit2_41 to GOFLAGS)
+- npm CLI: freedom-cli/lib/webkit.js (applyWebkitTags), used by `freedom shell build`
+Detection is by pkg-config availability, so no user-facing flag is needed.
+
+To refresh from upstream: copy the new tree over this directory, re-apply the two deltas
+above, delete examples/ and webview_test.go, then re-sync the identical copy under
+freedom-cli/templates/go/third_party/webview_go/ (it is what `freedom shell build` compiles).
+
+webkitgtk-6.0 is NOT bridgeable this way (different C API: WebKitNetworkSession,
+permission handlers); it needs an upstream port.

package/templates/go/third_party/webview_go/LICENSE

@@ -0,0 +1,22 @@
+MIT License
+
+Copyright (c) 2017 Serge Zaitsev
+Copyright (c) 2020 webview
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/templates/go/third_party/webview_go/README.md

@@ -0,0 +1,50 @@
+# webview_go
+
+[![GoDoc](https://godoc.org/github.com/webview/webview_go?status.svg)](https://godoc.org/github.com/webview/webview_go)
+[![Go Report Card](https://goreportcard.com/badge/github.com/webview/webview_go)](https://goreportcard.com/report/github.com/webview/webview_go)
+
+Go language binding for the [webview library][webview].
+
+> [!NOTE]
+> Versions <= 0.1.1 are available in the [old repository][webview].
+
+### Getting Started
+
+See [Go package documentation][go-docs] for the Go API documentation, or simply read the source code.
+
+Start with creating a new directory structure for your project.
+
+```sh
+mkdir my-project && cd my-project
+```
+
+Create a new Go module.
+
+```sh
+go mod init example.com/app
+```
+
+Save one of the example programs into your project directory.
+
+```sh
+curl -sSLo main.go "https://raw.githubusercontent.com/webview/webview_go/master/examples/basic/main.go"
+```
+
+Install dependencies.
+
+```sh
+go get github.com/webview/webview_go
+```
+
+Build the example. On Windows, add `-ldflags="-H windowsgui"` to the command line.
+
+```sh
+go build
+```
+
+### Notes
+
+Calling `Eval()` or `Dispatch()` before `Run()` does not work because the webview instance has only been configured and not yet started.
+
+[go-docs]: https://pkg.go.dev/github.com/webview/webview_go
+[webview]: https://github.com/webview/webview

package/templates/go/third_party/webview_go/glue.c

@@ -0,0 +1,36 @@
+#include "webview.h"
+
+#include <stdlib.h>
+#include <stdint.h>
+
+struct binding_context {
+    webview_t w;
+    uintptr_t index;
+};
+
+void _webviewDispatchGoCallback(void *);
+void _webviewBindingGoCallback(webview_t, char *, char *, uintptr_t);
+
+static void _webview_dispatch_cb(webview_t w, void *arg) {
+    _webviewDispatchGoCallback(arg);
+}
+
+static void _webview_binding_cb(const char *id, const char *req, void *arg) {
+    struct binding_context *ctx = (struct binding_context *) arg;
+    _webviewBindingGoCallback(ctx->w, (char *)id, (char *)req, ctx->index);
+}
+
+void CgoWebViewDispatch(webview_t w, uintptr_t arg) {
+    webview_dispatch(w, _webview_dispatch_cb, (void *)arg);
+}
+
+void CgoWebViewBind(webview_t w, const char *name, uintptr_t index) {
+    struct binding_context *ctx = calloc(1, sizeof(struct binding_context));
+    ctx->w = w;
+    ctx->index = index;
+    webview_bind(w, name, _webview_binding_cb, (void *)ctx);
+}
+
+void CgoWebViewUnbind(webview_t w, const char *name) {
+    webview_unbind(w, name);
+}