From defd7ed7d0abb1d695aea00a69e99b357b136d47 Mon Sep 17 00:00:00 2001 From: Ronnie Flathers Date: Sun, 15 Mar 2020 19:24:22 -0500 Subject: [PATCH] removed last references to go-winio --- appdomain.go | 5 ++--- assembly.go | 5 ++--- go.mod | 5 +---- go.sum | 15 --------------- methodinfo.go | 5 ++--- 5 files changed, 7 insertions(+), 28 deletions(-) diff --git a/appdomain.go b/appdomain.go index 41ae03a..3dbc208 100644 --- a/appdomain.go +++ b/appdomain.go @@ -3,10 +3,9 @@ package clr import ( + "golang.org/x/sys/windows" "syscall" "unsafe" - - "github.com/Microsoft/go-winio/pkg/guid" ) type AppDomain struct { @@ -105,7 +104,7 @@ func NewAppDomainFromPtr(ppv uintptr) *AppDomain { return (*AppDomain)(unsafe.Pointer(ppv)) } -func (obj *AppDomain) QueryInterface(riid *guid.GUID, ppvObject *uintptr) uintptr { +func (obj *AppDomain) QueryInterface(riid *windows.GUID, ppvObject *uintptr) uintptr { ret, _, _ := syscall.Syscall( obj.vtbl.QueryInterface, 3, diff --git a/assembly.go b/assembly.go index f6d0ccc..f38c0f0 100644 --- a/assembly.go +++ b/assembly.go @@ -3,10 +3,9 @@ package clr import ( + "golang.org/x/sys/windows" "syscall" "unsafe" - - "github.com/Microsoft/go-winio/pkg/guid" ) // from mscorlib.tlh @@ -73,7 +72,7 @@ func NewAssemblyFromPtr(ppv uintptr) *Assembly { return (*Assembly)(unsafe.Pointer(ppv)) } -func (obj *Assembly) QueryInterface(riid *guid.GUID, ppvObject *uintptr) uintptr { +func (obj *Assembly) QueryInterface(riid *windows.GUID, ppvObject *uintptr) uintptr { ret, _, _ := syscall.Syscall( obj.vtbl.QueryInterface, 3, diff --git a/go.mod b/go.mod index 13e69de..335e9d8 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,4 @@ module github.com/ropnop/go-clr go 1.13 -require ( - github.com/Microsoft/go-winio v0.4.14 - golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527 -) +require golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527 diff --git a/go.sum b/go.sum index e422f6e..be51ac6 100644 --- a/go.sum +++ b/go.sum @@ -1,17 +1,2 @@ -github.com/Microsoft/go-winio v0.4.14 h1:+hMXMk01us9KgxGb7ftKQt2Xpf5hH/yky+TDA+qxleU= -github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= -github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/sirupsen/logrus v1.4.1 h1:GL2rEmy6nsikmW0r8opw9JIRScdMF5hA8cOYLH7In1k= -github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= -github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527 h1:uYVVQ9WP/Ds2ROhcaGPeIdVq0RIXVLwsHlnvJ+cT1So= golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= diff --git a/methodinfo.go b/methodinfo.go index 96beac2..37ba320 100644 --- a/methodinfo.go +++ b/methodinfo.go @@ -3,10 +3,9 @@ package clr import ( + "golang.org/x/sys/windows" "syscall" "unsafe" - - "github.com/Microsoft/go-winio/pkg/guid" ) // from mscorlib.tlh @@ -63,7 +62,7 @@ func NewMethodInfoFromPtr(ppv uintptr) *MethodInfo { return (*MethodInfo)(unsafe.Pointer(ppv)) } -func (obj *MethodInfo) QueryInterface(riid *guid.GUID, ppvObject *uintptr) uintptr { +func (obj *MethodInfo) QueryInterface(riid *windows.GUID, ppvObject *uintptr) uintptr { ret, _, _ := syscall.Syscall( obj.vtbl.QueryInterface, 3,