Cinder code updates for removal of <Win10

Author: andrewfb

include/cinder/audio/msw/ContextWasapi.h

@@ -24,7 +24,6 @@
 #pragma once
 
 #include "cinder/Cinder.h"
-#if ( _WIN32_WINNT >= 0x0600 ) // requires Windows Vista+
 
 #include "cinder/audio/Context.h"
 
@@ -95,5 +94,3 @@ class WasapiExc : public AudioExc {
 };
 
 } } } // namespace cinder::audio::msw
-
-#endif // ( _WIN32_WINNT >= 0x0600 )

include/cinder/audio/msw/DeviceManagerWasapi.h

@@ -24,7 +24,6 @@
 #pragma once
 
 #include "cinder/Cinder.h"
-#if ( _WIN32_WINNT >= _WIN32_WINNT_VISTA ) // requires Windows Vista+
 
 #include "cinder/audio/Device.h"
 
@@ -77,6 +76,4 @@ class DeviceManagerWasapi : public DeviceManager {
 	  std::unique_ptr<Impl> mImpl;
 };
 
-} } } // namespace cinder::audio::msw
-
-#endif // #if ( _WIN32_WINNT >= _WIN32_WINNT_VISTA ) // requires Windows Vista+
+} } } // namespace cinder::audio::msw

src/cinder/ImageTargetFileWic.cpp

@@ -28,9 +28,7 @@
 #include <map>
 #include <set>
 
-#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE)
-	#include <D2D1.h>
-#endif
+#include <D2D1.h>
 #include <wincodec.h>
 #include <wincodecsdk.h>
 #pragma comment( lib, "WindowsCodecs.lib" )

src/cinder/app/msw/RendererImplDx.cpp

@@ -17,7 +17,7 @@
 //   may be used to endorse or promote products derived from this software 
 //   without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS �AS IS� AND ANY EXPRESS OR IMPLIED WARRANTIES, 
 // INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS 
 // FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
 // INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
@@ -316,24 +316,15 @@ void RendererImplDx::swapBuffers() const
 	parameters.pScrollOffset = nullptr;
 
 	HRESULT hr;
-#if ( _WIN32_WINNT >= 0x0602 )
 	if( mVsyncEnable )
 		hr = mSwapChain->Present1( 1, 0, &parameters );
 	else
 		hr = mSwapChain->Present1( 0, 0, &parameters );
-#else
-	if( mVsyncEnable )
-		hr = mSwapChain->Present( 1, 0 );
-	else
-		hr = mSwapChain->Present( 0, 0 );
-#endif
 	//handle device lost
 	if(hr == DXGI_ERROR_DEVICE_REMOVED)
 		const_cast<RendererImplDx*>(this)->handleLostDevice();
-#if ( _WIN32_WINNT >= 0x0602 )
 	mDeviceContext->DiscardView( mMainFramebuffer );
 	mDeviceContext->DiscardView( mDepthStencilView );
-#endif
 }
 
 void RendererImplDx::makeCurrentContext()
@@ -597,10 +588,7 @@ bool RendererImplDx::createDevice( UINT createDeviceFlags )
 {
 	D3D_FEATURE_LEVEL featureLevels[] =
     {
-#if (_WIN32_WINNT >= 0x0602 /*_WIN32_WINNT_WIN8*/)
-		// This requires Windows 8.
 		D3D_FEATURE_LEVEL_11_1,
-#endif
         D3D_FEATURE_LEVEL_11_0,
         D3D_FEATURE_LEVEL_10_1,
         D3D_FEATURE_LEVEL_10_0,
@@ -625,19 +613,11 @@ bool RendererImplDx::createDevice( UINT createDeviceFlags )
 	);
 
 	if( hr == S_OK ) {
-#if ( _WIN32_WINNT >= 0x0602 )
 		hr = device->QueryInterface(__uuidof(ID3D11Device1), (void**)&md3dDevice);
-#else
-		hr = device->QueryInterface(__uuidof(ID3D11Device), (void**)&md3dDevice);
-#endif
 	}
 
 	if( hr == S_OK ) {
-#if ( _WIN32_WINNT >= 0x0602 )
 		hr = context->QueryInterface(__uuidof(ID3D11DeviceContext1), (void**)&mDeviceContext);
-#else
-		hr = context->QueryInterface(__uuidof(ID3D11DeviceContext), (void**)&mDeviceContext);
-#endif
 	}
 
 	if( context )
@@ -689,7 +669,6 @@ bool RendererImplDx::createFramebufferResources()
 		if( hr != S_OK )
 			return false;
 
- #if ( _WIN32_WINNT >= 0x0602 )
 		IDXGIFactory2 *dxgiFactory;
 		hr = dxgiAdapter->GetParent(__uuidof(IDXGIFactory2), (void**)&dxgiFactory);
 		if( hr != S_OK )
@@ -704,57 +683,11 @@ bool RendererImplDx::createFramebufferResources()
 		swapChainDesc.SampleDesc.Quality = 0;
 		swapChainDesc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT;
 		swapChainDesc.BufferCount = 2; // Use double-buffering to minimize latency.
-
-		// Check to see if the OS is Windows 8 or later. If it's not, then that means
-		// compiling/running on Windows 7 SP1. We use this to set the appropriate
-		// flags for Windows7 SP 1's DirectX 11.1 support.
-		//
-		OSVERSIONINFOEX osver;
-		ZeroMemory( &osver, sizeof(OSVERSIONINFOEX) );
-		osver.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
-		GetVersionEx( (OSVERSIONINFO*)&osver );
-		bool isWin8 = (osver.dwMajorVersion >= 6) && (osver.dwMinorVersion >= 2);
-
-		if( isWin8 ) {
-			swapChainDesc.Scaling = DXGI_SCALING_NONE;
-		}
-		else {
-			//
-			// Win7 doesn't support DXGI_SCALING_NONE:
-			//    http://msdn.microsoft.com/en-us/library/windows/desktop/hh404557(v=vs.85).aspx
-			//
-			swapChainDesc.Scaling = DXGI_SCALING_STRETCH;
-		}
-
+		swapChainDesc.Scaling = DXGI_SCALING_NONE;
 		swapChainDesc.SwapEffect = DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL; // All Windows Store apps must use this SwapEffect.
 		swapChainDesc.Flags = DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH;
 
 		hr = dxgiFactory->CreateSwapChainForHwnd( md3dDevice, mWnd, &swapChainDesc, NULL, NULL, &mSwapChain );
-#else
-		IDXGIFactory1 *dxgiFactory;
-		hr = dxgiAdapter->GetParent(__uuidof(IDXGIFactory1), (void**)&dxgiFactory);
-		if( hr != S_OK )
-			return false;
-		
-		DXGI_SWAP_CHAIN_DESC swapChainDesc = {0};
-		swapChainDesc.BufferDesc.Width = static_cast<UINT>(width); // Match the size of the window.
-		swapChainDesc.BufferDesc.Height = static_cast<UINT>(height);
-		swapChainDesc.BufferDesc.RefreshRate.Numerator = 60;
-		swapChainDesc.BufferDesc.RefreshRate.Denominator = 1;
-		swapChainDesc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; // This is the most common swap chain format.
-		swapChainDesc.BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED;
-		swapChainDesc.BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED;
-		swapChainDesc.SampleDesc.Count = 1; // Don't use multi-sampling.
-		swapChainDesc.SampleDesc.Quality = 0;
-		swapChainDesc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT;
-		swapChainDesc.BufferCount = 2; // Use double-buffering to minimize latency.
-		swapChainDesc.OutputWindow = mWnd;
-		swapChainDesc.Windowed = TRUE;
-		swapChainDesc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD;
-		swapChainDesc.Flags = 0;
-		
-		hr = dxgiFactory->CreateSwapChain( md3dDevice, &swapChainDesc, &mSwapChain );
-#endif
 		if( hr != S_OK )
 			return false;
 		hr = dxgiDevice->SetMaximumFrameLatency(1);

src/cinder/audio/Context.cpp

@@ -87,11 +87,7 @@ Context* Context::master()
 #if defined( CINDER_COCOA )
 		sMasterContext.reset( new cocoa::ContextAudioUnit() );
 #elif defined( CINDER_MSW )
-	#if( _WIN32_WINNT >= 0x0600 ) // requires Windows Vista+
 		sMasterContext.reset( new msw::ContextWasapi() );
-	#else
-		sMasterContext.reset( new msw::ContextXAudio() );
-	#endif
 #elif defined( CINDER_ANDROID )
 		sMasterContext.reset( new android::ContextOpenSl() );
 #elif defined( CINDER_LINUX )
@@ -111,9 +107,7 @@ DeviceManager* Context::deviceManager()
 #elif defined( CINDER_COCOA_TOUCH )
 		sDeviceManager.reset( new cocoa::DeviceManagerAudioSession() );
 #elif defined( CINDER_MSW )
-	#if( _WIN32_WINNT > 0x0600 ) // requires Windows Vista+
 		sDeviceManager.reset( new msw::DeviceManagerWasapi() );
-	#endif
 #elif defined( CINDER_ANDROID )
 		sDeviceManager.reset( new android::DeviceManagerOpenSl() );
 #elif defined( CINDER_LINUX )