Added patch for combase HSTRING objects.
Merge with master.