Show type and member names in warning messages (#195)

Co-authored-by: Manuel Leßmann <[email protected]>
dspace-group · Oct 11, 2023 · fda665c · fda665c
1 parent 8b152a8
commit fda665c
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/src/dscom/writer/ElemDescBasedWriter.cs b/src/dscom/writer/ElemDescBasedWriter.cs
@@ -46,7 +46,7 @@ public virtual void ReportEvent()
 
         if (Type.GetUnderlayingType().IsGenericType)
         {
-            Context.LogWarning("Warning: Type library exporter encountered a generic type instance in a signature. Generic code may not be exported to COM.", unchecked(HRESULT.TLBX_E_GENERICINST_SIGNATURE));
+            Context.LogWarning($"Warning: Type library exporter encountered generic type {Type.GetUnderlayingType()} in a signature while writing type {ParentType}. Generic code may not be exported to COM.", unchecked(HRESULT.TLBX_E_GENERICINST_SIGNATURE));
         }
 
         var unrefedType = Type.IsByRef ? Type.GetElementType()! : Type;
@@ -62,7 +62,7 @@ public virtual void ReportEvent()
                     marshasinfo += $" SafeArraySubType: {TypeProvider.MarshalAsAttribute!.SafeArraySubType}";
                 }
             }
-            Context.LogWarning($"Type library exporter warning processing '{Type.Name}'{marshasinfo}. Warning: The method or field has an invalid managed/unmanaged type combination, check the MarshalAs directive.", unchecked(HRESULT.TLBX_E_BAD_NATIVETYPE));
+            Context.LogWarning($"Type library exporter warning processing '{Type}'{marshasinfo}. Warning: The method or field has an invalid managed/unmanaged type combination, check the MarshalAs directive.", unchecked(HRESULT.TLBX_E_BAD_NATIVETYPE));
         }
     }
 

diff --git a/src/dscom/writer/EnumWriter.cs b/src/dscom/writer/EnumWriter.cs
@@ -54,9 +54,9 @@ public override void Create()
             varDesc.wVarFlags = 0;
 
             TypeInfo.AddVarDesc(index, varDesc)
-                .ThrowIfFailed($"Failed to add variable description for enum {Name}.");
+                .ThrowIfFailed($"Failed to add variable description for enum {SourceType}.");
             TypeInfo.SetVarName(index, Context.NameResolver.GetMappedName(field, $"{Name}_{field.Name}"))
-                .ThrowIfFailed($"Failed to set variable name for enum {Name}.");
+                .ThrowIfFailed($"Failed to set variable name {field.Name} for enum {SourceType}.");
             index++;
         }
 

diff --git a/src/dscom/writer/MethodWriter.cs b/src/dscom/writer/MethodWriter.cs
@@ -191,23 +191,23 @@ public override void Create()
             names = GetNamesForParameters().ToArray();
 
             typeInfo.AddFuncDesc((uint)funcIndex, funcDesc.Value)
-                .ThrowIfFailed($"Failed to add function description for {MethodInfo.Name}.");
+                .ThrowIfFailed($"Failed to add function description for {MethodInfo.DeclaringType}.{MethodInfo.Name}().");
 
             typeInfo.SetFuncAndParamNames((uint)funcIndex, names, (uint)names.Length)
-                .ThrowIfFailed($"Failed to set function and parameter names for {MethodInfo.Name}.");
+                .ThrowIfFailed($"Failed to set function and parameter names for {MethodInfo.DeclaringType}.{MethodInfo.Name}().");
 
             var description = MethodInfo.GetCustomAttribute<System.ComponentModel.DescriptionAttribute>();
             if (description != null)
             {
                 typeInfo.SetFuncDocString((uint)funcIndex, description.Description)
-                    .ThrowIfFailed($"Failed to set function documentation string for {MethodInfo.Name}.");
+                    .ThrowIfFailed($"Failed to set function documentation string for {MethodInfo.DeclaringType}.{MethodInfo.Name}().");
             }
 
             if (memidCreated == 0 && InvokeKind == INVOKEKIND.INVOKE_FUNC)
             {
                 //Function has been forced as property (default member handling)
                 typeInfo.SetFuncCustData((uint)funcIndex, new Guid(Guids.GUID_Function2Getter), 1)
-                    .ThrowIfFailed($"Failed to set function custom data for {MethodInfo.Name}.");
+                    .ThrowIfFailed($"Failed to set function custom data for {MethodInfo.DeclaringType}.{MethodInfo.Name}().");
             }
 
         }

diff --git a/src/dscom/writer/ParameterWriter.cs b/src/dscom/writer/ParameterWriter.cs
@@ -83,7 +83,7 @@ public override void ReportEvent()
         base.ReportEvent();
         if (!ParameterIsResolvable && Type.GetUnderlayingType().IsInterface)
         {
-            Context.LogWarning($"Warning: Type library exporter could not find the type library for {Type.GetUnderlayingType().Name}.  IUnknown was substituted for the interface.", HRESULT.TLBX_I_USEIUNKNOWN);
+            Context.LogWarning($"Warning: Type library exporter could not find the type library for {Type.GetUnderlayingType()} while writing member {ParentType}.{ParameterInfo.Member.Name}. IUnknown was substituted for the interface.", HRESULT.TLBX_I_USEIUNKNOWN);
         }
     }
 

diff --git a/src/dscom/writer/TypeWriter.cs b/src/dscom/writer/TypeWriter.cs
@@ -76,7 +76,7 @@ public virtual void CreateTypeInfo()
         if (typeLib != null)
         {
             typeLib.CreateTypeInfo(Context.NameResolver.GetMappedName(SourceType, Name), TypeKind, out var createTypeInfo)
-                    .ThrowIfFailed($"Failed to create type info for {Name}.");
+                    .ThrowIfFailed($"Failed to create type info {Name} for type {SourceType}.");
 
             _createTypeInfo2 = (ICreateTypeInfo2)createTypeInfo;