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

BREAKING CHANGE: moved interfaces and VARIANT from oaidl.h into Vanara.PInvoke.OleAut32 from Ole32 as they are actually hosted there. This required some changes to supproting code.

pull/83/head
David Hall 2019-11-06 22:13:59 -07:00
parent bfd863bfe6
commit 7f6c787af1
8 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
PInvoke/Ole/Ole32/OAIdl.cs → PInvoke/Ole/OleAut32/OAIdl.Interfaces.cs
View File

0
PInvoke/Ole/Ole32/OAIdl.VARIANT.cs → PInvoke/Ole/OleAut32/OAIdl.VARIANT.cs
View File

1
PInvoke/Ole/PropSys/PropSys.PropertyBag.cs
View File

@ -5,6 +5,7 @@ using System.Runtime.InteropServices.ComTypes;
using System.Text; using System.Text;
using Vanara.InteropServices; using Vanara.InteropServices;
using static Vanara.PInvoke.Ole32; using static Vanara.PInvoke.Ole32;
using static Vanara.PInvoke.OleAut32;
namespace Vanara.PInvoke namespace Vanara.PInvoke
{ {

1
PInvoke/Ole/PropSys/PropvarUtil.cs
View File

@ -4,6 +4,7 @@ using System.Runtime.InteropServices;
using System.Text; using System.Text;
using Vanara.InteropServices; using Vanara.InteropServices;
using static Vanara.PInvoke.Ole32; using static Vanara.PInvoke.Ole32;
using static Vanara.PInvoke.OleAut32;
using FILETIME = System.Runtime.InteropServices.ComTypes.FILETIME; using FILETIME = System.Runtime.InteropServices.ComTypes.FILETIME;
namespace Vanara.PInvoke namespace Vanara.PInvoke

5
PInvoke/Shell32/PropvarUtil.cs
View File

@ -1,4 +1,5 @@
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using static Vanara.PInvoke.OleAut32;
namespace Vanara.PInvoke namespace Vanara.PInvoke
{ {
@ -31,7 +32,7 @@ namespace Vanara.PInvoke
// InitVariantFromStrRet( STRRET *pstrret, PCUITEMID_CHILD pidl, VARIANT *pvar ); // InitVariantFromStrRet( STRRET *pstrret, PCUITEMID_CHILD pidl, VARIANT *pvar );
[DllImport(Lib.PropSys, SetLastError = false, ExactSpelling = true)] [DllImport(Lib.PropSys, SetLastError = false, ExactSpelling = true)]
[PInvokeData("propvarutil.h", MSDNShortId = "8e9542a9-9ed0-4e44-b9b1-32b31151bd8e")] [PInvokeData("propvarutil.h", MSDNShortId = "8e9542a9-9ed0-4e44-b9b1-32b31151bd8e")]
public static extern HRESULT InitVariantFromStrRet(in STRRET pstrret, PIDL pidl, out Ole32.VARIANT pvar); public static extern HRESULT InitVariantFromStrRet(in STRRET pstrret, PIDL pidl, out VARIANT pvar);
/// <summary>If the source variant is a VT_BSTR, extracts string and places it into a STRRET structure.</summary> /// <summary>If the source variant is a VT_BSTR, extracts string and places it into a STRRET structure.</summary>
/// <param name="varIn"> /// <param name="varIn">
@ -50,6 +51,6 @@ namespace Vanara.PInvoke
// varIn, STRRET *pstrret ); // varIn, STRRET *pstrret );
[DllImport(Lib.PropSys, SetLastError = false, ExactSpelling = true)] [DllImport(Lib.PropSys, SetLastError = false, ExactSpelling = true)]
[PInvokeData("propvarutil.h", MSDNShortId = "dfc1f52e-58c6-48fd-8da9-1d4d5115912c")] [PInvokeData("propvarutil.h", MSDNShortId = "dfc1f52e-58c6-48fd-8da9-1d4d5115912c")]
public static extern HRESULT VariantToStrRet(in Ole32.VARIANT varIn, out STRRET pstrret); public static extern HRESULT VariantToStrRet(in VARIANT varIn, out STRRET pstrret);
} }
} }

2
PInvoke/Shell32/ShObjIdl.IExecuteCommand.cs
View File

@ -1,7 +1,7 @@
using System; using System;
using System.Drawing; using System.Drawing;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using static Vanara.PInvoke.Ole32; using static Vanara.PInvoke.OleAut32;
namespace Vanara.PInvoke namespace Vanara.PInvoke
{ {

1
Windows.Shell/ShellExtensions/ShellCommand.cs
View File

@ -1,6 +1,7 @@
using System; using System;
using Vanara.PInvoke; using Vanara.PInvoke;
using static Vanara.PInvoke.Ole32; using static Vanara.PInvoke.Ole32;
using static Vanara.PInvoke.OleAut32;
using static Vanara.PInvoke.Shell32; using static Vanara.PInvoke.Shell32;
namespace Vanara.Windows.Shell namespace Vanara.Windows.Shell

2
Windows.Shell/ShellProperties/PropertyBag.cs
View File

@ -1,4 +1,4 @@
using static Vanara.PInvoke.Ole32; using static Vanara.PInvoke.OleAut32;
namespace Vanara.Windows.Shell namespace Vanara.Windows.Shell
{ {