From d405bd48f0c1e9dd7107de8538dfb082af0bf98f Mon Sep 17 00:00:00 2001 From: Lea O'Anthony Date: Mon, 5 Aug 2024 05:22:00 +1000 Subject: [PATCH] Fix tests for Windows --- v3/pkg/application/application_windows.go | 4 ++-- v3/pkg/application/menuitem_windows.go | 2 +- v3/pkg/application/webview_window_windows.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/v3/pkg/application/application_windows.go b/v3/pkg/application/application_windows.go index 67f7f7048..ddc9a58fb 100644 --- a/v3/pkg/application/application_windows.go +++ b/v3/pkg/application/application_windows.go @@ -318,7 +318,7 @@ func (m *windowsApp) unregisterWindow(w *windowsWebviewWindow) { func newPlatformApp(app *App) *windowsApp { err := w32.SetProcessDPIAware() if err != nil { - globalApplication.fatal("Fatal error in application initialisation: ", err.Error()) + globalApplication.fatal("Fatal error in application initialisation: %s", err.Error()) os.Exit(1) } @@ -361,5 +361,5 @@ func (a *App) platformEnvironment() map[string]any { func fatalHandler(errFunc func(error)) { w32.Fatal = errFunc - return + return } diff --git a/v3/pkg/application/menuitem_windows.go b/v3/pkg/application/menuitem_windows.go index 691b4ec7d..8d9fdb0d0 100644 --- a/v3/pkg/application/menuitem_windows.go +++ b/v3/pkg/application/menuitem_windows.go @@ -114,7 +114,7 @@ func (m *windowsMenuItem) setBitmap(bitmap []byte) { // Set the icon err := w32.SetMenuIcons(m.hMenu, m.id, bitmap, nil) if err != nil { - globalApplication.error("Unable to set bitmap on menu item", "error", err.Error()) + globalApplication.error("Unable to set bitmap on menu item: %s", err.Error()) return } m.update() diff --git a/v3/pkg/application/webview_window_windows.go b/v3/pkg/application/webview_window_windows.go index 9a369a959..0631a1875 100644 --- a/v3/pkg/application/webview_window_windows.go +++ b/v3/pkg/application/webview_window_windows.go @@ -1318,7 +1318,7 @@ func (w *windowsWebviewWindow) processRequest(req *edge.ICoreWebView2WebResource uri, _ := req.GetUri() reqUri, err := url.ParseRequestURI(uri) if err != nil { - globalApplication.error("Unable to parse request uri", "uri", uri, "error", err) + globalApplication.error("Unable to parse request uri: uri='%s' error='%s'", uri, err) return }