OSDN Git Service
Takashi Sawanaka [Sun, 18 Nov 2018 22:57:56 +0000 (07:57 +0900)]
MergeDoc.cpp: Fix github issue #106 File compare always showing different ending
Takashi Sawanaka [Fri, 16 Nov 2018 14:29:17 +0000 (23:29 +0900)]
SuperComboBox.cpp: Fix crash when pressing key with enabling "From MRU list" option
Takashi Sawanaka [Thu, 15 Nov 2018 22:00:14 +0000 (07:00 +0900)]
Bitmap.cpp: grayscaling toolbar bitmap did not work on XP
Takashi Sawanaka [Wed, 14 Nov 2018 15:46:12 +0000 (00:46 +0900)]
OpenView.cpp: Replace SplitButton with PushButton when running on XP
Takashi Sawanaka [Tue, 13 Nov 2018 23:24:26 +0000 (08:24 +0900)]
Fix github issue#105 Scrolling issue
Takashi Sawanaka [Tue, 13 Nov 2018 22:01:24 +0000 (07:01 +0900)]
Merge
Takashi Sawanaka [Tue, 13 Nov 2018 22:00:09 +0000 (07:00 +0900)]
Fix crash when inserting text at the last line which is a ghost line. github issue#104
Takashi Sawanaka [Tue, 13 Nov 2018 21:53:27 +0000 (06:53 +0900)]
ccrystaltextview.cpp: Fixed an issue that does not advance upward after the second search if backward searching of one-character text only
Tim Gerundt [Tue, 13 Nov 2018 06:06:29 +0000 (07:06 +0100)]
Drop ClearCase from Installer
Tim Gerundt [Tue, 13 Nov 2018 06:06:05 +0000 (07:06 +0100)]
Drop ClearCase from Manual
Takashi Sawanaka [Mon, 12 Nov 2018 16:12:18 +0000 (01:12 +0900)]
MergeDoc.cpp: clear GGhostTextBuffer::m_RealityBlock when reloading unnamed buffer
Takashi Sawanaka [Mon, 12 Nov 2018 14:25:51 +0000 (23:25 +0900)]
Merge.rc: Fix bitbucket issue#125. The order of controls seems to be important
Takashi Sawanaka [Sat, 10 Nov 2018 19:43:51 +0000 (04:43 +0900)]
Add Lithuanian translation
Takashi Sawanaka [Thu, 8 Nov 2018 16:51:25 +0000 (01:51 +0900)]
MergeEditView.cpp: Fix "Copy to Left and Advance" not work in 3-way file compare. bitbucket#123
Takashi Sawanaka [Tue, 6 Nov 2018 22:01:53 +0000 (07:01 +0900)]
DirFrame.cpp: Add loading/saving of the visibility of status bar
Takashi Sawanaka [Tue, 6 Nov 2018 21:54:14 +0000 (06:54 +0900)]
Merge.rc: Widen the width of 'Save project...' button for some translations
Takashi Sawanaka [Tue, 6 Nov 2018 21:48:53 +0000 (06:48 +0900)]
Merge
Takashi Sawanaka [Tue, 6 Nov 2018 21:45:45 +0000 (06:45 +0900)]
Merge pull request #103 from Lippe35/master
Add missing Portuguese Translation
Lippe35 [Tue, 6 Nov 2018 15:19:33 +0000 (15:19 +0000)]
Add missing Portuguese Translation
Tim Gerundt [Wed, 31 Oct 2018 20:54:12 +0000 (21:54 +0100)]
Remove IDR_MERGEDOCTYPE and IDR_DIRDOCTYPE
Tim Gerundt [Wed, 31 Oct 2018 20:53:32 +0000 (21:53 +0100)]
Add separators to "Zoom" and "Diff Context" menus
Takashi Sawanaka [Mon, 29 Oct 2018 21:41:41 +0000 (06:41 +0900)]
Merge.rc: Replace 'Compare' with 'Co&mpare' in OpenDlg. bitbucket#121
Takashi Sawanaka [Mon, 29 Oct 2018 20:54:26 +0000 (05:54 +0900)]
Merge pull request #102 from Lippe35/master
Update Portuguese Translation
Lippe35 [Mon, 29 Oct 2018 14:58:38 +0000 (14:58 +0000)]
Update Portuguese Translation
Takashi Sawanaka [Sun, 28 Oct 2018 22:56:34 +0000 (07:56 +0900)]
Manual: Update screenshots
Takashi Sawanaka [Sun, 28 Oct 2018 17:42:40 +0000 (02:42 +0900)]
Merge pull request #101 from GreyMerlin/master
Various refactorings
Takashi Sawanaka [Sun, 28 Oct 2018 17:23:25 +0000 (02:23 +0900)]
Added tag 2.15.5 for changeset
42fd7355d3f7
GreyMerlin [Sun, 28 Oct 2018 14:58:47 +0000 (07:58 -0700)]
Various refactorings involving NULL, ASSERT, TRUE and FALSE (7)
More of the same...
GreyMerlin [Fri, 26 Oct 2018 23:50:31 +0000 (16:50 -0700)]
Various refactorings involving NULL, ASSERT, TRUE and FALSE (6)
More of the same...
GreyMerlin [Fri, 26 Oct 2018 19:02:11 +0000 (12:02 -0700)]
Restore testing data file accidentally changed
* Changed when I used Excel to look at the file, then accidentally committed in the "Cleanup
PLUGIN_MODE usage" commit.
* now restored to the traditional file.
GreyMerlin [Fri, 26 Oct 2018 18:52:16 +0000 (11:52 -0700)]
Various refactorings involving NULL, ASSERT, TRUE and FALSE (5)
More of the same...
GreyMerlin [Thu, 25 Oct 2018 00:46:30 +0000 (17:46 -0700)]
Cleanup PLUGIN_MODE usage
While modernizing more NULL and BOOL situations, I encountered the following two comments in the
code ...
`// TODO: Convert to PLUGIN_MODE and fix compile error` and
`// TODO: Convert bMode to PLUGIN_MODE and fix compile errors`
* Values of type `PLUGIN_MODE` were being stored into `int` variables, often with a `b` prefix
(implying the variables were boolean in nature).
* And values themselves were sometimes `false`, or `1` although sometimes from the `PLUGIN_MODE`
enumeration.
* Value testing often assumed the values were boolean (i.e. zero or non-zero)
* I've changed all appropriate variables to type `PLUGIN_MODE` and used explicit values from the
enumeration in all related expressions.
* I've also taken the opportunity to modernize all member variables in the `PluginForFile` and
`PackingInfo` classes, by adding an explicit `m_` prefix
GreyMerlin [Thu, 25 Oct 2018 00:07:58 +0000 (17:07 -0700)]
Various refactorings involving NULL, ASSERT, TRUE and FALSE (4)
More of the same...
GreyMerlin [Wed, 24 Oct 2018 22:31:39 +0000 (15:31 -0700)]
Various refactorings involving NULL, ASSERT, TRUE and FALSE (3)
More of the same...
* Mostly in CrystalEdit
* And also BCMenu
* Change many `return(v);` -> `return v;`
* Many changes `= 0` to `= nullptr`
* The various `*.c` files must use `NULL` instead of `0`
GreyMerlin [Tue, 23 Oct 2018 21:27:28 +0000 (14:27 -0700)]
Various refactorings involving NULL, ASSERT, TRUE and FALSE (2)
* `assert(0)` -> `assert(false)`
* Some `return 0;` -> `return nullptr;`
* Also `ptr(0)` initializations -> `ptr(nullptr)`
GreyMerlin [Tue, 23 Oct 2018 20:10:53 +0000 (13:10 -0700)]
Various refactorings involving NULL, ASSERT, TRUE and FALSE
* Many more `NULL` -> `nullptr`
* More `ASSERT (ptr)` -> `ASSERT (ptr!=nullptr`)
* More `if (ptr)` -> `if (ptr != nullptr`)
* Also `if (!ptr)` -> `if (ptr == nullptr)`
* Also, treat `HWND` like `ptr` for these refactorings
* More `TRUE/FALSE` -> `true/false` where `bool` vars already exists
* All `ASSERT(FALSE)` are now `ASSERT(false)`
* Some `if ( i1 & i2 )` -> `if ( (i1 & i2) != 0)`
* Some `b == false` -> `!b`
* Some `b == true` -> `b`
Takashi Sawanaka [Sun, 28 Oct 2018 14:47:48 +0000 (23:47 +0900)]
DiffTextBuffer.cpp: Impletement 'TODO: speed this up via table lookup'
Takashi Sawanaka [Sun, 28 Oct 2018 14:00:42 +0000 (23:00 +0900)]
Restore wrongly removed translations
Takashi Sawanaka [Fri, 26 Oct 2018 21:49:47 +0000 (06:49 +0900)]
Cppcheck: Member variable '...' is not initialized in the constructor.
Takashi Sawanaka [Tue, 23 Oct 2018 23:23:37 +0000 (08:23 +0900)]
MyCom.h: The parameter _vt in ChangeType() function was not used
Takashi Sawanaka [Tue, 23 Oct 2018 14:41:00 +0000 (23:41 +0900)]
Restore Merge7zFormatShellImpl. {cpp, h}
This module enables comparison of various special folders like the following.
- FTP folder (ftp://...)
- Folder in the ZIP file (c:\tmp\a.zip\dir1)
- CLSID (::{
645FF040-5081-101B-9F08-
00AA002F954E}})
Takashi Sawanaka [Tue, 23 Oct 2018 14:17:36 +0000 (23:17 +0900)]
Merge pull request #100 from GreyMerlin/master
Trivial Bugfix: Debugger generates three warnings
GreyMerlin [Tue, 23 Oct 2018 00:31:14 +0000 (17:31 -0700)]
Trivial Bugfix: Debugger generates three warnings
**Symptom:** Starting WinMerge with an active Debugger generates three identical
warning messages ...
`... \dlgdata.cpp(254) : AppMsg - Warning: dialog data checkbox value (205) out of range.`
**Solution:** The `m_bReadOnly`array was not being initialized, thus all of the `bool` elements
had a value of `0xcd` = 205 when initially given to the three **Read-only** checkboxes on the
OpenView dialog.
The array is now properly initialized in the `COpenView::` constructor.
**Also:** An unrelated trivial comment is repaired.
Takashi Sawanaka [Mon, 22 Oct 2018 22:56:32 +0000 (07:56 +0900)]
CreateRelase.cmd: build with VS2015 until the following problem is fixed.
https://developercommunity.visualstudio.com/content/problem/312206/mfc-exe-binary-size-is-5-times-bigger-in-vs-158-ms.html
Takashi Sawanaka [Mon, 22 Oct 2018 14:57:34 +0000 (23:57 +0900)]
Merge
Takashi Sawanaka [Mon, 22 Oct 2018 14:55:47 +0000 (23:55 +0900)]
Update release notes and changelog for 2.15.5
Takashi Sawanaka [Mon, 22 Oct 2018 14:18:10 +0000 (23:18 +0900)]
Merge pull request #99 from GreyMerlin/master
BugFix: Extended Length File Path names
Takashi Sawanaka [Mon, 22 Oct 2018 14:14:23 +0000 (23:14 +0900)]
Write an error message to the console when unknown command-line option is specified
Takashi Sawanaka [Mon, 22 Oct 2018 14:04:46 +0000 (23:04 +0900)]
Installer: Upgrade to 7-Zip 18.05
GreyMerlin [Mon, 22 Oct 2018 06:28:25 +0000 (23:28 -0700)]
BugFix: Extended Length File Path names
**Symptom:** If an explicit `\\?\` or `\\?\UNC\` prefix is given for a file path in the Open
dialog, that prefix remains with the file path even if it is not necessary to indicate an Extended
Length File Path. It will even be correctly stored and retrieved from the registry. Generally
this is OK, however some context menu actions (such as *Rename*, *Delete* *Left/Right Shell Menu"
and *Open With...*) cannot process Extended Length File Path values (because they are implemented
via Shell Extensions, which are limited to file path values with less that 260 characters).
Unfortunately, the Shell Extensions reject file path values simply based on the `\\?\` prefix, not
the actual length of the value.
**Solution:** Remove the explicit `\\?\` or `\\?\UNC\` prefix characters if they are not actually
necessary.
**Note:** The context menu actions noted above will still fail for actual Extended Length File Path
values, because Shell Extensions (indeed the entire Windows Shell) cannot handle Extended Length
File Path names.
Takashi Sawanaka [Sun, 21 Oct 2018 23:03:54 +0000 (08:03 +0900)]
Update ReleaseNotes.html for 2.15.5
Takashi Sawanaka [Sun, 21 Oct 2018 23:02:51 +0000 (08:02 +0900)]
Merge.rc: Change the tab order of the group '1st File or Folder' to 1
Takashi Sawanaka [Sat, 20 Oct 2018 15:05:43 +0000 (00:05 +0900)]
OpenView.cpp: Make 'Folder: Filter' group and 'File: Unpacker Plugin' group resizable
Takashi Sawanaka [Sat, 20 Oct 2018 13:32:38 +0000 (22:32 +0900)]
DownloadDeps.cmd: Upgrade to 7-Zip 18.05
Takashi Sawanaka [Sat, 20 Oct 2018 13:20:19 +0000 (22:20 +0900)]
Merge
Takashi Sawanaka [Sat, 20 Oct 2018 13:19:57 +0000 (22:19 +0900)]
Merge.rc: Widen 'Folder: Filter' and 'File: Unpacker Plugin' label in OpenDialog
Takashi Sawanaka [Sat, 20 Oct 2018 13:13:43 +0000 (22:13 +0900)]
CrystalEdit/Sample: Fix memory leak
Takashi Sawanaka [Sat, 20 Oct 2018 13:13:02 +0000 (22:13 +0900)]
CrystalEdit/Sample: Fix link error
Takashi Sawanaka [Sat, 20 Oct 2018 13:11:01 +0000 (22:11 +0900)]
Update Japanese translation
Takashi Sawanaka [Sat, 20 Oct 2018 13:08:14 +0000 (22:08 +0900)]
ArchiveSupport: Upgrade to 7-Zip 18.05
Tim Gerundt [Fri, 19 Oct 2018 03:59:15 +0000 (05:59 +0200)]
Use "c-format" only if nessary in POT file
Tim Gerundt [Fri, 19 Oct 2018 03:53:22 +0000 (05:53 +0200)]
Update German translation a little bit
Takashi Sawanaka [Mon, 15 Oct 2018 22:03:19 +0000 (07:03 +0900)]
Merge pull request #98 from GreyMerlin/master
Improve OpenView's Status layout
GreyMerlin [Mon, 15 Oct 2018 06:28:03 +0000 (23:28 -0700)]
Improve OpenView's Status layout (2)
* Move "Status Text" to the Left margin and make it full width
GreyMerlin [Sun, 14 Oct 2018 03:10:23 +0000 (20:10 -0700)]
More updates to 2.15.5 changelog
GreyMerlin [Sat, 13 Oct 2018 06:08:42 +0000 (23:08 -0700)]
Improve OpenView's Status layout (1)
* Status marked by light-gray line above, full width at bottom of dialog
* 12 fewer vertical pixels overall, but still 17 pixels more than original
* Added a few comments
GreyMerlin [Sat, 13 Oct 2018 15:30:03 +0000 (08:30 -0700)]
Further tweak to sizecbar.*
* Eliminate "old creation method" as it is no longer used or needed.
Takashi Sawanaka [Mon, 15 Oct 2018 16:00:34 +0000 (01:00 +0900)]
Fix release build error (2)
Takashi Sawanaka [Mon, 15 Oct 2018 14:13:51 +0000 (23:13 +0900)]
BuildArc.cmd: Eliminate error messages when running createrelease.cmd
Takashi Sawanaka [Mon, 15 Oct 2018 14:03:53 +0000 (23:03 +0900)]
Installer: Remove an unused variable
Takashi Sawanaka [Mon, 15 Oct 2018 13:06:30 +0000 (22:06 +0900)]
Bump revision to 2.15.5
Takashi Sawanaka [Mon, 15 Oct 2018 13:03:15 +0000 (22:03 +0900)]
DiffTextBuffer.cpp: Last line was not saved when last line has no EOL
Takashi Sawanaka [Mon, 15 Oct 2018 11:36:03 +0000 (20:36 +0900)]
Fix release build error
Takashi Sawanaka [Sat, 13 Oct 2018 12:18:40 +0000 (21:18 +0900)]
sizecbar.*: partially revert back to BOOL
Takashi Sawanaka [Fri, 12 Oct 2018 18:07:09 +0000 (03:07 +0900)]
Merge pull request #97 from GreyMerlin/master
Reorganize the OpenView dialog, plus ...
GreyMerlin [Thu, 11 Oct 2018 23:31:37 +0000 (16:31 -0700)]
Reorganize OpenView dialog (5)
* Update the `*.pot` and `*.po` files
GreyMerlin [Thu, 11 Oct 2018 23:29:20 +0000 (16:29 -0700)]
Reorganize OpenView dialog (4)
* Allow more room for translation with **Read-Only** and **Swap** buttons.
GreyMerlin [Thu, 11 Oct 2018 22:33:20 +0000 (15:33 -0700)]
`BOOL` becomes `bool` and related (2)
* Implicit assignment conversions of `BOOL` to `bool` that were caught only by VS2015. However it
is good to be explicit.
GreyMerlin [Thu, 11 Oct 2018 06:42:23 +0000 (23:42 -0700)]
Add icon for "New (3 panes)" menu item
* Courtesy of **Tim Gerundt**, issue #118, see
https://bitbucket.org/winmerge/winmerge/issues/118/icon-for-new-3-panes
* I couldn't find a need to use the additional `.bmp`, `.png`, or `.ico` files provided by Tim;
nonetheless I have captured them locally, but outside of the repository
GreyMerlin [Thu, 11 Oct 2018 00:16:13 +0000 (17:16 -0700)]
Reorganize OpenView dialog (3)
* Improve the Enable/Disable logic for OpenView dialog items that are only valid for Folders or
Files.
GreyMerlin [Thu, 11 Oct 2018 00:14:26 +0000 (17:14 -0700)]
Reorganize OpenView dialog (2)
* Automatic changes by VS's Resource Editor ...
* It threw away all the comments; I had **git** put them back
* I kept the other formatting changes
GreyMerlin [Thu, 11 Oct 2018 00:09:09 +0000 (17:09 -0700)]
Reorganize OpenView dialog (1)
* Same info, improved layout
GreyMerlin [Sat, 29 Sep 2018 05:56:24 +0000 (22:56 -0700)]
`BOOL` becomes `bool` and related (1)
* Retains `BOOL` where necessary for MFC or Win API interfaces
* Retains `BOOL` in `*.c` files (GNU diffutils, and others) as `bool` is unavailable
* Mostly retains `BOOL` in CrystalEdit and BCMenu related files
* Retains `BOOL` in Poco and Boost source files.
* Retains `BOOL` when used with values other than simply `TRUE` and `FALSE`, such as values of
`-1`, or with additional flag bits. These should be modernized with some future commits.
* Also `TRUE` becomes `true` and `FALSE` becomes `false` where appropriate.
Takashi Sawanaka [Thu, 11 Oct 2018 15:00:40 +0000 (00:00 +0900)]
CompareMSExcelFiles.sct: To avoid saving the extracted sheet data as a file name containing prohibited characters, change the name of the file name
Takashi Sawanaka [Thu, 11 Oct 2018 13:47:56 +0000 (22:47 +0900)]
Remove unused header file
Takashi Sawanaka [Thu, 11 Oct 2018 13:44:13 +0000 (22:44 +0900)]
EditorFilepathBar.cpp: Remove gaps
Takashi Sawanaka [Wed, 10 Oct 2018 23:10:48 +0000 (08:10 +0900)]
Update changelog for 2.15.5
Takashi Sawanaka [Wed, 10 Oct 2018 22:58:35 +0000 (07:58 +0900)]
BCMenu.cpp: Small optimization
Takashi Sawanaka [Wed, 10 Oct 2018 13:48:02 +0000 (22:48 +0900)]
Manual: Eliminate old Version Control feature
Takashi Sawanaka [Wed, 10 Oct 2018 13:25:52 +0000 (22:25 +0900)]
StdAfx.*: Improve CWinMergeProfile
Takashi Sawanaka [Wed, 10 Oct 2018 13:06:25 +0000 (22:06 +0900)]
CrystalEdit: An optimization for large text files
Takashi Sawanaka [Mon, 8 Oct 2018 11:35:55 +0000 (20:35 +0900)]
MergeEditView.*: Remove an unused function
Takashi Sawanaka [Mon, 8 Oct 2018 11:32:15 +0000 (20:32 +0900)]
MergeEditSplitterView.h: Fix mixed eol-style
Takashi Sawanaka [Sun, 7 Oct 2018 11:14:20 +0000 (20:14 +0900)]
Please run InsertLineNumbersInPOFiles.bat if you want to insert line numbers into PO files
Takashi Sawanaka [Thu, 27 Sep 2018 15:56:29 +0000 (00:56 +0900)]
Update Dutch translation. Submitted by Thomas De Rocke
Takashi Sawanaka [Wed, 26 Sep 2018 15:32:51 +0000 (00:32 +0900)]
Merge pull request #96 from GreyMerlin/master
Eliminate old (and unfinished) Version Control feature
GreyMerlin [Tue, 25 Sep 2018 04:37:00 +0000 (21:37 -0700)]
Merge branch 'master' of https://github.com/sdottaka/winmerge-v2
Tim Gerundt [Mon, 24 Sep 2018 21:15:09 +0000 (23:15 +0200)]
Rename some more readme.txt to README.md
Tim Gerundt [Mon, 24 Sep 2018 20:52:39 +0000 (22:52 +0200)]
Rename SVN_Organisation.txt to Folder_Structure.txt
Tim Gerundt [Mon, 24 Sep 2018 20:52:07 +0000 (22:52 +0200)]
Drop readme-Subversion.html