@@ -1,7 +1,7 @@

 # the following lines are in sorted order, FYI

 github.com/Azure/go-ansiterm d6e3b3328b783f23731bc4d058875b0371ff8109

 github.com/Microsoft/hcsshim 44c060121b68e8bdc40b411beba551f3b4ee9e55

-github.com/Microsoft/go-winio v0.4.10

+github.com/Microsoft/go-winio v0.4.11

 github.com/docker/libtrust 9cbd2a1374f46905c68a4eb3694a130610adc62a

 github.com/go-check/check 4ed411733c5785b40214c70bce814c3a3a689609 https://github.com/cpuguy83/check.git

 github.com/golang/gddo 9b12a26f3fbd7397dee4e20939ddca719d840d2a

@@ -1,137 +1,137 @@

-package winio

-

-import (

-	"bytes"

-	"encoding/binary"

-	"errors"

-)

-

-type fileFullEaInformation struct {

-	NextEntryOffset uint32

-	Flags           uint8

-	NameLength      uint8

-	ValueLength     uint16

-}

-

-var (

-	fileFullEaInformationSize = binary.Size(&fileFullEaInformation{})

-

-	errInvalidEaBuffer = errors.New("invalid extended attribute buffer")

-	errEaNameTooLarge  = errors.New("extended attribute name too large")

-	errEaValueTooLarge = errors.New("extended attribute value too large")

-)

-

-// ExtendedAttribute represents a single Windows EA.

-type ExtendedAttribute struct {

-	Name  string

-	Value []byte

-	Flags uint8

-}

-

-func parseEa(b []byte) (ea ExtendedAttribute, nb []byte, err error) {

-	var info fileFullEaInformation

-	err = binary.Read(bytes.NewReader(b), binary.LittleEndian, &info)

-	if err != nil {

-		err = errInvalidEaBuffer

-		return

-	}

-

-	nameOffset := fileFullEaInformationSize

-	nameLen := int(info.NameLength)

-	valueOffset := nameOffset + int(info.NameLength) + 1

-	valueLen := int(info.ValueLength)

-	nextOffset := int(info.NextEntryOffset)

-	if valueLen+valueOffset > len(b) || nextOffset < 0 || nextOffset > len(b) {

-		err = errInvalidEaBuffer

-		return

-	}

-

-	ea.Name = string(b[nameOffset : nameOffset+nameLen])

-	ea.Value = b[valueOffset : valueOffset+valueLen]

-	ea.Flags = info.Flags

-	if info.NextEntryOffset != 0 {

-		nb = b[info.NextEntryOffset:]

-	}

-	return

-}

-

-// DecodeExtendedAttributes decodes a list of EAs from a FILE_FULL_EA_INFORMATION

-// buffer retrieved from BackupRead, ZwQueryEaFile, etc.

-func DecodeExtendedAttributes(b []byte) (eas []ExtendedAttribute, err error) {

-	for len(b) != 0 {

-		ea, nb, err := parseEa(b)

-		if err != nil {

-			return nil, err

-		}

-

-		eas = append(eas, ea)

-		b = nb

-	}

-	return

-}

-

-func writeEa(buf *bytes.Buffer, ea *ExtendedAttribute, last bool) error {

-	if int(uint8(len(ea.Name))) != len(ea.Name) {

-		return errEaNameTooLarge

-	}

-	if int(uint16(len(ea.Value))) != len(ea.Value) {

-		return errEaValueTooLarge

-	}

-	entrySize := uint32(fileFullEaInformationSize + len(ea.Name) + 1 + len(ea.Value))

-	withPadding := (entrySize + 3) &^ 3

-	nextOffset := uint32(0)

-	if !last {

-		nextOffset = withPadding

-	}

-	info := fileFullEaInformation{

-		NextEntryOffset: nextOffset,

-		Flags:           ea.Flags,

-		NameLength:      uint8(len(ea.Name)),

-		ValueLength:     uint16(len(ea.Value)),

-	}

-

-	err := binary.Write(buf, binary.LittleEndian, &info)

-	if err != nil {

-		return err

-	}

-

-	_, err = buf.Write([]byte(ea.Name))

-	if err != nil {

-		return err

-	}

-

-	err = buf.WriteByte(0)

-	if err != nil {

-		return err

-	}

-

-	_, err = buf.Write(ea.Value)

-	if err != nil {

-		return err

-	}

-

-	_, err = buf.Write([]byte{0, 0, 0}[0 : withPadding-entrySize])

-	if err != nil {

-		return err

-	}

-

-	return nil

-}

-

-// EncodeExtendedAttributes encodes a list of EAs into a FILE_FULL_EA_INFORMATION

-// buffer for use with BackupWrite, ZwSetEaFile, etc.

-func EncodeExtendedAttributes(eas []ExtendedAttribute) ([]byte, error) {

-	var buf bytes.Buffer

-	for i := range eas {

-		last := false

-		if i == len(eas)-1 {

-			last = true

-		}

-

-		err := writeEa(&buf, &eas[i], last)

-		if err != nil {

-			return nil, err

-		}

-	}

-	return buf.Bytes(), nil

-}

+package winio

+

+import (

+	"bytes"

+	"encoding/binary"

+	"errors"

+)

+

+type fileFullEaInformation struct {

+	NextEntryOffset uint32

+	Flags           uint8

+	NameLength      uint8

+	ValueLength     uint16

+}

+

+var (

+	fileFullEaInformationSize = binary.Size(&fileFullEaInformation{})

+

+	errInvalidEaBuffer = errors.New("invalid extended attribute buffer")

+	errEaNameTooLarge  = errors.New("extended attribute name too large")

+	errEaValueTooLarge = errors.New("extended attribute value too large")

+)

+

+// ExtendedAttribute represents a single Windows EA.

+type ExtendedAttribute struct {

+	Name  string

+	Value []byte

+	Flags uint8

+}

+

+func parseEa(b []byte) (ea ExtendedAttribute, nb []byte, err error) {

+	var info fileFullEaInformation

+	err = binary.Read(bytes.NewReader(b), binary.LittleEndian, &info)

+	if err != nil {

+		err = errInvalidEaBuffer

+		return

+	}

+

+	nameOffset := fileFullEaInformationSize

+	nameLen := int(info.NameLength)

+	valueOffset := nameOffset + int(info.NameLength) + 1

+	valueLen := int(info.ValueLength)

+	nextOffset := int(info.NextEntryOffset)

+	if valueLen+valueOffset > len(b) || nextOffset < 0 || nextOffset > len(b) {

+		err = errInvalidEaBuffer

+		return

+	}

+

+	ea.Name = string(b[nameOffset : nameOffset+nameLen])

+	ea.Value = b[valueOffset : valueOffset+valueLen]

+	ea.Flags = info.Flags

+	if info.NextEntryOffset != 0 {

+		nb = b[info.NextEntryOffset:]

+	}

+	return

+}

+

+// DecodeExtendedAttributes decodes a list of EAs from a FILE_FULL_EA_INFORMATION

+// buffer retrieved from BackupRead, ZwQueryEaFile, etc.

+func DecodeExtendedAttributes(b []byte) (eas []ExtendedAttribute, err error) {

+	for len(b) != 0 {

+		ea, nb, err := parseEa(b)

+		if err != nil {

+			return nil, err

+		}

+

+		eas = append(eas, ea)

+		b = nb

+	}

+	return

+}

+

+func writeEa(buf *bytes.Buffer, ea *ExtendedAttribute, last bool) error {

+	if int(uint8(len(ea.Name))) != len(ea.Name) {

+		return errEaNameTooLarge

+	}

+	if int(uint16(len(ea.Value))) != len(ea.Value) {

+		return errEaValueTooLarge

+	}

+	entrySize := uint32(fileFullEaInformationSize + len(ea.Name) + 1 + len(ea.Value))

+	withPadding := (entrySize + 3) &^ 3

+	nextOffset := uint32(0)

+	if !last {

+		nextOffset = withPadding

+	}

+	info := fileFullEaInformation{

+		NextEntryOffset: nextOffset,

+		Flags:           ea.Flags,

+		NameLength:      uint8(len(ea.Name)),

+		ValueLength:     uint16(len(ea.Value)),

+	}

+

+	err := binary.Write(buf, binary.LittleEndian, &info)

+	if err != nil {

+		return err

+	}

+

+	_, err = buf.Write([]byte(ea.Name))

+	if err != nil {

+		return err

+	}

+

+	err = buf.WriteByte(0)

+	if err != nil {

+		return err

+	}

+

+	_, err = buf.Write(ea.Value)

+	if err != nil {

+		return err

+	}

+

+	_, err = buf.Write([]byte{0, 0, 0}[0 : withPadding-entrySize])

+	if err != nil {

+		return err

+	}

+

+	return nil

+}

+

+// EncodeExtendedAttributes encodes a list of EAs into a FILE_FULL_EA_INFORMATION

+// buffer for use with BackupWrite, ZwSetEaFile, etc.

+func EncodeExtendedAttributes(eas []ExtendedAttribute) ([]byte, error) {

+	var buf bytes.Buffer

+	for i := range eas {

+		last := false

+		if i == len(eas)-1 {

+			last = true

+		}

+

+		err := writeEa(&buf, &eas[i], last)

+		if err != nil {

+			return nil, err

+		}

+	}

+	return buf.Bytes(), nil

+}

@@ -1,82 +1,108 @@

-// +build windows

-

-package vhd

-

-import "syscall"

-

-//go:generate go run mksyscall_windows.go -output zvhd.go vhd.go

-

-//sys createVirtualDisk(virtualStorageType *virtualStorageType, path string, virtualDiskAccessMask uint32, securityDescriptor *uintptr, flags uint32, providerSpecificFlags uint32, parameters *createVirtualDiskParameters, o *syscall.Overlapped, handle *syscall.Handle) (err error) [failretval != 0] = VirtDisk.CreateVirtualDisk

-

-type virtualStorageType struct {

-	DeviceID uint32

-	VendorID [16]byte

-}

-

-const virtualDiskAccessNONE uint32 = 0

-const virtualDiskAccessATTACHRO uint32 = 65536

-const virtualDiskAccessATTACHRW uint32 = 131072

-const virtualDiskAccessDETACH uint32 = 262144

-const virtualDiskAccessGETINFO uint32 = 524288

-const virtualDiskAccessCREATE uint32 = 1048576

-const virtualDiskAccessMETAOPS uint32 = 2097152

-const virtualDiskAccessREAD uint32 = 851968

-const virtualDiskAccessALL uint32 = 4128768

-const virtualDiskAccessWRITABLE uint32 = 3276800

-

-const createVirtualDiskFlagNone uint32 = 0

-const createVirtualDiskFlagFullPhysicalAllocation uint32 = 1

-const createVirtualDiskFlagPreventWritesToSourceDisk uint32 = 2

-const createVirtualDiskFlagDoNotCopyMetadataFromParent uint32 = 4

-

-type version2 struct {

-	UniqueID                 [16]byte // GUID

-	MaximumSize              uint64

-	BlockSizeInBytes         uint32

-	SectorSizeInBytes        uint32

-	ParentPath               *uint16 // string

-	SourcePath               *uint16 // string

-	OpenFlags                uint32

-	ParentVirtualStorageType virtualStorageType

-	SourceVirtualStorageType virtualStorageType

-	ResiliencyGUID           [16]byte // GUID

-}

-

-type createVirtualDiskParameters struct {

-	Version  uint32 // Must always be set to 2

-	Version2 version2

-}

-

-// CreateVhdx will create a simple vhdx file at the given path using default values.

-func CreateVhdx(path string, maxSizeInGb, blockSizeInMb uint32) error {

-	var defaultType virtualStorageType

-

-	parameters := createVirtualDiskParameters{

-		Version: 2,

-		Version2: version2{

-			MaximumSize:      uint64(maxSizeInGb) * 1024 * 1024 * 1024,

-			BlockSizeInBytes: blockSizeInMb * 1024 * 1024,

-		},

-	}

-

-	var handle syscall.Handle

-

-	if err := createVirtualDisk(

-		&defaultType,

-		path,

-		virtualDiskAccessNONE,

-		nil,

-		createVirtualDiskFlagNone,

-		0,

-		&parameters,

-		nil,

-		&handle); err != nil {

-		return err

-	}

-

-	if err := syscall.CloseHandle(handle); err != nil {

-		return err

-	}

-

-	return nil

-}

+// +build windows

+

+package vhd

+

+import "syscall"

+

+//go:generate go run mksyscall_windows.go -output zvhd.go vhd.go

+

+//sys createVirtualDisk(virtualStorageType *virtualStorageType, path string, virtualDiskAccessMask uint32, securityDescriptor *uintptr, flags uint32, providerSpecificFlags uint32, parameters *createVirtualDiskParameters, o *syscall.Overlapped, handle *syscall.Handle) (err error) [failretval != 0] = VirtDisk.CreateVirtualDisk

+//sys openVirtualDisk(virtualStorageType *virtualStorageType, path string, virtualDiskAccessMask uint32, flags uint32, parameters *uintptr, handle *syscall.Handle) (err error) [failretval != 0] = VirtDisk.OpenVirtualDisk

+//sys detachVirtualDisk(handle syscall.Handle, flags uint32, providerSpecificFlags uint32) (err error) [failretval != 0] = VirtDisk.DetachVirtualDisk

+

+type virtualStorageType struct {

+	DeviceID uint32

+	VendorID [16]byte

+}

+

+const virtualDiskAccessNONE uint32 = 0

+const virtualDiskAccessATTACHRO uint32 = 65536

+const virtualDiskAccessATTACHRW uint32 = 131072

+const virtualDiskAccessDETACH uint32 = 262144

+const virtualDiskAccessGETINFO uint32 = 524288

+const virtualDiskAccessCREATE uint32 = 1048576

+const virtualDiskAccessMETAOPS uint32 = 2097152

+const virtualDiskAccessREAD uint32 = 851968

+const virtualDiskAccessALL uint32 = 4128768

+const virtualDiskAccessWRITABLE uint32 = 3276800

+

+const createVirtualDiskFlagNone uint32 = 0

+const createVirtualDiskFlagFullPhysicalAllocation uint32 = 1

+const createVirtualDiskFlagPreventWritesToSourceDisk uint32 = 2

+const createVirtualDiskFlagDoNotCopyMetadataFromParent uint32 = 4

+

+type version2 struct {

+	UniqueID                 [16]byte // GUID

+	MaximumSize              uint64

+	BlockSizeInBytes         uint32

+	SectorSizeInBytes        uint32

+	ParentPath               *uint16 // string

+	SourcePath               *uint16 // string

+	OpenFlags                uint32

+	ParentVirtualStorageType virtualStorageType

+	SourceVirtualStorageType virtualStorageType

+	ResiliencyGUID           [16]byte // GUID

+}

+

+type createVirtualDiskParameters struct {

+	Version  uint32 // Must always be set to 2

+	Version2 version2

+}

+

+// CreateVhdx will create a simple vhdx file at the given path using default values.

+func CreateVhdx(path string, maxSizeInGb, blockSizeInMb uint32) error {

+	var defaultType virtualStorageType

+

+	parameters := createVirtualDiskParameters{

+		Version: 2,

+		Version2: version2{

+			MaximumSize:      uint64(maxSizeInGb) * 1024 * 1024 * 1024,

+			BlockSizeInBytes: blockSizeInMb * 1024 * 1024,

+		},

+	}

+

+	var handle syscall.Handle

+

+	if err := createVirtualDisk(

+		&defaultType,

+		path,

+		virtualDiskAccessNONE,

+		nil,

+		createVirtualDiskFlagNone,

+		0,

+		&parameters,

+		nil,

+		&handle); err != nil {

+		return err

+	}

+

+	if err := syscall.CloseHandle(handle); err != nil {

+		return err

+	}

+

+	return nil

+}

+

+// DetachVhd detaches a VHD attached at the given path.

+func DetachVhd(path string) error {

+	var (

+		defaultType virtualStorageType

+		handle      syscall.Handle

+	)

+

+	if err := openVirtualDisk(

+		&defaultType,

+		path,

+		virtualDiskAccessDETACH,

+		0,

+		nil,

+		&handle); err != nil {

+		return err

+	}

+	defer syscall.CloseHandle(handle)

+

+	if err := detachVirtualDisk(handle, 0, 0); err != nil {

+		return err

+	}

+	return nil

+}

@@ -40,6 +40,8 @@ var (

 	modVirtDisk = windows.NewLazySystemDLL("VirtDisk.dll")

 	procCreateVirtualDisk = modVirtDisk.NewProc("CreateVirtualDisk")

+	procOpenVirtualDisk   = modVirtDisk.NewProc("OpenVirtualDisk")

+	procDetachVirtualDisk = modVirtDisk.NewProc("DetachVirtualDisk")

 )

 func createVirtualDisk(virtualStorageType *virtualStorageType, path string, virtualDiskAccessMask uint32, securityDescriptor *uintptr, flags uint32, providerSpecificFlags uint32, parameters *createVirtualDiskParameters, o *syscall.Overlapped, handle *syscall.Handle) (err error) {

@@ -62,3 +64,36 @@ func _createVirtualDisk(virtualStorageType *virtualStorageType, path *uint16, vi

 	}

 	return

 }

+

+func openVirtualDisk(virtualStorageType *virtualStorageType, path string, virtualDiskAccessMask uint32, flags uint32, parameters *uintptr, handle *syscall.Handle) (err error) {

+	var _p0 *uint16

+	_p0, err = syscall.UTF16PtrFromString(path)

+	if err != nil {

+		return

+	}

+	return _openVirtualDisk(virtualStorageType, _p0, virtualDiskAccessMask, flags, parameters, handle)

+}

+

+func _openVirtualDisk(virtualStorageType *virtualStorageType, path *uint16, virtualDiskAccessMask uint32, flags uint32, parameters *uintptr, handle *syscall.Handle) (err error) {

+	r1, _, e1 := syscall.Syscall6(procOpenVirtualDisk.Addr(), 6, uintptr(unsafe.Pointer(virtualStorageType)), uintptr(unsafe.Pointer(path)), uintptr(virtualDiskAccessMask), uintptr(flags), uintptr(unsafe.Pointer(parameters)), uintptr(unsafe.Pointer(handle)))

+	if r1 != 0 {

+		if e1 != 0 {

+			err = errnoErr(e1)

+		} else {

+			err = syscall.EINVAL

+		}

+	}

+	return

+}

+

+func detachVirtualDisk(handle syscall.Handle, flags uint32, providerSpecificFlags uint32) (err error) {

+	r1, _, e1 := syscall.Syscall(procDetachVirtualDisk.Addr(), 3, uintptr(handle), uintptr(flags), uintptr(providerSpecificFlags))

+	if r1 != 0 {

+		if e1 != 0 {

+			err = errnoErr(e1)

+		} else {

+			err = syscall.EINVAL

+		}

+	}

+	return

+}