typenative 0.4.1 → 0.5.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +171 -0
- package/README.md +62 -22
- package/ROUND2-HANDOFF.md +200 -0
- package/bin/cli.js +1 -0
- package/bin/index.js +13 -2
- package/bin/main.js +1 -0
- package/bin/node/assert.js +2 -2
- package/bin/node/async_hooks.js +1 -1
- package/bin/node/buffer.js +16 -5
- package/bin/node/child_process.js +7 -7
- package/bin/node/cluster.js +3 -3
- package/bin/node/crypto_keys.js +21 -21
- package/bin/node/dgram.js +1 -1
- package/bin/node/diagnostics_channel.js +3 -3
- package/bin/node/dns.js +2 -2
- package/bin/node/events.js +3 -3
- package/bin/node/fetch.js +2 -2
- package/bin/node/fs.js +3 -3
- package/bin/node/fs_watch.js +5 -5
- package/bin/node/http.js +3 -3
- package/bin/node/http2.js +3 -3
- package/bin/node/net.js +8 -8
- package/bin/node/path.js +17 -3
- package/bin/node/process.js +34 -11
- package/bin/node/readline.js +1 -1
- package/bin/node/registry.js +4 -1
- package/bin/node/sqlite.js +6 -6
- package/bin/node/stream.js +81 -15
- package/bin/node/stream_web.js +10 -10
- package/bin/node/system_extra.js +3 -3
- package/bin/node/test.js +674 -366
- package/bin/node/test_coverage.js +187 -0
- package/bin/node/test_report.js +1392 -0
- package/bin/node/test_run.js +575 -0
- package/bin/node/timers.js +4 -4
- package/bin/node/tls.js +5 -5
- package/bin/node/util.js +31 -7
- package/bin/node/util_extra.js +7 -7
- package/bin/node/webview.js +654 -0
- package/bin/node/worker_threads.js +1 -1
- package/bin/node/zlib.js +3 -3
- package/bin/parse-node.js +4 -0
- package/bin/transpiler.js +10390 -1178
- package/bin/version.js +1 -1
- package/conformance.md +468 -340
- package/examples/README.md +47 -10
- package/examples/desktop-notes/README.md +108 -0
- package/examples/desktop-notes/bench.mjs +125 -0
- package/examples/desktop-notes/main.ts +131 -0
- package/examples/desktop-notes/package-lock.json +726 -0
- package/examples/desktop-notes/package.json +9 -0
- package/examples/desktop-notes/ui.ts +176 -0
- package/examples/dupe-finder/README.md +76 -0
- package/examples/dupe-finder/bench.mjs +120 -0
- package/examples/dupe-finder/main.ts +87 -0
- package/examples/mandelbrot-png/README.md +65 -0
- package/examples/mandelbrot-png/bench.mjs +95 -0
- package/examples/mandelbrot-png/main.ts +98 -0
- package/examples/mandelbrot-png/preview.png +0 -0
- package/examples/marked-cli/README.md +159 -0
- package/examples/marked-cli/bench.mjs +178 -0
- package/examples/marked-cli/main.ts +292 -0
- package/examples/marked-cli/parity.mjs +185 -0
- package/examples/marked-cli/vendor/marked/LICENSE +44 -0
- package/examples/marked-cli/vendor/marked/VENDOR.md +26 -0
- package/examples/todo-cli/README.md +69 -0
- package/examples/todo-cli/bench.mjs +89 -0
- package/examples/todo-cli/main.ts +92 -0
- package/examples/yaml-cli/README.md +136 -0
- package/examples/yaml-cli/bench.mjs +265 -0
- package/examples/yaml-cli/main.ts +29 -0
- package/examples/yaml-cli/parity.mjs +156 -0
- package/examples/yaml-cli/vendor/yaml/LICENSE +13 -0
- package/examples/yaml-cli/vendor/yaml/VENDOR.md +25 -0
- package/govendor/github.com/jchv/go-webview2/LICENSE +22 -0
- package/govendor/github.com/jchv/go-webview2/README.md +21 -0
- package/govendor/github.com/jchv/go-webview2/common.go +84 -0
- package/govendor/github.com/jchv/go-webview2/go.mod +3 -0
- package/govendor/github.com/jchv/go-webview2/internal/w32/w32.go +194 -0
- package/govendor/github.com/jchv/go-webview2/internal/w32/w32_386.go +14 -0
- package/govendor/github.com/jchv/go-webview2/internal/w32/w32_64bit.go +15 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/COREWEBVIEW2_COLOR.go +8 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/COREWEBVIEW2_HOST_RESOURCE_ACCESS_KIND.go +9 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/COREWEBVIEW2_KEY_EVENT_KIND.go +10 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/COREWEBVIEW2_MOVE_FOCUS_REASON.go +9 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/COREWEBVIEW2_PHYSICAL_KEY_STATUS.go +10 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/COREWEBVIEW2_WEB_RESOURCE_CONTEXT.go +23 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/ICoreWebView2AcceleratorKeyPressedEventArgs.go +78 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/ICoreWebView2AcceleratorKeyPressedEventHandler.go +52 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/ICoreWebView2Controller.go +132 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/ICoreWebView2Controller2.go +74 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/ICoreWebView2CreateCoreWebView2ControllerCompletedHandler.go +48 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/ICoreWebView2NavigationCompletedEventArgs.go +17 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/ICoreWebView2NavigationCompletedEventHandler.go +48 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/ICoreWebView2Settings.go +270 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/ICoreWebView2WebResourceRequest.go +43 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/ICoreWebView2WebResourceRequestedEventArgs.go +51 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/ICoreWebView2WebResourceRequestedEventHandler.go +48 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/ICoreWebView2WebResourceResponse.go +21 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/ICoreWebView2_2.go +21 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/ICoreWebView2_3.go +60 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/ICoreWebViewSettings.go +396 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/chromium.go +361 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/chromium_386.go +24 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/chromium_amd64.go +22 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/chromium_arm64.go +26 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/comproc.go +13 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/comproc_go17.go +51 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/comproc_go18.go +16 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/corewebview2.go +411 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/guid.go +223 -0
- package/govendor/github.com/jchv/go-webview2/webview.go +482 -0
- package/govendor/github.com/jchv/go-webview2/webviewloader/README.md +3 -0
- package/govendor/github.com/jchv/go-webview2/webviewloader/module.go +153 -0
- package/govendor/github.com/jchv/go-webview2/webviewloader/module_386.go +6 -0
- package/govendor/github.com/jchv/go-webview2/webviewloader/module_amd64.go +6 -0
- package/govendor/github.com/jchv/go-webview2/webviewloader/module_arm64.go +6 -0
- package/govendor/github.com/jchv/go-webview2/webviewloader/sdk/arm64/WebView2Loader.dll +0 -0
- package/govendor/github.com/jchv/go-webview2/webviewloader/sdk/x64/WebView2Loader.dll +0 -0
- package/govendor/github.com/jchv/go-webview2/webviewloader/sdk/x86/WebView2Loader.dll +0 -0
- package/govendor/github.com/jchv/go-winloader/LICENSE.md +7 -0
- package/govendor/github.com/jchv/go-winloader/README.md +124 -0
- package/govendor/github.com/jchv/go-winloader/common.go +11 -0
- package/govendor/github.com/jchv/go-winloader/go.mod +3 -0
- package/govendor/github.com/jchv/go-winloader/internal/loader/loader.go +25 -0
- package/govendor/github.com/jchv/go-winloader/internal/loader/machine.go +53 -0
- package/govendor/github.com/jchv/go-winloader/internal/memloader/cache.go +42 -0
- package/govendor/github.com/jchv/go-winloader/internal/memloader/loader.go +253 -0
- package/govendor/github.com/jchv/go-winloader/internal/pe/export.go +76 -0
- package/govendor/github.com/jchv/go-winloader/internal/pe/format.go +522 -0
- package/govendor/github.com/jchv/go-winloader/internal/pe/import.go +106 -0
- package/govendor/github.com/jchv/go-winloader/internal/pe/module.go +91 -0
- package/govendor/github.com/jchv/go-winloader/internal/pe/reloc.go +177 -0
- package/govendor/github.com/jchv/go-winloader/internal/pe/util.go +40 -0
- package/govendor/github.com/jchv/go-winloader/internal/vmem/common.go +55 -0
- package/govendor/github.com/jchv/go-winloader/internal/vmem/memory_other.go +71 -0
- package/govendor/github.com/jchv/go-winloader/internal/vmem/memory_windows.go +179 -0
- package/govendor/github.com/jchv/go-winloader/internal/winloader/hacks_other.go +17 -0
- package/govendor/github.com/jchv/go-winloader/internal/winloader/hacks_windows.go +73 -0
- package/govendor/github.com/jchv/go-winloader/internal/winloader/loader_windows.go +64 -0
- package/govendor/github.com/jchv/go-winloader/internal/winloader/machine_windows.go +32 -0
- package/govendor/github.com/jchv/go-winloader/internal/winloader/nativearch_386.go +9 -0
- package/govendor/github.com/jchv/go-winloader/internal/winloader/nativearch_amd64.go +9 -0
- package/govendor/github.com/jchv/go-winloader/internal/winloader/nativearch_arm64.go +9 -0
- package/govendor/github.com/jchv/go-winloader/loader_other.go +24 -0
- package/govendor/github.com/jchv/go-winloader/loader_windows.go +33 -0
- package/govendor/manifest.txt +3 -1
- package/package.json +1 -1
- package/tsparser/main.go +4 -0
- package/types/typenative-npm.d.ts +190 -2
- package/types/typenative.d.ts +98 -31
|
@@ -0,0 +1,361 @@
|
|
|
1
|
+
//go:build windows
|
|
2
|
+
// +build windows
|
|
3
|
+
|
|
4
|
+
package edge
|
|
5
|
+
|
|
6
|
+
import (
|
|
7
|
+
"log"
|
|
8
|
+
"os"
|
|
9
|
+
"path/filepath"
|
|
10
|
+
"sync/atomic"
|
|
11
|
+
"unsafe"
|
|
12
|
+
|
|
13
|
+
"github.com/jchv/go-webview2/internal/w32"
|
|
14
|
+
"golang.org/x/sys/windows"
|
|
15
|
+
)
|
|
16
|
+
|
|
17
|
+
type Chromium struct {
|
|
18
|
+
hwnd uintptr
|
|
19
|
+
focusOnInit bool
|
|
20
|
+
controller *ICoreWebView2Controller
|
|
21
|
+
webview *ICoreWebView2
|
|
22
|
+
inited uintptr
|
|
23
|
+
envCompleted *iCoreWebView2CreateCoreWebView2EnvironmentCompletedHandler
|
|
24
|
+
controllerCompleted *iCoreWebView2CreateCoreWebView2ControllerCompletedHandler
|
|
25
|
+
webMessageReceived *iCoreWebView2WebMessageReceivedEventHandler
|
|
26
|
+
permissionRequested *iCoreWebView2PermissionRequestedEventHandler
|
|
27
|
+
webResourceRequested *iCoreWebView2WebResourceRequestedEventHandler
|
|
28
|
+
acceleratorKeyPressed *ICoreWebView2AcceleratorKeyPressedEventHandler
|
|
29
|
+
navigationCompleted *ICoreWebView2NavigationCompletedEventHandler
|
|
30
|
+
|
|
31
|
+
environment *ICoreWebView2Environment
|
|
32
|
+
|
|
33
|
+
// Settings
|
|
34
|
+
DataPath string
|
|
35
|
+
|
|
36
|
+
// permissions
|
|
37
|
+
permissions map[CoreWebView2PermissionKind]CoreWebView2PermissionState
|
|
38
|
+
globalPermission *CoreWebView2PermissionState
|
|
39
|
+
|
|
40
|
+
// Callbacks
|
|
41
|
+
MessageCallback func(string)
|
|
42
|
+
WebResourceRequestedCallback func(request *ICoreWebView2WebResourceRequest, args *ICoreWebView2WebResourceRequestedEventArgs)
|
|
43
|
+
NavigationCompletedCallback func(sender *ICoreWebView2, args *ICoreWebView2NavigationCompletedEventArgs)
|
|
44
|
+
AcceleratorKeyCallback func(uint) bool
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
func NewChromium() *Chromium {
|
|
48
|
+
e := &Chromium{}
|
|
49
|
+
/*
|
|
50
|
+
All these handlers are passed to native code through syscalls with 'uintptr(unsafe.Pointer(handler))' and we know
|
|
51
|
+
that a pointer to those will be kept in the native code. Furthermore these handlers als contain pointer to other Go
|
|
52
|
+
structs like the vtable.
|
|
53
|
+
This violates the unsafe.Pointer rule '(4) Conversion of a Pointer to a uintptr when calling syscall.Syscall.' because
|
|
54
|
+
theres no guarantee that Go doesn't move these objects.
|
|
55
|
+
AFAIK currently the Go runtime doesn't move HEAP objects, so we should be safe with these handlers. But they don't
|
|
56
|
+
guarantee it, because in the future Go might use a compacting GC.
|
|
57
|
+
There's a proposal to add a runtime.Pin function, to prevent moving pinned objects, which would allow to easily fix
|
|
58
|
+
this issue by just pinning the handlers. The https://go-review.googlesource.com/c/go/+/367296/ should land in Go 1.19.
|
|
59
|
+
*/
|
|
60
|
+
e.envCompleted = newICoreWebView2CreateCoreWebView2EnvironmentCompletedHandler(e)
|
|
61
|
+
e.controllerCompleted = newICoreWebView2CreateCoreWebView2ControllerCompletedHandler(e)
|
|
62
|
+
e.webMessageReceived = newICoreWebView2WebMessageReceivedEventHandler(e)
|
|
63
|
+
e.permissionRequested = newICoreWebView2PermissionRequestedEventHandler(e)
|
|
64
|
+
e.webResourceRequested = newICoreWebView2WebResourceRequestedEventHandler(e)
|
|
65
|
+
e.acceleratorKeyPressed = newICoreWebView2AcceleratorKeyPressedEventHandler(e)
|
|
66
|
+
e.navigationCompleted = newICoreWebView2NavigationCompletedEventHandler(e)
|
|
67
|
+
e.permissions = make(map[CoreWebView2PermissionKind]CoreWebView2PermissionState)
|
|
68
|
+
|
|
69
|
+
return e
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
func (e *Chromium) Embed(hwnd uintptr) bool {
|
|
73
|
+
e.hwnd = hwnd
|
|
74
|
+
|
|
75
|
+
dataPath := e.DataPath
|
|
76
|
+
if dataPath == "" {
|
|
77
|
+
currentExePath := make([]uint16, windows.MAX_PATH)
|
|
78
|
+
_, err := windows.GetModuleFileName(windows.Handle(0), ¤tExePath[0], windows.MAX_PATH)
|
|
79
|
+
if err != nil {
|
|
80
|
+
// What to do here?
|
|
81
|
+
return false
|
|
82
|
+
}
|
|
83
|
+
currentExeName := filepath.Base(windows.UTF16ToString(currentExePath))
|
|
84
|
+
dataPath = filepath.Join(os.Getenv("AppData"), currentExeName)
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
res, err := createCoreWebView2EnvironmentWithOptions(nil, windows.StringToUTF16Ptr(dataPath), 0, e.envCompleted)
|
|
88
|
+
if err != nil {
|
|
89
|
+
log.Printf("Error calling Webview2Loader: %v", err)
|
|
90
|
+
return false
|
|
91
|
+
} else if res != 0 {
|
|
92
|
+
log.Printf("Result: %08x", res)
|
|
93
|
+
return false
|
|
94
|
+
}
|
|
95
|
+
var msg w32.Msg
|
|
96
|
+
for {
|
|
97
|
+
if atomic.LoadUintptr(&e.inited) != 0 {
|
|
98
|
+
break
|
|
99
|
+
}
|
|
100
|
+
r, _, _ := w32.User32GetMessageW.Call(
|
|
101
|
+
uintptr(unsafe.Pointer(&msg)),
|
|
102
|
+
0,
|
|
103
|
+
0,
|
|
104
|
+
0,
|
|
105
|
+
)
|
|
106
|
+
if r == 0 {
|
|
107
|
+
break
|
|
108
|
+
}
|
|
109
|
+
_, _, _ = w32.User32TranslateMessage.Call(uintptr(unsafe.Pointer(&msg)))
|
|
110
|
+
_, _, _ = w32.User32DispatchMessageW.Call(uintptr(unsafe.Pointer(&msg)))
|
|
111
|
+
}
|
|
112
|
+
e.Init("window.external={invoke:s=>window.chrome.webview.postMessage(s)}")
|
|
113
|
+
return true
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
func (e *Chromium) Navigate(url string) {
|
|
117
|
+
_, _, _ = e.webview.vtbl.Navigate.Call(
|
|
118
|
+
uintptr(unsafe.Pointer(e.webview)),
|
|
119
|
+
uintptr(unsafe.Pointer(windows.StringToUTF16Ptr(url))),
|
|
120
|
+
)
|
|
121
|
+
}
|
|
122
|
+
|
|
123
|
+
func (e *Chromium) NavigateToString(htmlContent string) {
|
|
124
|
+
_, _, _ = e.webview.vtbl.NavigateToString.Call(
|
|
125
|
+
uintptr(unsafe.Pointer(e.webview)),
|
|
126
|
+
uintptr(unsafe.Pointer(windows.StringToUTF16Ptr(htmlContent))),
|
|
127
|
+
)
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
func (e *Chromium) Init(script string) {
|
|
131
|
+
_, _, _ = e.webview.vtbl.AddScriptToExecuteOnDocumentCreated.Call(
|
|
132
|
+
uintptr(unsafe.Pointer(e.webview)),
|
|
133
|
+
uintptr(unsafe.Pointer(windows.StringToUTF16Ptr(script))),
|
|
134
|
+
0,
|
|
135
|
+
)
|
|
136
|
+
}
|
|
137
|
+
|
|
138
|
+
func (e *Chromium) Eval(script string) {
|
|
139
|
+
_script, err := windows.UTF16PtrFromString(script)
|
|
140
|
+
if err != nil {
|
|
141
|
+
log.Fatal(err)
|
|
142
|
+
}
|
|
143
|
+
|
|
144
|
+
_, _, _ = e.webview.vtbl.ExecuteScript.Call(
|
|
145
|
+
uintptr(unsafe.Pointer(e.webview)),
|
|
146
|
+
uintptr(unsafe.Pointer(_script)),
|
|
147
|
+
0,
|
|
148
|
+
)
|
|
149
|
+
}
|
|
150
|
+
|
|
151
|
+
func (e *Chromium) Show() error {
|
|
152
|
+
return e.controller.PutIsVisible(true)
|
|
153
|
+
}
|
|
154
|
+
|
|
155
|
+
func (e *Chromium) Hide() error {
|
|
156
|
+
return e.controller.PutIsVisible(false)
|
|
157
|
+
}
|
|
158
|
+
|
|
159
|
+
func (e *Chromium) QueryInterface(_, _ uintptr) uintptr {
|
|
160
|
+
return 0
|
|
161
|
+
}
|
|
162
|
+
|
|
163
|
+
func (e *Chromium) AddRef() uintptr {
|
|
164
|
+
return 1
|
|
165
|
+
}
|
|
166
|
+
|
|
167
|
+
func (e *Chromium) Release() uintptr {
|
|
168
|
+
return 1
|
|
169
|
+
}
|
|
170
|
+
|
|
171
|
+
func (e *Chromium) EnvironmentCompleted(res uintptr, env *ICoreWebView2Environment) uintptr {
|
|
172
|
+
if int64(res) < 0 {
|
|
173
|
+
log.Fatalf("Creating environment failed with %08x", res)
|
|
174
|
+
}
|
|
175
|
+
_, _, _ = env.vtbl.AddRef.Call(uintptr(unsafe.Pointer(env)))
|
|
176
|
+
e.environment = env
|
|
177
|
+
|
|
178
|
+
_, _, _ = env.vtbl.CreateCoreWebView2Controller.Call(
|
|
179
|
+
uintptr(unsafe.Pointer(env)),
|
|
180
|
+
e.hwnd,
|
|
181
|
+
uintptr(unsafe.Pointer(e.controllerCompleted)),
|
|
182
|
+
)
|
|
183
|
+
return 0
|
|
184
|
+
}
|
|
185
|
+
|
|
186
|
+
func (e *Chromium) CreateCoreWebView2ControllerCompleted(res uintptr, controller *ICoreWebView2Controller) uintptr {
|
|
187
|
+
if int64(res) < 0 {
|
|
188
|
+
log.Fatalf("Creating controller failed with %08x", res)
|
|
189
|
+
}
|
|
190
|
+
_, _, _ = controller.vtbl.AddRef.Call(uintptr(unsafe.Pointer(controller)))
|
|
191
|
+
e.controller = controller
|
|
192
|
+
|
|
193
|
+
var token _EventRegistrationToken
|
|
194
|
+
_, _, _ = controller.vtbl.GetCoreWebView2.Call(
|
|
195
|
+
uintptr(unsafe.Pointer(controller)),
|
|
196
|
+
uintptr(unsafe.Pointer(&e.webview)),
|
|
197
|
+
)
|
|
198
|
+
_, _, _ = e.webview.vtbl.AddRef.Call(
|
|
199
|
+
uintptr(unsafe.Pointer(e.webview)),
|
|
200
|
+
)
|
|
201
|
+
_, _, _ = e.webview.vtbl.AddWebMessageReceived.Call(
|
|
202
|
+
uintptr(unsafe.Pointer(e.webview)),
|
|
203
|
+
uintptr(unsafe.Pointer(e.webMessageReceived)),
|
|
204
|
+
uintptr(unsafe.Pointer(&token)),
|
|
205
|
+
)
|
|
206
|
+
_, _, _ = e.webview.vtbl.AddPermissionRequested.Call(
|
|
207
|
+
uintptr(unsafe.Pointer(e.webview)),
|
|
208
|
+
uintptr(unsafe.Pointer(e.permissionRequested)),
|
|
209
|
+
uintptr(unsafe.Pointer(&token)),
|
|
210
|
+
)
|
|
211
|
+
_, _, _ = e.webview.vtbl.AddWebResourceRequested.Call(
|
|
212
|
+
uintptr(unsafe.Pointer(e.webview)),
|
|
213
|
+
uintptr(unsafe.Pointer(e.webResourceRequested)),
|
|
214
|
+
uintptr(unsafe.Pointer(&token)),
|
|
215
|
+
)
|
|
216
|
+
_, _, _ = e.webview.vtbl.AddNavigationCompleted.Call(
|
|
217
|
+
uintptr(unsafe.Pointer(e.webview)),
|
|
218
|
+
uintptr(unsafe.Pointer(e.navigationCompleted)),
|
|
219
|
+
uintptr(unsafe.Pointer(&token)),
|
|
220
|
+
)
|
|
221
|
+
|
|
222
|
+
_ = e.controller.AddAcceleratorKeyPressed(e.acceleratorKeyPressed, &token)
|
|
223
|
+
|
|
224
|
+
atomic.StoreUintptr(&e.inited, 1)
|
|
225
|
+
|
|
226
|
+
if e.focusOnInit {
|
|
227
|
+
e.Focus()
|
|
228
|
+
}
|
|
229
|
+
|
|
230
|
+
return 0
|
|
231
|
+
}
|
|
232
|
+
|
|
233
|
+
func (e *Chromium) MessageReceived(sender *ICoreWebView2, args *iCoreWebView2WebMessageReceivedEventArgs) uintptr {
|
|
234
|
+
var message *uint16
|
|
235
|
+
_, _, _ = args.vtbl.TryGetWebMessageAsString.Call(
|
|
236
|
+
uintptr(unsafe.Pointer(args)),
|
|
237
|
+
uintptr(unsafe.Pointer(&message)),
|
|
238
|
+
)
|
|
239
|
+
if e.MessageCallback != nil {
|
|
240
|
+
e.MessageCallback(w32.Utf16PtrToString(message))
|
|
241
|
+
}
|
|
242
|
+
_, _, _ = sender.vtbl.PostWebMessageAsString.Call(
|
|
243
|
+
uintptr(unsafe.Pointer(sender)),
|
|
244
|
+
uintptr(unsafe.Pointer(message)),
|
|
245
|
+
)
|
|
246
|
+
windows.CoTaskMemFree(unsafe.Pointer(message))
|
|
247
|
+
return 0
|
|
248
|
+
}
|
|
249
|
+
|
|
250
|
+
func (e *Chromium) SetPermission(kind CoreWebView2PermissionKind, state CoreWebView2PermissionState) {
|
|
251
|
+
e.permissions[kind] = state
|
|
252
|
+
}
|
|
253
|
+
|
|
254
|
+
func (e *Chromium) SetGlobalPermission(state CoreWebView2PermissionState) {
|
|
255
|
+
e.globalPermission = &state
|
|
256
|
+
}
|
|
257
|
+
|
|
258
|
+
func (e *Chromium) PermissionRequested(_ *ICoreWebView2, args *iCoreWebView2PermissionRequestedEventArgs) uintptr {
|
|
259
|
+
var kind CoreWebView2PermissionKind
|
|
260
|
+
_, _, _ = args.vtbl.GetPermissionKind.Call(
|
|
261
|
+
uintptr(unsafe.Pointer(args)),
|
|
262
|
+
uintptr(kind),
|
|
263
|
+
)
|
|
264
|
+
var result CoreWebView2PermissionState
|
|
265
|
+
if e.globalPermission != nil {
|
|
266
|
+
result = *e.globalPermission
|
|
267
|
+
} else {
|
|
268
|
+
var ok bool
|
|
269
|
+
result, ok = e.permissions[kind]
|
|
270
|
+
if !ok {
|
|
271
|
+
result = CoreWebView2PermissionStateDefault
|
|
272
|
+
}
|
|
273
|
+
}
|
|
274
|
+
_, _, _ = args.vtbl.PutState.Call(
|
|
275
|
+
uintptr(unsafe.Pointer(args)),
|
|
276
|
+
uintptr(result),
|
|
277
|
+
)
|
|
278
|
+
return 0
|
|
279
|
+
}
|
|
280
|
+
|
|
281
|
+
func (e *Chromium) WebResourceRequested(sender *ICoreWebView2, args *ICoreWebView2WebResourceRequestedEventArgs) uintptr {
|
|
282
|
+
req, err := args.GetRequest()
|
|
283
|
+
if err != nil {
|
|
284
|
+
log.Fatal(err)
|
|
285
|
+
}
|
|
286
|
+
if e.WebResourceRequestedCallback != nil {
|
|
287
|
+
e.WebResourceRequestedCallback(req, args)
|
|
288
|
+
}
|
|
289
|
+
return 0
|
|
290
|
+
}
|
|
291
|
+
|
|
292
|
+
func (e *Chromium) AddWebResourceRequestedFilter(filter string, ctx COREWEBVIEW2_WEB_RESOURCE_CONTEXT) {
|
|
293
|
+
err := e.webview.AddWebResourceRequestedFilter(filter, ctx)
|
|
294
|
+
if err != nil {
|
|
295
|
+
log.Fatal(err)
|
|
296
|
+
}
|
|
297
|
+
}
|
|
298
|
+
|
|
299
|
+
func (e *Chromium) Environment() *ICoreWebView2Environment {
|
|
300
|
+
return e.environment
|
|
301
|
+
}
|
|
302
|
+
|
|
303
|
+
// AcceleratorKeyPressed is called when an accelerator key is pressed.
|
|
304
|
+
// If the AcceleratorKeyCallback method has been set, it will defer handling of the keypress
|
|
305
|
+
// to the callback. That callback returns a bool indicating if the event was handled.
|
|
306
|
+
func (e *Chromium) AcceleratorKeyPressed(sender *ICoreWebView2Controller, args *ICoreWebView2AcceleratorKeyPressedEventArgs) uintptr {
|
|
307
|
+
if e.AcceleratorKeyCallback == nil {
|
|
308
|
+
return 0
|
|
309
|
+
}
|
|
310
|
+
eventKind, _ := args.GetKeyEventKind()
|
|
311
|
+
if eventKind == COREWEBVIEW2_KEY_EVENT_KIND_KEY_DOWN ||
|
|
312
|
+
eventKind == COREWEBVIEW2_KEY_EVENT_KIND_SYSTEM_KEY_DOWN {
|
|
313
|
+
virtualKey, _ := args.GetVirtualKey()
|
|
314
|
+
status, _ := args.GetPhysicalKeyStatus()
|
|
315
|
+
if !status.WasKeyDown {
|
|
316
|
+
_ = args.PutHandled(e.AcceleratorKeyCallback(virtualKey))
|
|
317
|
+
return 0
|
|
318
|
+
}
|
|
319
|
+
}
|
|
320
|
+
_ = args.PutHandled(false)
|
|
321
|
+
return 0
|
|
322
|
+
}
|
|
323
|
+
|
|
324
|
+
func (e *Chromium) GetSettings() (*ICoreWebViewSettings, error) {
|
|
325
|
+
return e.webview.GetSettings()
|
|
326
|
+
}
|
|
327
|
+
|
|
328
|
+
func (e *Chromium) GetController() *ICoreWebView2Controller {
|
|
329
|
+
return e.controller
|
|
330
|
+
}
|
|
331
|
+
|
|
332
|
+
func boolToInt(input bool) int {
|
|
333
|
+
if input {
|
|
334
|
+
return 1
|
|
335
|
+
}
|
|
336
|
+
return 0
|
|
337
|
+
}
|
|
338
|
+
|
|
339
|
+
func (e *Chromium) NavigationCompleted(sender *ICoreWebView2, args *ICoreWebView2NavigationCompletedEventArgs) uintptr {
|
|
340
|
+
if e.NavigationCompletedCallback != nil {
|
|
341
|
+
e.NavigationCompletedCallback(sender, args)
|
|
342
|
+
}
|
|
343
|
+
return 0
|
|
344
|
+
}
|
|
345
|
+
|
|
346
|
+
func (e *Chromium) NotifyParentWindowPositionChanged() error {
|
|
347
|
+
//It looks like the wndproc function is called before the controller initialization is complete.
|
|
348
|
+
//Because of this the controller is nil
|
|
349
|
+
if e.controller == nil {
|
|
350
|
+
return nil
|
|
351
|
+
}
|
|
352
|
+
return e.controller.NotifyParentWindowPositionChanged()
|
|
353
|
+
}
|
|
354
|
+
|
|
355
|
+
func (e *Chromium) Focus() {
|
|
356
|
+
if e.controller == nil {
|
|
357
|
+
e.focusOnInit = true
|
|
358
|
+
return
|
|
359
|
+
}
|
|
360
|
+
_ = e.controller.MoveFocus(COREWEBVIEW2_MOVE_FOCUS_REASON_PROGRAMMATIC)
|
|
361
|
+
}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
//go:build windows
|
|
2
|
+
// +build windows
|
|
3
|
+
|
|
4
|
+
package edge
|
|
5
|
+
|
|
6
|
+
import (
|
|
7
|
+
"unsafe"
|
|
8
|
+
"github.com/jchv/go-webview2/internal/w32"
|
|
9
|
+
)
|
|
10
|
+
|
|
11
|
+
func (e *Chromium) Resize() {
|
|
12
|
+
if e.controller == nil {
|
|
13
|
+
return
|
|
14
|
+
}
|
|
15
|
+
var bounds w32.Rect
|
|
16
|
+
w32.User32GetClientRect.Call(e.hwnd, uintptr(unsafe.Pointer(&bounds)))
|
|
17
|
+
e.controller.vtbl.PutBounds.Call(
|
|
18
|
+
uintptr(unsafe.Pointer(e.controller)),
|
|
19
|
+
uintptr(bounds.Left),
|
|
20
|
+
uintptr(bounds.Top),
|
|
21
|
+
uintptr(bounds.Right),
|
|
22
|
+
uintptr(bounds.Bottom),
|
|
23
|
+
)
|
|
24
|
+
}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
//go:build windows
|
|
2
|
+
// +build windows
|
|
3
|
+
|
|
4
|
+
package edge
|
|
5
|
+
|
|
6
|
+
import (
|
|
7
|
+
"unsafe"
|
|
8
|
+
|
|
9
|
+
"github.com/jchv/go-webview2/internal/w32"
|
|
10
|
+
)
|
|
11
|
+
|
|
12
|
+
func (e *Chromium) Resize() {
|
|
13
|
+
if e.controller == nil {
|
|
14
|
+
return
|
|
15
|
+
}
|
|
16
|
+
var bounds w32.Rect
|
|
17
|
+
_, _, _ = w32.User32GetClientRect.Call(e.hwnd, uintptr(unsafe.Pointer(&bounds)))
|
|
18
|
+
_, _, _ = e.controller.vtbl.PutBounds.Call(
|
|
19
|
+
uintptr(unsafe.Pointer(e.controller)),
|
|
20
|
+
uintptr(unsafe.Pointer(&bounds)),
|
|
21
|
+
)
|
|
22
|
+
}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
//go:build windows
|
|
2
|
+
// +build windows
|
|
3
|
+
|
|
4
|
+
package edge
|
|
5
|
+
|
|
6
|
+
import (
|
|
7
|
+
"unsafe"
|
|
8
|
+
|
|
9
|
+
"github.com/jchv/go-webview2/internal/w32"
|
|
10
|
+
)
|
|
11
|
+
|
|
12
|
+
func (e *Chromium) Resize() {
|
|
13
|
+
if e.controller == nil {
|
|
14
|
+
return
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
var bounds w32.Rect
|
|
18
|
+
w32.User32GetClientRect.Call(e.hwnd, uintptr(unsafe.Pointer(&bounds)))
|
|
19
|
+
|
|
20
|
+
words := (*[2]uintptr)(unsafe.Pointer(&bounds))
|
|
21
|
+
e.controller.vtbl.PutBounds.Call(
|
|
22
|
+
uintptr(unsafe.Pointer(e.controller)),
|
|
23
|
+
words[0],
|
|
24
|
+
words[1],
|
|
25
|
+
)
|
|
26
|
+
}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
package edge
|
|
2
|
+
|
|
3
|
+
import (
|
|
4
|
+
"golang.org/x/sys/windows"
|
|
5
|
+
)
|
|
6
|
+
|
|
7
|
+
// ComProc stores a COM procedure.
|
|
8
|
+
type ComProc uintptr
|
|
9
|
+
|
|
10
|
+
// NewComProc creates a new COM proc from a Go function.
|
|
11
|
+
func NewComProc(fn interface{}) ComProc {
|
|
12
|
+
return ComProc(windows.NewCallback(fn))
|
|
13
|
+
}
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
//go:build !go1.18
|
|
2
|
+
// +build !go1.18
|
|
3
|
+
|
|
4
|
+
package edge
|
|
5
|
+
|
|
6
|
+
import "syscall"
|
|
7
|
+
|
|
8
|
+
//go:uintptrescapes
|
|
9
|
+
// Call calls a COM procedure.
|
|
10
|
+
func (p ComProc) Call(a ...uintptr) (r1, r2 uintptr, lastErr error) {
|
|
11
|
+
// The magic uintptrescapes comment is needed to prevent moving uintptr(unsafe.Pointer(p)) so calls to .Call() also
|
|
12
|
+
// satisfy the unsafe.Pointer rule "(4) Conversion of a Pointer to a uintptr when calling syscall.Syscall."
|
|
13
|
+
// Otherwise it might be that pointers get moved, especially pointer onto the Go stack which might grow dynamically.
|
|
14
|
+
// See https://pkg.go.dev/unsafe#Pointer and https://github.com/golang/go/issues/34474
|
|
15
|
+
switch len(a) {
|
|
16
|
+
case 0:
|
|
17
|
+
return syscall.Syscall(uintptr(p), 0, 0, 0, 0)
|
|
18
|
+
case 1:
|
|
19
|
+
return syscall.Syscall(uintptr(p), 1, a[0], 0, 0)
|
|
20
|
+
case 2:
|
|
21
|
+
return syscall.Syscall(uintptr(p), 2, a[0], a[1], 0)
|
|
22
|
+
case 3:
|
|
23
|
+
return syscall.Syscall(uintptr(p), 3, a[0], a[1], a[2])
|
|
24
|
+
case 4:
|
|
25
|
+
return syscall.Syscall6(uintptr(p), 4, a[0], a[1], a[2], a[3], 0, 0)
|
|
26
|
+
case 5:
|
|
27
|
+
return syscall.Syscall6(uintptr(p), 5, a[0], a[1], a[2], a[3], a[4], 0)
|
|
28
|
+
case 6:
|
|
29
|
+
return syscall.Syscall6(uintptr(p), 6, a[0], a[1], a[2], a[3], a[4], a[5])
|
|
30
|
+
case 7:
|
|
31
|
+
return syscall.Syscall9(uintptr(p), 7, a[0], a[1], a[2], a[3], a[4], a[5], a[6], 0, 0)
|
|
32
|
+
case 8:
|
|
33
|
+
return syscall.Syscall9(uintptr(p), 8, a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], 0)
|
|
34
|
+
case 9:
|
|
35
|
+
return syscall.Syscall9(uintptr(p), 9, a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8])
|
|
36
|
+
case 10:
|
|
37
|
+
return syscall.Syscall12(uintptr(p), 10, a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], 0, 0)
|
|
38
|
+
case 11:
|
|
39
|
+
return syscall.Syscall12(uintptr(p), 11, a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], 0)
|
|
40
|
+
case 12:
|
|
41
|
+
return syscall.Syscall12(uintptr(p), 12, a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], a[11])
|
|
42
|
+
case 13:
|
|
43
|
+
return syscall.Syscall15(uintptr(p), 13, a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], a[11], a[12], 0, 0)
|
|
44
|
+
case 14:
|
|
45
|
+
return syscall.Syscall15(uintptr(p), 14, a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], a[11], a[12], a[13], 0)
|
|
46
|
+
case 15:
|
|
47
|
+
return syscall.Syscall15(uintptr(p), 15, a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], a[11], a[12], a[13], a[14])
|
|
48
|
+
default:
|
|
49
|
+
panic("too many arguments")
|
|
50
|
+
}
|
|
51
|
+
}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
//go:build go1.18
|
|
2
|
+
// +build go1.18
|
|
3
|
+
|
|
4
|
+
package edge
|
|
5
|
+
|
|
6
|
+
import "syscall"
|
|
7
|
+
|
|
8
|
+
//go:uintptrescapes
|
|
9
|
+
// Call calls a COM procedure.
|
|
10
|
+
func (p ComProc) Call(a ...uintptr) (r1, r2 uintptr, lastErr error) {
|
|
11
|
+
// The magic uintptrescapes comment is needed to prevent moving uintptr(unsafe.Pointer(p)) so calls to .Call() also
|
|
12
|
+
// satisfy the unsafe.Pointer rule "(4) Conversion of a Pointer to a uintptr when calling syscall.Syscall."
|
|
13
|
+
// Otherwise it might be that pointers get moved, especially pointer onto the Go stack which might grow dynamically.
|
|
14
|
+
// See https://pkg.go.dev/unsafe#Pointer and https://github.com/golang/go/issues/34474
|
|
15
|
+
return syscall.SyscallN(uintptr(p), a...)
|
|
16
|
+
}
|