removed last references to go-winio

This commit is contained in:
Ronnie Flathers
2020-03-15 19:24:22 -05:00
parent b5515ad04e
commit defd7ed7d0
5 changed files with 7 additions and 28 deletions
+2 -3
View File
@@ -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,
+2 -3
View File
@@ -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,
+1 -4
View File
@@ -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
-15
View File
@@ -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=
+2 -3
View File
@@ -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,