OSDN Git Service
GreyMerlin [Sun, 1 Oct 2017 18:29:41 +0000 (11:29 -0700)]
Cleanup: Eliminate _CRT_xxx deprecation (3)
* lost in recent merge with Sdottaka's latest commit:
3f0ab7f9cf3e84ca81af1090d9d0c1dcb8efef9c
*This again eliminates these symbols in the *.vcxproj files ...
_CRT_SECURE_NO_WARNINGS
_CRT_NONSTDC_NO_WARNINGS
_CRT_SECURE_NO_DEPRECATE
GreyMerlin [Sun, 1 Oct 2017 17:27:01 +0000 (10:27 -0700)]
Cleanup: Misc `size_t` related issues
* eliminate conversion warnings for `size_t` related expressions.
* convert various `int` and `long` to `size_t`
* add `static_cast<int>` or add `static_cast<long>` as appropriate
* classical `(int)`-style casting is used in *.c files, of course
While this commit changes various parameters and data items to `size_t`,
the focus of these changes was to completely eliminate the various
warnings. This code is still fundamentally restricted to 2GB of text.
There is still much work to do to generalize the fundamentals of
WinMerge to be fully `size_t` capable (for the X64 platform).
GreyMerlin [Sat, 30 Sep 2017 21:19:00 +0000 (14:19 -0700)]
Cleanup: Eliminate 'C4091' warnings
The "warning C4091: 'typedef ': ignored on left of 'tagGPFIDL_FLAGS'
when no variable is declared" is generated within the Microsoft
<shlobj.h> include file, but only for "toolsets" that support XP. I
have no idea why this is true?!?!
* A `#pragma warning` now is pushed and popped around all
`#include <shlobj.h>` statements to prevent this meaningless
and obnoxious warning message.
GreyMerlin [Sat, 30 Sep 2017 20:25:10 +0000 (13:25 -0700)]
Cleanup CrystalEdit: `size_t` related issues
* eliminate conversion warnings for `size_t` related expressions.
* convert various `int` and `long` to `size_t`
* add `static_cast<int>` or add `static_cast<long>` as appropriate
* classical `(int)` casting is used in ASSERT, for simple convenience.
* add a few ASSERT() statements to assure that various `size_t` values
remain within the positive `int` value range.
* Since `-1` is often used as a "size flag", these changes now
explicitly test for `x != -1` rather than `x >= 0`
While this commit changes various parameters and data items to `size_t`,
the focus of these changes was to completely eliminate the various
warnings. This code is still fundamentally restricted to 2GB of text.
There is still much work to do to generalize the fundamentals of
CrystalEdit to be fully `size_t` capable (for the X64 platform). Two
items of important note:
1. MFC's CPOINT structure is limited to `LONG` values.
The `.x` member should become `size_t`.
2. MFC's CSTRING data is limited to `int` maximum length
GreyMerlin [Sat, 30 Sep 2017 19:17:27 +0000 (12:17 -0700)]
Cleanup poco/XML: `size_t` related warnings
* properly cast return type for `XML_GetCurrentByteIndex`
GreyMerlin [Sat, 30 Sep 2017 19:00:00 +0000 (12:00 -0700)]
Cleanup: Eliminate _CRT_xxx deprecation (2)
* lost in Merge with -jp-141
GreyMerlin [Fri, 29 Sep 2017 22:21:56 +0000 (15:21 -0700)]
Cleanup poco/Foundation: 'size_t' related warnings
* eliminate conversion warnings for `size_t` related expressions.
* convert a few `int` to `size_t`
* SharedMemory files `_size` is now LONGLONG and mappings are correctly
created for files larger than 65kb.
GreyMerlin [Mon, 25 Sep 2017 05:01:38 +0000 (22:01 -0700)]
Cleanup: Eliminate _CRT_xxx deprecation situations
* The VC compiler began emitting Warnings for various deprecated CRT and
POSIX function names beginning with VS2005. It was convenient to
ignore these warnings by defining the following preprocessor symbols in
the *.vcxproj files ...
_CRT_SECURE_NO_WARNINGS
_CRT_NONSTDC_NO_WARNINGS
_CRT_SECURE_NO_DEPRECATE
* This change eliminates those symbol definitions, and appropriately
upgrades the code to properly use the modern, security enhanced,
functions.
* Most of the existing code properly uses TCHAR, however some areas
explicitly use 'wchar_t' and some areas still use the old 'char' type.
* The areas that still use 'char' need further investigation and
possible repair as the rest of the program completely uses Unicode.
GreyMerlin [Sat, 23 Sep 2017 23:51:04 +0000 (16:51 -0700)]
Cleanup: Remove useless AFX_INSERT_LOCATION
* Most *.h files do not have MFC's AFX_INSERT_LOCATION indicator
* And its generally useless
* Now its gone, with general cleanup at the end of *.h files
GreyMerlin [Sat, 23 Sep 2017 23:37:27 +0000 (16:37 -0700)]
Cleanup: Eliminate silly *.inl files in CCrystalEdit
* Elimination #defines for INLINE that always ended up blank
* Merged code from *.inl files into appropriate *.h files
* Eliminate ancient CE_DLL_BUILD stuff
* Appropriate changes to *.vcxproj and *.vcxproj.filters files to
account for removal of the five *.inl files, for both
VS2015 and VS2017
GreyMerlin [Sat, 23 Sep 2017 01:00:48 +0000 (18:00 -0700)]
Use '#pragma once' in more .h files
Takashi Sawanaka [Tue, 3 Oct 2017 15:06:13 +0000 (00:06 +0900)]
UnicodeString.cpp: Fix crash when generating HTML report.
Takashi Sawanaka [Sun, 1 Oct 2017 13:22:10 +0000 (22:22 +0900)]
Remove git_clone.cmd
Takashi Sawanaka [Sun, 1 Oct 2017 13:21:32 +0000 (22:21 +0900)]
Fix the revisions of external sources
Takashi Sawanaka [Sun, 1 Oct 2017 11:32:48 +0000 (20:32 +0900)]
BuildArc.cmd: No need to zip installer. (it was due to a restriction of geocities.co.jp)
Takashi Sawanaka [Sun, 1 Oct 2017 11:09:01 +0000 (20:09 +0900)]
Do not create installer in BuildBin.*.cmd
Takashi Sawanaka [Sun, 1 Oct 2017 10:55:06 +0000 (19:55 +0900)]
Remove BuildAll2.cmd, BuildBin.cmd, WinMerge.sln and Merge.vcxproj*
Use *.vs2015.* or *.vs2017.* instead of above
Takashi Sawanaka [Sun, 1 Oct 2017 09:55:50 +0000 (18:55 +0900)]
Restore htmlhelp build to use saxon instead of xsltproc
Takashi Sawanaka [Sat, 30 Sep 2017 07:53:19 +0000 (16:53 +0900)]
Fix search marker not working if 'Match case' checkbox is unchecked
Takashi Sawanaka [Sat, 30 Sep 2017 07:46:31 +0000 (16:46 +0900)]
Forgot to add ctextmarkerdlg.{h,cpp} Github#40
Takashi Sawanaka [Sat, 30 Sep 2017 07:45:04 +0000 (16:45 +0900)]
Fix untranslated strings
Takashi Sawanaka [Fri, 29 Sep 2017 20:14:02 +0000 (05:14 +0900)]
temporarily set revision to 2.15.2.0
Takashi Sawanaka [Fri, 29 Sep 2017 15:17:05 +0000 (00:17 +0900)]
Remove Japanese help
Takashi Sawanaka [Fri, 29 Sep 2017 15:07:54 +0000 (00:07 +0900)]
Restore Help menu
Takashi Sawanaka [Fri, 29 Sep 2017 14:41:57 +0000 (23:41 +0900)]
Restore URL
Takashi Sawanaka [Fri, 29 Sep 2017 13:22:37 +0000 (22:22 +0900)]
Merge
Takashi Sawanaka [Thu, 28 Sep 2017 23:07:44 +0000 (08:07 +0900)]
Added tag 2.14.0+-jp-141 for changeset
cee70b23e6ae
Takashi Sawanaka [Mon, 25 Sep 2017 16:14:17 +0000 (16:14 +0000)]
Merged in jdunne525/winmerge-v2 (pull request #1)
More on Issue #73 Fixed the -dl -dm and -dr description parameters for conflict files (for both 2 way and 3 way conflict files).
Approved-by: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Takashi Sawanaka [Mon, 25 Sep 2017 16:08:58 +0000 (01:08 +0900)]
Bump revision to 2.14.0+-jp-141
Takashi Sawanaka [Mon, 25 Sep 2017 16:08:39 +0000 (01:08 +0900)]
Add some tests
Takashi Sawanaka [Mon, 25 Sep 2017 16:07:26 +0000 (01:07 +0900)]
editlib: Implement Marker feature(2)
Joseph Dunne [Mon, 25 Sep 2017 15:00:12 +0000 (10:00 -0500)]
More on Issue #73 Fixed the -dl -dm and -dr description parameters for conflict files (for both 2 way and 3 way conflict files).
Takashi Sawanaka [Sun, 24 Sep 2017 15:54:24 +0000 (00:54 +0900)]
FolderCompare: Fix crash when recomparing selected items
Takashi Sawanaka [Sun, 24 Sep 2017 15:50:56 +0000 (00:50 +0900)]
Fix issue #77: Drag'n'Drop files with result 'identical'
Takashi Sawanaka [Wed, 20 Sep 2017 21:52:39 +0000 (06:52 +0900)]
Fix issue #73: Command line parameter /dr doesn't work with conflict file
Takashi Sawanaka [Wed, 20 Sep 2017 21:48:47 +0000 (06:48 +0900)]
DisplayXMLFiles plugin: Upgrade project file to VS2017 and fix #71
Takashi Sawanaka [Sun, 10 Sep 2017 11:10:37 +0000 (20:10 +0900)]
crystaledit/Sample: Add x64 platform configuration
Takashi Sawanaka [Tue, 5 Sep 2017 13:59:22 +0000 (22:59 +0900)]
Merge pull request #38 from GreyMerlin/master
ShellExtension: migrate to VS2017, etc.
GreyMerlin [Mon, 4 Sep 2017 22:12:19 +0000 (15:12 -0700)]
ShellExtension VS2017(5) - Remove old files
* Remove the old .sln, .vcxproj, and .filters files that were used as
the base for original *.2015.* files, in commit (1) of this group.
GreyMerlin [Mon, 4 Sep 2017 06:34:54 +0000 (23:34 -0700)]
ShellExtension VS2017(4) - Eliminate Warnings
* Eliminate various compilation and linking warnings
* Debug builds use Incremental linking
* Debug builds don't use 'Safe Exception Handlers'
* DLL exports no longer have assigned numbers
* _vsntprintf() changed to _vsntprintf_s()
* Make sure WINVER set to 0x501 (for XP compilation)
* .rc file locally defines _USING_V110_SDK71_ to prevent duplicate
declaration warnings. Note: this _USING_V110_SDK71_
definition is implicitly provided for all .cpp compilations by the
use of an Win-XP compatible Toolset, such as v141_xp)
* All .h files now use #pragma once
* Eliminate deprecation errors for GetVersionEx() by simulating Version
Helper code that works on all versions, Win2000 and beyond
(including WinXP)
GreyMerlin [Sun, 3 Sep 2017 05:44:27 +0000 (22:44 -0700)]
ShellExtension VS2017(3) - Updates
* updates to .vs2017.sln and .vs2017.vcxproj files
* Debug compilations also use v141_xp toolset.
* also to .vs2015.vcxproj file
GreyMerlin [Sun, 13 Aug 2017 21:57:22 +0000 (14:57 -0700)]
ShellExtension VS2017(2) - Updates
* Eliminate Debug <CustomBuildStep> for registering the shell
extension; it is leftover from a long-ago VS and no longer
functions correctly.
* Also for VS2015
GreyMerlin [Sun, 13 Aug 2017 21:12:36 +0000 (14:12 -0700)]
ShellExtension VS2017(1) - Initial copy of files
* Also for VS2015
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.