OSDN Git Service

winmerge-jp/winmerge-jp.git
8 years agothe encoding area in status bar was too wide when DPI is 96
Takashi Sawanaka [Sat, 25 Jun 2016 09:37:01 +0000 (18:37 +0900)]
the encoding area in status bar was too wide when DPI is 96

8 years agoRe-downgrade VS2015 project files to VS2013 because of a bug of _fstat() on WinXP.
Takashi Sawanaka [Sat, 25 Jun 2016 03:57:28 +0000 (12:57 +0900)]
Re-downgrade VS2015 project files to VS2013 because of a bug of _fstat() on WinXP.
See https://connect.microsoft.com/VisualStudio/feedback/details/1557168/wstat64-returns-1-on-xp-always

8 years agoAdded tag 2.14.0+-jp-109 for changeset ccf79ddcad39
Takashi Sawanaka [Sun, 19 Jun 2016 14:29:33 +0000 (23:29 +0900)]
Added tag 2.14.0+-jp-109 for changeset ccf79ddcad39

8 years agoBump revision to 2.14.0+-jp-109
Takashi Sawanaka [Sun, 19 Jun 2016 14:22:40 +0000 (23:22 +0900)]
Bump revision to 2.14.0+-jp-109

8 years agoBCMenu.cpp: Remove compiler warnings
Takashi Sawanaka [Sun, 19 Jun 2016 13:44:02 +0000 (22:44 +0900)]
BCMenu.cpp: Remove compiler warnings

8 years agoBCMenu: Restore DrawItem_Win9xNT2000() and use DrawItem_Win9xNT2000() instead of...
Takashi Sawanaka [Sun, 19 Jun 2016 13:20:10 +0000 (22:20 +0900)]
BCMenu: Restore DrawItem_Win9xNT2000() and use DrawItem_Win9xNT2000() instead of DrawItem_WinXP()

8 years agoBCMenu: Use uxtheme API
Takashi Sawanaka [Sun, 19 Jun 2016 12:53:18 +0000 (21:53 +0900)]
BCMenu: Use uxtheme API

8 years agoBCMenu.cpp: Remove prefix 'm_' from local variables
Takashi Sawanaka [Sat, 18 Jun 2016 15:08:12 +0000 (00:08 +0900)]
BCMenu.cpp: Remove prefix 'm_' from local variables

8 years agoBCMenu.cpp: - Remove unused functions
Takashi Sawanaka [Sat, 18 Jun 2016 09:43:39 +0000 (18:43 +0900)]
BCMenu.cpp: - Remove unused functions
BCMenu.cpp: - Move *A() functions to BCMenu.h for reducing executable size

8 years agoAdded tag 2.14.0+-jp-108 for changeset a7e54e0a5df3
Takashi Sawanaka [Sun, 12 Jun 2016 13:03:42 +0000 (22:03 +0900)]
Added tag 2.14.0+-jp-108 for changeset a7e54e0a5df3

8 years agoBump revision to 2.14.0+-jp-108
Takashi Sawanaka [Sun, 12 Jun 2016 12:23:34 +0000 (21:23 +0900)]
Bump revision to 2.14.0+-jp-108

8 years ago.hgignore: Add *.db and *.opendb
Takashi Sawanaka [Sun, 12 Jun 2016 11:30:12 +0000 (20:30 +0900)]
.hgignore: Add *.db and *.opendb

8 years ago- Use LoadImage() instead of StretchBitmap() for scaling toolbar images
Takashi Sawanaka [Sun, 12 Jun 2016 11:14:42 +0000 (20:14 +0900)]
- Use LoadImage() instead of StretchBitmap() for scaling toolbar images
- Create grayscale toolbar images programmatically

8 years agoAdd [View]/[Toolbar]/[Huge] menu item
Takashi Sawanaka [Sun, 12 Jun 2016 05:28:31 +0000 (14:28 +0900)]
Add [View]/[Toolbar]/[Huge] menu item

8 years agoFolder filter did not work when unchecked 'Include subfolders' checkbox
Takashi Sawanaka [Sat, 11 Jun 2016 09:16:40 +0000 (18:16 +0900)]
Folder filter did not work when unchecked 'Include subfolders' checkbox

8 years agoAdd test files and folders
Takashi Sawanaka [Sat, 11 Jun 2016 08:47:45 +0000 (17:47 +0900)]
Add test files and folders

8 years agoAdded tag 2.14.0+-jp-107 for changeset 111dca9a90b7
Takashi Sawanaka [Mon, 6 Jun 2016 16:03:36 +0000 (01:03 +0900)]
Added tag 2.14.0+-jp-107 for changeset 111dca9a90b7

8 years agoBump revision to 2.14.0+-jp-107
Takashi Sawanaka [Mon, 6 Jun 2016 16:03:16 +0000 (01:03 +0900)]
Bump revision to 2.14.0+-jp-107

8 years agoMake URL of Check For Updates configurable
Takashi Sawanaka [Mon, 6 Jun 2016 16:01:57 +0000 (01:01 +0900)]
Make URL of Check For Updates configurable

8 years agoOpenView.cpp: Fix for the issue #48
Takashi Sawanaka [Mon, 6 Jun 2016 15:59:04 +0000 (00:59 +0900)]
OpenView.cpp: Fix for the issue #48

8 years agoCompareMSPowerPointFiles.sct: Fix wrong title of Options dialog
Takashi Sawanaka [Sun, 5 Jun 2016 05:55:37 +0000 (14:55 +0900)]
CompareMSPowerPointFiles.sct: Fix wrong title of Options dialog

8 years agoAdded tag 2.14.0+-jp-106 for changeset f68a97f2e3df
Takashi Sawanaka [Sun, 29 May 2016 11:29:20 +0000 (20:29 +0900)]
Added tag 2.14.0+-jp-106 for changeset f68a97f2e3df

8 years agoBump revsion to 2.14.0+-jp-106
Takashi Sawanaka [Sun, 29 May 2016 10:45:38 +0000 (19:45 +0900)]
Bump revsion to 2.14.0+-jp-106

8 years agoAdd '/or reportfilename' command line option
Takashi Sawanaka [Sun, 29 May 2016 10:04:37 +0000 (19:04 +0900)]
Add '/or reportfilename' command line option

8 years agoFix wrong @file tag
Takashi Sawanaka [Sat, 28 May 2016 23:57:02 +0000 (08:57 +0900)]
Fix wrong @file tag

8 years agoRemove unnecessary #include "Merge.h"
Takashi Sawanaka [Sat, 28 May 2016 23:06:59 +0000 (08:06 +0900)]
Remove unnecessary #include "Merge.h"

8 years agoRemove unused cursor image resource
Takashi Sawanaka [Sat, 28 May 2016 15:24:03 +0000 (00:24 +0900)]
Remove unused cursor image resource

8 years agoEditorFilepathBar.*: Remove CEditorFilepathBar::LookLikeThisWnd() function
Takashi Sawanaka [Sat, 28 May 2016 15:10:11 +0000 (00:10 +0900)]
EditorFilepathBar.*: Remove CEditorFilepathBar::LookLikeThisWnd() function

8 years agoCppcheck: Member variable '...' is not initialized in the constructor.
Takashi Sawanaka [Sat, 28 May 2016 12:08:30 +0000 (21:08 +0900)]
Cppcheck: Member variable '...' is not initialized in the constructor.

8 years agoCppcheck: Race condition: non-interlocked access after InterlockedDecrement(). Use...
Takashi Sawanaka [Sat, 28 May 2016 11:48:19 +0000 (20:48 +0900)]
Cppcheck: Race condition: non-interlocked access after InterlockedDecrement(). Use InterlockedDecrement() return value instead.

8 years agoWinMerge.sln: Upgrade to Visual Studio 2015
Takashi Sawanaka [Sat, 28 May 2016 11:38:13 +0000 (20:38 +0900)]
WinMerge.sln: Upgrade to Visual Studio 2015

8 years agoArchiveSupport: Upgrade to 7-Zip 16.02 (merge from https://bitbucket.org/jtuc/winmerg...
Takashi Sawanaka [Sat, 28 May 2016 11:08:15 +0000 (20:08 +0900)]
ArchiveSupport: Upgrade to 7-Zip 16.02 (merge from https://bitbucket.org/jtuc/winmerge2011/commits/e4edd1b3c0ab559d866d603c6d7813eda24a4b8b )

8 years agoMerge7z: Rename project files
Takashi Sawanaka [Sat, 28 May 2016 05:40:18 +0000 (14:40 +0900)]
Merge7z: Rename project files

8 years agoRemove CMergeApp::m_strDescription used as a global variable
Takashi Sawanaka [Sat, 28 May 2016 04:21:36 +0000 (13:21 +0900)]
Remove CMergeApp::m_strDescription used as a global variable

8 years agoChange the IMergeDoc::GenerateReport() function interface
Takashi Sawanaka [Sun, 22 May 2016 08:25:09 +0000 (17:25 +0900)]
Change the IMergeDoc::GenerateReport() function interface

8 years agoChange the type of the variable CMergeApp::m_strSaveAsPath from CString to String
Takashi Sawanaka [Sat, 21 May 2016 12:36:26 +0000 (21:36 +0900)]
Change the type of the variable CMergeApp::m_strSaveAsPath from CString to String

8 years agoRemove unused function
Takashi Sawanaka [Sat, 21 May 2016 10:07:04 +0000 (19:07 +0900)]
Remove unused function

8 years agoRemove useless c_str()
Takashi Sawanaka [Sat, 21 May 2016 05:09:56 +0000 (14:09 +0900)]
Remove useless c_str()

8 years agotest
Takashi Sawanaka [Fri, 20 May 2016 15:37:31 +0000 (00:37 +0900)]
test

8 years agoMerge pull request #1 from Kirozen/master
Takashi Sawanaka [Thu, 19 May 2016 13:58:57 +0000 (22:58 +0900)]
Merge pull request #1 from Kirozen/master

Very small fixes

8 years agoAdd .gitignore
Kirozen [Wed, 18 May 2016 13:20:19 +0000 (15:20 +0200)]
Add .gitignore

8 years agoFix build script
Kirozen [Wed, 18 May 2016 12:35:38 +0000 (14:35 +0200)]
Fix build script

8 years agoAdded tag 2.14.0+-jp-105 for changeset 14a67f9aef76
Takashi Sawanaka [Sun, 15 May 2016 14:10:20 +0000 (23:10 +0900)]
Added tag 2.14.0+-jp-105 for changeset 14a67f9aef76

8 years agoBuildArc.cmd: Exclude *.*~ files
Takashi Sawanaka [Sun, 15 May 2016 09:45:48 +0000 (18:45 +0900)]
BuildArc.cmd: Exclude *.*~ files

8 years agoInstaller: it still needs to include vcomp120.dll #2
Takashi Sawanaka [Sun, 15 May 2016 09:43:34 +0000 (18:43 +0900)]
Installer: it still needs to include vcomp120.dll #2

8 years agoInstaller: it still needs to include vcomp120.dll
Takashi Sawanaka [Sun, 15 May 2016 09:15:40 +0000 (18:15 +0900)]
Installer: it still needs to include vcomp120.dll

8 years agoBuildArc.cmd: Exclude *.db files
Takashi Sawanaka [Sun, 15 May 2016 08:52:34 +0000 (17:52 +0900)]
BuildArc.cmd: Exclude *.db files

8 years agoBump revision to 2.14.0+-jp-105
Takashi Sawanaka [Sun, 15 May 2016 07:05:24 +0000 (16:05 +0900)]
Bump revision to 2.14.0+-jp-105

8 years agoUniFile.cpp: NUL chars was treated as EOL chars
Takashi Sawanaka [Sun, 15 May 2016 06:56:19 +0000 (15:56 +0900)]
UniFile.cpp: NUL chars was treated as EOL chars

8 years agoFix some warnings
Takashi Sawanaka [Sun, 15 May 2016 06:27:14 +0000 (15:27 +0900)]
Fix some warnings

8 years agoBCMenu.*: Remove disable_old_style
Takashi Sawanaka [Sun, 15 May 2016 02:02:59 +0000 (11:02 +0900)]
BCMenu.*: Remove disable_old_style

8 years agoBCMenu.*: Remove m_bDynIcons
Takashi Sawanaka [Sun, 15 May 2016 01:49:54 +0000 (10:49 +0900)]
BCMenu.*: Remove m_bDynIcons

8 years agoRemove unneeded use of MAKEINTRESOURCE macro
Takashi Sawanaka [Sat, 14 May 2016 21:17:33 +0000 (06:17 +0900)]
Remove unneeded use of MAKEINTRESOURCE macro

8 years agoCompareMSPowerPointFiles.sct: Make texts in notes pages comparable
Takashi Sawanaka [Sat, 14 May 2016 05:48:21 +0000 (14:48 +0900)]
CompareMSPowerPointFiles.sct: Make texts in notes pages comparable

8 years agoInclude CompareMSPowerPointFiles.sct plugin in the installer
Takashi Sawanaka [Sat, 14 May 2016 05:33:22 +0000 (14:33 +0900)]
Include CompareMSPowerPointFiles.sct plugin in the installer

8 years agoCompareMSWordFiles.sct: Make grouped shapes comparable
Takashi Sawanaka [Sat, 14 May 2016 04:09:41 +0000 (13:09 +0900)]
CompareMSWordFiles.sct: Make grouped shapes comparable

8 years agoDirView: even if tree mode is enabled and a folder item is selected, enable Compare...
Takashi Sawanaka [Sat, 14 May 2016 03:54:36 +0000 (12:54 +0900)]
DirView: even if tree mode is enabled and a folder item is selected, enable Compare menu item to compare folders

8 years agoDIFFRANGE::dbegin[] and dend[] do not need to be an array.
Takashi Sawanaka [Sun, 8 May 2016 11:05:07 +0000 (20:05 +0900)]
DIFFRANGE::dbegin[] and dend[] do not need to be an array.

8 years agoFix some compiler warnings
Takashi Sawanaka [Fri, 6 May 2016 02:07:50 +0000 (11:07 +0900)]
Fix some compiler warnings

8 years agoFix typo
Takashi Sawanaka [Thu, 5 May 2016 08:58:03 +0000 (17:58 +0900)]
Fix typo

8 years agoGhostTextBuffer.*: Remove some duplicate code #2
Takashi Sawanaka [Thu, 5 May 2016 08:54:55 +0000 (17:54 +0900)]
GhostTextBuffer.*: Remove some duplicate code #2

8 years ago7zCommon.cpp: Fix mixed eol-style
Takashi Sawanaka [Thu, 5 May 2016 07:11:58 +0000 (16:11 +0900)]
7zCommon.cpp: Fix mixed eol-style

8 years agoGhostTextBuffer.cpp: Remove some warnings
Takashi Sawanaka [Wed, 4 May 2016 15:37:00 +0000 (00:37 +0900)]
GhostTextBuffer.cpp: Remove some warnings

8 years agoGhostTextBuffer.cpp: Remove unneeded code
Takashi Sawanaka [Wed, 4 May 2016 14:25:34 +0000 (23:25 +0900)]
GhostTextBuffer.cpp: Remove unneeded code

8 years agoFix crash when merging
Takashi Sawanaka [Wed, 4 May 2016 11:37:19 +0000 (20:37 +0900)]
Fix crash when merging

8 years agoGhostTextBuffer.*: Remove some duplicate code
Takashi Sawanaka [Wed, 4 May 2016 11:36:13 +0000 (20:36 +0900)]
GhostTextBuffer.*: Remove some duplicate code

8 years agoFix for the warning C6001: Using uninitialized memory '...'
Takashi Sawanaka [Mon, 2 May 2016 02:18:08 +0000 (11:18 +0900)]
Fix for the warning C6001: Using uninitialized memory '...'

8 years agoFix for the warning C6262: Function uses ... bytes of stack: exceeds /analyze:stacksi...
Takashi Sawanaka [Mon, 2 May 2016 02:06:16 +0000 (11:06 +0900)]
Fix for the warning C6262: Function uses ... bytes of stack: exceeds /analyze:stacksize:'16384'

8 years agoBump revision to 2.14.0+-jp-104
Takashi Sawanaka [Mon, 25 Apr 2016 14:39:27 +0000 (23:39 +0900)]
Bump revision to 2.14.0+-jp-104

8 years agoFix for the warning C28112: A variable which is accessed via an Interlocked function...
Takashi Sawanaka [Mon, 25 Apr 2016 14:30:06 +0000 (23:30 +0900)]
Fix for the warning C28112: A variable which is accessed via an Interlocked function must always be accessed via an Interlocked function

8 years agoAdd "Include Subfolders" checkbox in Options dialog
Takashi Sawanaka [Sun, 24 Apr 2016 12:22:01 +0000 (21:22 +0900)]
Add "Include Subfolders" checkbox in Options dialog

8 years agoMake the maximum number of MRU items configurable
Takashi Sawanaka [Sun, 24 Apr 2016 09:56:24 +0000 (18:56 +0900)]
Make the maximum number of MRU items configurable

8 years agoThe third or later menu items in Recent Files Or Folders menu item were not enabled.
Takashi Sawanaka [Sun, 24 Apr 2016 06:21:54 +0000 (15:21 +0900)]
The third or later menu items in Recent Files Or Folders menu item were not enabled.

8 years agowhen removing lines that have synchronization points,
Takashi Sawanaka [Sun, 24 Apr 2016 02:36:36 +0000 (11:36 +0900)]
when removing lines that have synchronization points,
delete paired synchronization points in other editor pane.

fixes #45

8 years agoClipBoard.*: Check GlobalLock() return value
Takashi Sawanaka [Sat, 9 Apr 2016 11:12:06 +0000 (20:12 +0900)]
ClipBoard.*: Check GlobalLock() return value

8 years agoPlugins.cpp: Remove unused functions
Takashi Sawanaka [Sat, 9 Apr 2016 10:48:03 +0000 (19:48 +0900)]
Plugins.cpp: Remove unused functions

8 years agoDiffList.cpp: Fix typo
Takashi Sawanaka [Sat, 9 Apr 2016 09:13:22 +0000 (18:13 +0900)]
DiffList.cpp: Fix typo

8 years agoCompare result was not correct when using Synchronization Point
Takashi Sawanaka [Sat, 9 Apr 2016 02:36:48 +0000 (11:36 +0900)]
Compare result was not correct when using Synchronization Point

8 years agoLanguageSelect.cpp: Fix crash if *.po files are unmatched with MergeLang.dll
Takashi Sawanaka [Sat, 9 Apr 2016 02:12:47 +0000 (11:12 +0900)]
LanguageSelect.cpp: Fix crash if *.po files are unmatched with MergeLang.dll

8 years agoUpdate winimerge to changeset 93:d588b6726a7f
Takashi Sawanaka [Sun, 27 Mar 2016 11:10:24 +0000 (20:10 +0900)]
Update winimerge to changeset 93:d588b6726a7f

8 years agoRetry to upgrade project files to VS2015
Takashi Sawanaka [Sun, 27 Mar 2016 09:26:47 +0000 (18:26 +0900)]
Retry to upgrade project files to VS2015

8 years agoAdd CompareMSPowerPointFiles.sct
Takashi Sawanaka [Mon, 21 Mar 2016 15:45:01 +0000 (00:45 +0900)]
Add CompareMSPowerPointFiles.sct

8 years agoCompareMSExcelFiles.sct: Make grouped shapes comparable
Takashi Sawanaka [Mon, 21 Mar 2016 15:44:32 +0000 (00:44 +0900)]
CompareMSExcelFiles.sct: Make grouped shapes comparable

8 years agoCompareMSExcelFiles.sct: Optimize comparing formulas
Takashi Sawanaka [Mon, 21 Mar 2016 15:42:49 +0000 (00:42 +0900)]
CompareMSExcelFiles.sct: Optimize comparing formulas

8 years agoCompareMSExcelFiles.sct: All cell values were not compared when including "#REF!...
Takashi Sawanaka [Mon, 21 Mar 2016 15:40:49 +0000 (00:40 +0900)]
CompareMSExcelFiles.sct: All cell values were not compared when including "#REF!" in cells

8 years agoMergeDoc.cpp: Fix mixed eol-style
Takashi Sawanaka [Sun, 20 Mar 2016 14:05:43 +0000 (23:05 +0900)]
MergeDoc.cpp: Fix mixed eol-style

8 years agoBump revision to 2.14.0+-jp-103
Takashi Sawanaka [Mon, 14 Mar 2016 15:34:24 +0000 (00:34 +0900)]
Bump revision to 2.14.0+-jp-103

8 years agoDowngrade project file from VS2015 to VS2013 (2)
Takashi Sawanaka [Mon, 14 Mar 2016 15:33:11 +0000 (00:33 +0900)]
Downgrade project file from VS2015 to VS2013 (2)

8 years agoUpdate translations
Takashi Sawanaka [Mon, 14 Mar 2016 15:30:47 +0000 (00:30 +0900)]
Update translations

8 years agoAdd "Ignore codepage differences" option
Takashi Sawanaka [Mon, 14 Mar 2016 15:29:05 +0000 (00:29 +0900)]
Add "Ignore codepage differences" option

8 years agoMergeStatusBar.*: Colorize encoding and EOL differeces in status bar
Takashi Sawanaka [Mon, 14 Mar 2016 15:24:32 +0000 (00:24 +0900)]
MergeStatusBar.*: Colorize encoding and EOL differeces in status bar

8 years agoMove the statusbar related code from ChildFrm.* to MergeStatusBar.*
Takashi Sawanaka [Sat, 12 Mar 2016 23:41:45 +0000 (08:41 +0900)]
Move the statusbar related code from ChildFrm.* to MergeStatusBar.*

8 years agoFix build error when cloning from github.com/sdottaka/winmerge-v2
Takashi Sawanaka [Sat, 5 Mar 2016 10:10:35 +0000 (19:10 +0900)]
Fix build error when cloning from github.com/sdottaka/winmerge-v2

8 years agoBump revision to 2.14.0+-jp-102
Takashi Sawanaka [Sat, 27 Feb 2016 12:25:26 +0000 (21:25 +0900)]
Bump revision to 2.14.0+-jp-102

8 years agoGive priority to UTF-8 detection even in the case of using mlang.dll
Takashi Sawanaka [Sat, 27 Feb 2016 12:25:02 +0000 (21:25 +0900)]
Give priority to UTF-8 detection even in the case of using mlang.dll

8 years ago"Filter comments" feature did not work properly in the case of issue #41
Takashi Sawanaka [Sat, 27 Feb 2016 11:39:45 +0000 (20:39 +0900)]
"Filter comments" feature did not work properly in the case of issue #41

8 years agoCompareMSExcelFiles.sct: Add support for xltx and xltm file extensions
Takashi Sawanaka [Sat, 27 Feb 2016 11:31:48 +0000 (20:31 +0900)]
CompareMSExcelFiles.sct: Add support for xltx and xltm file extensions

8 years agoFix crash when moving from a folder to another folder without closing the descendant...
Takashi Sawanaka [Sat, 27 Feb 2016 11:29:41 +0000 (20:29 +0900)]
Fix crash when moving from a folder to another folder without closing the descendant File Compare window

8 years agoBump revision to 2.14.0+-jp-101
Takashi Sawanaka [Sun, 21 Feb 2016 15:43:22 +0000 (00:43 +0900)]
Bump revision to 2.14.0+-jp-101

8 years agoReduce MFC dependency
Takashi Sawanaka [Sun, 21 Feb 2016 12:08:22 +0000 (21:08 +0900)]
Reduce MFC dependency