From f43d10a0a79748f95068d1de58e86205a1ee64be Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Mon, 18 Mar 2019 08:08:51 +0900 Subject: [PATCH] Merge7z: Remvoe version number from DLL file name --HG-- branch : stable --- ArchiveSupport/Merge7z/Merge7z.vs2015.vcxproj | 8 ++++---- ArchiveSupport/Merge7z/Merge7z.vs2017.vcxproj | 8 ++++---- ArchiveSupport/Merge7z/Merge7z.vs2019.vcxproj | 8 ++++---- BuildArc.cmd | 2 +- Installer/InnoSetup/WinMerge.iss | 2 +- Installer/InnoSetup/WinMergeX64.iss | 2 +- Src/7zCommon.cpp | 6 ++---- 7 files changed, 17 insertions(+), 19 deletions(-) diff --git a/ArchiveSupport/Merge7z/Merge7z.vs2015.vcxproj b/ArchiveSupport/Merge7z/Merge7z.vs2015.vcxproj index 57ffadc77..333c43109 100644 --- a/ArchiveSupport/Merge7z/Merge7z.vs2015.vcxproj +++ b/ArchiveSupport/Merge7z/Merge7z.vs2015.vcxproj @@ -80,10 +80,10 @@ ..\..\BuildTmp\$(ProjectName)\$(Platform)\$(Configuration)/ false false - Merge7z1806U - Merge7z1806U - Merge7z1806U - Merge7z1806U + Merge7z + Merge7z + Merge7z + Merge7z C:\Program Files (x86)\Microsoft Visual Studio 14.0\Team Tools\Static Analysis Tools\Rule Sets\NativeRecommendedRules.ruleset diff --git a/ArchiveSupport/Merge7z/Merge7z.vs2017.vcxproj b/ArchiveSupport/Merge7z/Merge7z.vs2017.vcxproj index a519bd50a..3bb046d68 100644 --- a/ArchiveSupport/Merge7z/Merge7z.vs2017.vcxproj +++ b/ArchiveSupport/Merge7z/Merge7z.vs2017.vcxproj @@ -83,10 +83,10 @@ ..\..\BuildTmp\$(ProjectName)\$(Platform)\$(Configuration)/ false false - Merge7z1806U - Merge7z1806U - Merge7z1806U - Merge7z1806U + Merge7z + Merge7z + Merge7z + Merge7z C:\Program Files (x86)\Microsoft Visual Studio 14.0\Team Tools\Static Analysis Tools\Rule Sets\NativeRecommendedRules.ruleset diff --git a/ArchiveSupport/Merge7z/Merge7z.vs2019.vcxproj b/ArchiveSupport/Merge7z/Merge7z.vs2019.vcxproj index dc05ace40..76f939074 100644 --- a/ArchiveSupport/Merge7z/Merge7z.vs2019.vcxproj +++ b/ArchiveSupport/Merge7z/Merge7z.vs2019.vcxproj @@ -83,10 +83,10 @@ ..\..\BuildTmp\$(ProjectName)\$(Platform)\$(Configuration)/ false false - Merge7z1806U - Merge7z1806U - Merge7z1806U - Merge7z1806U + Merge7z + Merge7z + Merge7z + Merge7z C:\Program Files (x86)\Microsoft Visual Studio 14.0\Team Tools\Static Analysis Tools\Rule Sets\NativeRecommendedRules.ruleset diff --git a/BuildArc.cmd b/BuildArc.cmd index a55e5f6de..b3e33930a 100644 --- a/BuildArc.cmd +++ b/BuildArc.cmd @@ -81,7 +81,7 @@ del "%DISTDIR%\%PLATFORMH%zip-version\WinMerge\MergePlugins\Watch*OfLog.dll" 2> del "%DISTDIR%\%PLATFORMH%zip-version\WinMerge\MergePlugins\DisplayXMLFiles.dll" 2> NUL rem 7zPlugins -copy Build\%PLATFORM%\Merge7z\Merge7z*.dll "%DISTDIR%\%PLATFORMH%zip-version\WinMerge\Merge7z\" +copy Build\%PLATFORM%\Merge7z\Merge7z.dll "%DISTDIR%\%PLATFORMH%zip-version\WinMerge\Merge7z\" copy Build\%PLATFORM%\Merge7z\7z.dll "%DISTDIR%\%PLATFORMH%zip-version\WinMerge\Merge7z\" copy Build\%PLATFORM%\Merge7z\*.txt "%DISTDIR%\%PLATFORMH%zip-version\WinMerge\Merge7z\" copy Build\%PLATFORM%\Merge7z\Lang\*.txt "%DISTDIR%\%PLATFORMH%zip-version\WinMerge\Merge7z\Lang\" diff --git a/Installer/InnoSetup/WinMerge.iss b/Installer/InnoSetup/WinMerge.iss index dcba85684..77693a900 100755 --- a/Installer/InnoSetup/WinMerge.iss +++ b/Installer/InnoSetup/WinMerge.iss @@ -435,7 +435,7 @@ Source: ..\..\Build\ShellExtension\ShellExtensionU.dll; DestDir: {app}; Flags: r Source: ..\..\Build\ShellExtension\ShellExtensionX64.dll; DestDir: {app}; Flags: regserver uninsrestartdelete restartreplace promptifolder 64bit; MinVersion: 0,5.01.2600; Check: IsWin64 ;Please do not reorder the 7z Dlls by version they compress better ordered by platform and then by version -Source: ..\..\Build\Merge7z\Merge7z1806U.dll; DestDir: {app}\Merge7z; Flags: promptifolder; MinVersion: 0, 4; Components: ArchiveSupport +Source: ..\..\Build\Merge7z\Merge7z.dll; DestDir: {app}\Merge7z; Flags: promptifolder; MinVersion: 0, 4; Components: ArchiveSupport Source: ..\..\Build\Merge7z\7z.dll; DestDir: {app}\Merge7z; Flags: promptifolder; MinVersion: 0, 4; Components: ArchiveSupport Source: ..\..\Build\Merge7z\*.txt; DestDir: {app}\Merge7z; Flags: promptifolder; MinVersion: 0, 4; Components: ArchiveSupport Source: ..\..\Build\Merge7z\Lang\*.txt; DestDir: {app}\Merge7z\Lang; Flags: promptifolder; MinVersion: 0, 4; Components: ArchiveSupport diff --git a/Installer/InnoSetup/WinMergeX64.iss b/Installer/InnoSetup/WinMergeX64.iss index d55a00735..fdeb84bd7 100644 --- a/Installer/InnoSetup/WinMergeX64.iss +++ b/Installer/InnoSetup/WinMergeX64.iss @@ -414,7 +414,7 @@ Source: ..\..\Build\ShellExtension\ShellExtensionU.dll; DestDir: {app}; Flags: r Source: ..\..\Build\ShellExtension\ShellExtensionX64.dll; DestDir: {app}; Flags: regserver uninsrestartdelete restartreplace promptifolder 64bit; MinVersion: 0,5.01.2600; Check: IsWin64 ;Please do not reorder the 7z Dlls by version they compress better ordered by platform and then by version -Source: ..\..\Build\X64\Merge7z\Merge7z1806U.dll; DestDir: {app}\Merge7z; Flags: promptifolder; MinVersion: 0, 4; Components: ArchiveSupport +Source: ..\..\Build\X64\Merge7z\Merge7z.dll; DestDir: {app}\Merge7z; Flags: promptifolder; MinVersion: 0, 4; Components: ArchiveSupport Source: ..\..\Build\X64\Merge7z\7z.dll; DestDir: {app}\Merge7z; Flags: promptifolder; MinVersion: 0, 4; Components: ArchiveSupport Source: ..\..\Build\X64\Merge7z\*.txt; DestDir: {app}\Merge7z; Flags: promptifolder; MinVersion: 0, 4; Components: ArchiveSupport Source: ..\..\Build\X64\Merge7z\Lang\*.txt; DestDir: {app}\Merge7z\Lang; Flags: promptifolder; MinVersion: 0, 4; Components: ArchiveSupport diff --git a/Src/7zCommon.cpp b/Src/7zCommon.cpp index ccd9b6506..123fda8ae 100644 --- a/Src/7zCommon.cpp +++ b/Src/7zCommon.cpp @@ -119,7 +119,7 @@ DATE: BY: DESCRIPTION: static __declspec(thread) Merge7z::Proxy m_Merge7z = { { 0, 0, DllBuild_Merge7z, }, - "Merge7z\\Merge7z%u%02u" DECORATE_U ".dll", + "Merge7z\\Merge7z.dll", "Merge7z", nullptr }; @@ -288,9 +288,7 @@ interface Merge7z *Merge7z::Proxy::operator->() throw new CResourceException(); if (DWORD ver = VersionOf7z()) { - char name[MAX_PATH]; - wsprintfA(name, format, UINT HIWORD(ver), UINT LOWORD(ver)); - Merge7z[0] = name; + Merge7z[0] = format; stub.Load(); } else -- 2.11.0