diff --git a/app/cmd/app/app_darwin.go b/app/cmd/app/app_darwin.go index 2018ce8e4..8e886a124 100644 --- a/app/cmd/app/app_darwin.go +++ b/app/cmd/app/app_darwin.go @@ -191,13 +191,6 @@ func LaunchNewApp() { C.launchApp(appName) } -// Send a request to the main app thread to load a UI page -func sendUIRequestMessage(path string) { - p := C.CString(path) - defer C.free(unsafe.Pointer(p)) - C.uiRequest(p) -} - func registerLaunchAgent(hasCompletedFirstRun bool) { // Remove any stale Login Item registrations C.unregisterSelfFromLoginItem() diff --git a/app/cmd/app/app_windows.go b/app/cmd/app/app_windows.go index b563d4098..9caeb178a 100644 --- a/app/cmd/app/app_windows.go +++ b/app/cmd/app/app_windows.go @@ -263,11 +263,6 @@ func createLoginShortcut() error { return nil } -// Send a request to the main app thread to load a UI page -func sendUIRequestMessage(path string) { - wintray.SendUIRequestMessage(path) -} - func LaunchNewApp() { } diff --git a/app/dialog/dlgs_windows.go b/app/dialog/dlgs_windows.go index c5b175caa..51ba9ee69 100644 --- a/app/dialog/dlgs_windows.go +++ b/app/dialog/dlgs_windows.go @@ -15,7 +15,7 @@ const multiFileBufferSize = w32.MAX_PATH * 10 type WinDlgError int func (e WinDlgError) Error() string { - return fmt.Sprintf("CommDlgExtendedError: %#x", e) + return fmt.Sprintf("CommDlgExtendedError: %#x", int(e)) } func err() error { diff --git a/app/wintray/eventloop.go b/app/wintray/eventloop.go index 15fbd0c31..dda433e28 100644 --- a/app/wintray/eventloop.go +++ b/app/wintray/eventloop.go @@ -158,16 +158,16 @@ func (t *winTray) wndProc(hWnd windows.Handle, message uint32, wParam, lParam ui case uint32(UI_REQUEST_MSG_ID): // Requests for the UI must always come from the main event thread l := int(wParam) - path := unsafe.String((*byte)(unsafe.Pointer(lParam)), l) + path := unsafe.String((*byte)(unsafe.Pointer(lParam)), l) //nolint:govet,gosec t.app.UIRun(path) case WM_COPYDATA: // Handle URL scheme requests from other instances if lParam != 0 { - cds := (*COPYDATASTRUCT)(unsafe.Pointer(lParam)) - if cds.DwData == 1 { // Our identifier for URL scheme messages + cds := (*COPYDATASTRUCT)(unsafe.Pointer(lParam)) //nolint:govet,gosec + if cds.DwData == 1 { // Our identifier for URL scheme messages // Convert the data back to string data := make([]byte, cds.CbData) - copy(data, (*[1 << 30]byte)(unsafe.Pointer(cds.LpData))[:cds.CbData:cds.CbData]) + copy(data, (*[1 << 30]byte)(unsafe.Pointer(cds.LpData))[:cds.CbData:cds.CbData]) //nolint:govet,gosec urlScheme := string(data) handleURLSchemeRequest(urlScheme) lResult = 1 // Return non-zero to indicate success