From eca2005ac59a77efa497729212241ea25525e286 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Fri, 8 Apr 2016 18:01:05 -0700 Subject: [PATCH] Removed obsolete adapter code for VS 2010/2012 --- DDSTextureLoader/DDSTextureLoader.h | 17 ------------ ScreenGrab/ScreenGrab.cpp | 40 ++++----------------------- ScreenGrab/ScreenGrab.h | 8 +----- WICTextureLoader/WICTextureLoader.cpp | 5 ---- WICTextureLoader/WICTextureLoader.h | 19 ------------- 5 files changed, 6 insertions(+), 83 deletions(-) diff --git a/DDSTextureLoader/DDSTextureLoader.h b/DDSTextureLoader/DDSTextureLoader.h index 3a7e21c..542ad8a 100644 --- a/DDSTextureLoader/DDSTextureLoader.h +++ b/DDSTextureLoader/DDSTextureLoader.h @@ -18,28 +18,11 @@ // http://go.microsoft.com/fwlink/?LinkId=248929 //-------------------------------------------------------------------------------------- -#ifdef _MSC_VER #pragma once -#endif #include - -#pragma warning(push) -#pragma warning(disable : 4005) #include -#pragma warning(pop) -#if defined(_MSC_VER) && (_MSC_VER<1610) && !defined(_In_reads_) -#define _In_reads_(exp) -#define _Out_writes_(exp) -#define _In_reads_bytes_(exp) -#define _In_reads_opt_(exp) -#define _Outptr_opt_ -#endif - -#ifndef _Use_decl_annotations_ -#define _Use_decl_annotations_ -#endif namespace DirectX { diff --git a/ScreenGrab/ScreenGrab.cpp b/ScreenGrab/ScreenGrab.cpp index b54dd9f..e5d054f 100644 --- a/ScreenGrab/ScreenGrab.cpp +++ b/ScreenGrab/ScreenGrab.cpp @@ -28,32 +28,13 @@ #include #include -#if !defined(WINAPI_FAMILY) || (WINAPI_FAMILY != WINAPI_FAMILY_PHONE_APP) || (_WIN32_WINNT > _WIN32_WINNT_WIN8) - -// VS 2010's stdint.h conflicts with intsafe.h -#pragma warning(push) -#pragma warning(disable : 4005) #include -#include -#pragma warning(pop) -#endif #include #include #include -// VS 2010/2012 do not support =default =delete -#ifndef DIRECTX_CTOR_DEFAULT -#if defined(_MSC_VER) && (_MSC_VER < 1800) -#define DIRECTX_CTOR_DEFAULT {} -#define DIRECTX_CTOR_DELETE ; -#else -#define DIRECTX_CTOR_DEFAULT =default; -#define DIRECTX_CTOR_DELETE =delete; -#endif -#endif - #include "ScreenGrab.h" using Microsoft::WRL::ComPtr; @@ -241,12 +222,10 @@ namespace private: HANDLE m_handle; - auto_delete_file(const auto_delete_file&) DIRECTX_CTOR_DELETE; - auto_delete_file& operator=(const auto_delete_file&) DIRECTX_CTOR_DELETE; + auto_delete_file(const auto_delete_file&) = delete; + auto_delete_file& operator=(const auto_delete_file&) = delete; }; -#if !defined(WINAPI_FAMILY) || (WINAPI_FAMILY != WINAPI_FAMILY_PHONE_APP) || (_WIN32_WINNT > _WIN32_WINNT_WIN8) - class auto_delete_file_wic { public: @@ -266,11 +245,9 @@ namespace LPCWSTR m_filename; ComPtr& m_handle; - auto_delete_file_wic(const auto_delete_file_wic&) DIRECTX_CTOR_DELETE; - auto_delete_file_wic& operator=(const auto_delete_file_wic&) DIRECTX_CTOR_DELETE; + auto_delete_file_wic(const auto_delete_file_wic&) = delete; + auto_delete_file_wic& operator=(const auto_delete_file_wic&) = delete; }; - -#endif } //-------------------------------------------------------------------------------------- @@ -720,8 +697,6 @@ static HRESULT CaptureTexture( _In_ ID3D11DeviceContext* pContext, //-------------------------------------------------------------------------------------- -#if !defined(WINAPI_FAMILY) || (WINAPI_FAMILY != WINAPI_FAMILY_PHONE_APP) || (_WIN32_WINNT > _WIN32_WINNT_WIN8) - static bool g_WIC2 = false; static IWICImagingFactory* _GetWIC() @@ -731,7 +706,7 @@ static IWICImagingFactory* _GetWIC() if ( s_Factory ) return s_Factory; -#if(_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE) +#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE) HRESULT hr = CoCreateInstance( CLSID_WICImagingFactory2, nullptr, @@ -779,7 +754,6 @@ static IWICImagingFactory* _GetWIC() return s_Factory; } -#endif //-------------------------------------------------------------------------------------- @@ -943,8 +917,6 @@ HRESULT DirectX::SaveDDSTextureToFile( _In_ ID3D11DeviceContext* pContext, } //-------------------------------------------------------------------------------------- -#if !defined(WINAPI_FAMILY) || (WINAPI_FAMILY != WINAPI_FAMILY_PHONE_APP) || (_WIN32_WINNT > _WIN32_WINNT_WIN8) - HRESULT DirectX::SaveWICTextureToFile( _In_ ID3D11DeviceContext* pContext, _In_ ID3D11Resource* pSource, _In_ REFGUID guidContainerFormat, @@ -1230,5 +1202,3 @@ HRESULT DirectX::SaveWICTextureToFile( _In_ ID3D11DeviceContext* pContext, return S_OK; } - -#endif // !WINAPI_FAMILY || (WINAPI_FAMILY != WINAPI_FAMILY_PHONE_APP) || (_WIN32_WINNT > _WIN32_WINNT_WIN8) diff --git a/ScreenGrab/ScreenGrab.h b/ScreenGrab/ScreenGrab.h index 36b6bab..a20b31b 100644 --- a/ScreenGrab/ScreenGrab.h +++ b/ScreenGrab/ScreenGrab.h @@ -19,21 +19,15 @@ // http://go.microsoft.com/fwlink/?LinkId=248929 //-------------------------------------------------------------------------------------- -#ifdef _MSC_VER #pragma once -#endif #include - #include - -#pragma warning(push) -#pragma warning(disable : 4005) #include -#pragma warning(pop) #include + namespace DirectX { HRESULT SaveDDSTextureToFile( _In_ ID3D11DeviceContext* pContext, diff --git a/WICTextureLoader/WICTextureLoader.cpp b/WICTextureLoader/WICTextureLoader.cpp index 413ca49..70f3225 100644 --- a/WICTextureLoader/WICTextureLoader.cpp +++ b/WICTextureLoader/WICTextureLoader.cpp @@ -31,12 +31,7 @@ #include #include -// VS 2010's stdint.h conflicts with intsafe.h -#pragma warning(push) -#pragma warning(disable : 4005) #include -#include -#pragma warning(pop) #include diff --git a/WICTextureLoader/WICTextureLoader.h b/WICTextureLoader/WICTextureLoader.h index 7df46b2..915b25c 100644 --- a/WICTextureLoader/WICTextureLoader.h +++ b/WICTextureLoader/WICTextureLoader.h @@ -25,30 +25,11 @@ // http://go.microsoft.com/fwlink/?LinkId=248929 //-------------------------------------------------------------------------------------- -#ifdef _MSC_VER #pragma once -#endif - -#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP) && (_WIN32_WINNT <= _WIN32_WINNT_WIN8) -#error WIC is not supported on Windows Phone 8.0 -#endif #include - -#pragma warning(push) -#pragma warning(disable : 4005) #include -#pragma warning(pop) -#if defined(_MSC_VER) && (_MSC_VER<1610) && !defined(_In_reads_) -#define _In_reads_(exp) -#define _Out_writes_(exp) -#define _In_reads_bytes_(exp) -#endif - -#ifndef _Use_decl_annotations_ -#define _Use_decl_annotations_ -#endif namespace DirectX {