From 6d8b68c8f3cd7c9e9560c23e5f20e3ec4bc4fb6e Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Thu, 6 Jun 2019 22:28:13 +0200
Subject: wintun: guid functions are upstream

---
 tun/wintun/guid/guid_windows.go  | 41 ------------------------------
 tun/wintun/guid/mksyscall.go     |  8 ------
 tun/wintun/guid/zguid_windows.go | 55 ----------------------------------------
 3 files changed, 104 deletions(-)
 delete mode 100644 tun/wintun/guid/guid_windows.go
 delete mode 100644 tun/wintun/guid/mksyscall.go
 delete mode 100644 tun/wintun/guid/zguid_windows.go

(limited to 'tun/wintun/guid')

diff --git a/tun/wintun/guid/guid_windows.go b/tun/wintun/guid/guid_windows.go
deleted file mode 100644
index cc476d9..0000000
--- a/tun/wintun/guid/guid_windows.go
+++ /dev/null
@@ -1,41 +0,0 @@
-/* SPDX-License-Identifier: MIT
- *
- * Copyright (C) 2019 WireGuard LLC. All Rights Reserved.
- */
-
-package guid
-
-import (
-	"fmt"
-	"syscall"
-
-	"golang.org/x/sys/windows"
-)
-
-//sys	clsidFromString(lpsz *uint16, pclsid *windows.GUID) (err error) [failretval!=0] = ole32.CLSIDFromString
-
-//
-// FromString parses "{XXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}" string to GUID.
-//
-func FromString(str string) (*windows.GUID, error) {
-	strUTF16, err := syscall.UTF16PtrFromString(str)
-	if err != nil {
-		return nil, err
-	}
-	guid := &windows.GUID{}
-	err = clsidFromString(strUTF16, guid)
-	if err != nil {
-		return nil, err
-	}
-	return guid, nil
-}
-
-//
-// ToString function converts GUID to string
-// "{XXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}".
-//
-// The resulting string is uppercase.
-//
-func ToString(guid *windows.GUID) string {
-	return fmt.Sprintf("{%08X-%04X-%04X-%04X-%012X}", guid.Data1, guid.Data2, guid.Data3, guid.Data4[:2], guid.Data4[2:])
-}
diff --git a/tun/wintun/guid/mksyscall.go b/tun/wintun/guid/mksyscall.go
deleted file mode 100644
index 5c956cf..0000000
--- a/tun/wintun/guid/mksyscall.go
+++ /dev/null
@@ -1,8 +0,0 @@
-/* SPDX-License-Identifier: MIT
- *
- * Copyright (C) 2019 WireGuard LLC. All Rights Reserved.
- */
-
-package guid
-
-//go:generate go run $GOROOT/src/syscall/mksyscall_windows.go -output zguid_windows.go guid_windows.go
diff --git a/tun/wintun/guid/zguid_windows.go b/tun/wintun/guid/zguid_windows.go
deleted file mode 100644
index b0b4cce..0000000
--- a/tun/wintun/guid/zguid_windows.go
+++ /dev/null
@@ -1,55 +0,0 @@
-// Code generated by 'go generate'; DO NOT EDIT.
-
-package guid
-
-import (
-	"syscall"
-	"unsafe"
-
-	"golang.org/x/sys/windows"
-)
-
-var _ unsafe.Pointer
-
-// Do the interface allocations only once for common
-// Errno values.
-const (
-	errnoERROR_IO_PENDING = 997
-)
-
-var (
-	errERROR_IO_PENDING error = syscall.Errno(errnoERROR_IO_PENDING)
-)
-
-// errnoErr returns common boxed Errno values, to prevent
-// allocations at runtime.
-func errnoErr(e syscall.Errno) error {
-	switch e {
-	case 0:
-		return nil
-	case errnoERROR_IO_PENDING:
-		return errERROR_IO_PENDING
-	}
-	// TODO: add more here, after collecting data on the common
-	// error values see on Windows. (perhaps when running
-	// all.bat?)
-	return e
-}
-
-var (
-	modole32 = windows.NewLazySystemDLL("ole32.dll")
-
-	procCLSIDFromString = modole32.NewProc("CLSIDFromString")
-)
-
-func clsidFromString(lpsz *uint16, pclsid *windows.GUID) (err error) {
-	r1, _, e1 := syscall.Syscall(procCLSIDFromString.Addr(), 2, uintptr(unsafe.Pointer(lpsz)), uintptr(unsafe.Pointer(pclsid)), 0)
-	if r1 != 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-- 
cgit v1.2.3