* Remove obsolete product version fallback, part 2.

Author: IRainman

Src/ClassicExplorer/ClassicCopy.cpp

@@ -687,7 +687,9 @@ static LRESULT CALLBACK WindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM
 						if (bDef)
 						{
 							delay=0;
+#if _WIN32_WINNT < _WIN32_WINNT_WIN7
 							if (GetWinVersion()>=_WIN32_WINNT_WIN7)
+#endif
 							{
 								BOOL comp;
 								if (SUCCEEDED(DwmIsCompositionEnabled(&comp)) && comp)

Src/ClassicExplorer/ExplorerBand.cpp

@@ -539,7 +539,9 @@ static bool GetPidlPath( PIDLIST_ABSOLUTE pidl, wchar_t *path )
 	path[0]=0;
 	if (SHGetPathFromIDList(pidl,path) && *path)
 		return true;
+#if _WIN32_WINNT < _WIN32_WINNT_WIN7
 	if (GetWinVersion()>= _WIN32_WINNT_WIN7)
+#endif
 	{
 		// maybe it is a library - try the default save folder
 		CComPtr<IShellItem> pShellItem;
@@ -1983,7 +1985,12 @@ void CBandWindow::SetBrowsers( IShellBrowser *pBrowser, IWebBrowser2 *pWebBrowse
 
 CExplorerBand::CExplorerBand( void )
 {
-	m_bSubclassRebar=GetWinVersion()>= _WIN32_WINNT_WIN7;
+	m_bSubclassRebar =
+#if _WIN32_WINNT < _WIN32_WINNT_WIN7
+		GetWinVersion() >= _WIN32_WINNT_WIN7;
+#else
+		true;
+#endif
 	m_bSubclassedRebar=false;
 	m_TopWindow=NULL;
 }

Src/StartMenu/StartMenuDLL/ItemManager.cpp

@@ -123,7 +123,9 @@ static CComPtr<IApplicationResolver> g_pAppResolver;
 // Creates the app id resolver object
 static void CreateAppResolver( void )
 {
+#if _WIN32_WINNT < _WIN32_WINNT_WIN7
 	if (GetWinVersion()>=_WIN32_WINNT_WIN7)
+#endif
 	{
 		CComPtr<IUnknown> pUnknown;
 		pUnknown.CoCreateInstance(CLSID_ApplicationResolver);
@@ -1938,7 +1940,9 @@ void CItemManager::RefreshItemInfo( ItemInfo *pInfo, int refreshFlags, IShellIte
 				}
 				if (pStore)
 				{
+#if _WIN32_WINNT < _WIN32_WINNT_WIN7
 					if (GetWinVersion()>=_WIN32_WINNT_WIN7)
+#endif
 					{
 						newInfo.appid=GetPropertyStoreString(pStore,PKEY_AppUserModel_ID);
 						newInfo.bExplicitAppId=!newInfo.appid.IsEmpty();

Src/StartMenu/StartMenuDLL/MenuContainer.cpp

@@ -7725,7 +7725,9 @@ HWND CMenuContainer::ToggleStartMenu( int taskbarId, bool bKeyboard, bool bAllPr
 	}
 
 	// the taskbar on Windows 7 (and most likely later versions) is always on top even though it doesn't have the ABS_ALWAYSONTOP flag.
+#if _WIN32_WINNT < _WIN32_WINNT_WIN7
 	if (GetWinVersion()>=_WIN32_WINNT_WIN7)
+#endif
 	{
 		// also check the WS_EX_TOPMOST style - maybe some tool like DisableTaskbarOnTop is messing with it
 		if (::GetWindowLong(s_TaskBar,GWL_EXSTYLE)&WS_EX_TOPMOST)