Hi,
I think the patch is a correct fix for the BadMatch / ChoosePixelFormat issues. The patch isn't 100% complete yet as I haven't updated the WGL extensions for pbuffer and wglChoosePixelFormat to work with the new pixelformats yet (that's why you see a line WoW hack). I will fix that part when you guys think that the patch is correct.
I can't speak about the technical aspects, but placing wgl commands into x11drv sounds like a good idea if we want better platform independence. We will need it if we want to port wine 'properly' to macos(without an x server) or any other os which does not have x servers.