OSDN Git Service

(root) / winmerge-jp / winmerge-jp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2e85cb3)
ArchiveSupport: Upgrade to 7-Zip 18.05
authorTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sat, 20 Oct 2018 13:08:14 +0000 (22:08 +0900)
committerTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sat, 20 Oct 2018 13:08:14 +0000 (22:08 +0900)
ArchiveSupport/Merge7z/Merge7z.vs2015.vcxproj patch | blob | history
ArchiveSupport/Merge7z/Merge7z.vs2015.vcxproj.filters patch | blob | history
ArchiveSupport/Merge7z/Merge7z.vs2017.vcxproj patch | blob | history
ArchiveSupport/Merge7z/Merge7z.vs2017.vcxproj.filters patch | blob | history
ArchiveSupport/Merge7z/Merge7z907.cpp patch | blob | history
ArchiveSupport/Merge7z/Merge7zCommon.cpp patch | blob | history
ArchiveSupport/Merge7z/StdAfx.h patch | blob | history
Externals/hg_clone.cmd patch | blob | history
Externals/versions.txt patch | blob | history

diff --git a/ArchiveSupport/Merge7z/Merge7z.vs2015.vcxproj b/ArchiveSupport/Merge7z/Merge7z.vs2015.vcxproj
index 6c5df07..6ebb139 100644 (file)
--- a/ArchiveSupport/Merge7z/Merge7z.vs2015.vcxproj
+++ b/ArchiveSupport/Merge7z/Merge7z.vs2015.vcxproj
@@ -80,10 +80,10 @@
     <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'">Merge7z1604U</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Merge7z1604U</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Merge7z1604U</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Merge7z1604U</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Merge7z1805U</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Merge7z1805U</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Merge7z1805U</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Merge7z1805U</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
@@ -187,7 +187,7 @@
     <ClCompile>\r
       <Optimization>MinSpace</Optimization>\r
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
-      <AdditionalIncludeDirectories>..\..\Externals\sevenzip\CPP;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\Externals\sevenzip;..\..\Externals\sevenzip\CPP;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <StringPooling>true</StringPooling>\r
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>\r
@@ -233,7 +233,7 @@
     <ClCompile>\r
       <Optimization>MinSpace</Optimization>\r
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
-      <AdditionalIncludeDirectories>..\..\Externals\sevenzip\CPP;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\Externals\sevenzip;..\..\Externals\sevenzip\CPP;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <StringPooling>true</StringPooling>\r
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>\r
@@ -277,6 +277,7 @@
     <None Include="revision.txt" />\r
   </ItemGroup>\r
   <ItemGroup>\r
+    <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\UI\Common\SortUtils.h" />\r
     <ClInclude Include="Merge7z.h" />\r
     <ClInclude Include="Merge7zCommon.h" />\r
     <ClInclude Include="StdAfx.h" />\r
@@ -340,6 +341,7 @@
     <ClInclude Include="..\..\Externals\sevenzip\C\Threads.h" />\r
   </ItemGroup>\r
   <ItemGroup>\r
+    <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\UI\Common\SortUtils.cpp" />\r
     <ClCompile Include="..\..\Externals\sevenzip\C\7zCrcOpt.c">\r
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>\r
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>\r
@@ -444,4 +446,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r
-</Project>
\ No newline at end of file
+</Project>\r
diff --git a/ArchiveSupport/Merge7z/Merge7z.vs2015.vcxproj.filters b/ArchiveSupport/Merge7z/Merge7z.vs2015.vcxproj.filters
index d6fd6ef..b7f4428 100644 (file)
--- a/ArchiveSupport/Merge7z/Merge7z.vs2015.vcxproj.filters
+++ b/ArchiveSupport/Merge7z/Merge7z.vs2015.vcxproj.filters
@@ -222,6 +222,9 @@
     <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\UI\GUI\resource.h">\r
       <Filter>Header-Dateien</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\UI\Common\SortUtils.h">\r
+      <Filter>7zip Common</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClCompile Include="Merge7z907.cpp">\r
@@ -416,6 +419,9 @@
     <ClCompile Include="..\..\Externals\sevenzip\C\Threads.c">\r
       <Filter>C</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\UI\Common\SortUtils.cpp">\r
+      <Filter>7zip Common</Filter>\r
+    </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ResourceCompile Include="..\..\Externals\sevenzip\CPP\7zip\Ui\Gui\resource.rc">\r
diff --git a/ArchiveSupport/Merge7z/Merge7z.vs2017.vcxproj b/ArchiveSupport/Merge7z/Merge7z.vs2017.vcxproj
index f3406de..a908bee 100644 (file)
--- a/ArchiveSupport/Merge7z/Merge7z.vs2017.vcxproj
+++ b/ArchiveSupport/Merge7z/Merge7z.vs2017.vcxproj
@@ -22,7 +22,7 @@
     <ProjectGuid>{FFB6D02A-782B-48EF-8398-7F8862859616}</ProjectGuid>\r
     <SccProjectName />\r
     <SccLocalPath />\r
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>\r
+    <WindowsTargetPlatformVersion>7.0</WindowsTargetPlatformVersion>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
@@ -79,10 +79,10 @@
     <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'">Merge7z1604U</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Merge7z1604U</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Merge7z1604U</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Merge7z1604U</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Merge7z1805U</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Merge7z1805U</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Merge7z1805U</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Merge7z1805U</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
@@ -186,7 +186,7 @@
     <ClCompile>\r
       <Optimization>MinSpace</Optimization>\r
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
-      <AdditionalIncludeDirectories>..\..\Externals\sevenzip\CPP;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\Externals\sevenzip;..\..\Externals\sevenzip\CPP;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <StringPooling>true</StringPooling>\r
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>\r
@@ -232,7 +232,7 @@
     <ClCompile>\r
       <Optimization>MinSpace</Optimization>\r
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
-      <AdditionalIncludeDirectories>..\..\Externals\sevenzip\CPP;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\Externals\sevenzip;..\..\Externals\sevenzip\CPP;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <StringPooling>true</StringPooling>\r
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>\r
@@ -276,6 +276,7 @@
     <None Include="revision.txt" />\r
   </ItemGroup>\r
   <ItemGroup>\r
+    <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\UI\Common\SortUtils.h" />\r
     <ClInclude Include="Merge7z.h" />\r
     <ClInclude Include="Merge7zCommon.h" />\r
     <ClInclude Include="StdAfx.h" />\r
@@ -339,6 +340,7 @@
     <ClInclude Include="..\..\Externals\sevenzip\C\Threads.h" />\r
   </ItemGroup>\r
   <ItemGroup>\r
+    <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\UI\Common\SortUtils.cpp" />\r
     <ClCompile Include="..\..\Externals\sevenzip\C\7zCrcOpt.c">\r
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>\r
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>\r
diff --git a/ArchiveSupport/Merge7z/Merge7z.vs2017.vcxproj.filters b/ArchiveSupport/Merge7z/Merge7z.vs2017.vcxproj.filters
index d6fd6ef..b7f4428 100644 (file)
--- a/ArchiveSupport/Merge7z/Merge7z.vs2017.vcxproj.filters
+++ b/ArchiveSupport/Merge7z/Merge7z.vs2017.vcxproj.filters
@@ -222,6 +222,9 @@
     <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\UI\GUI\resource.h">\r
       <Filter>Header-Dateien</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\UI\Common\SortUtils.h">\r
+      <Filter>7zip Common</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClCompile Include="Merge7z907.cpp">\r
@@ -416,6 +419,9 @@
     <ClCompile Include="..\..\Externals\sevenzip\C\Threads.c">\r
       <Filter>C</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\UI\Common\SortUtils.cpp">\r
+      <Filter>7zip Common</Filter>\r
+    </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ResourceCompile Include="..\..\Externals\sevenzip\CPP\7zip\Ui\Gui\resource.rc">\r
diff --git a/ArchiveSupport/Merge7z/Merge7z907.cpp b/ArchiveSupport/Merge7z/Merge7z907.cpp
index 8a221dd..1bf1887 100644 (file)
--- a/ArchiveSupport/Merge7z/Merge7z907.cpp
+++ b/ArchiveSupport/Merge7z/Merge7z907.cpp
@@ -74,8 +74,8 @@ public:
                indices(indices),\r
                numItems(numItems)\r
        {\r
-               ExtractCallbackSpec->ProgressDialog = &ProgressDialog;\r
-               ProgressDialog.CompressingMode = false;\r
+               ExtractCallbackSpec->ProgressDialog = this;\r
+               CompressingMode = false;\r
                //result = E_FAIL;\r
                if (HRESULT hr = Create(GetUnicodeString(title), hwndParent))\r
                {\r
@@ -156,7 +156,8 @@ HRESULT Format7zDLL::Interface::Inspector::Extract(HWND hwndParent, LPCTSTR fold
                (\r
                        false,\r
                        NExtract::NPathMode::kFullPaths,\r
-                       NExtract::NOverwriteMode::kOverwrite\r
+                       NExtract::NOverwriteMode::kOverwrite,\r
+                       false\r
                );\r
 \r
                CExtractNtOptions ntOptions;\r
@@ -230,6 +231,7 @@ protected:
 public:\r
        HRESULT result;\r
        UINT32 numItems;\r
+\r
        CThreadUpdating\r
        (\r
                CUpdateCallbackGUI *updateCallbackGUI,\r
@@ -247,7 +249,7 @@ public:
                file(file)\r
        {\r
                result = E_FAIL;\r
-               updateCallbackGUI->ProgressDialog = &ProgressDialog;\r
+               updateCallbackGUI->ProgressDialog = this;\r
                if (HRESULT hr = Create(GetUnicodeString(title), hwndParent))\r
                {\r
                        Complain(hr, NULL);\r
diff --git a/ArchiveSupport/Merge7z/Merge7zCommon.cpp b/ArchiveSupport/Merge7z/Merge7zCommon.cpp
index f571d57..b51176d 100755 (executable)
--- a/ArchiveSupport/Merge7z/Merge7zCommon.cpp
+++ b/ArchiveSupport/Merge7z/Merge7zCommon.cpp
@@ -87,7 +87,8 @@ static void EnumerateDirectory(
        const UString &prefix,\r
        CDirItems &dirItems)\r
 {\r
-       NFind::CEnumerator enumerator(baseFolderPrefix + directory + L'*');\r
+       NFind::CEnumerator enumerator;\r
+       enumerator.SetDirPrefix(baseFolderPrefix + directory);\r
        NFind::CFileInfo fileInfo;\r
        while (enumerator.Next(fileInfo))\r
        { \r
diff --git a/ArchiveSupport/Merge7z/StdAfx.h b/ArchiveSupport/Merge7z/StdAfx.h
index f11e221..775d3d1 100755 (executable)
--- a/ArchiveSupport/Merge7z/StdAfx.h
+++ b/ArchiveSupport/Merge7z/StdAfx.h
@@ -7,4 +7,4 @@
 
 #define LANG
 
-#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[1]))
+#include "../../Externals/sevenzip/CPP/Common/Common.h"
diff --git a/Externals/hg_clone.cmd b/Externals/hg_clone.cmd
index 55e00e3..f054a6e 100644 (file)
--- a/Externals/hg_clone.cmd
+++ b/Externals/hg_clone.cmd
@@ -1,7 +1,7 @@
 set urls_revs=^\r
   https://bitbucket.org/winmerge/freeimage!05e4e65 ^\r
   https://bitbucket.org/winmerge/winimerge!1.0.7.0 ^\r
-  https://bitbucket.org/winmerge/sevenzip!1510f74 ^\r
+  https://bitbucket.org/winmerge/sevenzip!571e08f ^\r
   https://bitbucket.org/winmerge/frhed!7f942c2 ^\r
   https://bitbucket.org/winmerge/patch!b0a7238\r
 \r
diff --git a/Externals/versions.txt b/Externals/versions.txt
index d2d14de..dcedbb8 100644 (file)
--- a/Externals/versions.txt
+++ b/Externals/versions.txt
@@ -10,4 +10,4 @@ freeimage: 3.16.0
 WinIMerge: 1.0.7.0
 Google C++ Testing Framework: 1.70
 GnuWin32 Patch for Windows: 2.5.9-7
-7-zip: 16.04 
+7-zip: 18.05 
About OSDN
Find Software
Develop Software
Help