Changing WinAPI calls to ATL and WTL calls
Merge branch '41396883' into develop