From f599c14f5403a378b01a12c5c6b571453e60f595 Mon Sep 17 00:00:00 2001 From: Oleg Broslavsky Date: Thu, 6 Aug 2020 13:44:50 +0700 Subject: [PATCH] Rename go module to the fork name to use it in libs --- README.md | 11 +++++++++-- _example/excel/excel.go | 4 ++-- _example/excel2/excel.go | 4 ++-- _example/ie/ie.go | 4 ++-- _example/itunes/itunes.go | 4 ++-- _example/libreoffice/libreoffice.go | 4 ++-- _example/mediaplayer/mediaplayer.go | 4 ++-- _example/msagent/msagent.go | 4 ++-- _example/msxml/rssreader.go | 4 ++-- _example/outlook/outlook.go | 4 ++-- _example/winsock/winsock.go | 4 ++-- go.mod | 7 +++++-- go.sum | 4 ++++ oleutil/connection.go | 2 +- oleutil/connection_func.go | 2 +- oleutil/connection_windows.go | 2 +- oleutil/oleutil.go | 2 +- 17 files changed, 42 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index 7b57755..fb711f0 100644 --- a/README.md +++ b/README.md @@ -2,18 +2,25 @@ [![Build status](https://ci.appveyor.com/api/projects/status/qr0u2sf7q43us9fj?svg=true)](https://ci.appveyor.com/project/jacobsantos/go-ole-jgs28) [![Build Status](https://travis-ci.org/go-ole/go-ole.svg?branch=master)](https://travis-ci.org/go-ole/go-ole) -[![GoDoc](https://godoc.org/github.com/go-ole/go-ole?status.svg)](https://godoc.org/github.com/go-ole/go-ole) +[![GoDoc](https://godoc.org/github.com/bi-zone/go-ole?status.svg)](https://godoc.org/github.com/bi-zone/go-ole) Go bindings for Windows COM using shared libraries instead of cgo. By Yasuhiro Matsumoto. +## Fork Features +Fork contains the following bug fixes until them will be merged to the upstream: +- https://github.com/go-ole/go-ole/pull/199 +- https://github.com/go-ole/go-ole/pull/201 + +Go module is renamed to the fork name to be able to use it in libs without replace trick. + ## Install To experiment with go-ole, you can just compile and run the example program: ``` -go get github.com/go-ole/go-ole +go get github.com/bi-zone/go-ole cd /path/to/go-ole/ go test diff --git a/_example/excel/excel.go b/_example/excel/excel.go index 0a8d911..6930d79 100644 --- a/_example/excel/excel.go +++ b/_example/excel/excel.go @@ -5,8 +5,8 @@ package main import ( "time" - ole "github.com/go-ole/go-ole" - "github.com/go-ole/go-ole/oleutil" + ole "github.com/bi-zone/go-ole" + "github.com/bi-zone/go-ole/oleutil" ) func main() { diff --git a/_example/excel2/excel.go b/_example/excel2/excel.go index ed8616a..c90d70d 100644 --- a/_example/excel2/excel.go +++ b/_example/excel2/excel.go @@ -7,8 +7,8 @@ import ( "log" "os" - ole "github.com/go-ole/go-ole" - "github.com/go-ole/go-ole/oleutil" + ole "github.com/bi-zone/go-ole" + "github.com/bi-zone/go-ole/oleutil" ) func writeExample(excel, workbooks *ole.IDispatch, filepath string) { diff --git a/_example/ie/ie.go b/_example/ie/ie.go index 106863d..67bd7d1 100644 --- a/_example/ie/ie.go +++ b/_example/ie/ie.go @@ -5,8 +5,8 @@ package main import ( "time" - ole "github.com/go-ole/go-ole" - "github.com/go-ole/go-ole/oleutil" + ole "github.com/bi-zone/go-ole" + "github.com/bi-zone/go-ole/oleutil" ) func main() { diff --git a/_example/itunes/itunes.go b/_example/itunes/itunes.go index 0d10ce0..e077df6 100644 --- a/_example/itunes/itunes.go +++ b/_example/itunes/itunes.go @@ -7,8 +7,8 @@ import ( "os" "strings" - ole "github.com/go-ole/go-ole" - "github.com/go-ole/go-ole/oleutil" + ole "github.com/bi-zone/go-ole" + "github.com/bi-zone/go-ole/oleutil" "github.com/gonuts/commander" ) diff --git a/_example/libreoffice/libreoffice.go b/_example/libreoffice/libreoffice.go index 3a1d928..54c4c7e 100644 --- a/_example/libreoffice/libreoffice.go +++ b/_example/libreoffice/libreoffice.go @@ -38,8 +38,8 @@ import ( "fmt" "log" - ole "github.com/go-ole/go-ole" - "github.com/go-ole/go-ole/oleutil" + ole "github.com/bi-zone/go-ole" + "github.com/bi-zone/go-ole/oleutil" ) func checkError(err error, msg string) { diff --git a/_example/mediaplayer/mediaplayer.go b/_example/mediaplayer/mediaplayer.go index 5352e4c..861ec3e 100644 --- a/_example/mediaplayer/mediaplayer.go +++ b/_example/mediaplayer/mediaplayer.go @@ -6,8 +6,8 @@ import ( "fmt" "log" - ole "github.com/go-ole/go-ole" - "github.com/go-ole/go-ole/oleutil" + ole "github.com/bi-zone/go-ole" + "github.com/bi-zone/go-ole/oleutil" ) func main() { diff --git a/_example/msagent/msagent.go b/_example/msagent/msagent.go index 7d96546..449e58d 100644 --- a/_example/msagent/msagent.go +++ b/_example/msagent/msagent.go @@ -5,8 +5,8 @@ package main import ( "time" - ole "github.com/go-ole/go-ole" - "github.com/go-ole/go-ole/oleutil" + ole "github.com/bi-zone/go-ole" + "github.com/bi-zone/go-ole/oleutil" ) func main() { diff --git a/_example/msxml/rssreader.go b/_example/msxml/rssreader.go index b43be81..fda055b 100644 --- a/_example/msxml/rssreader.go +++ b/_example/msxml/rssreader.go @@ -6,8 +6,8 @@ import ( "fmt" "time" - ole "github.com/go-ole/go-ole" - "github.com/go-ole/go-ole/oleutil" + ole "github.com/bi-zone/go-ole" + "github.com/bi-zone/go-ole/oleutil" ) func main() { diff --git a/_example/outlook/outlook.go b/_example/outlook/outlook.go index 141051f..23fdcab 100644 --- a/_example/outlook/outlook.go +++ b/_example/outlook/outlook.go @@ -5,8 +5,8 @@ package main import ( "fmt" - ole "github.com/go-ole/go-ole" - "github.com/go-ole/go-ole/oleutil" + ole "github.com/bi-zone/go-ole" + "github.com/bi-zone/go-ole/oleutil" ) func main() { diff --git a/_example/winsock/winsock.go b/_example/winsock/winsock.go index 55b7cf1..ed532f0 100644 --- a/_example/winsock/winsock.go +++ b/_example/winsock/winsock.go @@ -7,8 +7,8 @@ import ( "syscall" "unsafe" - ole "github.com/go-ole/go-ole" - "github.com/go-ole/go-ole/oleutil" + ole "github.com/bi-zone/go-ole" + "github.com/bi-zone/go-ole/oleutil" ) type EventReceiver struct { diff --git a/go.mod b/go.mod index 3a21f75..811b9a0 100644 --- a/go.mod +++ b/go.mod @@ -1,5 +1,8 @@ -module github.com/go-ole/go-ole +module github.com/bi-zone/go-ole go 1.12 -require golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3 +require ( + github.com/gonuts/commander v0.1.0 // indirect + golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3 +) diff --git a/go.sum b/go.sum index 9814d31..0a21b0d 100644 --- a/go.sum +++ b/go.sum @@ -1,2 +1,6 @@ +github.com/gonuts/commander v0.1.0 h1:EcDTiVw9oAVORFjQOEOuHQqcl6OXMyTgELocTq6zJ0I= +github.com/gonuts/commander v0.1.0/go.mod h1:qkb5mSlcWodYgo7vs8ulLnXhfinhZsZcm6+H/z1JjgY= +github.com/gonuts/flag v0.1.0 h1:fqMv/MZ+oNGu0i9gp0/IQ/ZaPIDoAZBOBaJoV7viCWM= +github.com/gonuts/flag v0.1.0/go.mod h1:ZTmTGtrSPejTo/SRNhCqwLTmiAgyBdCkLYhHrAoBdz4= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3 h1:7TYNF4UdlohbFwpNH04CoPMp1cHUZgO1Ebq5r2hIjfo= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= diff --git a/oleutil/connection.go b/oleutil/connection.go index 60df73c..614b10e 100644 --- a/oleutil/connection.go +++ b/oleutil/connection.go @@ -6,7 +6,7 @@ import ( "reflect" "unsafe" - ole "github.com/go-ole/go-ole" + ole "github.com/bi-zone/go-ole" ) type stdDispatch struct { diff --git a/oleutil/connection_func.go b/oleutil/connection_func.go index 8818fb8..2fd000e 100644 --- a/oleutil/connection_func.go +++ b/oleutil/connection_func.go @@ -2,7 +2,7 @@ package oleutil -import ole "github.com/go-ole/go-ole" +import ole "github.com/bi-zone/go-ole" // ConnectObject creates a connection point between two services for communication. func ConnectObject(disp *ole.IDispatch, iid *ole.GUID, idisp interface{}) (uint32, error) { diff --git a/oleutil/connection_windows.go b/oleutil/connection_windows.go index ab9c0d8..37cb936 100644 --- a/oleutil/connection_windows.go +++ b/oleutil/connection_windows.go @@ -7,7 +7,7 @@ import ( "syscall" "unsafe" - ole "github.com/go-ole/go-ole" + ole "github.com/bi-zone/go-ole" ) // ConnectObject creates a connection point between two services for communication. diff --git a/oleutil/oleutil.go b/oleutil/oleutil.go index f7803c1..eafa8a4 100644 --- a/oleutil/oleutil.go +++ b/oleutil/oleutil.go @@ -1,6 +1,6 @@ package oleutil -import ole "github.com/go-ole/go-ole" +import ole "github.com/bi-zone/go-ole" // ClassIDFrom retrieves class ID whether given is program ID or application string. func ClassIDFrom(programID string) (classID *ole.GUID, err error) {