OSDN Git Service

winmerge-jp/winmerge-jp.git
9 years ago* Add _tcscpy_safe() to coretools.h
sdottaka [Sun, 24 May 2015 11:44:42 +0000 (20:44 +0900)]
* Add _tcscpy_safe() to coretools.h
* Use _tcscpy_safe() and StrintCchCopy() instead of _tcscpy() and _tcsncpy()

--HG--
branch : stable

9 years agoEnvironment.cpp: Copy env_GetMyDocuments() and env_GetWindowsDirectory() from WinMerg...
sdottaka [Sun, 24 May 2015 09:12:19 +0000 (18:12 +0900)]
Environment.cpp: Copy env_GetMyDocuments() and env_GetWindowsDirectory() from WinMerge2011

--HG--
branch : stable

9 years agodllpstub.cpp: Fix for 64bit
sdottaka [Sun, 24 May 2015 08:53:06 +0000 (17:53 +0900)]
dllpstub.cpp: Fix for 64bit

--HG--
branch : stable

9 years agoFileOrFolderSelect.cpp: Use CoTaskMemFree() instead of IMalloc::Free()
sdottaka [Sun, 24 May 2015 08:49:28 +0000 (17:49 +0900)]
FileOrFolderSelect.cpp: Use CoTaskMemFree() instead of IMalloc::Free()

--HG--
branch : stable

9 years agoFix compiler warning
sdottaka [Sun, 24 May 2015 08:33:16 +0000 (17:33 +0900)]
Fix compiler warning

--HG--
branch : stable

9 years agoExConverter.cpp: Fix memory leak
sdottaka [Sun, 24 May 2015 06:23:33 +0000 (15:23 +0900)]
ExConverter.cpp: Fix memory leak

--HG--
branch : stable

9 years agosign *.exe, *.dll and installer
sdottaka [Sun, 24 May 2015 01:58:09 +0000 (10:58 +0900)]
sign *.exe, *.dll and installer

--HG--
branch : stable

9 years agoMerge7z: Remove unused files
sdottaka [Sun, 24 May 2015 00:14:41 +0000 (09:14 +0900)]
Merge7z: Remove unused files

--HG--
branch : stable

9 years agoMerge7z: Remove Release and Debug solution configurations
sdottaka [Sun, 24 May 2015 00:07:11 +0000 (09:07 +0900)]
Merge7z: Remove Release and Debug solution configurations

--HG--
branch : stable

9 years agoMerge7z: Fix for the warning "warning MSB8030: The linker switch "Minimum Required...
sdottaka [Sat, 23 May 2015 23:43:59 +0000 (08:43 +0900)]
Merge7z: Fix for the warning "warning MSB8030: The linker switch "Minimum Required Version" requires "SubSystem" to be set.  Without "SubSystem", the "Minimum Required Version" would not be passed to linker and could prevent to the output binary from running on older Operating Systems"

--HG--
branch : stable

9 years agoMerge7z: Add SignMerge7z.bat
sdottaka [Sat, 23 May 2015 23:32:27 +0000 (08:32 +0900)]
Merge7z: Add SignMerge7z.bat

--HG--
branch : stable

9 years agoMerge7z: Update to VS2013
sdottaka [Sat, 23 May 2015 23:32:05 +0000 (08:32 +0900)]
Merge7z: Update to VS2013

--HG--
branch : stable

9 years agoPlugins: Update dlls
sdottaka [Sat, 23 May 2015 13:34:14 +0000 (22:34 +0900)]
Plugins: Update dlls

--HG--
branch : stable

9 years agoShellExtension: Add SignShellExtension.bat
sdottaka [Sat, 23 May 2015 13:33:44 +0000 (22:33 +0900)]
ShellExtension: Add SignShellExtension.bat

--HG--
branch : stable

9 years agoPlugins: Add SignPlugins.bat
sdottaka [Sat, 23 May 2015 13:30:05 +0000 (22:30 +0900)]
Plugins: Add SignPlugins.bat

--HG--
branch : stable

9 years agoUpdate Externals
sdottaka [Sat, 23 May 2015 13:09:33 +0000 (22:09 +0900)]
Update Externals

--HG--
branch : stable

9 years agoShellExtension: Remove unused function
sdottaka [Sat, 23 May 2015 13:04:01 +0000 (22:04 +0900)]
ShellExtension: Remove unused function

--HG--
branch : stable

9 years agoShellExtension: Bump revision to 1.16.5.3
sdottaka [Sat, 23 May 2015 13:02:22 +0000 (22:02 +0900)]
ShellExtension: Bump revision to 1.16.5.3

--HG--
branch : stable

9 years agoShellExtension: Update to VS2013
sdottaka [Sat, 23 May 2015 13:01:54 +0000 (22:01 +0900)]
ShellExtension: Update to VS2013

--HG--
branch : stable

9 years agoPlugins: Bump revisions
sdottaka [Sat, 23 May 2015 12:50:37 +0000 (21:50 +0900)]
Plugins: Bump revisions

--HG--
branch : stable

9 years agoPlugins: Update to VS2013
sdottaka [Sat, 23 May 2015 12:49:32 +0000 (21:49 +0900)]
Plugins: Update to VS2013

--HG--
branch : stable

9 years agoDon't use SSE2 instructions for Pentium III
sdottaka [Sat, 23 May 2015 12:39:34 +0000 (21:39 +0900)]
Don't use SSE2 instructions for Pentium III

--HG--
branch : stable

9 years agoAllow using environment variables in temporary path name
sdottaka [Sun, 17 May 2015 13:45:25 +0000 (22:45 +0900)]
Allow using environment variables in temporary path name

--HG--
branch : stable

9 years agoUse paths_*() functions instead of shlwapi functions
sdottaka [Sun, 17 May 2015 05:27:31 +0000 (14:27 +0900)]
Use paths_*() functions instead of shlwapi functions

--HG--
branch : stable

9 years agoChildFrm.cpp: Use ucr::toTString() instad of A2CT() for the warning "C6255 Unprotecte...
sdottaka [Sun, 17 May 2015 03:53:09 +0000 (12:53 +0900)]
ChildFrm.cpp: Use ucr::toTString() instad of A2CT() for the warning "C6255 Unprotected use of alloca"

--HG--
branch : stable

9 years agoMerge.vcxproj: Use $(OutDir) macro
sdottaka [Sun, 17 May 2015 03:35:32 +0000 (12:35 +0900)]
Merge.vcxproj: Use $(OutDir) macro

--HG--
branch : stable

9 years agoReduce compiler warnings
sdottaka [Sat, 16 May 2015 13:23:40 +0000 (22:23 +0900)]
Reduce compiler warnings

--HG--
branch : stable

9 years agodiff.h: reduce compiler warnings
sdottaka [Sat, 16 May 2015 13:08:42 +0000 (22:08 +0900)]
diff.h: reduce compiler warnings

--HG--
branch : stable

9 years agocrystaledit: reduce compile warnings
sdottaka [Sat, 16 May 2015 11:18:06 +0000 (20:18 +0900)]
crystaledit: reduce compile warnings

--HG--
branch : stable

9 years agoOptionDef.*: Reduce the source code size
sdottaka [Sat, 16 May 2015 10:52:13 +0000 (19:52 +0900)]
OptionDef.*: Reduce the source code size

--HG--
branch : stable

11 years ago* Add paths_AddTrailingSlash() & use it
sdottaka [Sun, 30 Jun 2013 10:21:43 +0000 (19:21 +0900)]
* Add paths_AddTrailingSlash() & use it
* Use paths_ConcatPath()

--HG--
branch : stable

9 years agoOptionsDef.*: Reduce executable file size
sdottaka [Sun, 10 May 2015 12:01:29 +0000 (21:01 +0900)]
OptionsDef.*: Reduce executable file size

--HG--
branch : stable

9 years agoReduce source code size
sdottaka [Sun, 10 May 2015 09:09:12 +0000 (18:09 +0900)]
Reduce source code size

--HG--
branch : stable

9 years agoMove ID_OPTIONS_SHOW* menu handler in CMainFrame to CDirView
sdottaka [Sun, 10 May 2015 05:23:22 +0000 (14:23 +0900)]
Move ID_OPTIONS_SHOW* menu handler in CMainFrame to CDirView

--HG--
branch : stable

9 years agoMove ID_VIEW_WHITESPACE menu handler in CMainFrame to CMergeEditView
sdottaka [Sat, 9 May 2015 14:30:24 +0000 (23:30 +0900)]
Move ID_VIEW_WHITESPACE menu handler in CMainFrame to CMergeEditView

--HG--
branch : stable

9 years agoMainFrm.cpp: Reduce compile warnings
sdottaka [Sat, 9 May 2015 13:29:00 +0000 (22:29 +0900)]
MainFrm.cpp: Reduce compile warnings

--HG--
branch : stable

9 years agoMerge.vcxproj: Reduce file size
sdottaka [Fri, 8 May 2015 14:47:04 +0000 (23:47 +0900)]
Merge.vcxproj: Reduce file size

--HG--
branch : stable

9 years agoUse SysLink control instead of CStaticLink class
sdottaka [Thu, 7 May 2015 15:38:24 +0000 (00:38 +0900)]
Use SysLink control instead of CStaticLink class

--HG--
branch : stable

9 years agoRemove CMoveConstraint dependency from LoadSaveCodepageDlg.{cpp, h}
sdottaka [Thu, 7 May 2015 11:11:39 +0000 (20:11 +0900)]
Remove CMoveConstraint dependency from LoadSaveCodepageDlg.{cpp, h}

--HG--
branch : stable

9 years agoRemove CSubclass.{cpp, h}
sdottaka [Thu, 7 May 2015 11:04:51 +0000 (20:04 +0900)]
Remove CSubclass.{cpp, h}

--HG--
branch : stable

9 years agoUpdate translations
sdottaka [Sun, 3 May 2015 15:42:37 +0000 (00:42 +0900)]
Update translations

--HG--
branch : stable

9 years agoUse CWaitCursor class instead of WaitStatusCursor class for reducing .po file size
sdottaka [Sun, 3 May 2015 15:41:40 +0000 (00:41 +0900)]
Use CWaitCursor class instead of WaitStatusCursor class for reducing .po file size

--HG--
branch : stable

9 years agoRemove unused codes
sdottaka [Sun, 3 May 2015 14:48:42 +0000 (23:48 +0900)]
Remove unused codes

--HG--
branch : stable

9 years agoRemove some #ifdef _DEBUG blocks
sdottaka [Sun, 3 May 2015 14:15:35 +0000 (23:15 +0900)]
Remove some #ifdef _DEBUG blocks

--HG--
branch : stable

9 years agoFilepathEdit.cpp: Fix mixed eol-style
sdottaka [Sun, 3 May 2015 12:37:23 +0000 (21:37 +0900)]
FilepathEdit.cpp: Fix mixed eol-style

--HG--
branch : stable

9 years agoFix wrong file names in @file
sdottaka [Sun, 3 May 2015 03:21:48 +0000 (12:21 +0900)]
Fix wrong file names in @file

--HG--
branch : stable

9 years agoAdded tag 2.14.0+-jp-80 for changeset 64c9b8a8a876
sdottaka [Tue, 28 Apr 2015 14:38:00 +0000 (23:38 +0900)]
Added tag 2.14.0+-jp-80 for changeset 64c9b8a8a876

--HG--
branch : stable

9 years agoBump revision to 2.14.0+-jp-80 2.14.0+-jp-80
sdottaka [Sun, 26 Apr 2015 13:06:13 +0000 (22:06 +0900)]
Bump revision to 2.14.0+-jp-80

--HG--
branch : stable

9 years agoUpdate translations
sdottaka [Sun, 26 Apr 2015 12:54:02 +0000 (21:54 +0900)]
Update translations

--HG--
branch : stable

9 years agoPropShell.*: Add Register/Unregister shell extension buttons on Shell Options dialog
sdottaka [Sun, 26 Apr 2015 12:53:39 +0000 (21:53 +0900)]
PropShell.*: Add Register/Unregister shell extension buttons on Shell Options dialog

--HG--
branch : stable

9 years agoMDITabBar.cpp: Fix for High Contrast Themes
sdottaka [Sun, 26 Apr 2015 12:12:45 +0000 (21:12 +0900)]
MDITabBar.cpp: Fix for High Contrast Themes

--HG--
branch : stable

9 years agoLineFiltersList.cpp: Ignore empty line filter
sdottaka [Sat, 25 Apr 2015 14:59:58 +0000 (23:59 +0900)]
LineFiltersList.cpp: Ignore empty line filter

--HG--
branch : stable

9 years agoFilepathEdit.*: Adjust top margin in edit control
sdottaka [Sat, 25 Apr 2015 14:52:51 +0000 (23:52 +0900)]
FilepathEdit.*: Adjust top margin in edit control

--HG--
branch : stable

9 years agoOpenView.*: Handle Ctrl+A key
sdottaka [Sat, 25 Apr 2015 13:56:06 +0000 (22:56 +0900)]
OpenView.*: Handle Ctrl+A key

--HG--
branch : stable

9 years agoMDITabBar: Make tab bar flat
sdottaka [Sat, 25 Apr 2015 13:47:15 +0000 (22:47 +0900)]
MDITabBar: Make tab bar flat

--HG--
branch : stable

9 years agoBump revision to 2.14.0+-jp-79
sdottaka [Sun, 19 Apr 2015 14:13:25 +0000 (23:13 +0900)]
Bump revision to 2.14.0+-jp-79

--HG--
branch : stable

9 years agoUpdate translations
sdottaka [Sun, 19 Apr 2015 14:00:10 +0000 (23:00 +0900)]
Update translations

--HG--
branch : stable

9 years agoMerge.rc: fine-tune the label positions on DirCompProgress dialog
sdottaka [Sun, 19 Apr 2015 13:59:49 +0000 (22:59 +0900)]
Merge.rc: fine-tune the label positions on DirCompProgress dialog

--HG--
branch : stable

9 years agoFix crash when recomparing selected folders non-recursively
sdottaka [Sun, 19 Apr 2015 11:11:07 +0000 (20:11 +0900)]
Fix crash when recomparing selected folders non-recursively

--HG--
branch : stable

9 years agoCompareStats.cpp: Fix mixed eol-style
sdottaka [Sun, 19 Apr 2015 11:00:17 +0000 (20:00 +0900)]
CompareStats.cpp: Fix mixed eol-style

--HG--
branch : stable

9 years agoRemove "Enable multiple compare windows" group box
sdottaka [Sun, 19 Apr 2015 10:59:49 +0000 (19:59 +0900)]
Remove "Enable multiple compare windows" group box

--HG--
branch : stable

9 years agoDirCompProgressBar: Show relative path instead of absolute path while comparing files
sdottaka [Sun, 19 Apr 2015 09:39:20 +0000 (18:39 +0900)]
DirCompProgressBar: Show relative path instead of absolute path while comparing files

--HG--
branch : stable

9 years agoDiff3.h: Fix mixed eol-style
sdottaka [Sat, 18 Apr 2015 13:05:33 +0000 (22:05 +0900)]
Diff3.h: Fix mixed eol-style

--HG--
branch : stable

9 years agodiffutils: Remove unused regex library
sdottaka [Sat, 18 Apr 2015 13:04:59 +0000 (22:04 +0900)]
diffutils: Remove unused regex library

--HG--
branch : stable

9 years agoUpdate translations
sdottaka [Sat, 18 Apr 2015 08:11:29 +0000 (17:11 +0900)]
Update translations

--HG--
branch : stable

9 years agoMerge from
sdottaka [Sat, 18 Apr 2015 08:08:06 +0000 (17:08 +0900)]
Merge from
https://bitbucket.org/jtuc/winmerge2011/commits/384fa7e51f4e7a0dc424fd67da34c2810e3649fd
 (DirCompProgressDlg: Show paths of files being compared (lazily updated))
https://bitbucket.org/jtuc/winmerge2011/commits/86a84dc5dec8b4c94e65cca7431f7ad10c5528ad
 (DirCompProgressDlg: Show paths of most time-consuming one among current items)

--HG--
branch : stable

9 years agoBCMenu: Remove xp_draw_3D_bitmaps
sdottaka [Sun, 12 Apr 2015 09:49:44 +0000 (18:49 +0900)]
BCMenu: Remove xp_draw_3D_bitmaps

--HG--
branch : stable

9 years agoRemove old VS version support
sdottaka [Sun, 12 Apr 2015 09:23:13 +0000 (18:23 +0900)]
Remove old VS version support

--HG--
branch : stable

9 years agoBump revision to 2.14.0+-jp-78
sdottaka [Sun, 5 Apr 2015 12:03:10 +0000 (21:03 +0900)]
Bump revision to 2.14.0+-jp-78

--HG--
branch : stable

9 years agoConfigLog.cpp: Show the version of hekseditU.dll, WinIMergeLib.dll and 7z.dll
sdottaka [Sat, 4 Apr 2015 14:15:16 +0000 (23:15 +0900)]
ConfigLog.cpp: Show the version of hekseditU.dll, WinIMergeLib.dll and 7z.dll

--HG--
branch : stable

9 years agoupdate sevenzip to changeset 7:39183f27c635
sdottaka [Sat, 4 Apr 2015 13:09:31 +0000 (22:09 +0900)]
update sevenzip to changeset 7:39183f27c635

--HG--
branch : stable

9 years agoMerge.rc: Fine-tune the position of controls in dialogs (2)
sdottaka [Sat, 4 Apr 2015 02:34:30 +0000 (11:34 +0900)]
Merge.rc: Fine-tune the position of controls in dialogs (2)

--HG--
branch : stable

9 years agoFix crash when searching with invalid regular expression
sdottaka [Sat, 4 Apr 2015 01:39:03 +0000 (10:39 +0900)]
Fix crash when searching with invalid regular expression

--HG--
branch : stable

9 years agoUse more appropriate font
sdottaka [Sat, 4 Apr 2015 01:36:34 +0000 (10:36 +0900)]
Use more appropriate font

--HG--
branch : stable

9 years agoAdded tag 2.14.0+-jp-77 for changeset 6372ed162d8d
sdottaka [Sun, 29 Mar 2015 11:01:58 +0000 (20:01 +0900)]
Added tag 2.14.0+-jp-77 for changeset 6372ed162d8d

--HG--
branch : stable

9 years agoBump revsion to 2.14.0+-jp-77 2.14.0+-jp-77
sdottaka [Sun, 29 Mar 2015 10:03:15 +0000 (19:03 +0900)]
Bump revsion to 2.14.0+-jp-77

--HG--
branch : stable

9 years agoUpdate translations
sdottaka [Sun, 29 Mar 2015 10:01:23 +0000 (19:01 +0900)]
Update translations

--HG--
branch : stable

9 years agoFix menu items are displayed with wrong width sometimes
sdottaka [Sun, 29 Mar 2015 09:09:44 +0000 (18:09 +0900)]
Fix menu items are displayed with wrong width sometimes

--HG--
branch : stable

9 years agoFix disappeared tooltips on toolbar icons
sdottaka [Sun, 29 Mar 2015 07:19:02 +0000 (16:19 +0900)]
Fix disappeared tooltips on toolbar icons

--HG--
branch : stable

9 years agoRename ID_* to IDS_* for String ID
sdottaka [Sun, 29 Mar 2015 03:24:22 +0000 (12:24 +0900)]
Rename ID_* to IDS_* for String ID

--HG--
branch : stable

9 years agoAdd more words to StringBlacklist.txt to reduce .po file size
sdottaka [Sun, 29 Mar 2015 01:37:57 +0000 (10:37 +0900)]
Add more words to StringBlacklist.txt to reduce .po file size

--HG--
branch : stable

9 years agoRemove [Help/Release Notes] and [Help/Translations] menu item
sdottaka [Sat, 28 Mar 2015 23:49:23 +0000 (08:49 +0900)]
Remove [Help/Release Notes] and [Help/Translations] menu item

--HG--
branch : stable

9 years agoAdd language names to StringBlacklist.txt to reduce .po file size
sdottaka [Sat, 28 Mar 2015 15:15:40 +0000 (00:15 +0900)]
Add language names to StringBlacklist.txt to reduce .po file size

--HG--
branch : stable

9 years agoUse WinMerge2011's MakeShortSize() function
sdottaka [Sat, 28 Mar 2015 14:46:14 +0000 (23:46 +0900)]
Use WinMerge2011's MakeShortSize() function

--HG--
branch : stable

9 years agoRemove unused resource strings
sdottaka [Sat, 28 Mar 2015 14:19:20 +0000 (23:19 +0900)]
Remove unused resource strings

--HG--
branch : stable

9 years agoMerge.rc: Replace tabs with spaces
sdottaka [Sat, 28 Mar 2015 13:49:33 +0000 (22:49 +0900)]
Merge.rc: Replace tabs with spaces

--HG--
branch : stable

9 years agoRemove messages on the status bar to reduce the size of .rc file
sdottaka [Sat, 28 Mar 2015 13:41:07 +0000 (22:41 +0900)]
Remove messages on the status bar to reduce the size of .rc file

--HG--
branch : stable

9 years agoFix mixed eol-style
sdottaka [Sat, 28 Mar 2015 04:59:08 +0000 (13:59 +0900)]
Fix mixed eol-style

--HG--
branch : stable

9 years agoBCMenu.cpp: Draw menu items in XP-style even on Win8, Win7 and Vista
sdottaka [Thu, 26 Mar 2015 14:27:07 +0000 (23:27 +0900)]
BCMenu.cpp: Draw menu items in XP-style even on Win8, Win7 and Vista

--HG--
branch : stable

9 years agoBump revision to 2.14.0+-jp-76
sdottaka [Sun, 22 Mar 2015 11:24:04 +0000 (20:24 +0900)]
Bump revision to 2.14.0+-jp-76

--HG--
branch : stable

9 years agoCrystalEdit: Fix crash when closing editor window without closing Find dialog
sdottaka [Sun, 22 Mar 2015 11:23:22 +0000 (20:23 +0900)]
CrystalEdit: Fix crash when closing editor window without closing Find dialog

--HG--
branch : stable

9 years agoMerge.rc: Fine-tune the position of controls in dialogs
sdottaka [Sun, 22 Mar 2015 10:39:24 +0000 (19:39 +0900)]
Merge.rc: Fine-tune the position of controls in dialogs

--HG--
branch : stable

9 years agoUse appropriate system UI font for dialogs (Use Segoe UI font)
sdottaka [Sun, 22 Mar 2015 09:07:39 +0000 (18:07 +0900)]
Use appropriate system UI font for dialogs (Use Segoe UI font)

--HG--
branch : stable

9 years agoMessageBoxDialog.*: Simulate Vista-style message box
sdottaka [Sat, 21 Mar 2015 14:41:43 +0000 (23:41 +0900)]
MessageBoxDialog.*: Simulate Vista-style message box

--HG--
branch : stable

9 years agoUpdate Translations
sdottaka [Sat, 21 Mar 2015 07:49:38 +0000 (16:49 +0900)]
Update Translations

--HG--
branch : stable

9 years agoAdd [Check For Updates] menu item
sdottaka [Sat, 21 Mar 2015 07:13:53 +0000 (16:13 +0900)]
Add [Check For Updates] menu item

--HG--
branch : stable

9 years agoOptionsMgr.h: Add GetDefault() template function
sdottaka [Sun, 15 Mar 2015 08:20:12 +0000 (17:20 +0900)]
OptionsMgr.h: Add GetDefault() template function

--HG--
branch : stable

9 years agoSrc/Merge.vcxproj: Add Constans.h
sdottaka [Sat, 14 Mar 2015 13:59:39 +0000 (22:59 +0900)]
Src/Merge.vcxproj: Add Constans.h

--HG--
branch : stable

9 years agoInstaller/InnoSetup/WinMerge*.iss: Install GPL.rtf
sdottaka [Sat, 14 Mar 2015 13:58:49 +0000 (22:58 +0900)]
Installer/InnoSetup/WinMerge*.iss: Install GPL.rtf

--HG--
branch : stable

9 years agoRemove unused variable
sdottaka [Sat, 14 Mar 2015 13:15:16 +0000 (22:15 +0900)]
Remove unused variable

--HG--
branch : stable