OSDN Git Service

winmerge-jp/winmerge-jp.git
10 years agoHexView: left only file or right only file can be now opened in Hex view 2.14.0+-jp-17
sdottaka [Sun, 29 Sep 2013 00:59:53 +0000 (09:59 +0900)]
HexView: left only file or right only file can be now opened in Hex view

--HG--
branch : stable

10 years agoUpdate Merge_FC_loose.flt for VS2010
sdottaka [Sat, 28 Sep 2013 01:33:35 +0000 (10:33 +0900)]
Update Merge_FC_loose.flt for VS2010

--HG--
branch : stable

10 years agoDisable events when opening Excel workbooks, to avoid VBA macro errors
sdottaka [Sat, 14 Sep 2013 03:06:12 +0000 (12:06 +0900)]
Disable events when opening Excel workbooks, to avoid VBA macro errors

--HG--
branch : stable

10 years agofix mixed eol-style
sdottaka [Mon, 9 Sep 2013 15:06:49 +0000 (00:06 +0900)]
fix mixed eol-style

--HG--
branch : stable

10 years agoFix unsynchronized header bar and editor panes while loading large files
sdottaka [Mon, 9 Sep 2013 15:06:18 +0000 (00:06 +0900)]
Fix unsynchronized header bar and editor panes while loading large files

--HG--
branch : stable

10 years agoUpdate revisions
sdottaka [Mon, 9 Sep 2013 14:14:23 +0000 (23:14 +0900)]
Update revisions

--HG--
branch : stable

10 years agoInclude Jochen's version of Frhed (https://bitbucket.org/jtuc/frhed/)
sdottaka [Mon, 9 Sep 2013 14:14:05 +0000 (23:14 +0900)]
Include Jochen's version of Frhed (https://bitbucket.org/jtuc/frhed/)

--HG--
branch : stable

10 years agoAdded tag 2.14.0+-jp-16 for changeset 79e01f9fe331
sdottaka [Wed, 28 Aug 2013 13:15:42 +0000 (22:15 +0900)]
Added tag 2.14.0+-jp-16 for changeset 79e01f9fe331

--HG--
branch : stable

10 years agoUpdate revisions 2.14.0+-jp-16
sdottaka [Wed, 28 Aug 2013 12:41:04 +0000 (21:41 +0900)]
Update revisions

--HG--
branch : stable

10 years agoFix crash when opening directories before completing folder compare
sdottaka [Tue, 27 Aug 2013 13:35:04 +0000 (22:35 +0900)]
Fix crash when opening directories before completing folder compare

--HG--
branch : stable

10 years agoAdded tag 2.14.0+-jp-15 for changeset 37fdc816aa4d
sdottaka [Sun, 28 Jul 2013 10:46:56 +0000 (19:46 +0900)]
Added tag 2.14.0+-jp-15 for changeset 37fdc816aa4d

--HG--
branch : stable

10 years agoUpdate revisions 2.14.0+-jp-15
sdottaka [Tue, 23 Jul 2013 14:06:44 +0000 (23:06 +0900)]
Update revisions

--HG--
branch : stable

10 years agoFix: SaveClosingDlg is not shown in the center of the MainFrame
sdottaka [Tue, 23 Jul 2013 13:48:42 +0000 (22:48 +0900)]
Fix: SaveClosingDlg is not shown in the center of the MainFrame

11 years agoAdded tag 2.14.0+-jp-14 for changeset 918180abd795
sdottaka [Sun, 14 Jul 2013 08:57:47 +0000 (17:57 +0900)]
Added tag 2.14.0+-jp-14 for changeset 918180abd795

11 years agoUpdate revisions 2.14.0+-jp-14
sdottaka [Sun, 14 Jul 2013 07:30:02 +0000 (16:30 +0900)]
Update revisions

11 years agoAdd "Close Select Files or Folders Dialog on clicking OK button" option. close #26
sdottaka [Sun, 14 Jul 2013 07:29:48 +0000 (16:29 +0900)]
Add "Close Select Files or Folders Dialog on clicking OK button" option. close #26

11 years agoMake OpenDlg resizable again. close #27
sdottaka [Sun, 14 Jul 2013 04:55:56 +0000 (13:55 +0900)]
Make OpenDlg resizable again. close #27

11 years agoImprove startup time
sdottaka [Sat, 6 Jul 2013 14:54:04 +0000 (23:54 +0900)]
Improve startup time

11 years agoAdded tag 2.14.0+-jp-13 for changeset 78f2a78ebb20
sdottaka [Fri, 28 Jun 2013 23:40:29 +0000 (08:40 +0900)]
Added tag 2.14.0+-jp-13 for changeset 78f2a78ebb20

11 years agoUpdate revisions 2.14.0+-jp-13
sdottaka [Fri, 28 Jun 2013 23:40:11 +0000 (08:40 +0900)]
Update revisions

11 years agoLook at "HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\SourceSafe\\Databases" for finding...
sdottaka [Fri, 28 Jun 2013 23:04:05 +0000 (08:04 +0900)]
Look at "HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\SourceSafe\\Databases" for finding VSS databases

11 years agoInstall 32-bit ShellExtention for 64-bit Windows
sdottaka [Thu, 27 Jun 2013 14:19:43 +0000 (23:19 +0900)]
Install 32-bit ShellExtention for 64-bit Windows

11 years agoRemove unused LogFile.{cpp,h} in vc71 project file
sdottaka [Thu, 27 Jun 2013 14:15:16 +0000 (23:15 +0900)]
Remove unused LogFile.{cpp,h} in vc71 project file

11 years agoFix: the contents of config log are broken
sdottaka [Thu, 27 Jun 2013 14:13:34 +0000 (23:13 +0900)]
Fix: the contents of config log are broken

11 years agoAdded tag 2.14.0+-jp-12 for changeset 9226cde7d33e
sdottaka [Sun, 23 Jun 2013 00:29:46 +0000 (09:29 +0900)]
Added tag 2.14.0+-jp-12 for changeset 9226cde7d33e

11 years agoUpdate revisions 2.14.0+-jp-12
sdottaka [Sun, 23 Jun 2013 00:29:32 +0000 (09:29 +0900)]
Update revisions

11 years agoFix: VSS integration does not work
sdottaka [Sun, 23 Jun 2013 00:05:33 +0000 (09:05 +0900)]
Fix: VSS integration does not work

11 years agoAdded tag 2.14.0+-jp-11 for changeset cc1a06ca5c34
sdottaka [Sat, 15 Jun 2013 01:42:12 +0000 (10:42 +0900)]
Added tag 2.14.0+-jp-11 for changeset cc1a06ca5c34

11 years agoUpdate revisions 2.14.0+-jp-11
sdottaka [Sat, 15 Jun 2013 01:41:40 +0000 (10:41 +0900)]
Update revisions

11 years agoFix: unable to convert Unicode file to ANSI file for plugins. #22
sdottaka [Sat, 15 Jun 2013 01:25:08 +0000 (10:25 +0900)]
Fix: unable to convert Unicode file to ANSI file for plugins. #22

11 years agoFix the problem that cannot save font face name setting
sdottaka [Sat, 1 Jun 2013 12:51:29 +0000 (21:51 +0900)]
Fix the problem that cannot save font face name setting

11 years agoAdded tag 2.14.0+-jp-10 for changeset f0d1dec733d0
sdottaka [Wed, 29 May 2013 14:53:21 +0000 (23:53 +0900)]
Added tag 2.14.0+-jp-10 for changeset f0d1dec733d0

11 years agoBuildArc.cmd: create jp_files.txt 2.14.0+-jp-10
sdottaka [Wed, 29 May 2013 14:36:36 +0000 (23:36 +0900)]
BuildArc.cmd: create jp_files.txt

11 years agoBuildBin.cmd: fix for 32bit OS
sdottaka [Wed, 29 May 2013 14:17:12 +0000 (23:17 +0900)]
BuildBin.cmd: fix for 32bit OS

11 years agoBuildArc.cmd: include *.vbs files in archive file
sdottaka [Wed, 29 May 2013 14:15:37 +0000 (23:15 +0900)]
BuildArc.cmd: include *.vbs files in archive file

11 years agoUpdate revisions
sdottaka [Wed, 29 May 2013 14:14:24 +0000 (23:14 +0900)]
Update revisions

11 years agoFix that WinMerge ANSI build didn't display items in Folder Compare window on some...
sdottaka [Wed, 29 May 2013 14:13:48 +0000 (23:13 +0900)]
Fix that WinMerge ANSI build didn't display items in Folder Compare window on some Windows box
(sent LVN_GETDISPINFOW(UNICODE) message regardless of Ansi build)

11 years agoRemove unused files
sdottaka [Wed, 29 May 2013 13:57:23 +0000 (22:57 +0900)]
Remove unused files

11 years agoAdded tag 2.14.0+-jp-9 for changeset 7dec9a4246a2
sdottaka [Sun, 26 May 2013 16:07:53 +0000 (01:07 +0900)]
Added tag 2.14.0+-jp-9 for changeset 7dec9a4246a2

11 years agoUpdate revisions 2.14.0+-jp-9
sdottaka [Sun, 26 May 2013 12:44:40 +0000 (21:44 +0900)]
Update revisions

11 years agoLink with MFC library statically
sdottaka [Sun, 26 May 2013 12:44:20 +0000 (21:44 +0900)]
Link with MFC library statically

11 years agoRemove non ascii characters from CrystalEditViewEx.h
sdottaka [Sun, 26 May 2013 12:34:47 +0000 (21:34 +0900)]
Remove non ascii characters from CrystalEditViewEx.h

11 years agoFix 64bit PocoUtilmtd.lib location
sdottaka [Sun, 26 May 2013 12:32:39 +0000 (21:32 +0900)]
Fix 64bit PocoUtilmtd.lib location

11 years agoRename CMemDC class name to solve conflict with MFC
sdottaka [Sun, 26 May 2013 09:34:21 +0000 (18:34 +0900)]
Rename CMemDC class name to solve conflict with MFC

11 years agoRemove IsUnicodeBuild(), _abs64_patch() in StdAfx.*
sdottaka [Sun, 26 May 2013 03:27:54 +0000 (12:27 +0900)]
Remove IsUnicodeBuild(), _abs64_patch() in StdAfx.*

11 years agoFix mixed eol-style
sdottaka [Sun, 26 May 2013 02:19:53 +0000 (11:19 +0900)]
Fix mixed eol-style

11 years agoRemove LogFile.*
sdottaka [Sun, 26 May 2013 01:03:14 +0000 (10:03 +0900)]
Remove LogFile.*

11 years agoMove loading/saving diff option settings code to OptionsDiffOptions.{cpp,h}
sdottaka [Sat, 25 May 2013 23:38:01 +0000 (08:38 +0900)]
Move loading/saving diff option settings code to OptionsDiffOptions.{cpp,h}

11 years ago* Remove Debug menu (Load Config/Reset Options)
sdottaka [Sat, 25 May 2013 23:30:35 +0000 (08:30 +0900)]
* Remove Debug menu (Load Config/Reset Options)
* Write all OptionsMgr settings in config log

11 years agoTempFile.*: Small cleanup
sdottaka [Sat, 25 May 2013 13:57:55 +0000 (22:57 +0900)]
TempFile.*: Small cleanup

11 years agofont settings were not updated after importing .ini file and restarting WinMerge
sdottaka [Tue, 21 May 2013 14:46:26 +0000 (23:46 +0900)]
font settings were not updated after importing .ini file and restarting WinMerge
close #21

11 years agoFix for reporting unexpected compare results when comparing folders with Ignore Case...
sdottaka [Tue, 21 May 2013 14:39:47 +0000 (23:39 +0900)]
Fix for reporting unexpected compare results when comparing folders with Ignore Case option.
close #20 (failed to convert file contents to utf-8 because of a buffer shortage)

11 years agoAdded tag 2.14.0+-jp-8 for changeset 53266bba3228
sdottaka [Sun, 19 May 2013 17:45:18 +0000 (02:45 +0900)]
Added tag 2.14.0+-jp-8 for changeset 53266bba3228

11 years agoRemoved tag 2.14.0+-jp-8
sdottaka [Sun, 19 May 2013 17:45:16 +0000 (02:45 +0900)]
Removed tag 2.14.0+-jp-8

11 years agoFix crash when opening SelectUnpackerDlg 2.14.0+-jp-8
sdottaka [Sun, 19 May 2013 17:45:01 +0000 (02:45 +0900)]
Fix crash when opening SelectUnpackerDlg

11 years agoAdded tag 2.14.0+-jp-8 for changeset 2bf4616d2afd
sdottaka [Sun, 19 May 2013 16:46:38 +0000 (01:46 +0900)]
Added tag 2.14.0+-jp-8 for changeset 2bf4616d2afd

11 years agoUpdate revisions
sdottaka [Sun, 19 May 2013 16:36:05 +0000 (01:36 +0900)]
Update revisions

11 years agoUpdate translation files
sdottaka [Sun, 19 May 2013 14:33:18 +0000 (23:33 +0900)]
Update translation files

11 years agoRemove unused files
sdottaka [Sun, 19 May 2013 14:30:46 +0000 (23:30 +0900)]
Remove unused files

11 years agoAdd "Ignore Reparse Points" Option
sdottaka [Sun, 19 May 2013 14:25:34 +0000 (23:25 +0900)]
Add "Ignore Reparse Points" Option

11 years agoFilepathEdit.cpp: Use clipboard helper function
sdottaka [Sun, 19 May 2013 14:21:02 +0000 (23:21 +0900)]
FilepathEdit.cpp: Use clipboard helper function

11 years agoRemove unused function
sdottaka [Sun, 19 May 2013 14:18:44 +0000 (23:18 +0900)]
Remove unused function

11 years agoMove drag and drop helper code to DragDrop.*
sdottaka [Sun, 19 May 2013 14:12:03 +0000 (23:12 +0900)]
Move drag and drop helper code to DragDrop.*

11 years agoMove loading/saving diff color settings code to OptionsDiffColors.{cpp,h} (2)
sdottaka [Sun, 19 May 2013 13:50:26 +0000 (22:50 +0900)]
Move loading/saving diff color settings code to OptionsDiffColors.{cpp,h} (2)

11 years agoAdded tag 2.14.0+-jp-7 for changeset 0e72022c2be8
sdottaka [Wed, 15 May 2013 14:23:52 +0000 (23:23 +0900)]
Added tag 2.14.0+-jp-7 for changeset 0e72022c2be8

11 years agoUpdate revisions 2.14.0+-jp-7
sdottaka [Wed, 15 May 2013 13:25:22 +0000 (22:25 +0900)]
Update revisions

11 years agostringdiffs.*: Remove unused functions
sdottaka [Wed, 15 May 2013 13:25:10 +0000 (22:25 +0900)]
stringdiffs.*: Remove unused functions

11 years agoFix adding FFILEOPEN_NOMRU flagged items to Win7 jump list
sdottaka [Tue, 14 May 2013 13:25:26 +0000 (22:25 +0900)]
Fix adding FFILEOPEN_NOMRU flagged items to Win7 jump list

11 years agoFix adding garbage item into Win7 jump list on WinMerge ANSI build
sdottaka [Mon, 13 May 2013 16:04:44 +0000 (01:04 +0900)]
Fix adding garbage item into Win7 jump list on WinMerge ANSI build

11 years agoGet rid of a NUL char at the end of pasted text on ANSI build
sdottaka [Mon, 13 May 2013 13:53:10 +0000 (22:53 +0900)]
Get rid of a NUL char at the end of pasted text on ANSI build

11 years agoMove loading/saving diff color settings code to OptionsDiffColors.{cpp,h}
sdottaka [Mon, 13 May 2013 13:40:01 +0000 (22:40 +0900)]
Move loading/saving diff color settings code to OptionsDiffColors.{cpp,h}

11 years agoFix mixed eol-style
sdottaka [Sun, 12 May 2013 12:36:41 +0000 (21:36 +0900)]
Fix mixed eol-style

11 years agoRename SyntaxColorsUtil.* to OptionsSyntaxColors.*
sdottaka [Sun, 12 May 2013 03:42:25 +0000 (12:42 +0900)]
Rename SyntaxColorsUtil.* to OptionsSyntaxColors.*

11 years ago* Remove "View/Select Font" menu item. close #19
sdottaka [Sun, 12 May 2013 02:58:12 +0000 (11:58 +0900)]
* Remove "View/Select Font" menu item. close #19
* Update File/Folder Window's font when selecting "View/Use Default Font" menu item
* Move loading/saving font settings code to OptionsFont.{cpp,h}

11 years agoSeparte diff3 algorithm from DiffWrapper.cpp and stringdiffs.cpp into Diff3.h
sdottaka [Sun, 5 May 2013 06:22:59 +0000 (15:22 +0900)]
Separte diff3 algorithm from DiffWrapper.cpp and stringdiffs.cpp into Diff3.h

11 years agoFix mixed eol-style
sdottaka [Sun, 5 May 2013 02:20:43 +0000 (11:20 +0900)]
Fix mixed eol-style

11 years agoFix crash when comparing zero size file with prediffer plugin
sdottaka [Sat, 4 May 2013 04:40:42 +0000 (13:40 +0900)]
Fix crash when comparing zero size file with prediffer plugin

11 years agoAvoid using 'delete' operator
sdottaka [Sat, 4 May 2013 03:55:45 +0000 (12:55 +0900)]
Avoid using 'delete' operator

11 years agoUpdate boost version to 1.53.0
sdottaka [Fri, 3 May 2013 09:06:20 +0000 (18:06 +0900)]
Update boost version to 1.53.0

11 years agoFix mixed eol-style
sdottaka [Fri, 3 May 2013 03:55:35 +0000 (12:55 +0900)]
Fix mixed eol-style

11 years agoFix: Still shows green progress bar on Win7's taskbar even when finished comparing...
sdottaka [Mon, 29 Apr 2013 10:00:07 +0000 (19:00 +0900)]
Fix: Still shows green progress bar on Win7's taskbar even when finished comparing folders. Submitted by tatsu-san

11 years agoAdded tag 2.14.0+-jp-6 for changeset d8ee64c8d443
sdottaka [Sun, 21 Apr 2013 20:01:37 +0000 (05:01 +0900)]
Added tag 2.14.0+-jp-6 for changeset d8ee64c8d443

11 years agoCppcheck: Variable 'm_svalue' is assigned in constructor body. Consider performing... 2.14.0+-jp-6
sdottaka [Sun, 21 Apr 2013 13:48:54 +0000 (22:48 +0900)]
Cppcheck: Variable 'm_svalue' is assigned in constructor body. Consider performing initialization in initialization list.

11 years agoCppcheck: Function parameter 'str1' should be passed by reference.
sdottaka [Sun, 21 Apr 2013 13:41:35 +0000 (22:41 +0900)]
Cppcheck: Function parameter 'str1' should be passed by reference.

11 years agoCppcheck: Passing the result of c_str() to a function that takes std::string as argum...
sdottaka [Sun, 21 Apr 2013 13:37:23 +0000 (22:37 +0900)]
Cppcheck: Passing the result of c_str() to a function that takes std::string as argument no. ? is slow and redundant.

11 years agoCppcheck: The extra qualification '*::' is unnecessary and is considered an error...
sdottaka [Sun, 21 Apr 2013 13:32:39 +0000 (22:32 +0900)]
Cppcheck: The extra qualification '*::' is unnecessary and is considered an error by many compilers.

11 years agoCppcheck: Member variable * is not initialized in the constructor.
sdottaka [Sun, 21 Apr 2013 13:27:30 +0000 (22:27 +0900)]
Cppcheck: Member variable * is not initialized in the constructor.

11 years agoCppcheck: syntax error
sdottaka [Sun, 21 Apr 2013 13:08:35 +0000 (22:08 +0900)]
Cppcheck: syntax error

11 years agoCppcheck: Common realloc mistake: 'ptr' nulled but not freed upon failure
sdottaka [Sun, 21 Apr 2013 12:53:30 +0000 (21:53 +0900)]
Cppcheck: Common realloc mistake: 'ptr' nulled but not freed upon failure

11 years agoCppcheck: Uninitialized variable: bModified
sdottaka [Sun, 21 Apr 2013 12:36:54 +0000 (21:36 +0900)]
Cppcheck: Uninitialized variable: bModified

11 years agoFix: OpenView does not accept Drag&Droped three files
sdottaka [Sun, 21 Apr 2013 12:35:14 +0000 (21:35 +0900)]
Fix: OpenView does not accept Drag&Droped three files

11 years agoFix memory leak In GetWordDiffArray()
sdottaka [Sun, 21 Apr 2013 12:30:27 +0000 (21:30 +0900)]
Fix memory leak In GetWordDiffArray()

11 years ago Cppcheck: Passing the result of c_str() to a function that takes std::string as...
sdottaka [Sun, 21 Apr 2013 11:48:04 +0000 (20:48 +0900)]
 Cppcheck: Passing the result of c_str() to a function that takes std::string as argument no. ? is slow and redundant.

11 years agoCppcheck: Unused variable: *
sdottaka [Sun, 21 Apr 2013 11:36:04 +0000 (20:36 +0900)]
Cppcheck: Unused variable: *
Cppcheck: Variable * is assigned a value that is never used.

11 years agoCppcheck: Prefer prefix ++/-- operators for non-primitive types.
sdottaka [Sun, 21 Apr 2013 11:03:22 +0000 (20:03 +0900)]
Cppcheck: Prefer prefix ++/-- operators for non-primitive types.

11 years agoFix crash when enabling Application Verifier
sdottaka [Sun, 21 Apr 2013 08:32:25 +0000 (17:32 +0900)]
Fix crash when enabling Application Verifier

11 years agoUpdate revisions
sdottaka [Sun, 21 Apr 2013 05:31:46 +0000 (14:31 +0900)]
Update revisions

11 years agoFix: Temporary folder path name is created in Windows 7 jump list after comparing...
sdottaka [Sun, 21 Apr 2013 05:31:35 +0000 (14:31 +0900)]
Fix: Temporary folder path name is created in Windows 7 jump list after comparing zip files

11 years agoChange "FileDescription" of WinMergeU.exe
sdottaka [Sun, 21 Apr 2013 05:26:31 +0000 (14:26 +0900)]
Change "FileDescription" of WinMergeU.exe

11 years agoFix: Windows 7 Jump List not appearing on Start Menu
sdottaka [Sun, 21 Apr 2013 05:22:47 +0000 (14:22 +0900)]
Fix: Windows 7 Jump List not appearing on Start Menu