OSDN Git Service

(root) / winmerge-jp / winmerge-jp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6d8da8b)
ArchiveSupport: Upgrade to 7-Zip 16.02 (merge from https://bitbucket.org/jtuc/winmerg...
authorTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sat, 28 May 2016 11:08:15 +0000 (20:08 +0900)
committerTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sat, 28 May 2016 11:08:15 +0000 (20:08 +0900)
15 files changed:
ArchiveSupport/Merge7z/Merge7z.h patch | blob | history
ArchiveSupport/Merge7z/Merge7z.sln patch | blob | history
ArchiveSupport/Merge7z/Merge7z.vcxproj patch | blob | history
ArchiveSupport/Merge7z/Merge7z.vcxproj.filters patch | blob | history
ArchiveSupport/Merge7z/Merge7z907.cpp patch | blob | history
ArchiveSupport/Merge7z/Merge7zCommon.cpp patch | blob | history
ArchiveSupport/Merge7z/Merge7zCommon.h patch | blob | history
ArchiveSupport/Merge7z/StdAfx.cpp patch | blob | history
ArchiveSupport/Merge7z/StdAfx.h patch | blob | history
ArchiveSupport/Merge7z/resource_for_vs2013.rc [deleted file] patch | blob | history
ArchiveSupport/Merge7z/revision.txt patch | blob | history
ArchiveSupport/Merge7z/tools.cpp patch | blob | history
ArchiveSupport/Merge7z/tools.h patch | blob | history
Installer/InnoSetup/WinMerge.iss patch | blob | history
Installer/InnoSetup/WinMergeX64.iss patch | blob | history

diff --git a/ArchiveSupport/Merge7z/Merge7z.h b/ArchiveSupport/Merge7z/Merge7z.h
index 3d65598..3e64c26 100755 (executable)
--- a/ArchiveSupport/Merge7z/Merge7z.h
+++ b/ArchiveSupport/Merge7z/Merge7z.h
@@ -14,7 +14,6 @@
 #define DllBuild_Merge7z_10 public
 #else
 #define DllBuild_Merge7z_10 private
-#define DLLPSTUB /##/
 #endif
 
 #if DllBuild_Merge7z >= 13
@@ -40,6 +39,7 @@ interface Merge7z
                        Local7z = 2,
                        GuessFormatBySignature = 4,
                        GuessFormatByExtension = 8,
+                       ShowPassword = 16,
                        Default = sizeof(TCHAR) == sizeof(WCHAR) ? Unicode : 0
                };
        };
diff --git a/ArchiveSupport/Merge7z/Merge7z.sln b/ArchiveSupport/Merge7z/Merge7z.sln
index 869e0ca..3d78c16 100644 (file)
--- a/ArchiveSupport/Merge7z/Merge7z.sln
+++ b/ArchiveSupport/Merge7z/Merge7z.sln
@@ -1,26 +1,26 @@
 \r
 Microsoft Visual Studio Solution File, Format Version 12.00\r
-# Visual Studio 2013\r
-VisualStudioVersion = 12.0.31101.0\r
+# Visual Studio 14\r
+VisualStudioVersion = 14.0.25123.0\r
 MinimumVisualStudioVersion = 10.0.40219.1\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Merge7z", "Merge7z.vcxproj", "{FFB6D02A-782B-48EF-8398-7F8862859616}"\r
 EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
-               UnicodeDebug|Win32 = UnicodeDebug|Win32\r
-               UnicodeDebug|x64 = UnicodeDebug|x64\r
-               UnicodeRelease|Win32 = UnicodeRelease|Win32\r
-               UnicodeRelease|x64 = UnicodeRelease|x64\r
+               Debug|Win32 = Debug|Win32\r
+               Debug|x64 = Debug|x64\r
+               Release|Win32 = Release|Win32\r
+               Release|x64 = Release|x64\r
        EndGlobalSection\r
        GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
-               {FFB6D02A-782B-48EF-8398-7F8862859616}.UnicodeDebug|Win32.ActiveCfg = UnicodeDebug|Win32\r
-               {FFB6D02A-782B-48EF-8398-7F8862859616}.UnicodeDebug|Win32.Build.0 = UnicodeDebug|Win32\r
-               {FFB6D02A-782B-48EF-8398-7F8862859616}.UnicodeDebug|x64.ActiveCfg = UnicodeDebug|x64\r
-               {FFB6D02A-782B-48EF-8398-7F8862859616}.UnicodeDebug|x64.Build.0 = UnicodeDebug|x64\r
-               {FFB6D02A-782B-48EF-8398-7F8862859616}.UnicodeRelease|Win32.ActiveCfg = UnicodeRelease|Win32\r
-               {FFB6D02A-782B-48EF-8398-7F8862859616}.UnicodeRelease|Win32.Build.0 = UnicodeRelease|Win32\r
-               {FFB6D02A-782B-48EF-8398-7F8862859616}.UnicodeRelease|x64.ActiveCfg = UnicodeRelease|x64\r
-               {FFB6D02A-782B-48EF-8398-7F8862859616}.UnicodeRelease|x64.Build.0 = UnicodeRelease|x64\r
+               {FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|Win32.Build.0 = Debug|Win32\r
+               {FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|x64.ActiveCfg = Debug|x64\r
+               {FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|x64.Build.0 = Debug|x64\r
+               {FFB6D02A-782B-48EF-8398-7F8862859616}.Release|Win32.ActiveCfg = Release|Win32\r
+               {FFB6D02A-782B-48EF-8398-7F8862859616}.Release|Win32.Build.0 = Release|Win32\r
+               {FFB6D02A-782B-48EF-8398-7F8862859616}.Release|x64.ActiveCfg = Release|x64\r
+               {FFB6D02A-782B-48EF-8398-7F8862859616}.Release|x64.Build.0 = Release|x64\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r
diff --git a/ArchiveSupport/Merge7z/Merge7z.vcxproj b/ArchiveSupport/Merge7z/Merge7z.vcxproj
index ae547a5..8585771 100644 (file)
--- a/ArchiveSupport/Merge7z/Merge7z.vcxproj
+++ b/ArchiveSupport/Merge7z/Merge7z.vcxproj
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ItemGroup Label="ProjectConfigurations">\r
-    <ProjectConfiguration Include="UnicodeDebug|Win32">\r
-      <Configuration>UnicodeDebug</Configuration>\r
+    <ProjectConfiguration Include="Debug|Win32">\r
+      <Configuration>Debug</Configuration>\r
       <Platform>Win32</Platform>\r
     </ProjectConfiguration>\r
-    <ProjectConfiguration Include="UnicodeDebug|x64">\r
-      <Configuration>UnicodeDebug</Configuration>\r
+    <ProjectConfiguration Include="Debug|x64">\r
+      <Configuration>Debug</Configuration>\r
       <Platform>x64</Platform>\r
     </ProjectConfiguration>\r
-    <ProjectConfiguration Include="UnicodeRelease|Win32">\r
-      <Configuration>UnicodeRelease</Configuration>\r
+    <ProjectConfiguration Include="Release|Win32">\r
+      <Configuration>Release</Configuration>\r
       <Platform>Win32</Platform>\r
     </ProjectConfiguration>\r
-    <ProjectConfiguration Include="UnicodeRelease|x64">\r
-      <Configuration>UnicodeRelease</Configuration>\r
+    <ProjectConfiguration Include="Release|x64">\r
+      <Configuration>Release</Configuration>\r
       <Platform>x64</Platform>\r
     </ProjectConfiguration>\r
   </ItemGroup>\r
@@ -22,77 +22,87 @@
     <ProjectGuid>{FFB6D02A-782B-48EF-8398-7F8862859616}</ProjectGuid>\r
     <SccProjectName />\r
     <SccLocalPath />\r
+    <WindowsTargetPlatformVersion>\r
+    </WindowsTargetPlatformVersion>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'" Label="Configuration">\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
     <ConfigurationType>DynamicLibrary</ConfigurationType>\r
     <UseOfMfc>false</UseOfMfc>\r
     <CharacterSet>Unicode</CharacterSet>\r
     <PlatformToolset>v140_xp</PlatformToolset>\r
   </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'" Label="Configuration">\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">\r
     <ConfigurationType>DynamicLibrary</ConfigurationType>\r
     <UseOfMfc>false</UseOfMfc>\r
     <CharacterSet>Unicode</CharacterSet>\r
     <PlatformToolset>v140_xp</PlatformToolset>\r
   </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'" Label="Configuration">\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
     <ConfigurationType>DynamicLibrary</ConfigurationType>\r
     <UseOfMfc>false</UseOfMfc>\r
     <CharacterSet>Unicode</CharacterSet>\r
-    <PlatformToolset>v140_xp</PlatformToolset>\r
+    <PlatformToolset>v140</PlatformToolset>\r
   </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'" Label="Configuration">\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">\r
     <ConfigurationType>DynamicLibrary</ConfigurationType>\r
     <UseOfMfc>false</UseOfMfc>\r
     <CharacterSet>Unicode</CharacterSet>\r
-    <PlatformToolset>v140_xp</PlatformToolset>\r
+    <PlatformToolset>v140</PlatformToolset>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
   <ImportGroup Label="ExtensionSettings">\r
   </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'" Label="PropertySheets">\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
   </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'" Label="PropertySheets">\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
   </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'" Label="PropertySheets">\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
   </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'" Label="PropertySheets">\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">..\..\Build\Merge$(Configuration)\Merge7z\</OutDir>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">..\..\Build\$(Platform)\Merge$(Configuration)\Merge7z\</OutDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">..\..\BuildTmp\$(ProjectName)__$(Platform)_$(Configuration)/</IntDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">..\..\BuildTmp\$(ProjectName)__$(Platform)_$(Configuration)/</IntDir>\r
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">false</LinkIncremental>\r
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">false</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">..\..\Build\Merge$(Configuration)\Merge7z\</OutDir>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">..\..\Build\$(Platform)\Merge$(Configuration)\Merge7z\</OutDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">..\..\BuildTmp\$(ProjectName)__$(Platform)_$(Configuration)/</IntDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">..\..\BuildTmp\$(ProjectName)__$(Platform)_$(Configuration)/</IntDir>\r
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">false</LinkIncremental>\r
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">false</LinkIncremental>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">$(ProjectName)U</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">$(ProjectName)U</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">$(ProjectName)U</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">$(ProjectName)U</TargetName>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\Build\MergeUnicode$(Configuration)\Merge7z\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\Build\$(Platform)\MergeUnicode$(Configuration)\Merge7z\</OutDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\BuildTmp\$(ProjectName)\$(Platform)\$(Configuration)/</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\BuildTmp\$(ProjectName)\$(Platform)\$(Configuration)/</IntDir>\r
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>\r
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\Build\MergeUnicode$(Configuration)\Merge7z\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\Build\$(Platform)\MergeUnicode$(Configuration)\Merge7z\</OutDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\BuildTmp\$(ProjectName)\$(Platform)\$(Configuration)/</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\BuildTmp\$(ProjectName)\$(Platform)\$(Configuration)/</IntDir>\r
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>\r
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Merge7z1602U</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Merge7z1602U</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Merge7z1602U</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Merge7z1602U</TargetName>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <CodeAnalysisRuleSet>C:\Program Files (x86)\Microsoft Visual Studio 14.0\Team Tools\Static Analysis Tools\Rule Sets\NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>\r
+    <RunCodeAnalysis>false</RunCodeAnalysis>\r
   </PropertyGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <CodeAnalysisRuleSet>C:\Program Files (x86)\Microsoft Visual Studio 14.0\Team Tools\Static Analysis Tools\Rule Sets\NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>\r
+    <RunCodeAnalysis>false</RunCodeAnalysis>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
       <AdditionalIncludeDirectories>..\..\Externals\sevenzip;..\..\Externals\sevenzip\CPP;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>Merge7z920_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>\r
       <PrecompiledHeader>Use</PrecompiledHeader>\r
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>\r
-      <PrecompiledHeaderOutputFile>$(IntDir)/Merge7z920.pch</PrecompiledHeaderOutputFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)/Merge7z1602.pch</PrecompiledHeaderOutputFile>\r
       <AssemblerListingLocation>$(IntDir)/</AssemblerListingLocation>\r
       <ObjectFileName>$(IntDir)/</ObjectFileName>\r
       <ProgramDataBaseFileName>$(IntDir)/</ProgramDataBaseFileName>\r
@@ -103,15 +113,16 @@
       <CompileAs>Default</CompileAs>\r
       <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>\r
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>\r
+      <EnablePREfast>false</EnablePREfast>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalDependencies>shlwapi.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>../../Build/Merge$(Configuration)/Merge7z/$(TargetName).dll</OutputFile>\r
+      <OutputFile>$(TargetPath)</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <ModuleDefinitionFile>.\Merge7z.def</ModuleDefinitionFile>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>\r
-      <ImportLibrary>$(IntDir)/Merge7z920U.lib</ImportLibrary>\r
+      <ImportLibrary>$(IntDir)/$(TargetName).lib</ImportLibrary>\r
       <TargetMachine>MachineX86</TargetMachine>\r
       <SubSystem>Windows</SubSystem>\r
     </Link>\r
@@ -120,7 +131,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <TargetEnvironment>Win32</TargetEnvironment>\r
-      <TypeLibraryName>$(IntDir)/Merge7z920.tlb</TypeLibraryName>\r
+      <TypeLibraryName>$(IntDir)/Merge7z1602.tlb</TypeLibraryName>\r
       <HeaderFileName>\r
       </HeaderFileName>\r
     </Midl>\r
@@ -129,16 +140,16 @@
       <Culture>0x0407</Culture>\r
     </ResourceCompile>\r
   </ItemDefinitionGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
       <AdditionalIncludeDirectories>..\..\Externals\sevenzip;..\..\Externals\sevenzip\CPP;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>Merge7z920_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>\r
       <PrecompiledHeader>Use</PrecompiledHeader>\r
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>\r
-      <PrecompiledHeaderOutputFile>$(IntDir)/Merge7z920.pch</PrecompiledHeaderOutputFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)/Merge7z1602.pch</PrecompiledHeaderOutputFile>\r
       <AssemblerListingLocation>$(IntDir)/</AssemblerListingLocation>\r
       <ObjectFileName>$(IntDir)/</ObjectFileName>\r
       <ProgramDataBaseFileName>$(IntDir)/</ProgramDataBaseFileName>\r
@@ -151,19 +162,19 @@
     </ClCompile>\r
     <Link>\r
       <AdditionalDependencies>shlwapi.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>../../Build/$(Platform)/Merge$(Configuration)/Merge7z/$(TargetName).dll</OutputFile>\r
+      <OutputFile>$(TargetPath)</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <ModuleDefinitionFile>.\Merge7z.def</ModuleDefinitionFile>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>\r
-      <ImportLibrary>$(IntDir)/Merge7z920U.lib</ImportLibrary>\r
+      <ImportLibrary>$(IntDir)/$(TargetName).lib</ImportLibrary>\r
       <SubSystem>Windows</SubSystem>\r
     </Link>\r
     <Midl>\r
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <MkTypLibCompatible>true</MkTypLibCompatible>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
-      <TypeLibraryName>$(IntDir)/Merge7z920.tlb</TypeLibraryName>\r
+      <TypeLibraryName>$(IntDir)/Merge7z1602.tlb</TypeLibraryName>\r
       <HeaderFileName>\r
       </HeaderFileName>\r
     </Midl>\r
@@ -172,18 +183,18 @@
       <Culture>0x0407</Culture>\r
     </ResourceCompile>\r
   </ItemDefinitionGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <ClCompile>\r
       <Optimization>MinSpace</Optimization>\r
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
       <AdditionalIncludeDirectories>..\..\Externals\sevenzip\CPP;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>Merge7z920_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <StringPooling>true</StringPooling>\r
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
       <PrecompiledHeader>Use</PrecompiledHeader>\r
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>\r
-      <PrecompiledHeaderOutputFile>$(IntDir)/Merge7z920.pch</PrecompiledHeaderOutputFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)/Merge7z1602.pch</PrecompiledHeaderOutputFile>\r
       <AssemblerListingLocation>$(IntDir)/</AssemblerListingLocation>\r
       <ObjectFileName>$(IntDir)/</ObjectFileName>\r
       <ProgramDataBaseFileName>$(IntDir)/</ProgramDataBaseFileName>\r
@@ -192,13 +203,14 @@
       <CompileAs>Default</CompileAs>\r
       <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>\r
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>\r
+      <EnablePREfast>false</EnablePREfast>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalDependencies>shlwapi.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>../../Build/Merge$(Configuration)/Merge7z/$(TargetName).dll</OutputFile>\r
+      <OutputFile>$(TargetPath)</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <ModuleDefinitionFile>.\Merge7z.def</ModuleDefinitionFile>\r
-      <ImportLibrary>$(IntDir)/Merge7z920U.lib</ImportLibrary>\r
+      <ImportLibrary>$(IntDir)/$(TargetName).lib</ImportLibrary>\r
       <TargetMachine>MachineX86</TargetMachine>\r
       <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>\r
       <SubSystem>Windows</SubSystem>\r
@@ -208,7 +220,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <TargetEnvironment>Win32</TargetEnvironment>\r
-      <TypeLibraryName>$(IntDir)/Merge7z920.tlb</TypeLibraryName>\r
+      <TypeLibraryName>$(IntDir)/Merge7z1602.tlb</TypeLibraryName>\r
       <HeaderFileName>\r
       </HeaderFileName>\r
     </Midl>\r
@@ -217,18 +229,18 @@
       <Culture>0x0407</Culture>\r
     </ResourceCompile>\r
   </ItemDefinitionGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
     <ClCompile>\r
       <Optimization>MinSpace</Optimization>\r
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
       <AdditionalIncludeDirectories>..\..\Externals\sevenzip\CPP;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>Merge7z920_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <StringPooling>true</StringPooling>\r
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
       <PrecompiledHeader>Use</PrecompiledHeader>\r
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>\r
-      <PrecompiledHeaderOutputFile>$(IntDir)/Merge7z920.pch</PrecompiledHeaderOutputFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)/Merge7z1602.pch</PrecompiledHeaderOutputFile>\r
       <AssemblerListingLocation>$(IntDir)/</AssemblerListingLocation>\r
       <ObjectFileName>$(IntDir)/</ObjectFileName>\r
       <ProgramDataBaseFileName>$(IntDir)/</ProgramDataBaseFileName>\r
@@ -239,10 +251,10 @@
     </ClCompile>\r
     <Link>\r
       <AdditionalDependencies>shlwapi.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>../../Build/$(Platform)/Merge$(Configuration)/Merge7z/$(TargetName).dll</OutputFile>\r
+      <OutputFile>$(TargetPath)</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <ModuleDefinitionFile>.\Merge7z.def</ModuleDefinitionFile>\r
-      <ImportLibrary>$(IntDir)/Merge7z920U.lib</ImportLibrary>\r
+      <ImportLibrary>$(IntDir)/$(TargetName).lib</ImportLibrary>\r
       <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>\r
       <SubSystem>Windows</SubSystem>\r
     </Link>\r
@@ -250,7 +262,7 @@
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <MkTypLibCompatible>true</MkTypLibCompatible>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
-      <TypeLibraryName>$(IntDir)/Merge7z920.tlb</TypeLibraryName>\r
+      <TypeLibraryName>$(IntDir)/Merge7z1602.tlb</TypeLibraryName>\r
       <HeaderFileName>\r
       </HeaderFileName>\r
     </Midl>\r
@@ -265,18 +277,17 @@
     <None Include="revision.txt" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ClInclude Include="..\..\Externals\sevenzip\C\CpuArch.h" />\r
     <ClInclude Include="Merge7z.h" />\r
     <ClInclude Include="Merge7zCommon.h" />\r
     <ClInclude Include="StdAfx.h" />\r
     <ClInclude Include="tools.h" />\r
     <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\UI\GUI\resource.h" />\r
     <ClInclude Include="..\..\Externals\sevenzip\CPP\Windows\DLL.h" />\r
-    <ClInclude Include="..\..\Externals\sevenzip\CPP\Windows\Error.h" />\r
+    <ClInclude Include="..\..\Externals\sevenzip\CPP\Windows\ErrorMsg.h" />\r
     <ClInclude Include="..\..\Externals\sevenzip\CPP\Windows\FileIO.h" />\r
     <ClInclude Include="..\..\Externals\sevenzip\Cpp\Windows\Control\ListView.h" />\r
     <ClInclude Include="..\..\Externals\sevenzip\CPP\Windows\PropVariant.h" />\r
-    <ClInclude Include="..\..\Externals\sevenzip\CPP\Windows\PropVariantConversions.h" />\r
+    <ClInclude Include="..\..\Externals\sevenzip\CPP\Windows\PropVariantConv.h" />\r
     <ClInclude Include="..\..\Externals\sevenzip\CPP\Windows\ResourceString.h" />\r
     <ClInclude Include="..\..\Externals\sevenzip\CPP\Windows\Synchronization.h" />\r
     <ClInclude Include="..\..\Externals\sevenzip\CPP\Common\IntToString.h" />\r
@@ -294,6 +305,7 @@
     <ClInclude Include="..\..\Externals\sevenzip\Cpp\7zip\Ui\Common\EnumDirItems.h" />\r
     <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\UI\FileManager\ExtractCallback.h" />\r
     <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\Common\FileStreams.h" />\r
+    <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\Common\UniqBlocks.h" />\r
     <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\UI\FileManager\FormatUtils.h" />\r
     <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\UI\FileManager\LangUtils.h" />\r
     <ClInclude Include="..\..\Externals\sevenzip\Cpp\7zip\Ui\Common\LoadCodecs.h" />\r
@@ -303,49 +315,53 @@
     <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\UI\FileManager\OverwriteDialog.h" />\r
     <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\UI\FileManager\PasswordDialog.h" />\r
     <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\UI\FileManager\ProgramLocation.h" />\r
+    <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\UI\FileManager\PropertyName.h" />\r
     <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\Common\ProgressUtils.h" />\r
     <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\Common\StreamUtils.h" />\r
+    <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\Compress\CopyCoder.h" />\r
     <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\UI\Common\UpdateCallback.h" />\r
     <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\UI\GUI\UpdateCallbackGUI.h" />\r
+    <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\UI\GUI\UpdateCallbackGUI2.h" />\r
     <ClInclude Include="..\..\Externals\sevenzip\CPP\Windows\Window.h" />\r
     <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\UI\Common\ExtractingFilePath.h" />\r
+    <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\UI\Common\PropIDUTils.h" />\r
+    <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\UI\Common\SetProperties.h" />\r
     <ClInclude Include="..\..\Externals\sevenzip\CPP\Windows\FileDir.h" />\r
     <ClInclude Include="..\..\Externals\sevenzip\CPP\Windows\FileFind.h" />\r
     <ClInclude Include="..\..\Externals\sevenzip\CPP\Windows\FileName.h" />\r
     <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\Common\FilePathAutoRename.h" />\r
+    <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\Common\LimitedStreams.h" />\r
+    <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\Common\StreamObjects.h" />\r
     <ClInclude Include="..\..\Externals\sevenzip\CPP\Common\MyVector.h" />\r
     <ClInclude Include="..\..\Externals\sevenzip\CPP\Common\Wildcard.h" />\r
     <ClInclude Include="..\..\Externals\sevenzip\C\7zCrc.h" />\r
+    <ClInclude Include="..\..\Externals\sevenzip\C\Alloc.h" />\r
+    <ClInclude Include="..\..\Externals\sevenzip\C\CpuArch.h" />\r
     <ClInclude Include="..\..\Externals\sevenzip\C\Threads.h" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClCompile Include="..\..\Externals\sevenzip\C\7zCrcOpt.c">\r
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">NotUsing</PrecompiledHeader>\r
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">NotUsing</PrecompiledHeader>\r
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">NotUsing</PrecompiledHeader>\r
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\Externals\sevenzip\C\CpuArch.c">\r
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">NotUsing</PrecompiledHeader>\r
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">NotUsing</PrecompiledHeader>\r
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">NotUsing</PrecompiledHeader>\r
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>\r
     </ClCompile>\r
     <ClCompile Include="Merge7z907.cpp" />\r
     <ClCompile Include="Merge7zCommon.cpp" />\r
     <ClCompile Include="StdAfx.cpp">\r
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Create</PrecompiledHeader>\r
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">Create</PrecompiledHeader>\r
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">Create</PrecompiledHeader>\r
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">Create</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>\r
     </ClCompile>\r
     <ClCompile Include="tools.cpp" />\r
     <ClCompile Include="..\..\Externals\sevenzip\CPP\Windows\DLL.cpp" />\r
-    <ClCompile Include="..\..\Externals\sevenzip\CPP\Windows\Error.cpp" />\r
+    <ClCompile Include="..\..\Externals\sevenzip\CPP\Windows\ErrorMsg.cpp" />\r
     <ClCompile Include="..\..\Externals\sevenzip\CPP\Windows\FileIO.cpp" />\r
+    <ClCompile Include="..\..\Externals\sevenzip\CPP\Windows\FileLink.cpp" />\r
     <ClCompile Include="..\..\Externals\sevenzip\Cpp\Windows\Control\ListView.cpp" />\r
     <ClCompile Include="..\..\Externals\sevenzip\CPP\Windows\PropVariant.cpp" />\r
-    <ClCompile Include="..\..\Externals\sevenzip\CPP\Windows\PropVariantConversions.cpp" />\r
+    <ClCompile Include="..\..\Externals\sevenzip\CPP\Windows\PropVariantConv.cpp" />\r
     <ClCompile Include="..\..\Externals\sevenzip\CPP\Windows\ResourceString.cpp" />\r
     <ClCompile Include="..\..\Externals\sevenzip\CPP\Windows\Synchronization.cpp" />\r
     <ClCompile Include="..\..\Externals\sevenzip\CPP\Common\IntToString.cpp" />\r
@@ -363,6 +379,7 @@
     <ClCompile Include="..\..\Externals\sevenzip\Cpp\7zip\Ui\Common\EnumDirItems.cpp" />\r
     <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\UI\FileManager\ExtractCallback.cpp" />\r
     <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\Common\FileStreams.cpp" />\r
+    <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\Common\UniqBlocks.cpp" />\r
     <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\UI\FileManager\FormatUtils.cpp" />\r
     <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\UI\FileManager\LangUtils.cpp" />\r
     <ClCompile Include="..\..\Externals\sevenzip\Cpp\7zip\Ui\Common\LoadCodecs.cpp" />\r
@@ -373,38 +390,53 @@
     <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\UI\FileManager\PasswordDialog.cpp" />\r
     <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\UI\FileManager\ProgramLocation.cpp" />\r
     <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\UI\FileManager\ProgressDialog2.cpp" />\r
+    <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\UI\FileManager\PropertyName.cpp" />\r
     <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\Common\ProgressUtils.cpp" />\r
+    <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\Common\PropId.cpp" />\r
     <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\Common\StreamUtils.cpp" />\r
+    <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\Compress\CopyCoder.cpp" />\r
     <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\UI\Common\UpdateCallback.cpp" />\r
     <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\UI\GUI\UpdateCallbackGUI.cpp" />\r
+    <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\UI\GUI\UpdateCallbackGUI2.cpp" />\r
     <ClCompile Include="..\..\Externals\sevenzip\CPP\Windows\Window.cpp" />\r
     <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\Ui\Common\ExtractingFilePath.cpp" />\r
+    <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\UI\Common\PropIDUTils.cpp" />\r
+    <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\UI\Common\SetProperties.cpp" />\r
     <ClCompile Include="..\..\Externals\sevenzip\CPP\Windows\FileDir.cpp" />\r
     <ClCompile Include="..\..\Externals\sevenzip\CPP\Windows\FileFind.cpp" />\r
     <ClCompile Include="..\..\Externals\sevenzip\CPP\Windows\FileName.cpp" />\r
     <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\Common\FilePathAutoRename.cpp" />\r
+    <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\Common\LimitedStreams.cpp" />\r
+    <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\Common\StreamObjects.cpp" />\r
     <ClCompile Include="..\..\Externals\sevenzip\CPP\Common\MyVector.cpp" />\r
     <ClCompile Include="..\..\Externals\sevenzip\CPP\Common\Wildcard.cpp" />\r
     <ClCompile Include="..\..\Externals\sevenzip\C\7zCrc.c">\r
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">NotUsing</PrecompiledHeader>\r
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">NotUsing</PrecompiledHeader>\r
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">NotUsing</PrecompiledHeader>\r
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\Externals\sevenzip\C\Alloc.c">\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\Externals\sevenzip\C\CpuArch.c">\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>\r
     </ClCompile>\r
     <ClCompile Include="..\..\Externals\sevenzip\C\Threads.c">\r
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">NotUsing</PrecompiledHeader>\r
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">NotUsing</PrecompiledHeader>\r
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">NotUsing</PrecompiledHeader>\r
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>\r
     </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ResourceCompile Include="resource_for_vs2013.rc">\r
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">..\..\Externals\sevenzip\CPP\7zip\Ui\Gui;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">..\..\Externals\sevenzip\CPP\7zip\Ui\Gui;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">..\..\Externals\sevenzip\CPP\7zip\Ui\Gui;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">..\..\Externals\sevenzip\CPP\7zip\Ui\Gui;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-    </ResourceCompile>\r
+    <ResourceCompile Include="..\..\Externals\sevenzip\CPP\7zip\Ui\Gui\resource.rc" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <Manifest Include="..\..\Externals\sevenzip\CPP\7zip\Ui\Gui\7zG.exe.manifest" />\r
diff --git a/ArchiveSupport/Merge7z/Merge7z.vcxproj.filters b/ArchiveSupport/Merge7z/Merge7z.vcxproj.filters
index 3e6c9cb..d6fd6ef 100644 (file)
--- a/ArchiveSupport/Merge7z/Merge7z.vcxproj.filters
+++ b/ArchiveSupport/Merge7z/Merge7z.vcxproj.filters
@@ -54,7 +54,7 @@
     <ClInclude Include="..\..\Externals\sevenzip\CPP\Windows\DLL.h">\r
       <Filter>Windows</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\Externals\sevenzip\CPP\Windows\Error.h">\r
+    <ClInclude Include="..\..\Externals\sevenzip\CPP\Windows\ErrorMsg.h">\r
       <Filter>Windows</Filter>\r
     </ClInclude>\r
     <ClInclude Include="..\..\Externals\sevenzip\CPP\Windows\FileIO.h">\r
@@ -66,7 +66,7 @@
     <ClInclude Include="..\..\Externals\sevenzip\CPP\Windows\PropVariant.h">\r
       <Filter>Windows</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\Externals\sevenzip\CPP\Windows\PropVariantConversions.h">\r
+    <ClInclude Include="..\..\Externals\sevenzip\CPP\Windows\PropVariantConv.h">\r
       <Filter>Windows</Filter>\r
     </ClInclude>\r
     <ClInclude Include="..\..\Externals\sevenzip\CPP\Windows\ResourceString.h">\r
@@ -120,6 +120,9 @@
     <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\Common\FileStreams.h">\r
       <Filter>7zip Common</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\Common\UniqBlocks.h">\r
+      <Filter>7zip Common</Filter>\r
+    </ClInclude>\r
     <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\UI\FileManager\FormatUtils.h">\r
       <Filter>7zip Common</Filter>\r
     </ClInclude>\r
@@ -147,24 +150,39 @@
     <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\UI\FileManager\ProgramLocation.h">\r
       <Filter>7zip Common</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\UI\FileManager\PropertyName.h">\r
+      <Filter>7zip Common</Filter>\r
+    </ClInclude>\r
     <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\Common\ProgressUtils.h">\r
       <Filter>7zip Common</Filter>\r
     </ClInclude>\r
     <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\Common\StreamUtils.h">\r
       <Filter>7zip Common</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\Compress\CopyCoder.h">\r
+      <Filter>7zip Common</Filter>\r
+    </ClInclude>\r
     <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\UI\Common\UpdateCallback.h">\r
       <Filter>7zip Common</Filter>\r
     </ClInclude>\r
     <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\UI\GUI\UpdateCallbackGUI.h">\r
       <Filter>7zip Common</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\UI\GUI\UpdateCallbackGUI2.h">\r
+      <Filter>7zip Common</Filter>\r
+    </ClInclude>\r
     <ClInclude Include="..\..\Externals\sevenzip\CPP\Windows\Window.h">\r
       <Filter>7zip Common</Filter>\r
     </ClInclude>\r
     <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\UI\Common\ExtractingFilePath.h">\r
       <Filter>Extract</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\UI\Common\PropIDUTils.h">\r
+      <Filter>Extract</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\UI\Common\SetProperties.h">\r
+      <Filter>Extract</Filter>\r
+    </ClInclude>\r
     <ClInclude Include="..\..\Externals\sevenzip\CPP\Windows\FileDir.h">\r
       <Filter>Extract</Filter>\r
     </ClInclude>\r
@@ -177,6 +195,12 @@
     <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\Common\FilePathAutoRename.h">\r
       <Filter>Extract</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\Common\LimitedStreams.h">\r
+      <Filter>Extract</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\Common\StreamObjects.h">\r
+      <Filter>Extract</Filter>\r
+    </ClInclude>\r
     <ClInclude Include="..\..\Externals\sevenzip\CPP\Common\MyVector.h">\r
       <Filter>Extract</Filter>\r
     </ClInclude>\r
@@ -186,12 +210,15 @@
     <ClInclude Include="..\..\Externals\sevenzip\C\7zCrc.h">\r
       <Filter>C</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\Externals\sevenzip\C\Threads.h">\r
+    <ClInclude Include="..\..\Externals\sevenzip\C\Alloc.h">\r
       <Filter>C</Filter>\r
     </ClInclude>\r
     <ClInclude Include="..\..\Externals\sevenzip\C\CpuArch.h">\r
       <Filter>C</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="..\..\Externals\sevenzip\C\Threads.h">\r
+      <Filter>C</Filter>\r
+    </ClInclude>\r
     <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\UI\GUI\resource.h">\r
       <Filter>Header-Dateien</Filter>\r
     </ClInclude>\r
@@ -212,19 +239,22 @@
     <ClCompile Include="..\..\Externals\sevenzip\CPP\Windows\DLL.cpp">\r
       <Filter>Windows</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\..\Externals\sevenzip\CPP\Windows\Error.cpp">\r
+    <ClCompile Include="..\..\Externals\sevenzip\CPP\Windows\ErrorMsg.cpp">\r
       <Filter>Windows</Filter>\r
     </ClCompile>\r
     <ClCompile Include="..\..\Externals\sevenzip\CPP\Windows\FileIO.cpp">\r
       <Filter>Windows</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="..\..\Externals\sevenzip\CPP\Windows\FileLink.cpp">\r
+      <Filter>Windows</Filter>\r
+    </ClCompile>\r
     <ClCompile Include="..\..\Externals\sevenzip\Cpp\Windows\Control\ListView.cpp">\r
       <Filter>Windows</Filter>\r
     </ClCompile>\r
     <ClCompile Include="..\..\Externals\sevenzip\CPP\Windows\PropVariant.cpp">\r
       <Filter>Windows</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\..\Externals\sevenzip\CPP\Windows\PropVariantConversions.cpp">\r
+    <ClCompile Include="..\..\Externals\sevenzip\CPP\Windows\PropVariantConv.cpp">\r
       <Filter>Windows</Filter>\r
     </ClCompile>\r
     <ClCompile Include="..\..\Externals\sevenzip\CPP\Windows\ResourceString.cpp">\r
@@ -278,6 +308,9 @@
     <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\Common\FileStreams.cpp">\r
       <Filter>7zip Common</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\Common\UniqBlocks.cpp">\r
+      <Filter>7zip Common</Filter>\r
+    </ClCompile>\r
     <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\UI\FileManager\FormatUtils.cpp">\r
       <Filter>7zip Common</Filter>\r
     </ClCompile>\r
@@ -308,24 +341,42 @@
     <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\UI\FileManager\ProgressDialog2.cpp">\r
       <Filter>7zip Common</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\UI\FileManager\PropertyName.cpp">\r
+      <Filter>7zip Common</Filter>\r
+    </ClCompile>\r
     <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\Common\ProgressUtils.cpp">\r
       <Filter>7zip Common</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\Common\PropId.cpp">\r
+      <Filter>7zip Common</Filter>\r
+    </ClCompile>\r
     <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\Common\StreamUtils.cpp">\r
       <Filter>7zip Common</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\Compress\CopyCoder.cpp">\r
+      <Filter>7zip Common</Filter>\r
+    </ClCompile>\r
     <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\UI\Common\UpdateCallback.cpp">\r
       <Filter>7zip Common</Filter>\r
     </ClCompile>\r
     <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\UI\GUI\UpdateCallbackGUI.cpp">\r
       <Filter>7zip Common</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\UI\GUI\UpdateCallbackGUI2.cpp">\r
+      <Filter>7zip Common</Filter>\r
+    </ClCompile>\r
     <ClCompile Include="..\..\Externals\sevenzip\CPP\Windows\Window.cpp">\r
       <Filter>7zip Common</Filter>\r
     </ClCompile>\r
     <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\Ui\Common\ExtractingFilePath.cpp">\r
       <Filter>Extract</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\Ui\Common\PropIDUTils.cpp">\r
+      <Filter>Extract</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\Ui\Common\SetProperties.cpp">\r
+      <Filter>Extract</Filter>\r
+    </ClCompile>\r
     <ClCompile Include="..\..\Externals\sevenzip\CPP\Windows\FileDir.cpp">\r
       <Filter>Extract</Filter>\r
     </ClCompile>\r
@@ -338,6 +389,12 @@
     <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\Common\FilePathAutoRename.cpp">\r
       <Filter>Extract</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\Common\LimitedStreams.cpp">\r
+      <Filter>Extract</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\Common\StreamObjects.cpp">\r
+      <Filter>Extract</Filter>\r
+    </ClCompile>\r
     <ClCompile Include="..\..\Externals\sevenzip\CPP\Common\MyVector.cpp">\r
       <Filter>Extract</Filter>\r
     </ClCompile>\r
@@ -347,19 +404,22 @@
     <ClCompile Include="..\..\Externals\sevenzip\C\7zCrc.c">\r
       <Filter>C</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\..\Externals\sevenzip\C\Threads.c">\r
+    <ClCompile Include="..\..\Externals\sevenzip\C\7zCrcOpt.c">\r
+      <Filter>C</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\Externals\sevenzip\C\Alloc.c">\r
       <Filter>C</Filter>\r
     </ClCompile>\r
     <ClCompile Include="..\..\Externals\sevenzip\C\CpuArch.c">\r
       <Filter>C</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\..\Externals\sevenzip\C\7zCrcOpt.c">\r
+    <ClCompile Include="..\..\Externals\sevenzip\C\Threads.c">\r
       <Filter>C</Filter>\r
     </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ResourceCompile Include="resource_for_vs2013.rc">\r
-      <Filter>Ressourcendateien</Filter>\r
+    <ResourceCompile Include="..\..\Externals\sevenzip\CPP\7zip\Ui\Gui\resource.rc">\r
+      <Filter>Quellcodedateien</Filter>\r
     </ResourceCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
diff --git a/ArchiveSupport/Merge7z/Merge7z907.cpp b/ArchiveSupport/Merge7z/Merge7z907.cpp
index 7787f60..8a221dd 100644 (file)
--- a/ArchiveSupport/Merge7z/Merge7z907.cpp
+++ b/ArchiveSupport/Merge7z/Merge7z907.cpp
@@ -115,7 +115,8 @@ void Format7zDLL::Interface::Inspector::Init(HWND hwndParent)
        {\r
                Complain(ERROR_OPEN_FAILED, path);\r
        }\r
-       if COMPLAIN(archive->Open(file, 0, callback) != S_OK)\r
+       static const UInt64 maxCheckStartPosition = ULLONG_MAX;\r
+       if COMPLAIN(archive->Open(file, &maxCheckStartPosition, callback) != S_OK)\r
        {\r
                Complain(ERROR_CANT_ACCESS_FILE, path);\r
        }\r
@@ -135,7 +136,7 @@ HRESULT Format7zDLL::Interface::Inspector::Extract(HWND hwndParent, LPCTSTR fold
        {\r
                if (*folder)\r
                {\r
-                       if COMPLAIN(!NFile::NDirectory::CreateComplexDirectory(folder))\r
+                       if COMPLAIN(!NFile::NDir::CreateComplexDir(folder))\r
                        {\r
                                Complain(ERROR_CANNOT_MAKE, folder);\r
                        }\r
@@ -145,7 +146,7 @@ HRESULT Format7zDLL::Interface::Inspector::Extract(HWND hwndParent, LPCTSTR fold
 \r
                extractCallbackSpec2->Init();\r
 \r
-               extractCallbackSpec2->OverwriteMode = NExtract::NOverwriteMode::kWithoutPrompt;\r
+               extractCallbackSpec2->OverwriteMode = NExtract::NOverwriteMode::kOverwrite;\r
                extractCallbackSpec2->PasswordIsDefined = passwordIsDefined;\r
                extractCallbackSpec2->Password = password;\r
 \r
@@ -154,9 +155,11 @@ HRESULT Format7zDLL::Interface::Inspector::Extract(HWND hwndParent, LPCTSTR fold
                extractCallbackSpec->InitForMulti\r
                (\r
                        false,\r
-                       NExtract::NPathMode::kFullPathnames,\r
-                       NExtract::NOverwriteMode::kWithoutPrompt\r
+                       NExtract::NPathMode::kFullPaths,\r
+                       NExtract::NOverwriteMode::kOverwrite\r
                );\r
+\r
+               CExtractNtOptions ntOptions;\r
                CArc arc;\r
                arc.Archive = archive;\r
                arc.Path = GetUnicodeString(path);\r
@@ -165,14 +168,14 @@ HRESULT Format7zDLL::Interface::Inspector::Extract(HWND hwndParent, LPCTSTR fold
                arc.SubfileIndex = 0;\r
                extractCallbackSpec->Init\r
                (\r
+                       ntOptions,\r
                        NULL,\r
                        &arc,\r
                        extractCallbackSpec2,\r
                        false,                                                                                  //stdOutMode\r
                        false,                                                                                  //testMode\r
-                       false,                                                                                  //crcMode\r
                        GetUnicodeString(folder),\r
-                       UStringVector(),\r
+                       UStringVector(), false,\r
                        (UInt64)(Int64)-1\r
                );\r
 \r
@@ -299,7 +302,7 @@ HRESULT Format7zDLL::Interface::Updater::Commit(HWND hwndParent)
 \r
                operationChain.Reserve(dirItems.Items.Size());\r
                //\r
-               int i;\r
+               unsigned i;\r
                for (i = 0 ; i < dirItems.Items.Size() ; i++)\r
                {\r
                        pair2.DirIndex = i;\r
diff --git a/ArchiveSupport/Merge7z/Merge7zCommon.cpp b/ArchiveSupport/Merge7z/Merge7zCommon.cpp
index 9c60fa4..f571d57 100755 (executable)
--- a/ArchiveSupport/Merge7z/Merge7zCommon.cpp
+++ b/ArchiveSupport/Merge7z/Merge7zCommon.cpp
@@ -60,12 +60,11 @@ void ReloadLang(); //Implemented in /*/FileManager/LangUtils.cpp
 \r
 using namespace NWindows;\r
 using namespace NFile;\r
-using namespace NName;\r
 \r
 void AddDirFileInfo(\r
        const UString &prefix, \r
        const UString &fullPathName,\r
-       NFind::CFileInfoW &fileInfo, \r
+       NFind::CFileInfo &fileInfo, \r
        CDirItems &dirItems)\r
 {\r
        CDirItem item;\r
@@ -88,15 +87,15 @@ static void EnumerateDirectory(
        const UString &prefix,\r
        CDirItems &dirItems)\r
 {\r
-       NFind::CEnumeratorW enumerator(baseFolderPrefix + directory + wchar_t(kAnyStringWildcard));\r
-       NFind::CFileInfoW fileInfo;\r
+       NFind::CEnumerator enumerator(baseFolderPrefix + directory + L'*');\r
+       NFind::CFileInfo fileInfo;\r
        while (enumerator.Next(fileInfo))\r
        { \r
                AddDirFileInfo(prefix, directory + fileInfo.Name, fileInfo, dirItems);\r
                if (fileInfo.IsDir())\r
                {\r
-                       EnumerateDirectory(baseFolderPrefix, directory + fileInfo.Name + wchar_t(kDirDelimiter),\r
-                       prefix + fileInfo.Name + wchar_t(kDirDelimiter), dirItems);\r
+                       EnumerateDirectory(baseFolderPrefix, directory + fileInfo.Name + WCHAR_PATH_SEPARATOR,\r
+                       prefix + fileInfo.Name + WCHAR_PATH_SEPARATOR, dirItems);\r
                }\r
        }\r
 }\r
@@ -192,7 +191,7 @@ static HMODULE DllProxyHelper(LPCSTR *proxy, ...)
 HRESULT Format7zDLL::Interface::CreateObject(const GUID *interfaceID, void **outObject)\r
 {\r
        PROPVARIANT value;\r
-       HRESULT result = proxy->GetHandlerProperty(NArchive::kClassID, &value);\r
+       HRESULT result = proxy->GetHandlerProperty(NArchive::NHandlerPropID::kClassID, &value);\r
        if SUCCEEDED(result)\r
        {\r
                if (value.vt != VT_BSTR || SysStringByteLen(value.bstrVal) != sizeof(GUID))\r
@@ -242,7 +241,7 @@ HRESULT Format7zDLL::Interface::DeCompressArchive(HWND hwndParent, LPCTSTR path,
        HRESULT result = E_FAIL;\r
        if (Merge7z::Format::Inspector *inspector = Open(hwndParent, path))\r
        {\r
-               if (CMyComBSTR(GetHandlerAddExtension(hwndParent)).Length())\r
+               if (AutoBSTR(GetHandlerAddExtension(hwndParent)).Len())\r
                {\r
                        //Most handlers seem to be happy with missing index array, but rpm\r
                        //handler doesn't know how to "extract all" and needs index array\r
@@ -344,15 +343,15 @@ FILETIME Format7zDLL::Interface::Inspector::LastWriteTime(UINT32 index)
 \r
 void Format7zDLL::Interface::GetDefaultName(HWND hwndParent, UString &ustrDefaultName)\r
 {\r
-       int dot = ustrDefaultName.ReverseFind('.');\r
-       int slash = ustrDefaultName.ReverseFind('\\');\r
+       int dot = ustrDefaultName.ReverseFind(L'.');\r
+       int slash = ustrDefaultName.ReverseFind(L'\\');\r
        if (dot > slash)\r
        {\r
                LPCWSTR pchExtension = ustrDefaultName;\r
                pchExtension += dot + 1;\r
-               static const OLECHAR wBlank[] = L" ";\r
-               CMyComBSTR bstrHandlerExtension = GetHandlerExtension(hwndParent);\r
-               CMyComBSTR bstrHandlerAddExtension = GetHandlerAddExtension(hwndParent);\r
+               static OLECHAR const wBlank[] = L" ";\r
+               AutoBSTR const bstrHandlerExtension = GetHandlerExtension(hwndParent);\r
+               AutoBSTR const bstrHandlerAddExtension = GetHandlerAddExtension(hwndParent);\r
                LPWSTR pchHandlerExtension = bstrHandlerExtension.m_str;\r
                LPWSTR pchHandlerAddExtension = bstrHandlerAddExtension.m_str;\r
                while (int cchHandlerAddExtension = StrCSpnW(pchHandlerAddExtension += StrSpnW(pchHandlerAddExtension, wBlank), wBlank))\r
@@ -360,9 +359,9 @@ void Format7zDLL::Interface::GetDefaultName(HWND hwndParent, UString &ustrDefaul
                        int cchHandlerExtension = StrCSpnW(pchHandlerExtension += StrSpnW(pchHandlerExtension, wBlank), wBlank);\r
                        if (StrIsIntlEqualW(FALSE, pchExtension, pchHandlerExtension, cchHandlerExtension) && pchExtension[cchHandlerExtension] == 0)\r
                        {\r
-                               pchHandlerAddExtension[cchHandlerAddExtension] = '\0'; // will also stop iteration\r
-                               ustrDefaultName.ReleaseBuffer(dot);\r
-                               if (*pchHandlerAddExtension == '.') // consider != '*'\r
+                               pchHandlerAddExtension[cchHandlerAddExtension] = L'\0'; // will also stop iteration\r
+                               ustrDefaultName.ReleaseBuf_SetEnd(dot);\r
+                               if (*pchHandlerAddExtension == L'.') // consider != '*'\r
                                {\r
                                        ustrDefaultName += pchHandlerAddExtension;\r
                                        dot += cchHandlerAddExtension; // make ReleaseBuffer(dot) below a NOP\r
@@ -371,7 +370,7 @@ void Format7zDLL::Interface::GetDefaultName(HWND hwndParent, UString &ustrDefaul
                        pchHandlerExtension += cchHandlerExtension;\r
                        pchHandlerAddExtension += cchHandlerAddExtension;\r
                }\r
-               ustrDefaultName.ReleaseBuffer(dot);\r
+               ustrDefaultName.ReleaseBuf_SetEnd(dot);\r
                ustrDefaultName.Delete(0, slash + 1);\r
        }\r
        else\r
@@ -440,7 +439,7 @@ UINT32 Format7zDLL::Interface::Updater::Add(Merge7z::DirItemEnumerator::Item &et
        if (etorItem.Mask.Item && (etorItem.Mask.Item & (etorItem.Mask.NeedFindFile|etorItem.Mask.CheckIfPresent)) != etorItem.Mask.NeedFindFile)\r
        {\r
                // Check the info from the disk\r
-               NFile::NFind::CFileInfoW fileInfo;\r
+               NFile::NFind::CFileInfo fileInfo;\r
                if (NFile::NFind::CFindFile().FindFirst(FullPath, fileInfo))\r
                {\r
                        if (!(etorItem.Mask.Item & etorItem.Mask.Name))\r
@@ -547,7 +546,7 @@ HRESULT Format7zDLL::Interface::GetHandlerProperty(HWND hwndParent, PROPID propI
 BSTR Format7zDLL::Interface::GetHandlerName(HWND hwndParent)\r
 {\r
        PROPVARIANT value;\r
-       return SUCCEEDED(GetHandlerProperty(hwndParent, NArchive::kName, &value, VT_BSTR)) ? value.bstrVal : 0;\r
+       return SUCCEEDED(GetHandlerProperty(hwndParent, NArchive::NHandlerPropID::kName, &value, VT_BSTR)) ? value.bstrVal : 0;\r
 }\r
 \r
 /**\r
@@ -556,7 +555,7 @@ BSTR Format7zDLL::Interface::GetHandlerName(HWND hwndParent)
 BSTR Format7zDLL::Interface::GetHandlerClassID(HWND hwndParent)\r
 {\r
        PROPVARIANT value;\r
-       return SUCCEEDED(GetHandlerProperty(hwndParent, NArchive::kClassID, &value, VT_BSTR)) ? value.bstrVal : 0;\r
+       return SUCCEEDED(GetHandlerProperty(hwndParent, NArchive::NHandlerPropID::kClassID, &value, VT_BSTR)) ? value.bstrVal : 0;\r
 }\r
 \r
 /**\r
@@ -565,7 +564,7 @@ BSTR Format7zDLL::Interface::GetHandlerClassID(HWND hwndParent)
 BSTR Format7zDLL::Interface::GetHandlerExtension(HWND hwndParent)\r
 {\r
        PROPVARIANT value;\r
-       return SUCCEEDED(GetHandlerProperty(hwndParent, NArchive::kExtension, &value, VT_BSTR)) ? value.bstrVal : 0;\r
+       return SUCCEEDED(GetHandlerProperty(hwndParent, NArchive::NHandlerPropID::kExtension, &value, VT_BSTR)) ? value.bstrVal : 0;\r
 }\r
 \r
 /**\r
@@ -574,7 +573,7 @@ BSTR Format7zDLL::Interface::GetHandlerExtension(HWND hwndParent)
 BSTR Format7zDLL::Interface::GetHandlerAddExtension(HWND hwndParent)\r
 {\r
        PROPVARIANT value;\r
-       return SUCCEEDED(GetHandlerProperty(hwndParent, NArchive::kAddExtension, &value, VT_BSTR)) ? value.bstrVal : 0;\r
+       return SUCCEEDED(GetHandlerProperty(hwndParent, NArchive::NHandlerPropID::kAddExtension, &value, VT_BSTR)) ? value.bstrVal : 0;\r
 }\r
 \r
 /**\r
@@ -583,7 +582,7 @@ BSTR Format7zDLL::Interface::GetHandlerAddExtension(HWND hwndParent)
 VARIANT_BOOL Format7zDLL::Interface::GetHandlerUpdate(HWND hwndParent)\r
 {\r
        PROPVARIANT value;\r
-       return SUCCEEDED(GetHandlerProperty(hwndParent, NArchive::kUpdate, &value, VT_BOOL)) ? value.boolVal : 0;\r
+       return SUCCEEDED(GetHandlerProperty(hwndParent, NArchive::NHandlerPropID::kUpdate, &value, VT_BOOL)) ? value.boolVal : 0;\r
 }\r
 \r
 /**\r
@@ -592,7 +591,7 @@ VARIANT_BOOL Format7zDLL::Interface::GetHandlerUpdate(HWND hwndParent)
 VARIANT_BOOL Format7zDLL::Interface::GetHandlerKeepName(HWND hwndParent)\r
 {\r
        PROPVARIANT value;\r
-       return SUCCEEDED(GetHandlerProperty(hwndParent, NArchive::kKeepName, &value, VT_BOOL)) ? value.boolVal : 0;\r
+       return SUCCEEDED(GetHandlerProperty(hwndParent, NArchive::NHandlerPropID::kKeepName, &value, VT_BOOL)) ? value.boolVal : 0;\r
 }\r
 \r
 /**\r
@@ -653,7 +652,7 @@ struct Format7zDLL::Proxy *Format7zDLL::Proxy::operator->()
                {\r
                        PROPVARIANT value;\r
                        ::VariantInit((LPVARIANT)&value);\r
-                       if (SUCCEEDED(handle.GetHandlerProperty2(--i, NArchive::kClassID, &value)) &&\r
+                       if (SUCCEEDED(handle.GetHandlerProperty2(--i, NArchive::NHandlerPropID::kClassID, &value)) &&\r
                                value.vt == VT_BSTR &&\r
                                SysStringByteLen(value.bstrVal) == sizeof(GUID) &&\r
                                IsEqualGUID(clsId, *value.puuid))\r
@@ -917,21 +916,21 @@ LPCTSTR Merge7z::LoadLang(LPCTSTR langFile)
                }\r
        }\r
        g_LangPath = GetSystemString(g_cPath7z);\r
-       g_LangPath += TEXT("Lang\\");\r
+       g_LangPath += L"Lang\\";\r
        g_LangPath += langFile;\r
-       int slash = g_LangPath.ReverseFind('\\');\r
-       int minus = g_LangPath.ReverseFind('-');\r
-       int dot = g_LangPath.ReverseFind('.');\r
+       int slash = g_LangPath.ReverseFind(L'\\');\r
+       int minus = g_LangPath.ReverseFind(L'-');\r
+       int dot = g_LangPath.ReverseFind(L'.');\r
        if (dot <= slash)\r
        {\r
-               dot = g_LangPath.Length();\r
-               g_LangPath += TEXT(".txt");\r
+               dot = g_LangPath.Len();\r
+               g_LangPath += L".txt";\r
        }\r
        if (minus > slash && !PathFileExists(g_LangPath))\r
        {\r
                // 2nd chance: filename == language code\r
                CSysString Region = g_LangPath.Mid(minus, dot - minus);\r
-               Region.Replace('-', '\\');\r
+               Region.Replace(L'-', L'\\');\r
                g_LangPath.Delete(minus, dot - minus);\r
                if (!PathFileExists(g_LangPath))\r
                {\r
@@ -955,7 +954,21 @@ void ReadRegLang(UString &langFile)
        langFile = GetUnicodeString(g_LangPath);\r
 }\r
 \r
-void SaveRegLang(const UString &langFile)\r
+void SaveRegLang(const UString &)\r
+{\r
+}\r
+\r
+/**\r
+ * @brief Provide substitutes for Read_ShowPassword()/Save_ShowPassword.\r
+ */\r
+#include "7zip/UI/Common/ZipRegistry.h"\r
+\r
+bool NExtract::Read_ShowPassword()\r
+{\r
+       return (g_dwFlags & Merge7z::Initialize::ShowPassword) != 0;\r
+}\r
+\r
+void NExtract::Save_ShowPassword(bool)\r
 {\r
 }\r
 \r
diff --git a/ArchiveSupport/Merge7z/Merge7zCommon.h b/ArchiveSupport/Merge7z/Merge7zCommon.h
index 7d300bc..e370d94 100755 (executable)
--- a/ArchiveSupport/Merge7z/Merge7zCommon.h
+++ b/ArchiveSupport/Merge7z/Merge7zCommon.h
@@ -4,7 +4,7 @@
 #include "7zip/Archive/IArchive.h"\r
 #include "Common/StringConvert.h"\r
 #include "Windows/PropVariant.h"\r
-#include "Windows/PropVariantConversions.h"\r
+#include "Windows/PropVariantConv.h"\r
 #include "Windows/FileDir.h"\r
 #include "Windows/FileFind.h"\r
 \r
@@ -13,8 +13,7 @@
 \r
 // Merge7z includes\r
 #include "tools.h"\r
-#define DllBuild_Merge7z 28\r
-#define DLLPSTUB /##/\r
+#define DllBuild_Merge7z 30\r
 #include "Merge7z.h"\r
 \r
 typedef char SZ_EXTENSION[8];\r
diff --git a/ArchiveSupport/Merge7z/StdAfx.cpp b/ArchiveSupport/Merge7z/StdAfx.cpp
index 8d364ca..fd4f341 100755 (executable)
--- a/ArchiveSupport/Merge7z/StdAfx.cpp
+++ b/ArchiveSupport/Merge7z/StdAfx.cpp
@@ -1,8 +1 @@
-// stdafx.cpp : Quelltextdatei, die nur die Standard-Includes einbindet
-//     Merge7z.pch ist die vorkompilierte Header-Datei
-//     stdafx.obj enthält die vorkompilierte Typinformation
-
 #include "stdafx.h"
-
-// ZU ERLEDIGEN: Verweis auf alle zusätzlichen Header-Dateien, die Sie in STDAFX.H
-// und nicht in dieser Datei benötigen
diff --git a/ArchiveSupport/Merge7z/StdAfx.h b/ArchiveSupport/Merge7z/StdAfx.h
index 2a8fa4f..f11e221 100755 (executable)
--- a/ArchiveSupport/Merge7z/StdAfx.h
+++ b/ArchiveSupport/Merge7z/StdAfx.h
@@ -4,56 +4,7 @@
 #include <commctrl.h>
 #include <basetyps.h>
 #include <vector>
-//<jtuc>
-//-    help 7z sources compile with old SDK headers
-#ifndef GWLP_WNDPROC
-#define INT_PTR int // MS has switched to int
-typedef long LONG_PTR;
-typedef unsigned long ULONG_PTR;
 
-#define GetWindowLongPtrA   GetWindowLongA
-#define GetWindowLongPtrW   GetWindowLongW
-#define SetWindowLongPtrA   SetWindowLongA
-#define SetWindowLongPtrW   SetWindowLongW
+#define LANG
 
-#ifdef UNICODE
-#define GetWindowLongPtr  GetWindowLongPtrW
-#define SetWindowLongPtr  SetWindowLongPtrW
-#else
-#define SetWindowLongPtr  SetWindowLongPtrA
-#define GetWindowLongPtr  GetWindowLongPtrA
-#endif // !UNICODE
-
-#define GWLP_WNDPROC GWL_WNDPROC
-#define GWLP_USERDATA GWL_USERDATA
-#define DWLP_MSGRESULT DWL_MSGRESULT
-
-#define IS_INTRESOURCE(_r) (((ULONG_PTR)(_r) >> 16) == 0)
-
-//#define BIF_NEWDIALOGSTYLE 0
-//#define BTNS_BUTTON 0        
-#endif
-
-#ifndef ListView_SetCheckState
-#define        ListView_SetCheckState(hLv, iItem, bCheck) ListView_SetItemState(hLv, iItem, bCheck ? INDEXTOSTATEIMAGEMASK(2) : INDEXTOSTATEIMAGEMASK(1), LVIS_STATEIMAGEMASK)
-#endif
-
-typedef unsigned short UINT16, *PUINT16;
-//</jtuc>
-
-#define LANG        
-
-// the following defines control how ReadArchiverInfoList() will collect the
-// list of available formats.
-
-/*#define EXCLUDE_COM
-#define FORMAT_7Z
-#define FORMAT_BZIP2
-#define FORMAT_GZIP
-#define FORMAT_TAR
-#define FORMAT_ZIP
-#define FORMAT_CPIO
-#define FORMAT_RPM
-#define FORMAT_ARJ*/
-  
-//#define _SFX
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[1]))
diff --git a/ArchiveSupport/Merge7z/resource_for_vs2013.rc b/ArchiveSupport/Merge7z/resource_for_vs2013.rc
deleted file mode 100644 (file)
index 5022b34..0000000
--- a/ArchiveSupport/Merge7z/resource_for_vs2013.rc
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "windows.h"\r
-#define _WINUSER_    // fix for fatal error RC10056 \r
-#include "../../Externals/sevenzip/CPP/7zip/UI/GUI/resource.rc"\r
diff --git a/ArchiveSupport/Merge7z/revision.txt b/ArchiveSupport/Merge7z/revision.txt
index 0aa8c80..21aca95 100755 (executable)
--- a/ArchiveSupport/Merge7z/revision.txt
+++ b/ArchiveSupport/Merge7z/revision.txt
@@ -64,3 +64,5 @@ VERSION(2,2)
 "*"//2010-04-24        Jochen Neubeck  New formats introduced with 7z459 beta:
 //                                                             XAR, MUB, HFS, DMG, ELF (not sure if they work)
 //                                                             Support 7z465, 7z907, 7z909-7z913
+"*"//2013-02-17        Jochen Neubeck  From now on maintained as part of WinMerge 2011
+"*"//2013-12-01        Jochen Neubeck  Fix inability to open NSIS installers
diff --git a/ArchiveSupport/Merge7z/tools.cpp b/ArchiveSupport/Merge7z/tools.cpp
index 688e59a..fec966b 100755 (executable)
--- a/ArchiveSupport/Merge7z/tools.cpp
+++ b/ArchiveSupport/Merge7z/tools.cpp
@@ -20,21 +20,12 @@ Please mind 2. a) of the GNU General Public License, and log your changes below.
 
 DATE:          BY:                                     DESCRIPTION:
 ==========     ==================      ================================================
-2003/12/09     Jochen Tucht            Created
-2005/02/26     Jochen Tucht            Changed as explained in revision.txt
-2005/08/20     Jochen Tucht            Remove unused EnumList
+2003-12-09     Jochen Tucht            Created
+2005-02-26     Jochen Tucht            Changed as explained in revision.txt
+2005-08-20     Jochen Tucht            Remove unused EnumList
 */
 
 #include "stdafx.h"
-
-#ifndef StrIsIntlEqual
-#ifdef UNICODE
-#define StrIsIntlEqual          StrIsIntlEqualW
-#else
-#define StrIsIntlEqual          StrIsIntlEqualA
-#endif
-#endif
-
 #include "tools.h"
 
 /**
@@ -54,7 +45,7 @@ Complain::Complain(DWORD dwError, LPCTSTR pszContext, HMODULE hContext)
                pszMessage += wsprintf(pszMessage, _T("%.500s"), pszContext);
                if (hContext)
                {
-                       *pszMessage++ = '@';
+                       *pszMessage++ = _T('@');
                        int cch = ::GetModuleFileName(hContext, pszMessage, 500);
                        if (cch == 0)
                        {
@@ -62,8 +53,8 @@ Complain::Complain(DWORD dwError, LPCTSTR pszContext, HMODULE hContext)
                        }
                        pszMessage += cch;
                }
-               *pszMessage++ = ':';
-               *pszMessage++ = '\n';
+               *pszMessage++ = _T(':');
+               *pszMessage++ = _T('\n');
        }
        FormatMessage
        (
@@ -110,4 +101,3 @@ void NTAPI Release(IUnknown *punk)
                }
        }
 }
-
diff --git a/ArchiveSupport/Merge7z/tools.h b/ArchiveSupport/Merge7z/tools.h
index 9fb85e7..731168a 100755 (executable)
--- a/ArchiveSupport/Merge7z/tools.h
+++ b/ArchiveSupport/Merge7z/tools.h
@@ -16,4 +16,14 @@ public:
        int Alert(HWND, UINT = MB_ICONSTOP|MB_TASKMODAL);
 };
 
+class AutoBSTR
+{
+public:
+       AutoBSTR(BSTR str) : m_str(str) { }
+       ~AutoBSTR() { SysFreeString(m_str); }
+       UINT Len() const { return SysStringLen(m_str); }
+       UINT ByteLen() const { return SysStringByteLen(m_str); }
+       BSTR const m_str;
+};
+
 void NTAPI Release(IUnknown *);
diff --git a/Installer/InnoSetup/WinMerge.iss b/Installer/InnoSetup/WinMerge.iss
index 528b77f..d9957af 100755 (executable)
--- a/Installer/InnoSetup/WinMerge.iss
+++ b/Installer/InnoSetup/WinMerge.iss
@@ -424,7 +424,7 @@ Source: ..\..\Build\ShellExtensionUnicode Release MinDependency\ShellExtensionU.
 Source: ..\..\Build\X64\ShellExtensionUnicode Release MinDependency\ShellExtensionX64.dll; DestDir: {app}; Flags: regserver uninsrestartdelete restartreplace promptifolder 64bit; MinVersion: 0,5.01.2600; Check: IsWin64\r
 \r
 ;Please do not reorder the 7z Dlls by version they compress better ordered by platform and then by version\r
-Source: ..\..\Build\MergeUnicodeRelease\Merge7z\Merge7z920U.dll; DestDir: {app}\Merge7z; Flags: promptifolder; MinVersion: 0, 4; Components: ArchiveSupport\r
+Source: ..\..\Build\MergeUnicodeRelease\Merge7z\Merge7z1602U.dll; DestDir: {app}\Merge7z; Flags: promptifolder; MinVersion: 0, 4; Components: ArchiveSupport\r
 Source: ..\..\Build\MergeUnicodeRelease\Merge7z\7z.dll; DestDir: {app}\Merge7z; Flags: promptifolder; MinVersion: 0, 4; Components: ArchiveSupport\r
 Source: ..\..\Build\MergeUnicodeRelease\Merge7z\*.txt; DestDir: {app}\Merge7z; Flags: promptifolder; MinVersion: 0, 4; Components: ArchiveSupport\r
 Source: ..\..\Build\MergeUnicodeRelease\Merge7z\Lang\*.txt; DestDir: {app}\Merge7z\Lang; Flags: promptifolder; MinVersion: 0, 4; Components: ArchiveSupport\r
diff --git a/Installer/InnoSetup/WinMergeX64.iss b/Installer/InnoSetup/WinMergeX64.iss
index c703d2a..ff58f8c 100644 (file)
--- a/Installer/InnoSetup/WinMergeX64.iss
+++ b/Installer/InnoSetup/WinMergeX64.iss
@@ -403,7 +403,7 @@ Source: ..\..\Build\ShellExtensionUnicode Release MinDependency\ShellExtensionU.
 Source: ..\..\Build\X64\ShellExtensionUnicode Release MinDependency\ShellExtensionX64.dll; DestDir: {app}; Flags: regserver uninsrestartdelete restartreplace promptifolder 64bit; MinVersion: 0,5.01.2600; Check: IsWin64\r
 \r
 ;Please do not reorder the 7z Dlls by version they compress better ordered by platform and then by version\r
-Source: ..\..\Build\X64\MergeUnicodeRelease\Merge7z\Merge7z920U.dll; DestDir: {app}\Merge7z; Flags: promptifolder; MinVersion: 0, 4; Components: ArchiveSupport\r
+Source: ..\..\Build\X64\MergeUnicodeRelease\Merge7z\Merge7z1602U.dll; DestDir: {app}\Merge7z; Flags: promptifolder; MinVersion: 0, 4; Components: ArchiveSupport\r
 Source: ..\..\Build\X64\MergeUnicodeRelease\Merge7z\7z.dll; DestDir: {app}\Merge7z; Flags: promptifolder; MinVersion: 0, 4; Components: ArchiveSupport\r
 Source: ..\..\Build\X64\MergeUnicodeRelease\Merge7z\*.txt; DestDir: {app}\Merge7z; Flags: promptifolder; MinVersion: 0, 4; Components: ArchiveSupport\r
 Source: ..\..\Build\X64\MergeUnicodeRelease\Merge7z\Lang\*.txt; DestDir: {app}\Merge7z\Lang; Flags: promptifolder; MinVersion: 0, 4; Components: ArchiveSupport\r
About OSDN
Find Software
Develop Software
Help