From f70d9de366c25cd2c3eef5465c1a625900ab354f Mon Sep 17 00:00:00 2001 From: Misite Bao Date: Tue, 6 Dec 2022 03:45:06 +0800 Subject: [PATCH] fix: fix `go test` errors (#2169) * fix: fix go test errors * Add flags to mac test * Run on all branches * Update PR workflow Co-authored-by: Lea Anthony --- .github/workflows/build-and-test.yml | 12 ++++++++-- .github/workflows/pr.yml | 13 ++++++++--- .github/workflows/push.yml | 2 +- v2/cmd/wails/build.go | 13 ++++++----- v2/cmd/wails/doctor.go | 9 ++++---- v2/cmd/wails/main.go | 7 +++--- v2/cmd/wails/update.go | 8 ++++--- .../frontend/desktop/windows/dialog_test.go | 5 +++- .../windows/go-webview2/internal/w32/w32.go | 5 +++- .../go-webview2/pkg/combridge/bridge.go | 2 ++ .../go-webview2/pkg/combridge/iunknown.go | 2 ++ .../pkg/combridge/iunknown_impl.go | 2 ++ .../go-webview2/pkg/combridge/syscall.go | 2 ++ .../go-webview2/pkg/combridge/vtables.go | 2 ++ .../pkg/edge/COREWEBVIEW2_COLOR.go | 2 ++ .../COREWEBVIEW2_HOST_RESOURCE_ACCESS_KIND.go | 2 ++ .../pkg/edge/COREWEBVIEW2_KEY_EVENT_KIND.go | 2 ++ .../edge/COREWEBVIEW2_MOVE_FOCUS_REASON.go | 2 ++ .../edge/COREWEBVIEW2_PHYSICAL_KEY_STATUS.go | 2 ++ .../edge/COREWEBVIEW2_WEB_RESOURCE_CONTEXT.go | 2 ++ ...eWebView2AcceleratorKeyPressedEventArgs.go | 5 +++- ...bView2AcceleratorKeyPressedEventHandler.go | 2 ++ .../pkg/edge/ICoreWebView2Controller.go | 7 ++++-- .../pkg/edge/ICoreWebView2Controller2.go | 5 +++- ...eCoreWebView2ControllerCompletedHandler.go | 2 ++ ...reWebView2HttpHeadersCollectionIterator.go | 2 ++ .../edge/ICoreWebView2HttpRequestHeaders.go | 2 ++ ...oreWebView2NavigationCompletedEventArgs.go | 2 ++ ...WebView2NavigationCompletedEventHandler.go | 2 ++ .../pkg/edge/ICoreWebView2Settings.go | 5 +++- .../edge/ICoreWebView2WebResourceRequest.go | 2 ++ ...reWebView2WebResourceRequestedEventArgs.go | 5 +++- ...ebView2WebResourceRequestedEventHandler.go | 2 ++ .../edge/ICoreWebView2WebResourceResponse.go | 2 ++ .../go-webview2/pkg/edge/ICoreWebView2_2.go | 2 ++ .../go-webview2/pkg/edge/ICoreWebView2_3.go | 2 ++ .../pkg/edge/ICoreWebViewSettings.go | 2 ++ .../windows/go-webview2/pkg/edge/IStream.go | 2 ++ .../go-webview2/pkg/edge/create_env_go.go | 2 +- .../go-webview2/pkg/edge/create_env_native.go | 2 +- .../windows/go-webview2/pkg/edge/guid.go | 12 ++++++---- .../go-webview2/webviewloader/env_create.go | 2 +- .../webviewloader/env_create_options.go | 2 +- .../go-webview2/webviewloader/find_dll.go | 2 ++ .../webviewloader/find_dll_installed.go | 2 +- .../webviewloader/native_module.go | 2 +- .../go-webview2/webviewloader/syscall.go | 2 ++ v2/internal/frontend/desktop/windows/theme.go | 2 ++ .../frontend/desktop/windows/win32/theme.go | 5 +++- .../frontend/desktop/windows/winc/app.go | 3 ++- .../frontend/desktop/windows/winc/bitmap.go | 2 ++ .../frontend/desktop/windows/winc/brush.go | 2 ++ .../frontend/desktop/windows/winc/buttons.go | 2 ++ .../frontend/desktop/windows/winc/canvas.go | 2 ++ .../frontend/desktop/windows/winc/color.go | 2 ++ .../frontend/desktop/windows/winc/combobox.go | 2 ++ .../desktop/windows/winc/commondlgs.go | 2 ++ .../desktop/windows/winc/controlbase.go | 4 +++- .../desktop/windows/winc/controller.go | 2 ++ .../frontend/desktop/windows/winc/dialog.go | 2 ++ .../frontend/desktop/windows/winc/edit.go | 4 +++- .../frontend/desktop/windows/winc/event.go | 2 ++ .../desktop/windows/winc/eventdata.go | 2 ++ .../desktop/windows/winc/eventmanager.go | 2 ++ .../frontend/desktop/windows/winc/font.go | 2 ++ .../frontend/desktop/windows/winc/form.go | 2 ++ .../desktop/windows/winc/globalvars.go | 6 +++-- .../frontend/desktop/windows/winc/icon.go | 2 ++ .../desktop/windows/winc/imagelist.go | 2 ++ .../desktop/windows/winc/imageview.go | 2 ++ .../desktop/windows/winc/imageviewbox.go | 2 ++ .../frontend/desktop/windows/winc/init.go | 2 ++ .../frontend/desktop/windows/winc/keyboard.go | 2 ++ .../frontend/desktop/windows/winc/label.go | 2 ++ .../frontend/desktop/windows/winc/layout.go | 2 ++ .../frontend/desktop/windows/winc/listview.go | 2 ++ .../frontend/desktop/windows/winc/menu.go | 2 ++ .../desktop/windows/winc/mousecontrol.go | 2 ++ .../windows/winc/msghandlerregistry.go | 2 ++ .../frontend/desktop/windows/winc/panel.go | 2 ++ .../frontend/desktop/windows/winc/path.go | 2 ++ .../frontend/desktop/windows/winc/pen.go | 2 ++ .../desktop/windows/winc/progressbar.go | 2 ++ .../frontend/desktop/windows/winc/rect.go | 2 ++ .../frontend/desktop/windows/winc/resizer.go | 2 ++ .../desktop/windows/winc/scrollview.go | 2 ++ .../frontend/desktop/windows/winc/slider.go | 2 ++ .../frontend/desktop/windows/winc/tabview.go | 2 ++ .../frontend/desktop/windows/winc/toolbar.go | 2 ++ .../frontend/desktop/windows/winc/tooltip.go | 2 ++ .../frontend/desktop/windows/winc/treeview.go | 2 ++ .../frontend/desktop/windows/winc/utils.go | 2 ++ .../desktop/windows/winc/w32/comctl32.go | 2 ++ .../desktop/windows/winc/w32/comdlg32.go | 3 ++- .../desktop/windows/winc/w32/constants.go | 9 ++++---- .../desktop/windows/winc/w32/dwmapi.go | 2 ++ .../desktop/windows/winc/w32/gdi32.go | 3 ++- .../desktop/windows/winc/w32/gdiplus.go | 3 ++- .../desktop/windows/winc/w32/idispatch.go | 3 ++- .../desktop/windows/winc/w32/istream.go | 3 ++- .../desktop/windows/winc/w32/iunknown.go | 3 ++- .../desktop/windows/winc/w32/kernel32.go | 3 ++- .../desktop/windows/winc/w32/ole32.go | 3 ++- .../desktop/windows/winc/w32/oleaut32.go | 3 ++- .../desktop/windows/winc/w32/shcore.go | 2 ++ .../desktop/windows/winc/w32/shell32.go | 3 ++- .../desktop/windows/winc/w32/shlwapi.go | 2 ++ .../desktop/windows/winc/w32/toolbar.go | 2 ++ .../desktop/windows/winc/w32/typedef.go | 2 ++ .../desktop/windows/winc/w32/user32.go | 2 ++ .../desktop/windows/winc/w32/utils.go | 2 ++ .../desktop/windows/winc/w32/uxtheme.go | 2 ++ .../frontend/desktop/windows/winc/w32/vars.go | 2 ++ .../frontend/desktop/windows/winc/wndproc.go | 2 ++ v2/internal/gomod/gomod_test.go | 2 ++ v2/internal/project/project.go | 6 ++--- v2/internal/project/project_test.go | 23 +++++++++++++++---- .../system/operatingsystem/os_windows.go | 2 ++ .../system/operatingsystem/version_windows.go | 5 +++- v2/internal/wv2installer/browser.go | 4 ++-- v2/internal/wv2installer/download.go | 5 ++-- v2/internal/wv2installer/embed.go | 4 ++-- v2/internal/wv2installer/error.go | 4 ++-- v2/pkg/commands/build/base.go | 3 +-- v2/pkg/commands/build/build.go | 5 ++-- 125 files changed, 320 insertions(+), 83 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index d4dc6aaa..93fb12f0 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -2,7 +2,7 @@ name: Build + Test on: push: - branches: [*] + branches: [release/*, master] workflow_dispatch: jobs: @@ -28,7 +28,15 @@ jobs: with: go-version: ${{ matrix.go-version }} - - name: Run tests + - name: Run tests (mac) + if: matrix.os == 'macos-latest' + env: + CGO_LDFLAGS: -framework UniformTypeIdentifiers -mmacosx-version-min=10.13 + working-directory: ./v2 + run: go test -v ./... + + - name: Run tests (!mac) + if: matrix.os != 'macos-latest' working-directory: ./v2 run: go test -v ./... diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 7e85482e..6db750b7 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -48,7 +48,14 @@ jobs: with: go-version: ${{ matrix.go-version }} - - name: Run tests + - name: Run tests (mac) + if: matrix.os == 'macos-latest' + env: + CGO_LDFLAGS: -framework UniformTypeIdentifiers -mmacosx-version-min=10.13 working-directory: ./v2 - run: | - go test -v ./... + run: go test -v ./... + + - name: Run tests (!mac) + if: matrix.os != 'macos-latest' + working-directory: ./v2 + run: go test -v ./... diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 59d73029..916148e4 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -1,4 +1,4 @@ -name: Push +name: Push Checks on: push: diff --git a/v2/cmd/wails/build.go b/v2/cmd/wails/build.go index da9cf713..863cafcf 100644 --- a/v2/cmd/wails/build.go +++ b/v2/cmd/wails/build.go @@ -2,6 +2,11 @@ package main import ( "fmt" + "os" + "runtime" + "strings" + "time" + "github.com/leaanthony/slicer" "github.com/pterm/pterm" "github.com/wailsapp/wails/v2/cmd/wails/flags" @@ -10,10 +15,6 @@ import ( "github.com/wailsapp/wails/v2/internal/project" "github.com/wailsapp/wails/v2/pkg/clilogger" "github.com/wailsapp/wails/v2/pkg/commands/build" - "os" - "runtime" - "strings" - "time" ) func buildApplication(f *flags.Build) error { @@ -167,12 +168,12 @@ func buildApplication(f *flags.Build) error { switch buildOptions.Platform { case "linux": if runtime.GOOS != "linux" { - pterm.Warning.Println("Crosscompiling to Linux not currently supported.\n") + pterm.Warning.Println("Crosscompiling to Linux not currently supported.") return } case "darwin": if runtime.GOOS != "darwin" { - pterm.Warning.Println("Crosscompiling to Mac not currently supported.\n") + pterm.Warning.Println("Crosscompiling to Mac not currently supported.") return } macTargets := targets.Filter(func(platform string) bool { diff --git a/v2/cmd/wails/doctor.go b/v2/cmd/wails/doctor.go index 836b963e..3c8a2d71 100644 --- a/v2/cmd/wails/doctor.go +++ b/v2/cmd/wails/doctor.go @@ -1,14 +1,15 @@ package main import ( + "runtime" + "runtime/debug" + "strings" + "github.com/pterm/pterm" "github.com/wailsapp/wails/v2/cmd/wails/flags" "github.com/wailsapp/wails/v2/internal/colour" "github.com/wailsapp/wails/v2/internal/system" "github.com/wailsapp/wails/v2/internal/system/packagemanager" - "runtime" - "runtime/debug" - "strings" ) func diagnoseEnvironment(f *flags.Doctor) error { @@ -144,7 +145,7 @@ func diagnoseEnvironment(f *flags.Doctor) error { if len(dependenciesMissing) == 0 && dependenciesAvailableRequired == 0 { pterm.Println("Your system is ready for Wails development!") } else { - pterm.Println("Your system has missing dependencies!\n") + pterm.Println("Your system has missing dependencies!") } if dependenciesAvailableRequired != 0 { diff --git a/v2/cmd/wails/main.go b/v2/cmd/wails/main.go index fbbeb2d0..7a09559e 100644 --- a/v2/cmd/wails/main.go +++ b/v2/cmd/wails/main.go @@ -2,11 +2,12 @@ package main import ( "fmt" - "github.com/pterm/pterm" - "github.com/wailsapp/wails/v2/cmd/wails/internal" "os" "strings" + "github.com/pterm/pterm" + "github.com/wailsapp/wails/v2/cmd/wails/internal" + "github.com/wailsapp/wails/v2/internal/colour" "github.com/leaanthony/clir" @@ -52,7 +53,7 @@ func printFooter() { }, } printer.Println("If Wails is useful to you or your company, please consider sponsoring the project:") - pterm.Println("https://github.com/sponsors/leaanthony\n") + pterm.Println("https://github.com/sponsors/leaanthony") } func bool2Str(b bool) string { diff --git a/v2/cmd/wails/update.go b/v2/cmd/wails/update.go index 1bdba7e7..ac0e7375 100644 --- a/v2/cmd/wails/update.go +++ b/v2/cmd/wails/update.go @@ -2,12 +2,13 @@ package main import ( "fmt" + "os" + "github.com/labstack/gommon/color" "github.com/pterm/pterm" "github.com/wailsapp/wails/v2/cmd/wails/flags" "github.com/wailsapp/wails/v2/internal/colour" "github.com/wailsapp/wails/v2/internal/shell" - "os" "github.com/wailsapp/wails/v2/internal/github" ) @@ -76,7 +77,7 @@ func updateToVersion(targetVersion *github.SemanticVersion, force bool, currentV var targetVersionString = "v" + targetVersion.String() if targetVersionString == currentVersion { - pterm.Println("\nLooks like you're up to date!\n") + pterm.Println("\nLooks like you're up to date!") return nil } @@ -122,7 +123,8 @@ func updateToVersion(targetVersion *github.SemanticVersion, force bool, currentV // Compare if !success { pterm.Println("Error: The requested version is lower than the current version.") - pterm.Println("If this is what you really want to do, use `wails update -version %s`", targetVersionString) + pterm.Println(fmt.Sprintf("If this is what you really want to do, use `wails update -version "+"%s`", targetVersionString)) + return nil } diff --git a/v2/internal/frontend/desktop/windows/dialog_test.go b/v2/internal/frontend/desktop/windows/dialog_test.go index 96d8b784..e91058e9 100644 --- a/v2/internal/frontend/desktop/windows/dialog_test.go +++ b/v2/internal/frontend/desktop/windows/dialog_test.go @@ -1,9 +1,12 @@ +//go:build windows + package windows import ( + "testing" + "github.com/wailsapp/wails/v2/internal/frontend" "golang.org/x/sys/windows" - "testing" ) func Test_calculateMessageDialogFlags(t *testing.T) { diff --git a/v2/internal/frontend/desktop/windows/go-webview2/internal/w32/w32.go b/v2/internal/frontend/desktop/windows/go-webview2/internal/w32/w32.go index cfd1bfbd..2b564173 100644 --- a/v2/internal/frontend/desktop/windows/go-webview2/internal/w32/w32.go +++ b/v2/internal/frontend/desktop/windows/go-webview2/internal/w32/w32.go @@ -1,10 +1,13 @@ +//go:build windows + package w32 import ( - "golang.org/x/sys/windows" "syscall" "unicode/utf16" "unsafe" + + "golang.org/x/sys/windows" ) var ( diff --git a/v2/internal/frontend/desktop/windows/go-webview2/pkg/combridge/bridge.go b/v2/internal/frontend/desktop/windows/go-webview2/pkg/combridge/bridge.go index 2f837fed..ccf04243 100644 --- a/v2/internal/frontend/desktop/windows/go-webview2/pkg/combridge/bridge.go +++ b/v2/internal/frontend/desktop/windows/go-webview2/pkg/combridge/bridge.go @@ -1,3 +1,5 @@ +//go:build windows + package combridge import ( diff --git a/v2/internal/frontend/desktop/windows/go-webview2/pkg/combridge/iunknown.go b/v2/internal/frontend/desktop/windows/go-webview2/pkg/combridge/iunknown.go index 00790d74..90d7247f 100644 --- a/v2/internal/frontend/desktop/windows/go-webview2/pkg/combridge/iunknown.go +++ b/v2/internal/frontend/desktop/windows/go-webview2/pkg/combridge/iunknown.go @@ -1,3 +1,5 @@ +//go:build windows + package combridge import ( diff --git a/v2/internal/frontend/desktop/windows/go-webview2/pkg/combridge/iunknown_impl.go b/v2/internal/frontend/desktop/windows/go-webview2/pkg/combridge/iunknown_impl.go index b08d1292..4c748d46 100644 --- a/v2/internal/frontend/desktop/windows/go-webview2/pkg/combridge/iunknown_impl.go +++ b/v2/internal/frontend/desktop/windows/go-webview2/pkg/combridge/iunknown_impl.go @@ -1,3 +1,5 @@ +//go:build windows + package combridge import ( diff --git a/v2/internal/frontend/desktop/windows/go-webview2/pkg/combridge/syscall.go b/v2/internal/frontend/desktop/windows/go-webview2/pkg/combridge/syscall.go index 819a4fa2..17b7f500 100644 --- a/v2/internal/frontend/desktop/windows/go-webview2/pkg/combridge/syscall.go +++ b/v2/internal/frontend/desktop/windows/go-webview2/pkg/combridge/syscall.go @@ -1,3 +1,5 @@ +//go:build windows + package combridge import ( diff --git a/v2/internal/frontend/desktop/windows/go-webview2/pkg/combridge/vtables.go b/v2/internal/frontend/desktop/windows/go-webview2/pkg/combridge/vtables.go index 3872dc0b..b099a784 100644 --- a/v2/internal/frontend/desktop/windows/go-webview2/pkg/combridge/vtables.go +++ b/v2/internal/frontend/desktop/windows/go-webview2/pkg/combridge/vtables.go @@ -1,3 +1,5 @@ +//go:build windows + package combridge import ( diff --git a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/COREWEBVIEW2_COLOR.go b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/COREWEBVIEW2_COLOR.go index 43eb12e0..429ecef2 100644 --- a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/COREWEBVIEW2_COLOR.go +++ b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/COREWEBVIEW2_COLOR.go @@ -1,3 +1,5 @@ +//go:build windows + package edge type COREWEBVIEW2_COLOR struct { diff --git a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/COREWEBVIEW2_HOST_RESOURCE_ACCESS_KIND.go b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/COREWEBVIEW2_HOST_RESOURCE_ACCESS_KIND.go index 6a378fcb..ed106ed4 100644 --- a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/COREWEBVIEW2_HOST_RESOURCE_ACCESS_KIND.go +++ b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/COREWEBVIEW2_HOST_RESOURCE_ACCESS_KIND.go @@ -1,3 +1,5 @@ +//go:build windows + package edge type COREWEBVIEW2_HOST_RESOURCE_ACCESS_KIND uint32 diff --git a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/COREWEBVIEW2_KEY_EVENT_KIND.go b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/COREWEBVIEW2_KEY_EVENT_KIND.go index 0b571588..60714753 100644 --- a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/COREWEBVIEW2_KEY_EVENT_KIND.go +++ b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/COREWEBVIEW2_KEY_EVENT_KIND.go @@ -1,3 +1,5 @@ +//go:build windows + package edge type COREWEBVIEW2_KEY_EVENT_KIND uint32 diff --git a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/COREWEBVIEW2_MOVE_FOCUS_REASON.go b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/COREWEBVIEW2_MOVE_FOCUS_REASON.go index e901101e..c1679cc3 100644 --- a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/COREWEBVIEW2_MOVE_FOCUS_REASON.go +++ b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/COREWEBVIEW2_MOVE_FOCUS_REASON.go @@ -1,3 +1,5 @@ +//go:build windows + package edge type COREWEBVIEW2_MOVE_FOCUS_REASON uint32 diff --git a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/COREWEBVIEW2_PHYSICAL_KEY_STATUS.go b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/COREWEBVIEW2_PHYSICAL_KEY_STATUS.go index 8fc93e0e..dd883425 100644 --- a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/COREWEBVIEW2_PHYSICAL_KEY_STATUS.go +++ b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/COREWEBVIEW2_PHYSICAL_KEY_STATUS.go @@ -1,3 +1,5 @@ +//go:build windows + package edge type COREWEBVIEW2_PHYSICAL_KEY_STATUS struct { diff --git a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/COREWEBVIEW2_WEB_RESOURCE_CONTEXT.go b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/COREWEBVIEW2_WEB_RESOURCE_CONTEXT.go index 9ca9c41c..2e9261d0 100644 --- a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/COREWEBVIEW2_WEB_RESOURCE_CONTEXT.go +++ b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/COREWEBVIEW2_WEB_RESOURCE_CONTEXT.go @@ -1,3 +1,5 @@ +//go:build windows + package edge type COREWEBVIEW2_WEB_RESOURCE_CONTEXT uint32 diff --git a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2AcceleratorKeyPressedEventArgs.go b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2AcceleratorKeyPressedEventArgs.go index e3ff7bb5..2a3a9c82 100644 --- a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2AcceleratorKeyPressedEventArgs.go +++ b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2AcceleratorKeyPressedEventArgs.go @@ -1,8 +1,11 @@ +//go:build windows + package edge import ( - "golang.org/x/sys/windows" "unsafe" + + "golang.org/x/sys/windows" ) type _ICoreWebView2AcceleratorKeyPressedEventArgsVtbl struct { diff --git a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2AcceleratorKeyPressedEventHandler.go b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2AcceleratorKeyPressedEventHandler.go index 093cc804..2c276560 100644 --- a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2AcceleratorKeyPressedEventHandler.go +++ b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2AcceleratorKeyPressedEventHandler.go @@ -1,3 +1,5 @@ +//go:build windows + package edge type _ICoreWebView2AcceleratorKeyPressedEventHandlerVtbl struct { diff --git a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2Controller.go b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2Controller.go index 5aef0185..c95a00ad 100644 --- a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2Controller.go +++ b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2Controller.go @@ -1,10 +1,13 @@ +//go:build windows + package edge import ( - "github.com/wailsapp/wails/v2/internal/frontend/desktop/windows/go-webview2/internal/w32" - "golang.org/x/sys/windows" "math" "unsafe" + + "github.com/wailsapp/wails/v2/internal/frontend/desktop/windows/go-webview2/internal/w32" + "golang.org/x/sys/windows" ) type _ICoreWebView2ControllerVtbl struct { diff --git a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2Controller2.go b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2Controller2.go index 26835495..eff315a9 100644 --- a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2Controller2.go +++ b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2Controller2.go @@ -1,8 +1,11 @@ +//go:build windows + package edge import ( - "golang.org/x/sys/windows" "unsafe" + + "golang.org/x/sys/windows" ) type _ICoreWebView2Controller2Vtbl struct { diff --git a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2CreateCoreWebView2ControllerCompletedHandler.go b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2CreateCoreWebView2ControllerCompletedHandler.go index ca92d34b..c0e4d13b 100644 --- a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2CreateCoreWebView2ControllerCompletedHandler.go +++ b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2CreateCoreWebView2ControllerCompletedHandler.go @@ -1,3 +1,5 @@ +//go:build windows + package edge type _ICoreWebView2CreateCoreWebView2ControllerCompletedHandlerVtbl struct { diff --git a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2HttpHeadersCollectionIterator.go b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2HttpHeadersCollectionIterator.go index 45280f41..0c9eacb4 100644 --- a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2HttpHeadersCollectionIterator.go +++ b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2HttpHeadersCollectionIterator.go @@ -1,3 +1,5 @@ +//go:build windows + package edge import ( diff --git a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2HttpRequestHeaders.go b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2HttpRequestHeaders.go index 3df43b5c..5a147b29 100644 --- a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2HttpRequestHeaders.go +++ b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2HttpRequestHeaders.go @@ -1,3 +1,5 @@ +//go:build windows + package edge import ( diff --git a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2NavigationCompletedEventArgs.go b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2NavigationCompletedEventArgs.go index e304bb9d..c3998e0a 100644 --- a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2NavigationCompletedEventArgs.go +++ b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2NavigationCompletedEventArgs.go @@ -1,3 +1,5 @@ +//go:build windows + package edge type _ICoreWebView2NavigationCompletedEventArgsVtbl struct { diff --git a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2NavigationCompletedEventHandler.go b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2NavigationCompletedEventHandler.go index 6fbfe724..456da507 100644 --- a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2NavigationCompletedEventHandler.go +++ b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2NavigationCompletedEventHandler.go @@ -1,3 +1,5 @@ +//go:build windows + package edge type _ICoreWebView2NavigationCompletedEventHandlerVtbl struct { diff --git a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2Settings.go b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2Settings.go index 7f6e1b9b..a4ba613d 100644 --- a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2Settings.go +++ b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2Settings.go @@ -1,8 +1,11 @@ +//go:build windows + package edge import ( - "golang.org/x/sys/windows" "unsafe" + + "golang.org/x/sys/windows" ) type _ICoreWebView2SettingsVtbl struct { diff --git a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2WebResourceRequest.go b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2WebResourceRequest.go index f9119ee5..fe7f2cfa 100644 --- a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2WebResourceRequest.go +++ b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2WebResourceRequest.go @@ -1,3 +1,5 @@ +//go:build windows + package edge import ( diff --git a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2WebResourceRequestedEventArgs.go b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2WebResourceRequestedEventArgs.go index 9b093bd2..614594e8 100644 --- a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2WebResourceRequestedEventArgs.go +++ b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2WebResourceRequestedEventArgs.go @@ -1,8 +1,11 @@ +//go:build windows + package edge import ( - "golang.org/x/sys/windows" "unsafe" + + "golang.org/x/sys/windows" ) type _ICoreWebView2WebResourceRequestedEventArgsVtbl struct { diff --git a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2WebResourceRequestedEventHandler.go b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2WebResourceRequestedEventHandler.go index 8cdf58e8..d0860c3b 100644 --- a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2WebResourceRequestedEventHandler.go +++ b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2WebResourceRequestedEventHandler.go @@ -1,3 +1,5 @@ +//go:build windows + package edge type _ICoreWebView2WebResourceRequestedEventHandlerVtbl struct { diff --git a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2WebResourceResponse.go b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2WebResourceResponse.go index a6a0edda..dd02e608 100644 --- a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2WebResourceResponse.go +++ b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2WebResourceResponse.go @@ -1,3 +1,5 @@ +//go:build windows + package edge import "unsafe" diff --git a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2_2.go b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2_2.go index c2441ab2..85a4f71f 100644 --- a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2_2.go +++ b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2_2.go @@ -1,3 +1,5 @@ +//go:build windows + package edge type iCoreWebView2_2Vtbl struct { diff --git a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2_3.go b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2_3.go index 9802b8c0..58424bd6 100644 --- a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2_3.go +++ b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebView2_3.go @@ -1,3 +1,5 @@ +//go:build windows + package edge import ( diff --git a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebViewSettings.go b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebViewSettings.go index a4cf31a3..6c6b16d7 100644 --- a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebViewSettings.go +++ b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebViewSettings.go @@ -1,3 +1,5 @@ +//go:build windows + package edge import ( diff --git a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/IStream.go b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/IStream.go index 57039000..9e29ca4f 100644 --- a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/IStream.go +++ b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/IStream.go @@ -1,3 +1,5 @@ +//go:build windows + package edge import ( diff --git a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/create_env_go.go b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/create_env_go.go index 8651cab0..0619605a 100644 --- a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/create_env_go.go +++ b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/create_env_go.go @@ -1,4 +1,4 @@ -//go:build exp_gowebview2loader +//go:build windows && exp_gowebview2loader package edge diff --git a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/create_env_native.go b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/create_env_native.go index 0e24eca3..a72df06a 100644 --- a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/create_env_native.go +++ b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/create_env_native.go @@ -1,4 +1,4 @@ -//go:build !exp_gowebview2loader +//go:build windows && !exp_gowebview2loader package edge diff --git a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/guid.go b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/guid.go index 64d89534..007e6058 100644 --- a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/guid.go +++ b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/guid.go @@ -1,3 +1,5 @@ +//go:build windows + package edge // This code has been adapted from: https://github.com/go-ole/go-ole @@ -47,9 +49,9 @@ type GUID struct { // // The supplied string may be in any of these formats: // -// XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -// XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX -// {XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX} +// XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX +// XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX +// {XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX} // // The conversion of the supplied string is not case-sensitive. func NewGUID(guid string) *GUID { @@ -155,11 +157,11 @@ func decodeHexChar(c byte) (byte, bool) { // String converts the GUID to string form. It will adhere to this pattern: // -// {XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX} +// {XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX} // // If the GUID is nil, the string representation of an empty GUID is returned: // -// {00000000-0000-0000-0000-000000000000} +// {00000000-0000-0000-0000-000000000000} func (guid *GUID) String() string { if guid == nil { return emptyGUID diff --git a/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/env_create.go b/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/env_create.go index 2e2bdd55..9dd603ca 100644 --- a/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/env_create.go +++ b/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/env_create.go @@ -1,4 +1,4 @@ -//go:build exp_gowebview2loader +//go:build windows && exp_gowebview2loader package webviewloader diff --git a/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/env_create_options.go b/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/env_create_options.go index adfd8ca0..73b81e56 100644 --- a/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/env_create_options.go +++ b/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/env_create_options.go @@ -1,4 +1,4 @@ -//go:build exp_gowebview2loader +//go:build windows && exp_gowebview2loader package webviewloader diff --git a/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/find_dll.go b/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/find_dll.go index bf9dbc89..da9472ff 100644 --- a/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/find_dll.go +++ b/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/find_dll.go @@ -1,3 +1,5 @@ +//go:build windows + package webviewloader import ( diff --git a/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/find_dll_installed.go b/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/find_dll_installed.go index 4067fdd7..066732bc 100644 --- a/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/find_dll_installed.go +++ b/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/find_dll_installed.go @@ -1,4 +1,4 @@ -//go:build exp_gowebview2loader +//go:build windows && exp_gowebview2loader package webviewloader diff --git a/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/native_module.go b/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/native_module.go index 8f4c551a..92ab6ebd 100644 --- a/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/native_module.go +++ b/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/native_module.go @@ -1,4 +1,4 @@ -//go:build !exp_gowebview2loader +//go:build windows && !exp_gowebview2loader package webviewloader diff --git a/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/syscall.go b/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/syscall.go index ff604565..24d0856a 100644 --- a/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/syscall.go +++ b/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/syscall.go @@ -1,3 +1,5 @@ +//go:build windows + package webviewloader import ( diff --git a/v2/internal/frontend/desktop/windows/theme.go b/v2/internal/frontend/desktop/windows/theme.go index e22f0c6c..ac975e3d 100644 --- a/v2/internal/frontend/desktop/windows/theme.go +++ b/v2/internal/frontend/desktop/windows/theme.go @@ -1,3 +1,5 @@ +//go:build windows + package windows import ( diff --git a/v2/internal/frontend/desktop/windows/win32/theme.go b/v2/internal/frontend/desktop/windows/win32/theme.go index 2effae5a..299a4f63 100644 --- a/v2/internal/frontend/desktop/windows/win32/theme.go +++ b/v2/internal/frontend/desktop/windows/win32/theme.go @@ -1,8 +1,11 @@ +//go:build windows + package win32 import ( - "golang.org/x/sys/windows/registry" "unsafe" + + "golang.org/x/sys/windows/registry" ) type DWMWINDOWATTRIBUTE int32 diff --git a/v2/internal/frontend/desktop/windows/winc/app.go b/v2/internal/frontend/desktop/windows/winc/app.go index a2c3237c..52b30f59 100644 --- a/v2/internal/frontend/desktop/windows/winc/app.go +++ b/v2/internal/frontend/desktop/windows/winc/app.go @@ -1,8 +1,9 @@ +//go:build windows + /* * Copyright (C) 2019 The Winc Authors. All Rights Reserved. * Copyright (C) 2010-2013 Allen Dang. All Rights Reserved. */ - package winc import ( diff --git a/v2/internal/frontend/desktop/windows/winc/bitmap.go b/v2/internal/frontend/desktop/windows/winc/bitmap.go index 235dc43f..c19c31c2 100644 --- a/v2/internal/frontend/desktop/windows/winc/bitmap.go +++ b/v2/internal/frontend/desktop/windows/winc/bitmap.go @@ -1,3 +1,5 @@ +//go:build windows + /* * Copyright (C) 2019 The Winc Authors. All Rights Reserved. * Copyright (C) 2010-2013 Allen Dang. All Rights Reserved. diff --git a/v2/internal/frontend/desktop/windows/winc/brush.go b/v2/internal/frontend/desktop/windows/winc/brush.go index 55e8ec52..1126dd1b 100644 --- a/v2/internal/frontend/desktop/windows/winc/brush.go +++ b/v2/internal/frontend/desktop/windows/winc/brush.go @@ -1,3 +1,5 @@ +//go:build windows + /* * Copyright (C) 2019 The Winc Authors. All Rights Reserved. * Copyright (C) 2010-2013 Allen Dang. All Rights Reserved. diff --git a/v2/internal/frontend/desktop/windows/winc/buttons.go b/v2/internal/frontend/desktop/windows/winc/buttons.go index ccf0d267..3da80143 100644 --- a/v2/internal/frontend/desktop/windows/winc/buttons.go +++ b/v2/internal/frontend/desktop/windows/winc/buttons.go @@ -1,3 +1,5 @@ +//go:build windows + /* * Copyright (C) 2019 The Winc Authors. All Rights Reserved. * Copyright (C) 2010-2013 Allen Dang. All Rights Reserved. diff --git a/v2/internal/frontend/desktop/windows/winc/canvas.go b/v2/internal/frontend/desktop/windows/winc/canvas.go index 46fc0d61..0ca4deeb 100644 --- a/v2/internal/frontend/desktop/windows/winc/canvas.go +++ b/v2/internal/frontend/desktop/windows/winc/canvas.go @@ -1,3 +1,5 @@ +//go:build windows + /* * Copyright (C) 2019 The Winc Authors. All Rights Reserved. * Copyright (C) 2010-2013 Allen Dang. All Rights Reserved. diff --git a/v2/internal/frontend/desktop/windows/winc/color.go b/v2/internal/frontend/desktop/windows/winc/color.go index ac16dbc4..72b71b86 100644 --- a/v2/internal/frontend/desktop/windows/winc/color.go +++ b/v2/internal/frontend/desktop/windows/winc/color.go @@ -1,3 +1,5 @@ +//go:build windows + /* * Copyright (C) 2019 The Winc Authors. All Rights Reserved. * Copyright (C) 2010-2013 Allen Dang. All Rights Reserved. diff --git a/v2/internal/frontend/desktop/windows/winc/combobox.go b/v2/internal/frontend/desktop/windows/winc/combobox.go index b389c8b4..3b4348ac 100644 --- a/v2/internal/frontend/desktop/windows/winc/combobox.go +++ b/v2/internal/frontend/desktop/windows/winc/combobox.go @@ -1,3 +1,5 @@ +//go:build windows + /* * Copyright (C) 2019 The Winc Authors. All Rights Reserved. */ diff --git a/v2/internal/frontend/desktop/windows/winc/commondlgs.go b/v2/internal/frontend/desktop/windows/winc/commondlgs.go index 3e30f14b..07ba47a8 100644 --- a/v2/internal/frontend/desktop/windows/winc/commondlgs.go +++ b/v2/internal/frontend/desktop/windows/winc/commondlgs.go @@ -1,3 +1,5 @@ +//go:build windows + /* * Copyright (C) 2019 The Winc Authors. All Rights Reserved. * Copyright (C) 2010-2013 Allen Dang. All Rights Reserved. diff --git a/v2/internal/frontend/desktop/windows/winc/controlbase.go b/v2/internal/frontend/desktop/windows/winc/controlbase.go index 610e67e3..8dd11678 100644 --- a/v2/internal/frontend/desktop/windows/winc/controlbase.go +++ b/v2/internal/frontend/desktop/windows/winc/controlbase.go @@ -1,3 +1,5 @@ +//go:build windows + /* * Copyright (C) 2019 The Winc Authors. All Rights Reserved. * Copyright (C) 2010-2013 Allen Dang. All Rights Reserved. @@ -411,7 +413,7 @@ func (cba *ControlBase) PreTranslateMessage(msg *w32.MSG) bool { return false } -//Events +// Events func (cba *ControlBase) OnCreate() *EventManager { return &cba.onCreate } diff --git a/v2/internal/frontend/desktop/windows/winc/controller.go b/v2/internal/frontend/desktop/windows/winc/controller.go index 4fd03881..b697d997 100644 --- a/v2/internal/frontend/desktop/windows/winc/controller.go +++ b/v2/internal/frontend/desktop/windows/winc/controller.go @@ -1,3 +1,5 @@ +//go:build windows + /* * Copyright (C) 2019 The Winc Authors. All Rights Reserved. * Copyright (C) 2010-2013 Allen Dang. All Rights Reserved. diff --git a/v2/internal/frontend/desktop/windows/winc/dialog.go b/v2/internal/frontend/desktop/windows/winc/dialog.go index 721acbf7..6ed87ae4 100644 --- a/v2/internal/frontend/desktop/windows/winc/dialog.go +++ b/v2/internal/frontend/desktop/windows/winc/dialog.go @@ -1,3 +1,5 @@ +//go:build windows + /* * Copyright (C) 2019 The Winc Authors. All Rights Reserved. * Copyright (C) 2010-2013 Allen Dang. All Rights Reserved. diff --git a/v2/internal/frontend/desktop/windows/winc/edit.go b/v2/internal/frontend/desktop/windows/winc/edit.go index f1eeb0bc..00e67b71 100644 --- a/v2/internal/frontend/desktop/windows/winc/edit.go +++ b/v2/internal/frontend/desktop/windows/winc/edit.go @@ -1,3 +1,5 @@ +//go:build windows + /* * Copyright (C) 2019 The Winc Authors. All Rights Reserved. * Copyright (C) 2010-2013 Allen Dang. All Rights Reserved. @@ -37,7 +39,7 @@ func (ed *Edit) SetReadOnly(isReadOnly bool) { w32.SendMessage(ed.hwnd, w32.EM_SETREADONLY, uintptr(w32.BoolToBOOL(isReadOnly)), 0) } -//Public methods +// Public methods func (ed *Edit) SetPassword(isPassword bool) { if isPassword { w32.SendMessage(ed.hwnd, w32.EM_SETPASSWORDCHAR, uintptr(passwordChar), 0) diff --git a/v2/internal/frontend/desktop/windows/winc/event.go b/v2/internal/frontend/desktop/windows/winc/event.go index 66feabd0..12f894f6 100644 --- a/v2/internal/frontend/desktop/windows/winc/event.go +++ b/v2/internal/frontend/desktop/windows/winc/event.go @@ -1,3 +1,5 @@ +//go:build windows + /* * Copyright (C) 2019 The Winc Authors. All Rights Reserved. * Copyright (C) 2010-2013 Allen Dang. All Rights Reserved. diff --git a/v2/internal/frontend/desktop/windows/winc/eventdata.go b/v2/internal/frontend/desktop/windows/winc/eventdata.go index 51bd0bff..32798ebf 100644 --- a/v2/internal/frontend/desktop/windows/winc/eventdata.go +++ b/v2/internal/frontend/desktop/windows/winc/eventdata.go @@ -1,3 +1,5 @@ +//go:build windows + /* * Copyright (C) 2019 The Winc Authors. All Rights Reserved. * Copyright (C) 2010-2013 Allen Dang. All Rights Reserved. diff --git a/v2/internal/frontend/desktop/windows/winc/eventmanager.go b/v2/internal/frontend/desktop/windows/winc/eventmanager.go index 9769f50f..f4372e9c 100644 --- a/v2/internal/frontend/desktop/windows/winc/eventmanager.go +++ b/v2/internal/frontend/desktop/windows/winc/eventmanager.go @@ -1,3 +1,5 @@ +//go:build windows + /* * Copyright (C) 2019 The Winc Authors. All Rights Reserved. * Copyright (C) 2010-2013 Allen Dang. All Rights Reserved. diff --git a/v2/internal/frontend/desktop/windows/winc/font.go b/v2/internal/frontend/desktop/windows/winc/font.go index f79353be..314f1bbd 100644 --- a/v2/internal/frontend/desktop/windows/winc/font.go +++ b/v2/internal/frontend/desktop/windows/winc/font.go @@ -1,3 +1,5 @@ +//go:build windows + /* * Copyright (C) 2019 The Winc Authors. All Rights Reserved. * Copyright (C) 2010-2013 Allen Dang. All Rights Reserved. diff --git a/v2/internal/frontend/desktop/windows/winc/form.go b/v2/internal/frontend/desktop/windows/winc/form.go index b146dbf2..c719582e 100644 --- a/v2/internal/frontend/desktop/windows/winc/form.go +++ b/v2/internal/frontend/desktop/windows/winc/form.go @@ -1,3 +1,5 @@ +//go:build windows + /* * Copyright (C) 2019 The Winc Authors. All Rights Reserved. * Copyright (C) 2010-2013 Allen Dang. All Rights Reserved. diff --git a/v2/internal/frontend/desktop/windows/winc/globalvars.go b/v2/internal/frontend/desktop/windows/winc/globalvars.go index c3da17a6..46777da0 100644 --- a/v2/internal/frontend/desktop/windows/winc/globalvars.go +++ b/v2/internal/frontend/desktop/windows/winc/globalvars.go @@ -1,3 +1,5 @@ +//go:build windows + /* * Copyright (C) 2019 The Winc Authors. All Rights Reserved. * Copyright (C) 2010-2013 Allen Dang. All Rights Reserved. @@ -11,14 +13,14 @@ import ( "github.com/wailsapp/wails/v2/internal/frontend/desktop/windows/winc/w32" ) -//Private global variables. +// Private global variables. var ( gAppInstance w32.HINSTANCE gControllerRegistry map[w32.HWND]Controller gRegisteredClasses []string ) -//Public global variables. +// Public global variables. var ( GeneralWndprocCallBack = syscall.NewCallback(generalWndProc) DefaultFont *Font diff --git a/v2/internal/frontend/desktop/windows/winc/icon.go b/v2/internal/frontend/desktop/windows/winc/icon.go index b19d5947..6a3e1a39 100644 --- a/v2/internal/frontend/desktop/windows/winc/icon.go +++ b/v2/internal/frontend/desktop/windows/winc/icon.go @@ -1,3 +1,5 @@ +//go:build windows + /* * Copyright (C) 2019 The Winc Authors. All Rights Reserved. * Copyright (C) 2010-2013 Allen Dang. All Rights Reserved. diff --git a/v2/internal/frontend/desktop/windows/winc/imagelist.go b/v2/internal/frontend/desktop/windows/winc/imagelist.go index 45bf32f8..c540a816 100644 --- a/v2/internal/frontend/desktop/windows/winc/imagelist.go +++ b/v2/internal/frontend/desktop/windows/winc/imagelist.go @@ -1,3 +1,5 @@ +//go:build windows + /* * Copyright (C) 2019 The Winc Authors. All Rights Reserved. * Copyright (C) 2010-2013 Allen Dang. All Rights Reserved. diff --git a/v2/internal/frontend/desktop/windows/winc/imageview.go b/v2/internal/frontend/desktop/windows/winc/imageview.go index acd4856f..8e3ae50b 100644 --- a/v2/internal/frontend/desktop/windows/winc/imageview.go +++ b/v2/internal/frontend/desktop/windows/winc/imageview.go @@ -1,3 +1,5 @@ +//go:build windows + /* * Copyright (C) 2019 The Winc Authors. All Rights Reserved. */ diff --git a/v2/internal/frontend/desktop/windows/winc/imageviewbox.go b/v2/internal/frontend/desktop/windows/winc/imageviewbox.go index 978a5098..0f6f57be 100644 --- a/v2/internal/frontend/desktop/windows/winc/imageviewbox.go +++ b/v2/internal/frontend/desktop/windows/winc/imageviewbox.go @@ -1,3 +1,5 @@ +//go:build windows + /* * Copyright (C) 2019 The Winc Authors. All Rights Reserved. */ diff --git a/v2/internal/frontend/desktop/windows/winc/init.go b/v2/internal/frontend/desktop/windows/winc/init.go index 8ec9e80c..b0037f5a 100644 --- a/v2/internal/frontend/desktop/windows/winc/init.go +++ b/v2/internal/frontend/desktop/windows/winc/init.go @@ -1,3 +1,5 @@ +//go:build windows + /* * Copyright (C) 2019 The Winc Authors. All Rights Reserved. * Copyright (C) 2010-2013 Allen Dang. All Rights Reserved. diff --git a/v2/internal/frontend/desktop/windows/winc/keyboard.go b/v2/internal/frontend/desktop/windows/winc/keyboard.go index ea38fd98..1f636924 100644 --- a/v2/internal/frontend/desktop/windows/winc/keyboard.go +++ b/v2/internal/frontend/desktop/windows/winc/keyboard.go @@ -1,3 +1,5 @@ +//go:build windows + /* * Copyright (C) 2019 The Winc Authors. All Rights Reserved. * Copyright (C) 2010-2013 Allen Dang. All Rights Reserved. diff --git a/v2/internal/frontend/desktop/windows/winc/label.go b/v2/internal/frontend/desktop/windows/winc/label.go index b866ea7b..6e441e9e 100644 --- a/v2/internal/frontend/desktop/windows/winc/label.go +++ b/v2/internal/frontend/desktop/windows/winc/label.go @@ -1,3 +1,5 @@ +//go:build windows + /* * Copyright (C) 2019 The Winc Authors. All Rights Reserved. */ diff --git a/v2/internal/frontend/desktop/windows/winc/layout.go b/v2/internal/frontend/desktop/windows/winc/layout.go index b16f041c..da989520 100644 --- a/v2/internal/frontend/desktop/windows/winc/layout.go +++ b/v2/internal/frontend/desktop/windows/winc/layout.go @@ -1,3 +1,5 @@ +//go:build windows + /* * Copyright (C) 2019 The Winc Authors. All Rights Reserved. */ diff --git a/v2/internal/frontend/desktop/windows/winc/listview.go b/v2/internal/frontend/desktop/windows/winc/listview.go index a138b55f..c98fc4c6 100644 --- a/v2/internal/frontend/desktop/windows/winc/listview.go +++ b/v2/internal/frontend/desktop/windows/winc/listview.go @@ -1,3 +1,5 @@ +//go:build windows + /* * Copyright (C) 2019 The Winc Authors. All Rights Reserved. */ diff --git a/v2/internal/frontend/desktop/windows/winc/menu.go b/v2/internal/frontend/desktop/windows/winc/menu.go index bbfdefad..d1567e64 100644 --- a/v2/internal/frontend/desktop/windows/winc/menu.go +++ b/v2/internal/frontend/desktop/windows/winc/menu.go @@ -1,3 +1,5 @@ +//go:build windows + /* * Copyright (C) 2019 The Winc Authors. All Rights Reserved. */ diff --git a/v2/internal/frontend/desktop/windows/winc/mousecontrol.go b/v2/internal/frontend/desktop/windows/winc/mousecontrol.go index 12cf634c..2b89dd30 100644 --- a/v2/internal/frontend/desktop/windows/winc/mousecontrol.go +++ b/v2/internal/frontend/desktop/windows/winc/mousecontrol.go @@ -1,3 +1,5 @@ +//go:build windows + /* * Copyright (C) 2019 The Winc Authors. All Rights Reserved. */ diff --git a/v2/internal/frontend/desktop/windows/winc/msghandlerregistry.go b/v2/internal/frontend/desktop/windows/winc/msghandlerregistry.go index a7b61631..2f165e3c 100644 --- a/v2/internal/frontend/desktop/windows/winc/msghandlerregistry.go +++ b/v2/internal/frontend/desktop/windows/winc/msghandlerregistry.go @@ -1,3 +1,5 @@ +//go:build windows + /* * Copyright (C) 2019 The Winc Authors. All Rights Reserved. * Copyright (C) 2010-2013 Allen Dang. All Rights Reserved. diff --git a/v2/internal/frontend/desktop/windows/winc/panel.go b/v2/internal/frontend/desktop/windows/winc/panel.go index 4bdf92b9..f6aaea26 100644 --- a/v2/internal/frontend/desktop/windows/winc/panel.go +++ b/v2/internal/frontend/desktop/windows/winc/panel.go @@ -1,3 +1,5 @@ +//go:build windows + /* * Copyright (C) 2019 The Winc Authors. All Rights Reserved. */ diff --git a/v2/internal/frontend/desktop/windows/winc/path.go b/v2/internal/frontend/desktop/windows/winc/path.go index 99f1829e..f52a2b93 100644 --- a/v2/internal/frontend/desktop/windows/winc/path.go +++ b/v2/internal/frontend/desktop/windows/winc/path.go @@ -1,3 +1,5 @@ +//go:build windows + /* * Copyright (C) 2019 The Winc Authors. All Rights Reserved. * Copyright (C) 2010-2013 Allen Dang. All Rights Reserved. diff --git a/v2/internal/frontend/desktop/windows/winc/pen.go b/v2/internal/frontend/desktop/windows/winc/pen.go index c8091186..232f2bb4 100644 --- a/v2/internal/frontend/desktop/windows/winc/pen.go +++ b/v2/internal/frontend/desktop/windows/winc/pen.go @@ -1,3 +1,5 @@ +//go:build windows + /* * Copyright (C) 2019 The Winc Authors. All Rights Reserved. * Copyright (C) 2010-2013 Allen Dang. All Rights Reserved. diff --git a/v2/internal/frontend/desktop/windows/winc/progressbar.go b/v2/internal/frontend/desktop/windows/winc/progressbar.go index 19f3c51f..5d51a8a5 100644 --- a/v2/internal/frontend/desktop/windows/winc/progressbar.go +++ b/v2/internal/frontend/desktop/windows/winc/progressbar.go @@ -1,3 +1,5 @@ +//go:build windows + /* * Copyright (C) 2019 The Winc Authors. All Rights Reserved. */ diff --git a/v2/internal/frontend/desktop/windows/winc/rect.go b/v2/internal/frontend/desktop/windows/winc/rect.go index 43daa753..dd9a7084 100644 --- a/v2/internal/frontend/desktop/windows/winc/rect.go +++ b/v2/internal/frontend/desktop/windows/winc/rect.go @@ -1,3 +1,5 @@ +//go:build windows + /* * Copyright (C) 2019 The Winc Authors. All Rights Reserved. * Copyright (C) 2010-2013 Allen Dang. All Rights Reserved. diff --git a/v2/internal/frontend/desktop/windows/winc/resizer.go b/v2/internal/frontend/desktop/windows/winc/resizer.go index 61789a8b..2e9ea02f 100644 --- a/v2/internal/frontend/desktop/windows/winc/resizer.go +++ b/v2/internal/frontend/desktop/windows/winc/resizer.go @@ -1,3 +1,5 @@ +//go:build windows + /* * Copyright (C) 2019 The Winc Authors. All Rights Reserved. */ diff --git a/v2/internal/frontend/desktop/windows/winc/scrollview.go b/v2/internal/frontend/desktop/windows/winc/scrollview.go index 395dfed6..d9e93293 100644 --- a/v2/internal/frontend/desktop/windows/winc/scrollview.go +++ b/v2/internal/frontend/desktop/windows/winc/scrollview.go @@ -1,3 +1,5 @@ +//go:build windows + /* * Copyright (C) 2019 The Winc Authors. All Rights Reserved. */ diff --git a/v2/internal/frontend/desktop/windows/winc/slider.go b/v2/internal/frontend/desktop/windows/winc/slider.go index 2a1e5503..2be9f13b 100644 --- a/v2/internal/frontend/desktop/windows/winc/slider.go +++ b/v2/internal/frontend/desktop/windows/winc/slider.go @@ -1,3 +1,5 @@ +//go:build windows + /* * Copyright (C) 2019 The Winc Authors. All Rights Reserved. */ diff --git a/v2/internal/frontend/desktop/windows/winc/tabview.go b/v2/internal/frontend/desktop/windows/winc/tabview.go index 16187711..5e8fe509 100644 --- a/v2/internal/frontend/desktop/windows/winc/tabview.go +++ b/v2/internal/frontend/desktop/windows/winc/tabview.go @@ -1,3 +1,5 @@ +//go:build windows + /* * Copyright (C) 2019 The Winc Authors. All Rights Reserved. */ diff --git a/v2/internal/frontend/desktop/windows/winc/toolbar.go b/v2/internal/frontend/desktop/windows/winc/toolbar.go index ae1fe393..bbe945e1 100644 --- a/v2/internal/frontend/desktop/windows/winc/toolbar.go +++ b/v2/internal/frontend/desktop/windows/winc/toolbar.go @@ -1,3 +1,5 @@ +//go:build windows + /* * Copyright (C) 2019 The Winc Authors. All Rights Reserved. */ diff --git a/v2/internal/frontend/desktop/windows/winc/tooltip.go b/v2/internal/frontend/desktop/windows/winc/tooltip.go index f18ba1cd..ec1568bb 100644 --- a/v2/internal/frontend/desktop/windows/winc/tooltip.go +++ b/v2/internal/frontend/desktop/windows/winc/tooltip.go @@ -1,3 +1,5 @@ +//go:build windows + /* * Copyright (C) 2019 The Winc Authors. All Rights Reserved. * Copyright (C) 2010-2013 Allen Dang. All Rights Reserved. diff --git a/v2/internal/frontend/desktop/windows/winc/treeview.go b/v2/internal/frontend/desktop/windows/winc/treeview.go index 4976fa65..9118f3d0 100644 --- a/v2/internal/frontend/desktop/windows/winc/treeview.go +++ b/v2/internal/frontend/desktop/windows/winc/treeview.go @@ -1,3 +1,5 @@ +//go:build windows + /* * Copyright (C) 2019 The Winc Authors. All Rights Reserved. */ diff --git a/v2/internal/frontend/desktop/windows/winc/utils.go b/v2/internal/frontend/desktop/windows/winc/utils.go index 527e8590..00926c70 100644 --- a/v2/internal/frontend/desktop/windows/winc/utils.go +++ b/v2/internal/frontend/desktop/windows/winc/utils.go @@ -1,3 +1,5 @@ +//go:build windows + /* * Copyright (C) 2019 The Winc Authors. All Rights Reserved. * Copyright (C) 2010-2013 Allen Dang. All Rights Reserved. diff --git a/v2/internal/frontend/desktop/windows/winc/w32/comctl32.go b/v2/internal/frontend/desktop/windows/winc/w32/comctl32.go index 0f37403a..b66709f5 100644 --- a/v2/internal/frontend/desktop/windows/winc/w32/comctl32.go +++ b/v2/internal/frontend/desktop/windows/winc/w32/comctl32.go @@ -1,3 +1,5 @@ +//go:build windows + /* * Copyright (C) 2019 The Winc Authors. All Rights Reserved. * Copyright (C) 2010-2012 The W32 Authors. All Rights Reserved. diff --git a/v2/internal/frontend/desktop/windows/winc/w32/comdlg32.go b/v2/internal/frontend/desktop/windows/winc/w32/comdlg32.go index 936bcf33..d28922c3 100644 --- a/v2/internal/frontend/desktop/windows/winc/w32/comdlg32.go +++ b/v2/internal/frontend/desktop/windows/winc/w32/comdlg32.go @@ -1,8 +1,9 @@ +//go:build windows + /* * Copyright (C) 2019 The Winc Authors. All Rights Reserved. * Copyright (C) 2010-2012 The W32 Authors. All Rights Reserved. */ - package w32 import ( diff --git a/v2/internal/frontend/desktop/windows/winc/w32/constants.go b/v2/internal/frontend/desktop/windows/winc/w32/constants.go index c8191ad5..49b507a2 100644 --- a/v2/internal/frontend/desktop/windows/winc/w32/constants.go +++ b/v2/internal/frontend/desktop/windows/winc/w32/constants.go @@ -1,8 +1,9 @@ +//go:build windows + /* * Copyright (C) 2019 The Winc Authors. All Rights Reserved. * Copyright (C) 2010-2012 The W32 Authors. All Rights Reserved. */ - package w32 const ( @@ -1099,7 +1100,7 @@ const ( OFN_SHOWHELP = 0x00000010 ) -//SHBrowseForFolder flags +// SHBrowseForFolder flags const ( BIF_RETURNONLYFSDIRS = 0x00000001 BIF_DONTGOBELOWDOMAIN = 0x00000002 @@ -1120,7 +1121,7 @@ const ( BIF_BROWSEFILEJUNCTIONS = 0x00010000 ) -//MessageBox flags +// MessageBox flags const ( MB_OK = 0x00000000 MB_OKCANCEL = 0x00000001 @@ -1144,7 +1145,7 @@ const ( MB_DEFBUTTON4 = 0x00000300 ) -//COM +// COM const ( E_INVALIDARG = 0x80070057 E_OUTOFMEMORY = 0x8007000E diff --git a/v2/internal/frontend/desktop/windows/winc/w32/dwmapi.go b/v2/internal/frontend/desktop/windows/winc/w32/dwmapi.go index 56545a94..f5c1b755 100644 --- a/v2/internal/frontend/desktop/windows/winc/w32/dwmapi.go +++ b/v2/internal/frontend/desktop/windows/winc/w32/dwmapi.go @@ -1,3 +1,5 @@ +//go:build windows + package w32 import "syscall" diff --git a/v2/internal/frontend/desktop/windows/winc/w32/gdi32.go b/v2/internal/frontend/desktop/windows/winc/w32/gdi32.go index f54c0b53..b4b9053e 100644 --- a/v2/internal/frontend/desktop/windows/winc/w32/gdi32.go +++ b/v2/internal/frontend/desktop/windows/winc/w32/gdi32.go @@ -1,8 +1,9 @@ +//go:build windows + /* * Copyright (C) 2019 The Winc Authors. All Rights Reserved. * Copyright (C) 2010-2012 The W32 Authors. All Rights Reserved. */ - package w32 import ( diff --git a/v2/internal/frontend/desktop/windows/winc/w32/gdiplus.go b/v2/internal/frontend/desktop/windows/winc/w32/gdiplus.go index a8d7daff..2591ed71 100644 --- a/v2/internal/frontend/desktop/windows/winc/w32/gdiplus.go +++ b/v2/internal/frontend/desktop/windows/winc/w32/gdiplus.go @@ -1,8 +1,9 @@ +//go:build windows + /* * Copyright (C) 2019 The Winc Authors. All Rights Reserved. * Copyright (C) 2010-2012 The W32 Authors. All Rights Reserved. */ - package w32 import ( diff --git a/v2/internal/frontend/desktop/windows/winc/w32/idispatch.go b/v2/internal/frontend/desktop/windows/winc/w32/idispatch.go index 2396c9c1..4f610f3f 100644 --- a/v2/internal/frontend/desktop/windows/winc/w32/idispatch.go +++ b/v2/internal/frontend/desktop/windows/winc/w32/idispatch.go @@ -1,8 +1,9 @@ +//go:build windows + /* * Copyright (C) 2019 The Winc Authors. All Rights Reserved. * Copyright (C) 2010-2012 The W32 Authors. All Rights Reserved. */ - package w32 import ( diff --git a/v2/internal/frontend/desktop/windows/winc/w32/istream.go b/v2/internal/frontend/desktop/windows/winc/w32/istream.go index a937c7ac..a47fbbce 100644 --- a/v2/internal/frontend/desktop/windows/winc/w32/istream.go +++ b/v2/internal/frontend/desktop/windows/winc/w32/istream.go @@ -1,8 +1,9 @@ +//go:build windows + /* * Copyright (C) 2019 Tad Vizbaras. All Rights Reserved. * Copyright (C) 2010-2012 The W32 Authors. All Rights Reserved. */ - package w32 import ( diff --git a/v2/internal/frontend/desktop/windows/winc/w32/iunknown.go b/v2/internal/frontend/desktop/windows/winc/w32/iunknown.go index 388cf10a..8ddc605c 100644 --- a/v2/internal/frontend/desktop/windows/winc/w32/iunknown.go +++ b/v2/internal/frontend/desktop/windows/winc/w32/iunknown.go @@ -1,8 +1,9 @@ +//go:build windows + /* * Copyright (C) 2019 Tad Vizbaras. All Rights Reserved. * Copyright (C) 2010-2012 The W32 Authors. All Rights Reserved. */ - package w32 type pIUnknownVtbl struct { diff --git a/v2/internal/frontend/desktop/windows/winc/w32/kernel32.go b/v2/internal/frontend/desktop/windows/winc/w32/kernel32.go index 66a9b5f6..063a1b0e 100644 --- a/v2/internal/frontend/desktop/windows/winc/w32/kernel32.go +++ b/v2/internal/frontend/desktop/windows/winc/w32/kernel32.go @@ -1,8 +1,9 @@ +//go:build windows + /* * Copyright (C) 2019 Tad Vizbaras. All Rights Reserved. * Copyright (C) 2010-2012 The W32 Authors. All Rights Reserved. */ - package w32 import ( diff --git a/v2/internal/frontend/desktop/windows/winc/w32/ole32.go b/v2/internal/frontend/desktop/windows/winc/w32/ole32.go index d5cc0df4..00409931 100644 --- a/v2/internal/frontend/desktop/windows/winc/w32/ole32.go +++ b/v2/internal/frontend/desktop/windows/winc/w32/ole32.go @@ -1,8 +1,9 @@ +//go:build windows + /* * Copyright (C) 2019 Tad Vizbaras. All Rights Reserved. * Copyright (C) 2010-2012 The W32 Authors. All Rights Reserved. */ - package w32 import ( diff --git a/v2/internal/frontend/desktop/windows/winc/w32/oleaut32.go b/v2/internal/frontend/desktop/windows/winc/w32/oleaut32.go index 35cc8833..0bb8ef7d 100644 --- a/v2/internal/frontend/desktop/windows/winc/w32/oleaut32.go +++ b/v2/internal/frontend/desktop/windows/winc/w32/oleaut32.go @@ -1,8 +1,9 @@ +//go:build windows + /* * Copyright (C) 2019 Tad Vizbaras. All Rights Reserved. * Copyright (C) 2010-2012 The W32 Authors. All Rights Reserved. */ - package w32 import ( diff --git a/v2/internal/frontend/desktop/windows/winc/w32/shcore.go b/v2/internal/frontend/desktop/windows/winc/w32/shcore.go index 1d23ac1f..72e9aab3 100644 --- a/v2/internal/frontend/desktop/windows/winc/w32/shcore.go +++ b/v2/internal/frontend/desktop/windows/winc/w32/shcore.go @@ -1,3 +1,5 @@ +//go:build windows + package w32 import ( diff --git a/v2/internal/frontend/desktop/windows/winc/w32/shell32.go b/v2/internal/frontend/desktop/windows/winc/w32/shell32.go index 4584a959..458fbc64 100644 --- a/v2/internal/frontend/desktop/windows/winc/w32/shell32.go +++ b/v2/internal/frontend/desktop/windows/winc/w32/shell32.go @@ -1,8 +1,9 @@ +//go:build windows + /* * Copyright (C) 2019 Tad Vizbaras. All Rights Reserved. * Copyright (C) 2010-2012 The W32 Authors. All Rights Reserved. */ - package w32 import ( diff --git a/v2/internal/frontend/desktop/windows/winc/w32/shlwapi.go b/v2/internal/frontend/desktop/windows/winc/w32/shlwapi.go index eb7aaeea..89d17ce6 100644 --- a/v2/internal/frontend/desktop/windows/winc/w32/shlwapi.go +++ b/v2/internal/frontend/desktop/windows/winc/w32/shlwapi.go @@ -1,3 +1,5 @@ +//go:build windows + package w32 import ( diff --git a/v2/internal/frontend/desktop/windows/winc/w32/toolbar.go b/v2/internal/frontend/desktop/windows/winc/w32/toolbar.go index 9c0c9ffe..ac9261fc 100644 --- a/v2/internal/frontend/desktop/windows/winc/w32/toolbar.go +++ b/v2/internal/frontend/desktop/windows/winc/w32/toolbar.go @@ -1,3 +1,5 @@ +//go:build windows + /* * Copyright (C) 2019 Tad Vizbaras. All Rights Reserved. * Copyright (C) 2010-2012 The W32 Authors. All Rights Reserved. diff --git a/v2/internal/frontend/desktop/windows/winc/w32/typedef.go b/v2/internal/frontend/desktop/windows/winc/w32/typedef.go index c9f38161..13735204 100644 --- a/v2/internal/frontend/desktop/windows/winc/w32/typedef.go +++ b/v2/internal/frontend/desktop/windows/winc/w32/typedef.go @@ -1,3 +1,5 @@ +//go:build windows + /* * Copyright (C) 2019 Tad Vizbaras. All Rights Reserved. * Copyright (C) 2010-2012 The W32 Authors. All Rights Reserved. diff --git a/v2/internal/frontend/desktop/windows/winc/w32/user32.go b/v2/internal/frontend/desktop/windows/winc/w32/user32.go index c68b7cde..17e0d999 100644 --- a/v2/internal/frontend/desktop/windows/winc/w32/user32.go +++ b/v2/internal/frontend/desktop/windows/winc/w32/user32.go @@ -1,3 +1,5 @@ +//go:build windows + /* * Copyright (C) 2019 Tad Vizbaras. All Rights Reserved. * Copyright (C) 2010-2012 The W32 Authors. All Rights Reserved. diff --git a/v2/internal/frontend/desktop/windows/winc/w32/utils.go b/v2/internal/frontend/desktop/windows/winc/w32/utils.go index 718d88cb..8a72d484 100644 --- a/v2/internal/frontend/desktop/windows/winc/w32/utils.go +++ b/v2/internal/frontend/desktop/windows/winc/w32/utils.go @@ -1,3 +1,5 @@ +//go:build windows + /* * Copyright (C) 2019 Tad Vizbaras. All Rights Reserved. * Copyright (C) 2010-2012 The W32 Authors. All Rights Reserved. diff --git a/v2/internal/frontend/desktop/windows/winc/w32/uxtheme.go b/v2/internal/frontend/desktop/windows/winc/w32/uxtheme.go index 67b02872..51ec0035 100644 --- a/v2/internal/frontend/desktop/windows/winc/w32/uxtheme.go +++ b/v2/internal/frontend/desktop/windows/winc/w32/uxtheme.go @@ -1,3 +1,5 @@ +//go:build windows + /* * Copyright (C) 2019 Tad Vizbaras. All Rights Reserved. * Copyright (C) 2010-2012 The W32 Authors. All Rights Reserved. diff --git a/v2/internal/frontend/desktop/windows/winc/w32/vars.go b/v2/internal/frontend/desktop/windows/winc/w32/vars.go index 53bc6cb8..cb69f9d1 100644 --- a/v2/internal/frontend/desktop/windows/winc/w32/vars.go +++ b/v2/internal/frontend/desktop/windows/winc/w32/vars.go @@ -1,3 +1,5 @@ +//go:build windows + /* * Copyright (C) 2019 Tad Vizbaras. All Rights Reserved. * Copyright (C) 2010-2012 The W32 Authors. All Rights Reserved. diff --git a/v2/internal/frontend/desktop/windows/winc/wndproc.go b/v2/internal/frontend/desktop/windows/winc/wndproc.go index 24490d74..3db1652c 100644 --- a/v2/internal/frontend/desktop/windows/winc/wndproc.go +++ b/v2/internal/frontend/desktop/windows/winc/wndproc.go @@ -1,3 +1,5 @@ +//go:build windows + /* * Copyright (C) 2019 The Winc Authors. All Rights Reserved. * Copyright (C) 2010-2013 Allen Dang. All Rights Reserved. diff --git a/v2/internal/gomod/gomod_test.go b/v2/internal/gomod/gomod_test.go index 13b04da4..034d4a89 100644 --- a/v2/internal/gomod/gomod_test.go +++ b/v2/internal/gomod/gomod_test.go @@ -1,3 +1,5 @@ +//go:build windows + package gomod import ( diff --git a/v2/internal/project/project.go b/v2/internal/project/project.go index 016ceecb..023ca1df 100644 --- a/v2/internal/project/project.go +++ b/v2/internal/project/project.go @@ -38,7 +38,7 @@ type Project struct { /*** Internal Data ***/ // The path to the project directory - Path string + Path string `json:"projectdir"` // Build directory BuildDir string `json:"build:dir"` @@ -205,9 +205,7 @@ func (p *Project) setDefaults() { p.OutputFilename += ".exe" } case "darwin", "linux": - if strings.HasSuffix(p.OutputFilename, ".exe") { - p.OutputFilename = strings.TrimSuffix(p.OutputFilename, ".exe") - } + p.OutputFilename = strings.TrimSuffix(p.OutputFilename, ".exe") } } diff --git a/v2/internal/project/project_test.go b/v2/internal/project/project_test.go index 0ad29d96..8c080307 100644 --- a/v2/internal/project/project_test.go +++ b/v2/internal/project/project_test.go @@ -1,12 +1,13 @@ package project_test import ( - "github.com/samber/lo" - "github.com/wailsapp/wails/v2/internal/project" "os" "path/filepath" "runtime" "testing" + + "github.com/samber/lo" + "github.com/wailsapp/wails/v2/internal/project" ) func TestProject_GetFrontendDir(t *testing.T) { @@ -30,9 +31,21 @@ func TestProject_GetFrontendDir(t *testing.T) { wantError: false, }, { - name: "Should resolve a relative path with project path set", - inputJSON: `{"frontend:dir": "./frontend", "projectdir": "/home/user/project"}`, - want: "/home/user/project/frontend", + name: "Should resolve a relative path with project path set", + inputJSON: func() string { + if runtime.GOOS == "windows" { + return `{"frontend:dir": "./frontend", "projectdir": "C:\\project"}` + } else { + return `{"frontend:dir": "./frontend", "projectdir": "/home/user/project"}` + } + }(), + want: func() string { + if runtime.GOOS == "windows" { + return `C:/project/frontend` + } else { + return `/home/user/project/frontend` + } + }(), wantError: false, }, { diff --git a/v2/internal/system/operatingsystem/os_windows.go b/v2/internal/system/operatingsystem/os_windows.go index 0f294ba9..38ea43a1 100644 --- a/v2/internal/system/operatingsystem/os_windows.go +++ b/v2/internal/system/operatingsystem/os_windows.go @@ -1,3 +1,5 @@ +//go:build windows + package operatingsystem import ( diff --git a/v2/internal/system/operatingsystem/version_windows.go b/v2/internal/system/operatingsystem/version_windows.go index 766e8ff8..a8f53d13 100644 --- a/v2/internal/system/operatingsystem/version_windows.go +++ b/v2/internal/system/operatingsystem/version_windows.go @@ -1,8 +1,11 @@ +//go:build windows + package operatingsystem import ( - "golang.org/x/sys/windows/registry" "strconv" + + "golang.org/x/sys/windows/registry" ) type WindowsVersionInfo struct { diff --git a/v2/internal/wv2installer/browser.go b/v2/internal/wv2installer/browser.go index a2fa1018..2597bde6 100644 --- a/v2/internal/wv2installer/browser.go +++ b/v2/internal/wv2installer/browser.go @@ -1,5 +1,5 @@ -//go:build wv2runtime.browser -// +build wv2runtime.browser +//go:build windows && wv2runtime.browser +// +build windows,wv2runtime.browser package wv2installer diff --git a/v2/internal/wv2installer/download.go b/v2/internal/wv2installer/download.go index 99c03e0b..0a054d66 100644 --- a/v2/internal/wv2installer/download.go +++ b/v2/internal/wv2installer/download.go @@ -1,10 +1,11 @@ -//go:build !wv2runtime.error && !wv2runtime.browser && !wv2runtime.embed -// +build !wv2runtime.error,!wv2runtime.browser,!wv2runtime.embed +//go:build windows && !wv2runtime.error && !wv2runtime.browser && !wv2runtime.embed +// +build windows,!wv2runtime.error,!wv2runtime.browser,!wv2runtime.embed package wv2installer import ( "fmt" + "github.com/wailsapp/wails/v2/internal/webview2runtime" "github.com/wailsapp/wails/v2/pkg/options/windows" ) diff --git a/v2/internal/wv2installer/embed.go b/v2/internal/wv2installer/embed.go index b01274ea..942d6b51 100644 --- a/v2/internal/wv2installer/embed.go +++ b/v2/internal/wv2installer/embed.go @@ -1,5 +1,5 @@ -//go:build wv2runtime.embed -// +build wv2runtime.embed +//go:build windows && wv2runtime.embed +// +build windows,wv2runtime.embed package wv2installer diff --git a/v2/internal/wv2installer/error.go b/v2/internal/wv2installer/error.go index 3ce7d2a1..ec48ef99 100644 --- a/v2/internal/wv2installer/error.go +++ b/v2/internal/wv2installer/error.go @@ -1,5 +1,5 @@ -//go:build wv2runtime.error -// +build wv2runtime.error +//go:build windows && wv2runtime.error +// +build windows,wv2runtime.error package wv2installer diff --git a/v2/pkg/commands/build/base.go b/v2/pkg/commands/build/base.go index f4195628..9d195cd4 100644 --- a/v2/pkg/commands/build/base.go +++ b/v2/pkg/commands/build/base.go @@ -379,8 +379,7 @@ func (b *BaseBuilder) CompileProject(options *Options) error { NOTE: It would appear that you do not have the latest Xcode cli tools installed. Please reinstall by doing the following: 1. Remove the current installation located at "xcode-select -p", EG: sudo rm -rf /Library/Developer/CommandLineTools - 2. Install latest Xcode tools: xcode-select --install -`) + 2. Install latest Xcode tools: xcode-select --install`) } } return err diff --git a/v2/pkg/commands/build/build.go b/v2/pkg/commands/build/build.go index 876ba19a..dd4b6d73 100644 --- a/v2/pkg/commands/build/build.go +++ b/v2/pkg/commands/build/build.go @@ -293,7 +293,7 @@ func execBuildApplication(builder Builder, options *Options) (string, error) { } // Run lipo if options.Verbosity == VERBOSE { - pterm.Println("Running lipo: lipo -create -output %s %s %s", outputFile, amd64Filename, arm64Filename) + pterm.Println(fmt.Sprintf("Running lipo: lipo -create -output %s %s %s", outputFile, amd64Filename, arm64Filename)) } _, stderr, err := shell.RunCommand(options.BinDirectory, "lipo", "-create", "-output", outputFile, amd64Filename, arm64Filename) if err != nil { @@ -401,7 +401,8 @@ func executeBuildHook(outputLogger *clilogger.CLILogger, options *Options, hookI } if options.Verbosity == VERBOSE { - pterm.Info.Println("%s", strings.Join(args, " ")) + pterm.Info.Println(strings.Join(args, " ")) + } stdout, stderr, err := shell.RunCommand(options.BinDirectory, args[0], args[1:]...)