diff --git a/de4dot.code/deobfuscators/DeobUtils.cs b/de4dot.code/deobfuscators/DeobUtils.cs index 5df4037a..4dd6c6cb 100644 --- a/de4dot.code/deobfuscators/DeobUtils.cs +++ b/de4dot.code/deobfuscators/DeobUtils.cs @@ -228,7 +228,7 @@ namespace de4dot.code.deobfuscators { if (cctor != null) yield return cctor; - var entryPoint = module.EntryPoint as MethodDef; + var entryPoint = module.EntryPoint; if (entryPoint != null) { cctor = entryPoint.DeclaringType.FindClassConstructor(); if (cctor != null) diff --git a/de4dot.code/deobfuscators/MPRESS/Deobfuscator.cs b/de4dot.code/deobfuscators/MPRESS/Deobfuscator.cs index 9fd808d0..58bd9005 100644 --- a/de4dot.code/deobfuscators/MPRESS/Deobfuscator.cs +++ b/de4dot.code/deobfuscators/MPRESS/Deobfuscator.cs @@ -139,7 +139,7 @@ namespace de4dot.code.deobfuscators.MPRESS { new MethodInfo("System.Int32", "(System.String[])"), }; Version detectVersion() { - var ep = module.EntryPoint as MethodDef; + var ep = module.EntryPoint; if (ep == null || ep.Body == null) return Version.Unknown; var type = ep.DeclaringType; diff --git a/de4dot.code/deobfuscators/UnusedMethodsFinder.cs b/de4dot.code/deobfuscators/UnusedMethodsFinder.cs index 0cc92da6..70332630 100644 --- a/de4dot.code/deobfuscators/UnusedMethodsFinder.cs +++ b/de4dot.code/deobfuscators/UnusedMethodsFinder.cs @@ -33,7 +33,7 @@ namespace de4dot.code.deobfuscators { this.module = module; this.removedMethods = removedMethods; foreach (var method in possiblyUnusedMethods) { - if (method != module.EntryPoint && !removedMethods.exists(method)) + if (method != module.ManagedEntryPoint && !removedMethods.exists(method)) this.possiblyUnusedMethods[method] = true; } } diff --git a/de4dot.code/renamer/Renamer.cs b/de4dot.code/renamer/Renamer.cs index 95d4d967..6a7d0c82 100644 --- a/de4dot.code/renamer/Renamer.cs +++ b/de4dot.code/renamer/Renamer.cs @@ -1574,7 +1574,7 @@ namespace de4dot.code.renamer { void prepareRenameEntryPoints() { foreach (var module in modules.TheModules) { - var entryPoint = module.ModuleDefMD.EntryPoint as MethodDef; + var entryPoint = module.ModuleDefMD.EntryPoint; if (entryPoint == null) continue; var methodDef = modules.resolveMethod(entryPoint); diff --git a/de4dot.code/renamer/asmmodules/MemberRefFinder.cs b/de4dot.code/renamer/asmmodules/MemberRefFinder.cs index e689f75d..94093145 100644 --- a/de4dot.code/renamer/asmmodules/MemberRefFinder.cs +++ b/de4dot.code/renamer/asmmodules/MemberRefFinder.cs @@ -153,7 +153,7 @@ namespace de4dot.code.renamer.asmmodules { } void add(ModuleDef mod) { - push(mod.EntryPoint); + push(mod.ManagedEntryPoint); add(mod.CustomAttributes); add(mod.Types); add(mod.ExportedTypes); diff --git a/dot10 b/dot10 index 71e94c79..c0e5b8b8 160000 --- a/dot10 +++ b/dot10 @@ -1 +1 @@ -Subproject commit 71e94c79a8271bbd0abb614ac8b79d31e98674b4 +Subproject commit c0e5b8b8ef7c5f3ad8cb9fb82f806f016572816e