From fe0de8b9f6ddede25388190f5d66d3a3b941b3b6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 30 Jun 2023 00:28:26 +0000 Subject: [PATCH] fix(deps): update module github.com/containers/libhvee to v0.2.0 Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- .../github.com/containers/libhvee/pkg/wmiext/service.go | 8 +++++++- vendor/modules.txt | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 042368be4b..87121c00e7 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/containers/common v0.54.0 github.com/containers/conmon v2.0.20+incompatible github.com/containers/image/v5 v5.26.0 - github.com/containers/libhvee v0.0.5 + github.com/containers/libhvee v0.2.0 github.com/containers/ocicrypt v1.1.7 github.com/containers/psgo v1.8.0 github.com/containers/storage v1.47.0 diff --git a/go.sum b/go.sum index b866eae63c..0f3834e69c 100644 --- a/go.sum +++ b/go.sum @@ -247,8 +247,8 @@ github.com/containers/conmon v2.0.20+incompatible h1:YbCVSFSCqFjjVwHTPINGdMX1F6J github.com/containers/conmon v2.0.20+incompatible/go.mod h1:hgwZ2mtuDrppv78a/cOBNiCm6O0UMWGx1mu7P00nu5I= github.com/containers/image/v5 v5.26.0 h1:P9H4+N/7fTTClnFthIWgJU+0LBkhGlW2tCWR+UNG0Vs= github.com/containers/image/v5 v5.26.0/go.mod h1:QSW67adLL/B4eYsFPG6TjH5Ye4LiLazPAGWk5oQnUdQ= -github.com/containers/libhvee v0.0.5 h1:5tUiF2eVe8XbVSPD/Os4dIU1gJWoQgtkQHIjQ5X7wpE= -github.com/containers/libhvee v0.0.5/go.mod h1:AYsyMe44w9ylWWEZNW+IOzA7oZ2i/P9TChNljavhYMI= +github.com/containers/libhvee v0.2.0 h1:6h7LdSvBt176oIdMXKkgxdoT/IVP+o/gkwgyjWzvEAo= +github.com/containers/libhvee v0.2.0/go.mod h1:Zr2Qhnl5THW/HQjF1o8HmxXWjvHfJb8fvd0ThTzHMys= github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 h1:Qzk5C6cYglewc+UyGf6lc8Mj2UaPTHy/iF2De0/77CA= github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01/go.mod h1:9rfv8iPl1ZP7aqh9YA68wnZv2NUDbXdcdPHVz0pFbPY= github.com/containers/ocicrypt v1.0.1/go.mod h1:MeJDzk1RJHv89LjsH0Sp5KTY3ZYkjXO/C+bKAeWFIrc= diff --git a/vendor/github.com/containers/libhvee/pkg/wmiext/service.go b/vendor/github.com/containers/libhvee/pkg/wmiext/service.go index 60bd42d8e6..190d83acfb 100644 --- a/vendor/github.com/containers/libhvee/pkg/wmiext/service.go +++ b/vendor/github.com/containers/libhvee/pkg/wmiext/service.go @@ -62,6 +62,7 @@ func connectService(namespace string) (*Service, error) { var err error var res uintptr var strResource *uint16 + var strLocale *uint16 var service *ole.IUnknown loc := fmt.Sprintf(`\\.\%s`, namespace) @@ -70,6 +71,11 @@ func connectService(namespace string) (*Service, error) { return nil, err } + // Connect with en_US LCID since we do pattern matching against English key values + if strLocale, err = syscall.UTF16PtrFromString("MS_409"); err != nil { + return nil, err + } + myVTable := (*IWbemLocatorVtbl)(unsafe.Pointer(wmiWbemLocator.RawVTable)) res, _, _ = syscall.SyscallN( myVTable.ConnectServer, // IWbemLocator::ConnectServer( @@ -77,7 +83,7 @@ func connectService(namespace string) (*Service, error) { uintptr(unsafe.Pointer(strResource)), // [in] const BSTR strNetworkResource, uintptr(0), // [in] const BSTR strUser, uintptr(0), // [in] const BSTR strPassword, - uintptr(0), // [in] const BSTR strLocale, + uintptr(unsafe.Pointer(strLocale)), // [in] const BSTR strLocale, uintptr(WBEM_FLAG_CONNECT_USE_MAX_WAIT), // [in] long lSecurityFlags, uintptr(0), // [in] const BSTR strAuthority, uintptr(0), // [in] IWbemContext *pCtx, diff --git a/vendor/modules.txt b/vendor/modules.txt index 90826957c6..3671ed6f78 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -258,7 +258,7 @@ github.com/containers/image/v5/transports github.com/containers/image/v5/transports/alltransports github.com/containers/image/v5/types github.com/containers/image/v5/version -# github.com/containers/libhvee v0.0.5 +# github.com/containers/libhvee v0.2.0 ## explicit; go 1.18 github.com/containers/libhvee/pkg/hypervctl github.com/containers/libhvee/pkg/kvp/ginsu