Re: [PATCH 5/5] d3d9/tests: Merge query.c into device.c.