Re: [Resend 2] SHLWAPI fixes