WinMerge 2011 includes approximately the features from WinMerge mainstream trunk.A significant exception are plugins, which were ruled out due to unfortunate design flaws,but added support for scriptlet based file transforms compensates well for that.

Share and enjoy.

Regards,Jochen

Last edited by jtuc on Sun Oct 21, 2012 5:07 pm, edited 6 times in total.

Very interesting! It is cool to see somebody is still working hard with WinMerge!

I don't want to sound blunt but where are the sources? Can you upload them to BitBucket or GitHub (my own preferences, of course I'm happy with other services too!).

Considering that WinMerge 3 effort has been just some discussion and a bit of proof-of-concept code maybe this would be a good refresh for the project...

jtuc wrote:The most remarkable fact is that it compiles without MFC.

What UI toolkit it uses then? I'm very happy to hear this as this has been the major thing preventing lots of people contributing to the project and really refreshing the GUI.

jtuc wrote:The CRT is linked in statically, so end of redist annoyances.

I'm not sure this is a good idea after all. There's been some CRT updates because of vulnerabilities. And I think the CRT installing problem is now solved with the MSI installer. The annoying problem with the MSI installer was the size caused by MFC DLLs. But as MFC is now removed that is not problem.

Regarding UI, things of particular interest are H2O, which makes OS handles appear as if they were pointers to objects, and H2O2, which adds subclassing and methods to mimic MFC dialog data exchange. H2O and H2O2 share a set of decorator templates to implement most of the methods.

So none of the bloatworks which instantly come to mind, and which are no doubt beneficial when it comes to justifying designs to decision makers.

2011.001.527Changes since preceding release (not necessarily complete):• Fix occasional out-of-bound array accesses after line deletions• ShellExtension got easily confused by leftovers from previous invocation• Fix F4 Navigation between line diffs for diff detail views• File/folder selection controls were at times showing a wrong icon• The menu bar was misaligning accelerator key underlines on Vista• Number of replacements reported by replace dialog could be off by 1• Fix issue #1: Can't expand Open File Dialog• A space in the directory path was breaking the build process• File transform scriptlet to add line numbers• Fix issue #2: Scrolling by mouse wheel stops in middle of file• Line revision numbers got lost when growing the undo stack• Fix wrap at EOF logic for find/replace with an RE that matches BOL or EOL• Undoing an insertion into a ghost line went wrong• Fix enabling of Compare command when comparing a folder to itself• LineDiffs logic was mistreating the line endings• Fix MRU list issues• Add a compiled help (CHM) file

0.2011.001.464 betaChanges since preceding release (not necessarily complete):• Make support for pathnames longer than 260 characters UNC-aware• Hide \\?\ and \\?\UNC\ prefixes from user interface (work in progress)• Remove an unwanted iframe border in printouts that has been noticed with IE8• Make setup.wsf aware of Win64's Sysnative pseudo directory

0.2011.001.461 betaChanges since preceding release (not necessarily complete):• Compare As > Archive allows users to be more specific about how to open files• Extensible "Compare As" menu to allow for script driven file transforms• Make "Compare As" option available in Open dialog• Simple UI to help tweak the ClearCase Type Manager map file• Fix setup.hta for 64-bit (by disguising it as a .wsf)• Patch #3065275 Detect UCS-2 (both endiannesses) without BOM• Partial support for pathnames longer than 260 characters

0.2011.001.415 betaChanges since preceding release (not necessarily complete):• Applying of patches through drag & drop• Dropping a single file onto the application window was causing a crash• Print preview based on Internet Explorer backend with a custom print template• Continued attempts to understand and fix comments filtering• A DocFrame that was opened through ClearCase was not closing on Esc key press• Handle absence of heksedit gracefully when user invokes Compare As > Binary

0.2011.001.362 alphaShares most bugtures of mainstream code, except for (not necessarily complete):• Support for plugins other than Merge7z and heksedit is discontinued• A file with extension .flt~ no longer aborts scanning of Filters directory• FileFilterMgr no longer disregards regexps which are not followed by ##• DiffUtils and ByteCompare results are more consistent• LineFilters no longer degrade folder compare performance• Changing fonts for folder and file compare windows finally works as designed• Some unstable aspects of unicode support start stabilizing• Issue described in Patch #3281234 support of Alt+Down/Up in Diff Pane• Bug #3108489 FolderCmp object instantiation degrades DirScan performance• Bug #2010049 Memory leak from line filters (related to patch #3064882)• Patch #3065283 "Swap Panes" (Ctrl+U)• CMessageBoxDialog::CreateIconControl() was leaking bitmap handles

Last edited by jtuc on Sat Apr 07, 2012 7:46 pm, edited 22 times in total.

Can you tell me and others what are your plans with these versions? Are you going to keep developing it in private or synch to main repository later or what? Since you have basically rewritten the GUI code the sync to main repository would be quite a job.

I'm just wondering what we can do if we want to use your work in mainstream versions...

What would be the point of such effort? Are you considering to restart maintenance of WinMerge 2?

No, I'm not.

But I'm wondering your current practices. There are free code hosting services but you still don't develop in open. And there are "real" download services but you upload to some rapidshare service... You have put serious amount of work to it but make it look like suspicious download at best. How many are ready to run executables they download from those services...