GetShortPathName returns Long Path Name

After recent directory changes now the GetShortPathName does not work, but returns the Long Path Name. A test program is attached.

Edit: Patch attached may be helpful.