OSDN -- 오픈 소스 소프트웨어 개발 및 다운로드
Translation Status of 한국말 translation status for ko
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

winmerge-jp: Commit


Commit MetaInfo

Revisione9ba223a798e43e4bec7d82d486324cb77b3aec9 (tree)
Time2023-02-27 21:21:59
AuthorTakashi Sawanaka <sdottaka@user...>
CommiterTakashi Sawanaka

Log Message

Merge remote-tracking branch 'upstream/master' into jp

Change Summary

Incremental Difference

--- a/DownloadDeps.cmd
+++ b/DownloadDeps.cmd
@@ -11,7 +11,7 @@ if not %ERRORLEVEL% == 0 (
1111 set downloadsdir=%~dp0\build\WinMergeDownloadDeps
1212 set urls_destdirs=^
1313 https://github.com/WinMerge/winmerge/releases/download/winmerge_manual_another_build_tools_v2/winmerge_manual_another_build_tools_v2.zip!Docs\Manual\Tools ^
14-https://github.com/WinMerge/winmerge/releases/download/ShellExtension-1.18.6.0/ShellExtension-1.18.6.0.zip!Build ^
14+https://github.com/WinMerge/winmerge/releases/download/ShellExtension-1.18.7.0/ShellExtension-1.18.7.0.zip!Build ^
1515 https://github.com/WinMerge/winmerge/releases/download/Merge7z2201.0/Merge7z2201.0-x86.zip!Build\x86\Release ^
1616 https://github.com/WinMerge/winmerge/releases/download/Merge7z2201.0/Merge7z2201.0-x64.zip!Build\X64\Release ^
1717 https://github.com/WinMerge/winmerge/releases/download/Merge7z2201.0/Merge7z2201.0-ARM.zip!Build\ARM64\Release ^
--- a/ShellExtension/ShellExtension/ShellExtension.rc
+++ b/ShellExtension/ShellExtension/ShellExtension.rc
@@ -53,8 +53,8 @@ END
5353 //
5454
5555 VS_VERSION_INFO VERSIONINFO
56- FILEVERSION 1,18,6,0
57- PRODUCTVERSION 1,18,6,0
56+ FILEVERSION 1,18,7,0
57+ PRODUCTVERSION 1,18,7,0
5858 FILEFLAGSMASK 0x3fL
5959 #ifdef _DEBUG
6060 FILEFLAGS 0x1L
@@ -71,12 +71,12 @@ BEGIN
7171 BEGIN
7272 VALUE "CompanyName", "https://winmerge.org"
7373 VALUE "FileDescription", "WinMerge Shell Integration library"
74- VALUE "FileVersion", "1.18.6.0"
74+ VALUE "FileVersion", "1.18.7.0"
7575 VALUE "InternalName", "ShellExtension"
7676 VALUE "LegalCopyright", "Copyright 2003-2023"
7777 VALUE "OriginalFilename", "ShellExtension.DLL"
7878 VALUE "ProductName", "WinMerge Shell Integration library"
79- VALUE "ProductVersion", "1.18.6.0"
79+ VALUE "ProductVersion", "1.18.7.0"
8080 END
8181 END
8282 BLOCK "VarFileInfo"
--- a/ShellExtension/WinMergeContextMenu/dllmain.cpp
+++ b/ShellExtension/WinMergeContextMenu/dllmain.cpp
@@ -38,7 +38,7 @@ BOOL APIENTRY DllMain( HMODULE hModule,
3838 return TRUE;
3939 }
4040
41-class WinMergeExplorerCommandBase : public RuntimeClass<RuntimeClassFlags<ClassicCom>, IExplorerCommand, IObjectWithSite>
41+class WinMergeExplorerCommandBase : public RuntimeClass<RuntimeClassFlags<WinRtClassicComMix>, IExplorerCommand, IObjectWithSite>
4242 {
4343 public:
4444 WinMergeExplorerCommandBase(WinMergeContextMenu* pContextMenu) : m_pContextMenu(pContextMenu) {}
@@ -210,7 +210,7 @@ private:
210210 MenuItem m_menuItem;
211211 };
212212
213-class EnumCommands : public RuntimeClass<RuntimeClassFlags<ClassicCom>, IEnumExplorerCommand>
213+class EnumCommands : public RuntimeClass<RuntimeClassFlags<WinRtClassicComMix>, IEnumExplorerCommand>
214214 {
215215 public:
216216 explicit EnumCommands(WinMergeContextMenu* pContextMenu)
--- a/ShellExtension/WinMergePkg/AppxManifest.xml.in
+++ b/ShellExtension/WinMergePkg/AppxManifest.xml.in
@@ -12,7 +12,7 @@
1212 xmlns:uap10="http://schemas.microsoft.com/appx/manifest/uap/windows10/10"
1313 xmlns:com="http://schemas.microsoft.com/appx/manifest/com/windows10"
1414 IgnorableNamespaces="uap uap2 uap3 rescap desktop desktop4 desktop5 desktop6 uap10 com">
15- <Identity Name="WinMerge" ProcessorArchitecture="neutral" Publisher="${Publisher}" Version="1.0.6.0" />
15+ <Identity Name="WinMerge" ProcessorArchitecture="neutral" Publisher="${Publisher}" Version="1.0.7.0" />
1616 <Properties>
1717 <DisplayName>WinMerge</DisplayName>
1818 <PublisherDisplayName>winmerge.org</PublisherDisplayName>
--- a/Src/LineFiltersList.cpp
+++ b/Src/LineFiltersList.cpp
@@ -197,29 +197,3 @@ void LineFiltersList::SaveFilters()
197197 retval2 = m_pOptionsMgr->RemoveOption(filter);
198198 }
199199 }
200-
201-/**
202- * @brief Import old-style filter string into new system.
203- * This function imports old-style (2.6.x and earlier) line filters
204- * to new linefilter system. Earlier linefilters were saved as one
205- * string to registry.
206- * @param [in] filters String containing line filters in old-style.
207- */
208-void LineFiltersList::Import(const String& filters)
209-{
210- if (!filters.empty())
211- {
212- const TCHAR sep[] = _T("\r\n");
213- TCHAR *p_filters = (TCHAR *)&filters[0];
214- TCHAR *pfilterNext = nullptr;
215-
216- // find each regular expression and add to list
217- TCHAR *token = _tcstok_s(p_filters, sep, &pfilterNext);
218- while (token != nullptr)
219- {
220- AddFilter(token, true);
221- token = _tcstok_s(nullptr, sep, &pfilterNext);
222- }
223- SaveFilters();
224- }
225-}
--- a/Src/LineFiltersList.h
+++ b/Src/LineFiltersList.h
@@ -43,8 +43,6 @@ public:
4343 void Initialize(COptionsMgr *pOptionsMgr);
4444 void SaveFilters();
4545
46- void Import(const String& filters);
47-
4846 private:
4947 std::vector<LineFilterItemPtr> m_items; /**< List for linefilter items */
5048 COptionsMgr * m_pOptionsMgr; /**< Options-manager for storage */
--- a/Src/Merge.cpp
+++ b/Src/Merge.cpp
@@ -352,15 +352,6 @@ BOOL CMergeApp::InitInstance()
352352 if (m_pLineFilters != nullptr)
353353 m_pLineFilters->Initialize(GetOptionsMgr());
354354
355- // If there are no filters loaded, and there is filter string in previous
356- // option string, import old filters to new place.
357- if (m_pLineFilters->GetCount() == 0)
358- {
359- String oldFilter = theApp.GetProfileString(_T("Settings"), _T("RegExps"));
360- if (!oldFilter.empty())
361- m_pLineFilters->Import(oldFilter);
362- }
363-
364355 if (m_pSubstitutionFiltersList != nullptr)
365356 m_pSubstitutionFiltersList->Initialize(GetOptionsMgr());
366357
--- a/Src/Merge.vcxproj
+++ b/Src/Merge.vcxproj
@@ -298,7 +298,7 @@
298298 <SDLCheck>true</SDLCheck>
299299 <LanguageStandard>stdcpp17</LanguageStandard>
300300 <DisableSpecificWarnings>4100;4189;4204;4505</DisableSpecificWarnings>
301- <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
301+ <AssemblerOutput>NoListing</AssemblerOutput>
302302 </ClCompile>
303303 <ResourceCompile>
304304 <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -358,7 +358,7 @@
358358 <LanguageStandard>stdcpp17</LanguageStandard>
359359 <DisableSpecificWarnings>4100;4189;4204;4505</DisableSpecificWarnings>
360360 <ControlFlowGuard>Guard</ControlFlowGuard>
361- <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
361+ <AssemblerOutput>NoListing</AssemblerOutput>
362362 </ClCompile>
363363 <ResourceCompile>
364364 <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -414,7 +414,7 @@
414414 <LanguageStandard>stdcpp17</LanguageStandard>
415415 <DisableSpecificWarnings>4100;4189;4204;4505</DisableSpecificWarnings>
416416 <ControlFlowGuard>Guard</ControlFlowGuard>
417- <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
417+ <AssemblerOutput>NoListing</AssemblerOutput>
418418 </ClCompile>
419419 <ResourceCompile>
420420 <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -469,7 +469,7 @@
469469 <LanguageStandard>stdcpp17</LanguageStandard>
470470 <DisableSpecificWarnings>4100;4189;4204;4505</DisableSpecificWarnings>
471471 <ControlFlowGuard>Guard</ControlFlowGuard>
472- <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
472+ <AssemblerOutput>NoListing</AssemblerOutput>
473473 </ClCompile>
474474 <ResourceCompile>
475475 <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1806,4 +1806,4 @@
18061806 <UserProperties RESOURCE_FILE="Merge.rc" />
18071807 </VisualStudio>
18081808 </ProjectExtensions>
1809-</Project>
1809+</Project>
\ No newline at end of file
Show on old repository browser