VSadov/Satori
1
0
Fork 0
mirror of https://github.com/VSadov/Satori.git synced 2025-06-11 02:13:38 +09:00
Code Activity

Remove dependency for IBindableVector Type (dotnet/corefx#30710)

Browse source 
Commit migrated from 1ddcfb9eca
This commit is contained in:
Luqun Lou 2018-06-28 13:07:54 -07:00 • committed by GitHub
parent 4b385c1124
commit 862e09c609
1 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/libraries/System.Runtime.WindowsRuntime/src/System/Runtime/InteropServices/WindowsRuntime/MarshalingHelpers.cs
View file

@ -101,6 +101,9 @@ namespace System.Runtime.InteropServices.WindowsRuntime
{
const string WinRTNotifyCollectionChangedEventArgsName = "Windows.UI.Xaml.Interop.NotifyCollectionChangedEventArgs";
// IBindableVector Guid
static Guid IID_IBindableVector = new Guid("393de7de-6fd0-4c0d-bb71-47244a113e93");
static INotifyCollectionChangedEventArgsFactory s_EventArgsFactory;
// Extracts properties from a managed NotifyCollectionChangedEventArgs and passes them to
@ -116,9 +119,22 @@ namespace System.Runtime.InteropServices.WindowsRuntime
try
{
if (managedArgs.NewItems != null)
newItemsIP = Marshal.GetComInterfaceForObject(managedArgs.NewItems, typeof(IBindableVector));
{
IntPtr unkPtr = Marshal.GetIUnknownForObject(managedArgs.NewItems);
int hr = Marshal.QueryInterface(unkPtr, ref IID_IBindableVector, out newItemsIP);
Marshal.Release(unkPtr);
if (hr < 0)
throw Marshal.GetExceptionForHR(hr);
}
if (managedArgs.OldItems != null)
oldItemsIP = Marshal.GetComInterfaceForObject(managedArgs.OldItems, typeof(IBindableVector));
{
IntPtr unkPtr = Marshal.GetIUnknownForObject(managedArgs.OldItems);
int hr = Marshal.QueryInterface(unkPtr, ref IID_IBindableVector, out oldItemsIP);
Marshal.Release(unkPtr);
if (hr < 0)
throw Marshal.GetExceptionForHR(hr);
}
return CreateNativeNCCEventArgsInstanceHelper((int)managedArgs.Action, newItemsIP, oldItemsIP, managedArgs.NewStartingIndex, managedArgs.OldStartingIndex);
}