[Winmerge-development] New information for shutdown bug!

[Kimmo Varis <kimmov@wi...>]

I've worked with Gordon Thompson to get more information about the shutdown 
bug that has been reported against our latest stable versions.

Now Gordon was able to identify the release where this bug appears for a 
first time. For my very big surprise, the first faulty version is 2.1.5.7 
experimental. Earlier I was already surprised the bug was already in 2.2.0 
and later stable versions. And I don't remember any reports before 2.6.x 
versions.Only idea I have this bug has become more visible in recent stable 
series.

Shortly, I have created status page to wiki for this bug:
http://winmerge.org/Wiki/Bug_1976241

Gordon has tested several test builds I've done with additional logging and 
couple of additional patches mentioned in the page. The conclusion from 
these tests was that CMergeApp::ExitInstance() never gets called, after 
CMainFrame::OnClose(). Googling about "ExitInstance not called" or something 
like that gives some hints about what might cause it. Looks like it is 
because there must be something open/active in the application which 
prevents the framework from calling ExitInstance(). So far we have no idea 
what that could be. One suspect is possible static classes not closing down 
themselves properly.

But now we have identified a small set of patches one of which must be the 
one introducing this bug. There are 15 commits touching the code. And most 
of those seem like they cannot have anything to do with the bug.

One important info got from Gordon was that the bug appears just by starting 
the WinMerge and then trying to close WinMerge. No opening compares, dialogs 
etc. So that already rules out most of the code.

Other findings include:
- splash screen was disabled
- archive support was disabled
- single-instance was disabled

Regards,
Kimmo

[Winmerge-development] Security Assurance in FOSS: Request for contribution

[Andre Haralevi <haralevi@in...>]

Dear members of the Winmerge project, 

we kindly ask for your participation in our survey on security assurance in
free/open source software. 
Security assurances are confidence building activities through structured
design processes, documentation, and testing. 

By participating in our survey you contribute to ongoing research with the
aim to make free/open source software more secure. 
It will not take more than 10 minutes of your valuable time for our 21
questions. 

Our survey is online for the next two weeks until July 1 at: 
http://survey.mi.fu-berlin.de/public/survey.php?name=fosssecurity
The survey is anonymous. 

Please find the results of the survey on the project page during July: 
https://www.inf.fu-berlin.de/w/SE/FOSSSecuritySurvey 

For further information about Open Source research at the Research Group
Software Engineering at Freie Universitaet Berlin, please visit: 
https://www.inf.fu-berlin.de/w/SE/FOSSHome 

Thank you in anticipation,
Sascha Rasmussen, Alexander Kunze, and Andre Haralevi

In case you participate in more than one FOSS project, please fill out the
questionnaire for the one where security is most important, or fill out one
questionnaire per project. 
Thank you!

[Winmerge-development] WinMerge 2.10 plans and ideas

[Kimmo Varis <kimmov@wi...>]

Hi all,

as already stated we've changed our development model for future stable 
releases. In short we'll create a new branch for stable development 
early and only merge accepted improvements and fixes from trunk to branch.

I'm going to create a branch for 2.10 development next week. This means 
there won't be any big changes for 2.10. There aren't big changes in 
current trunk after 2.8 and we simply won't merge big changes from trunk 
to 2.10 branch.

This does not mean 2.10 development stops and we just wait for the 
release. There are plenty of smaller things to fix for 2.10 release. And 
indeed I really want to see 2.10 release as incremental improvement for 
2.8 release rather than a release having lots of new features. Now we 
have a good change to fix those smaller bugs and annoyances. These 
smaller issues easily get ignored by us developers. There are plenty of 
these in our tracker. So lets get some of them finally solved/fixed.

I'm sure everybody has their own favourite bugs/feature requests. Lets 
list them. Few of them might get fixed. The feature requests list in 
sf.net is pretty long and it is not easy to find items or see what would 
be good ones to work with. If we get a good list collected I can even 
add it to our development wiki.

My initial plan for 2.10 release is:
- 2.9.10 beta release end of next week (more about version number later 
in this mail)
- 2.9.12 beta end at August
- 2.10.0 stable at September

Yes, beta version numbers look weird. The reason for version number bump 
is I used 2.9.9.1 as version number of first 2.9.x experimental. It was 
partly an accident, and partly I wanted to test how some download 
services work. Now the result is clear, after there is 2.9.9.1, many 
services don't understand that 2.9.1.3 is a later release. One reason I 
wanted to know this is that we may want to release experimental releases 
from both development/stable branch and from trunk. If we do so, we'll 
need to make sure we always use bigger version number otherwise the 
release doesn't get to the services.

Regards,
Kimmo

Re: [Winmerge-development] List of files in subversion that are not in the project file

[Kimmo Varis <kimmov@wi...>]

Hi!

> I have written a small script that compares the content of the 
> Merge.vcproj project file and the files on disk (the script needs some 
> polishing before I send it).

Nice, these kind of scripts are good to have! Tim already added a script 
to check that all files in project file exist, which found several 
non-existing files.

>  From my script output, i was able to find that there is a lot of files 
> not included in the project that should either be included or may be 
> removed from subversion. I give you the list below, it is now up to you 
> to decide whether to add them, remove them or leave them alone. (all 
> files below are under Src)
>
> First here is a list that are not in the project file but are included 
> through Merge.rc2 (via Merge2.rc). I think they should be added to the 
> project.

[list removed]

I'm not sure what the value is with having resource files in project 
file. You don't edit bitmaps or icons in Visual Studio. But if somebody 
wants to add them, I'm fine with it.

> There is the following header file that is not in the project but is 
> included by cpp files. We should add it to the project
>   winnt_supp.h

Only Src/ConfigLog.cpp seems to use it. I don't think that file is 
needed anymore as we require Platform SDK for compiling. And it was for 
VS6 only.

> There is one file under Src that is only referenced by the project 
> (Testing\EditorTest\SampleStatic.dsp):
>   editlib\edtlib.cpp

If WinMerge executable doesn't need that file, it does not need to be in 
project file. But as test project needs it we cannot remove it.

Src/Editlib and Src/diffutils are still (external) libraries we just 
include. Editlib (CrystalEditor) has been modified quite a lot. And it 
hasn't been updated by its maintainer/creator for years. So it is kind 
of special case. We could (if/when somebody has time) do some 
refactoring etc. And remove those unused files.

Diffutils is active GNU project so we don't really want to create our 
own version of it. At least we don't remove any files. Whether all files 
are included in project file I don't care. We don't usually want to even 
modify diffutils code. Yes, there are some modifications, but those 
modifications also make updating so hard.

>   Common\dirtools.cpp
>   Common\dirtools.h

Hmm. Those routines could actually help with our file/folder selections.

>   ListEntry.h

Yes, seems to be unused currently.

>   diffutils\lib\ALLOCA.C
>   diffutils\lib\ERROR.C
>   diffutils\lib\GETOPT.C
>   diffutils\lib\GETOPT1.C
>   diffutils\lib\XMALLOC.C
>   diffutils\src\CMP.C
>   diffutils\src\DIFF.C
>   diffutils\src\DIR.C
>   diffutils\src\Dir.cpp
>   diffutils\src\SDIFF.C
>   diffutils\src\diffmain.c

These we don't touch. Read above.

>   editlib\editres.rc
>   editlib\splash.cpp
>   editlib\splash.h

These we could remove. I'm sure we don't need CrystalEditor's splash screen.

>   ssauto.h

This we don't remove. It contains generated Visual Source Safe constants 
etc. Maybe not currently used, but if somebody wants to improve VSS 
support those may be needed.

>   STACK.C
I think this is part of diffutils and needs to be moved to 
Src/diffutils/lib or Src/diffutils/src.

Regards,
Kimmo

[Winmerge-development] List of files in subversion that are not in the project file

[Marcel Gosselin <marcel.gosselin@po...>]

Hi all,

I have written a small script that compares the content of the 
Merge.vcproj project file and the files on disk (the script needs some 
polishing before I send it).

 From my script output, i was able to find that there is a lot of files 
not included in the project that should either be included or may be 
removed from subversion. I give you the list below, it is now up to you 
to decide whether to add them, remove them or leave them alone. (all 
files below are under Src)

First here is a list that are not in the project file but are included 
through Merge.rc2 (via Merge2.rc). I think they should be added to the 
project.
  Merge2.rc
  res\FileFilter.ico
  res\LineFilter.ico
  res\ToolbarDisabled.bmp
  res\ToolbarDisabled32.bmp
  res\ToolbarEnabled.bmp
  res\ToolbarEnabled32.bmp
  res\WinMerge.exe.manifest
  res\WinMergeU.exe.manifest
  res\aborted.ico
  res\cascade.bmp
  res\change_pane.bmp
  res\clear_bookmarks.bmp
  res\close.bmp
  res\copy.bmp
  res\customize_columns.bmp
  res\cut.bmp
  res\delete.bmp
  res\exit.bmp
  res\filters.bmp
  res\go_to.bmp
  res\help_contents.bmp
  res\horizontally.bmp
  res\language.bmp
  res\mg_icons.bmp
  res\next_bookmark.bmp
  res\paste.bmp
  res\patch.bmp
  res\prev_bookmark.bmp
  res\print.bmp
  res\replace.bmp
  res\report.bmp
  res\search.bmp
  res\select_all.bmp
  res\select_font.bmp
  res\splash.jpg
  res\toggle_bookmark.bmp
  res\vertically.bmp
  res\zoom_in.bmp
  res\zoom_out.bmp

There is the following header file that is not in the project but is 
included by cpp files. We should add it to the project
  winnt_supp.h

There is one file under Src that is only referenced by the project 
(Testing\EditorTest\SampleStatic.dsp):
  editlib\edtlib.cpp

Finally here is the list of files that I could not link to anything.
  Common\dirtools.cpp
  Common\dirtools.h
  ListEntry.h
  diffutils\lib\ALLOCA.C
  diffutils\lib\ERROR.C
  diffutils\lib\GETOPT.C
  diffutils\lib\GETOPT1.C
  diffutils\lib\XMALLOC.C
  diffutils\src\CMP.C
  diffutils\src\DIFF.C
  diffutils\src\DIR.C
  diffutils\src\Dir.cpp
  diffutils\src\SDIFF.C
  diffutils\src\diffmain.c
  editlib\editres.rc
  editlib\splash.cpp
  editlib\splash.h
  ssauto.h
  STACK.C

Marcel Gosselin