merge wdm.h second attempt. This time taking more care of vista definitions.