Added support for dirids that map to a CSIDL value (based on a patch