(windows MTP) Replacing portable device FTM with legacy one.

Author: rupor-github

mtp/device_windows.go

@@ -205,6 +205,7 @@ func (d *Device) Copy(obj *objects.ObjectInfo) (err error) {
 	if obj == nil {
 		panic("Copy is called with nil object")
 	}
+
 	parent := obj.OIS.Find(path.Dir(obj.FullPath))
 	if parent == nil {
 		return fmt.Errorf("parent object not found for '%s'", obj.FullPath)
@@ -215,6 +216,12 @@ func (d *Device) Copy(obj *objects.ObjectInfo) (err error) {
 		d.log.Debug("Executed action Copy", zap.String("actor", d.Name()), zap.Any("object", obj), zap.Duration("elapsed", time.Since(start)), zap.Error(err))
 	}(time.Now())
 
+	from, err := os.Open(obj.ObjectName)
+	if err != nil {
+		return fmt.Errorf("unable to open source file '%s': %w", obj.ObjectName, err)
+	}
+	defer from.Close()
+
 	values, err := createObjectValues(obj.OidParent, obj.Name, &WPD_CONTENT_TYPE_GENERIC_FILE, obj.ObjSize)
 	if err != nil {
 		return fmt.Errorf("failed to create object values: %w", err)
@@ -233,11 +240,6 @@ func (d *Device) Copy(obj *objects.ObjectInfo) (err error) {
 	}
 	defer stream.Release()
 
-	from, err := os.Open(obj.ObjectName)
-	if err != nil {
-		return fmt.Errorf("unable to open source file '%s': %w", obj.ObjectName, err)
-	}
-	defer from.Close()
 	written, err := io.CopyBuffer(stream, from, make([]byte, bufsize))
 	if err != nil {
 		var oleerr *ole.OleError

mtp/pdevice.go

@@ -29,7 +29,11 @@ func (v *IPortableDevice) VTable() *IPortableDeviceVtbl {
 }
 
 func CreatePortableDevice() (*IPortableDevice, error) {
-	iu, err := ole.CreateInstance(ole.NewGUID("f7c0039a-4762-488a-b4b3-760ef9a1ba9b"),
+
+	// Looks like Go runtime requires legacy marshaling - FTM sporadically crashes in Copy action.
+	// FTM: iu, err := ole.CreateInstance(ole.NewGUID("f7c0039a-4762-488a-b4b3-760ef9a1ba9b"),
+
+	iu, err := ole.CreateInstance(ole.NewGUID("728a21c5-3d9e-48d7-9810-864848f0f404"),
 		ole.NewGUID("625e2df8-6392-4cf0-9ad1-3cfa5f17775c"))
 	if err != nil {
 		return nil, fmt.Errorf("unable to create IPortableDevice: %w", err)