From 7b636380e50f257e7f1b98b6b5829a24166e2000 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Tue, 5 Feb 2019 14:03:28 +0100 Subject: [PATCH] setupapi: Move Go<>Windows struct marshaling to types_windows.go Signed-off-by: Simon Rozman --- setupapi/setupapi_windows.go | 31 ++++---------------------- setupapi/types_windows.go | 43 ++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 27 deletions(-) diff --git a/setupapi/setupapi_windows.go b/setupapi/setupapi_windows.go index 0a833ed..750a81b 100644 --- a/setupapi/setupapi_windows.go +++ b/setupapi/setupapi_windows.go @@ -41,11 +41,7 @@ func SetupDiGetDeviceInfoListDetail(DeviceInfoSet DevInfo) (DeviceInfoSetDetailD return } - return &DevInfoListDetailData{ - ClassGUID: _data.ClassGUID, - RemoteMachineHandle: _data.RemoteMachineHandle, - RemoteMachineName: windows.UTF16ToString(_data.RemoteMachineName[:]), - }, nil + return _data.toGo(), nil } // GetDeviceInfoListDetail method retrieves information associated with a device information set including the class GUID, remote computer handle, and remote computer name. @@ -247,15 +243,7 @@ func SetupDiGetDeviceInstallParams(DeviceInfoSet DevInfo, DeviceInfoData *SP_DEV return } - return &DevInstallParams{ - Flags: _data.Flags, - FlagsEx: _data.FlagsEx, - hwndParent: _data.hwndParent, - InstallMsgHandler: _data.InstallMsgHandler, - InstallMsgHandlerContext: _data.InstallMsgHandlerContext, - FileQueue: _data.FileQueue, - DriverPath: windows.UTF16ToString(_data.DriverPath[:]), - }, nil + return _data.toGo(), nil } // GetDeviceInstallParams method retrieves device installation parameters for a device information set or a particular device information element. @@ -275,23 +263,12 @@ func (DeviceInfoSet DevInfo) GetClassInstallParams(DeviceInfoData *SP_DEVINFO_DA // SetupDiSetDeviceInstallParams function sets device installation parameters for a device information set or a particular device information element. func SetupDiSetDeviceInstallParams(DeviceInfoSet DevInfo, DeviceInfoData *SP_DEVINFO_DATA, DeviceInstallParams *DevInstallParams) (err error) { - _data := _SP_DEVINSTALL_PARAMS{ - Flags: DeviceInstallParams.Flags, - FlagsEx: DeviceInstallParams.FlagsEx, - hwndParent: DeviceInstallParams.hwndParent, - InstallMsgHandler: DeviceInstallParams.InstallMsgHandler, - InstallMsgHandlerContext: DeviceInstallParams.InstallMsgHandlerContext, - FileQueue: DeviceInstallParams.FileQueue, - } - _data.Size = uint32(unsafe.Sizeof(_data)) - - driverPathUTF16, err := syscall.UTF16FromString(DeviceInstallParams.DriverPath) + _data, err := DeviceInstallParams.toWindows() if err != nil { return } - copy(_data.DriverPath[:], driverPathUTF16) - return setupDiSetDeviceInstallParams(DeviceInfoSet, DeviceInfoData, &_data) + return setupDiSetDeviceInstallParams(DeviceInfoSet, DeviceInfoData, _data) } // SetDeviceInstallParams member sets device installation parameters for a device information set or a particular device information element. diff --git a/setupapi/types_windows.go b/setupapi/types_windows.go index c93d3aa..9bbe38b 100644 --- a/setupapi/types_windows.go +++ b/setupapi/types_windows.go @@ -6,6 +6,9 @@ package setupapi import ( + "syscall" + "unsafe" + "golang.org/x/sys/windows" ) @@ -46,6 +49,14 @@ type _SP_DEVINFO_LIST_DETAIL_DATA struct { RemoteMachineName [SP_MAX_MACHINENAME_LENGTH]uint16 } +func (_data _SP_DEVINFO_LIST_DETAIL_DATA) toGo() *DevInfoListDetailData { + return &DevInfoListDetailData{ + ClassGUID: _data.ClassGUID, + RemoteMachineHandle: _data.RemoteMachineHandle, + RemoteMachineName: windows.UTF16ToString(_data.RemoteMachineName[:]), + } +} + // DevInfoListDetailData is a structure for detailed information on a device information set (used for SetupDiGetDeviceInfoListDetail which supercedes the functionality of SetupDiGetDeviceInfoListClass). type DevInfoListDetailData struct { ClassGUID windows.GUID @@ -111,6 +122,18 @@ type _SP_DEVINSTALL_PARAMS struct { DriverPath [windows.MAX_PATH]uint16 } +func (_data _SP_DEVINSTALL_PARAMS) toGo() *DevInstallParams { + return &DevInstallParams{ + Flags: _data.Flags, + FlagsEx: _data.FlagsEx, + hwndParent: _data.hwndParent, + InstallMsgHandler: _data.InstallMsgHandler, + InstallMsgHandlerContext: _data.InstallMsgHandlerContext, + FileQueue: _data.FileQueue, + DriverPath: windows.UTF16ToString(_data.DriverPath[:]), + } +} + // DevInstallParams is device installation parameters structure (associated with a particular device information element, or globally with a device information set) type DevInstallParams struct { Flags DI_FLAGS @@ -122,6 +145,26 @@ type DevInstallParams struct { DriverPath string } +func (DeviceInstallParams DevInstallParams) toWindows() (_data *_SP_DEVINSTALL_PARAMS, err error) { + _data = &_SP_DEVINSTALL_PARAMS{ + Flags: DeviceInstallParams.Flags, + FlagsEx: DeviceInstallParams.FlagsEx, + hwndParent: DeviceInstallParams.hwndParent, + InstallMsgHandler: DeviceInstallParams.InstallMsgHandler, + InstallMsgHandlerContext: DeviceInstallParams.InstallMsgHandlerContext, + FileQueue: DeviceInstallParams.FileQueue, + } + _data.Size = uint32(unsafe.Sizeof(*_data)) + + driverPathUTF16, err := syscall.UTF16FromString(DeviceInstallParams.DriverPath) + if err != nil { + return + } + copy(_data.DriverPath[:], driverPathUTF16) + + return +} + // DI_FLAGS is SP_DEVINSTALL_PARAMS.Flags values type DI_FLAGS uint32