blender/flamenco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Windows: fix error handling of syscall to AssocQueryStringW

Browse Source 
syscall.SyscallN returns a `uintptr` type alias, and thus has to be
compared to `0`, not `nil`. Yeah, it's a bit weird.
This commit is contained in:
Sybren A. Stüvel 2022-07-13 11:48:26 +02:00
parent 5b1b0b30a9
commit ce250a611e
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
internal/worker/find_blender/windows.go
View File

@ -72,7 +72,7 @@ func fileAssociation(extension string) (string, error) {
buf := make([]uint16, cchOut) buf := make([]uint16, cchOut)
pszOut := unsafe.Pointer(&buf[0]) pszOut := unsafe.Pointer(&buf[0])
result1, _, err := syscall.SyscallN( result1, _, errno := syscall.SyscallN(
assocQueryString, assocQueryString,
uintptr(ASSOCF_INIT_DEFAULTTOSTAR), // [in] ASSOCF flags uintptr(ASSOCF_INIT_DEFAULTTOSTAR), // [in] ASSOCF flags
uintptr(ASSOCSTR_EXECUTABLE), // [in] ASSOCSTR str uintptr(ASSOCSTR_EXECUTABLE), // [in] ASSOCSTR str
@ -81,13 +81,8 @@ func fileAssociation(extension string) (string, error) {
uintptr(pszOut), // [out, optional] LPWSTR pszOut uintptr(pszOut), // [out, optional] LPWSTR pszOut
uintptr(unsafe.Pointer(&cchOut)), // [in, out] DWORD *pcchOut uintptr(unsafe.Pointer(&cchOut)), // [in, out] DWORD *pcchOut
) )
if err != nil { if errno != 0 {
// This can be a syscall.Errno with code 0, indicating things are actually fine. return "", fmt.Errorf("error calling AssocQueryStringW from shlwapi.dll: %w", errno)
if errno, ok := err.(syscall.Errno); ok && errno == 0 {
// So this is fine.
} else {
return "", fmt.Errorf("error calling AssocQueryStringW from shlwapi.dll: %w", err)
}
} }
if result1 != 0 { if result1 != 0 {
return "", fmt.Errorf("unknown result %d calling AssocQueryStringW from shlwapi.dll: %w", result1, err) return "", fmt.Errorf("unknown result %d calling AssocQueryStringW from shlwapi.dll: %w", result1, err)