monocul.us/de4dot-cex
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename isDelegateType() -> derivesFromDelegate()

Browse Source
This commit is contained in:
de4dot 2011-11-04 00:39:48 +01:00
parent e1715adb48
commit 30f713f8f8
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
blocks/DotNetUtils.cs
View File

@ -282,7 +282,7 @@ namespace de4dot.blocks {
return type != null && (type.FullName == "System.Delegate" || type.FullName == "System.MulticastDelegate");
}
public static bool isDelegateType(TypeDefinition type) {
public static bool derivesFromDelegate(TypeDefinition type) {
return type != null && isDelegate(type.BaseType);
}

2
de4dot.code/deobfuscators/CliSecure/Deobfuscator.cs
View File

@ -214,7 +214,7 @@ namespace de4dot.deobfuscators.CliSecure {
base.deobfuscateBegin();
foreach (var type in module.Types) {
if (type.FullName == "InitializeDelegate" && DotNetUtils.isDelegateType(type))
if (type.FullName == "InitializeDelegate" && DotNetUtils.derivesFromDelegate(type))
this.addTypeToBeRemoved(type, "Obfuscator type");
else if (findResourceDecrypter(type)) {
// Nothing

2
de4dot.code/deobfuscators/SmartAssembly/AssemblyResolverInfo.cs
View File

@ -105,7 +105,7 @@ namespace de4dot.deobfuscators.SmartAssembly {
return true;
foreach (var field in type.Fields) {
if (!DotNetUtils.isDelegateType(DotNetUtils.getType(module, field.FieldType)))
if (!DotNetUtils.derivesFromDelegate(DotNetUtils.getType(module, field.FieldType)))
return false;
}
return true;

2
de4dot.code/deobfuscators/SmartAssembly/MemoryManagerInfo.cs
View File

@ -73,7 +73,7 @@ namespace de4dot.deobfuscators.SmartAssembly {
fields++;
continue;
}
if (DotNetUtils.isDelegateType(DotNetUtils.getType(module, field.FieldType)))
if (DotNetUtils.derivesFromDelegate(DotNetUtils.getType(module, field.FieldType)))
continue;
return false;

2
de4dot.code/deobfuscators/SmartAssembly/ProxyDelegateFinder.cs
View File

@ -93,7 +93,7 @@ namespace de4dot.deobfuscators.SmartAssembly {
public void findDelegateCreator(ModuleDefinition module) {
var callCounter = new CallCounter();
foreach (var type in module.Types) {
if (type.Namespace != "" || !DotNetUtils.isDelegateType(type))
if (type.Namespace != "" || !DotNetUtils.derivesFromDelegate(type))
continue;
var cctor = DotNetUtils.getMethod(type, ".cctor");
if (cctor == null)

4
de4dot.code/deobfuscators/SmartAssembly/StringEncoderClassFinder.cs
View File

@ -117,7 +117,7 @@ namespace de4dot.deobfuscators.SmartAssembly {
if (typeToken == null)
continue;
var delegateType = getType(typeToken);
if (!DotNetUtils.isDelegateType(delegateType))
if (!DotNetUtils.derivesFromDelegate(delegateType))
continue;
var invoke = DotNetUtils.getMethod(delegateType, "Invoke");
if (invoke == null || !DotNetUtils.isMethod(invoke, "System.String", "(System.Int32)"))
@ -143,7 +143,7 @@ namespace de4dot.deobfuscators.SmartAssembly {
if (typeToken == null)
continue;
var type = getType(typeToken);
if (type == null || DotNetUtils.isDelegateType(type))
if (type == null || DotNetUtils.derivesFromDelegate(type))
continue;
if (!couldBeStringDecrypterClass(type))
continue;

4
de4dot.code/deobfuscators/TypesRestorer.cs
View File

@ -711,9 +711,9 @@ namespace de4dot.deobfuscators {
}
static TypeReference getCommonBaseClass(ModuleDefinition module, TypeReference a, TypeReference b) {
if (DotNetUtils.isDelegate(a) && DotNetUtils.isDelegateType(DotNetUtils.getType(module, b)))
if (DotNetUtils.isDelegate(a) && DotNetUtils.derivesFromDelegate(DotNetUtils.getType(module, b)))
return b;
if (DotNetUtils.isDelegate(b) && DotNetUtils.isDelegateType(DotNetUtils.getType(module, a)))
if (DotNetUtils.isDelegate(b) && DotNetUtils.derivesFromDelegate(DotNetUtils.getType(module, a)))
return a;
return null; //TODO:
}