You can find the current patchset here: http://www.math.uni-bielefeld.de/~tjakobi/wine/np2fixup_arb/
Of course the GLSL patchset is needed as well: http://www.math.uni-bielefeld.de/~tjakobi/wine/np2fixup_glsl/
I hope both can finally go into master, so please take a look.
Going to resend the GLSL part tomorrow if they don't make it in by then.
Greets, Tobias