Changeset 660

Timestamp:

Aug 19, 2016, 11:09:16 PM (7 years ago)

Author:

roman

Message:

 

Location:

trunk/Utilities/MediaFoundation/EnumerateTransforms

Files:

• Application.cpp (modified) (5 diffs)
• EnumerateTransforms.sln (modified) (1 diff)
• EnumerateTransforms.vcxproj (modified) (6 diffs)

trunk/Utilities/MediaFoundation/EnumerateTransforms/Application.cpp

@@ -83 +83 @@
                         A(MFT_CATEGORY_VIDEO_PROCESSOR)
                         A(MFT_CATEGORY_OTHER)
+                        #if (WINVER >= _WIN32_WINNT_WIN10_RS1)
+                                A(MFT_CATEGORY_ENCRYPTOR)
+                        #endif
                         A(CLSID_VideoInputDeviceCategory) // Kernel streaming (KS) minidriver backed hardware transforms https://msdn.microsoft.com/en-us/library/windows/desktop/ms700134#live_sources
                         A(KSCATEGORY_BRIDGE)
@@ -104 +107 @@
                 for(auto&& CategoryItem: g_pCategoryMap)
                 {
-                        _tprintf(_T("Category: %hs %ls\n"), CategoryItem.pszName, _PersistHelper::StringFromIdentifier(CategoryItem.Value));
+                        _tprintf(_T("Category: %hs %ls\n"), (LPCSTR) CategoryItem.pszName, (LPCWSTR) _PersistHelper::StringFromIdentifier(CategoryItem.Value));
                         _tprintf(_T("\n"));
                         _ATLTRY
@@ -117 +120 @@
                                         if(pActivate.TryGetString(MFT_FRIENDLY_NAME_Attribute, sFriendlyName))
                                                 sItem.Insert(0, AtlFormatString(_T("%s "), sFriendlyName));
-                                        _tprintf(_T("\t") _T("%s\n"), sItem);
+                                        _tprintf(_T("\t") _T("%s\n"), (LPCTSTR) sItem);
                                         _ATLTRY
                                         {
@@ -169 +172 @@
                                                         #pragma endregion 
                                                         if(bStringValueAvailable)
-                                                                _tprintf(_T("\t") _T("\t") _T("%s: %s\n"), MF::FormatKey(Key), sStringValue);
+                                                                _tprintf(_T("\t") _T("\t") _T("%s: %s\n"), (LPCTSTR) MF::FormatKey(Key), (LPCTSTR) sStringValue);
                                                         else
-                                                                _tprintf(_T("\t") _T("\t") _T("%s: ??? (0x%X)\n"), MF::FormatKey(Key), MF::CPropVariant::FormatType(vValue.vt));
+                                                                _tprintf(_T("\t") _T("\t") _T("%s: ??? (%s)\n"), (LPCTSTR) MF::FormatKey(Key), (LPCTSTR) MF::CPropVariant::FormatType(vValue.vt));
                                                 }
+                                                //_ATLTRY
+                                                //{
+                                                //      CComPtr<IMFTransform> pTransform;
+                                                //      __C(pActivate->ActivateObject(__uuidof(IMFTransform), (VOID**) &pTransform));
+                                                //      const CComQIPtr<ISpecifyPropertyPages> pSpecifyPropertyPages = pTransform;
+                                                //      if(pSpecifyPropertyPages)
+                                                //      {
+                                                //              CAUUID Pages;
+                                                //              ZeroMemory(&Pages, sizeof Pages);
+                                                //              __C(pSpecifyPropertyPages->GetPages(&Pages));
+                                                //      }
+                                                //}
+                                                //_ATLCATCHALL()
+                                                //{
+                                                //      _Z_EXCEPTION();
+                                                //}
                                         }
                                         _ATLCATCHALL()
@@ -258 +277 @@
         catch(CArgumentException Exception)
         {
-                _tprintf(_T("Fatal Error: %s\n"), Exception.m_sMessage);
+                _tprintf(_T("Fatal Error: %s\n"), (LPCTSTR) Exception.m_sMessage);
                 return 1;
         }
         _ATLCATCH(Exception)
         {
-                _tprintf(_T("Fatal Error: 0x%08x %s\n"), (HRESULT) Exception, AtlFormatSystemMessage(Exception).TrimRight(_T("\t\n\r .")));
+                _tprintf(_T("Fatal Error: 0x%08X %s\n"), (HRESULT) Exception, (LPCTSTR) AtlFormatSystemMessage(Exception).TrimRight(_T("\t\n\r .")));
                 return 1;
         }

trunk/Utilities/MediaFoundation/EnumerateTransforms/EnumerateTransforms.sln

@@ -1 +1 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
+# Visual Studio 2015
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EnumerateTransforms", "EnumerateTransforms.vcxproj", "{DCEC8B03-EA75-4595-83B1-0EBFD9A2E316}"
 EndProject

trunk/Utilities/MediaFoundation/EnumerateTransforms/EnumerateTransforms.vcxproj

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -23 +23 @@
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>EnumerateTransforms</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -28 +29 @@
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfAtl>Static</UseOfAtl>
@@ -35 +36 @@
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfAtl>Static</UseOfAtl>
@@ -42 +43 @@
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
@@ -50 +51 @@
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>