Merge branch 'master' into ujjwalchadha/benchmarks

microsoft · Jul 21, 2020 · a869203 · a869203
2 parents 47e7b73 + 6315f97
commit a869203
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/WinRT.Runtime/Marshalers.cs b/WinRT.Runtime/Marshalers.cs
@@ -919,7 +919,10 @@ public static IObjectReference CreateMarshaler(object o, bool unwrapObject = tru
  {
  return objRef.As<IInspectable.Vftbl>();
  }
- return ComWrappersSupport.CreateCCWForObject(o);
+ using (var ccw = ComWrappersSupport.CreateCCWForObject(o))
+ { 
+ return ccw.As<IInspectable.Vftbl>();
+ }
  }
 
  public static IntPtr GetAbi(IObjectReference objRef) => 

diff --git a/cswinrt.sln b/cswinrt.sln
@@ -223,14 +223,12 @@ Global
  {B34C96F4-3660-4B2D-8ABD-A4B428166DC7}.Debug|x64.ActiveCfg = Debug|x64
  {B34C96F4-3660-4B2D-8ABD-A4B428166DC7}.Debug|x64.Build.0 = Debug|x64
  {B34C96F4-3660-4B2D-8ABD-A4B428166DC7}.Debug|x86.ActiveCfg = Debug|x86
- {B34C96F4-3660-4B2D-8ABD-A4B428166DC7}.Debug|x86.Build.0 = Debug|x86
  {B34C96F4-3660-4B2D-8ABD-A4B428166DC7}.Release|Any CPU.ActiveCfg = Release|x86
  {B34C96F4-3660-4B2D-8ABD-A4B428166DC7}.Release|ARM.ActiveCfg = Release|x86
  {B34C96F4-3660-4B2D-8ABD-A4B428166DC7}.Release|ARM64.ActiveCfg = Release|x86
  {B34C96F4-3660-4B2D-8ABD-A4B428166DC7}.Release|x64.ActiveCfg = Release|x64
  {B34C96F4-3660-4B2D-8ABD-A4B428166DC7}.Release|x64.Build.0 = Release|x64
  {B34C96F4-3660-4B2D-8ABD-A4B428166DC7}.Release|x86.ActiveCfg = Release|x86
- {B34C96F4-3660-4B2D-8ABD-A4B428166DC7}.Release|x86.Build.0 = Release|x86
  {78D85F23-7CB1-44A1-9238-6DF2C76754E4}.Debug|Any CPU.ActiveCfg = Debug|Win32
  {78D85F23-7CB1-44A1-9238-6DF2C76754E4}.Debug|ARM.ActiveCfg = Debug|Win32
  {78D85F23-7CB1-44A1-9238-6DF2C76754E4}.Debug|ARM64.ActiveCfg = Debug|Win32