sean-m
/
Vanara
mirror of https://github.com/dahall/Vanara.git
1
0
Fork 0
Code Issues Releases Wiki Activity

More work on NativeClipboard

pull/363/head
David Hall 2022-12-30 18:24:08 -07:00
parent 442fc2591d
commit 8e09e4e2dd
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
UnitTests/Windows.Shell/ClipboardTests.cs
View File

@ -125,12 +125,12 @@ namespace Vanara.Windows.Shell.Tests
const string txt = @"“0’0©0è0”";
using (var cb = new Clipboard(true))
cb.SetText(txt, $"<p>{txt}</p>");
cb.SetText(txt, txt);
using (var cb = new Clipboard())
{
Assert.That(cb.GetText(TextDataFormat.Text), Is.EqualTo(txt));
Assert.That(cb.GetText(TextDataFormat.UnicodeText), Is.EqualTo(txt));
Assert.That(cb.GetText(TextDataFormat.Html), Contains.Substring(txt));
Assert.That(cb.GetText(TextDataFormat.Html), Is.EqualTo(txt));
TestContext.WriteLine(cb.GetText(TextDataFormat.Html));
}
}

16
Windows.Shell.Common/NativeClipboard.cs
View File

@ -387,11 +387,11 @@ namespace Vanara.Windows.Shell
/// <returns>The string value or <see langword="null"/> if the format is not available.</returns>
public string GetText(TextDataFormat formatId) => formatId switch
{
TextDataFormat.Text => Marshal.PtrToStringAnsi(DanagerousGetData(CLIPFORMAT.CF_TEXT)),
TextDataFormat.UnicodeText => Marshal.PtrToStringUni(DanagerousGetData(CLIPFORMAT.CF_UNICODETEXT)),
TextDataFormat.Rtf => StringHelper.GetString(DanagerousGetData(RegisterFormat(ShellClipboardFormat.CF_RTF)), CharSet.Ansi),
TextDataFormat.Html => Utils.GetHtml(DanagerousGetData(RegisterFormat(ShellClipboardFormat.CF_HTML))),
TextDataFormat.CommaSeparatedValue => StringHelper.GetString(DanagerousGetData(RegisterFormat(ShellClipboardFormat.CF_CSV)), CharSet.Ansi),
TextDataFormat.Text => DanagerousGetData(CLIPFORMAT.CF_TEXT).CallLocked(Marshal.PtrToStringAnsi),
TextDataFormat.UnicodeText => DanagerousGetData(CLIPFORMAT.CF_UNICODETEXT).CallLocked(Marshal.PtrToStringUni),
TextDataFormat.Rtf => DanagerousGetData(RegisterFormat(ShellClipboardFormat.CF_RTF)).CallLocked(Marshal.PtrToStringAnsi),
TextDataFormat.Html => Utils.GetHtml(GetClipboardData(RegisterFormat(ShellClipboardFormat.CF_HTML))),
TextDataFormat.CommaSeparatedValue => DanagerousGetData(RegisterFormat(ShellClipboardFormat.CF_CSV)).CallLocked(Marshal.PtrToStringAnsi),
_ => throw new ArgumentOutOfRangeException(nameof(formatId)),
};
@ -401,9 +401,8 @@ namespace Vanara.Windows.Shell
/// <exception cref="System.ArgumentNullException">data</exception>
public void SetBinaryData(uint formatId, byte[] data)
{
using var pMem = new SafeMoveableHGlobalHandle(data);
using SafeMoveableHGlobalHandle pMem = new(data);
Win32Error.ThrowLastErrorIfInvalid(pMem);
pMem.Unlock();
Win32Error.ThrowLastErrorIfNull(SetClipboardData(formatId, pMem.DangerousGetHandle()));
}
@ -414,7 +413,6 @@ namespace Vanara.Windows.Shell
{
using var pMem = SafeMoveableHGlobalHandle.CreateFromStructure(data);
Win32Error.ThrowLastErrorIfInvalid(pMem);
pMem.Unlock();
Win32Error.ThrowLastErrorIfNull(SetClipboardData(formatId, pMem.DangerousGetHandle()));
}
@ -425,7 +423,6 @@ namespace Vanara.Windows.Shell
{
using var pMem = SafeMoveableHGlobalHandle.CreateFromList(values);
Win32Error.ThrowLastErrorIfInvalid(pMem);
pMem.Unlock();
Win32Error.ThrowLastErrorIfNull(SetClipboardData(formatId, pMem.DangerousGetHandle()));
}
@ -438,7 +435,6 @@ namespace Vanara.Windows.Shell
{
using var pMem = SafeMoveableHGlobalHandle.CreateFromStringList(values, packing, charSet);
Win32Error.ThrowLastErrorIfInvalid(pMem);
pMem.Unlock();
Win32Error.ThrowLastErrorIfNull(SetClipboardData(formatId, pMem.DangerousGetHandle()));
}

2
Windows.Shell.Common/Utils.cs
View File

@ -40,7 +40,7 @@ namespace Vanara.Windows.Shell
}
}
return GetHtmlFromClipboard(ptr.ToArray<byte>(byteCount));
return GetHtmlFromClipboard(new SafeMoveableHGlobalHandle(ptr, false).GetBytes());
}
internal static void RunAsSTAThread(ThreadStart threadStart)