Skip to content

Commit fd2ef39

Browse files
committed
Revert "TO_TEST: Switch NativeClipboard.CurrentDataObject to IDataObjectProvider"
This reverts commit 699e466.
1 parent b02fefe commit fd2ef39

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

src/Files.App/Utils/Storage/Operations/FilesystemHelpers.cs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
using System.Runtime.InteropServices;
1010
using System.Runtime.InteropServices.ComTypes;
1111
using Vanara.PInvoke;
12+
using Vanara.Windows.Shell;
1213
using Windows.ApplicationModel.DataTransfer;
1314
using Windows.Graphics.Imaging;
1415
using Windows.Storage;
1516
using Windows.Storage.Streams;
16-
using WinRT;
1717
using FileAttributes = System.IO.FileAttributes;
1818

1919
namespace Files.App.Utils.Storage
@@ -758,14 +758,12 @@ public static async Task<IEnumerable<IStorageItemWithPath>> GetDraggedStorageIte
758758
{
759759
if (hasVirtualItems && packageView.Contains("FileContents"))
760760
{
761-
var dataObjectProvider = packageView.As<Shell32.IDataObjectProvider>();
762-
var iddo = dataObjectProvider.GetDataObject();
763-
var descriptor = iddo.GetData<Shell32.FILEGROUPDESCRIPTOR>("FileGroupDescriptorW");
761+
var descriptor = NativeClipboard.CurrentDataObject.GetData<Shell32.FILEGROUPDESCRIPTOR>("FileGroupDescriptorW");
764762
for (var ii = 0; ii < descriptor.cItems; ii++)
765763
{
766764
if (descriptor.fgd[ii].dwFileAttributes.HasFlag(FileFlagsAndAttributes.FILE_ATTRIBUTE_DIRECTORY))
767765
itemsList.Add(new VirtualStorageFolder(descriptor.fgd[ii].cFileName).FromStorageItem());
768-
else if (iddo.GetData("FileContents", DVASPECT.DVASPECT_CONTENT, ii) is IStream stream)
766+
else if (NativeClipboard.CurrentDataObject.GetData("FileContents", DVASPECT.DVASPECT_CONTENT, ii) is IStream stream)
769767
{
770768
var streamContent = new ComStreamWrapper(stream);
771769
itemsList.Add(new VirtualStorageFile(streamContent, descriptor.fgd[ii].cFileName).FromStorageItem());

0 commit comments

Comments
 (0)