Bug 730128 - Remove code ifdef'd MOZ_WINSDK_TARGETVER for pre-Windows 7 SDKs. r=jmathies

widget/windows/JumpListBuilder.cpp

@@ -37,8 +37,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7
-
 #include "JumpListBuilder.h"
 
 #include "nsError.h"
@@ -769,4 +767,3 @@ AsyncDeleteAllFaviconsFromDisk::~AsyncDeleteAllFaviconsFromDisk()
 } // namespace widget
 } // namespace mozilla
 
-#endif // MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7

widget/windows/JumpListBuilder.h

@@ -40,8 +40,6 @@
 #ifndef __JumpListBuilder_h__
 #define __JumpListBuilder_h__
 
-#if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7
-
 #include <windows.h>
 
 #undef NTDDI_VERSION
@@ -152,7 +150,5 @@ public:
 } // namespace widget
 } // namespace mozilla
 
-#endif // MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7
-
 #endif /* __JumpListBuilder_h__ */
 

widget/windows/JumpListItem.cpp

@@ -37,8 +37,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7
-
 #include "JumpListItem.h"
 
 #include <shellapi.h>
@@ -841,4 +839,3 @@ nsresult JumpListItem::HashURI(nsCOMPtr<nsICryptoHash> &aCryptoHash,
 } // namespace widget
 } // namespace mozilla
 
-#endif // MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7

widget/windows/JumpListItem.h

@@ -40,8 +40,6 @@
 #ifndef __JumpListItem_h__
 #define __JumpListItem_h__
 
-#if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7
-
 #include <windows.h>
 #include <shobjidl.h>
 
@@ -160,6 +158,4 @@ protected:
 } // namespace widget
 } // namespace mozilla
 
-#endif // MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7
-
 #endif /* __JumpListItem_h__ */

widget/windows/TaskbarPreview.cpp

@@ -39,8 +39,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7
-
 #include "TaskbarPreview.h"
 #include <nsITaskbarPreviewController.h>
 #include <windows.h>
@@ -467,4 +465,3 @@ TaskbarPreview::sActivePreview = nsnull;
 } // namespace widget
 } // namespace mozilla
 
-#endif // MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7

widget/windows/TaskbarPreview.h

@@ -41,8 +41,6 @@
 #ifndef __mozilla_widget_TaskbarPreview_h__
 #define __mozilla_widget_TaskbarPreview_h__
 
-#if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7
-
 #include <windows.h>
 #include <shobjidl.h>
 
@@ -133,8 +131,5 @@ private:
 } // namespace widget
 } // namespace mozilla
 
-#endif // MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7
-
 #endif /* __mozilla_widget_TaskbarPreview_h__ */
 
-

widget/windows/TaskbarPreviewButton.cpp

@@ -38,8 +38,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7
-
 #include <windows.h>
 #include <strsafe.h>
 
@@ -178,5 +176,3 @@ TaskbarPreviewButton::Update() {
 } // namespace widget
 } // namespace mozilla
 
-#endif // MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7 
-

widget/windows/TaskbarPreviewButton.h

@@ -41,8 +41,6 @@
 #ifndef __mozilla_widget_TaskbarPreviewButton_h__
 #define __mozilla_widget_TaskbarPreviewButton_h__
 
-#if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7
-
 #include <windows.h>
 #include <shobjidl.h>
 
@@ -77,8 +75,5 @@ private:
 } // namespace widget
 } // namespace mozilla
 
-#endif // MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7
-
 #endif /* __mozilla_widget_TaskbarPreviewButton_h__ */
 
-

widget/windows/TaskbarTabPreview.cpp

@@ -38,8 +38,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7
-
 #include "TaskbarTabPreview.h"
 #include "nsWindowGfx.h"
 #include "nsUXThemeData.h"
@@ -390,4 +388,3 @@ TaskbarTabPreview::UpdateNext() {
 } // namespace widget
 } // namespace mozilla
 
-#endif // MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7

widget/windows/TaskbarTabPreview.h

@@ -41,8 +41,6 @@
 #ifndef __mozilla_widget_TaskbarTabPreview_h__
 #define __mozilla_widget_TaskbarTabPreview_h__
 
-#if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7
-
 #include "nsITaskbarTabPreview.h"
 #include "TaskbarPreview.h"
 
@@ -101,6 +99,4 @@ private:
 } // namespace widget
 } // namespace mozilla
 
-#endif // MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7
-
 #endif /* __mozilla_widget_TaskbarTabPreview_h__ */

widget/windows/TaskbarWindowPreview.cpp

@@ -39,8 +39,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7
-
 #include "mozilla/Util.h"
 
 #include <nsITaskbarPreviewController.h>
@@ -358,5 +356,3 @@ TaskbarWindowPreview::UpdateButton(PRUint32 index) {
 } // namespace widget
 } // namespace mozilla
 
-#endif // MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7
-

widget/windows/TaskbarWindowPreview.h

@@ -42,8 +42,6 @@
 #ifndef __mozilla_widget_TaskbarWindowPreview_h__
 #define __mozilla_widget_TaskbarWindowPreview_h__
 
-#if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7
-
 #include "nsITaskbarWindowPreview.h"
 #include "nsITaskbarProgress.h"
 #include "nsITaskbarOverlayIconController.h"
@@ -116,7 +114,5 @@ private:
 } // namespace widget
 } // namespace mozilla
 
-#endif // MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7
-
 #endif /* __mozilla_widget_TaskbarWindowPreview_h__ */
 

widget/windows/WinTaskbar.cpp

@@ -39,8 +39,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7
-
 #include "WinTaskbar.h"
 #include "TaskbarPreview.h"
 #include <nsITaskbarPreviewController.h>
@@ -530,4 +528,3 @@ WinTaskbar::PrepareFullScreenHWND(void *aHWND, bool aFullScreen) {
 } // namespace widget
 } // namespace mozilla
 
-#endif // MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7

widget/windows/WinTaskbar.h

@@ -41,8 +41,6 @@
 #ifndef __WinTaskbar_h__
 #define __WinTaskbar_h__
 
-#if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7
-
 #include <windows.h>
 #include <shobjidl.h>
 #include "nsIWinTaskbar.h"
@@ -74,7 +72,5 @@ private:
 } // namespace widget
 } // namespace mozilla
 
-#endif // MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7
-
 #endif /* __WinTaskbar_h__ */
 

widget/windows/nsAppShell.cpp

@@ -60,14 +60,12 @@ const PRUnichar* kTaskbarButtonEventId = L"TaskbarButtonCreated";
 
 static UINT sMsgId;
 
-#if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7
 static UINT sTaskbarButtonCreatedMsg;
 
 /* static */
 UINT nsAppShell::GetTaskbarButtonCreatedMessage() {
 	return sTaskbarButtonCreatedMsg;
 }
-#endif
 
 namespace mozilla {
 namespace crashreporter {
@@ -144,10 +142,8 @@ nsAppShell::Init()
   if (!sMsgId)
     sMsgId = RegisterWindowMessageW(kAppShellEventId);
 
-#if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7
   sTaskbarButtonCreatedMsg = ::RegisterWindowMessageW(kTaskbarButtonEventId);
   NS_ASSERTION(sTaskbarButtonCreatedMsg, "Could not register taskbar button creation message");
-#endif
 
   WNDCLASSW wc;
   HINSTANCE module = GetModuleHandle(NULL);

widget/windows/nsAppShell.h

@@ -57,9 +57,7 @@ public:
   nsresult Init();
   void DoProcessMoreGeckoEvents();
 
-#if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7
   static UINT GetTaskbarButtonCreatedMessage();
-#endif
 
 protected:
 #if defined(_MSC_VER) && defined(_M_IX86)

widget/windows/nsWidgetFactory.cpp

@@ -86,14 +86,12 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsClipboard)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsClipboardHelper)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsSound)
 
-#if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7
 NS_GENERIC_FACTORY_CONSTRUCTOR(WinTaskbar)
 NS_GENERIC_FACTORY_CONSTRUCTOR(JumpListBuilder)
 NS_GENERIC_FACTORY_CONSTRUCTOR(JumpListItem)
 NS_GENERIC_FACTORY_CONSTRUCTOR(JumpListSeparator)
 NS_GENERIC_FACTORY_CONSTRUCTOR(JumpListLink)
 NS_GENERIC_FACTORY_CONSTRUCTOR(JumpListShortcut)
-#endif
 
 namespace mozilla {
 namespace widget {
@@ -128,14 +126,12 @@ NS_DEFINE_NAMED_CID(NS_SOUND_CID);
 NS_DEFINE_NAMED_CID(NS_TRANSFERABLE_CID);
 NS_DEFINE_NAMED_CID(NS_HTMLFORMATCONVERTER_CID);
 
-#if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7
 NS_DEFINE_NAMED_CID(NS_WIN_TASKBAR_CID);
 NS_DEFINE_NAMED_CID(NS_WIN_JUMPLISTBUILDER_CID);
 NS_DEFINE_NAMED_CID(NS_WIN_JUMPLISTITEM_CID);
 NS_DEFINE_NAMED_CID(NS_WIN_JUMPLISTSEPARATOR_CID);
 NS_DEFINE_NAMED_CID(NS_WIN_JUMPLISTLINK_CID);
 NS_DEFINE_NAMED_CID(NS_WIN_JUMPLISTSHORTCUT_CID);
-#endif
 
 NS_DEFINE_NAMED_CID(NS_DRAGSERVICE_CID);
 NS_DEFINE_NAMED_CID(NS_BIDIKEYBOARD_CID);
@@ -162,14 +158,12 @@ static const mozilla::Module::CIDEntry kWidgetCIDs[] = {
   { &kNS_SOUND_CID, false, NULL, nsSoundConstructor },
   { &kNS_TRANSFERABLE_CID, false, NULL, nsTransferableConstructor },
   { &kNS_HTMLFORMATCONVERTER_CID, false, NULL, nsHTMLFormatConverterConstructor },
-#if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7
   { &kNS_WIN_TASKBAR_CID, false, NULL, WinTaskbarConstructor },
   { &kNS_WIN_JUMPLISTBUILDER_CID, false, NULL, JumpListBuilderConstructor },
   { &kNS_WIN_JUMPLISTITEM_CID, false, NULL, JumpListItemConstructor },
   { &kNS_WIN_JUMPLISTSEPARATOR_CID, false, NULL, JumpListSeparatorConstructor },
   { &kNS_WIN_JUMPLISTLINK_CID, false, NULL, JumpListLinkConstructor },
   { &kNS_WIN_JUMPLISTSHORTCUT_CID, false, NULL, JumpListShortcutConstructor },
-#endif
   { &kNS_DRAGSERVICE_CID, false, NULL, nsDragServiceConstructor },
   { &kNS_BIDIKEYBOARD_CID, false, NULL, nsBidiKeyboardConstructor },
 #ifdef NS_PRINTING
@@ -195,14 +189,12 @@ static const mozilla::Module::ContractIDEntry kWidgetContracts[] = {
   { "@mozilla.org/sound;1", &kNS_SOUND_CID },
   { "@mozilla.org/widget/transferable;1", &kNS_TRANSFERABLE_CID },
   { "@mozilla.org/widget/htmlformatconverter;1", &kNS_HTMLFORMATCONVERTER_CID },
-#if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7
   { "@mozilla.org/windows-taskbar;1", &kNS_WIN_TASKBAR_CID },
   { "@mozilla.org/windows-jumplistbuilder;1", &kNS_WIN_JUMPLISTBUILDER_CID },
   { "@mozilla.org/windows-jumplistitem;1", &kNS_WIN_JUMPLISTITEM_CID },
   { "@mozilla.org/windows-jumplistseparator;1", &kNS_WIN_JUMPLISTSEPARATOR_CID },
   { "@mozilla.org/windows-jumplistlink;1", &kNS_WIN_JUMPLISTLINK_CID },
   { "@mozilla.org/windows-jumplistshortcut;1", &kNS_WIN_JUMPLISTSHORTCUT_CID },
-#endif
   { "@mozilla.org/widget/dragservice;1", &kNS_DRAGSERVICE_CID },
   { "@mozilla.org/widget/bidikeyboard;1", &kNS_BIDIKEYBOARD_CID },
 #ifdef NS_PRINTING

widget/windows/nsWindow.cpp

@@ -419,18 +419,14 @@ nsWindow::nsWindow() : nsBaseWidget()
   mBrush                = ::CreateSolidBrush(NSRGB_2_COLOREF(mBackground));
   mForeground           = ::GetSysColor(COLOR_WINDOWTEXT);
 
-#if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7
   mTaskbarPreview = nsnull;
   mHasTaskbarIconBeenCreated = false;
-#endif
 
   // Global initialization
   if (!sInstanceCount) {
-#if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7
     // Global app registration id for Win7 and up. See
     // WinTaskbar.cpp for details.
     mozilla::widget::WinTaskbar::RegisterAppUserModelID();
-#endif
 
     gKbdLayout.LoadLayout(::GetKeyboardLayout(0));
 
@@ -5329,14 +5325,12 @@ bool nsWindow::ProcessMessage(UINT msg, WPARAM &wParam, LPARAM &lParam,
     *aRetValue = TABLET_ROTATE_GESTURE_ENABLE;
     break;
 
-#if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7
   case WM_TOUCH:
     result = OnTouch(wParam, lParam);
     if (result) {
       *aRetValue = 0;
     }
     break;
-#endif
 
   case WM_GESTURE:
     result = OnGesture(wParam, lParam);
@@ -5456,10 +5450,8 @@ bool nsWindow::ProcessMessage(UINT msg, WPARAM &wParam, LPARAM &lParam,
         nsTextStore::OnTextChangeMsg();
       }
 #endif //NS_ENABLE_TSF
-#if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7
       if (msg == nsAppShell::GetTaskbarButtonCreatedMessage())
         SetHasTaskbarIconBeenCreated();
-#endif
       if (msg == sOOPPPluginFocusEvent) {
         if (wParam == 1) {
           // With OOPP, the plugin window exists in another process and is a child of
@@ -6203,7 +6195,6 @@ void nsWindow::UserActivity()
   }
 }
 
-#if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7
 bool nsWindow::OnTouch(WPARAM wParam, LPARAM lParam)
 {
   PRUint32 cInputs = LOWORD(wParam);
@@ -6240,7 +6231,6 @@ bool nsWindow::OnTouch(WPARAM wParam, LPARAM lParam)
   mGesture.CloseTouchInputHandle((HTOUCHINPUT)lParam);
   return true;
 }
-#endif
 
 // Gesture event processing. Handles WM_GESTURE events.
 bool nsWindow::OnGesture(WPARAM wParam, LPARAM lParam)

widget/windows/nsWindow.h

@@ -99,9 +99,7 @@ class nsWindow : public nsBaseWidget
   typedef mozilla::TimeStamp TimeStamp;
   typedef mozilla::TimeDuration TimeDuration;
   typedef mozilla::widget::WindowHook WindowHook;
-#if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7
   typedef mozilla::widget::TaskbarWindowPreview TaskbarWindowPreview;
-#endif
 public:
   nsWindow();
   virtual ~nsWindow();
@@ -278,7 +276,6 @@ public:
    */
   bool                    AssociateDefaultIMC(bool aAssociate);
 
-#if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7
   bool HasTaskbarIconBeenCreated() { return mHasTaskbarIconBeenCreated; }
   // Called when either the nsWindow or an nsITaskbarTabPreview receives the noticiation that this window
   // has its icon placed on the taskbar.
@@ -290,7 +287,6 @@ public:
     return preview.forget();
   }
   void SetTaskbarPreview(nsITaskbarWindowPreview *preview) { mTaskbarPreview = do_GetWeakReference(preview); }
-#endif
 
   NS_IMETHOD              ReparentNativeWidget(nsIWidget* aNewParent);
 
@@ -408,9 +404,7 @@ protected:
   void                    OnScrollInternal(UINT aMsg, WPARAM aWParam,
                                            LPARAM aLParam);
   bool                    OnGesture(WPARAM wParam, LPARAM lParam);
-#if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7
   bool                    OnTouch(WPARAM wParam, LPARAM lParam);
-#endif
   bool                    OnHotKey(WPARAM wParam, LPARAM lParam);
   BOOL                    OnInputLangChange(HKL aHKL);
   bool                    OnPaint(HDC aDC, PRUint32 aNestingLevel);
@@ -600,13 +594,11 @@ protected:
   // Win7 Gesture processing and management
   nsWinGesture          mGesture;
 
-#if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7
   // Weak ref to the nsITaskbarWindowPreview associated with this window
   nsWeakPtr             mTaskbarPreview;
   // True if the taskbar (possibly through the tab preview) tells us that the
   // icon has been created on the taskbar.
   bool                  mHasTaskbarIconBeenCreated;
-#endif
 
   // The point in time at which the last paint completed. We use this to avoid
   //  painting too rapidly in response to frequent input events.