Skip to content

Commit aa24751

Browse files
committed
Upgrade to 1.0.4-ci441 SharpGenTools.
1 parent e81ca53 commit aa24751

9 files changed

Lines changed: 16 additions & 512 deletions

ComObject.cs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,13 @@ namespace SharpGen.Runtime
2929
/// </summary>
3030
public partial class ComObject
3131
{
32-
/// <summary>
33-
/// Logs a warning of a possible memory leak when <see cref="Configuration.EnableObjectTracking" /> is enabled.
34-
/// Default uses <see cref="System.Diagnostics.Debug"/>.
35-
/// </summary>
36-
public static Action<string> LogMemoryLeakWarning = (warning) => System.Diagnostics.Debug.WriteLine(warning);
37-
3832
/// <summary>
3933
/// Initializes a new instance of the <see cref="ComObject"/> class from a IUnknown object.
4034
/// </summary>
4135
/// <param name="iunknowObject">Reference to a IUnknown object</param>
42-
public ComObject(object iunknowObject)
36+
public ComObject(object iunknownObject)
4337
{
44-
NativePointer = Marshal.GetIUnknownForObject(iunknowObject);
38+
NativePointer = Marshal.GetIUnknownForObject(iunknownObject);
4539
}
4640

4741
/// <summary>

Directory.build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22
<PropertyGroup>
33
<VersionPrefix Condition="'$(APPVEYOR_REPO_TAG_NAME)' != ''">$(APPVEYOR_REPO_TAG_NAME)</VersionPrefix>
4-
<VersionPrefix Condition="'$(VersionPrefix)' == ''">1.0.3</VersionPrefix>
4+
<VersionPrefix Condition="'$(VersionPrefix)' == ''">1.1</VersionPrefix>
55
<VersionSuffix Condition="'$(CI)' == ''">local</VersionSuffix>
66
<VersionSuffix Condition="'$(CI)' != '' AND '$(APPVEYOR_REPO_TAG_NAME)' == ''">ci$(APPVEYOR_BUILD_NUMBER)</VersionSuffix>
77
<Authors>jkoritzinsky</Authors>

Mapping.xml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,15 @@
115115
<bind from="BOOL" to="SharpGen.Runtime.Win32.RawBool"/>
116116
<bind from="HANDLE" to="System.IntPtr" />
117117
<bind from="HRESULT" to="SharpGen.Runtime.Result" />
118-
<bind from="SIZE_T" to="SharpGen.Runtime.PointerSize" marshal="System.IntPtr"/>
119-
<bind from="SSIZE_T" to="SharpGen.Runtime.PointerSize" marshal="System.IntPtr"/>
118+
<bind from="SIZE_T" to="SharpGen.Runtime.PointerSize" />
119+
<bind from="SSIZE_T" to="SharpGen.Runtime.PointerSize" />
120120
<bind from="MSG" to="SharpGen.Runtime.Win32.NativeMessage" />
121121
<bind from="ULARGE_INTEGER" to="System.UInt64" />
122122
<bind from="LARGE_INTEGER" to="System.Int64" />
123123
<bind from="FILETIME" to="System.Int64" />
124+
<bind from="DWORD" to="System.Int32" />
125+
<bind from="ULONG" to="System.UInt32" />
126+
<bind from="LONG" to="System.Int32" />
124127

125128
<bind from="SECURITY_ATTRIBUTES" to="SharpGen.Runtime.Win32.SecurityAttributes"/>
126129

@@ -159,7 +162,7 @@
159162
<context-clear/>
160163

161164
<context>Unknwnbase</context>
162-
<map interface="IUnknown" callback="true" callback-dual="true" callback-name="ComObject" callback-visibility="public" />
165+
<map interface="IUnknown" callback="true" callback-dual="true" callback-name="ComObject" callback-visibility="public" shadow-name="SharpGen.Runtime.ComObjectShadow" vtbl-name="SharpGen.Runtime.ComObjectShadow.ComObjectVtbl" />
163166
<map method="IUnknown::.*" keep-implement-public="true" />
164167
<map method="IUnknown::QueryInterface" check="false" />
165168
<context-clear/>
@@ -183,12 +186,12 @@
183186
<map enum-item="STATFLAG_NONAME" name="NoName"/>
184187
<remove enum-item="STATFLAG_NOOPEN"/>
185188

186-
<map interface="ISequentialStream" name="IStreamBase" callback-visibility="public" callback="true" callback-dual="true" callback-name="ComStreamBase"/>
189+
<map interface="ISequentialStream" name="IStreamBase" callback-visibility="public" callback="true" callback-dual="true" callback-name="ComStreamBase" autogen-shadow="true" />
187190
<map param="ISequentialStream::Read::pcbRead" return="true"/>
188191
<map param="ISequentialStream::Write::pcbWritten" return="true"/>
189192
<map method="ISequentialStream::.*" keep-implement-public="true"/>
190193

191-
<map interface="IStream" name="IStream" callback-visibility="public" callback="true" callback-dual="true" callback-name="ComStream"/>
194+
<map interface="IStream" name="IStream" callback-visibility="public" callback="true" callback-dual="true" callback-name="ComStream" autogen-shadow="true" />
192195
<map param="IStream::Seek::dwOrigin" type="SHARPGEN_RUNTIME_SEEKORIGIN"/>
193196
<map param="IStream::Seek::plibNewPosition" return="true"/>
194197
<map param="IStream::CopyTo::pcbRead" attribute="out" return="true"/>
@@ -199,7 +202,7 @@
199202
<map param="IStream::Stat::pstatstg" attribute="out" return="true"/>
200203
<map param="IStream::Stat::grfStatFlag" type="STATFLAG"/>
201204
<map param="IStream::Clone::ppstm" return="true"/>
202-
<map method="IStream::.*" keep-implement-public="true"/>
205+
<map method="IStream::.*" keep-implement-public="true" property="false" />
203206

204207
<context-clear/>
205208

NuGet.Config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
<configuration>
33
<packageSources>
44
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
5+
<add key="sharpgen" value="https://www.myget.org/F/sharpgentools/api/v3/index.json" />
56
</packageSources>
67
</configuration>

SharpGen.Runtime.COM.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010

1111
<ItemGroup>
1212
<SharpGenMapping Include="Mapping.xml" />
13-
<PackageReference Include="System.Memory" Version="4.4.0-preview2-25405-01" />
13+
<PackageReference Include="System.Memory" Version="4.5.0" />
1414
<PackageReference Include="SharpGen.Doc.Msdn.Tasks" Version="1.0.2">
1515
<PrivateAssets>all</PrivateAssets>
1616
</PackageReference>
17-
<PackageReference Include="SharpGenTools.Sdk" Version="1.0.2">
17+
<PackageReference Include="SharpGenTools.Sdk" Version="1.0.4-ci441">
1818
<PrivateAssets>all</PrivateAssets>
1919
</PackageReference>
20-
<PackageReference Include="SharpGen.Runtime" Version="1.0.2" />
20+
<PackageReference Include="SharpGen.Runtime" Version="1.0.4-ci441" />
2121
</ItemGroup>
2222

2323
</Project>

Win32/ComStreamBaseShadow.cs

Lines changed: 0 additions & 84 deletions
This file was deleted.

0 commit comments

Comments
 (0)