More controls added

Fixed windows LONG_PTR issue