setupapi: Merge _SP_DEVINSTALL_PARAMS and DevInstallParams
Signed-off-by: Simon Rozman <simon@rozman.si>
This commit is contained in:
parent
05d25fd1b7
commit
bd963497da
@ -332,19 +332,14 @@ func (deviceInfoSet DevInfo) SetDeviceRegistryProperty(deviceInfoData *DevInfoDa
|
||||
return SetupDiSetDeviceRegistryProperty(deviceInfoSet, deviceInfoData, property, propertyBuffers)
|
||||
}
|
||||
|
||||
//sys setupDiGetDeviceInstallParams(deviceInfoSet DevInfo, deviceInfoData *DevInfoData, deviceInstallParams *_SP_DEVINSTALL_PARAMS) (err error) = setupapi.SetupDiGetDeviceInstallParamsW
|
||||
//sys setupDiGetDeviceInstallParams(deviceInfoSet DevInfo, deviceInfoData *DevInfoData, deviceInstallParams *DevInstallParams) (err error) = setupapi.SetupDiGetDeviceInstallParamsW
|
||||
|
||||
// SetupDiGetDeviceInstallParams function retrieves device installation parameters for a device information set or a particular device information element.
|
||||
func SetupDiGetDeviceInstallParams(deviceInfoSet DevInfo, deviceInfoData *DevInfoData) (deviceInstallParams *DevInstallParams, err error) {
|
||||
var _data _SP_DEVINSTALL_PARAMS
|
||||
_data.Size = uint32(unsafe.Sizeof(_data))
|
||||
func SetupDiGetDeviceInstallParams(deviceInfoSet DevInfo, deviceInfoData *DevInfoData) (*DevInstallParams, error) {
|
||||
params := &DevInstallParams{}
|
||||
params.size = uint32(unsafe.Sizeof(*params))
|
||||
|
||||
err = setupDiGetDeviceInstallParams(deviceInfoSet, deviceInfoData, &_data)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
return _data.toGo(), nil
|
||||
return params, setupDiGetDeviceInstallParams(deviceInfoSet, deviceInfoData, params)
|
||||
}
|
||||
|
||||
// GetDeviceInstallParams method retrieves device installation parameters for a device information set or a particular device information element.
|
||||
@ -360,17 +355,7 @@ func (deviceInfoSet DevInfo) GetClassInstallParams(deviceInfoData *DevInfoData,
|
||||
return SetupDiGetClassInstallParams(deviceInfoSet, deviceInfoData, classInstallParams, classInstallParamsSize, requiredSize)
|
||||
}
|
||||
|
||||
//sys setupDiSetDeviceInstallParams(deviceInfoSet DevInfo, deviceInfoData *DevInfoData, deviceInstallParams *_SP_DEVINSTALL_PARAMS) (err error) = setupapi.SetupDiSetDeviceInstallParamsW
|
||||
|
||||
// SetupDiSetDeviceInstallParams function sets device installation parameters for a device information set or a particular device information element.
|
||||
func SetupDiSetDeviceInstallParams(deviceInfoSet DevInfo, deviceInfoData *DevInfoData, deviceInstallParams *DevInstallParams) (err error) {
|
||||
_data, err := deviceInstallParams.toWindows()
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
return setupDiSetDeviceInstallParams(deviceInfoSet, deviceInfoData, _data)
|
||||
}
|
||||
//sys SetupDiSetDeviceInstallParams(deviceInfoSet DevInfo, deviceInfoData *DevInfoData, deviceInstallParams *DevInstallParams) (err error) = setupapi.SetupDiSetDeviceInstallParamsW
|
||||
|
||||
// SetDeviceInstallParams member sets device installation parameters for a device information set or a particular device information element.
|
||||
func (deviceInfoSet DevInfo) SetDeviceInstallParams(deviceInfoData *DevInfoData, deviceInstallParams *DevInstallParams) error {
|
||||
|
@ -361,6 +361,12 @@ func TestSetupDiGetDeviceInstallParams(t *testing.T) {
|
||||
t.Errorf("Error calling SetupDiGetDeviceInstallParams: %s", err.Error())
|
||||
}
|
||||
}
|
||||
|
||||
params := &DevInstallParams{}
|
||||
params.SetDriverPath("foobar")
|
||||
if params.GetDriverPath() != "foobar" {
|
||||
t.Error("DevInstallParams.(Get|Set)DriverPath() differ")
|
||||
}
|
||||
}
|
||||
|
||||
func TestSetupDiClassNameFromGuidEx(t *testing.T) {
|
||||
|
@ -123,8 +123,9 @@ const (
|
||||
DIF_FINISHINSTALL_ACTION DI_FUNCTION = 0x0000002A
|
||||
)
|
||||
|
||||
type _SP_DEVINSTALL_PARAMS struct {
|
||||
Size uint32
|
||||
// DevInstallParams is device installation parameters structure (associated with a particular device information element, or globally with a device information set)
|
||||
type DevInstallParams struct {
|
||||
size uint32
|
||||
Flags DI_FLAGS
|
||||
FlagsEx DI_FLAGSEX
|
||||
hwndParent uintptr
|
||||
@ -133,50 +134,20 @@ type _SP_DEVINSTALL_PARAMS struct {
|
||||
FileQueue HSPFILEQ
|
||||
_ uintptr
|
||||
_ uint32
|
||||
DriverPath [windows.MAX_PATH]uint16
|
||||
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[:]),
|
||||
}
|
||||
func (params *DevInstallParams) GetDriverPath() string {
|
||||
return windows.UTF16ToString(params.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
|
||||
FlagsEx DI_FLAGSEX
|
||||
hwndParent uintptr
|
||||
InstallMsgHandler uintptr
|
||||
InstallMsgHandlerContext uintptr
|
||||
FileQueue HSPFILEQ
|
||||
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)
|
||||
func (params *DevInstallParams) SetDriverPath(driverPath string) error {
|
||||
str, err := syscall.UTF16FromString(driverPath)
|
||||
if err != nil {
|
||||
return
|
||||
return err
|
||||
}
|
||||
copy(_data.DriverPath[:], driverPathUTF16)
|
||||
|
||||
return
|
||||
copy(params.driverPath[:], str)
|
||||
return nil
|
||||
}
|
||||
|
||||
// DI_FLAGS is SP_DEVINSTALL_PARAMS.Flags values
|
||||
|
@ -273,7 +273,7 @@ func setupDiSetDeviceRegistryProperty(deviceInfoSet DevInfo, deviceInfoData *Dev
|
||||
return
|
||||
}
|
||||
|
||||
func setupDiGetDeviceInstallParams(deviceInfoSet DevInfo, deviceInfoData *DevInfoData, deviceInstallParams *_SP_DEVINSTALL_PARAMS) (err error) {
|
||||
func setupDiGetDeviceInstallParams(deviceInfoSet DevInfo, deviceInfoData *DevInfoData, deviceInstallParams *DevInstallParams) (err error) {
|
||||
r1, _, e1 := syscall.Syscall(procSetupDiGetDeviceInstallParamsW.Addr(), 3, uintptr(deviceInfoSet), uintptr(unsafe.Pointer(deviceInfoData)), uintptr(unsafe.Pointer(deviceInstallParams)))
|
||||
if r1 == 0 {
|
||||
if e1 != 0 {
|
||||
@ -297,7 +297,7 @@ func SetupDiGetClassInstallParams(deviceInfoSet DevInfo, deviceInfoData *DevInfo
|
||||
return
|
||||
}
|
||||
|
||||
func setupDiSetDeviceInstallParams(deviceInfoSet DevInfo, deviceInfoData *DevInfoData, deviceInstallParams *_SP_DEVINSTALL_PARAMS) (err error) {
|
||||
func SetupDiSetDeviceInstallParams(deviceInfoSet DevInfo, deviceInfoData *DevInfoData, deviceInstallParams *DevInstallParams) (err error) {
|
||||
r1, _, e1 := syscall.Syscall(procSetupDiSetDeviceInstallParamsW.Addr(), 3, uintptr(deviceInfoSet), uintptr(unsafe.Pointer(deviceInfoData)), uintptr(unsafe.Pointer(deviceInstallParams)))
|
||||
if r1 == 0 {
|
||||
if e1 != 0 {
|
||||
|
Loading…
Reference in New Issue
Block a user