It would be nice to see what Alexandre's opinion of the options discussed in this thread is, as he's ultimately the one who will decide.
From an observer's point of view, I'd say that moving the current DIB
code out of wineX11 first before replacing it with Max's DIB code sounds like the cleanest idea, because then if any bugs are introduced it will be directly from the migration of the code, not the logic of the DIB stuff itself. But obviously, from reading the discussion, it's not as clean cut as just moving the code.
Luke.