Index: /trunk/eraser/Installer/Bootstrapper/Bootstrapper.vcxproj
===================================================================
--- /trunk/eraser/Installer/Bootstrapper/Bootstrapper.vcxproj	(revision 2413)
+++ /trunk/eraser/Installer/Bootstrapper/Bootstrapper.vcxproj	(revision 2414)
@@ -69,5 +69,5 @@
     </ClCompile>
     <Link>
-      <AdditionalDependencies>comctl32.lib;7zd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>comctl32.lib;7zLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)Bootstrapper.exe</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -91,5 +91,5 @@
     </ClCompile>
     <Link>
-      <AdditionalDependencies>comctl32.lib;7z.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>comctl32.lib;7zLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)Bootstrapper.exe</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
Index: /trunk/eraser/Installer/Bootstrapper/stdafx.h
===================================================================
--- /trunk/eraser/Installer/Bootstrapper/stdafx.h	(revision 2413)
+++ /trunk/eraser/Installer/Bootstrapper/stdafx.h	(revision 2414)
@@ -39,9 +39,7 @@
 //7-zip SDK
 extern "C" {
+	#include <C/7z.h>
+	#include <C/7zAlloc.h>
 	#include <C/7zCrc.h>
-	#include <C/Archive/7z/7zIn.h>
-	#include <C/Archive/7z/7zAlloc.h>
-	#include <C/Archive/7z/7zDecode.h>
-	#include <C/Archive/7z/7zExtract.h>
 }
 
Index: /trunk/eraser/Installer/Bootstrapper/Bootstrapper.cpp
===================================================================
--- /trunk/eraser/Installer/Bootstrapper/Bootstrapper.cpp	(revision 2413)
+++ /trunk/eraser/Installer/Bootstrapper/Bootstrapper.cpp	(revision 2414)
@@ -116,5 +116,5 @@
 	size_t CurrentOffset;
 
-	static SRes LZMemStreamLook(void* object, void** buf, size_t* size)
+	static SRes LZMemStreamLook(void* object, const void** buf, size_t* size)
 	{
 		if (*size == 0)
@@ -238,5 +238,5 @@
 		size_t convertedChars = 0;
 		wchar_t fileName[MAX_PATH];
-		mbstowcs_s(&convertedChars, fileName, file->Name, sizeof(fileName) / sizeof(fileName[0]));
+		SzArEx_GetFileNameUtf16(&db, i, reinterpret_cast<UInt16*>(fileName));
 		
 		//Split the path to get the file name only.
@@ -259,5 +259,5 @@
 		while (result == SZ_OK && destFileSize)
 		{
-			result = SzAr_Extract(&db, &stream.InStream, i, &blockIndex,
+			result = SzArEx_Extract(&db, &stream.InStream, i, &blockIndex,
 				&outBuffer, &outBufferSize, &offset, &processedSize, &allocImp,
 				&allocTempImp);
Index: unk/eraser/Installer/Bootstrapper/Bootstrapper.vcproj
===================================================================
--- /trunk/eraser/Installer/Bootstrapper/Bootstrapper.vcproj	(revision 2413)
+++ 	(revision )
@@ -1,265 +1,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="Installer.Bootstrapper"
-	ProjectGUID="{4F6CD250-0A08-4DB8-8E07-848E4FF01C21}"
-	RootNamespace="Bootstrapper"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)\bin\$(ConfigurationName)"
-			IntermediateDirectory="obj\$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="..\..\Eraser Native.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="&quot;$(SolutionDir)UpdateVersions.bat&quot; &quot;$(SolutionDir)\&quot; &quot;$(SolutionDir)Version.rc.in&quot; &quot;$(SolutionDir)Version.rc&quot;"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_LZMA_IN_CB"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="2"
-				WarningLevel="4"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="comctl32.lib 7zd.lib"
-				OutputFile="$(OutDir)\Bootstrapper.exe"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)\bin\$(ConfigurationName)"
-			IntermediateDirectory="obj\$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="..\..\Eraser Native.vsprops"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="&quot;$(SolutionDir)UpdateVersions.bat&quot; &quot;$(SolutionDir)\&quot; &quot;$(SolutionDir)Version.rc.in&quot; &quot;$(SolutionDir)Version.rc&quot;"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_LZMA_IN_CB"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="2"
-				WarningLevel="4"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="comctl32.lib 7z.lib"
-				OutputFile="$(OutDir)\Bootstrapper.exe"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\Bootstrapper.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\Main.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\stdafx.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\Bootstrapper.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Handle.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Resource.h"
-				>
-			</File>
-			<File
-				RelativePath=".\stdafx.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath=".\Bootstrapper.manifest"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\Bootstrapper.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>