You had the formatting right in the original code why not now? And why would the number of array elements depend on the size of wchar_t? I fixed the patch up and checked it in.