OSDN Git Service

winmerge-jp/winmerge-jp.git
5 years agoUpdate release notes and changelog for 2.16.1
Takashi Sawanaka [Sun, 24 Feb 2019 14:09:54 +0000 (23:09 +0900)]
Update release notes and changelog for 2.16.1

--HG--
branch : stable

5 years agoReduce unnecessary drawing
Takashi Sawanaka [Sun, 24 Feb 2019 10:49:03 +0000 (19:49 +0900)]
Reduce unnecessary drawing

--HG--
branch : stable

5 years agoUse COptionsMgr instead of GetProfile*() and WriteProfile*()
Takashi Sawanaka [Sun, 24 Feb 2019 07:41:35 +0000 (16:41 +0900)]
Use COptionsMgr instead of GetProfile*() and WriteProfile*()

--HG--
branch : stable

5 years agoUpdate Contributors.txt
Takashi Sawanaka [Sun, 24 Feb 2019 07:15:17 +0000 (16:15 +0900)]
Update Contributors.txt

--HG--
branch : stable

5 years agoBulgarian.po edited online with Bitbucket
Yanko Yankov [Wed, 20 Feb 2019 22:28:56 +0000 (22:28 +0000)]
Bulgarian.po edited online with Bitbucket

--HG--
branch : stable

5 years agoFix sf.net ticket #2215: Cancelation of selection range with reverse indent
Takashi Sawanaka [Mon, 18 Feb 2019 22:42:53 +0000 (07:42 +0900)]
Fix sf.net ticket #2215: Cancelation of selection range with reverse indent
(Revert the commit "Improve handling of last lines in files (4) (b3d10de90b11)" partially)

--HG--
branch : stable

5 years ago'Automatically scroll to first difference' option did not work since 0db5699a19e7
Takashi Sawanaka [Sun, 17 Feb 2019 11:57:06 +0000 (20:57 +0900)]
'Automatically scroll to first difference' option did not work since 0db5699a19e7

--HG--
branch : stable

5 years agoChanged EOL from Unix (LF) to Windows (CR LF), because not shows correctly in Windows...
Tichij [Tue, 22 Jan 2019 11:05:12 +0000 (13:05 +0200)]
Changed EOL from Unix (LF) to Windows (CR LF), because not shows correctly in Windows Notepad.

--HG--
branch : stable

5 years agoMinor improvements of Lithuanian translation
Tichij [Tue, 12 Feb 2019 11:11:23 +0000 (13:11 +0200)]
Minor improvements of Lithuanian translation

--HG--
branch : stable

5 years agoRussian.po edited online with Bitbucket
Timon34 [Tue, 5 Feb 2019 18:33:45 +0000 (18:33 +0000)]
Russian.po edited online with Bitbucket
Fixed 1 typo, improved 2 strings translation, changed translators list

--HG--
branch : stable

5 years agoMergeStatusBar.cpp: Reduce unnecessary drawing
Takashi Sawanaka [Sun, 3 Feb 2019 10:40:00 +0000 (19:40 +0900)]
MergeStatusBar.cpp: Reduce unnecessary drawing

--HG--
branch : stable

5 years agoTempFile.cpp: Use Poco::File::remove() instead of SHFileOperation()
Takashi Sawanaka [Sun, 3 Feb 2019 05:43:54 +0000 (14:43 +0900)]
TempFile.cpp: Use Poco::File::remove() instead of SHFileOperation()
SHFileOperation() is slow.

--HG--
branch : stable

5 years agoUpdate .hgignore
Takashi Sawanaka [Sun, 3 Feb 2019 02:57:27 +0000 (11:57 +0900)]
Update .hgignore

--HG--
branch : stable

5 years agoFix sf.net ticket #2213: Left and Right files swap after losing focus v2.16.0.0
Takashi Sawanaka [Sun, 3 Feb 2019 02:57:04 +0000 (11:57 +0900)]
Fix sf.net ticket #2213: Left and Right files swap after losing focus v2.16.0.0

--HG--
branch : stable

5 years agoReduce application startup time by reducing the number of open-close of HKEY (2)
Takashi Sawanaka [Sun, 3 Feb 2019 02:56:02 +0000 (11:56 +0900)]
Reduce application startup time by reducing the number of open-close of HKEY (2)
(Anti-virus software makes creating the handle of registry key slow)

--HG--
branch : stable

5 years agoRemove unused variables
Takashi Sawanaka [Fri, 1 Feb 2019 15:39:51 +0000 (00:39 +0900)]
Remove unused variables

--HG--
branch : stable

5 years agoRemove WMPROFILE
Takashi Sawanaka [Fri, 1 Feb 2019 15:36:57 +0000 (00:36 +0900)]
Remove WMPROFILE

--HG--
branch : stable

5 years agoReduce application startup time by reducing the number of open-close of HKEY
Takashi Sawanaka [Fri, 1 Feb 2019 15:32:14 +0000 (00:32 +0900)]
Reduce application startup time by reducing the number of open-close of HKEY
(Anti-virus software makes creating the handle of registry key slow)

--HG--
branch : stable

5 years agoShellExtension: Change the encoding of *.rc and *.po files to UTF-8
Takashi Sawanaka [Fri, 1 Feb 2019 15:29:48 +0000 (00:29 +0900)]
ShellExtension: Change the encoding of *.rc and *.po files to UTF-8

--HG--
branch : stable

5 years agoRussian.po edited online with Bitbucket
Timon34 [Thu, 31 Jan 2019 17:05:45 +0000 (17:05 +0000)]
Russian.po edited online with Bitbucket

Compared https://bitbucket.org/winmerge/winmerge/src/b3087026c3d70d6919418e1bd6ed9825f320db72/Translations/ShellExtension/Russian.po and https://bitbucket.org/winmerge/winmerge/raw/5b8ae66a0a1f748b0377807ed6183d60327cebb8/ShellExtension/Languages/ShellExtensionRussian.rc translations.

Made final version. Many thanks to Yury Lebedev https://bitbucket.org/yuryleb/

Not quite sure that fixed these 2 strings, think they remain from previous translation.

Found where problems with CP come from:
Takashi Sawanaka 3798cd9 Russian.po: Change the file encoding from UTF-8 to CP-1251 2019-01-16
https://bitbucket.org/winmerge/winmerge/src/3798cd9cba3d3984b6271d904dd7b9ded58ffce8/Translations/ShellExtension/Russian.po

Do not know how it worked before, but because of 'Change the file encoding from UTF-8 to CP-1251', everything became unreadable. Probably, this edit should be rolled back.

--HG--
branch : stable

5 years agoRussian.po edited online with Bitbucket
Timon34 [Thu, 31 Jan 2019 06:21:52 +0000 (06:21 +0000)]
Russian.po edited online with Bitbucket
Translated maximum what was possible at the moment. This is final verified version. Again made many fixes meticulously checking with the program interface. By the way, found several sections that are not present in the language file - 'Edit - Options- Compare - Binary - Frhed Settings' - View Settings + Binary mode + Character set. They should be added because they are rather difficult for ordinary people to understand.

--HG--
branch : stable

5 years agoRussian.po edited online with Bitbucket
Timon34 [Wed, 30 Jan 2019 10:06:55 +0000 (10:06 +0000)]
Russian.po edited online with Bitbucket
Made about 25 fixes and new translations

--HG--
branch : stable

5 years agoRussian.po edited online with Bitbucket
Timon34 [Mon, 28 Jan 2019 10:51:55 +0000 (10:51 +0000)]
Russian.po edited online with Bitbucket
Made several strings translation

--HG--
branch : stable

5 years agoFix Bitbucket issue #140: Click doesn't trigger document to scroll in Location pane...
Takashi Sawanaka [Wed, 30 Jan 2019 10:11:12 +0000 (19:11 +0900)]
Fix Bitbucket issue #140: Click doesn't trigger document to scroll in Location pane under circumstance

--HG--
branch : stable

5 years agoMergeDoc.cpp: Recover lost compatibility
Takashi Sawanaka [Sun, 27 Jan 2019 23:01:51 +0000 (08:01 +0900)]
MergeDoc.cpp: Recover lost compatibility

--HG--
branch : stable

5 years agoTest.cpp: Do not change the registry values while testing
Takashi Sawanaka [Sun, 27 Jan 2019 22:59:31 +0000 (07:59 +0900)]
Test.cpp: Do not change the registry values while testing

--HG--
branch : stable

5 years agoFix bitbucket issue #138: Unique files are not shown
Takashi Sawanaka [Sat, 26 Jan 2019 15:27:39 +0000 (00:27 +0900)]
Fix bitbucket issue #138: Unique files are not shown
When comparing empty file and nonexistent file, `DIFFCODE::SAME` flag is set to the variable `code`, so change the flag to `DIFFCODE::DIFF`

--HG--
branch : stable

5 years agoRussian.po edited online with Bitbucket
Timon34 [Fri, 25 Jan 2019 10:13:44 +0000 (10:13 +0000)]
Russian.po edited online with Bitbucket
Made a huge number of fixes in previous translation, fixes typos, ...

--HG--
branch : stable

5 years agoRussian.isl edited online with Bitbucket
Timon34 [Thu, 24 Jan 2019 06:20:51 +0000 (06:20 +0000)]
Russian.isl edited online with Bitbucket
Made some fixes + translated Localization Components section

--HG--
branch : stable

5 years agoappveyor.yml: enable the eol extension
Takashi Sawanaka [Wed, 23 Jan 2019 16:13:11 +0000 (01:13 +0900)]
appveyor.yml: enable the eol extension

--HG--
branch : stable

5 years agoRussian.po edited online with Bitbucket
Timon34 [Wed, 23 Jan 2019 12:12:25 +0000 (12:12 +0000)]
Russian.po edited online with Bitbucket
Again made many fixes and new translations

--HG--
branch : stable

5 years agoMergeEditSplitterView: Don't claim input focus upon mouse click / Fix an apparent...
datadiode [Wed, 23 Jan 2019 11:20:40 +0000 (12:20 +0100)]
MergeEditSplitterView: Don't claim input focus upon mouse click / Fix an apparent afx_msg vs. virtual confusion / Mark overrides as such

--HG--
branch : stable

5 years agoClarification as per https://github.com/WinMerge/winmerge-v2/issues/41
datadiode [Wed, 23 Jan 2019 09:44:23 +0000 (10:44 +0100)]
Clarification as per https://github.com/WinMerge/winmerge-v2/issues/41

--HG--
branch : stable

5 years agoMergeDoc.cpp: If the command line option /x is specified and the files are identical...
Takashi Sawanaka [Tue, 22 Jan 2019 23:12:24 +0000 (08:12 +0900)]
MergeDoc.cpp: If the command line option /x is specified and the files are identical, EOL status on the status bar

--HG--
branch : stable

5 years agoFix sf.net issue #2211: end of line documentation
Takashi Sawanaka [Mon, 21 Jan 2019 14:54:10 +0000 (23:54 +0900)]
Fix sf.net issue #2211: end of line documentation

--HG--
branch : stable

5 years agoAdd Timon34 to Contributers.txt
Takashi Sawanaka [Sun, 20 Jan 2019 14:08:10 +0000 (23:08 +0900)]
Add Timon34 to Contributers.txt

--HG--
branch : stable

5 years agoDelay calling InitialUpdateFrame() to reduce unnecessary drawing
Takashi Sawanaka [Sun, 20 Jan 2019 11:38:50 +0000 (20:38 +0900)]
Delay calling InitialUpdateFrame() to reduce unnecessary drawing

--HG--
branch : stable

5 years agoccrystaltextview.cpp: Ctrl+F3 key did not work correctly
Takashi Sawanaka [Sun, 20 Jan 2019 02:08:06 +0000 (11:08 +0900)]
ccrystaltextview.cpp: Ctrl+F3 key did not work correctly

--HG--
branch : stable

5 years agoRussian.po: Correct the position of double quotation mark
Takashi Sawanaka [Sat, 19 Jan 2019 13:25:03 +0000 (22:25 +0900)]
Russian.po: Correct the position of double quotation mark

--HG--
branch : stable

5 years agoMergeLang.vs*.vcxproj: Revert incorrectly changed OutDir
Takashi Sawanaka [Sat, 19 Jan 2019 13:19:21 +0000 (22:19 +0900)]
MergeLang.vs*.vcxproj: Revert incorrectly changed OutDir

--HG--
branch : stable

5 years agoFix Bitbucket issue #137: Shell Integration "Enable Advanced Menu" disabled when...
Takashi Sawanaka [Sat, 19 Jan 2019 05:17:30 +0000 (14:17 +0900)]
Fix Bitbucket issue #137: Shell Integration "Enable Advanced Menu" disabled when instaling 32-bit WinMerge on 64-bit Windows

--HG--
branch : stable

5 years agoFix for https://github.com/GreyMerlin/winmerge-v2/commit/7823411ed17d2364c026075096f0...
Takashi Sawanaka [Sat, 19 Jan 2019 02:02:38 +0000 (11:02 +0900)]
Fix for https://github.com/GreyMerlin/winmerge-v2/commit/7823411ed17d2364c026075096f093c8b24c13b0#commitcomment-31951237

--HG--
branch : stable

5 years ago Don't pass `DIFFITEM *` by casting to `uintptr_t` (3)
GreyMerlin [Fri, 18 Jan 2019 00:06:00 +0000 (16:06 -0800)]
 Don't pass `DIFFITEM *` by casting to `uintptr_t` (3)

* Improve comments, especially related to the doubly linked list structure of DIFFITEM siblings.
* see commit comment at
https://github.com/WinMerge/winmerge-v2/commit/c30b5e126a1e2679db8071ea043f39655fa68630#commitcomment-31972299

--HG--
branch : stable

5 years agoRussian.isl edited online with Bitbucket
Timon34 [Thu, 17 Jan 2019 05:23:56 +0000 (05:23 +0000)]
Russian.isl edited online with Bitbucket
Improved InnoSetup Russian translation

--HG--
branch : stable

5 years agoRussian.po edited online with Bitbucket
Timon34 [Wed, 16 Jan 2019 17:12:46 +0000 (17:12 +0000)]
Russian.po edited online with Bitbucket

--HG--
branch : stable

5 years agoRussian.po: Change the file encoding from UTF-8 to CP-1251
Takashi Sawanaka [Wed, 16 Jan 2019 14:53:20 +0000 (23:53 +0900)]
Russian.po: Change the file encoding from UTF-8 to CP-1251

--HG--
branch : stable

5 years agoRussian.po edited online with Bitbucket
Timon34 [Wed, 16 Jan 2019 05:22:47 +0000 (05:22 +0000)]
Russian.po edited online with Bitbucket
Made ShellExtension Russian translation (attempt 3)

--HG--
branch : stable

5 years agoRemove unused declarations
Takashi Sawanaka [Mon, 14 Jan 2019 14:05:17 +0000 (23:05 +0900)]
Remove unused declarations

--HG--
branch : stable

5 years agoRussian.po edited online with Bitbucket
Timon34 [Wed, 16 Jan 2019 11:46:35 +0000 (11:46 +0000)]
Russian.po edited online with Bitbucket
Worked hard to fix Russian translation

--HG--
branch : stable

5 years agoRussian.po edited online with Bitbucket
Timon34 [Wed, 16 Jan 2019 05:05:02 +0000 (05:05 +0000)]
Russian.po edited online with Bitbucket
Made Russian translation for ShellExtension

--HG--
branch : stable

5 years agoanother `nullptr` cleanup
GreyMerlin [Tue, 15 Jan 2019 23:53:43 +0000 (15:53 -0800)]
another `nullptr` cleanup

--HG--
branch : stable

5 years agoDon't pass `DIFFITEM *` by casting to `uintptr_t` (2)
GreyMerlin [Mon, 14 Jan 2019 23:33:03 +0000 (15:33 -0800)]
Don't pass `DIFFITEM *` by casting to `uintptr_t` (2)

* Improve linkage isolation
* Move `enum ViewCustomFlags` from `DirActions.h` to `DiffItem.h`
* Keep `diffFileInfo[]` near front of DIFFITEM class for small offsets (mainly to prevent
"mistakes" from over-writing linkage values.

--HG--
branch : stable

5 years agoDon't pass `DIFFITEM *` by casting to `uintptr_t` (1)
GreyMerlin [Sat, 5 Jan 2019 21:01:22 +0000 (13:01 -0800)]
Don't pass `DIFFITEM *` by casting to `uintptr_t` (1)

* Change DIFFITEM from `struct` to `class`
* Incorporate `ListEntry` class directly into DIFFITEM
* Change handling of m_Root (now m_pRoot) and `children`
* Eliminate all casting between `DIFFITEM *` and `uintptr_t`
* Isolate all manipulation of `DIFFITEM` linkage to be within the DIFFITEM class.

* Add `#include "StdAfx.h"` and `#define new DEBUG_NEW` to a few files
* Cleanup various related comments
* Eliminate the `ListEntry.h` file.  Also, it was never part of the project's Solution Explorer
tree.

--HG--
branch : stable

5 years agoRussian.po edited online with Bitbucket
Timon34 [Tue, 15 Jan 2019 20:50:07 +0000 (20:50 +0000)]
Russian.po edited online with Bitbucket
Made some more fixes in Russian translation

--HG--
branch : stable

5 years agoRussian.po edited online with Bitbucket
Timon34 [Tue, 15 Jan 2019 20:03:19 +0000 (20:03 +0000)]
Russian.po edited online with Bitbucket
Made some fixes in Russian translation

--HG--
branch : stable

5 years agoSome more minor corrections.
Tichij [Mon, 14 Jan 2019 09:02:39 +0000 (11:02 +0200)]
Some more minor corrections.

--HG--
branch : stable

5 years agoFix error C4703: potentially uninitialized local pointer variable 'pszNew' used
Takashi Sawanaka [Mon, 14 Jan 2019 09:03:48 +0000 (18:03 +0900)]
Fix error C4703: potentially uninitialized local pointer variable 'pszNew' used

--HG--
branch : stable

5 years agoDiffTextBuffer: Create Unicode temp files (makes EscapeControlChars() obsolete)
datadiode [Mon, 14 Jan 2019 07:33:35 +0000 (08:33 +0100)]
DiffTextBuffer: Create Unicode temp files (makes EscapeControlChars() obsolete)

While transcoding UTF-16 input to a relaxed superset of UTF-8 so diffutils can make sense of it, prepare_text_end() (located in diffutils/src/io.c) translates NUL chars into 2 byte sequences so as to not create bogus string terminators. That was also the single remaining purpose which EscapeControlChars() was still serving after EditLib was enabled to show control characters in hexadecimal notation with a rounded rectangle around them. Now that the NUL char handling built into prepare_text_end() applies, EscapeControlChars() is no longer needed.

--HG--
branch : stable

5 years agoMainFrm.h: Fix a problem which the size of header paths is not updated when opening...
Takashi Sawanaka [Mon, 14 Jan 2019 01:38:39 +0000 (10:38 +0900)]
MainFrm.h: Fix a problem which the size of header paths is not updated when opening identical files from OpenDlg.

--HG--
branch : stable

5 years agoOpenDlg: Avoid retaining bogus filetype icons from previous selections
datadiode [Sun, 13 Jan 2019 17:30:43 +0000 (18:30 +0100)]
OpenDlg: Avoid retaining bogus filetype icons from previous selections

--HG--
branch : stable

5 years agoLanguageSelect.cpp: Remove unused function
Takashi Sawanaka [Sun, 13 Jan 2019 17:14:00 +0000 (02:14 +0900)]
LanguageSelect.cpp: Remove unused function

--HG--
branch : stable

5 years agoTranslate strings without using MergeLang.dll
Takashi Sawanaka [Sun, 13 Jan 2019 17:00:24 +0000 (02:00 +0900)]
Translate strings without using MergeLang.dll

--HG--
branch : stable

5 years agoMainFrm.h: Fix a problem which title is not updated when opening files from DirView.
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.

--HG--
branch : stable

5 years agoChildFrm.cpp: Remove no longer needed flicker free hack thanks to GitHub PR#9
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

--HG--
branch : stable

5 years agoInstaller: Upgrade to 7-Zip 18.06
Takashi Sawanaka [Sat, 12 Jan 2019 08:57:09 +0000 (17:57 +0900)]
Installer: Upgrade to 7-Zip 18.06

--HG--
branch : stable

5 years agoUpgrade to 7-Zip 18.06
Takashi Sawanaka [Sat, 12 Jan 2019 08:42:00 +0000 (17:42 +0900)]
Upgrade to 7-Zip 18.06

--HG--
branch : stable

5 years agoFix "Assertion failed: dr.begin[0] == dr.begin[file], file c:\dev\winmerge\src\diffwr...
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/)

--HG--
branch : stable

5 years agoGhostTextBuffer.cpp: Fix incorrect size being passed to CopyMemory(). (https://bitbuc...
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/)

--HG--
branch : stable

5 years agoUpdate translations
Takashi Sawanaka [Sat, 12 Jan 2019 02:53:13 +0000 (11:53 +0900)]
Update translations

--HG--
branch : stable

5 years agoMainFrm.cpp: Although the command lnie option '/e' was specified, pressing the ESC...
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.

--HG--
branch : stable

5 years agoRevert the commit 'ccrystaltextview2.cpp: Fix the GitHub issue #109 Frustrating text...
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

--HG--
branch : stable

5 years agoCppcheck: Variable '...' is assigned in constructor body. Consider performing initial...
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.

--HG--
branch : stable

5 years agoCppcheck: Either the condition '....empty()' is redundant or content is accessed...
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.

--HG--
branch : stable

5 years agoCppcheck: Memory leak: hData
Takashi Sawanaka [Sun, 6 Jan 2019 10:56:45 +0000 (19:56 +0900)]
Cppcheck: Memory leak: hData

--HG--
branch : stable

5 years agoFix Warning C26437 Do not slice (es.63).
Takashi Sawanaka [Sat, 5 Jan 2019 14:23:14 +0000 (23:23 +0900)]
Fix Warning C26437 Do not slice (es.63).

--HG--
branch : stable

5 years agoFix Warning C26444 Avoid unnamed objects with custom construction and destruction...
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).

--HG--
branch : stable

5 years agoAdd `hekxedit.h` to project files
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

--HG--
branch : stable

5 years agoDistinguish between Aborted and "not yet compared" files (3)
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

--HG--
branch : stable

5 years agoPropagate compare FileIO error status to parent directories (2)
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.

--HG--
branch : stable

5 years agoFix obscure memory leak
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.

--HG--
branch : stable

5 years agoAdd `NDEBUG` preprocessor for Release builds
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.

--HG--
branch : stable

5 years agoDistinguish between Aborted and "not yet compared" files (2)
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.

--HG--
branch : stable

5 years agoDistinguish between Aborted and "not yet compared" files
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.

--HG--
branch : stable

5 years agoPropagate compare FileIO error status to parent directories
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.

--HG--
branch : stable

5 years agoRepair Compare Statistics dialogs
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

--HG--
branch : stable

5 years agoAdditional low-level cleanups (5)
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

--HG--
branch : stable

5 years agoAdditional low-level cleanups (4)
GreyMerlin [Tue, 25 Dec 2018 02:59:44 +0000 (18:59 -0800)]
Additional low-level cleanups (4)

--HG--
branch : stable

5 years agoAdditional low-level cleanups (3)
GreyMerlin [Mon, 24 Dec 2018 23:26:19 +0000 (15:26 -0800)]
Additional low-level cleanups (3)

--HG--
branch : stable

5 years agoAdditional low-level cleanups (2)
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)`

--HG--
branch : stable

5 years agoAdditional low-level cleanups for ...
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

--HG--
branch : stable

5 years agoFix bitbucket issue #135: Binary File options don't change from default
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

--HG--
branch : stable

5 years agoRevert the commit 'PreTranslateMessage() is still needed for Alt+1, Alt+S, and so...
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)'

--HG--
branch : stable

5 years agoOpenView.cpp: The OpenView dialog size should track the WinMerge screen size when...
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)

--HG--
branch : stable

5 years agoOpenView.*: PreTranslateMessage() is still needed for Alt+1, Alt+S, and so on. (relat...
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)

--HG--
branch : stable

5 years agoOpenDlg: Expose cleaner moving/resizing behavior esp. in non-maximized state
datadiode [Thu, 3 Jan 2019 13:07:14 +0000 (14:07 +0100)]
OpenDlg: Expose cleaner moving/resizing behavior esp. in non-maximized state

--HG--
branch : stable

6 years agoVarious refactorings involving NULL, ASSERT, TRUE and FALSE (7)
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...

--HG--
branch : stable

6 years agoVarious refactorings involving NULL, ASSERT, TRUE and FALSE (6)
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...

--HG--
branch : stable

6 years agoRestore testing data file accidentally changed
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.

--HG--
branch : stable

6 years agoVarious refactorings involving NULL, ASSERT, TRUE and FALSE (5)
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...

--HG--
branch : stable

6 years agoCleanup PLUGIN_MODE usage
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

--HG--
branch : stable