OSDN Git Service
Takashi Sawanaka [Thu, 26 Apr 2018 11:02:52 +0000 (20:02 +0900)]
DirView.*: Remove unused functions
Takashi Sawanaka [Thu, 26 Apr 2018 11:02:15 +0000 (20:02 +0900)]
resource.h: Remove unused resource symbols
Takashi Sawanaka [Sun, 22 Apr 2018 06:04:56 +0000 (15:04 +0900)]
MergeDoc.*: Mark ignored lines by Prediffer plugin as Trivial
Takashi Sawanaka [Sun, 22 Apr 2018 05:59:30 +0000 (14:59 +0900)]
Installer: Add PrediffLineFilter.sct plugin
Takashi Sawanaka [Sun, 22 Apr 2018 05:50:29 +0000 (14:50 +0900)]
PrediffLineFilter.sct: Add Ignore Case option to settings dialog
Takashi Sawanaka [Sat, 21 Apr 2018 15:01:28 +0000 (00:01 +0900)]
GhostTextBuffer.cpp: Fixed a problem that line without EOL exists even though it is not the last line
Takashi Sawanaka [Sat, 21 Apr 2018 13:37:53 +0000 (22:37 +0900)]
GhostTextBuffer.cpp: Avoid assertion failure when deleting ghost lines
Takashi Sawanaka [Sat, 21 Apr 2018 12:25:24 +0000 (21:25 +0900)]
Merge pull request #85 from Lippe35/master
Add missing translation Portuguese
Lippe35 [Sat, 21 Apr 2018 08:19:45 +0000 (09:19 +0100)]
Add missing translation Portuguese
Takashi Sawanaka [Mon, 16 Apr 2018 21:57:04 +0000 (06:57 +0900)]
Merge pull request #84 from Lippe35/master
Improvements Portuguese
Lippe35 [Mon, 16 Apr 2018 08:30:59 +0000 (09:30 +0100)]
Improvements Portuguese
Takashi Sawanaka [Sun, 15 Apr 2018 13:46:21 +0000 (22:46 +0900)]
Fix crash when removing ghost lines. I hope this fixes the issue #80 (GitHub)
Takashi Sawanaka [Sun, 8 Apr 2018 15:45:29 +0000 (00:45 +0900)]
Add PrediffLineFilter.sct
Takashi Sawanaka [Mon, 2 Apr 2018 14:56:02 +0000 (23:56 +0900)]
Merge pull request #82 from GreyMerlin/master
Two patches related to reading large files (i.e. > 2GB)
GreyMerlin [Mon, 2 Apr 2018 01:31:41 +0000 (18:31 -0700)]
Improve reading of files > 2GB (3)
* This is just the "next" in a series of patches to allow WinMerge to
properly handle very large ( i.e. > 2GB) files.
* This is a "kludge" patch allow for a responsive UI while reading
large files. After every input line is read and processed,
`::PeekMessage()` and `PumpMessage()` are called to allow the UI to
process messages.
* A much more robust solution would involve running
`CMergeDoc::LoadOneFile()` to run on threads that are independant of
the UI. This patch could then be easily removed.
* This patch also removes a useless label and `goto`,
* **Important Note** ... The reading and display of large
files remains seriously slow (with a completely non-responsive
WinMerge window for much of the time). Simple vertical scrolling
seems reasonably responsive. However ... any manipulation of the
"shape" or "z-order" of panes within the WinMerge window consumes
**seriously** more elapsed time while the Vertical Scroll Bar is being
tediously re-calculated. For this and other reasons ... I don't
consider large files to be very useful yet.
GreyMerlin [Mon, 2 Apr 2018 01:09:46 +0000 (18:09 -0700)]
Improve reading of files > 2GB (2)
* This is just the "next" in a series of patches to allow WinMerge to
properly handle very large ( i.e. > 2GB) files; although all of the
problems noted and fixed here can also be exhibited with files
somewhat smaller than that 2GB size.
* The main improvement here is to notice "lines" longer than 2^16 chars
and forcefully truncate them. For binary-like text files, long runs of
'\x00' and '\xff' characters are tolerated for lines containing up to
2^18 characters.
* This greatly improves the performance of the display and scrolling of
"binary-like" files (files whose extension does not match the **Binary
File Pattern**).
* Note too that the function `MultiByteToWideChar()` can only handle
output lines up to INT_MAX characters (thus, input lines up to
INT_MAX/2 characters).
* I've dropped in a few `// TODO` comments to looping situations that
are particularly slow and should be re-designed with very long files in
mind.
* **Important Note** ... The reading and display of large
files remains seriously slow (with a completely non-responsive
WinMerge window for much of the time). Simple vertical scrolling
seems reasonably responsive. However ... any manipulation of the
"shape" or "z-order" of panes within the WinMerge window consumes
**seriously** more elapsed time while the Vertical Scroll Bar is being
tediously re-calculated. For this and other reasons ... I don't
consider large files to be very useful yet.
Takashi Sawanaka [Sun, 1 Apr 2018 15:15:34 +0000 (00:15 +0900)]
Fix the problem that dot icon in a drop-down menu is not drawn correctly
Takashi Sawanaka [Sun, 1 Apr 2018 14:49:32 +0000 (23:49 +0900)]
OpenView.*: Merge with ProjectFilePathDlg and remove ProjectFilePathDlg. Add Options button to OpenView
Takashi Sawanaka [Wed, 28 Mar 2018 14:27:30 +0000 (23:27 +0900)]
Merge pull request #81 from GreyMerlin/master
Improve reading of files > 2GB (1)
GreyMerlin [Tue, 27 Mar 2018 19:16:02 +0000 (12:16 -0700)]
Improve reading of files > 2GB
* Now that commit #
4e4e46c has allowed files larger than 2GB, there are
number of places in WinMerge that are not prepared to handle files that
large. These will have to be discovered by "trial and error". These
are the first two problems encountered ...
* This patch repairs two places that `assert`with long file lengths.
* It should be noted that Windows can only read/write in chunks of up to
2GB. The code around lines 227 to 232 is part of a loop that is
capable of reading very large files, and now has the correct setup code
to limit the size of each successive read.
* The `assert` at line 911 is completely unnecessary for both 32- and
64-bit builds.
Takashi Sawanaka [Mon, 26 Mar 2018 13:30:50 +0000 (22:30 +0900)]
SharedMemory_WIN32.cpp: Avoid access violation when mapping a file on Google Drive File Stream to memory(2). (sf.net#2206)
the previous fix did not work on release build
Takashi Sawanaka [Sun, 25 Mar 2018 13:54:02 +0000 (22:54 +0900)]
UniFile.cpp: Remove 2GB file size limit for 64-bit build
Takashi Sawanaka [Sun, 25 Mar 2018 06:14:48 +0000 (15:14 +0900)]
SharedMemory_WIN32.cpp: Avoid access violation when mapping a file on Google Drive File Stream to memory. (sf.net#2206)
Takashi Sawanaka [Mon, 19 Mar 2018 14:18:58 +0000 (23:18 +0900)]
DirCmpReport.cpp: Fix an issue where garbled text was copied to the clipboard when generating a report on the clipboard. (sf.net#2200)
Takashi Sawanaka [Sun, 18 Mar 2018 21:39:02 +0000 (06:39 +0900)]
Merge pull request #79 from GreyMerlin/master
Version issues plus Adapt to VS2017 15.6.1 changes
GreyMerlin [Sun, 18 Mar 2018 18:34:39 +0000 (11:34 -0700)]
Simplify version.h file name confusions
Problem ...
* there were two, very different, `version.h` files ...
`.\version.h` which simply contains current version defines
`.\Src\Common\Version.h` which declares the `CVersionInfo` class
implemented in the `\Src\Common\Version.cpp` file.
* The files `.\version.h` and `.\Src\res\Merge2.rc` are not visible in
the Solution Explorer tree.
Solution ...
* I have changed `.\Src\Common\Version.*` to be
`.\Src\Common\VersionInfo.*`. This also follows more typical file
naming norms.
* I have moved these new `VersionInfo.*` files from the **Header Files**
section of the Solution Explorer, into the **MFCGui/Common** section
* I have added the `.\version.h`file into the **Header Files** section,
so that it becomes a visible part of the project. I have **not**
modified the name or purpose of this file because it is generated by
`BuildBin.vs2017.cmd` during the release build process.
* I have added the `.\Src\res\Merge2.rc` to the **Resource Files**
section of the Solution Explorer (so that it becomes visible to the
project). I have marked that file as "Excluded From Build" (in all
build configurations) because it is directly included from the
`.\Src\res\Merge.rc2`file.
* I have made these changes for both VS2015 and VS2017 projects.
GreyMerlin [Sat, 17 Mar 2018 21:44:05 +0000 (14:44 -0700)]
Adapt to VS2017 version 15.6.1
* These problems were introduced with the upgrade to VS2017 15.6.1
* Once again, the boost library needs to be aware of the newest VS2017
compiler version, which is now _MSC_VER == 1913
* two functions in `DirView.cpp` and one function in `MovedBlocks.cpp`
were causing a new level=3 warning ::
"warning C4834: discarding return value of function with 'nodiscard'
attribute"
This was caused by increased checking on the `std::accumulate()`
function.
* Note:: the `isPresent()` function of `MovedBlocks.cpp` is never
actually called, which masked the obvious bug in the code
(now repaired).
* These changes also work correctly with VS2015 (although the new
checking and warning message are not in VS2015)
GreyMerlin [Sat, 17 Mar 2018 20:22:22 +0000 (13:22 -0700)]
Update version as in SetVersion.cmd = 2.15.3
Takashi Sawanaka [Sun, 18 Mar 2018 14:07:30 +0000 (23:07 +0900)]
DirView.cpp: Re-detect the file encoding when opening files from DirView. (sf.net#2131)
Takashi Sawanaka [Sat, 17 Mar 2018 05:37:33 +0000 (14:37 +0900)]
Add Pause button to Folder Compare Progress dialog (sf.net#828,#1222,#1237)
Takashi Sawanaka [Wed, 14 Mar 2018 14:03:46 +0000 (23:03 +0900)]
Merge.rc: Add Ctrl++/Ctrl+-(not numpad key) shortcut key to zoom in/out. (sf.net#1727)
Takashi Sawanaka [Fri, 9 Mar 2018 13:36:36 +0000 (22:36 +0900)]
Update Slovak translation (sf.net#2902)
Takashi Sawanaka [Tue, 6 Mar 2018 15:00:34 +0000 (00:00 +0900)]
PatchDlg.*: Fix the issue that File1/File2 fields don't remember manual input (sf.net#1949)
Takashi Sawanaka [Sat, 3 Mar 2018 13:57:57 +0000 (22:57 +0900)]
Added tag 2.15.3 for changeset
82b36418c467
Takashi Sawanaka [Sat, 3 Mar 2018 13:02:51 +0000 (22:02 +0900)]
Merge
Takashi Sawanaka [Sat, 3 Mar 2018 12:56:41 +0000 (21:56 +0900)]
Update release notes and changelog for 2.15.3
Takashi Sawanaka [Sat, 3 Mar 2018 12:53:42 +0000 (21:53 +0900)]
DownloadDeps.cmd: Update ShellExtension version
Takashi Sawanaka [Thu, 1 Mar 2018 21:41:17 +0000 (06:41 +0900)]
Merge pull request #78 from Lippe35/master
Improvements Portuguese
Lippe35 [Thu, 1 Mar 2018 14:54:52 +0000 (14:54 +0000)]
Improvements Portuguese
Takashi Sawanaka [Wed, 28 Feb 2018 20:49:30 +0000 (05:49 +0900)]
Merge pull request #77 from Lippe35/master
Add missing translation and corrections Portuguese
Lippe35 [Wed, 28 Feb 2018 15:23:34 +0000 (15:23 +0000)]
Add missing translation and corrections Portuguese
Takashi Sawanaka [Wed, 28 Feb 2018 13:31:19 +0000 (22:31 +0900)]
DirView.cpp: Remove trailing garbage from a dragged text (2) fixes github#75
Takashi Sawanaka [Sun, 25 Feb 2018 05:39:19 +0000 (14:39 +0900)]
Manual: Fix the issue "sf.net#2165 Manual "Using Filters" Line Filter Example"
Takashi Sawanaka [Sun, 25 Feb 2018 05:00:58 +0000 (14:00 +0900)]
Polish.po: Update Polish translation (sf.net#2177)
Takashi Sawanaka [Sat, 24 Feb 2018 12:07:50 +0000 (21:07 +0900)]
Merge pull request #76 from Lippe35/master
Corrections and improvements Portuguese
Lippe35 [Sat, 24 Feb 2018 07:39:58 +0000 (07:39 +0000)]
Corrections and improvements Portuguese
Takashi Sawanaka [Sat, 24 Feb 2018 04:59:48 +0000 (13:59 +0900)]
Contributors.txt: Change the file encoding to UTF-8
Takashi Sawanaka [Sat, 24 Feb 2018 04:59:04 +0000 (13:59 +0900)]
Translations/WinMerge/*.po: Change the file encoding to UTF-8
Takashi Sawanaka [Fri, 23 Feb 2018 13:29:30 +0000 (22:29 +0900)]
Merge
Takashi Sawanaka [Fri, 23 Feb 2018 13:09:49 +0000 (22:09 +0900)]
Merge pull request #74 from Lippe35/master
Corrections Portuguese
Lippe35 [Fri, 23 Feb 2018 03:51:16 +0000 (03:51 +0000)]
Corrections Portuguese
Takashi Sawanaka [Thu, 22 Feb 2018 12:35:06 +0000 (21:35 +0900)]
Fix to show text that contains & on message box, correctly. sf.net#2067 (2)
Takashi Sawanaka [Tue, 20 Feb 2018 21:36:49 +0000 (06:36 +0900)]
Merge pull request #73 from Lippe35/master
Improvements and corrections Portuguese
Lippe35 [Tue, 20 Feb 2018 14:31:37 +0000 (14:31 +0000)]
Improvements and corrections Portuguese
Takashi Sawanaka [Tue, 20 Feb 2018 13:23:48 +0000 (22:23 +0900)]
Merge pull request #72 from Lippe35/master
Revert "Fix Portuguese"
Lippe35 [Tue, 20 Feb 2018 05:55:28 +0000 (05:55 +0000)]
More corrections Portuguese
Lippe35 [Tue, 20 Feb 2018 05:23:57 +0000 (05:23 +0000)]
Add and Correction Portuguese
Lippe35 [Tue, 20 Feb 2018 05:09:18 +0000 (05:09 +0000)]
Correction Portuguese
Lippe35 [Tue, 20 Feb 2018 04:51:46 +0000 (04:51 +0000)]
Revert "Fix Portuguese"
This reverts commit
6cc226cf092fcbbb5d3c515922a3461c85d7fa71.
Takashi Sawanaka [Mon, 19 Feb 2018 21:45:04 +0000 (06:45 +0900)]
Merge pull request #71 from Lippe35/patch-1
Fix Portuguese
Lippe35 [Mon, 19 Feb 2018 21:41:10 +0000 (21:41 +0000)]
Fix Portuguese
Takashi Sawanaka [Mon, 19 Feb 2018 21:34:26 +0000 (06:34 +0900)]
Merge
Takashi Sawanaka [Mon, 19 Feb 2018 21:29:36 +0000 (06:29 +0900)]
Merge pull request #70 from Lippe35/master
Improvements Portuguese
Lippe35 [Mon, 19 Feb 2018 14:21:50 +0000 (14:21 +0000)]
Improvements Portuguese
Takashi Sawanaka [Sun, 18 Feb 2018 16:26:41 +0000 (01:26 +0900)]
Bump revision to 2.15.3
Takashi Sawanaka [Sun, 18 Feb 2018 16:25:35 +0000 (01:25 +0900)]
Installer: Use replacesameversion flag to overwrite jp branch's frhed and winimerge
Takashi Sawanaka [Sun, 18 Feb 2018 16:18:03 +0000 (01:18 +0900)]
ShellExtension: Bump revision to 1.17.1.0
Takashi Sawanaka [Sun, 18 Feb 2018 15:35:10 +0000 (00:35 +0900)]
Fix to show text that contains & on message box, correctly. sf.net#2067
Takashi Sawanaka [Sun, 18 Feb 2018 11:57:52 +0000 (20:57 +0900)]
MergeDoc.cpp: Fix wrong if condition. sf.net#2202
Takashi Sawanaka [Sun, 18 Feb 2018 11:18:11 +0000 (20:18 +0900)]
ccrystaltextview.cpp: Fix infinite loop when replacing ^ sf.net#2094
Takashi Sawanaka [Sun, 18 Feb 2018 10:54:11 +0000 (19:54 +0900)]
ccrystaltextview.cpp: Fix reverse search to search last line correctly
Takashi Sawanaka [Fri, 16 Feb 2018 13:24:37 +0000 (22:24 +0900)]
Merge pull request #69 from Lippe35/master
Add and corrections Portuguese
Lippe35 [Fri, 16 Feb 2018 13:10:05 +0000 (13:10 +0000)]
Add and corrections Portuguese
Takashi Sawanaka [Fri, 16 Feb 2018 12:14:46 +0000 (21:14 +0900)]
Merge pull request #68 from Lippe35/master
More add and corrections Portuguese translation
Lippe35 [Thu, 15 Feb 2018 14:50:18 +0000 (14:50 +0000)]
More Add and corrections Portuguese translation
Takashi Sawanaka [Thu, 15 Feb 2018 14:04:37 +0000 (23:04 +0900)]
Merge pull request #67 from Lippe35/master
Add and corrections Portuguese translation
Lippe35 [Thu, 15 Feb 2018 13:35:56 +0000 (13:35 +0000)]
Add and corrections Portuguese translation
Takashi Sawanaka [Mon, 12 Feb 2018 12:58:12 +0000 (21:58 +0900)]
Update Turkish translation. Bitbucket#86
Takashi Sawanaka [Sun, 11 Feb 2018 14:08:50 +0000 (23:08 +0900)]
Update Turkish translation. Bitbucket#86
Takashi Sawanaka [Sun, 11 Feb 2018 13:33:12 +0000 (22:33 +0900)]
ShellExtension/Sinhala.po: Use LANG_SINHALESE instead of LANG_SINHALA that is not defined
Takashi Sawanaka [Sun, 11 Feb 2018 13:30:31 +0000 (22:30 +0900)]
Update Turkish translation. Bitbucket#85, #86
Takashi Sawanaka [Sun, 11 Feb 2018 08:54:18 +0000 (17:54 +0900)]
Installer: Add "How to Apply These Terms to Your New Programs" section into GPL.rtf. sf.net#2098
Takashi Sawanaka [Sun, 11 Feb 2018 07:22:18 +0000 (16:22 +0900)]
GhostTextBuffer.cpp: if the last line in selection to be deleted is a ghost line,
the EOL of last real line in selection should not be deleted.
Otherwise, a line with no EOL will appear.
Takashi Sawanaka [Sun, 11 Feb 2018 05:51:07 +0000 (14:51 +0900)]
GhostTextBuffer.cpp: Remove unnecessary function call
Takashi Sawanaka [Sun, 11 Feb 2018 05:33:17 +0000 (14:33 +0900)]
Update translations
Takashi Sawanaka [Sat, 10 Feb 2018 00:20:54 +0000 (09:20 +0900)]
Update *.isl files
Takashi Sawanaka [Sat, 10 Feb 2018 00:20:12 +0000 (09:20 +0900)]
Update Polish translation sf.net#3034
Takashi Sawanaka [Sat, 10 Feb 2018 00:19:24 +0000 (09:19 +0900)]
Update Persian translation sf.net#3033
Takashi Sawanaka [Sat, 10 Feb 2018 00:17:59 +0000 (09:17 +0900)]
Update Contributors.txt
Takashi Sawanaka [Sat, 10 Feb 2018 00:17:10 +0000 (09:17 +0900)]
Add Sinhala translation sf.net#3032
Takashi Sawanaka [Sat, 10 Feb 2018 00:15:11 +0000 (09:15 +0900)]
Add Finnish translation sf.net#3031
Takashi Sawanaka [Thu, 8 Feb 2018 22:10:44 +0000 (07:10 +0900)]
LanguageSelect.cpp: Add Sinhalese
Takashi Sawanaka [Thu, 8 Feb 2018 15:00:18 +0000 (00:00 +0900)]
UpdatePoFilesFromPotFile.vbs: Add support for *.po file encoded in UTF-8
Takashi Sawanaka [Thu, 8 Feb 2018 14:54:06 +0000 (23:54 +0900)]
ShellExtension/Basque.po: Fix wrong codepage
Takashi Sawanaka [Thu, 8 Feb 2018 14:49:54 +0000 (23:49 +0900)]
ShellExtensionPortuguese.rc: Recreate from .po file
Takashi Sawanaka [Thu, 8 Feb 2018 14:46:43 +0000 (23:46 +0900)]
ShellExtension/Portuguese.po: Change the file encoding from UTF-8 to CP1252
Takashi Sawanaka [Tue, 6 Feb 2018 22:03:00 +0000 (07:03 +0900)]
Japanese.po: Remove an unused line
Takashi Sawanaka [Tue, 6 Feb 2018 22:01:40 +0000 (07:01 +0900)]
Portuguese.po: Change the file encoding from UTF-8 to CP1252
Takashi Sawanaka [Tue, 6 Feb 2018 21:55:31 +0000 (06:55 +0900)]
Merge pull request #64 from Lippe35/patch-1
Update Portuguese
Lippe35 [Tue, 6 Feb 2018 21:06:43 +0000 (21:06 +0000)]
Update Portuguese