thanks for the update. Two main remarks still:
* it looks like you added changes for my remarks on new commits on top of the existing ones. it would be better to squash the changes inside your initial commits. * also, we require that each commit should be able to success in their tests. so it's very likely the commit with tests should have @todo_wine@ marks inside them (this way the test, when run under windows will check that the output -after the mark- matches, but when the test in run under wine, it will check that output doesn't match, but won't report an error) * this shall be removed in the same commit as the corresponding fix