同步官方dc24628cff851ffa030cbe43068a9c33ed516159版本大部分内容

Author: mzky

.idea/.gitignore

@@ -61,6 +61,10 @@ type WebView interface {
 	// properly, webview will re-encode it for you.
 	Navigate(url string)
 
+	// SetHtml sets the webview HTML directly.
+	// The origin of the page is `about:blank`.
+	SetHtml(html string)
+
 	// Init injects JavaScript code at the initialization of the new page. Every
 	// time the webview will open a the new page - this initialization code will
 	// be executed. It is guaranteed that code is executed before window.onload.

common.go

@@ -33,6 +33,7 @@ var (
 	User32DefWindowProcW     = user32.NewProc("DefWindowProcW")
 	User32GetClientRect      = user32.NewProc("GetClientRect")
 	User32PostQuitMessage    = user32.NewProc("PostQuitMessage")
+	User32PostMessageW       = user32.NewProc("PostMessageW")
 	User32SetWindowTextW     = user32.NewProc("SetWindowTextW")
 	User32PostThreadMessageW = user32.NewProc("PostThreadMessageW")
 	User32GetWindowLongPtrW  = user32.NewProc("GetWindowLongPtrW")
@@ -119,7 +120,7 @@ const (
 
 const (
 	WSOverlapped       = 0x00000000
-	WSMaximizeBox      = 0x00020000
+	WSMaximizeBox      = 0x00010000
 	WSThickFrame       = 0x00040000
 	WSCaption          = 0x00C00000
 	WSSysMenu          = 0x00080000

internal/w32/w32.go

@@ -120,6 +120,13 @@ func (e *Chromium) Navigate(url string) {
 	)
 }
 
+func (e *Chromium) NavigateToString(htmlContent string) {
+	_, _, _ = e.webview.vtbl.NavigateToString.Call(
+		uintptr(unsafe.Pointer(e.webview)),
+		uintptr(unsafe.Pointer(windows.StringToUTF16Ptr(htmlContent))),
+	)
+}
+
 func (e *Chromium) Init(script string) {
 	_, _, _ = e.webview.vtbl.AddScriptToExecuteOnDocumentCreated.Call(
 		uintptr(unsafe.Pointer(e.webview)),

pkg/edge/chromium.go

@@ -41,6 +41,7 @@ type browser interface {
 	Embed(hWnd uintptr) bool
 	Resize()
 	Navigate(url string)
+	NavigateToString(htmlContent string)
 	Init(script string)
 	Eval(script string)
 	NotifyParentWindowPositionChanged() error
@@ -338,9 +339,9 @@ func (w *webview) CreateWithOptions(opts WindowOptions) bool {
 	)
 	setWindowContext(w.hWnd, w)
 
-	_, _, _ = w32.User32ShowWindow.Call(w.hWnd, w32.SWSHOWNOACTIVATE)
-	_, _, _ = w32.User32ShowWindow.Call(w.hWnd, w32.SWSHOWMINIMIZED)
-	_, _, _ = w32.User32ShowWindow.Call(w.hWnd, w32.SWMINIMIZE)
+	_, _, _ = w32.User32ShowWindow.Call(w.hWnd, w32.SWShow)
+	_, _, _ = w32.User32UpdateWindow.Call(w.hWnd)
+	_, _, _ = w32.User32SetFocus.Call(w.hWnd)
 
 	_, _, _ = w32.User32UpdateWindow.Call(w.hWnd)
 	_, _, _ = w32.User32SetFocus.Call(w.hWnd)
@@ -392,6 +393,10 @@ func (w *webview) Start(callback func()) {
 	}
 }
 
+func (w *webview) SetHtml(html string) {
+	w.browser.NavigateToString(html)
+}
+
 func (w *webview) Terminate() {
 	_, _, _ = w32.User32PostQuitMessage.Call(0)
 }

webview.go

@@ -3,6 +3,7 @@ package webviewloader
 import (
 	_ "embed"
 	"fmt"
+	"github.com/jchv/go-winloader"
 	"golang.org/x/sys/windows/registry"
 	"io/ioutil"
 	"os"
@@ -13,7 +14,6 @@ import (
 	"syscall"
 	"unsafe"
 
-	"github.com/jchv/go-winloader"
 	"golang.org/x/sys/windows"
 )
 
@@ -79,26 +79,30 @@ func GetInstalledVersion() (string, error) {
 	if nativeErr == nil {
 		nativeErr = nativeGetAvailableCoreWebView2BrowserVersionString.Find()
 	}
-	var err error
+	var hr uintptr
 	var result *uint16
 	if nativeErr != nil {
-		err = loadFromMemory(nativeErr)
-		if err != nil {
+		if err := loadFromMemory(nativeErr); err != nil {
 			return "", fmt.Errorf("Unable to load WebView2Loader.dll from disk: %v -- or from memory: %w", nativeErr, memErr)
 		}
-		_, _, err = memGetAvailableCoreWebView2BrowserVersionString.Call(
+		hr64, _, _ := memGetAvailableCoreWebView2BrowserVersionString.Call(
 			uint64(uintptr(unsafe.Pointer(nil))),
 			uint64(uintptr(unsafe.Pointer(&result))))
+		hr = uintptr(hr64) // The return size of the HRESULT will be whatver native size is (i.e uintptr) and not 64-bits on 32-bit systems.  In both cases it should be interpreted as 32-bits (a LONG).
 	} else {
-		_, _, err = nativeCompareBrowserVersions.Call(
+		hr, _, _ = nativeGetAvailableCoreWebView2BrowserVersionString.Call(
 			uintptr(unsafe.Pointer(nil)),
 			uintptr(unsafe.Pointer(&result)))
 	}
-	if err != nil {
-		return "", err
+	defer windows.CoTaskMemFree(unsafe.Pointer(result)) // Safe even if result is nil
+	if hr != uintptr(windows.S_OK) {
+		if hr&0xFFFF == uintptr(windows.ERROR_FILE_NOT_FOUND) {
+			// The lower 16-bits (the error code itself) of the HRESULT is ERROR_FILE_NOT_FOUND which means the system isn't installed.
+			return "", nil // Return a blank string but no error since we successfully detected no install.
+		}
+		return "", fmt.Errorf("GetAvailableCoreWebView2BrowserVersionString returned HRESULT 0x%X", hr)
 	}
-	version := windows.UTF16PtrToString(result)
-	windows.CoTaskMemFree(unsafe.Pointer(result))
+	version := windows.UTF16PtrToString(result) // Safe even if result is nil
 	return version, nil
 }