From 722646850b9a1ca296e57a3fd4946b36a1a58aca Mon Sep 17 00:00:00 2001 From: Eduardo Silva Date: Fri, 25 Sep 2026 18:03:35 +0100 Subject: [PATCH] rewrote the implementation for the shared memory knew it would bite me in the ass since I was "creating" it instead of just opening it. still need to figure out of this event implementation will actually trigger events for the mockserver tho --- eventutils/eventutils_windows.go | 42 ++++++++++++++++++----------- sharedMem/sharedMemWindows.go | 45 +++++++++++++++++++++++++++++++- 2 files changed, 71 insertions(+), 16 deletions(-) diff --git a/eventutils/eventutils_windows.go b/eventutils/eventutils_windows.go index a70a0bc..31e9a46 100644 --- a/eventutils/eventutils_windows.go +++ b/eventutils/eventutils_windows.go @@ -52,21 +52,32 @@ func OpenMemMap(name string, size uint32) (Reader, error) { // openEvent opens a windows.Handle for a given event func (u *utils) OpenEvent(eventName string) error { - name, err := windows.UTF16PtrFromString(eventName) + namePtr, err := windows.UTF16PtrFromString(eventName) if err != nil { return err } - // Request EVENT_MODIFY_STATE so SetEvent can be called on this handle - event, err := windows.OpenEvent(windows.SYNCHRONIZE|windows.EVENT_MODIFY_STATE, false, name) + eventHandle, err := windows.OpenEvent(windows.SYNCHRONIZE, false, namePtr) if err != nil { - // If event does not exist yet, create it - event, err = windows.CreateEvent(nil, 0, 0, name) - if err != nil { - return err - } + return err } - u.wEvent = event + + u.wEvent = eventHandle + // name, err := windows.UTF16PtrFromString(eventName) + // if err != nil { + // return err + // } + + // // Request EVENT_MODIFY_STATE so SetEvent can be called on this handle + // event, err := windows.OpenEvent(windows.SYNCHRONIZE|windows.EVENT_MODIFY_STATE, false, name) + // if err != nil { + // // If event does not exist yet, create it + // event, err = windows.CreateEvent(nil, 0, 0, name) + // if err != nil { + // return err + // } + // } + // u.wEvent = event return nil } @@ -143,13 +154,14 @@ func (u *utils) CheckValidDataEvent(timeout time.Duration) bool { } // Check the result of the wait - if result == WAIT_OBJECT_0 { - return true - } else if result == WAIT_TIMEOUT { - return false - } + return result == WAIT_OBJECT_0 + // if result == WAIT_OBJECT_0 { + // return true + // } else if result == WAIT_TIMEOUT { + // return false + // } - return false + // return false } // SendBroadcastMessage sends a message trough the broadcast channel diff --git a/sharedMem/sharedMemWindows.go b/sharedMem/sharedMemWindows.go index 9b9ee3f..61ea6d7 100644 --- a/sharedMem/sharedMemWindows.go +++ b/sharedMem/sharedMemWindows.go @@ -6,10 +6,16 @@ package sharedMem import ( "io" "log" + "unsafe" "golang.org/x/sys/windows" ) +var ( + modkernel32 = windows.NewLazySystemDLL("kernel32.dll") + procOpenFileMappingW = modkernel32.NewProc("OpenFileMappingW") +) + type shmi struct { h windows.Handle v uintptr @@ -45,9 +51,46 @@ func create(name string, size uint32) (*shmi, error) { return &shmi{h, addr, size}, nil } +func openFileMapping(desidredAccess uint32, inheritHandle bool, name *uint16) (windows.Handle, error) { + var inherit uint32 + if inheritHandle { + inherit = 1 + } + + r1, _, err := procOpenFileMappingW.Call( + uintptr(desidredAccess), + uintptr(inherit), + uintptr(unsafe.Pointer(name)), + ) + if r1 == 0 { + return 0, err + } + + return windows.Handle(r1), nil +} + // open shared memory. return shmi object. func open(name string, size uint32) (*shmi, error) { - return create(name, size) + fnPtr, err := windows.UTF16PtrFromString(name) + if err != nil { + return nil, err + } + + memHandle, err := openFileMapping(windows.FILE_MAP_READ, false, fnPtr) + if err != nil { + return nil, err + } + + memAddr, err := windows.MapViewOfFile(memHandle, windows.FILE_MAP_READ, 0, 0, 0) + if err != nil { + return nil, err + } + + return &shmi{ + h: memHandle, + v: memAddr, + size: size, + }, nil } func (o *shmi) close() error { -- 2.54.0