memmod: use resource functions from x/sys

Signed-off-by: Jason A. Donenfeld <[email protected]>
WireGuard · Mar 9, 2021 · 4885e7c · 4885e7c
1 parent 497ba95
commit 4885e7c
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 266 deletions.
diff --git a/tun/wintun/dll_fromrsrc_windows.go b/tun/wintun/dll_fromrsrc_windows.go
@@ -16,7 +16,6 @@ import (
 	"golang.org/x/sys/windows"
 
 	"golang.zx2c4.com/wireguard/tun/wintun/memmod"
-	"golang.zx2c4.com/wireguard/tun/wintun/resource"
 )
 
 type lazyDLL struct {
@@ -37,11 +36,11 @@ func (d *lazyDLL) Load() error {
 	}
 
 	const ourModule windows.Handle = 0
-	resInfo, err := resource.FindByName(ourModule, d.Name, resource.RT_RCDATA)
+	resInfo, err := windows.FindResource(ourModule, d.Name, windows.RT_RCDATA)
 	if err != nil {
 		return fmt.Errorf("Unable to find \"%v\" RCDATA resource: %w", d.Name, err)
 	}
-	data, err := resource.Load(ourModule, resInfo)
+	data, err := windows.LoadResourceData(ourModule, resInfo)
 	if err != nil {
 		return fmt.Errorf("Unable to load resource: %w", err)
 	}

diff --git a/tun/wintun/resource/mksyscall.go b/tun/wintun/resource/mksyscall.go
diff --git a/tun/wintun/resource/resource_windows.go b/tun/wintun/resource/resource_windows.go
diff --git a/tun/wintun/resource/zsyscall_windows.go b/tun/wintun/resource/zsyscall_windows.go