James Hawkins : msi: Fix use of BSTRs.