1717using System . Xml . Linq ;
1818using Microsoft . Extensions . Logging ;
1919using Silk . NET . SilkTouch . Clang ;
20+ using Microsoft . Extensions . Options ;
2021
2122namespace Silk . NET . SilkTouch . Mods
2223{
2324 /// <summary>
2425 /// A mod to modify COM interface structs into opaque structs that act like ComPtr objects
2526 /// </summary>
2627 /// <param name="logger">The logger to use.</param>
27- [ ModConfiguration < Config > ]
28- public class TransformCOM ( ILogger < TransformCOM > logger ) : Mod
28+ /// <param name="config">The configuration to use.</param>
29+ [ ModConfiguration < Configuration > ]
30+ public class TransformCOM (
31+ ILogger < TransformCOM > logger ,
32+ IOptionsSnapshot < TransformCOM . Configuration > config ) : Mod
2933 {
3034 /// <summary>
3135 /// The configuration for the <see cref="TransformCOM"/> mod.
3236 /// </summary>
33- public class Config
37+ public class Configuration
3438 {
35-
39+ /// <summary>
40+ /// The base type to consider the base of the com tree
41+ /// Usually this is IUknown.Interface
42+ /// </summary>
43+ public string ? BaseType { get ; init ; }
3644 }
3745
3846 /// <inheritdoc />
3947 public override async Task ExecuteAsync ( IModContext ctx , CancellationToken ct = default )
4048 {
4149 await base . ExecuteAsync ( ctx , ct ) ;
4250
43- var firstPass = new TypeDiscoverer ( ) ;
51+ var firstPass = new TypeDiscoverer ( config . Value . BaseType ?? "IUnknown.Interface" ) ;
4452 var proj = ctx . SourceProject ;
4553 if ( proj is null )
4654 {
@@ -101,7 +109,11 @@ public override async Task ExecuteAsync(IModContext ctx, CancellationToken ct =
101109 . OfType < MemberAccessExpressionSyntax > ( )
102110 . Where ( m => m . Expression is PrefixUnaryExpressionSyntax pues && pues . IsKind ( SyntaxKind . PointerMemberAccessExpression ) ) ;
103111
104- if ( memberAccesses . Count ( ) == 0 )
112+ var nullAssignments = root . DescendantNodes ( )
113+ . OfType < AssignmentExpressionSyntax > ( )
114+ . Where ( aes => aes . Right . IsKind ( SyntaxKind . NullLiteralExpression ) ) ;
115+
116+ if ( memberAccesses . Count ( ) == 0 && nullAssignments . Count ( ) == 0 )
105117 {
106118 continue ;
107119 }
@@ -120,6 +132,16 @@ public override async Task ExecuteAsync(IModContext ctx, CancellationToken ct =
120132 }
121133 }
122134
135+ foreach ( var nullAssignment in nullAssignments )
136+ {
137+ var typeInfo = semanticModel . GetTypeInfo ( nullAssignment . Left ) ;
138+ // Check if the type is a ComType
139+ if ( typeInfo . Type != null && firstPass . FoundCOMTypes . Any ( type => type . Item1 == typeInfo . Type . ToDisplayString ( ) ) )
140+ {
141+ var newNullAssignment = SyntaxFactory . AssignmentExpression ( nullAssignment . Kind ( ) , nullAssignment . Left , LiteralExpression ( SyntaxKind . DefaultExpression ) ) ;
142+ editor . ReplaceNode ( nullAssignment , newNullAssignment ) ;
143+ }
144+ }
123145 proj = doc . Project ;
124146
125147 logger . LogInformation ( "COM Object Usage Update for {0} Complete ({1}/{2})" , doc . Name , index , count ) ;
@@ -128,7 +150,7 @@ public override async Task ExecuteAsync(IModContext ctx, CancellationToken ct =
128150 ctx . SourceProject = proj ;
129151 }
130152
131- class TypeDiscoverer : CSharpSyntaxWalker
153+ class TypeDiscoverer ( string BaseType ) : CSharpSyntaxWalker
132154 {
133155 private Dictionary < string , List < ( string , bool ) > > _interfaceParenting = new Dictionary < string , List < ( string , bool ) > > ( ) ;
134156
@@ -179,7 +201,7 @@ public override void VisitInterfaceDeclaration(InterfaceDeclarationSyntax node)
179201
180202 private void CheckBases ( ( string , bool ) className , BaseListSyntax bases )
181203 {
182- if ( bases . Types . Any ( baseType => baseType . Type . ToString ( ) == "IUnknown.Interface" || FoundCOMTypes . Any ( val => val . Item1 == $ "{ baseType . Type } ") ) )
204+ if ( bases . Types . Any ( baseType => baseType . Type . ToString ( ) == BaseType || FoundCOMTypes . Any ( val => val . Item1 == $ "{ baseType . Type } ") ) )
183205 {
184206 COMTypeValidated ( className ) ;
185207 return ;
@@ -303,6 +325,20 @@ class Rewriter(List<(string, bool)> ComTypes)
303325
304326 return base . VisitCastExpression ( node ) ;
305327 }
328+
329+ public override SyntaxNode ? VisitParameter ( ParameterSyntax node )
330+ {
331+ var visited = base . VisitParameter ( node ) ;
332+ var visitedParameter = visited as ParameterSyntax ;
333+ if ( visitedParameter is null || visitedParameter . Default is null || visitedParameter . Type is null ||
334+ visitedParameter . Default . Value . IsKind ( SyntaxKind . NullLiteralExpression ) ||
335+ ! ComTypes . Any ( com => visitedParameter . Type ? . ToString ( ) == com . Item1 ) )
336+ {
337+ return visited ;
338+ }
339+
340+ return Parameter ( visitedParameter . AttributeLists , visitedParameter . Modifiers , visitedParameter . Type , visitedParameter . Identifier , EqualsValueClause ( LiteralExpression ( SyntaxKind . DefaultExpression ) ) ) ;
341+ }
306342 }
307343 }
308344}
0 commit comments