@yufengtadian/freedom-cli 1.13.2 → 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/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);
+}

package/templates/go/third_party/webview_go/go.mod

@@ -0,0 +1,3 @@
+module github.com/webview/webview_go
+
+go 1.13

package/templates/go/third_party/webview_go/libs/mswebview2/LICENSE

@@ -0,0 +1,27 @@
+Copyright (C) Microsoft Corporation. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * The name of Microsoft Corporation, or the names of its contributors 
+may not be used to endorse or promote products derived from this
+software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.