Update hcsshim and gowinio for Windows Overlay

vendor/github.com/Microsoft/hcsshim/mksyscall_windows.go

@@ -69,6 +69,7 @@ var (
 	filename       = flag.String("output", "", "output file name (standard output if omitted)")
 	printTraceFlag = flag.Bool("trace", false, "generate print statement after every syscall")
 	systemDLL      = flag.Bool("systemdll", true, "whether all DLLs should be loaded from the Windows system directory")
+	winio          = flag.Bool("winio", false, "import go-winio")
 )
 
 func trim(s string) string {
@@ -299,7 +300,10 @@ func (r *Rets) SetErrorCode() string {
 		%s = %sErrno(r0)
 	}`
 	const hrCode = `if int32(r0) < 0 {
-		%s = %sErrno(win32FromHresult(r0))
+		if r0&0x1fff0000 == 0x00070000 {
+			r0 &= 0xffff
+		}
+		%s = %sErrno(r0)
 	}`
 	if r.Name == "" && !r.ReturnsError {
 		return ""
@@ -772,7 +776,9 @@ func (src *Source) Generate(w io.Writer) error {
 			src.ExternalImport("golang.org/x/sys/windows")
 		}
 	}
-	src.ExternalImport("github.com/Microsoft/go-winio")
+	if *winio {
+		src.ExternalImport("github.com/Microsoft/go-winio")
+	}
 	if packageName != "syscall" {
 		src.Import("syscall")
 	}
@@ -784,6 +790,9 @@ func (src *Source) Generate(w io.Writer) error {
 			if !*systemDLL {
 				return syscalldot() + "NewLazyDLL(" + arg + ")"
 			}
+			if strings.HasPrefix(dll, "api_") || strings.HasPrefix(dll, "ext_") {
+				arg = strings.Replace(arg, "_", "-", -1)
+			}
 			switch pkgtype {
 			case pkgStd:
 				return syscalldot() + "NewLazyDLL(sysdll.Add(" + arg + "))"
@@ -843,7 +852,7 @@ func main() {
 // TODO: use println instead to print in the following template
 const srcTemplate = `
 
-{{define "main"}}// MACHINE GENERATED BY 'go generate' COMMAND; DO NOT EDIT
+{{define "main"}}// Code generated mksyscall_windows.exe DO NOT EDIT
 
 package {{packagename}}