admin/ropnop-go-clr
1
0
Fork 0
mirror of https://github.com/ropnop/go-clr synced 2026-06-08 17:11:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2 from ropnop/add_targetruntime_option

Browse Source 
added targetversion option to helper functions
This commit is contained in:
Ronnie Flathers
2020-08-05 11:16:22 -05:00
committed by GitHub
parent 85020b5010 9cdaaa9036
commit a9381fbe4f
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/CLRWrapper/CLRWrapper.go
+2 -1
View File
@@ -14,6 +14,7 @@ import (
func main() {
fmt.Println("[+] Loading DLL from Disk")
ret, err := clr.ExecuteDLLFromDisk(
"v4",
"TestDLL.dll",
"TestDLL.HelloWorld",
"SayHello",
@@ -30,7 +31,7 @@ func main() {
}
runtime.KeepAlive(exebytes)
ret2, err := clr.ExecuteByteArray(exebytes, []string{"test", "test2"})
ret2, err := clr.ExecuteByteArray("v2", exebytes, []string{"test", "test2"})
if err != nil {
log.Fatal(err)
}
go-clr.go
+16 -9
View File
@@ -47,10 +47,13 @@ func GetInstalledRuntimes(metahost *ICLRMetaHost) ([]string, error) {
}
// ExecuteDLLFromDisk is a wrapper function that will automatically load the latest installed CLR into the current process
// and execute a DLL on disk in the default app domain. It takes in the DLLPath, TypeName, MethodName and Argument to use
// as strings. It returns the return code from the assembly
func ExecuteDLLFromDisk(dllpath, typeName, methodName, argument string) (retCode int16, err error) {
// and execute a DLL on disk in the default app domain. It takes in the target runtime, DLLPath, TypeName, MethodName
// and Argument to use as strings. It returns the return code from the assembly
func ExecuteDLLFromDisk(targetRuntime, dllpath, typeName, methodName, argument string) (retCode int16, err error) {
retCode = -1
if targetRuntime == "" {
targetRuntime = "v4"
}
metahost, err := GetICLRMetaHost()
if err != nil {
return
@@ -62,7 +65,7 @@ func ExecuteDLLFromDisk(dllpath, typeName, methodName, argument string) (retCode
}
var latestRuntime string
for _, r := range runtimes {
if strings.Contains(r, "v4") {
if strings.Contains(r, targetRuntime) {
latestRuntime = r
break
} else {
@@ -104,11 +107,15 @@ func ExecuteDLLFromDisk(dllpath, typeName, methodName, argument string) (retCode
}
// ExecuteByteArray is a wrapper function that will automatically load the latest supported framework into the current
// process using the legacy APIs, then load and execute an executable from memory. It takes in a byte array of the
// executable to load and run and returns the return code. You can supply an array of strings as command line arguments.
func ExecuteByteArray(rawBytes []byte, params []string) (retCode int32, err error) {
// ExecuteByteArray is a wrapper function that will automatically loads the supplied target framework into the current
// process using the legacy APIs, then load and execute an executable from memory. If no targetRuntime is specified, it
// will default to latest. It takes in a byte array of the executable to load and run and returns the return code.
// You can supply an array of strings as command line arguments.
func ExecuteByteArray(targetRuntime string, rawBytes []byte, params []string) (retCode int32, err error) {
retCode = -1
if targetRuntime == "" {
targetRuntime = "v4"
}
metahost, err := GetICLRMetaHost()
if err != nil {
return
@@ -120,7 +127,7 @@ func ExecuteByteArray(rawBytes []byte, params []string) (retCode int32, err erro
}
var latestRuntime string
for _, r := range runtimes {
if strings.Contains(r, "v4") {
if strings.Contains(r, targetRuntime) {
latestRuntime = r
break
} else {