Is there anything wrong with my patches? The first one is marked as "Pending".
The tests at least seem fine to me, assuming they currently pass on Wine.
Patch 2 still has some struct initialization with named fields, which I don't think is allowed, but I figured I'd let that go and see what happens.