Fix win32 structures

Fixed structures some more

Updated driver def