Moved code to blocks assembly

AssemblyData/AssemblyData.csproj

@@ -37,6 +37,7 @@
     <Compile Include="AssemblyServer.cs" />
     <Compile Include="AssemblyService.cs" />
     <Compile Include="DelegateStringDecrypter.cs" />
+    <Compile Include="EmuStringDecrypter.cs" />
     <Compile Include="IAssemblyService.cs" />
     <Compile Include="IStringDecrypter.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -46,6 +47,16 @@
   <ItemGroup>
     <Reference Include="System.Runtime.Remoting" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\blocks\blocks.csproj">
+      <Project>{045B96F2-AF80-4C4C-8D27-E38635AC705E}</Project>
+      <Name>blocks</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\cecil\Mono.Cecil.csproj">
+      <Project>{D68133BD-1E63-496E-9EDE-4FBDBF77B486}</Project>
+      <Name>Mono.Cecil</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

AssemblyData/AssemblyService.cs

@@ -60,6 +60,10 @@ namespace AssemblyData {
 				stringDecrypter = new DelegateStringDecrypter();
 				break;
 
+			case StringDecrypterType.Emulate:
+				stringDecrypter = new EmuStringDecrypter();
+				break;
+
 			default:
 				throw new ApplicationException(string.Format("Unknown StringDecrypterType {0}", type));
 			}

AssemblyData/EmuStringDecrypter.cs

@@ -0,0 +1,60 @@
+/*
+    Copyright (C) 2011 de4dot@gmail.com
+
+    This file is part of de4dot.
+
+    de4dot is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    de4dot is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with de4dot.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Reflection;
+using System.Reflection.Emit;
+
+namespace AssemblyData {
+	class EmuStringDecrypter : IStringDecrypter {
+		delegate string DecryptString(object[] args);
+		List<DecryptInfo> decryptInfos = new List<DecryptInfo>();
+
+		class DecryptInfo {
+			public MethodInfo method;
+			public DecryptString decryptString;
+
+			public DecryptInfo(MethodInfo method) {
+				this.method = method;
+			}
+		}
+
+		public int defineStringDecrypter(MethodInfo method) {
+			decryptInfos.Add(new DecryptInfo(method));
+			return decryptInfos.Count - 1;
+		}
+
+		public object[] decryptStrings(int stringDecrypterMethod, object[] args) {
+			var decryptInfo = decryptInfos[stringDecrypterMethod];
+			if (decryptInfo.decryptString == null)
+				decryptInfo.decryptString = createDecryptString(decryptInfo.method);
+
+			var result = new object[args.Length];
+			for (int i = 0; i < args.Length; i++)
+				result[i] = decryptInfo.decryptString((object[])args[i]);
+			return result;
+		}
+
+		DecryptString createDecryptString(MethodInfo method) {
+			throw new System.NotImplementedException();	//TODO:
+		}
+	}
+}

AssemblyData/IAssemblyService.cs

@@ -20,6 +20,7 @@
 namespace AssemblyData {
 	public enum StringDecrypterType {
 		Delegate,
+		Emulate,
 	}
 
 	public interface IAssemblyService {

blocks/BaseBlock.cs

@@ -18,7 +18,7 @@
 */
 
 namespace de4dot.blocks {
-	abstract class BaseBlock {
+	public abstract class BaseBlock {
 		BaseBlock parent = null;
 
 		public BaseBlock Parent {

blocks/Block.cs

@@ -22,7 +22,7 @@ using System.Collections.Generic;
 using Mono.Cecil.Cil;
 
 namespace de4dot.blocks {
-	class Block : BaseBlock {
+	public class Block : BaseBlock {
 		List<Instr> instructions = new List<Instr>();
 
 		// List of all explicit (non-fall-through) targets. It's just one if it's a normal

blocks/Blocks.cs

@@ -23,7 +23,7 @@ using Mono.Cecil;
 using Mono.Cecil.Cil;
 
 namespace de4dot.blocks {
-	class Blocks {
+	public class Blocks {
 		MethodDefinition method;
 		IList<VariableDefinition> locals;
 		MethodBlocks methodBlocks;
@@ -52,17 +52,19 @@ namespace de4dot.blocks {
 				scopeBlock.deobfuscateLeaveObfuscation();
 		}
 
-		public void deobfuscate() {
+		public int deobfuscate() {
 			foreach (var scopeBlock in getAllScopeBlocks(methodBlocks))
 				scopeBlock.deobfuscate(this);
 
-			removeDeadBlocks();
+			int numDeadBlocks = removeDeadBlocks();
 
 			foreach (var scopeBlock in getAllScopeBlocks(methodBlocks)) {
 				scopeBlock.mergeBlocks();
 				scopeBlock.repartitionBlocks();
 				scopeBlock.deobfuscateLeaveObfuscation();
 			}
+
+			return numDeadBlocks;
 		}
 
 		IEnumerable<ScopeBlock> getAllScopeBlocks(ScopeBlock scopeBlock) {
@@ -72,10 +74,8 @@ namespace de4dot.blocks {
 			return list;
 		}
 
-		void removeDeadBlocks() {
+		int removeDeadBlocks() {
-			int numDeadBlocks = new DeadBlocksRemover(methodBlocks).remove();
+			return new DeadBlocksRemover(methodBlocks).remove();
-			if (numDeadBlocks > 0)
-				Log.v("Removed {0} dead block(s)", numDeadBlocks);
 		}
 
 		class DeadBlocksRemover {

blocks/CondBranchDeobfuscator.cs

@@ -21,7 +21,7 @@ using System.Collections.Generic;
 using Mono.Cecil.Cil;
 using de4dot.blocks;
 
-namespace de4dot {
+namespace de4dot.blocks {
 	abstract class CondBranchDeobfuscator {
 		ScopeBlock scopeBlock;
 		IEnumerable<Block> blocks;

blocks/DotNetUtils.cs

@@ -19,12 +19,11 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using Mono.Cecil;
 using Mono.Cecil.Cil;
 
-namespace de4dot {
+namespace de4dot.blocks {
-	class CallCounter {
+	public class CallCounter {
 		Dictionary<MethodReferenceAndDeclaringTypeKey, int> calls = new Dictionary<MethodReferenceAndDeclaringTypeKey, int>();
 
 		public void add(MethodReference calledMethod) {
@@ -47,7 +46,7 @@ namespace de4dot {
 		}
 	}
 
-	class MethodCalls {
+	public class MethodCalls {
 		Dictionary<string, int> methodCalls = new Dictionary<string, int>(StringComparer.Ordinal);
 
 		public void addMethodCalls(MethodDefinition method) {
@@ -78,7 +77,7 @@ namespace de4dot {
 		}
 	}
 
-	static class DotNetUtils {
+	public static class DotNetUtils {
 		public static bool isLdcI4(Instruction instruction) {
 			return isLdcI4(instruction.OpCode.Code);
 		}
@@ -474,21 +473,6 @@ namespace de4dot {
 			return list;
 		}
 
-		public static void decryptAndAddResources(ModuleDefinition module, string encryptedName, Func<byte[]> decryptResource) {
-			Log.v("Decrypting resources, name: {0}", Utils.toCsharpString(encryptedName));
-			var decryptedResourceData = decryptResource();
-			if (decryptedResourceData == null)
-				throw new ApplicationException("decryptedResourceData is null");
-			var resourceModule = ModuleDefinition.ReadModule(new MemoryStream(decryptedResourceData));
-
-			Log.indent();
-			foreach (var rsrc in resourceModule.Resources) {
-				Log.v("Adding decrypted resource {0}", Utils.toCsharpString(rsrc.Name));
-				module.Resources.Add(rsrc);
-			}
-			Log.deIndent();
-		}
-
 		public static bool hasReturnValue(IMethodSignature method) {
 			return !MemberReferenceHelper.verifyType(method.MethodReturnType.ReturnType, "mscorlib", "System.Void");
 		}

blocks/FilterHandlerBlock.cs

@@ -22,6 +22,6 @@ using Mono.Cecil;
 using Mono.Cecil.Cil;
 
 namespace de4dot.blocks {
-	class FilterHandlerBlock : ScopeBlock {
+	public class FilterHandlerBlock : ScopeBlock {
 	}
 }

blocks/HandlerBlock.cs

@@ -23,6 +23,6 @@ using Mono.Cecil.Cil;
 
 namespace de4dot.blocks {
 	// This is the block inside catch(xxx) { }.
-	class HandlerBlock : ScopeBlock {
+	public class HandlerBlock : ScopeBlock {
 	}
 }

blocks/Instr.cs

@@ -22,7 +22,7 @@ using Mono.Cecil.Cil;
 using System.Collections.Generic;
 
 namespace de4dot.blocks {
-	class Instr {
+	public class Instr {
 		Instruction instruction;
 
 		public OpCode OpCode {

blocks/MemberReferenceHelper.cs

@@ -21,8 +21,8 @@ using System;
 using System.Collections.Generic;
 using Mono.Cecil;
 
-namespace de4dot {
+namespace de4dot.blocks {
-	enum CecilType {
+	public enum CecilType {
 		ArrayType,
 		ByReferenceType,
 		EventDefinition,
@@ -44,7 +44,7 @@ namespace de4dot {
 		TypeReference,
 	}
 
-	class FieldReferenceKey {
+	public class FieldReferenceKey {
 		FieldReference fieldRef;
 
 		public FieldReference FieldReference {
@@ -71,7 +71,7 @@ namespace de4dot {
 		}
 	}
 
-	class PropertyReferenceKey {
+	public class PropertyReferenceKey {
 		PropertyReference propRef;
 
 		public PropertyReference PropertyReference {
@@ -98,7 +98,7 @@ namespace de4dot {
 		}
 	}
 
-	class EventReferenceKey {
+	public class EventReferenceKey {
 		EventReference eventRef;
 
 		public EventReference EventReference {
@@ -125,7 +125,7 @@ namespace de4dot {
 		}
 	}
 
-	class MethodReferenceKey {
+	public class MethodReferenceKey {
 		MethodReference methodRef;
 
 		public MethodReference MethodReference {
@@ -152,7 +152,7 @@ namespace de4dot {
 		}
 	}
 
-	class FieldReferenceAndDeclaringTypeKey {
+	public class FieldReferenceAndDeclaringTypeKey {
 		FieldReference fieldRef;
 
 		public FieldReference FieldReference {
@@ -181,7 +181,7 @@ namespace de4dot {
 		}
 	}
 
-	class MethodReferenceAndDeclaringTypeKey {
+	public class MethodReferenceAndDeclaringTypeKey {
 		MethodReference methodRef;
 
 		public MethodReference MethodReference {
@@ -210,7 +210,7 @@ namespace de4dot {
 		}
 	}
 
-	static class MemberReferenceHelper {
+	public static class MemberReferenceHelper {
 		static Dictionary<Type, CecilType> typeToCecilTypeDict = new Dictionary<Type, CecilType>();
 		static MemberReferenceHelper() {
 			typeToCecilTypeDict[typeof(ArrayType)] = CecilType.ArrayType;

blocks/MethodBlocks.cs

@@ -21,6 +21,6 @@ using System.Collections.Generic;
 
 namespace de4dot.blocks {
 	// Start of a method
-	class MethodBlocks : ScopeBlock {
+	public class MethodBlocks : ScopeBlock {
 	}
 }

blocks/Properties/AssemblyInfo.cs

@@ -0,0 +1,34 @@
+/*
+    Copyright (C) 2011 de4dot@gmail.com
+
+    This file is part of de4dot.
+
+    de4dot is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    de4dot is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with de4dot.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("blocks")]
+[assembly: AssemblyDescription("Modifies Mono.Cecil MethodDefinition bodies")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("blocks")]
+[assembly: AssemblyCopyright("Copyright (C) 2011 de4dot@gmail.com")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: ComVisible(false)]
+[assembly: AssemblyVersion("1.0.0.3405")]
+[assembly: AssemblyFileVersion("1.0.0.3405")]

blocks/ScopeBlock.cs

@@ -24,7 +24,7 @@ using Mono.Cecil.Cil;
 namespace de4dot.blocks {
 	// A normal branch may not transfer out of a protected block (try block), filter handler,
 	// an exception handler block, or a method.
-	abstract class ScopeBlock : BaseBlock {
+	public abstract class ScopeBlock : BaseBlock {
 		protected List<BaseBlock> baseBlocks;
 
 		public List<BaseBlock> BaseBlocks {

blocks/SwitchControlFlowDeobfuscator.cs

@@ -20,9 +20,8 @@
 using System;
 using System.Collections.Generic;
 using Mono.Cecil.Cil;
-using de4dot.blocks;
 
-namespace de4dot {
+namespace de4dot.blocks {
 	class SwitchControlFlowDeobfuscator {
 		Blocks blocks;
 		Dictionary<Block, bool> foundBlocks = new Dictionary<Block, bool>();

blocks/TryBlock.cs

@@ -21,7 +21,7 @@ using System.Collections.Generic;
 
 namespace de4dot.blocks {
 	// This is the block inside try { }.
-	class TryBlock : ScopeBlock {
+	public class TryBlock : ScopeBlock {
 		// The first one is the most nested one and the last one is the
 		// outer most handler. I.e., the exceptions are written to the
 		// image in the same order they're saved here.

blocks/TryHandlerBlock.cs

@@ -22,7 +22,7 @@ using Mono.Cecil.Cil;
 
 namespace de4dot.blocks {
 	// Contains the filter handler block and the catch handler block.
-	class TryHandlerBlock : ScopeBlock {
+	public class TryHandlerBlock : ScopeBlock {
 		FilterHandlerBlock filterHandlerBlock = new FilterHandlerBlock();
 		HandlerBlock handlerBlock = new HandlerBlock();
 

blocks/Utils.cs

@@ -0,0 +1,45 @@
+using System.Collections.Generic;
+
+namespace de4dot.blocks {
+	internal delegate TResult Func<out TResult>();
+	internal delegate TResult Func<in T, out TResult>(T arg);
+	internal delegate TResult Func<in T1, in T2, out TResult>(T1 arg1, T2 arg2);
+	internal delegate TResult Func<in T1, in T2, in T3, out TResult>(T1 arg1, T2 arg2, T3 arg3);
+	internal delegate void Action();
+	internal delegate void Action<in T>(T arg);
+	internal delegate void Action<in T1, in T2>(T1 arg1, T2 arg2);
+	internal delegate void Action<in T1, in T2, in T3>(T1 arg1, T2 arg2, T3 arg3);
+
+	public class Tuple<T1, T2> {
+		public T1 Item1 { get; set; }
+		public T2 Item2 { get; set; }
+		public override bool Equals(object obj) {
+			var other = obj as Tuple<T1, T2>;
+			if (other == null)
+				return false;
+			return Item1.Equals(other.Item1) && Item2.Equals(other.Item2);
+		}
+		public override int GetHashCode() {
+			return Item1.GetHashCode() + Item2.GetHashCode();
+		}
+		public override string ToString() {
+			return "<" + Item1.ToString() + "," + Item2.ToString() + ">";
+		}
+	}
+
+	static class Utils {
+		public static IDictionary<T, int> createObjectToIndexDictionary<T>(IList<T> objs) {
+			var dict = new Dictionary<T, int>();
+			for (int i = 0; i < objs.Count; i++)
+				dict[objs[i]] = i;
+			return dict;
+		}
+
+		public static List<TOut> convert<TIn, TOut>(IEnumerable<TIn> list) where TIn : TOut {
+			var olist = new List<TOut>();
+			foreach (var l in list)
+				olist.Add(l);
+			return olist;
+		}
+	}
+}

blocks/blocks.csproj

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{045B96F2-AF80-4C4C-8D27-E38635AC705E}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>de4dot.blocks</RootNamespace>
+    <AssemblyName>blocks</AssemblyName>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="BaseBlock.cs" />
+    <Compile Include="Block.cs" />
+    <Compile Include="Blocks.cs" />
+    <Compile Include="BlocksSorter.cs" />
+    <Compile Include="CodeGenerator.cs" />
+    <Compile Include="CondBranchDeobfuscator.cs" />
+    <Compile Include="DotNetUtils.cs" />
+    <Compile Include="FilterHandlerBlock.cs" />
+    <Compile Include="ForwardScanOrder.cs" />
+    <Compile Include="HandlerBlock.cs" />
+    <Compile Include="Instr.cs" />
+    <Compile Include="InstructionListParser.cs" />
+    <Compile Include="MemberReferenceHelper.cs" />
+    <Compile Include="MethodBlocks.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ScopeBlock.cs" />
+    <Compile Include="SwitchControlFlowDeobfuscator.cs" />
+    <Compile Include="TryBlock.cs" />
+    <Compile Include="TryHandlerBlock.cs" />
+    <Compile Include="Utils.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\cecil\Mono.Cecil.csproj">
+      <Project>{D68133BD-1E63-496E-9EDE-4FBDBF77B486}</Project>
+      <Name>Mono.Cecil</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

de4dot.code/CommandLineParser.cs

@@ -78,6 +78,7 @@ namespace de4dot {
 			stringDecrypterTypes.add(DecrypterType.None, "none", "Don't decrypt strings");
 			stringDecrypterTypes.add(DecrypterType.Static, "static", "Use static string decrypter if available");
 			stringDecrypterTypes.add(DecrypterType.Delegate, "delegate", "Use a delegate to call the real string decrypter");
+			stringDecrypterTypes.add(DecrypterType.Emulate, "emulate", "Call real string decrypter and emulate certain instructions");
 		}
 
 		public CommandLineParser(IList<IDeobfuscatorInfo> deobfuscatorInfos, FilesDeobfuscator.Options filesOptions) {

de4dot.code/IObfuscatedFile.cs

@@ -26,6 +26,7 @@ namespace de4dot {
 		None,
 		Static,
 		Delegate,
+		Emulate,
 	}
 
 	interface IObfuscatedFile {

de4dot.code/ObfuscatedFile.cs

@@ -239,6 +239,7 @@ namespace de4dot {
 				break;
 
 			case DecrypterType.Delegate:
+			case DecrypterType.Emulate:
 				checkSupportedStringDecrypter(StringFeatures.AllowDynamicDecryption);
 				assemblyClient = assemblyClientFactory.create();
 				assemblyClient.connect();
@@ -272,6 +273,8 @@ namespace de4dot {
 
 			if (options.StringDecrypterType == DecrypterType.Delegate)
 				assemblyClient.Service.setStringDecrypterType(AssemblyData.StringDecrypterType.Delegate);
+			else if (options.StringDecrypterType == DecrypterType.Emulate)
+				assemblyClient.Service.setStringDecrypterType(AssemblyData.StringDecrypterType.Emulate);
 			else
 				throw new ApplicationException(string.Format("Invalid string decrypter type '{0}'", options.StringDecrypterType));
 
@@ -415,8 +418,11 @@ namespace de4dot {
 					var blocks = new Blocks(method);
 
 					deob.deobfuscateMethodBegin(blocks);
-					if (options.ControlFlowDeobfuscation)
+					if (options.ControlFlowDeobfuscation) {
-						blocks.deobfuscate();
+						int numDeadBlocks = blocks.deobfuscate();
+						if (numDeadBlocks > 0)
+							Log.v("Removed {0} dead block(s)", numDeadBlocks);
+					}
 					deobfuscateStrings(blocks);
 					deob.deobfuscateMethodEnd(blocks);
 					if (options.ControlFlowDeobfuscation)
@@ -444,6 +450,7 @@ namespace de4dot {
 				break;
 
 			case DecrypterType.Delegate:
+			case DecrypterType.Emulate:
 				dynamicStringDecrypter.decrypt(blocks);
 				break;
 

de4dot.code/Utils.cs

@@ -173,19 +173,5 @@ namespace de4dot {
 		public static string getPathOfOurFile(string filename) {
 			return Path.Combine(getOurBaseDir(), filename);
 		}
-
-		public static IDictionary<T, int> createObjectToIndexDictionary<T>(IList<T> objs) {
-			var dict = new Dictionary<T, int>();
-			for (int i = 0; i < objs.Count; i++)
-				dict[objs[i]] = i;
-			return dict;
-		}
-
-		public static List<TOut> convert<TIn, TOut>(IEnumerable<TIn> list) where TIn : TOut {
-			var olist = new List<TOut>();
-			foreach (var l in list)
-				olist.Add(l);
-			return olist;
-		}
 	}
 }

de4dot.code/de4dot.code.csproj

@@ -54,27 +54,12 @@
     <Compile Include="AssemblyClient\NewProcessAssemblyServerLoader.cs" />
     <Compile Include="AssemblyClient\SameAppDomainAssemblyServerLoader.cs" />
     <Compile Include="AssemblyResolver.cs" />
-    <Compile Include="blocks\BaseBlock.cs" />
-    <Compile Include="blocks\Block.cs" />
-    <Compile Include="blocks\Blocks.cs" />
-    <Compile Include="blocks\BlocksSorter.cs" />
-    <Compile Include="blocks\CodeGenerator.cs" />
-    <Compile Include="blocks\CondBranchDeobfuscator.cs" />
-    <Compile Include="blocks\FilterHandlerBlock.cs" />
-    <Compile Include="blocks\ForwardScanOrder.cs" />
-    <Compile Include="blocks\HandlerBlock.cs" />
-    <Compile Include="blocks\Instr.cs" />
-    <Compile Include="blocks\InstructionListParser.cs" />
-    <Compile Include="blocks\MethodBlocks.cs" />
-    <Compile Include="blocks\ScopeBlock.cs" />
-    <Compile Include="blocks\SwitchControlFlowDeobfuscator.cs" />
-    <Compile Include="blocks\TryBlock.cs" />
-    <Compile Include="blocks\TryHandlerBlock.cs" />
     <Compile Include="CommandLineParser.cs" />
     <Compile Include="deobfuscators\CliSecure\Deobfuscator.cs" />
     <Compile Include="deobfuscators\CliSecure\ProxyDelegateFinder.cs" />
     <Compile Include="deobfuscators\DeobfuscatorBase.cs" />
     <Compile Include="deobfuscators\DeobfuscatorInfoBase.cs" />
+    <Compile Include="deobfuscators\DeobUtils.cs" />
     <Compile Include="deobfuscators\Dotfuscator\Deobfuscator.cs" />
     <Compile Include="deobfuscators\Eazfuscator\Deobfuscator.cs" />
     <Compile Include="deobfuscators\ExceptionLoggerRemover.cs" />
@@ -102,11 +87,9 @@
     <Compile Include="deobfuscators\SmartAssembly\StringEncoderClassFinder.cs" />
     <Compile Include="deobfuscators\SmartAssembly\TamperProtectionRemover.cs" />
     <Compile Include="deobfuscators\Unknown\Deobfuscator.cs" />
-    <Compile Include="DotNetUtils.cs" />
     <Compile Include="FilesDeobfuscator.cs" />
     <Compile Include="IObfuscatedFile.cs" />
     <Compile Include="Log.cs" />
-    <Compile Include="MemberReferenceHelper.cs" />
     <Compile Include="AssemblyModule.cs" />
     <Compile Include="NameRegexes.cs" />
     <Compile Include="ObfuscatedFile.cs" />
@@ -134,6 +117,10 @@
       <Project>{FBD84077-9D35-41FE-89DF-8D79EFE0B595}</Project>
       <Name>AssemblyData</Name>
     </ProjectReference>
+    <ProjectReference Include="..\blocks\blocks.csproj">
+      <Project>{045B96F2-AF80-4C4C-8D27-E38635AC705E}</Project>
+      <Name>blocks</Name>
+    </ProjectReference>
     <ProjectReference Include="..\cecil\Mono.Cecil.csproj">
       <Project>{D68133BD-1E63-496E-9EDE-4FBDBF77B486}</Project>
       <Name>Mono.Cecil</Name>

de4dot.code/deobfuscators/CliSecure/Deobfuscator.cs

@@ -264,7 +264,7 @@ namespace de4dot.deobfuscators.CliSecure {
 			if (resource == null)
 				return;
 
-			DotNetUtils.decryptAndAddResources(module, resource.Name, () => decryptResource(resource));
+			DeobUtils.decryptAndAddResources(module, resource.Name, () => decryptResource(resource));
 
 			addResourceToBeRemoved(resource, "Encrypted resource");
 			if (rsrcDecryptMethod != null)

de4dot.code/deobfuscators/DeobUtils.cs

@@ -0,0 +1,22 @@
+using System;
+using System.IO;
+using Mono.Cecil;
+
+namespace de4dot.deobfuscators {
+	static class DeobUtils {
+		public static void decryptAndAddResources(ModuleDefinition module, string encryptedName, Func<byte[]> decryptResource) {
+			Log.v("Decrypting resources, name: {0}", Utils.toCsharpString(encryptedName));
+			var decryptedResourceData = decryptResource();
+			if (decryptedResourceData == null)
+				throw new ApplicationException("decryptedResourceData is null");
+			var resourceModule = ModuleDefinition.ReadModule(new MemoryStream(decryptedResourceData));
+
+			Log.indent();
+			foreach (var rsrc in resourceModule.Resources) {
+				Log.v("Adding decrypted resource {0}", Utils.toCsharpString(rsrc.Name));
+				module.Resources.Add(rsrc);
+			}
+			Log.deIndent();
+		}
+	}
+}

de4dot.code/deobfuscators/Eazfuscator/Deobfuscator.cs

@@ -20,6 +20,7 @@
 using System.Collections.Generic;
 using Mono.Cecil;
 using Mono.Cecil.Cil;
+using de4dot.blocks;
 
 namespace de4dot.deobfuscators.Eazfuscator {
 	class DeobfuscatorInfo : DeobfuscatorInfoBase {

de4dot.code/deobfuscators/SmartAssembly/AssemblyResolverInfo.cs

@@ -22,6 +22,7 @@ using System.Collections.Generic;
 using System.Text;
 using Mono.Cecil;
 using Mono.Cecil.Cil;
+using de4dot.blocks;
 
 namespace de4dot.deobfuscators.SmartAssembly {
 	class AssemblyResolverInfo : ResolverInfoBase {

de4dot.code/deobfuscators/SmartAssembly/AutomatedErrorReportingFinder.cs

@@ -20,6 +20,7 @@
 using System.Collections.Generic;
 using Mono.Cecil;
 using Mono.Cecil.Cil;
+using de4dot.blocks;
 
 namespace de4dot.deobfuscators.SmartAssembly {
 	class AutomatedErrorReportingFinder {

de4dot.code/deobfuscators/SmartAssembly/MemoryManagerInfo.cs

@@ -18,6 +18,7 @@
 */
 
 using Mono.Cecil;
+using de4dot.blocks;
 
 namespace de4dot.deobfuscators.SmartAssembly {
 	class MemoryManagerInfo {

de4dot.code/deobfuscators/SmartAssembly/ProxyDelegateFinder.cs

@@ -19,6 +19,7 @@
 
 using System.Collections.Generic;
 using Mono.Cecil;
+using de4dot.blocks;
 
 namespace de4dot.deobfuscators.SmartAssembly {
 	class ProxyDelegateFinder : ProxyDelegateFinderBase {

de4dot.code/deobfuscators/SmartAssembly/ResolverInfoBase.cs

@@ -20,6 +20,7 @@
 using System.Collections.Generic;
 using Mono.Cecil;
 using Mono.Cecil.Cil;
+using de4dot.blocks;
 
 namespace de4dot.deobfuscators.SmartAssembly {
 	abstract class ResolverInfoBase {

de4dot.code/deobfuscators/SmartAssembly/ResourceDecrypterInfo.cs

@@ -20,6 +20,7 @@
 using System.Collections.Generic;
 using Mono.Cecil;
 using Mono.Cecil.Cil;
+using de4dot.blocks;
 
 namespace de4dot.deobfuscators.SmartAssembly {
 	class ResourceDecrypterInfo {

de4dot.code/deobfuscators/SmartAssembly/ResourceResolver.cs

@@ -20,6 +20,7 @@
 using System;
 using System.IO;
 using Mono.Cecil;
+using de4dot.blocks;
 
 namespace de4dot.deobfuscators.SmartAssembly {
 	class ResourceResolver {
@@ -46,7 +47,7 @@ namespace de4dot.deobfuscators.SmartAssembly {
 			if (resource == null)
 				return null;
 
-			DotNetUtils.decryptAndAddResources(module, resource.Name, () => assemblyResolver.removeDecryptedResource(resource));
+			DeobUtils.decryptAndAddResources(module, resource.Name, () => assemblyResolver.removeDecryptedResource(resource));
 			mergedIt = true;
 			return resource;
 		}

de4dot.code/deobfuscators/SmartAssembly/ResourceResolverInfo.cs

@@ -19,6 +19,7 @@
 
 using Mono.Cecil;
 using Mono.Cecil.Cil;
+using de4dot.blocks;
 
 namespace de4dot.deobfuscators.SmartAssembly {
 	class ResourceResolverInfo : ResolverInfoBase {

de4dot.code/deobfuscators/SmartAssembly/SimpleZipInfo.cs

@@ -18,6 +18,7 @@
 */
 
 using Mono.Cecil;
+using de4dot.blocks;
 
 namespace de4dot.deobfuscators.SmartAssembly {
 	class SimpleZipInfo {

de4dot.code/deobfuscators/SmartAssembly/StringEncoderClassFinder.cs

@@ -20,6 +20,7 @@
 using System.Collections.Generic;
 using Mono.Cecil;
 using Mono.Cecil.Cil;
+using de4dot.blocks;
 
 namespace de4dot.deobfuscators.SmartAssembly {
 	class StringsEncoderInfo {

de4dot.code/renamer/DefinitionsRenamer.cs

@@ -20,6 +20,7 @@
 using System;
 using System.Collections.Generic;
 using Mono.Cecil;
+using de4dot.blocks;
 
 namespace de4dot.renamer {
 	// Renames all typedefs, methoddefs, eventdefs, fielddefs, and propdefs

de4dot.code/renamer/MemberRefFinder.cs

@@ -21,6 +21,7 @@ using System;
 using System.Collections.Generic;
 using Mono.Cecil;
 using Mono.Cecil.Cil;
+using de4dot.blocks;
 
 namespace de4dot {
 	// If it's a non-generic memberref, you could use GetMemberReference() to get a cached

de4dot.code/renamer/MemberReferenceExpander.cs

@@ -19,6 +19,7 @@
 
 using System;
 using Mono.Cecil;
+using de4dot.blocks;
 
 namespace de4dot.renamer {
 	abstract class Expander {

de4dot.code/renamer/MemberRefs.cs

@@ -21,6 +21,7 @@ using System;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
 using Mono.Cecil;
+using de4dot.blocks;
 using de4dot.deobfuscators;
 
 namespace de4dot.renamer {

de4dot.code/renamer/MemberRenameState.cs

@@ -18,6 +18,7 @@
 */
 
 using System.Collections.Generic;
+using de4dot.blocks;
 
 namespace de4dot.renamer {
 	class MemberRenameState {

de4dot.code/renamer/NameCreators.cs

@@ -20,6 +20,7 @@
 using System;
 using System.Collections.Generic;
 using Mono.Cecil;
+using de4dot.blocks;
 
 namespace de4dot.renamer {
 	interface INameCreator {

de4dot.sln

@@ -30,6 +30,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssemblyServer-x64", "Assem
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dumpMethodsN", "dumpMethodsN\dumpMethodsN.vcxproj", "{3D97F8AF-494F-4AB2-82ED-E1BE532E4CB9}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "blocks", "blocks\blocks.csproj", "{045B96F2-AF80-4C4C-8D27-E38635AC705E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -1018,6 +1020,78 @@ Global
 		{3D97F8AF-494F-4AB2-82ED-E1BE532E4CB9}.winphone_Release|Win32.ActiveCfg = Release|Win32
 		{3D97F8AF-494F-4AB2-82ED-E1BE532E4CB9}.winphone_Release|Win32.Build.0 = Release|Win32
 		{3D97F8AF-494F-4AB2-82ED-E1BE532E4CB9}.winphone_Release|x86.ActiveCfg = Release|Win32
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.net_2_0_Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.net_2_0_Debug|Any CPU.Build.0 = Debug|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.net_2_0_Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.net_2_0_Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.net_2_0_Debug|Win32.ActiveCfg = Debug|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.net_2_0_Debug|x86.ActiveCfg = Debug|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.net_2_0_Release|Any CPU.ActiveCfg = Release|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.net_2_0_Release|Any CPU.Build.0 = Release|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.net_2_0_Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.net_2_0_Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.net_2_0_Release|Win32.ActiveCfg = Release|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.net_2_0_Release|x86.ActiveCfg = Release|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.net_3_5_Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.net_3_5_Debug|Any CPU.Build.0 = Debug|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.net_3_5_Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.net_3_5_Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.net_3_5_Debug|Win32.ActiveCfg = Debug|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.net_3_5_Debug|x86.ActiveCfg = Debug|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.net_3_5_Release|Any CPU.ActiveCfg = Release|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.net_3_5_Release|Any CPU.Build.0 = Release|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.net_3_5_Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.net_3_5_Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.net_3_5_Release|Win32.ActiveCfg = Release|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.net_3_5_Release|x86.ActiveCfg = Release|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.net_4_0_Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.net_4_0_Debug|Any CPU.Build.0 = Debug|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.net_4_0_Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.net_4_0_Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.net_4_0_Debug|Win32.ActiveCfg = Debug|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.net_4_0_Debug|x86.ActiveCfg = Debug|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.net_4_0_Release|Any CPU.ActiveCfg = Release|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.net_4_0_Release|Any CPU.Build.0 = Release|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.net_4_0_Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.net_4_0_Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.net_4_0_Release|Win32.ActiveCfg = Release|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.net_4_0_Release|x86.ActiveCfg = Release|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.Release|Win32.ActiveCfg = Release|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.Release|x86.ActiveCfg = Release|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.silverlight_Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.silverlight_Debug|Any CPU.Build.0 = Debug|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.silverlight_Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.silverlight_Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.silverlight_Debug|Win32.ActiveCfg = Debug|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.silverlight_Debug|x86.ActiveCfg = Debug|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.silverlight_Release|Any CPU.ActiveCfg = Release|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.silverlight_Release|Any CPU.Build.0 = Release|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.silverlight_Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.silverlight_Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.silverlight_Release|Win32.ActiveCfg = Release|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.silverlight_Release|x86.ActiveCfg = Release|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.winphone_Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.winphone_Debug|Any CPU.Build.0 = Debug|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.winphone_Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.winphone_Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.winphone_Debug|Win32.ActiveCfg = Debug|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.winphone_Debug|x86.ActiveCfg = Debug|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.winphone_Release|Any CPU.ActiveCfg = Release|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.winphone_Release|Any CPU.Build.0 = Release|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.winphone_Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.winphone_Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.winphone_Release|Win32.ActiveCfg = Release|Any CPU
+		{045B96F2-AF80-4C4C-8D27-E38635AC705E}.winphone_Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE