mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-12-25 03:08:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

internal/glfwwin: bug fix: crash when dropping a file

Browse Source 
Updates #2478
This commit is contained in:
Hajime Hoshi 2022-12-03 04:47:00 +09:00
parent 15c2fe01c0
commit 6a0eb82207
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
internal/glfwwin/api_windows.go
View File

@ -1063,7 +1063,11 @@ func _DragFinish(hDrop _HDROP) {
} }
func _DragQueryFileW(hDrop _HDROP, iFile uint32, file []uint16) uint32 { func _DragQueryFileW(hDrop _HDROP, iFile uint32, file []uint16) uint32 {
r, _, _ := procDragQueryFileW.Call(uintptr(hDrop), uintptr(iFile), uintptr(unsafe.Pointer(&file[0])), uintptr(len(file))) var filePtr unsafe.Pointer
if len(file) > 0 {
filePtr = unsafe.Pointer(&file[0])
}
r, _, _ := procDragQueryFileW.Call(uintptr(hDrop), uintptr(iFile), uintptr(filePtr), uintptr(len(file)))
return uint32(r) return uint32(r)
} }
@ -1493,7 +1497,11 @@ func _RegisterDeviceNotificationW(hRecipient windows.Handle, notificationFilter
} }
func _RegisterRawInputDevices(pRawInputDevices []_RAWINPUTDEVICE) error { func _RegisterRawInputDevices(pRawInputDevices []_RAWINPUTDEVICE) error {
r, _, e := procRegisterRawInputDevices.Call(uintptr(unsafe.Pointer(&pRawInputDevices[0])), uintptr(len(pRawInputDevices)), unsafe.Sizeof(pRawInputDevices[0])) var rawInputDevices unsafe.Pointer
if len(pRawInputDevices) > 0 {
rawInputDevices = unsafe.Pointer(&pRawInputDevices[0])
}
r, _, e := procRegisterRawInputDevices.Call(uintptr(rawInputDevices), uintptr(len(pRawInputDevices)), unsafe.Sizeof(_RAWINPUTDEVICE{}))
if int32(r) == 0 { if int32(r) == 0 {
return fmt.Errorf("glfwwin: RegisterRawInputDevices failed: %w", e) return fmt.Errorf("glfwwin: RegisterRawInputDevices failed: %w", e)
} }