GitHubMirror/go-winio
1
0
Fork 0
mirror of https://github.com/rwinkhart/go-winio.git synced 2026-09-06 00:57:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

FIxing corruption in callbacks

Browse Source 
Signed-off-by: Kyle Wojtaszek <kylewo@microsoft.com>
This commit is contained in:
Kyle Wojtaszek
2021-10-12 14:31:04 -07:00
parent 8f85a06205
commit 4c72048b5c
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/etw/sample/sample.go
+3
View File
@@ -7,6 +7,7 @@ import (
"bufio" "bufio"
"fmt" "fmt"
"os" "os"
"runtime"
"github.com/Microsoft/go-winio/pkg/etw" "github.com/Microsoft/go-winio/pkg/etw"
"github.com/Microsoft/go-winio/pkg/guid" "github.com/Microsoft/go-winio/pkg/guid"
@@ -18,6 +19,8 @@ func callback(sourceID guid.GUID, state etw.ProviderState, level etw.Level, matc
} }
func main() { func main() {
fmt.Printf("Running on %s/%s\n", runtime.GOOS, runtime.GOARCH)
group, err := guid.FromString("12341234-abcd-abcd-abcd-123412341234") group, err := guid.FromString("12341234-abcd-abcd-abcd-123412341234")
if err != nil { if err != nil {
logrus.Error(err) logrus.Error(err)
pkg/etw/wrapper_32.go
+3 -3
View File
@@ -59,9 +59,9 @@ func eventSetInformation(
// For x86, the matchAny and matchAll keywords need to be assembled from two // For x86, the matchAny and matchAll keywords need to be assembled from two
// 32-bit integers, because the max size of an argument is uintptr, but those // 32-bit integers, because the max size of an argument is uintptr, but those
// two arguments are actually 64-bit integers. // two arguments are actually 64-bit integers.
func providerCallbackAdapter(sourceID *guid.GUID, state uint32, level uint8, matchAnyKeyword_low uint32, matchAnyKeyword_high uint32, matchAllKeyword_low uint32, matchAllKeyword_high uint32, filterData uintptr, i uintptr) uintptr { func providerCallbackAdapter(sourceID *guid.GUID, state uint32, level uint32, matchAnyKeyword_low uint32, matchAnyKeyword_high uint32, matchAllKeyword_low uint32, matchAllKeyword_high uint32, filterData uintptr, i uintptr) uintptr {
matchAnyKeyword := uint64(matchAnyKeyword_high) << 32 | uint64(matchAnyKeyword_low) matchAnyKeyword := uint64(matchAnyKeyword_high)<<32 | uint64(matchAnyKeyword_low)
matchAllKeyword := uint64(matchAllKeyword_high) << 32 | uint64(matchAllKeyword_low) matchAllKeyword := uint64(matchAllKeyword_high)<<32 | uint64(matchAllKeyword_low)
providerCallback(*sourceID, ProviderState(state), Level(level), uint64(matchAnyKeyword), uint64(matchAllKeyword), filterData, i) providerCallback(*sourceID, ProviderState(state), Level(level), uint64(matchAnyKeyword), uint64(matchAllKeyword), filterData, i)
return 0 return 0
} }
pkg/etw/wrapper_64.go
+1 -1
View File
@@ -46,7 +46,7 @@ func eventSetInformation(
// for provider notifications. Because Go has trouble with callback arguments of // for provider notifications. Because Go has trouble with callback arguments of
// different size, it has only pointer-sized arguments, which are then cast to // different size, it has only pointer-sized arguments, which are then cast to
// the appropriate types when calling providerCallback. // the appropriate types when calling providerCallback.
func providerCallbackAdapter(sourceID *guid.GUID, state uint32, level uint8, matchAnyKeyword uintptr, matchAllKeyword uintptr, filterData uintptr, i uintptr) uintptr { func providerCallbackAdapter(sourceID *guid.GUID, state uintptr, level uintptr, matchAnyKeyword uintptr, matchAllKeyword uintptr, filterData uintptr, i uintptr) uintptr {
providerCallback(*sourceID, ProviderState(state), Level(level), uint64(matchAnyKeyword), uint64(matchAllKeyword), filterData, i) providerCallback(*sourceID, ProviderState(state), Level(level), uint64(matchAnyKeyword), uint64(matchAllKeyword), filterData, i)
return 0 return 0
} }