OSDN Git Service
Takashi Sawanaka [Sun, 13 Jan 2019 17:00:24 +0000 (02:00 +0900)]
Translate strings without using MergeLang.dll
Takashi Sawanaka [Sun, 13 Jan 2019 12:24:02 +0000 (21:24 +0900)]
MainFrm.h: Fix a problem which title is not updated when opening files from DirView.
Takashi Sawanaka [Sun, 13 Jan 2019 11:12:52 +0000 (20:12 +0900)]
ChildFrm.cpp: Remove no longer needed flicker free hack thanks to GitHub PR#9
Takashi Sawanaka [Sat, 12 Jan 2019 08:57:09 +0000 (17:57 +0900)]
Installer: Upgrade to 7-Zip 18.06
Takashi Sawanaka [Sat, 12 Jan 2019 08:42:00 +0000 (17:42 +0900)]
Upgrade to 7-Zip 18.06
Takashi Sawanaka [Sat, 12 Jan 2019 05:43:55 +0000 (14:43 +0900)]
Fix "Assertion failed: dr.begin[0] == dr.begin[file], file c:\dev\winmerge\src\diffwrapper.cpp, line 984" (https://bitbucket.org/sdottaka/winmerge-v2/issues/8/)
Takashi Sawanaka [Sat, 12 Jan 2019 04:01:47 +0000 (13:01 +0900)]
GhostTextBuffer.cpp: Fix incorrect size being passed to CopyMemory(). (https://bitbucket.org/sdottaka/winmerge-v2/issues/8/)
Takashi Sawanaka [Sat, 12 Jan 2019 02:53:13 +0000 (11:53 +0900)]
Update translations
Takashi Sawanaka [Mon, 7 Jan 2019 14:24:07 +0000 (23:24 +0900)]
MainFrm.cpp: Although the command lnie option '/e' was specified, pressing the ESC key did not terminate the application in some cases.
Takashi Sawanaka [Mon, 7 Jan 2019 13:47:13 +0000 (22:47 +0900)]
Revert the commit 'ccrystaltextview2.cpp: Fix the GitHub issue #109 Frustrating text selection bug' partially
Takashi Sawanaka [Sun, 6 Jan 2019 11:28:15 +0000 (20:28 +0900)]
Cppcheck: Variable '...' is assigned in constructor body. Consider performing initialization in initialization list.
Takashi Sawanaka [Sun, 6 Jan 2019 11:04:30 +0000 (20:04 +0900)]
Cppcheck: Either the condition '....empty()' is redundant or content is accessed out of bounds when content is empty.
Takashi Sawanaka [Sun, 6 Jan 2019 10:56:45 +0000 (19:56 +0900)]
Cppcheck: Memory leak: hData
Takashi Sawanaka [Sat, 5 Jan 2019 14:23:14 +0000 (23:23 +0900)]
Fix Warning C26437 Do not slice (es.63).
Takashi Sawanaka [Sat, 5 Jan 2019 13:46:00 +0000 (22:46 +0900)]
Fix Warning C26444 Avoid unnamed objects with custom construction and destruction (es.84).
GreyMerlin [Sat, 5 Jan 2019 01:01:09 +0000 (17:01 -0800)]
Add `hekxedit.h` to project files
* Improve IntelliSense's handling of `hekxedit.h` declarations
* VS2015, VS2017, VS2019
GreyMerlin [Fri, 4 Jan 2019 23:48:27 +0000 (15:48 -0800)]
Distinguish between Aborted and "not yet compared" files (3)
* Repair visual blemish on icon
GreyMerlin [Fri, 4 Jan 2019 22:54:01 +0000 (14:54 -0800)]
Propagate compare FileIO error status to parent directories (2)
* Allow hard FileIO error (or STOP error) status to be propagated to parent
directories during `Ctrl-F5` (Refresh Selected) operations.
GreyMerlin [Fri, 4 Jan 2019 19:32:02 +0000 (11:32 -0800)]
Fix obscure memory leak
A memory leak can be caused under the following circumstance:
* Compare a directory structure with a number of folders and/or files.
* Select one (or more) items.
* Outside of WinMerge (i.e. without WinMerge's knowledge) delete one (or more) of the files or
folders that is already selected in WinMerge.
* Switch back to WinMerge, and then select "View | Refresh Selected" from menu (or type
`Ctrl-F5`) to rescan only the selected items (note: some of these are now missing files or folders)
WinMerge will correctly detect that the files/folders are missing while rescanning, and will
modify its internal directory structure tree accordingly. HOWEVER - WinMerge will **not**
actually `delete` the disconnected tree item's memory. Thus causing a memory leak. This will be
visible with a Debug build of WinMerge.
The fix is both simple and allows the surrounding code to be cleaned up a little bit.
GreyMerlin [Wed, 2 Jan 2019 21:22:40 +0000 (13:22 -0800)]
Add `NDEBUG` preprocessor for Release builds
* Some debugging code is still enabled without `NDEBUG`, even if `_DEBUG` is not specified. In
particular, the `assert()` macro (note all lower case) remains active.
* The Release builds of the various **Poco** libraries have always been compiled with `NDEBUG`,
likewise for the **UnitTests** project.
GreyMerlin [Fri, 28 Dec 2018 22:40:32 +0000 (14:40 -0800)]
Distinguish between Aborted and "not yet compared" files (2)
* Use a new icon for files "not yet compared". This new icon is `Src/res/fileunknown.ico`.
Derived from existing icon `Src/res/MergeDoc.ico` with an overlayed blue question mark.
GreyMerlin [Fri, 28 Dec 2018 19:34:17 +0000 (11:34 -0800)]
Distinguish between Aborted and "not yet compared" files
* Add new icon resource `IDI_FILE`(equated currently to the existing "res\\MergeDoc.ico" Icon file)
* Use `IDI_FILE` (rather than `ID_ABORT`) for files that have not been compared
* Continue to use `IDI_ABORT` for files whose comparisons are terminated by the "Stop" button.
GreyMerlin [Fri, 28 Dec 2018 01:58:07 +0000 (17:58 -0800)]
Propagate compare FileIO error status to parent directories
* Hard FileIO error status was not being propagated to parent directories, thus showing that the
top-level directories compared as "Same", when in fact there were serious problems deeper in the
folder structure.
* Additionally, if a Folder comparison is aborted with the STOP button, the parent directories are
now marked with an error status to make it easier to visually determine which file comparison(s)
were interrupted.
GreyMerlin [Fri, 28 Dec 2018 01:22:06 +0000 (17:22 -0800)]
Repair Compare Statistics dialogs
* Add proper icon for identical folders
* Account for identical folders in the Folder column
* Properly calculate number of Binary Identical and Binary Different items
GreyMerlin [Sat, 29 Dec 2018 19:58:20 +0000 (11:58 -0800)]
Additional low-level cleanups (5)
* More `if(ptr)` changed to `if(ptr != nullptr)`
* More 'ptr=0` changed to `ptr = nullptr`
* More changing '0' parameters to `nullptr` as appropriate
GreyMerlin [Tue, 25 Dec 2018 02:59:44 +0000 (18:59 -0800)]
Additional low-level cleanups (4)
GreyMerlin [Mon, 24 Dec 2018 23:26:19 +0000 (15:26 -0800)]
Additional low-level cleanups (3)
GreyMerlin [Mon, 24 Dec 2018 22:59:59 +0000 (14:59 -0800)]
Additional low-level cleanups (2)
* More `while (1)` becomes `while (true)`
* More use of `ptr != nullptr` in conditionals
* Also `handle!=nullptr`in conditionals
* Also `while (ptr)` becomes `while (ptr != nullptr)`
* Add `{ ... }` brackets to a `do ... while()`
* Some `while(int)` changed to `while (int!=0)`
GreyMerlin [Sun, 23 Dec 2018 23:40:27 +0000 (15:40 -0800)]
Additional low-level cleanups for ...
* More `BOOL`, `TRUE`, `FALSE` become `bool`, `true`, `false` where appropriate
* Also `while (1)` becomes `while (true)`
* Also `while (ptr)` becomes `while (ptr != nullptr)`
* Cleanup related comments
Takashi Sawanaka [Fri, 4 Jan 2019 11:54:40 +0000 (20:54 +0900)]
Fix bitbucket issue #135: Binary File options don't change from default
Takashi Sawanaka [Fri, 4 Jan 2019 09:34:15 +0000 (18:34 +0900)]
Revert the commit 'PreTranslateMessage() is still needed for Alt+1, Alt+S, and so on. (related to GitHub PR #119)'
Takashi Sawanaka [Fri, 4 Jan 2019 07:07:10 +0000 (16:07 +0900)]
OpenView.cpp: The OpenView dialog size should track the WinMerge screen size when that size shrinks below the width of the dialog. (related to GitHub PR #119)
Takashi Sawanaka [Fri, 4 Jan 2019 07:05:59 +0000 (16:05 +0900)]
OpenView.*: PreTranslateMessage() is still needed for Alt+1, Alt+S, and so on. (related to GitHub PR #119)
datadiode [Thu, 3 Jan 2019 13:07:14 +0000 (14:07 +0100)]
OpenDlg: Expose cleaner moving/resizing behavior esp. in non-maximized state
Takashi Sawanaka [Tue, 1 Jan 2019 15:43:40 +0000 (00:43 +0900)]
Update Japanese.po
Takashi Sawanaka [Tue, 1 Jan 2019 15:43:26 +0000 (00:43 +0900)]
Add support for merging word level diffs in selection.
Demo: https://i.gyazo.com/
af18960bd1f121213a2cd9287cae9cf4.gif
Takashi Sawanaka [Tue, 1 Jan 2019 14:37:35 +0000 (23:37 +0900)]
Replace the image in rotate2.ico with WinMerge's Refresh-based icon
datadiode [Tue, 1 Jan 2019 10:35:59 +0000 (11:35 +0100)]
OpenDlg: Alternatively to Swap buttons, allow drag & drop between filetype icons
Rukoto Luther [Sun, 30 Dec 2018 06:37:57 +0000 (15:37 +0900)]
Improvements Japanese
Takashi Sawanaka [Sat, 29 Dec 2018 08:32:04 +0000 (17:32 +0900)]
Update Turkish.po. sf.net patch#3036
Takashi Sawanaka [Wed, 26 Dec 2018 13:45:57 +0000 (22:45 +0900)]
editlib: Fix Bitbucket issue #134. Use wcwidth() like WinMerge2011
Takashi Sawanaka [Sun, 23 Dec 2018 04:22:55 +0000 (13:22 +0900)]
Merge
Takashi Sawanaka [Sun, 23 Dec 2018 04:07:06 +0000 (13:07 +0900)]
Merge.cpp: Show translated HTML help if exists
Takashi Sawanaka [Sun, 23 Dec 2018 03:51:29 +0000 (12:51 +0900)]
Update DownloadDeps.cmd
Takashi Sawanaka [Sun, 23 Dec 2018 01:27:05 +0000 (10:27 +0900)]
Merge pull request #116 from vlakoff/manual
Some fixes in the manual
vlakoff [Sat, 22 Dec 2018 21:49:21 +0000 (22:49 +0100)]
Some fixes in the manual
Takashi Sawanaka [Sat, 22 Dec 2018 10:47:06 +0000 (19:47 +0900)]
Merge pull request #115 from GreyMerlin/master
Various minor updates, plus preparation for VS2019
GreyMerlin [Fri, 21 Dec 2018 22:43:22 +0000 (14:43 -0800)]
In Preparation for VS2019 (now in Preview) (6)
* Update "Build Software:" determination in `ConfigLog.cpp'
GreyMerlin [Fri, 21 Dec 2018 22:02:46 +0000 (14:02 -0800)]
In Preparation for VS2019 (now in Preview) (5)
* Bring the `Build*.vs2019.cmd` files up-to-date with recent changes to the `Build*.vs2017.cmd`
files
GreyMerlin [Thu, 13 Dec 2018 19:00:40 +0000 (11:00 -0800)]
In Preparation for VS2019 (now in Preview) (4)
* Update various `*.sln` properties
* Update various `*.vcxproj` properties
GreyMerlin [Wed, 12 Dec 2018 20:21:06 +0000 (12:21 -0800)]
In Preparation for VS2019 (now in Preview) (3)
* Update Boost version checking for VS2019 Preview 1
GreyMerlin [Wed, 12 Dec 2018 20:03:17 +0000 (12:03 -0800)]
In Preparation for VS2019 (now in Preview) (2)
* Copy the various *.vs2017.* solution and project files as new *.vs2019.* files
GreyMerlin [Mon, 17 Dec 2018 19:43:32 +0000 (11:43 -0800)]
Update various .sln and .vcxproj properties to latest VS2017 levels
GreyMerlin [Wed, 12 Dec 2018 20:19:28 +0000 (12:19 -0800)]
Update Boost version checking for VS2017 version 15.9.2
GreyMerlin [Wed, 12 Dec 2018 20:23:44 +0000 (12:23 -0800)]
Update "Legal Copyright" for ShellExtension.dll to 2019
Takashi Sawanaka [Thu, 20 Dec 2018 23:12:42 +0000 (08:12 +0900)]
Update appveyor.yml
Takashi Sawanaka [Thu, 20 Dec 2018 23:07:53 +0000 (08:07 +0900)]
Build*.cmd: Allow specifying platform in command line parameter
Takashi Sawanaka [Thu, 20 Dec 2018 23:07:01 +0000 (08:07 +0900)]
DownloadDeps.cmd: Change download directory to build/WinMergeDownloadDeps(2)
Takashi Sawanaka [Thu, 20 Dec 2018 23:05:57 +0000 (08:05 +0900)]
CreateRelease.cmd: Revert default compiler to VS2017
Takashi Sawanaka [Tue, 18 Dec 2018 23:02:37 +0000 (08:02 +0900)]
Merge
Takashi Sawanaka [Tue, 18 Dec 2018 23:01:19 +0000 (08:01 +0900)]
Merge pull request #114 from pgert/master
Swedish translation > InnoSetup - Pronoun corrections
Takashi Sawanaka [Tue, 18 Dec 2018 23:00:35 +0000 (08:00 +0900)]
BuildArc.cmd: Allow specifying platform in command line parameter
Takashi Sawanaka [Tue, 18 Dec 2018 22:57:53 +0000 (07:57 +0900)]
DownloadDeps.cmd: Change download directory to build/WinMergeDownloadDeps
Takashi Sawanaka [Tue, 18 Dec 2018 22:56:21 +0000 (07:56 +0900)]
Bump revision to 2.16.1.0
pgert [Tue, 18 Dec 2018 15:55:25 +0000 (16:55 +0100)]
Swedish translation > InnoSetup - Pronoun corrections
Takashi Sawanaka [Mon, 17 Dec 2018 14:48:36 +0000 (23:48 +0900)]
Update appveyor.yml
Takashi Sawanaka [Mon, 17 Dec 2018 14:20:21 +0000 (23:20 +0900)]
Merge
Takashi Sawanaka [Mon, 17 Dec 2018 14:14:03 +0000 (23:14 +0900)]
Add appveyor.yml
Takashi Sawanaka [Mon, 17 Dec 2018 13:44:33 +0000 (13:44 +0000)]
Merged in Tichij/winmerge (pull request #7)
Update for Lithuanian translation
Tichij [Thu, 13 Dec 2018 08:16:52 +0000 (10:16 +0200)]
Update for Lithuanian translation
Takashi Sawanaka [Wed, 12 Dec 2018 23:01:58 +0000 (08:01 +0900)]
MergeDoc.cpp: Add "Don't ask this question again" checkbox to the messagebox "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?"
Takashi Sawanaka [Wed, 12 Dec 2018 22:45:47 +0000 (07:45 +0900)]
Merge.rc: Fix conflicted menu accelerators
Takashi Sawanaka [Wed, 12 Dec 2018 12:36:45 +0000 (21:36 +0900)]
CreateTranslatedRcFiles.vbs: Fix GitHub issue #113. The last translated message in *.po file was lost if the po file is not terminated with CR+LF or LF.
Takashi Sawanaka [Tue, 11 Dec 2018 23:09:33 +0000 (08:09 +0900)]
Merge pull request #112 from pgert/master
Swedish translation - Minor corrections
pgert [Tue, 11 Dec 2018 16:47:40 +0000 (17:47 +0100)]
Swedish translation - Minor corrections
Takashi Sawanaka [Tue, 11 Dec 2018 13:49:20 +0000 (22:49 +0900)]
Add FindText test
Takashi Sawanaka [Sun, 9 Dec 2018 23:17:08 +0000 (08:17 +0900)]
Merge
Takashi Sawanaka [Sun, 9 Dec 2018 23:15:32 +0000 (08:15 +0900)]
Bump revision to 2.16.1
Takashi Sawanaka [Sun, 9 Dec 2018 23:15:06 +0000 (08:15 +0900)]
ccrystalltextview.cpp: Fix upward and downward search not work correctly
Takashi Sawanaka [Sun, 9 Dec 2018 12:40:43 +0000 (21:40 +0900)]
Merge pull request #111 from GreyMerlin/master
Remove `nFinalNullLines` checking, disabled by an earlier commit
GreyMerlin [Sun, 9 Dec 2018 01:10:50 +0000 (17:10 -0800)]
In Preparation for VS2019 (now in Preview)
VS2017 version 15.9.3 has begun issuing the following warning for all compilations using the
v141_xp toolset (i.e. all of WinMerge). VS2019 (now in Preview 1) still optionally provides the
v141_xp toolset (it has to be installed by the VS Installer); it too generates the same warning.
" ... PlatformToolsets\v141_xp\Toolset.targets(39,5):
warning MSB8051: Support for targeting Windows XP is deprecated and will not be present in
future releases of Visual Studio. Please see https://go.microsoft.com/fwlink/?linkid=
2023588
for more information."
* The temporary way to suppress this warning is to set the <XPDeprecationWarning> property
to `false` for each build configuration in each `*.vs2017.vcxproj` file. There is no Solution or
Project "wizard" interface to do this; these property changes were inserted manually. This
suppression seems to work for both VS2017 and VS2019
* It appears that at some point VS2019 will stop supporting Win XP ... but everything is still
functional at this point
GreyMerlin [Sat, 8 Dec 2018 23:31:40 +0000 (15:31 -0800)]
Remove `nFinalNullLines` checking, disabled by an earlier commit
* Github Commit
1b52d84 "MergeDoc.cpp: Fix github issue #106 ..." effectively removed this code
with a `#if 0`. This present commit actually removes the code, but preserves ASSERT checking to
make sure that all `m_ptBuf[]` structures have the exact same length.
* These lines of code (from GitHub Commit
51519fc, 16 Jun 2018) were an early attempt to solve
various problems with the last line(s) of a comparison. Subsequent changes made these lines
irrelevant. Independently they were shown to be erroneous.
Takashi Sawanaka [Sat, 8 Dec 2018 03:36:36 +0000 (12:36 +0900)]
Merge pull request #110 from serhioV/patch-1
Updated the copyright year to 2019, actually
serhio [Fri, 7 Dec 2018 14:48:28 +0000 (15:48 +0100)]
Updated the copyright year to 2019, actually
Updated the copyright year to 2019, actually
Takashi Sawanaka [Wed, 5 Dec 2018 13:09:56 +0000 (22:09 +0900)]
Fix a typo
Takashi Sawanaka [Wed, 5 Dec 2018 13:08:26 +0000 (22:08 +0900)]
ccrystaltextview2.cpp: Fix the GitHub issue #109 Frustrating text selection bug (2)
Takashi Sawanaka [Tue, 4 Dec 2018 23:10:14 +0000 (08:10 +0900)]
ccrystaltextview2.cpp: Fix the GitHub issue #109 Frustrating text selection bug
Takashi Sawanaka [Sun, 2 Dec 2018 16:45:02 +0000 (01:45 +0900)]
Add File/Recompare As/Image menu item
Takashi Sawanaka [Sun, 2 Dec 2018 16:39:39 +0000 (01:39 +0900)]
*.po: Add BOM
Takashi Sawanaka [Sun, 2 Dec 2018 16:38:40 +0000 (01:38 +0900)]
Serbian.po: Restore broken Serbian.po
Takashi Sawanaka [Sun, 2 Dec 2018 16:29:15 +0000 (01:29 +0900)]
Merge.rc: Widen the width of labels in Options dialog (GitHub#108)
Takashi Sawanaka [Sun, 2 Dec 2018 14:24:02 +0000 (23:24 +0900)]
Rename Brazilian_Portguese.isl to Brazilian.isl (GitHub#108)
Takashi Sawanaka [Sun, 2 Dec 2018 13:31:47 +0000 (22:31 +0900)]
Update Brazilian Portuguese translation. Submitted by Felipe (GitHub#108)
Takashi Sawanaka [Fri, 30 Nov 2018 15:01:54 +0000 (00:01 +0900)]
PreferencesDlg.cpp: Fix wrong pointer cast (Bitbucket#128)
Tim Gerundt [Wed, 28 Nov 2018 03:37:48 +0000 (04:37 +0100)]
Fix some problems in translations status
Tim Gerundt [Wed, 28 Nov 2018 03:36:22 +0000 (04:36 +0100)]
Use UTF-8 meta tags for WinMerge POT file
Takashi Sawanaka [Sun, 25 Nov 2018 22:55:45 +0000 (07:55 +0900)]
Update Swedish translation. sf.net#3035
Takashi Sawanaka [Wed, 21 Nov 2018 11:14:54 +0000 (20:14 +0900)]
Bump revision to 2.16.0
Takashi Sawanaka [Tue, 20 Nov 2018 23:13:44 +0000 (08:13 +0900)]
Test.cpp: Add FileCompare.LastLineEOL test
Takashi Sawanaka [Mon, 19 Nov 2018 23:26:54 +0000 (08:26 +0900)]
Add Testing/Data/LastLineEOL/*