James Hawkins : msi: Simplify MsiQueryComponentState, with more tests.