OSDN Git Service
Takashi Sawanaka [Thu, 15 Jul 2021 23:35:40 +0000 (08:35 +0900)]
Improve plugin system (editor script) (#871)
Takashi Sawanaka [Thu, 15 Jul 2021 12:12:23 +0000 (21:12 +0900)]
Fix issue #878: Installer integrates with TortoiseGit and TortoiseSVN despite being told not to
Takashi Sawanaka [Thu, 15 Jul 2021 00:03:45 +0000 (09:03 +0900)]
Fix issue #876' Registry key with "Executable" and "ContextMenuEnabled" left behind when using an INI file for options
Tichij [Wed, 14 Jul 2021 14:03:06 +0000 (17:03 +0300)]
Update of Lithuanian translation (#875)
Takashi Sawanaka [Tue, 13 Jul 2021 23:50:50 +0000 (08:50 +0900)]
Implement issue #772: Add preference option to clear "Don't ask this question again" CompareLargeFiles choice (3)
Hugo Carvalho [Tue, 13 Jul 2021 00:24:13 +0000 (01:24 +0100)]
Update Portuguese.po (#872)
Takashi Sawanaka [Mon, 12 Jul 2021 11:45:03 +0000 (20:45 +0900)]
Add /inifile command line option (2) related to https://github.com/WinMerge/winmerge/issues/248#issuecomment-
878083136
Takashi Sawanaka [Mon, 12 Jul 2021 00:17:03 +0000 (09:17 +0900)]
Update manual
Mr-Update [Sun, 11 Jul 2021 20:39:39 +0000 (22:39 +0200)]
Update German.po (#870)
Translation completed
Takashi Sawanaka [Sun, 11 Jul 2021 14:16:47 +0000 (23:16 +0900)]
ConfigLog.cpp: Do not output the path of the plugin described in Plugins.xml or the automatically generated plugin
Takashi Sawanaka [Sun, 11 Jul 2021 13:28:59 +0000 (22:28 +0900)]
Code scanning alerts 168,169: Unused static variable
Takashi Sawanaka [Sun, 11 Jul 2021 13:06:09 +0000 (22:06 +0900)]
Cppcheck: CWE: 398: Class 'CRegOptionsMgr' does not have a copy constructor which is recommended since it has dynamic memory/resource allocation(s).
Takashi Sawanaka [Sun, 11 Jul 2021 12:59:23 +0000 (21:59 +0900)]
Cppcheck: The function 'SetUnpacker' overrides a function in a base class but is not marked with a 'override' specifier.
Takashi Sawanaka [Sun, 11 Jul 2021 12:53:49 +0000 (21:53 +0900)]
Cppcheck: CWE: 398: Class '...' has a constructor with 1 argument that is not explicit. Such constructors should in general be explicit for type safety reasons. Using the explicit keyword in the constructor means some mistakes when using the class can be avoided.
Takashi Sawanaka [Sun, 11 Jul 2021 12:50:29 +0000 (21:50 +0900)]
Cppcheck: CWE: 398: Parameter 'textValue' can be declared with const
Takashi Sawanaka [Sun, 11 Jul 2021 12:46:27 +0000 (21:46 +0900)]
Cppcheck: CWE: 398: Parameter 'events' is passed by value. It could be passed as a const reference which is usually faster and recommended in C++.
Takashi Sawanaka [Sun, 11 Jul 2021 12:43:48 +0000 (21:43 +0900)]
Cppcheck: CWE: 563: Variable 'colnum' is assigned a value that is never used.
LMS [Sun, 11 Jul 2021 12:09:53 +0000 (14:09 +0200)]
Galician translation update (#869)
* Update Galician.po
* Update Galician.po
* Update Galician.po
Galician translation update and corrections
* Galician translation update
* Galician translation update
* Galician translation update
Takashi Sawanaka [Sun, 11 Jul 2021 09:13:01 +0000 (18:13 +0900)]
Add /inifile command line option
Takashi Sawanaka [Sun, 11 Jul 2021 04:16:33 +0000 (13:16 +0900)]
Fix winmerge/winimerge issue #20: winmerge shows (differences) rotated image
Takashi Sawanaka [Fri, 9 Jul 2021 13:58:33 +0000 (22:58 +0900)]
Fix issue #834: Incorrect comparison (2)
This bug occurs when enabling both the 'Ignore blank lines' option and the 'Completely unhighlight the ignored differences' option.
Takashi Sawanaka [Fri, 9 Jul 2021 12:38:04 +0000 (21:38 +0900)]
Add PrettifyYAML and QueryYAML plugins (3)
Takashi Sawanaka [Thu, 8 Jul 2021 13:34:14 +0000 (22:34 +0900)]
Add PrettifyYAML and QueryYAML plugins (2)
Takashi Sawanaka [Thu, 8 Jul 2021 13:30:13 +0000 (22:30 +0900)]
Add PrettifyYAML and QueryYAML plugins
Takashi Sawanaka [Wed, 7 Jul 2021 23:49:04 +0000 (08:49 +0900)]
Fix code scanning alerts 464, 467, 468: Missing header guard
Takashi Sawanaka [Wed, 7 Jul 2021 23:34:30 +0000 (08:34 +0900)]
Fix issue #864: Improvement: Add check and error mesage in DownloadDeps.cmd that path to 7-zip exists
Takashi Sawanaka [Wed, 7 Jul 2021 14:31:57 +0000 (23:31 +0900)]
Use its q command even if it exists in the {WinMergeU.exe folder}\Command\q folder. (The same goes for Apache Tika.)
Tichij [Wed, 7 Jul 2021 13:02:24 +0000 (16:02 +0300)]
Update of Lithuanian translation (#866)
Takashi Sawanaka [Wed, 7 Jul 2021 12:59:39 +0000 (21:59 +0900)]
Implement issue #772: Add preference option to clear "Don't ask this question again" CompareLargeFiles choice (2)
Takashi Sawanaka [Wed, 7 Jul 2021 00:06:39 +0000 (09:06 +0900)]
Fix code scanning alerts 36-40: Catching by value
Takashi Sawanaka [Tue, 6 Jul 2021 23:58:45 +0000 (08:58 +0900)]
Implement issue #772: Add preference option to clear "Don't ask … (#859)
Implement issue #772: Add preference option to clear "Don't ask this question again" CompareLargeFiles choice
Takashi Sawanaka [Tue, 6 Jul 2021 00:41:32 +0000 (09:41 +0900)]
Fix WinMerge/winmerge#862: ALL.vs2019.sln cl : command line warning D9035: option 'Gm' has been deprecated and will be removed in a future release (2)
Takashi Sawanaka [Tue, 6 Jul 2021 00:41:09 +0000 (09:41 +0900)]
Fix issue #862: ALL.vs2019.sln cl : command line warning D9035: option 'Gm' has been deprecated and will be removed in a future release
Takashi Sawanaka [Mon, 5 Jul 2021 13:19:38 +0000 (22:19 +0900)]
Fix issue #861: Project: heksedit cl : command line warning D9002: ignoring unknown option '/arch:SSE'
Mr-Update [Sun, 4 Jul 2021 22:24:44 +0000 (00:24 +0200)]
Update German.po (#860)
Takashi Sawanaka [Sun, 4 Jul 2021 12:59:17 +0000 (21:59 +0900)]
Update Slovenian translation. Submited by JadranR
Jun Tajima [Sun, 4 Jul 2021 10:39:16 +0000 (19:39 +0900)]
Fix an issue where a file is deselected when returning to the folder compare window after opening the file compare window by double-clicking the file in the folder compare window. (#857)
- CDirView::OnLButtonDblClk() now executes CListView::OnLButtonDblClk() only when it is in focus.
Takashi Sawanaka [Sat, 3 Jul 2021 14:38:44 +0000 (23:38 +0900)]
Fix code scaning alerts 189-191: 'new[]' array freed with 'delete'
Takashi Sawanaka [Sat, 3 Jul 2021 13:07:38 +0000 (22:07 +0900)]
Fix Code scanning alerts #652-661: Constant return type on member
efi99 [Sat, 3 Jul 2021 11:15:12 +0000 (13:15 +0200)]
Updated hungarian.po (#856)
* Update Hungarian.po
* Update Hungarian.po
Takashi Sawanaka [Sat, 3 Jul 2021 05:46:39 +0000 (14:46 +0900)]
Feature request #232: Right click context menu - Compare files or folders in a new tab (Fix issue #277: Subfolder context menu -> Compare destroys existing results)
Takashi Sawanaka [Sat, 3 Jul 2021 03:54:04 +0000 (12:54 +0900)]
There is a problem that OleUninitialize() in mfc/oleinit.cpp, which is called just before the process exits, hangs in rare cases.
To deal with this problem, force the process to exit if the process does not exit within 2 seconds after the call to CMergeApp::ExitInstance().
Takashi Sawanaka [Fri, 2 Jul 2021 13:32:38 +0000 (22:32 +0900)]
Fix issue #855: x64: LINK : warning LNK4010: invalid subsystem version number 5.01; default subsystem version assumed
Takashi Sawanaka [Thu, 1 Jul 2021 23:02:08 +0000 (08:02 +0900)]
BuildArc.cmd: Add Version.in to winmerge-x.x.x-full-src.7z
Takashi Sawanaka [Thu, 1 Jul 2021 15:08:13 +0000 (00:08 +0900)]
FolderCompare.vcxproj: use shared items projects (2)
Takashi Sawanaka [Thu, 1 Jul 2021 14:43:01 +0000 (23:43 +0900)]
FolderCompare.vcxproj: use shared items projects
Takashi Sawanaka [Thu, 1 Jul 2021 12:41:39 +0000 (21:41 +0900)]
Fix issue #853: CString rangestr = (argc > 0) ? argv[0] : GetColumnRangeString();
(Fix the problem that the value specified in the setting dialog is not used when the argument is not taken to the IgnoreColumns, IgnoreFieldsComma, IgnoreFieldsTab plugin.)
Takashi Sawanaka [Thu, 1 Jul 2021 12:07:39 +0000 (21:07 +0900)]
CompareMSExcelFiles.sct: Fix an issue where "This picture only contains a bitmap" is displayed when comparing Excel files that contain shapes. Submitted by Shirai
Takashi Sawanaka [Thu, 1 Jul 2021 00:06:30 +0000 (09:06 +0900)]
Fix issue #841 WinMerge doesn't build under Visual Studio 16.10.2
(See https://developercommunity.visualstudio.com/t/Build-fails-with-internal-compiler-erro/
1367077)
Takashi Sawanaka [Mon, 28 Jun 2021 14:39:51 +0000 (23:39 +0900)]
Update manual
StoyanDimitrov [Mon, 28 Jun 2021 12:05:07 +0000 (12:05 +0000)]
Update Bulgarian (#850)
Tichij [Mon, 28 Jun 2021 11:48:04 +0000 (14:48 +0300)]
Update of Lithuanian translation (#849)
Takashi Sawanaka [Sun, 27 Jun 2021 13:38:55 +0000 (22:38 +0900)]
Folder compare: Fix crash when disabling plugins
Takashi Sawanaka [Sun, 27 Jun 2021 12:13:05 +0000 (21:13 +0900)]
resource.h: Add IDS_PLUGIN_DESCRIPTION*
Takashi Sawanaka [Sun, 27 Jun 2021 09:16:49 +0000 (18:16 +0900)]
editor addin.sct: Add ReverseColumns, ReverseLines and Replace function (2)
Kaya Zeren [Sat, 26 Jun 2021 22:47:45 +0000 (01:47 +0300)]
Turkish translation 2.16.13 update (#848)
* Turkish translation update for 2.16.12
Turkish translation update for 2.16.12
* 2.16.13 update
2.16.13 update
Takashi Sawanaka [Sat, 26 Jun 2021 08:23:07 +0000 (17:23 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge
Takashi Sawanaka [Sat, 26 Jun 2021 08:22:44 +0000 (17:22 +0900)]
Make the plugin description translatable
Takashi Sawanaka [Sat, 26 Jun 2021 08:21:55 +0000 (17:21 +0900)]
editor addmin.sc: Add ReverseColumns, ReverseLines and Replace function
wvxwxvw [Fri, 25 Jun 2021 21:30:57 +0000 (00:30 +0300)]
Update Russian.po (#847)
Hugo Carvalho [Fri, 25 Jun 2021 13:13:15 +0000 (14:13 +0100)]
Update Portuguese translation (#846)
efi99 [Fri, 25 Jun 2021 12:21:10 +0000 (14:21 +0200)]
Patch 7 (hungarian lang update 2.16.13) (#845)
* Update Hungarian.po
* Update Hungarian.po
Svetoslav Zlatkov [Fri, 25 Jun 2021 12:20:24 +0000 (15:20 +0300)]
Resolves: Add continuous code security and quality analysis (#844)
* add minimal CodeQL
* add minimal CodeQL using project's build instructions
* building with project's instructions
* test build with minimal CodeQL
* run pipeline on windows os.
* minimal CodeQL test with autobuild on windows
* add minimal CodeQL with project's build instructions
* add CodeQL with security-and-quality queries
* run on ubuntu and add pwsh to build step
* change building platform to windows
* change the runner platform to ubuntu
* change the build platform to windows
* Update codeql-analysis.yml
Co-authored-by: aleks-ivanov <aleksandar.ivanov@singlet.dev>
Co-authored-by: Aleksandar Ivanov <74899441+aleks-ivanov@users.noreply.github.com>
Takashi Sawanaka [Thu, 24 Jun 2021 13:38:08 +0000 (22:38 +0900)]
Add PluginTests.vbs
Takashi Sawanaka [Thu, 24 Jun 2021 12:50:54 +0000 (21:50 +0900)]
editr addin.sct: Add SelectLines function
Thomas De Rocker [Thu, 24 Jun 2021 12:47:00 +0000 (14:47 +0200)]
Update Dutch.po (#842)
Takashi Sawanaka [Thu, 24 Jun 2021 00:03:31 +0000 (09:03 +0900)]
editr addin.sct: Add SelectColumns function
Takashi Sawanaka [Wed, 23 Jun 2021 14:53:34 +0000 (23:53 +0900)]
Load not only the plugins stored in the Program Files\WinMerge\MergePlugins folder, but also the plugins stored in the % APPDATA%\WinMerge\MergePlugins folder
Takashi Sawanaka [Wed, 23 Jun 2021 14:49:35 +0000 (23:49 +0900)]
Merge remote-tracking branch 'origin/master'
Takashi Sawanaka [Wed, 23 Jun 2021 14:49:15 +0000 (23:49 +0900)]
Fix 'No prediffer (normal)' menu item being marked in the Prediffer menu after selecting prediffer from the Apply Prediffer menu item
Tichij [Wed, 23 Jun 2021 14:38:39 +0000 (17:38 +0300)]
Update of Lithuanian translation (#840)
Takashi Sawanaka [Tue, 22 Jun 2021 13:38:52 +0000 (22:38 +0900)]
Plugins: Fix a crash on Window XP
https://stackoverflow.com/questions/
32633398/crash-in-catlstringmgrgetinstance-under-windows-xp/
32953859#
32953859
Takashi Sawanaka [Tue, 22 Jun 2021 12:21:01 +0000 (21:21 +0900)]
DownloadDeps.cmd: Download tidy.exe which supports Windows XP
Takashi Sawanaka [Tue, 22 Jun 2021 11:27:30 +0000 (20:27 +0900)]
q,bat: QueryCSV and QueryTSV plugins are only supported on x64 systems
Takashi Sawanaka [Tue, 22 Jun 2021 00:16:20 +0000 (09:16 +0900)]
Add jq and tidy-html5 submodules
Takashi Sawanaka [Mon, 21 Jun 2021 23:52:51 +0000 (08:52 +0900)]
Bump revision to 2.16.13
Takashi Sawanaka [Mon, 21 Jun 2021 23:43:55 +0000 (08:43 +0900)]
Improve plugin system (#797) (6)
Takashi Sawanaka [Mon, 21 Jun 2021 15:17:59 +0000 (00:17 +0900)]
Update changelog&releasenotes (2)
Takashi Sawanaka [Mon, 21 Jun 2021 15:17:39 +0000 (00:17 +0900)]
Improve plugin system (#797) (5)
Takashi Sawanaka [Mon, 21 Jun 2021 13:34:50 +0000 (22:34 +0900)]
Register.bat, RegisterPerUser.bat: Add /s option for silent registration
Takashi Sawanaka [Mon, 21 Jun 2021 12:48:15 +0000 (21:48 +0900)]
Improve plugin system (#797) (4)
Takashi Sawanaka [Mon, 21 Jun 2021 11:19:34 +0000 (20:19 +0900)]
Fix issue #834: Incorrect comparison
This bug occurs when enabling both the 'Ignore blank lines' option and the 'Completely unhighlight the ignored differences' option.
Takashi Sawanaka [Sun, 20 Jun 2021 14:46:20 +0000 (23:46 +0900)]
Update changelog&releasenotes
Takashi Sawanaka [Sun, 20 Jun 2021 13:43:27 +0000 (22:43 +0900)]
Improve plugin system (#797) (3)
Takashi Sawanaka [Sun, 20 Jun 2021 12:57:09 +0000 (21:57 +0900)]
Improve plugin system (#797) (2)
Takashi Sawanaka [Sun, 20 Jun 2021 08:12:00 +0000 (17:12 +0900)]
Improve plugin system (#797)
- Add categorized Unpacker plugin menu items to various menus
- Select Files or Folders window
![image](https://user-images.githubusercontent.com/98126/
122665970-
85f3de80-d1e5-11eb-8ffb-
5182652326c3.png)
- Folder Compare window
![image](https://user-images.githubusercontent.com/98126/
122665994-
b471b980-d1e5-11eb-87e8-
4b91a15bd8a7.png)
- File Compare window
![image](https://user-images.githubusercontent.com/98126/
122664730-
23e3ab00-d1de-11eb-99c7-
285596efaf9d.png)
![image](https://user-images.githubusercontent.com/98126/
122666029-
ee42c000-d1e5-11eb-922e-
b047d74c43fb.png)
- Make it possible to specify multiple Unpacker/Prediffer plugins by concatenating them with `|` and to specify arguments.
e.g. `ExecFilterCommand sort | MakeUpper`
![image](https://user-images.githubusercontent.com/98126/
122665171-
aa998780-d1e0-11eb-9f88-
deae7da2c6e5.png)
- Allow Unpacker/Prediffer plugins to be specified for multiple files at once in Folder Compare window. The specified plugin will be visible in the Unpacker and Prediffer columns
![image](https://user-images.githubusercontent.com/98126/
122666428-
116e6f00-d1e8-11eb-9cc5-
554285c8460e.png)
![image](https://user-images.githubusercontent.com/98126/
122664824-
ad937880-d1de-11eb-9699-
18132231d11e.png)
- Add "(U)" to the tab title when using the Unpacker plugin. Also, add "(P)" to the tab title when using the Prediffer plugin
![image](https://user-images.githubusercontent.com/98126/
122665422-
12040700-d1e2-11eb-9b31-
746eb8a79cf9.png)
- Allow the plugin settings dialog to specify default arguments that will be used when no plugin arguments are specified
- Allow plugins used by Automatic Unpacking/Prediffing to be excluded in the plugin settings dialog
![image](https://user-images.githubusercontent.com/98126/
122665573-
f816f400-d1e2-11eb-964e-
accbd09734ba.png)
- New unpacker plugins
- ApacheTika (Apache Tika)
- PrettifyJSON (jq)
- PrettifyXML (tidy-html5)
- QueryCSV (q)
- QueryTSV (q)
- QueryJSON (jq)
- MakeUpper (auto-generated unpacker plugin from editor script plugin)
- MakeLower (auto-generated unpacker plugin from editor script plugin)
- RemoveDuplicates (auto-generated unpacker plugin from editor script plugin)
- CountDuplicates (auto-generated unpacker plugin from editor script plugin)
- SortAscending (auto-generated unpacker plugin from editor script plugin)
- ExecFilterCommand (auto-generated unpacker plugin from editor script plugin)
- Tokenize (auto-generated unpacker plugin from editor script plugin)
- Trim (auto-generated unpacker plugin from editor script plugin)
- VisualizeGraphviz (graphviz)
- New editor script plugins
- RemoveDuplicates
- CountDuplicates
- Tokenize
- Trim
- ApacheTika (auto-generated editor script plugin from unpacker plugin)
- PrettifyJSON (auto-generated editor script plugin from unpacker plugin)
- PrettifyXML (auto-generated editor script plugin from unpacker plugin)
- Internals
- Allow command-based plugins to be defined in XML file
- Make the menu items of the Unpacker / Prediffer / Editor Script plugin translatable
- Create Editor Script plugins from the Unpacker plugins
Takashi Sawanaka [Wed, 16 Jun 2021 14:18:56 +0000 (23:18 +0900)]
Determine the language of syntax highlighting with the extension obtained with the UnpackedFileExtension property (related to #820)
Takashi Sawanaka [Wed, 16 Jun 2021 00:03:55 +0000 (09:03 +0900)]
strutils::join(): Fix the bug when the second element is empty
Takashi Sawanaka [Sun, 13 Jun 2021 13:57:22 +0000 (22:57 +0900)]
Update CWindowsManagerDialog - check some pointers for null and made … (#824) (2)
Flaviu_ [Sun, 13 Jun 2021 12:35:39 +0000 (15:35 +0300)]
Update CWindowsManagerDialog - check some pointers for null and made … (#824)
* Update CWindowsManagerDialog - check some pointers for null and made safe casts
* Update WindowsManagerDialog.cpp
Takashi Sawanaka [Sat, 12 Jun 2021 00:03:16 +0000 (09:03 +0900)]
Fix build errors
Jun Tajima [Fri, 11 Jun 2021 22:35:24 +0000 (07:35 +0900)]
Add Smarty syntax highlighting. (https://smarty.net/) (#821)
- Smarty delimiters can be changed, but for now only the default delimiters "{" and "}" are supported.
Takashi Sawanaka [Sat, 5 Jun 2021 01:19:35 +0000 (10:19 +0900)]
Add WinMergePluginBase.h (7)
Takashi Sawanaka [Sat, 5 Jun 2021 01:18:48 +0000 (10:18 +0900)]
Reduce compilation warnings
Flaviu_ [Fri, 4 Jun 2021 15:31:13 +0000 (18:31 +0300)]
Update CWindowsManagerDialog (#811)
Make no sense to test m_pIL for nullptr in CWindowsManagerDialog destructor
Takashi Sawanaka [Sun, 30 May 2021 02:02:39 +0000 (11:02 +0900)]
DirView.*: Add IsDiffItemSpecial() function
Takashi Sawanaka [Sun, 30 May 2021 01:45:34 +0000 (10:45 +0900)]
DirView.cpp: Disable Compare As → Text ~ XML in the context menu when the selected item is a folder or parent folder icon
Takashi Sawanaka [Sat, 29 May 2021 02:17:35 +0000 (11:17 +0900)]
Add WinMergePluginBase.h (6)
efi99 [Fri, 28 May 2021 11:37:08 +0000 (13:37 +0200)]
Update Hungarian.po (#807)
Takashi Sawanaka [Thu, 27 May 2021 11:44:01 +0000 (20:44 +0900)]
Fix issue #804: FeatureRequest - Ignoring options - lack in "button menu"