Bug 1322752 - Cannot compile widget with bumping WINVER to 0x601. r=jimm

MozReview-Commit-ID: EEOgx4H1ZyL

widget/windows/TaskbarPreview.cpp

@@ -28,7 +28,9 @@
 #include "mozilla/Telemetry.h"
 
 // Defined in dwmapi in a header that needs a higher numbered _WINNT #define
+#ifndef DWM_SIT_DISPLAYFRAME
 #define DWM_SIT_DISPLAYFRAME 0x1
+#endif
 
 namespace mozilla {
 namespace widget {

widget/windows/WinUtils.cpp

@@ -604,7 +604,7 @@ WinUtils::SystemScaleFactor()
   return systemScale;
 }
 
-#ifndef WM_DPICHANGED
+#if WINVER < 0x603
 typedef enum {
   MDT_EFFECTIVE_DPI = 0,
   MDT_ANGULAR_DPI = 1,

widget/windows/nsLookAndFeel.h

@@ -27,6 +27,8 @@
 #ifndef SM_SYSTEMDOCKED
 #define SM_CONVERTIBLESLATEMODE 0x00002003
 #define SM_SYSTEMDOCKED         0x00002004
+#endif
+#if WINVER < 0x0601
 typedef enum _AR_STATE
 {
   AR_ENABLED        = 0x0,

widget/windows/nsWinGesture.h

@@ -18,7 +18,7 @@
 #include "mozilla/TouchEvents.h"
 
 // Desktop builds target apis for 502. Win8 Metro builds target 602.
-#if WINVER < 0x0602
+#if WINVER < 0x0601
 
 DECLARE_HANDLE(HGESTUREINFO);