From: qmuntal Date: Wed, 23 Aug 2023 14:52:37 +0000 (+0200) Subject: os: omit existence check for GetFinalPathNameByHandle X-Git-Tag: go1.22rc1~1101 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=dd38ade8d1f2cbe938604fbb34a69533cb128310;p=gostls13.git os: omit existence check for GetFinalPathNameByHandle GetFinalPathNameByHandle exists since Windows Vista, which we no longer support, so we don't need to prove that it exists before using it. Updates #57003 Change-Id: Iff2bbe51d3baa3aabcaacf39ea3cbeda0088b9d7 Reviewed-on: https://go-review.googlesource.com/c/go/+/522195 Run-TryBot: Quim Muntal Reviewed-by: Carlos Amedee TryBot-Result: Gopher Robot Reviewed-by: Bryan Mills --- diff --git a/src/internal/syscall/windows/syscall_windows.go b/src/internal/syscall/windows/syscall_windows.go index 68778e7764..ab4ad2ec64 100644 --- a/src/internal/syscall/windows/syscall_windows.go +++ b/src/internal/syscall/windows/syscall_windows.go @@ -365,10 +365,6 @@ const ( //sys GetFinalPathNameByHandle(file syscall.Handle, filePath *uint16, filePathSize uint32, flags uint32) (n uint32, err error) = kernel32.GetFinalPathNameByHandleW -func LoadGetFinalPathNameByHandle() error { - return procGetFinalPathNameByHandleW.Find() -} - func ErrorLoadingGetTempPath2() error { return procGetTempPath2W.Find() } diff --git a/src/os/file_windows.go b/src/os/file_windows.go index c77d182fae..63d53a1df8 100644 --- a/src/os/file_windows.go +++ b/src/os/file_windows.go @@ -377,12 +377,6 @@ func normaliseLinkPath(path string) (string, error) { // handle paths, like \??\Volume{abc}\... - err := windows.LoadGetFinalPathNameByHandle() - if err != nil { - // we must be using old version of Windows - return "", err - } - h, err := openSymlink(path) if err != nil { return "", err