Huw Davies : riched20: Move the wrap context struct into wrap.c .