Skip to content

"rsync for cloud storage" - Google Drive, S3, Dropbox, Backblaze B2, One Drive, Swift, Hubic, Wasabi, Google Cloud Storage, Azure Blob, Azure Files, Yandex Files

Replace Windows-specific NewLazyDLL with NewLazySystemDLL

albertony7692ef289f21
diff --git a/backend/local/about_windows.go b/backend/local/about_windows.go
index 1d4ab338e..bda2a5504 100644
--- a/backend/local/about_windows.go
+++ b/backend/local/about_windows.go
@@ -5,18 +5,18 @@ package local
import (
"context"
"fmt"
- "syscall"
"unsafe"
"github.com/rclone/rclone/fs"
+ "golang.org/x/sys/windows"
)
-var getFreeDiskSpace = syscall.NewLazyDLL("kernel32.dll").NewProc("GetDiskFreeSpaceExW")
+var getFreeDiskSpace = windows.NewLazySystemDLL("kernel32.dll").NewProc("GetDiskFreeSpaceExW")
// About gets quota information
func (f *Fs) About(ctx context.Context) (*fs.Usage, error) {
var available, total, free int64
- root, e := syscall.UTF16PtrFromString(f.root)
+ root, e := windows.UTF16PtrFromString(f.root)
if e != nil {
return nil, fmt.Errorf("failed to read disk usage: %w", e)
}
@@ -26,7 +26,7 @@ func (f *Fs) About(ctx context.Context) (*fs.Usage, error) {
uintptr(unsafe.Pointer(&total)), // lpTotalNumberOfBytes
uintptr(unsafe.Pointer(&free)), // lpTotalNumberOfFreeBytes
)
- if e1 != syscall.Errno(0) {
+ if e1 != windows.Errno(0) {
return nil, fmt.Errorf("failed to read disk usage: %w", e1)
}
usage := &fs.Usage{
diff --git a/lib/terminal/hidden_windows.go b/lib/terminal/hidden_windows.go
index 62eda1e3d..1bc7f5e77 100644
--- a/lib/terminal/hidden_windows.go
+++ b/lib/terminal/hidden_windows.go
@@ -3,13 +3,13 @@
package terminal
import (
- "syscall"
+ "golang.org/x/sys/windows"
)
// HideConsole hides the console window and activates another window
func HideConsole() {
- getConsoleWindow := syscall.NewLazyDLL("kernel32.dll").NewProc("GetConsoleWindow")
- showWindow := syscall.NewLazyDLL("user32.dll").NewProc("ShowWindow")
+ getConsoleWindow := windows.NewLazySystemDLL("kernel32.dll").NewProc("GetConsoleWindow")
+ showWindow := windows.NewLazySystemDLL("user32.dll").NewProc("ShowWindow")
if getConsoleWindow.Find() == nil && showWindow.Find() == nil {
hwnd, _, _ := getConsoleWindow.Call()
if hwnd != 0 {