From b07a622ff9f5e708e6420a261df4268fb231311c Mon Sep 17 00:00:00 2001 From: Sean Chittenden Date: Wed, 1 Feb 2017 22:51:03 -0800 Subject: [PATCH] Update `github.com/go-ole/go-ole` and remove a bit of cruft. --- vendor/github.com/go-ole/go-ole/.travis.yml | 9 - vendor/github.com/go-ole/go-ole/ChangeLog.md | 49 ---- vendor/github.com/go-ole/go-ole/README.md | 46 ---- vendor/github.com/go-ole/go-ole/appveyor.yml | 63 ------ .../go-ole/go-ole/build/compile-go.bat | 5 - .../go-ole/go-ole/build/register-assembly.bat | 8 - .../go-ole/go-ole/data/screenshot.png | Bin 14362 -> 0 bytes .../go-ole/go-ole/example/excel/excel.go | 31 --- .../go-ole/go-ole/example/excel2/excel.go | 96 -------- .../github.com/go-ole/go-ole/example/ie/ie.go | 33 --- .../go-ole/go-ole/example/itunes/itunes.go | 47 ---- .../go-ole/example/mediaplayer/mediaplayer.go | 29 --- .../go-ole/go-ole/example/msagent/msagent.go | 24 -- .../go-ole/go-ole/example/msxml/rssreader.go | 49 ---- .../go-ole/go-ole/example/outlook/outlook.go | 29 --- .../go-ole/go-ole/example/winsock/winsock.go | 140 ------------ vendor/github.com/go-ole/go-ole/guid.go | 210 ++++++++++++++++-- .../go-ole/go-ole/idispatch_windows.go | 13 +- .../go-ole/go-ole/iinspectable_windows.go | 2 +- .../go-ole/oleutil/connection_windows.go | 1 + .../go-ole/go-ole/safearray_func.go | 8 +- vendor/vendor.json | 4 +- 22 files changed, 204 insertions(+), 692 deletions(-) delete mode 100644 vendor/github.com/go-ole/go-ole/.travis.yml delete mode 100644 vendor/github.com/go-ole/go-ole/ChangeLog.md delete mode 100644 vendor/github.com/go-ole/go-ole/README.md delete mode 100644 vendor/github.com/go-ole/go-ole/appveyor.yml delete mode 100644 vendor/github.com/go-ole/go-ole/build/compile-go.bat delete mode 100644 vendor/github.com/go-ole/go-ole/build/register-assembly.bat delete mode 100644 vendor/github.com/go-ole/go-ole/data/screenshot.png delete mode 100644 vendor/github.com/go-ole/go-ole/example/excel/excel.go delete mode 100644 vendor/github.com/go-ole/go-ole/example/excel2/excel.go delete mode 100644 vendor/github.com/go-ole/go-ole/example/ie/ie.go delete mode 100644 vendor/github.com/go-ole/go-ole/example/itunes/itunes.go delete mode 100644 vendor/github.com/go-ole/go-ole/example/mediaplayer/mediaplayer.go delete mode 100644 vendor/github.com/go-ole/go-ole/example/msagent/msagent.go delete mode 100644 vendor/github.com/go-ole/go-ole/example/msxml/rssreader.go delete mode 100644 vendor/github.com/go-ole/go-ole/example/outlook/outlook.go delete mode 100644 vendor/github.com/go-ole/go-ole/example/winsock/winsock.go diff --git a/vendor/github.com/go-ole/go-ole/.travis.yml b/vendor/github.com/go-ole/go-ole/.travis.yml deleted file mode 100644 index 0c2c02bdf2e..00000000000 --- a/vendor/github.com/go-ole/go-ole/.travis.yml +++ /dev/null @@ -1,9 +0,0 @@ -language: go -sudo: false - -go: - - 1.1 - - 1.2 - - 1.3 - - 1.4 - - tip diff --git a/vendor/github.com/go-ole/go-ole/ChangeLog.md b/vendor/github.com/go-ole/go-ole/ChangeLog.md deleted file mode 100644 index 4ba6a8c64d0..00000000000 --- a/vendor/github.com/go-ole/go-ole/ChangeLog.md +++ /dev/null @@ -1,49 +0,0 @@ -# Version 1.x.x - -* **Add more test cases and reference new test COM server project.** (Placeholder for future additions) - -# Version 1.2.0-alphaX - -**Minimum supported version is now Go 1.4. Go 1.1 support is deprecated, but should still build.** - - * Added CI configuration for Travis-CI and AppVeyor. - * Added test InterfaceID and ClassID for the COM Test Server project. - * Added more inline documentation (#83). - * Added IEnumVARIANT implementation (#88). - * Added IEnumVARIANT test cases (#99, #100, #101). - * Added support for retrieving `time.Time` from VARIANT (#92). - * Added test case for IUnknown (#64). - * Added test case for IDispatch (#64). - * Added test cases for scalar variants (#64, #76). - -# Version 1.1.1 - - * Fixes for Linux build. - * Fixes for Windows build. - -# Version 1.1.0 - -The change to provide building on all platforms is a new feature. The increase in minor version reflects that and allows those who wish to stay on 1.0.x to continue to do so. Support for 1.0.x will be limited to bug fixes. - - * Move GUID out of variables.go into its own file to make new documentation available. - * Move OleError out of ole.go into its own file to make new documentation available. - * Add documentation to utility functions. - * Add documentation to variant receiver functions. - * Add documentation to ole structures. - * Make variant available to other systems outside of Windows. - * Make OLE structures available to other systems outside of Windows. - -## New Features - - * Library should now be built on all platforms supported by Go. Library will NOOP on any platform that is not Windows. - * More functions are now documented and available on godoc.org. - -# Version 1.0.1 - - 1. Fix package references from repository location change. - -# Version 1.0.0 - -This version is stable enough for use. The COM API is still incomplete, but provides enough functionality for accessing COM servers using IDispatch interface. - -There is no changelog for this version. Check commits for history. diff --git a/vendor/github.com/go-ole/go-ole/README.md b/vendor/github.com/go-ole/go-ole/README.md deleted file mode 100644 index 0ea9db33c79..00000000000 --- a/vendor/github.com/go-ole/go-ole/README.md +++ /dev/null @@ -1,46 +0,0 @@ -#Go OLE - -[![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) - -Go bindings for Windows COM using shared libraries instead of cgo. - -By Yasuhiro Matsumoto. - -## Install - -To experiment with go-ole, you can just compile and run the example program: - -``` -go get github.com/go-ole/go-ole -cd /path/to/go-ole/ -go test - -cd /path/to/go-ole/example/excel -go run excel.go -``` - -## Continuous Integration - -Continuous integration configuration has been added for both Travis-CI and AppVeyor. You will have to add these to your own account for your fork in order for it to run. - -**Travis-CI** - -Travis-CI was added to check builds on Linux to ensure that `go get` works when cross building. Currently, Travis-CI is not used to test cross-building, but this may be changed in the future. It is also not currently possible to test the library on Linux, since COM API is specific to Windows and it is not currently possible to run a COM server on Linux or even connect to a remote COM server. - -**AppVeyor** - -AppVeyor is used to build on Windows using the (in-development) test COM server. It is currently only used to test the build and ensure that the code works on Windows. It will be used to register a COM server and then run the test cases based on the test COM server. - -The tests currently do run and do pass and this should be maintained with commits. - -##Versioning - -Go OLE uses [semantic versioning](http://semver.org) for version numbers, which is similar to the version contract of the Go language. Which means that the major version will always maintain backwards compatibility with minor versions. Minor versions will only add new additions and changes. Fixes will always be in patch. - -This contract should allow you to upgrade to new minor and patch versions without breakage or modifications to your existing code. Leave a ticket, if there is breakage, so that it could be fixed. - -##LICENSE - -Under the MIT License: http://mattn.mit-license.org/2013 diff --git a/vendor/github.com/go-ole/go-ole/appveyor.yml b/vendor/github.com/go-ole/go-ole/appveyor.yml deleted file mode 100644 index e66dd31a1db..00000000000 --- a/vendor/github.com/go-ole/go-ole/appveyor.yml +++ /dev/null @@ -1,63 +0,0 @@ -# Notes: -# - Minimal appveyor.yml file is an empty file. All sections are optional. -# - Indent each level of configuration with 2 spaces. Do not use tabs! -# - All section names are case-sensitive. -# - Section names should be unique on each level. - -version: "1.3.0.{build}-alpha-{branch}" - -os: Windows Server 2012 R2 - -branches: - only: - - master - - v1.2 - - v1.1 - - v1.0 - -skip_tags: true - -clone_folder: c:\gopath\src\github.com\go-ole\go-ole - -environment: - GOPATH: c:\gopath - matrix: - - GOARCH: amd64 - GOVERSION: 1.4 - GOROOT: c:\go - DOWNLOADPLATFORM: "x64" - -install: - - choco install mingw - - SET PATH=c:\tools\mingw64\bin;%PATH% - # - Download COM Server - - ps: Start-FileDownload "https://github.com/go-ole/test-com-server/releases/download/v1.0.2/test-com-server-${env:DOWNLOADPLATFORM}.zip" - - 7z e test-com-server-%DOWNLOADPLATFORM%.zip -oc:\gopath\src\github.com\go-ole\go-ole > NUL - - c:\gopath\src\github.com\go-ole\go-ole\build\register-assembly.bat - # - set - - go version - - go env - - c:\gopath\src\github.com\go-ole\go-ole\build\compile-go.bat - - go tool dist install -v cmd/8a - - go tool dist install -v cmd/8c - - go tool dist install -v cmd/8g - - go tool dist install -v cmd/8l - - go tool dist install -v cmd/6a - - go tool dist install -v cmd/6c - - go tool dist install -v cmd/6g - - go tool dist install -v cmd/6l - - go get -u golang.org/x/tools/cmd/cover - - go get -u golang.org/x/tools/cmd/godoc - - go get -u golang.org/x/tools/cmd/stringer - -build_script: - - cd c:\gopath\src\github.com\go-ole\go-ole - - go get -v -t ./... - - go build - - go test -v -cover ./... - -# disable automatic tests -test: off - -# disable deployment -deploy: off diff --git a/vendor/github.com/go-ole/go-ole/build/compile-go.bat b/vendor/github.com/go-ole/go-ole/build/compile-go.bat deleted file mode 100644 index 61eed9496a8..00000000000 --- a/vendor/github.com/go-ole/go-ole/build/compile-go.bat +++ /dev/null @@ -1,5 +0,0 @@ -@echo OFF - -echo "BUILD GOLANG" -cd "%GOROOT%\src" -./make.bat --dist-tool diff --git a/vendor/github.com/go-ole/go-ole/build/register-assembly.bat b/vendor/github.com/go-ole/go-ole/build/register-assembly.bat deleted file mode 100644 index e2ca87fe522..00000000000 --- a/vendor/github.com/go-ole/go-ole/build/register-assembly.bat +++ /dev/null @@ -1,8 +0,0 @@ -@ECHO OFF - -IF "x86" == "%DOWNLOADPLATFORM%" ( - CALL c:\Windows\Microsoft.NET\Framework\v4.0.30319\RegAsm.exe /codebase /nologo c:\gopath\src\github.com\go-ole\go-ole\TestCOMServer.dll -) -IF "x64" == "%DOWNLOADPLATFORM%" ( - CALL c:\Windows\Microsoft.NET\Framework64\v4.0.30319\RegAsm.exe /codebase /nologo c:\gopath\src\github.com\go-ole\go-ole\TestCOMServer.dll -) diff --git a/vendor/github.com/go-ole/go-ole/data/screenshot.png b/vendor/github.com/go-ole/go-ole/data/screenshot.png deleted file mode 100644 index f61344b6005864217cfdf2b0d822b0575597c64e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14362 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] + b[1] = hextable[byte(v>>24)&0x0f] + b[2] = hextable[byte(v>>16)>>4] + b[3] = hextable[byte(v>>16)&0x0f] + b[4] = hextable[byte(v>>8)>>4] + b[5] = hextable[byte(v>>8)&0x0f] + b[6] = hextable[byte(v)>>4] + b[7] = hextable[byte(v)&0x0f] +} + +func putUint16Hex(b []byte, v uint16) { + b[0] = hextable[byte(v>>8)>>4] + b[1] = hextable[byte(v>>8)&0x0f] + b[2] = hextable[byte(v)>>4] + b[3] = hextable[byte(v)&0x0f] +} + +func putByteHex(dst, src []byte) { + for i := 0; i < len(src); i++ { + dst[i*2] = hextable[src[i]>>4] + dst[i*2+1] = hextable[src[i]&0x0f] + } +} + // IsEqualGUID compares two GUID. // // Not constant time comparison. diff --git a/vendor/github.com/go-ole/go-ole/idispatch_windows.go b/vendor/github.com/go-ole/go-ole/idispatch_windows.go index 10b1ae46494..bb736903825 100644 --- a/vendor/github.com/go-ole/go-ole/idispatch_windows.go +++ b/vendor/github.com/go-ole/go-ole/idispatch_windows.go @@ -180,17 +180,14 @@ func invoke(disp *IDispatch, dispid int32, dispatch int16, params ...interface{} if hr != 0 { err = NewErrorWithSubError(hr, BstrToString(excepInfo.bstrDescription), excepInfo) } - for _, varg := range vargs { + for i, varg := range vargs { + n := len(params) - i - 1 if varg.VT == VT_BSTR && varg.Val != 0 { SysFreeString(((*int16)(unsafe.Pointer(uintptr(varg.Val))))) } - /* - if varg.VT == (VT_BSTR|VT_BYREF) && varg.Val != 0 { - *(params[n].(*string)) = LpOleStrToString((*uint16)(unsafe.Pointer(uintptr(varg.Val)))) - println(*(params[n].(*string))) - fmt.Fprintln(os.Stderr, *(params[n].(*string))) - } - */ + if varg.VT == (VT_BSTR|VT_BYREF) && varg.Val != 0 { + *(params[n].(*string)) = LpOleStrToString(*(**uint16)(unsafe.Pointer(uintptr(varg.Val)))) + } } return } diff --git a/vendor/github.com/go-ole/go-ole/iinspectable_windows.go b/vendor/github.com/go-ole/go-ole/iinspectable_windows.go index b19dde5b57c..4519a4aa449 100644 --- a/vendor/github.com/go-ole/go-ole/iinspectable_windows.go +++ b/vendor/github.com/go-ole/go-ole/iinspectable_windows.go @@ -30,7 +30,7 @@ func (v *IInspectable) GetIids() (iids []*GUID, err error) { slicehdr := reflect.SliceHeader{Data: array, Len: int(byteCount), Cap: int(byteCount)} byteSlice := *(*[]byte)(unsafe.Pointer(&slicehdr)) reader := bytes.NewReader(byteSlice) - for i, _ := range iids { + for i := range iids { guid := GUID{} err = binary.Read(reader, binary.LittleEndian, &guid) if err != nil { diff --git a/vendor/github.com/go-ole/go-ole/oleutil/connection_windows.go b/vendor/github.com/go-ole/go-ole/oleutil/connection_windows.go index 6b5c0599936..ab9c0d8dcbd 100644 --- a/vendor/github.com/go-ole/go-ole/oleutil/connection_windows.go +++ b/vendor/github.com/go-ole/go-ole/oleutil/connection_windows.go @@ -49,6 +49,7 @@ func ConnectObject(disp *ole.IDispatch, iid *ole.GUID, idisp interface{}) (cooki point.Release() return } + return } container.Release() diff --git a/vendor/github.com/go-ole/go-ole/safearray_func.go b/vendor/github.com/go-ole/go-ole/safearray_func.go index c261a0078c7..8ff0baa41dd 100644 --- a/vendor/github.com/go-ole/go-ole/safearray_func.go +++ b/vendor/github.com/go-ole/go-ole/safearray_func.go @@ -2,6 +2,10 @@ package ole +import ( + "unsafe" +) + // safeArrayAccessData returns raw array pointer. // // AKA: SafeArrayAccessData in Windows API. @@ -120,8 +124,8 @@ func safeArrayGetElementSize(safearray *SafeArray) (*uint32, error) { } // safeArrayGetElement retrieves element at given index. -func safeArrayGetElement(safearray *SafeArray, index int64) (uintptr, error) { - return uintptr(0), NewError(E_NOTIMPL) +func safeArrayGetElement(safearray *SafeArray, index int64, pv unsafe.Pointer) error { + return NewError(E_NOTIMPL) } // safeArrayGetElement retrieves element at given index and converts to string. diff --git a/vendor/vendor.json b/vendor/vendor.json index 6aeaf8eeef5..2ff2e9b60ef 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -484,9 +484,11 @@ "revision": "6ec4abd8f8d587536da56f730858f0e27aeb4126" }, { + "checksumSHA1": "wDZdTaY9JiqqqnF4c3pHP71nWmk=", "comment": "v1.2.0-4-g5005588", "path": "github.com/go-ole/go-ole", - "revision": "50055884d646dd9434f16bbb5c9801749b9bafe4" + "revision": "5e9c030faf78847db7aa77e3661b9cc449de29b7", + "revisionTime": "2016-11-16T06:46:58Z" }, { "comment": "v1.2.0-4-g5005588",