OSDN Git Service
Takashi Sawanaka [Mon, 4 Sep 2017 12:44:53 +0000 (21:44 +0900)]
Add version info test files
Takashi Sawanaka [Mon, 4 Sep 2017 12:37:41 +0000 (21:37 +0900)]
Merge
Takashi Sawanaka [Mon, 4 Sep 2017 12:30:36 +0000 (21:30 +0900)]
Merge pull request #37 from GreyMerlin/master
Tweak vs2017.vcxproj.filters
GreyMerlin [Mon, 4 Sep 2017 00:31:17 +0000 (17:31 -0700)]
Tweak vs2017.vcxproj.filters
* various Filters (i.e. compilation instructions) were not completely
copied from vs2015 into vs2017 for various recent changes.
Takashi Sawanaka [Sun, 3 Sep 2017 11:46:19 +0000 (20:46 +0900)]
BuildBin*.cmd: Use vswhere.exe
Takashi Sawanaka [Sat, 2 Sep 2017 06:37:18 +0000 (15:37 +0900)]
UploadToGithub.cmd: Add virualtotal.com's scan result URL to release description
Takashi Sawanaka [Sat, 2 Sep 2017 03:25:31 +0000 (12:25 +0900)]
Bump revision to 2.14.0+-jp-140
Takashi Sawanaka [Sat, 2 Sep 2017 03:22:19 +0000 (12:22 +0900)]
editlib: Fix syntax and diff hilighting not work properly in wrapped lines
Takashi Sawanaka [Sat, 2 Sep 2017 03:20:18 +0000 (12:20 +0900)]
editlib: marking text with double click is a litle bit annoying?
Takashi Sawanaka [Sat, 2 Sep 2017 02:44:54 +0000 (11:44 +0900)]
Merge.cpp: avoid an assertion failure
Takashi Sawanaka [Sat, 2 Sep 2017 02:42:06 +0000 (11:42 +0900)]
FolderCompare: Fix sorting of version, eol and encoding columns not working properly
Takashi Sawanaka [Wed, 30 Aug 2017 15:23:16 +0000 (00:23 +0900)]
Bump revision to 2.14.0+-jp-139
Takashi Sawanaka [Wed, 30 Aug 2017 15:22:57 +0000 (00:22 +0900)]
Installer: add ignoreversion and comparetimestamp flags to dlls in [Files] section
Takashi Sawanaka [Tue, 29 Aug 2017 13:09:56 +0000 (22:09 +0900)]
PropMarkerColors.*: Forgot to add the files. github#35
Takashi Sawanaka [Tue, 29 Aug 2017 13:08:37 +0000 (22:08 +0900)]
Merge pull request #36 from GreyMerlin/fix/jp-138
Missing line in .filters file
GreyMerlin [Tue, 29 Aug 2017 00:31:01 +0000 (17:31 -0700)]
Missing line in .filters file
* There should be an additional </ClInclude> in the file
Merge.vs2017.vcxproj.filters at line (1397) to properly terminate the
entry for MergeStatusBar.h, prior to the introduction on
PropMarkerColors.h
Takashi Sawanaka [Mon, 28 Aug 2017 17:57:57 +0000 (02:57 +0900)]
Fix broken Japanese.po
Takashi Sawanaka [Mon, 28 Aug 2017 16:25:15 +0000 (01:25 +0900)]
Bump revision to 2.14.0+-jp-138
Takashi Sawanaka [Mon, 28 Aug 2017 16:18:42 +0000 (01:18 +0900)]
editlib: Implement Marker feature (WIP)
Takashi Sawanaka [Sun, 20 Aug 2017 11:17:41 +0000 (20:17 +0900)]
ccrystaltextiview.cpp: remove duplicate code
Takashi Sawanaka [Fri, 18 Aug 2017 12:40:36 +0000 (21:40 +0900)]
crystaledit/Sample/StdAfx.cpp: Enable visual style
Takashi Sawanaka [Fri, 18 Aug 2017 12:07:25 +0000 (21:07 +0900)]
crystaledit/Sample/SampleDoc.cpp: Fix memory leak
Takashi Sawanaka [Fri, 18 Aug 2017 12:06:14 +0000 (21:06 +0900)]
crystaledit/Sample: Upgrade SampleStatic project from vs9 to vs2017
Takashi Sawanaka [Thu, 17 Aug 2017 05:43:54 +0000 (14:43 +0900)]
Use a vector instead of an array.
Takashi Sawanaka [Thu, 17 Aug 2017 05:34:44 +0000 (14:34 +0900)]
HexMergeDoc.cpp: Use customized colors for Hex Editor Window.
Takashi Sawanaka [Wed, 16 Aug 2017 08:34:03 +0000 (17:34 +0900)]
Merge pull request #33 from GreyMerlin/fix-Boost
Update Boost's checking for new VS2017 Update 3
GreyMerlin [Wed, 16 Aug 2017 02:11:51 +0000 (19:11 -0700)]
Update Boost's checking for new VS2017 Update 3 (2)
* tweak comment
GreyMerlin [Wed, 16 Aug 2017 01:47:42 +0000 (18:47 -0700)]
Update Boost's checking for new VS2017 Update 3
* Update 3 (dated 8/14/2017) changes _MSC_VER to 1911. See
https://blogs.msdn.microsoft.com/chuckw/2017/08/14/visual-studio-2017-15-3-update/
* This cause lots of compilation messages (neither Errors nor Warnings)
with the text "Unknown compiler version - please run the configure
tests and report the results". I have *not* reported this new issue to
Boost.org
* This tiny patch will prevent those messages until a newer version of
Boost (1.65.0 - now in beta) becomes available.
Takashi Sawanaka [Sun, 30 Jul 2017 00:50:51 +0000 (09:50 +0900)]
Merge pull request #32 from GreyMerlin/master
Setup for VS2017 Compilation
GreyMerlin [Wed, 26 Jul 2017 16:36:28 +0000 (09:36 -0700)]
VS2017 - update .sln, .vcxproj and .cmd files
* update to *.vs2017.vcxproj names
* update .sln header lines for VS2017
* update .vcxproj ToolsVersion in header
* update PlatformToolset to v141_xp (was v140)
* add new *.vs2017.cmd files to VS solution explorer
* update BuildBin.vs2017.cmd to use VS141COMNTOOLS
* Update VisualStudioVersion to 15.0.26430.16
GreyMerlin [Tue, 25 Jul 2017 22:24:39 +0000 (15:24 -0700)]
VS2017 - Copy all *.vs2015 files as *.vs2017
Takashi Sawanaka [Sat, 29 Jul 2017 14:29:57 +0000 (23:29 +0900)]
Added tag 2.14.0+-jp-137 for changeset
d36d76530c98
Takashi Sawanaka [Sat, 29 Jul 2017 09:39:01 +0000 (18:39 +0900)]
Merge pull request #31 from GreyMerlin/master
Three unrelated simple changes
GreyMerlin [Thu, 27 Jul 2017 23:25:43 +0000 (16:25 -0700)]
Fix properties for WinXP targeting
GreyMerlin [Tue, 25 Jul 2017 22:09:53 +0000 (15:09 -0700)]
Add VS Filters to various projects
* Copy various *_vs100.vcxproj.filters as *.vs2015.vcxproj.filters
to capture project file organization within Solution Explorer
* Add two relevant folders to MergeLang project for improved
project organization
* Add two relevant *.vbs files to MergeLang project (used only in
Post-Build Event step)
* Add relevant *.vbs file to Batch Files solution folder
* Also make sure that the *.vs2015.sln files are encoded as UTF-8-BOM
for proper Visual Studio selection.
GreyMerlin [Fri, 28 Jul 2017 00:21:31 +0000 (17:21 -0700)]
Typo corrections to new Go and Rust Copyrights
Takashi Sawanaka [Thu, 27 Jul 2017 15:42:14 +0000 (00:42 +0900)]
Bump revision to 2.14.0+-jp-137
Takashi Sawanaka [Thu, 27 Jul 2017 14:56:23 +0000 (23:56 +0900)]
editlib/cplusplus.cpp: Add C++11 keywords.
Takashi Sawanaka [Thu, 27 Jul 2017 14:27:24 +0000 (23:27 +0900)]
Add Go and Rust syntax highlighter
Takashi Sawanaka [Mon, 17 Jul 2017 12:47:57 +0000 (21:47 +0900)]
MergeDoc.cpp: Fix incorrect in-line diff coloring after swapping panes
Takashi Sawanaka [Mon, 17 Jul 2017 06:41:11 +0000 (15:41 +0900)]
Remove unused declarations
Takashi Sawanaka [Sun, 16 Jul 2017 07:52:37 +0000 (16:52 +0900)]
DirCmpReport.*: Create HTML report with UTF-8
Takashi Sawanaka [Tue, 11 Jul 2017 13:24:53 +0000 (22:24 +0900)]
DirCompProgressBar.*: Use Dynamic Dialog Layout for MFC
Takashi Sawanaka [Mon, 10 Jul 2017 13:06:12 +0000 (22:06 +0900)]
Bump revision to 2.14.0+-jp-136
Takashi Sawanaka [Sun, 9 Jul 2017 08:08:42 +0000 (17:08 +0900)]
Merge.cpp: To decrease startup time, call CleanupWMtemp() function in CMergeApp::ExitInstance() instead in CMergeApp:InitInstance().
Takashi Sawanaka [Sat, 8 Jul 2017 14:41:55 +0000 (23:41 +0900)]
Format resource file
Takashi Sawanaka [Sat, 8 Jul 2017 07:33:14 +0000 (16:33 +0900)]
Merge.*vcxproj.filters: Fix filename case
Takashi Sawanaka [Sat, 8 Jul 2017 04:27:29 +0000 (13:27 +0900)]
multiformatText.cpp: Fix Unpacker plugin not working properly when the selected custom codepage is 65001(UTF-8)
Takashi Sawanaka [Sat, 8 Jul 2017 04:21:02 +0000 (13:21 +0900)]
MergeEditView.cpp: Fix crash when selecting 'Copy to Right/Left And Advance' menu item while editing the last difference file opened from the folder comparison window
Takashi Sawanaka [Sun, 2 Jul 2017 15:26:34 +0000 (00:26 +0900)]
StdAfx.*: Move GetClipTcharTextFormat() function from StdAfx.* to CCrystalTextView class
Takashi Sawanaka [Sun, 2 Jul 2017 13:50:10 +0000 (22:50 +0900)]
Upgrade project files to VS2017
Takashi Sawanaka [Sun, 2 Jul 2017 08:46:22 +0000 (17:46 +0900)]
Add the alternative functions of _fstat() and _wstat() for the bug https://connect.microsoft.com/VisualStudio/feedback/details/
1600505/stat-not-working-on-windows-xp-using-v14-xp-platform-toolset-vs2015
Takashi Sawanaka [Sat, 1 Jul 2017 10:41:10 +0000 (19:41 +0900)]
FileOrFolderSelect.cpp: Use paths::DoesPathExist() instead of _tstati64()
Takashi Sawanaka [Thu, 29 Jun 2017 13:19:46 +0000 (22:19 +0900)]
Add 'Test' configuration to test WinMerge
Takashi Sawanaka [Thu, 29 Jun 2017 13:12:35 +0000 (22:12 +0900)]
Update boost to 1.64.0
Takashi Sawanaka [Wed, 28 Jun 2017 15:03:59 +0000 (00:03 +0900)]
Add GetDescription() function
Takashi Sawanaka [Sun, 25 Jun 2017 13:26:21 +0000 (22:26 +0900)]
OptionsMgr.h: Add COptionsMgr::GetNameList() function.
Takashi Sawanaka [Sun, 25 Jun 2017 13:06:01 +0000 (22:06 +0900)]
CCrystalTextView.*: Add CCrystalTextView::GetTextBocks() function.
Takashi Sawanaka [Sun, 25 Jun 2017 07:57:53 +0000 (16:57 +0900)]
UpdatePoFilesFromPotFile.vbs: Fix the last translated message in *.po file being lost if the po file is not terminated with CR+LF or LF
Takashi Sawanaka [Sun, 25 Jun 2017 07:33:26 +0000 (16:33 +0900)]
MessageBoxDialog.*: Add CMessageBoxDialog::SetFormerResult() method
Takashi Sawanaka [Sun, 18 Jun 2017 16:19:52 +0000 (01:19 +0900)]
MainFrm.cpp: Fix crash when the argument 'flags' of the function CMainFrm::DoFileOpen() is NULL.
Takashi Sawanaka [Thu, 15 Jun 2017 15:57:31 +0000 (00:57 +0900)]
Merge pull request #29 from GreyMerlin/master
Standardize Various Visual Studio File Names
GreyMerlin [Wed, 14 Jun 2017 20:54:45 +0000 (13:54 -0700)]
Standardize .cmd, .sln and .vcprojx file names (3)
* Change *.vcxproj.filters file names to *.vs2015.vcxproj.filters
GreyMerlin [Mon, 12 Jun 2017 20:13:42 +0000 (13:13 -0700)]
Standardize .cmd, .sln and .vcprojx file names (2)
* Adapt WinMerge.vs2015.sln to new *.vs2015.vcxproj file names
* Adapt new BuildBin.vs2015.cmd to proper .sln name
* Adapt new BuildAll.vs2015.cmd to new BuildBin.vs2015 name
* Adapt BuildAll.vs2015.cmd to use VS140 (i.e. VS2015)
* Add new BuildBin.vs2015.cmd and BuildAll.vs2015.cmd added
to WinMerge.vs2015.sln file
GreyMerlin [Mon, 12 Jun 2017 00:10:24 +0000 (17:10 -0700)]
Standardize .cmd, .sln and .vcprojx file names (1)
* copy BuildBin.cmd as BuildBin.vs2015.cmd
* copy BuildAll2.cmd as BuildAll.vs2015.cmd
* change all *_vs2015.vcxproj to *.vs2015.vcxproj
* change WinMerge_vs2015.sln to WinMerge.vs2015.sln
* using *.vs2015.* file names from related projects and solutions.
* This commit simply handles file name changes, detailed content
changes will be applied in the next commit
GreyMerlin [Sat, 10 Jun 2017 20:30:43 +0000 (13:30 -0700)]
Generalize .gitIgnore patterns
Takashi Sawanaka [Fri, 26 May 2017 12:51:39 +0000 (21:51 +0900)]
Added tag 2.14.0+-jp-135 for changeset
9d4e7604a3e3
Takashi Sawanaka [Tue, 23 May 2017 16:07:47 +0000 (01:07 +0900)]
Bump revision to 2.14.0+-jp-135
Takashi Sawanaka [Tue, 23 May 2017 16:01:27 +0000 (01:01 +0900)]
MergeDocLineDiffs.cpp: Avoid out of bounds access(2). (github#28)
Takashi Sawanaka [Sun, 21 May 2017 15:25:15 +0000 (00:25 +0900)]
Bump revision to 2.14.0+-jp-134
Takashi Sawanaka [Sun, 21 May 2017 15:23:08 +0000 (00:23 +0900)]
MergeDocLineDiffs.cpp: Avoid out of bounds access
Takashi Sawanaka [Sun, 21 May 2017 13:47:20 +0000 (22:47 +0900)]
GhostTextBuffer.cpp: Fix crash when redoing to delete text included ghost lines
Takashi Sawanaka [Sun, 21 May 2017 13:14:23 +0000 (22:14 +0900)]
ShellExtension: Bump revision to 1.16.5.11
Takashi Sawanaka [Sun, 21 May 2017 13:13:52 +0000 (22:13 +0900)]
ShellExtension: Fix stupid mistake in IsWindows8OrGreater() function
Takashi Sawanaka [Sun, 21 May 2017 13:07:19 +0000 (22:07 +0900)]
ShellExtension: Register.bat didn't work on Windows 10
Takashi Sawanaka [Tue, 16 May 2017 21:50:28 +0000 (06:50 +0900)]
Add sheppaul to Contributors.txt
Takashi Sawanaka [Tue, 16 May 2017 15:54:26 +0000 (00:54 +0900)]
Korean translation update submitted by sheppaul
Takashi Sawanaka [Sun, 14 May 2017 21:49:24 +0000 (06:49 +0900)]
Bump revision to 2.14.0+-jp-133
Takashi Sawanaka [Fri, 5 May 2017 03:01:25 +0000 (12:01 +0900)]
Fix warning C6001: Using uninitialized memory '...'
Takashi Sawanaka [Fri, 5 May 2017 02:40:54 +0000 (11:40 +0900)]
Cppcheck: The scope of the variable '...' can be reduced.
Takashi Sawanaka [Thu, 4 May 2017 14:23:18 +0000 (23:23 +0900)]
Add BuildInstaller.cmd, UploadToGithub.cmd, UploadToVirusTotal.cmd
Takashi Sawanaka [Thu, 4 May 2017 14:17:42 +0000 (23:17 +0900)]
Cppcheck: Checking if unsigned variable '...' is less than zero.
Takashi Sawanaka [Thu, 4 May 2017 14:03:30 +0000 (23:03 +0900)]
Cppcheck: Variable '...' is assigned a value that is never used.
Takashi Sawanaka [Thu, 4 May 2017 13:11:36 +0000 (22:11 +0900)]
WinMerge.sln: Fix build error on UnitTest project
Takashi Sawanaka [Thu, 4 May 2017 08:29:23 +0000 (17:29 +0900)]
Use std::array
Takashi Sawanaka [Thu, 4 May 2017 02:43:38 +0000 (11:43 +0900)]
Cppcheck: Variable '...' is reassigned a value before the old one has been used.
Takashi Sawanaka [Thu, 4 May 2017 02:29:22 +0000 (11:29 +0900)]
Cppcheck: %lX in format string (no. 1) requires 'unsigned long' but the argument type is 'void *'.
Takashi Sawanaka [Thu, 4 May 2017 02:29:01 +0000 (11:29 +0900)]
Cppcheck: %d in format string (no. 1) requires 'int' but the argument type is 'UINT {aka unsigned int}'.
Takashi Sawanaka [Wed, 3 May 2017 10:47:22 +0000 (19:47 +0900)]
MergeDoc.cpp: Reduce file access times on checking whether a file is changed
Takashi Sawanaka [Wed, 3 May 2017 10:33:52 +0000 (19:33 +0900)]
MessageBoxDialog.cpp: Fix invisible text in high-contrast mode
Takashi Sawanaka [Wed, 3 May 2017 09:22:53 +0000 (18:22 +0900)]
ShellExtension: Bump revision to 1.16.5.10
Takashi Sawanaka [Wed, 3 May 2017 09:17:06 +0000 (18:17 +0900)]
ShellExtension: Use icons instead of bitmaps
Takashi Sawanaka [Wed, 3 May 2017 06:11:43 +0000 (15:11 +0900)]
ShellExtension: Attempt to fix crash on Win7 when doing the operation below:
1. Press Windows key
2. Enter "cmd"
3. Press Ctrl+Shift+Enter key
Takashi Sawanaka [Sun, 30 Apr 2017 10:13:17 +0000 (19:13 +0900)]
stringdiffs.cpp: Reduce compiler warnings
Takashi Sawanaka [Sun, 16 Apr 2017 13:08:29 +0000 (22:08 +0900)]
Bump revision to 2.14.0+-jp-132
Takashi Sawanaka [Sun, 16 Apr 2017 13:04:51 +0000 (22:04 +0900)]
DirCompProgresBar.cpp: Fix: The range of Progress bar was not set. (CProgressBar::SetRange32() was accidentally removed in r8505 )
Takashi Sawanaka [Sun, 16 Apr 2017 09:57:13 +0000 (18:57 +0900)]
Fix issue#64 where files and folders that exist only on one side in the differing folders are not displayed when unchecking the 'Show Differences Items' menu item in the tree mode
Takashi Sawanaka [Sun, 9 Apr 2017 06:54:56 +0000 (15:54 +0900)]
MainFrm.cpp: Fix crash when changing the font of DirView
Takashi Sawanaka [Sat, 8 Apr 2017 00:26:33 +0000 (09:26 +0900)]
DirViewColItems.cpp: Fix indentation
Takashi Sawanaka [Sun, 2 Apr 2017 14:16:07 +0000 (23:16 +0900)]
Fix assertion on WindowsXP