@@ -278,30 +278,9 @@ private Declaration CreateMemberDeclaration(out FUNCDESC memberDescriptor, TYPEK
278
278
var memberDeclarationType = GetDeclarationType ( memberDescriptor , funcValueType , typeKind ) ;
279
279
280
280
var asTypeName = string . Empty ;
281
- if ( memberDeclarationType != DeclarationType . Procedure && ! TypeNames . TryGetValue ( funcValueType , out asTypeName ) )
281
+ if ( memberDeclarationType != DeclarationType . Procedure )
282
282
{
283
- if ( funcValueType == VarEnum . VT_PTR || funcValueType == VarEnum . VT_BYREF )
284
- {
285
- try
286
- {
287
- var asTypeDesc = ( TYPEDESC ) Marshal . PtrToStructure ( memberDescriptor . elemdescFunc . tdesc . lpValue , typeof ( TYPEDESC ) ) ;
288
- asTypeName = GetTypeName ( asTypeDesc , info ) ;
289
- }
290
- catch
291
- {
292
- if ( ! TypeNames . TryGetValue ( funcValueType , out asTypeName ) )
293
- {
294
- asTypeName = funcValueType . ToString ( ) ; //TypeNames[VarEnum.VT_VARIANT];
295
- }
296
- }
297
- }
298
- else
299
- {
300
- if ( ! TypeNames . TryGetValue ( funcValueType , out asTypeName ) )
301
- {
302
- asTypeName = funcValueType . ToString ( ) ; //TypeNames[VarEnum.VT_VARIANT];
303
- }
304
- }
283
+ asTypeName = GetTypeName ( memberDescriptor . elemdescFunc . tdesc , info ) ;
305
284
}
306
285
var attributes = new Attributes ( ) ;
307
286
if ( memberName == "_NewEnum" && ( ( FUNCFLAGS ) memberDescriptor . wFuncFlags ) . HasFlag ( FUNCFLAGS . FUNCFLAG_FNONBROWSABLE ) )
@@ -311,7 +290,6 @@ private Declaration CreateMemberDeclaration(out FUNCDESC memberDescriptor, TYPEK
311
290
else if ( memberDescriptor . memid == 0 )
312
291
{
313
292
attributes . AddDefaultMemberAttribute ( memberName ) ;
314
- //Debug.WriteLine("Default member found: {0}.{1} ({2} / {3})", moduleDeclaration.IdentifierName, memberName, memberDeclarationType, (VarEnum)memberDescriptor.elemdescFunc.tdesc.vt);
315
293
}
316
294
else if ( ( ( FUNCFLAGS ) memberDescriptor . wFuncFlags ) . HasFlag ( FUNCFLAGS . FUNCFLAG_FHIDDEN ) )
317
295
{
0 commit comments