From 8a305a42a31c99ffa586c4118692a5bf5c9d22ef Mon Sep 17 00:00:00 2001 From: Mike Fenelon Date: Fri, 18 Aug 2017 15:03:15 -0700 Subject: Update all currnet Print Samples to support VS2017 and Windows 10 --- .../BlankProjSrc/BlankProject.vcxproj | 54 + print/SampleOpenXPS/SampleOpenXPS.sln | 16 +- print/SampleXPS/BlankProjSrc/BlankProject.vcxproj | 54 + print/SampleXPS/SampleXPS.sln | 16 +- .../SimplePipelineFilter/SimplePipelineFilter.sln | 16 +- .../SimplePipelineFilter/WdkPipelineFilter.vcxproj | 114 ++ .../WdkPipelineFilter.vcxproj.Filters | 58 +- print/XPSDrvSmpl/Package/package.VcxProj | 16 + print/XPSDrvSmpl/XPSDrvSmpl.sln | 120 +- print/XPSDrvSmpl/install/xdsmpl.inf | 13 +- print/XPSDrvSmpl/src/common/pshndlr.cpp | 4 +- print/XPSDrvSmpl/src/common/ptquerybld.cpp | 12 +- print/XPSDrvSmpl/src/common/wmpthndlr.cpp | 4 +- print/XPSDrvSmpl/src/common/xdsmplcmn.vcxproj | 90 + .../src/common/xdsmplcmn.vcxproj.Filters | 2026 ++++++++++++++++++++ .../XPSDrvSmpl/src/filters/booklet/xdbook.vcxproj | 118 ++ .../src/filters/booklet/xdbook.vcxproj.Filters | 25 +- .../XPSDrvSmpl/src/filters/color/XDColMan.vcxproj | 120 ++ .../src/filters/color/XDColMan.vcxproj.Filters | 234 ++- print/XPSDrvSmpl/src/filters/color/cmimg.cpp | 2 +- print/XPSDrvSmpl/src/filters/color/dictionary.cpp | 2 +- print/XPSDrvSmpl/src/filters/color/profman.cpp | 2 +- print/XPSDrvSmpl/src/filters/common/ptmanage.cpp | 2 +- .../XPSDrvSmpl/src/filters/common/xdfltcmn.vcxproj | 118 ++ .../src/filters/common/xdfltcmn.vcxproj.Filters | 101 + print/XPSDrvSmpl/src/filters/nup/nupsax.cpp | 4 +- print/XPSDrvSmpl/src/filters/nup/xdnup.vcxproj | 118 ++ .../src/filters/nup/xdnup.vcxproj.Filters | 45 +- print/XPSDrvSmpl/src/filters/scaling/pagescale.cpp | 2 +- .../XPSDrvSmpl/src/filters/scaling/xdscale.vcxproj | 126 ++ .../src/filters/scaling/xdscale.vcxproj.Filters | 34 +- print/XPSDrvSmpl/src/filters/watermark/wmvect.cpp | 2 +- .../src/filters/watermark/xdwmark.vcxproj | 118 ++ .../src/filters/watermark/xdwmark.vcxproj.Filters | 156 +- print/XPSDrvSmpl/src/filters/xdcont/xdcont.vcxproj | 96 + .../src/filters/xdcont/xdcont.vcxproj.Filters | 101 + print/XPSDrvSmpl/src/ui/xdsmplui.vcxproj | 108 ++ print/XPSDrvSmpl/src/ui/xdsmplui.vcxproj.Filters | 493 ++++- print/XpsRasFilter/XpsRasFilter.sln | 16 +- print/XpsRasFilter/install/xpsrassmpl.inf | 13 +- print/XpsRasFilter/src/precomp.h | 1 + print/XpsRasFilter/src/xpsrasfilter.vcxproj | 106 + .../XpsRasFilter/src/xpsrasfilter.vcxproj.Filters | 130 +- print/autoconfig/AutoCnfg.inf | 5 +- print/autoconfig/AutoConfig.sln | 30 +- print/autoconfig/AutoConfig.vcxproj | 48 + print/autoconfig/AutoConfig.vcxproj.Filters | 12 + print/autoconfig/Package/package.VcxProj | 16 + print/autoconfig/README.md | 2 +- print/cpsuisam/cpsuisam.sln | 16 +- print/cpsuisam/cpsuisam.vcxproj | 98 + print/cpsuisam/cpsuisam.vcxproj.Filters | 34 + .../ExtensionSample/PrinterExtensionSample.csproj | 66 + .../PrinterExtensionLibrary.csproj | 18 + .../PrinterExtensionSample.sln | 40 + .../ConstraintScript.sln | 6 + .../ConstraintScript.vcxproj | 48 + .../HostBasedSampleDriver.sln | 10 + .../HostBasedSampleDriver.vcxproj | 54 +- .../Package/package.VcxProj | 16 + .../USBMon-Bidi-Extension.sln | 6 + .../USBMon-Bidi-Extension.vcxproj | 48 + .../WSDMon-Bidi-Extension.sln | 6 + .../WSDMon-Bidi-Extension.vcxproj | 48 + 64 files changed, 5512 insertions(+), 121 deletions(-) diff --git a/print/SampleOpenXPS/BlankProjSrc/BlankProject.vcxproj b/print/SampleOpenXPS/BlankProjSrc/BlankProject.vcxproj index a1944404..f59d1592 100644 --- a/print/SampleOpenXPS/BlankProjSrc/BlankProject.vcxproj +++ b/print/SampleOpenXPS/BlankProjSrc/BlankProject.vcxproj @@ -1,10 +1,18 @@  + + Debug + ARM64 + Debug Win32 + + Release + ARM64 + Release Win32 @@ -35,6 +43,14 @@ WindowsApplicationForDrivers10.0 DynamicLibrary + + Windows10 + False + Desktop + + WindowsApplicationForDrivers10.0 + DynamicLibrary + Windows10 True @@ -43,6 +59,14 @@ WindowsApplicationForDrivers10.0 DynamicLibrary + + Windows10 + True + Desktop + + WindowsApplicationForDrivers10.0 + DynamicLibrary + Windows10 False @@ -66,9 +90,15 @@ + + + + + + @@ -79,9 +109,15 @@ BlankProject + + BlankProject + BlankProject + + BlankProject + BlankProject @@ -97,6 +133,15 @@ true + + + + + + + true + + @@ -106,6 +151,15 @@ true + + + + + + + true + + diff --git a/print/SampleOpenXPS/SampleOpenXPS.sln b/print/SampleOpenXPS/SampleOpenXPS.sln index bf6c23a2..d532a21b 100644 --- a/print/SampleOpenXPS/SampleOpenXPS.sln +++ b/print/SampleOpenXPS/SampleOpenXPS.sln @@ -1,24 +1,30 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0 +# Visual Studio 15 +VisualStudioVersion = 15.0.26430.16 MinimumVisualStudioVersion = 12.0 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BlankProject", "BlankProjSrc\BlankProject.vcxproj", "{3B7F3284-4571-493B-87DF-0DCEB924EDED}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|ARM64 = Debug|ARM64 Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 Debug|x64 = Debug|x64 + Release|ARM64 = Release|ARM64 + Release|Win32 = Release|Win32 Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {3B7F3284-4571-493B-87DF-0DCEB924EDED}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {3B7F3284-4571-493B-87DF-0DCEB924EDED}.Debug|ARM64.Build.0 = Debug|ARM64 {3B7F3284-4571-493B-87DF-0DCEB924EDED}.Debug|Win32.ActiveCfg = Debug|Win32 {3B7F3284-4571-493B-87DF-0DCEB924EDED}.Debug|Win32.Build.0 = Debug|Win32 - {3B7F3284-4571-493B-87DF-0DCEB924EDED}.Release|Win32.ActiveCfg = Release|Win32 - {3B7F3284-4571-493B-87DF-0DCEB924EDED}.Release|Win32.Build.0 = Release|Win32 {3B7F3284-4571-493B-87DF-0DCEB924EDED}.Debug|x64.ActiveCfg = Debug|x64 {3B7F3284-4571-493B-87DF-0DCEB924EDED}.Debug|x64.Build.0 = Debug|x64 + {3B7F3284-4571-493B-87DF-0DCEB924EDED}.Release|ARM64.ActiveCfg = Release|ARM64 + {3B7F3284-4571-493B-87DF-0DCEB924EDED}.Release|ARM64.Build.0 = Release|ARM64 + {3B7F3284-4571-493B-87DF-0DCEB924EDED}.Release|Win32.ActiveCfg = Release|Win32 + {3B7F3284-4571-493B-87DF-0DCEB924EDED}.Release|Win32.Build.0 = Release|Win32 {3B7F3284-4571-493B-87DF-0DCEB924EDED}.Release|x64.ActiveCfg = Release|x64 {3B7F3284-4571-493B-87DF-0DCEB924EDED}.Release|x64.Build.0 = Release|x64 EndGlobalSection diff --git a/print/SampleXPS/BlankProjSrc/BlankProject.vcxproj b/print/SampleXPS/BlankProjSrc/BlankProject.vcxproj index c151252b..35a097ad 100644 --- a/print/SampleXPS/BlankProjSrc/BlankProject.vcxproj +++ b/print/SampleXPS/BlankProjSrc/BlankProject.vcxproj @@ -1,10 +1,18 @@  + + Debug + ARM64 + Debug Win32 + + Release + ARM64 + Release Win32 @@ -35,6 +43,14 @@ WindowsApplicationForDrivers10.0 DynamicLibrary + + Windows10 + False + Desktop + + WindowsApplicationForDrivers10.0 + DynamicLibrary + Windows10 True @@ -43,6 +59,14 @@ WindowsApplicationForDrivers10.0 DynamicLibrary + + Windows10 + True + Desktop + + WindowsApplicationForDrivers10.0 + DynamicLibrary + Windows10 False @@ -66,9 +90,15 @@ + + + + + + @@ -79,9 +109,15 @@ BlankProject + + BlankProject + BlankProject + + BlankProject + BlankProject @@ -97,6 +133,15 @@ true + + + + + + + true + + @@ -106,6 +151,15 @@ true + + + + + + + true + + diff --git a/print/SampleXPS/SampleXPS.sln b/print/SampleXPS/SampleXPS.sln index bff99c63..52802ac5 100644 --- a/print/SampleXPS/SampleXPS.sln +++ b/print/SampleXPS/SampleXPS.sln @@ -1,24 +1,30 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0 +# Visual Studio 15 +VisualStudioVersion = 15.0.26430.16 MinimumVisualStudioVersion = 12.0 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BlankProject", "BlankProjSrc\BlankProject.vcxproj", "{58038762-96ED-45A6-A3FF-C5898C7D1618}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|ARM64 = Debug|ARM64 Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 Debug|x64 = Debug|x64 + Release|ARM64 = Release|ARM64 + Release|Win32 = Release|Win32 Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {58038762-96ED-45A6-A3FF-C5898C7D1618}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {58038762-96ED-45A6-A3FF-C5898C7D1618}.Debug|ARM64.Build.0 = Debug|ARM64 {58038762-96ED-45A6-A3FF-C5898C7D1618}.Debug|Win32.ActiveCfg = Debug|Win32 {58038762-96ED-45A6-A3FF-C5898C7D1618}.Debug|Win32.Build.0 = Debug|Win32 - {58038762-96ED-45A6-A3FF-C5898C7D1618}.Release|Win32.ActiveCfg = Release|Win32 - {58038762-96ED-45A6-A3FF-C5898C7D1618}.Release|Win32.Build.0 = Release|Win32 {58038762-96ED-45A6-A3FF-C5898C7D1618}.Debug|x64.ActiveCfg = Debug|x64 {58038762-96ED-45A6-A3FF-C5898C7D1618}.Debug|x64.Build.0 = Debug|x64 + {58038762-96ED-45A6-A3FF-C5898C7D1618}.Release|ARM64.ActiveCfg = Release|ARM64 + {58038762-96ED-45A6-A3FF-C5898C7D1618}.Release|ARM64.Build.0 = Release|ARM64 + {58038762-96ED-45A6-A3FF-C5898C7D1618}.Release|Win32.ActiveCfg = Release|Win32 + {58038762-96ED-45A6-A3FF-C5898C7D1618}.Release|Win32.Build.0 = Release|Win32 {58038762-96ED-45A6-A3FF-C5898C7D1618}.Release|x64.ActiveCfg = Release|x64 {58038762-96ED-45A6-A3FF-C5898C7D1618}.Release|x64.Build.0 = Release|x64 EndGlobalSection diff --git a/print/SimplePipelineFilter/SimplePipelineFilter.sln b/print/SimplePipelineFilter/SimplePipelineFilter.sln index b7c29a27..fb7b4926 100644 --- a/print/SimplePipelineFilter/SimplePipelineFilter.sln +++ b/print/SimplePipelineFilter/SimplePipelineFilter.sln @@ -1,24 +1,30 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0 +# Visual Studio 15 +VisualStudioVersion = 15.0.26430.16 MinimumVisualStudioVersion = 12.0 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WdkPipelineFilter", "WdkPipelineFilter.vcxproj", "{80A8ADEB-D954-428E-8809-7308A4F007EF}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|ARM64 = Debug|ARM64 Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 Debug|x64 = Debug|x64 + Release|ARM64 = Release|ARM64 + Release|Win32 = Release|Win32 Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {80A8ADEB-D954-428E-8809-7308A4F007EF}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {80A8ADEB-D954-428E-8809-7308A4F007EF}.Debug|ARM64.Build.0 = Debug|ARM64 {80A8ADEB-D954-428E-8809-7308A4F007EF}.Debug|Win32.ActiveCfg = Debug|Win32 {80A8ADEB-D954-428E-8809-7308A4F007EF}.Debug|Win32.Build.0 = Debug|Win32 - {80A8ADEB-D954-428E-8809-7308A4F007EF}.Release|Win32.ActiveCfg = Release|Win32 - {80A8ADEB-D954-428E-8809-7308A4F007EF}.Release|Win32.Build.0 = Release|Win32 {80A8ADEB-D954-428E-8809-7308A4F007EF}.Debug|x64.ActiveCfg = Debug|x64 {80A8ADEB-D954-428E-8809-7308A4F007EF}.Debug|x64.Build.0 = Debug|x64 + {80A8ADEB-D954-428E-8809-7308A4F007EF}.Release|ARM64.ActiveCfg = Release|ARM64 + {80A8ADEB-D954-428E-8809-7308A4F007EF}.Release|ARM64.Build.0 = Release|ARM64 + {80A8ADEB-D954-428E-8809-7308A4F007EF}.Release|Win32.ActiveCfg = Release|Win32 + {80A8ADEB-D954-428E-8809-7308A4F007EF}.Release|Win32.Build.0 = Release|Win32 {80A8ADEB-D954-428E-8809-7308A4F007EF}.Release|x64.ActiveCfg = Release|x64 {80A8ADEB-D954-428E-8809-7308A4F007EF}.Release|x64.Build.0 = Release|x64 EndGlobalSection diff --git a/print/SimplePipelineFilter/WdkPipelineFilter.vcxproj b/print/SimplePipelineFilter/WdkPipelineFilter.vcxproj index dbbd36cb..cfbb05f1 100644 --- a/print/SimplePipelineFilter/WdkPipelineFilter.vcxproj +++ b/print/SimplePipelineFilter/WdkPipelineFilter.vcxproj @@ -1,10 +1,18 @@  + + Debug + ARM64 + Debug Win32 + + Release + ARM64 + Release Win32 @@ -34,6 +42,14 @@ WindowsApplicationForDrivers10.0 DynamicLibrary + + Windows10 + False + Desktop + + WindowsApplicationForDrivers10.0 + DynamicLibrary + Windows10 True @@ -42,6 +58,14 @@ WindowsApplicationForDrivers10.0 DynamicLibrary + + Windows10 + True + Desktop + + WindowsApplicationForDrivers10.0 + DynamicLibrary + Windows10 False @@ -65,9 +89,15 @@ + + + + + + @@ -103,9 +133,15 @@ WdkPipelineFilter + + WdkPipelineFilter + WdkPipelineFilter + + WdkPipelineFilter + WdkPipelineFilter @@ -117,11 +153,21 @@ %(AdditionalDependencies);user32.lib;kernel32.lib;oleaut32.lib;ole32.lib;uuid.lib;advapi32.lib + + + %(AdditionalDependencies);user32.lib;kernel32.lib;oleaut32.lib;ole32.lib;uuid.lib;advapi32.lib + + %(AdditionalDependencies);user32.lib;kernel32.lib;oleaut32.lib;ole32.lib;uuid.lib;advapi32.lib + + + %(AdditionalDependencies);user32.lib;kernel32.lib;oleaut32.lib;ole32.lib;uuid.lib;advapi32.lib + + %(AdditionalDependencies);user32.lib;kernel32.lib;oleaut32.lib;ole32.lib;uuid.lib;advapi32.lib @@ -138,12 +184,24 @@ _DllMainCRTStartup + + + _DllMainCRTStartup@12 + _DllMainCRTStartup + + _DllMainCRTStartup@12 _DllMainCRTStartup + + + _DllMainCRTStartup@12 + _DllMainCRTStartup + + _DllMainCRTStartup@12 @@ -174,6 +232,24 @@ %(AdditionalIncludeDirectories);$(DDK_INC_PATH) + + + MultiThreaded + MultiThreadedDebug + true + Level4 + %(PreprocessorDefinitions);_UNICODE;UNICODE + %(AdditionalIncludeDirectories);$(DDK_INC_PATH) + + + %(PreprocessorDefinitions);_UNICODE;UNICODE + %(AdditionalIncludeDirectories);$(DDK_INC_PATH) + + + %(PreprocessorDefinitions);_UNICODE;UNICODE + %(AdditionalIncludeDirectories);$(DDK_INC_PATH) + + MultiThreaded @@ -192,6 +268,24 @@ %(AdditionalIncludeDirectories);$(DDK_INC_PATH) + + + MultiThreaded + MultiThreadedDebug + true + Level4 + %(PreprocessorDefinitions);_UNICODE;UNICODE + %(AdditionalIncludeDirectories);$(DDK_INC_PATH) + + + %(PreprocessorDefinitions);_UNICODE;UNICODE + %(AdditionalIncludeDirectories);$(DDK_INC_PATH) + + + %(PreprocessorDefinitions);_UNICODE;UNICODE + %(AdditionalIncludeDirectories);$(DDK_INC_PATH) + + MultiThreaded @@ -238,6 +332,16 @@ + + + %(AdditionalOptions) /ignore:4070 + FilterSample.def + + + + + + %(AdditionalOptions) /ignore:4070 @@ -248,6 +352,16 @@ + + + %(AdditionalOptions) /ignore:4070 + FilterSample.def + + + + + + %(AdditionalOptions) /ignore:4070 diff --git a/print/SimplePipelineFilter/WdkPipelineFilter.vcxproj.Filters b/print/SimplePipelineFilter/WdkPipelineFilter.vcxproj.Filters index 60366d81..278a2bc6 100644 --- a/print/SimplePipelineFilter/WdkPipelineFilter.vcxproj.Filters +++ b/print/SimplePipelineFilter/WdkPipelineFilter.vcxproj.Filters @@ -27,13 +27,65 @@ Source Files - - Source Files - Resource Files + + + Header Files + + + + + + + + Header Files + + + + + + + + Header Files + + + + + + + + Header Files + + + + + + + + Header Files + + + + + + + + Header Files + + + + + + + + + + Source Files + + \ No newline at end of file diff --git a/print/XPSDrvSmpl/Package/package.VcxProj b/print/XPSDrvSmpl/Package/package.VcxProj index 697ef9af..228c7db4 100644 --- a/print/XPSDrvSmpl/Package/package.VcxProj +++ b/print/XPSDrvSmpl/Package/package.VcxProj @@ -1,10 +1,18 @@  + + Debug + ARM64 + Debug Win32 + + Release + ARM64 + Release Win32 @@ -75,10 +83,18 @@ Windows10 true + + Windows10 + true + Windows10 false + + Windows10 + false + diff --git a/print/XPSDrvSmpl/XPSDrvSmpl.sln b/print/XPSDrvSmpl/XPSDrvSmpl.sln index 03628549..600e4e74 100644 --- a/print/XPSDrvSmpl/XPSDrvSmpl.sln +++ b/print/XPSDrvSmpl/XPSDrvSmpl.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0 +# Visual Studio 15 +VisualStudioVersion = 15.0.26430.16 MinimumVisualStudioVersion = 12.0 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Package", "Package", "{5A68CA37-F621-4113-B573-8A361135203B}" EndProject @@ -92,98 +92,146 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xdbook", "src\filters\bookl EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|ARM64 = Debug|ARM64 Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 Debug|x64 = Debug|x64 + Release|ARM64 = Release|ARM64 + Release|Win32 = Release|Win32 Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {4A7303D2-92DB-4537-A380-24D334FC24FE}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {4A7303D2-92DB-4537-A380-24D334FC24FE}.Debug|ARM64.Build.0 = Debug|ARM64 + {4A7303D2-92DB-4537-A380-24D334FC24FE}.Debug|ARM64.Deploy.0 = Debug|ARM64 {4A7303D2-92DB-4537-A380-24D334FC24FE}.Debug|Win32.ActiveCfg = Debug|Win32 {4A7303D2-92DB-4537-A380-24D334FC24FE}.Debug|Win32.Build.0 = Debug|Win32 - {4A7303D2-92DB-4537-A380-24D334FC24FE}.Release|Win32.ActiveCfg = Release|Win32 - {4A7303D2-92DB-4537-A380-24D334FC24FE}.Release|Win32.Build.0 = Release|Win32 {4A7303D2-92DB-4537-A380-24D334FC24FE}.Debug|x64.ActiveCfg = Debug|x64 {4A7303D2-92DB-4537-A380-24D334FC24FE}.Debug|x64.Build.0 = Debug|x64 + {4A7303D2-92DB-4537-A380-24D334FC24FE}.Release|ARM64.ActiveCfg = Release|ARM64 + {4A7303D2-92DB-4537-A380-24D334FC24FE}.Release|ARM64.Build.0 = Release|ARM64 + {4A7303D2-92DB-4537-A380-24D334FC24FE}.Release|ARM64.Deploy.0 = Release|ARM64 + {4A7303D2-92DB-4537-A380-24D334FC24FE}.Release|Win32.ActiveCfg = Release|Win32 + {4A7303D2-92DB-4537-A380-24D334FC24FE}.Release|Win32.Build.0 = Release|Win32 {4A7303D2-92DB-4537-A380-24D334FC24FE}.Release|x64.ActiveCfg = Release|x64 {4A7303D2-92DB-4537-A380-24D334FC24FE}.Release|x64.Build.0 = Release|x64 + {E5DC3A24-691A-4F3A-B519-E4C49B2DAC98}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {E5DC3A24-691A-4F3A-B519-E4C49B2DAC98}.Debug|ARM64.Build.0 = Debug|ARM64 {E5DC3A24-691A-4F3A-B519-E4C49B2DAC98}.Debug|Win32.ActiveCfg = Debug|Win32 {E5DC3A24-691A-4F3A-B519-E4C49B2DAC98}.Debug|Win32.Build.0 = Debug|Win32 - {E5DC3A24-691A-4F3A-B519-E4C49B2DAC98}.Release|Win32.ActiveCfg = Release|Win32 - {E5DC3A24-691A-4F3A-B519-E4C49B2DAC98}.Release|Win32.Build.0 = Release|Win32 {E5DC3A24-691A-4F3A-B519-E4C49B2DAC98}.Debug|x64.ActiveCfg = Debug|x64 {E5DC3A24-691A-4F3A-B519-E4C49B2DAC98}.Debug|x64.Build.0 = Debug|x64 + {E5DC3A24-691A-4F3A-B519-E4C49B2DAC98}.Release|ARM64.ActiveCfg = Release|ARM64 + {E5DC3A24-691A-4F3A-B519-E4C49B2DAC98}.Release|ARM64.Build.0 = Release|ARM64 + {E5DC3A24-691A-4F3A-B519-E4C49B2DAC98}.Release|Win32.ActiveCfg = Release|Win32 + {E5DC3A24-691A-4F3A-B519-E4C49B2DAC98}.Release|Win32.Build.0 = Release|Win32 {E5DC3A24-691A-4F3A-B519-E4C49B2DAC98}.Release|x64.ActiveCfg = Release|x64 {E5DC3A24-691A-4F3A-B519-E4C49B2DAC98}.Release|x64.Build.0 = Release|x64 + {42677515-C196-4C0F-99A2-F11E2FB55BF6}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {42677515-C196-4C0F-99A2-F11E2FB55BF6}.Debug|ARM64.Build.0 = Debug|ARM64 {42677515-C196-4C0F-99A2-F11E2FB55BF6}.Debug|Win32.ActiveCfg = Debug|Win32 {42677515-C196-4C0F-99A2-F11E2FB55BF6}.Debug|Win32.Build.0 = Debug|Win32 - {42677515-C196-4C0F-99A2-F11E2FB55BF6}.Release|Win32.ActiveCfg = Release|Win32 - {42677515-C196-4C0F-99A2-F11E2FB55BF6}.Release|Win32.Build.0 = Release|Win32 {42677515-C196-4C0F-99A2-F11E2FB55BF6}.Debug|x64.ActiveCfg = Debug|x64 {42677515-C196-4C0F-99A2-F11E2FB55BF6}.Debug|x64.Build.0 = Debug|x64 + {42677515-C196-4C0F-99A2-F11E2FB55BF6}.Release|ARM64.ActiveCfg = Release|ARM64 + {42677515-C196-4C0F-99A2-F11E2FB55BF6}.Release|ARM64.Build.0 = Release|ARM64 + {42677515-C196-4C0F-99A2-F11E2FB55BF6}.Release|Win32.ActiveCfg = Release|Win32 + {42677515-C196-4C0F-99A2-F11E2FB55BF6}.Release|Win32.Build.0 = Release|Win32 {42677515-C196-4C0F-99A2-F11E2FB55BF6}.Release|x64.ActiveCfg = Release|x64 {42677515-C196-4C0F-99A2-F11E2FB55BF6}.Release|x64.Build.0 = Release|x64 + {7441D7F2-F509-4A47-9404-3EB8653AE037}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {7441D7F2-F509-4A47-9404-3EB8653AE037}.Debug|ARM64.Build.0 = Debug|ARM64 {7441D7F2-F509-4A47-9404-3EB8653AE037}.Debug|Win32.ActiveCfg = Debug|Win32 {7441D7F2-F509-4A47-9404-3EB8653AE037}.Debug|Win32.Build.0 = Debug|Win32 - {7441D7F2-F509-4A47-9404-3EB8653AE037}.Release|Win32.ActiveCfg = Release|Win32 - {7441D7F2-F509-4A47-9404-3EB8653AE037}.Release|Win32.Build.0 = Release|Win32 {7441D7F2-F509-4A47-9404-3EB8653AE037}.Debug|x64.ActiveCfg = Debug|x64 {7441D7F2-F509-4A47-9404-3EB8653AE037}.Debug|x64.Build.0 = Debug|x64 + {7441D7F2-F509-4A47-9404-3EB8653AE037}.Release|ARM64.ActiveCfg = Release|ARM64 + {7441D7F2-F509-4A47-9404-3EB8653AE037}.Release|ARM64.Build.0 = Release|ARM64 + {7441D7F2-F509-4A47-9404-3EB8653AE037}.Release|Win32.ActiveCfg = Release|Win32 + {7441D7F2-F509-4A47-9404-3EB8653AE037}.Release|Win32.Build.0 = Release|Win32 {7441D7F2-F509-4A47-9404-3EB8653AE037}.Release|x64.ActiveCfg = Release|x64 {7441D7F2-F509-4A47-9404-3EB8653AE037}.Release|x64.Build.0 = Release|x64 + {0F8262C1-75D8-4A92-BCB6-37A290891708}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {0F8262C1-75D8-4A92-BCB6-37A290891708}.Debug|ARM64.Build.0 = Debug|ARM64 {0F8262C1-75D8-4A92-BCB6-37A290891708}.Debug|Win32.ActiveCfg = Debug|Win32 {0F8262C1-75D8-4A92-BCB6-37A290891708}.Debug|Win32.Build.0 = Debug|Win32 - {0F8262C1-75D8-4A92-BCB6-37A290891708}.Release|Win32.ActiveCfg = Release|Win32 - {0F8262C1-75D8-4A92-BCB6-37A290891708}.Release|Win32.Build.0 = Release|Win32 {0F8262C1-75D8-4A92-BCB6-37A290891708}.Debug|x64.ActiveCfg = Debug|x64 {0F8262C1-75D8-4A92-BCB6-37A290891708}.Debug|x64.Build.0 = Debug|x64 + {0F8262C1-75D8-4A92-BCB6-37A290891708}.Release|ARM64.ActiveCfg = Release|ARM64 + {0F8262C1-75D8-4A92-BCB6-37A290891708}.Release|ARM64.Build.0 = Release|ARM64 + {0F8262C1-75D8-4A92-BCB6-37A290891708}.Release|Win32.ActiveCfg = Release|Win32 + {0F8262C1-75D8-4A92-BCB6-37A290891708}.Release|Win32.Build.0 = Release|Win32 {0F8262C1-75D8-4A92-BCB6-37A290891708}.Release|x64.ActiveCfg = Release|x64 {0F8262C1-75D8-4A92-BCB6-37A290891708}.Release|x64.Build.0 = Release|x64 + {D38B87BF-5778-4DA8-8DCE-B0F37F087D5A}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {D38B87BF-5778-4DA8-8DCE-B0F37F087D5A}.Debug|ARM64.Build.0 = Debug|ARM64 {D38B87BF-5778-4DA8-8DCE-B0F37F087D5A}.Debug|Win32.ActiveCfg = Debug|Win32 {D38B87BF-5778-4DA8-8DCE-B0F37F087D5A}.Debug|Win32.Build.0 = Debug|Win32 - {D38B87BF-5778-4DA8-8DCE-B0F37F087D5A}.Release|Win32.ActiveCfg = Release|Win32 - {D38B87BF-5778-4DA8-8DCE-B0F37F087D5A}.Release|Win32.Build.0 = Release|Win32 {D38B87BF-5778-4DA8-8DCE-B0F37F087D5A}.Debug|x64.ActiveCfg = Debug|x64 {D38B87BF-5778-4DA8-8DCE-B0F37F087D5A}.Debug|x64.Build.0 = Debug|x64 + {D38B87BF-5778-4DA8-8DCE-B0F37F087D5A}.Release|ARM64.ActiveCfg = Release|ARM64 + {D38B87BF-5778-4DA8-8DCE-B0F37F087D5A}.Release|ARM64.Build.0 = Release|ARM64 + {D38B87BF-5778-4DA8-8DCE-B0F37F087D5A}.Release|Win32.ActiveCfg = Release|Win32 + {D38B87BF-5778-4DA8-8DCE-B0F37F087D5A}.Release|Win32.Build.0 = Release|Win32 {D38B87BF-5778-4DA8-8DCE-B0F37F087D5A}.Release|x64.ActiveCfg = Release|x64 {D38B87BF-5778-4DA8-8DCE-B0F37F087D5A}.Release|x64.Build.0 = Release|x64 + {E31D1C4F-8E0D-428A-8583-5159CE690B33}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {E31D1C4F-8E0D-428A-8583-5159CE690B33}.Debug|ARM64.Build.0 = Debug|ARM64 {E31D1C4F-8E0D-428A-8583-5159CE690B33}.Debug|Win32.ActiveCfg = Debug|Win32 {E31D1C4F-8E0D-428A-8583-5159CE690B33}.Debug|Win32.Build.0 = Debug|Win32 - {E31D1C4F-8E0D-428A-8583-5159CE690B33}.Release|Win32.ActiveCfg = Release|Win32 - {E31D1C4F-8E0D-428A-8583-5159CE690B33}.Release|Win32.Build.0 = Release|Win32 {E31D1C4F-8E0D-428A-8583-5159CE690B33}.Debug|x64.ActiveCfg = Debug|x64 {E31D1C4F-8E0D-428A-8583-5159CE690B33}.Debug|x64.Build.0 = Debug|x64 + {E31D1C4F-8E0D-428A-8583-5159CE690B33}.Release|ARM64.ActiveCfg = Release|ARM64 + {E31D1C4F-8E0D-428A-8583-5159CE690B33}.Release|ARM64.Build.0 = Release|ARM64 + {E31D1C4F-8E0D-428A-8583-5159CE690B33}.Release|Win32.ActiveCfg = Release|Win32 + {E31D1C4F-8E0D-428A-8583-5159CE690B33}.Release|Win32.Build.0 = Release|Win32 {E31D1C4F-8E0D-428A-8583-5159CE690B33}.Release|x64.ActiveCfg = Release|x64 {E31D1C4F-8E0D-428A-8583-5159CE690B33}.Release|x64.Build.0 = Release|x64 + {1893FA97-40A9-480F-BB77-279F959EAE6E}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {1893FA97-40A9-480F-BB77-279F959EAE6E}.Debug|ARM64.Build.0 = Debug|ARM64 {1893FA97-40A9-480F-BB77-279F959EAE6E}.Debug|Win32.ActiveCfg = Debug|Win32 {1893FA97-40A9-480F-BB77-279F959EAE6E}.Debug|Win32.Build.0 = Debug|Win32 - {1893FA97-40A9-480F-BB77-279F959EAE6E}.Release|Win32.ActiveCfg = Release|Win32 - {1893FA97-40A9-480F-BB77-279F959EAE6E}.Release|Win32.Build.0 = Release|Win32 {1893FA97-40A9-480F-BB77-279F959EAE6E}.Debug|x64.ActiveCfg = Debug|x64 {1893FA97-40A9-480F-BB77-279F959EAE6E}.Debug|x64.Build.0 = Debug|x64 + {1893FA97-40A9-480F-BB77-279F959EAE6E}.Release|ARM64.ActiveCfg = Release|ARM64 + {1893FA97-40A9-480F-BB77-279F959EAE6E}.Release|ARM64.Build.0 = Release|ARM64 + {1893FA97-40A9-480F-BB77-279F959EAE6E}.Release|Win32.ActiveCfg = Release|Win32 + {1893FA97-40A9-480F-BB77-279F959EAE6E}.Release|Win32.Build.0 = Release|Win32 {1893FA97-40A9-480F-BB77-279F959EAE6E}.Release|x64.ActiveCfg = Release|x64 {1893FA97-40A9-480F-BB77-279F959EAE6E}.Release|x64.Build.0 = Release|x64 + {23BA577F-B171-4CEC-92E0-49EE44564366}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {23BA577F-B171-4CEC-92E0-49EE44564366}.Debug|ARM64.Build.0 = Debug|ARM64 {23BA577F-B171-4CEC-92E0-49EE44564366}.Debug|Win32.ActiveCfg = Debug|Win32 {23BA577F-B171-4CEC-92E0-49EE44564366}.Debug|Win32.Build.0 = Debug|Win32 - {23BA577F-B171-4CEC-92E0-49EE44564366}.Release|Win32.ActiveCfg = Release|Win32 - {23BA577F-B171-4CEC-92E0-49EE44564366}.Release|Win32.Build.0 = Release|Win32 {23BA577F-B171-4CEC-92E0-49EE44564366}.Debug|x64.ActiveCfg = Debug|x64 {23BA577F-B171-4CEC-92E0-49EE44564366}.Debug|x64.Build.0 = Debug|x64 + {23BA577F-B171-4CEC-92E0-49EE44564366}.Release|ARM64.ActiveCfg = Release|ARM64 + {23BA577F-B171-4CEC-92E0-49EE44564366}.Release|ARM64.Build.0 = Release|ARM64 + {23BA577F-B171-4CEC-92E0-49EE44564366}.Release|Win32.ActiveCfg = Release|Win32 + {23BA577F-B171-4CEC-92E0-49EE44564366}.Release|Win32.Build.0 = Release|Win32 {23BA577F-B171-4CEC-92E0-49EE44564366}.Release|x64.ActiveCfg = Release|x64 {23BA577F-B171-4CEC-92E0-49EE44564366}.Release|x64.Build.0 = Release|x64 + {C9C14C99-103E-45CB-B1B4-2C165429E35C}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {C9C14C99-103E-45CB-B1B4-2C165429E35C}.Debug|ARM64.Build.0 = Debug|ARM64 {C9C14C99-103E-45CB-B1B4-2C165429E35C}.Debug|Win32.ActiveCfg = Debug|Win32 {C9C14C99-103E-45CB-B1B4-2C165429E35C}.Debug|Win32.Build.0 = Debug|Win32 - {C9C14C99-103E-45CB-B1B4-2C165429E35C}.Release|Win32.ActiveCfg = Release|Win32 - {C9C14C99-103E-45CB-B1B4-2C165429E35C}.Release|Win32.Build.0 = Release|Win32 {C9C14C99-103E-45CB-B1B4-2C165429E35C}.Debug|x64.ActiveCfg = Debug|x64 {C9C14C99-103E-45CB-B1B4-2C165429E35C}.Debug|x64.Build.0 = Debug|x64 + {C9C14C99-103E-45CB-B1B4-2C165429E35C}.Release|ARM64.ActiveCfg = Release|ARM64 + {C9C14C99-103E-45CB-B1B4-2C165429E35C}.Release|ARM64.Build.0 = Release|ARM64 + {C9C14C99-103E-45CB-B1B4-2C165429E35C}.Release|Win32.ActiveCfg = Release|Win32 + {C9C14C99-103E-45CB-B1B4-2C165429E35C}.Release|Win32.Build.0 = Release|Win32 {C9C14C99-103E-45CB-B1B4-2C165429E35C}.Release|x64.ActiveCfg = Release|x64 {C9C14C99-103E-45CB-B1B4-2C165429E35C}.Release|x64.Build.0 = Release|x64 + {8D542B56-EB45-43B1-AAB8-417352F5BDE6}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {8D542B56-EB45-43B1-AAB8-417352F5BDE6}.Debug|ARM64.Build.0 = Debug|ARM64 {8D542B56-EB45-43B1-AAB8-417352F5BDE6}.Debug|Win32.ActiveCfg = Debug|Win32 {8D542B56-EB45-43B1-AAB8-417352F5BDE6}.Debug|Win32.Build.0 = Debug|Win32 - {8D542B56-EB45-43B1-AAB8-417352F5BDE6}.Release|Win32.ActiveCfg = Release|Win32 - {8D542B56-EB45-43B1-AAB8-417352F5BDE6}.Release|Win32.Build.0 = Release|Win32 {8D542B56-EB45-43B1-AAB8-417352F5BDE6}.Debug|x64.ActiveCfg = Debug|x64 {8D542B56-EB45-43B1-AAB8-417352F5BDE6}.Debug|x64.Build.0 = Debug|x64 + {8D542B56-EB45-43B1-AAB8-417352F5BDE6}.Release|ARM64.ActiveCfg = Release|ARM64 + {8D542B56-EB45-43B1-AAB8-417352F5BDE6}.Release|ARM64.Build.0 = Release|ARM64 + {8D542B56-EB45-43B1-AAB8-417352F5BDE6}.Release|Win32.ActiveCfg = Release|Win32 + {8D542B56-EB45-43B1-AAB8-417352F5BDE6}.Release|Win32.Build.0 = Release|Win32 {8D542B56-EB45-43B1-AAB8-417352F5BDE6}.Release|x64.ActiveCfg = Release|x64 {8D542B56-EB45-43B1-AAB8-417352F5BDE6}.Release|x64.Build.0 = Release|x64 EndGlobalSection @@ -191,17 +239,6 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {4A7303D2-92DB-4537-A380-24D334FC24FE} = {5A68CA37-F621-4113-B573-8A361135203B} - {E5DC3A24-691A-4F3A-B519-E4C49B2DAC98} = {3F637C27-BDFE-4466-838C-5FBDE4C5F2C1} - {42677515-C196-4C0F-99A2-F11E2FB55BF6} = {A51E3BEB-5868-445C-8F87-AC7D05C4EE2D} - {7441D7F2-F509-4A47-9404-3EB8653AE037} = {8D891397-002B-4AF1-929E-0515D8F2F5AB} - {0F8262C1-75D8-4A92-BCB6-37A290891708} = {413B0724-5117-4BD6-99EF-D6B59859E1B3} - {D38B87BF-5778-4DA8-8DCE-B0F37F087D5A} = {A82FAF9C-BCCE-4569-9EB2-36DA4D239DA8} - {E31D1C4F-8E0D-428A-8583-5159CE690B33} = {5452CCB0-EF39-4699-A8E0-C86D595FC4DA} - {1893FA97-40A9-480F-BB77-279F959EAE6E} = {8C5A07F5-C9E0-430D-A908-2C1161C952ED} - {23BA577F-B171-4CEC-92E0-49EE44564366} = {8B19C579-DB40-4D8B-A605-165366FAB6CD} - {C9C14C99-103E-45CB-B1B4-2C165429E35C} = {D804D2D8-5ED5-42B3-A77D-1A46D3ACB727} - {8D542B56-EB45-43B1-AAB8-417352F5BDE6} = {3904D25E-E461-4A90-A544-E1C74A32086A} {3F637C27-BDFE-4466-838C-5FBDE4C5F2C1} = {199CBE46-0460-42FA-AB80-DD3C89310F4A} {A51E3BEB-5868-445C-8F87-AC7D05C4EE2D} = {199CBE46-0460-42FA-AB80-DD3C89310F4A} {8D891397-002B-4AF1-929E-0515D8F2F5AB} = {199CBE46-0460-42FA-AB80-DD3C89310F4A} @@ -213,5 +250,16 @@ Global {8B19C579-DB40-4D8B-A605-165366FAB6CD} = {5234E3C1-1C0C-49A6-900E-EEC5815604BA} {D804D2D8-5ED5-42B3-A77D-1A46D3ACB727} = {5234E3C1-1C0C-49A6-900E-EEC5815604BA} {3904D25E-E461-4A90-A544-E1C74A32086A} = {5234E3C1-1C0C-49A6-900E-EEC5815604BA} + {4A7303D2-92DB-4537-A380-24D334FC24FE} = {5A68CA37-F621-4113-B573-8A361135203B} + {E5DC3A24-691A-4F3A-B519-E4C49B2DAC98} = {3F637C27-BDFE-4466-838C-5FBDE4C5F2C1} + {42677515-C196-4C0F-99A2-F11E2FB55BF6} = {A51E3BEB-5868-445C-8F87-AC7D05C4EE2D} + {7441D7F2-F509-4A47-9404-3EB8653AE037} = {8D891397-002B-4AF1-929E-0515D8F2F5AB} + {0F8262C1-75D8-4A92-BCB6-37A290891708} = {413B0724-5117-4BD6-99EF-D6B59859E1B3} + {D38B87BF-5778-4DA8-8DCE-B0F37F087D5A} = {A82FAF9C-BCCE-4569-9EB2-36DA4D239DA8} + {E31D1C4F-8E0D-428A-8583-5159CE690B33} = {5452CCB0-EF39-4699-A8E0-C86D595FC4DA} + {1893FA97-40A9-480F-BB77-279F959EAE6E} = {8C5A07F5-C9E0-430D-A908-2C1161C952ED} + {23BA577F-B171-4CEC-92E0-49EE44564366} = {8B19C579-DB40-4D8B-A605-165366FAB6CD} + {C9C14C99-103E-45CB-B1B4-2C165429E35C} = {D804D2D8-5ED5-42B3-A77D-1A46D3ACB727} + {8D542B56-EB45-43B1-AAB8-417352F5BDE6} = {3904D25E-E461-4A90-A544-E1C74A32086A} EndGlobalSection EndGlobal diff --git a/print/XPSDrvSmpl/install/xdsmpl.inf b/print/XPSDrvSmpl/install/xdsmpl.inf index eb94e358..5d93dfbd 100644 --- a/print/XPSDrvSmpl/install/xdsmpl.inf +++ b/print/XPSDrvSmpl/install/xdsmpl.inf @@ -24,7 +24,7 @@ Class=Printer DriverVer=10/17/2008,6.1.6930.0 [Manufacturer] -%ManufacturerName%=Standard,NTx86,NTia64,NTamd64,NTx86.6.0,NTia64.6.0,NTamd64.6.0 +%ManufacturerName%=Standard,NTx86,NTia64,NTamd64,NTx86.6.0,NTia64.6.0,NTamd64.6.0,NTarm64.6.0 [Standard.NTx86] "XPSDrv Sample Driver" = INSTALL_XDSMPL_FILTERS_PRE_VISTA @@ -44,6 +44,9 @@ DriverVer=10/17/2008,6.1.6930.0 [Standard.NTamd64.6.0] "XPSDrv Sample Driver" = INSTALL_XDSMPL_FILTERS_VISTA +[Standard.NTarm64.6.0] +"XPSDrv Sample Driver" = INSTALL_XDSMPL_FILTERS_VISTA + [INSTALL_XDSMPL_FILTERS_PRE_VISTA] CopyFiles=XPSDrvSample,ConfigPlugin,COLORPROFILES DriverFile=mxdwdrv.dll @@ -75,6 +78,10 @@ CoreDriverDependencies={D20EA372-DD35-4950-9ED8-A6335AFE79F0}, {D20EA372-DD35-49 PackageAware=TRUE CoreDriverDependencies={D20EA372-DD35-4950-9ED8-A6335AFE79F0}, {D20EA372-DD35-4950-9ED8-A6335AFE79F5} +[PrinterPackageInstallation.arm64] +PackageAware=TRUE +CoreDriverDependencies={D20EA372-DD35-4950-9ED8-A6335AFE79F0}, {D20EA372-DD35-4950-9ED8-A6335AFE79F5} + [DestinationDirs] DefaultDestDir=66000 COLORPROFILES=66003 @@ -114,6 +121,10 @@ xdsmpl-pipelineconfig.xml 1 = %Location%,, 2 = %Location%,,,amd64 +[SourceDisksNames.arm64] +1 = %Location%,, +2 = %Location%,,,arm64 + [SourceDisksFiles] xdsmpl.gpd = 1 xdnames.gpd = 1 diff --git a/print/XPSDrvSmpl/src/common/pshndlr.cpp b/print/XPSDrvSmpl/src/common/pshndlr.cpp index 989837be..868378da 100644 --- a/print/XPSDrvSmpl/src/common/pshndlr.cpp +++ b/print/XPSDrvSmpl/src/common/pshndlr.cpp @@ -133,7 +133,7 @@ CPSHandler::CPSHandler( cstrNSPrefix.Delete(iIndex, 1) > 0) { CStringXDW cstrOrgNamespaces; - cstrOrgNamespaces.Format(szNSSelection, cstrNSPrefix, FRAMEWORK_URI); + cstrOrgNamespaces.Format(szNSSelection, static_cast(cstrNSPrefix), FRAMEWORK_URI); hr = m_pPrintDocument->setProperty(CComBSTR(szSelectNS), CComVariant(cstrOrgNamespaces)); } @@ -1593,7 +1593,7 @@ CPSHandler::GetPrefixFromURI( // Construct the Root Query string // CStringXDW cstrRootQuery; - cstrRootQuery.Format(szPTRootQuery, szTmpNS, m_bstrDocumentType); + cstrRootQuery.Format(szPTRootQuery, szTmpNS, static_cast(m_bstrDocumentType)); // // Find the PrintSchema element so we can retrieve the private namespace prefix diff --git a/print/XPSDrvSmpl/src/common/ptquerybld.cpp b/print/XPSDrvSmpl/src/common/ptquerybld.cpp index 885af0b2..c2113932 100644 --- a/print/XPSDrvSmpl/src/common/ptquerybld.cpp +++ b/print/XPSDrvSmpl/src/common/ptquerybld.cpp @@ -236,7 +236,7 @@ CPTQueryBuilder::AddFeature( if (SUCCEEDED(hr)) { CStringXDW cstrFeatureQuery; - cstrFeatureQuery.Format(szPTQFeature, m_bstrFrameworkNS, bstrKeyword); + cstrFeatureQuery.Format(szPTQFeature, static_cast(m_bstrFrameworkNS), static_cast(bstrKeyword)); hr = m_bstrQuery.Append(cstrFeatureQuery); } @@ -305,7 +305,7 @@ CPTQueryBuilder::AddProperty( if (SUCCEEDED(hr)) { CStringXDW cstrPropertyQuery; - cstrPropertyQuery.Format(szPTQProperty, m_bstrFrameworkNS, bstrKeyword); + cstrPropertyQuery.Format(szPTQProperty, static_cast(m_bstrFrameworkNS), static_cast(bstrKeyword)); hr = m_bstrQuery.Append(cstrPropertyQuery); } @@ -369,7 +369,7 @@ CPTQueryBuilder::AddScoredProperty( if (SUCCEEDED(hr)) { CStringXDW cstrScoredPropertyQuery; - cstrScoredPropertyQuery.Format(szPTQScoredProperty, m_bstrFrameworkNS, bstrKeyword); + cstrScoredPropertyQuery.Format(szPTQScoredProperty, static_cast(m_bstrFrameworkNS), static_cast(bstrKeyword)); hr = m_bstrQuery.Append(cstrScoredPropertyQuery); } @@ -437,7 +437,7 @@ CPTQueryBuilder::AddParamRef( if (SUCCEEDED(hr)) { CStringXDW cstrParamRefQuery; - cstrParamRefQuery.Format(szPTQParamRef, m_bstrFrameworkNS, bstrKeyword); + cstrParamRefQuery.Format(szPTQParamRef, static_cast(m_bstrFrameworkNS), static_cast(bstrKeyword)); hr = m_bstrQuery.Append(cstrParamRefQuery); } @@ -490,13 +490,13 @@ CPTQueryBuilder::AddOption( { CStringXDW cstrQueryRoot(m_bstrQuery); CStringXDW cstrOptionQuery; - cstrOptionQuery.Format(szPTQOptionSH, m_bstrFrameworkNS); + cstrOptionQuery.Format(szPTQOptionSH, static_cast(m_bstrFrameworkNS)); if (SUCCEEDED(hr = m_bstrQuery.Append(cstrOptionQuery)) && SUCCEEDED(hr = m_bstrQuery.Append(szPTQOrNodes)) && SUCCEEDED(hr = m_bstrQuery.Append(cstrQueryRoot))) { - cstrOptionQuery.Format(szPTQOptionLH, m_bstrFrameworkNS, bstrKeywordNS, m_bstrFrameworkNS); + cstrOptionQuery.Format(szPTQOptionLH, static_cast(m_bstrFrameworkNS), bstrKeywordNS, static_cast(m_bstrFrameworkNS)); hr = m_bstrQuery.Append(cstrOptionQuery); } } diff --git a/print/XPSDrvSmpl/src/common/wmpthndlr.cpp b/print/XPSDrvSmpl/src/common/wmpthndlr.cpp index dcb1eff7..49792d6a 100644 --- a/print/XPSDrvSmpl/src/common/wmpthndlr.cpp +++ b/print/XPSDrvSmpl/src/common/wmpthndlr.cpp @@ -1123,7 +1123,7 @@ CWMPTHandler::GetTxtPropTypeAndValue( case FontColor: { cstrType = SCHEMA_STRING; - cstrValue.Format(L"%s", pWmData->txtData.bstrFontColor); + cstrValue.Format(L"%s", static_cast(pWmData->txtData.bstrFontColor)); } break; @@ -1137,7 +1137,7 @@ CWMPTHandler::GetTxtPropTypeAndValue( case Text: { cstrType = SCHEMA_STRING; - cstrValue.Format(L"%s", pWmData->txtData.bstrText); + cstrValue.Format(L"%s", static_cast(pWmData->txtData.bstrText)); } break; diff --git a/print/XPSDrvSmpl/src/common/xdsmplcmn.vcxproj b/print/XPSDrvSmpl/src/common/xdsmplcmn.vcxproj index a88401cd..ad460948 100644 --- a/print/XPSDrvSmpl/src/common/xdsmplcmn.vcxproj +++ b/print/XPSDrvSmpl/src/common/xdsmplcmn.vcxproj @@ -1,10 +1,18 @@  + + Debug + ARM64 + Debug Win32 + + Release + ARM64 + Release Win32 @@ -36,6 +44,14 @@ WindowsApplicationForDrivers10.0 StaticLibrary + + Windows10 + False + Desktop + + WindowsApplicationForDrivers10.0 + StaticLibrary + Windows10 True @@ -44,6 +60,14 @@ WindowsApplicationForDrivers10.0 StaticLibrary + + Windows10 + True + Desktop + + WindowsApplicationForDrivers10.0 + StaticLibrary + Windows10 False @@ -67,9 +91,15 @@ + + + + + + @@ -93,6 +123,22 @@ %(AdditionalIncludeDirectories);.\;.\..\inc;.\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + + + %(AdditionalIncludeDirectories);.\;.\..\inc;.\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + + + %(AdditionalIncludeDirectories);.\;.\..\inc;.\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + true + Level4 + Sync + MultiThreaded + MultiThreadedDebug + + + %(AdditionalIncludeDirectories);.\;.\..\inc;.\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + + %(AdditionalIncludeDirectories);.\;.\..\inc;.\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus @@ -109,6 +155,22 @@ %(AdditionalIncludeDirectories);.\;.\..\inc;.\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + + + %(AdditionalIncludeDirectories);.\;.\..\inc;.\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + + + %(AdditionalIncludeDirectories);.\;.\..\inc;.\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + true + Level4 + Sync + MultiThreaded + MultiThreadedDebug + + + %(AdditionalIncludeDirectories);.\;.\..\inc;.\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + + %(AdditionalIncludeDirectories);.\;.\..\inc;.\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus @@ -152,6 +214,17 @@ %(PreprocessorDefinitions);_UNICODE;UNICODE + + + %(PreprocessorDefinitions);_UNICODE;UNICODE + + + %(PreprocessorDefinitions);_UNICODE;UNICODE + + + %(PreprocessorDefinitions);_UNICODE;UNICODE + + %(PreprocessorDefinitions);_UNICODE;UNICODE @@ -163,6 +236,17 @@ %(PreprocessorDefinitions);_UNICODE;UNICODE + + + %(PreprocessorDefinitions);_UNICODE;UNICODE + + + %(PreprocessorDefinitions);_UNICODE;UNICODE + + + %(PreprocessorDefinitions);_UNICODE;UNICODE + + %(PreprocessorDefinitions);_UNICODE;UNICODE @@ -188,9 +272,15 @@ xdsmplcmn + + xdsmplcmn + xdsmplcmn + + xdsmplcmn + xdsmplcmn diff --git a/print/XPSDrvSmpl/src/common/xdsmplcmn.vcxproj.Filters b/print/XPSDrvSmpl/src/common/xdsmplcmn.vcxproj.Filters index 522e133e..61c9a129 100644 --- a/print/XPSDrvSmpl/src/common/xdsmplcmn.vcxproj.Filters +++ b/print/XPSDrvSmpl/src/common/xdsmplcmn.vcxproj.Filters @@ -115,4 +115,2030 @@ Source Files + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/print/XPSDrvSmpl/src/filters/booklet/xdbook.vcxproj b/print/XPSDrvSmpl/src/filters/booklet/xdbook.vcxproj index 97f7ddaf..30db60d3 100644 --- a/print/XPSDrvSmpl/src/filters/booklet/xdbook.vcxproj +++ b/print/XPSDrvSmpl/src/filters/booklet/xdbook.vcxproj @@ -1,10 +1,18 @@  + + Debug + ARM64 + Debug Win32 + + Release + ARM64 + Release Win32 @@ -36,6 +44,14 @@ WindowsApplicationForDrivers10.0 DynamicLibrary + + Windows10 + False + Desktop + + WindowsApplicationForDrivers10.0 + DynamicLibrary + Windows10 True @@ -44,6 +60,14 @@ WindowsApplicationForDrivers10.0 DynamicLibrary + + Windows10 + True + Desktop + + WindowsApplicationForDrivers10.0 + DynamicLibrary + Windows10 False @@ -67,9 +91,15 @@ + + + + + + @@ -80,9 +110,15 @@ xdbook + + xdbook + xdbook + + xdbook + xdbook @@ -95,12 +131,24 @@ _DllMainCRTStartup + + + _DllMainCRTStartup@12 + _DllMainCRTStartup + + _DllMainCRTStartup@12 _DllMainCRTStartup + + + _DllMainCRTStartup@12 + _DllMainCRTStartup + + _DllMainCRTStartup@12 @@ -132,6 +180,25 @@ %(AdditionalDependencies);uuid.lib;WIAGUID.lib;msxml6.lib;Kernel32.lib;ole32.lib;oleaut32.lib;prntvpt.lib;winspool.lib;gdi32.lib;gdiplus.lib;shlwapi.lib;Advapi32.lib;user32.lib;.\..\..\debug\$(IntDir)\xdsdbg.lib;.\..\..\common\$(IntDir)\xdsmplcmn.lib;.\..\..\filters\common\$(IntDir)\xdfltcmn.lib + + + %(AdditionalIncludeDirectories);..\;..\common;..\..\inc;..\..\common;..\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + + + %(AdditionalIncludeDirectories);..\;..\common;..\..\inc;..\..\common;..\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + MultiThreaded + MultiThreadedDebug + true + Level4 + Sync + + + %(AdditionalIncludeDirectories);..\;..\common;..\..\inc;..\..\common;..\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + + + %(AdditionalDependencies);uuid.lib;WIAGUID.lib;msxml6.lib;Kernel32.lib;ole32.lib;oleaut32.lib;prntvpt.lib;winspool.lib;gdi32.lib;gdiplus.lib;shlwapi.lib;Advapi32.lib;user32.lib;.\..\..\debug\$(IntDir)\xdsdbg.lib;.\..\..\common\$(IntDir)\xdsmplcmn.lib;.\..\..\filters\common\$(IntDir)\xdfltcmn.lib + + %(AdditionalIncludeDirectories);..\;..\common;..\..\inc;..\..\common;..\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus @@ -151,6 +218,25 @@ %(AdditionalDependencies);uuid.lib;WIAGUID.lib;msxml6.lib;Kernel32.lib;ole32.lib;oleaut32.lib;prntvpt.lib;winspool.lib;gdi32.lib;gdiplus.lib;shlwapi.lib;Advapi32.lib;user32.lib;.\..\..\debug\$(IntDir)\xdsdbg.lib;.\..\..\common\$(IntDir)\xdsmplcmn.lib;.\..\..\filters\common\$(IntDir)\xdfltcmn.lib + + + %(AdditionalIncludeDirectories);..\;..\common;..\..\inc;..\..\common;..\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + + + %(AdditionalIncludeDirectories);..\;..\common;..\..\inc;..\..\common;..\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + MultiThreaded + MultiThreadedDebug + true + Level4 + Sync + + + %(AdditionalIncludeDirectories);..\;..\common;..\..\inc;..\..\common;..\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + + + %(AdditionalDependencies);uuid.lib;WIAGUID.lib;msxml6.lib;Kernel32.lib;ole32.lib;oleaut32.lib;prntvpt.lib;winspool.lib;gdi32.lib;gdiplus.lib;shlwapi.lib;Advapi32.lib;user32.lib;.\..\..\debug\$(IntDir)\xdsdbg.lib;.\..\..\common\$(IntDir)\xdsmplcmn.lib;.\..\..\filters\common\$(IntDir)\xdfltcmn.lib + + %(AdditionalIncludeDirectories);..\;..\common;..\..\inc;..\..\common;..\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus @@ -200,6 +286,17 @@ %(PreprocessorDefinitions);_UNICODE;UNICODE + + + %(PreprocessorDefinitions);_UNICODE;UNICODE + + + %(PreprocessorDefinitions);_UNICODE;UNICODE + + + %(PreprocessorDefinitions);_UNICODE;UNICODE + + %(PreprocessorDefinitions);_UNICODE;UNICODE @@ -211,6 +308,17 @@ %(PreprocessorDefinitions);_UNICODE;UNICODE + + + %(PreprocessorDefinitions);_UNICODE;UNICODE + + + %(PreprocessorDefinitions);_UNICODE;UNICODE + + + %(PreprocessorDefinitions);_UNICODE;UNICODE + + %(PreprocessorDefinitions);_UNICODE;UNICODE @@ -265,11 +373,21 @@ xdbook.def + + + xdbook.def + + xdbook.def + + + xdbook.def + + xdbook.def diff --git a/print/XPSDrvSmpl/src/filters/booklet/xdbook.vcxproj.Filters b/print/XPSDrvSmpl/src/filters/booklet/xdbook.vcxproj.Filters index e9afca89..d01c09e2 100644 --- a/print/XPSDrvSmpl/src/filters/booklet/xdbook.vcxproj.Filters +++ b/print/XPSDrvSmpl/src/filters/booklet/xdbook.vcxproj.Filters @@ -30,13 +30,32 @@ Source Files - - Source Files - Resource Files + + + Header Files + + + + + Header Files + + + + + Header Files + + + + + + + Source Files + + \ No newline at end of file diff --git a/print/XPSDrvSmpl/src/filters/color/XDColMan.vcxproj b/print/XPSDrvSmpl/src/filters/color/XDColMan.vcxproj index c7cc5343..78daab4b 100644 --- a/print/XPSDrvSmpl/src/filters/color/XDColMan.vcxproj +++ b/print/XPSDrvSmpl/src/filters/color/XDColMan.vcxproj @@ -1,10 +1,18 @@  + + Debug + ARM64 + Debug Win32 + + Release + ARM64 + Release Win32 @@ -36,6 +44,14 @@ WindowsApplicationForDrivers10.0 DynamicLibrary + + Windows10 + False + Desktop + + WindowsApplicationForDrivers10.0 + DynamicLibrary + Windows10 True @@ -44,6 +60,14 @@ WindowsApplicationForDrivers10.0 DynamicLibrary + + Windows10 + True + Desktop + + WindowsApplicationForDrivers10.0 + DynamicLibrary + Windows10 False @@ -67,9 +91,15 @@ + + + + + + @@ -80,9 +110,15 @@ XDColMan + + XDColMan + XDColMan + + XDColMan + XDColMan @@ -96,6 +132,13 @@ _DllMainCRTStartup + + + %(AdditionalDependencies);mscms.lib;windowscodecs.lib + _DllMainCRTStartup@12 + _DllMainCRTStartup + + %(AdditionalDependencies);mscms.lib;windowscodecs.lib @@ -103,6 +146,13 @@ _DllMainCRTStartup + + + %(AdditionalDependencies);mscms.lib;windowscodecs.lib + _DllMainCRTStartup@12 + _DllMainCRTStartup + + %(AdditionalDependencies);mscms.lib;windowscodecs.lib @@ -136,6 +186,25 @@ %(AdditionalDependencies);uuid.lib;WIAGUID.lib;msxml6.lib;Kernel32.lib;ole32.lib;oleaut32.lib;prntvpt.lib;winspool.lib;gdi32.lib;gdiplus.lib;shlwapi.lib;Advapi32.lib;user32.lib;.\..\..\debug\$(IntDir)\xdsdbg.lib;.\..\..\common\$(IntDir)\xdsmplcmn.lib;.\..\..\filters\common\$(IntDir)\xdfltcmn.lib + + + %(AdditionalIncludeDirectories);..\;..\common;..\..\inc;..\..\common;..\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + + + %(AdditionalIncludeDirectories);..\;..\common;..\..\inc;..\..\common;..\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + MultiThreaded + MultiThreadedDebug + true + Level4 + Sync + + + %(AdditionalIncludeDirectories);..\;..\common;..\..\inc;..\..\common;..\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + + + %(AdditionalDependencies);uuid.lib;WIAGUID.lib;msxml6.lib;Kernel32.lib;ole32.lib;oleaut32.lib;prntvpt.lib;winspool.lib;gdi32.lib;gdiplus.lib;shlwapi.lib;Advapi32.lib;user32.lib;.\..\..\debug\$(IntDir)\xdsdbg.lib;.\..\..\common\$(IntDir)\xdsmplcmn.lib;.\..\..\filters\common\$(IntDir)\xdfltcmn.lib + + %(AdditionalIncludeDirectories);..\;..\common;..\..\inc;..\..\common;..\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus @@ -155,6 +224,25 @@ %(AdditionalDependencies);uuid.lib;WIAGUID.lib;msxml6.lib;Kernel32.lib;ole32.lib;oleaut32.lib;prntvpt.lib;winspool.lib;gdi32.lib;gdiplus.lib;shlwapi.lib;Advapi32.lib;user32.lib;.\..\..\debug\$(IntDir)\xdsdbg.lib;.\..\..\common\$(IntDir)\xdsmplcmn.lib;.\..\..\filters\common\$(IntDir)\xdfltcmn.lib + + + %(AdditionalIncludeDirectories);..\;..\common;..\..\inc;..\..\common;..\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + + + %(AdditionalIncludeDirectories);..\;..\common;..\..\inc;..\..\common;..\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + MultiThreaded + MultiThreadedDebug + true + Level4 + Sync + + + %(AdditionalIncludeDirectories);..\;..\common;..\..\inc;..\..\common;..\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + + + %(AdditionalDependencies);uuid.lib;WIAGUID.lib;msxml6.lib;Kernel32.lib;ole32.lib;oleaut32.lib;prntvpt.lib;winspool.lib;gdi32.lib;gdiplus.lib;shlwapi.lib;Advapi32.lib;user32.lib;.\..\..\debug\$(IntDir)\xdsdbg.lib;.\..\..\common\$(IntDir)\xdsmplcmn.lib;.\..\..\filters\common\$(IntDir)\xdfltcmn.lib + + %(AdditionalIncludeDirectories);..\;..\common;..\..\inc;..\..\common;..\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus @@ -204,6 +292,17 @@ %(PreprocessorDefinitions);_UNICODE;UNICODE + + + %(PreprocessorDefinitions);_UNICODE;UNICODE + + + %(PreprocessorDefinitions);_UNICODE;UNICODE + + + %(PreprocessorDefinitions);_UNICODE;UNICODE + + %(PreprocessorDefinitions);_UNICODE;UNICODE @@ -215,6 +314,17 @@ %(PreprocessorDefinitions);_UNICODE;UNICODE + + + %(PreprocessorDefinitions);_UNICODE;UNICODE + + + %(PreprocessorDefinitions);_UNICODE;UNICODE + + + %(PreprocessorDefinitions);_UNICODE;UNICODE + + %(PreprocessorDefinitions);_UNICODE;UNICODE @@ -335,11 +445,21 @@ XDColMan.def + + + XDColMan.def + + XDColMan.def + + + XDColMan.def + + XDColMan.def diff --git a/print/XPSDrvSmpl/src/filters/color/XDColMan.vcxproj.Filters b/print/XPSDrvSmpl/src/filters/color/XDColMan.vcxproj.Filters index db9fe1c4..2bcbd7d8 100644 --- a/print/XPSDrvSmpl/src/filters/color/XDColMan.vcxproj.Filters +++ b/print/XPSDrvSmpl/src/filters/color/XDColMan.vcxproj.Filters @@ -63,13 +63,241 @@ Source Files - - Source Files - Resource Files + + + Header Files + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + Source Files + + \ No newline at end of file diff --git a/print/XPSDrvSmpl/src/filters/color/cmimg.cpp b/print/XPSDrvSmpl/src/filters/color/cmimg.cpp index f44fa028..5f861422 100644 --- a/print/XPSDrvSmpl/src/filters/color/cmimg.cpp +++ b/print/XPSDrvSmpl/src/filters/color/cmimg.cpp @@ -537,7 +537,7 @@ CColorManagedImage::GetResURI( // Create a unique name for the bitmap for this print session // CStringXDW cstrURI; - cstrURI.Format(L"%s_%u.wdp", cstrFileName, GetUniqueNumber()); + cstrURI.Format(L"%s_%u.wdp", static_cast(cstrFileName), GetUniqueNumber()); SysFreeString(*pbstrResURI); *pbstrResURI = cstrURI.AllocSysString(); diff --git a/print/XPSDrvSmpl/src/filters/color/dictionary.cpp b/print/XPSDrvSmpl/src/filters/color/dictionary.cpp index 5106aad7..efd15760 100644 --- a/print/XPSDrvSmpl/src/filters/color/dictionary.cpp +++ b/print/XPSDrvSmpl/src/filters/color/dictionary.cpp @@ -273,7 +273,7 @@ CRemoteDictionary::GetResURI( // Create a unique name for the dictionary for this print session // CStringXDW cstrURI; - cstrURI.Format(L"%s_%u.dict", m_bstrDictionaryURI, GetUniqueNumber()); + cstrURI.Format(L"%s_%u.dict", static_cast(m_bstrDictionaryURI), GetUniqueNumber()); *pbstrResURI = cstrURI.AllocSysString(); } diff --git a/print/XPSDrvSmpl/src/filters/color/profman.cpp b/print/XPSDrvSmpl/src/filters/color/profman.cpp index 8bd06284..16ee9dc2 100644 --- a/print/XPSDrvSmpl/src/filters/color/profman.cpp +++ b/print/XPSDrvSmpl/src/filters/color/profman.cpp @@ -692,7 +692,7 @@ CProfileManager::GetResURI( // Create a unique name for the profile for this print session // CStringXDW cstrURI; - cstrURI.Format(L"/%s_%u%s", cstrFileName, GetUniqueNumber(), cstrFileExt); + cstrURI.Format(L"/%s_%u%s", static_cast(cstrFileName), GetUniqueNumber(), static_cast(cstrFileExt)); *pbstrResURI = cstrURI.AllocSysString(); } diff --git a/print/XPSDrvSmpl/src/filters/common/ptmanage.cpp b/print/XPSDrvSmpl/src/filters/common/ptmanage.cpp index 209c344a..b1c52db2 100644 --- a/print/XPSDrvSmpl/src/filters/common/ptmanage.cpp +++ b/print/XPSDrvSmpl/src/filters/common/ptmanage.cpp @@ -1034,7 +1034,7 @@ CPTManager::GetMergedTicket( { CStringXDA cstrMessage; CStringXDA cstrError(bstrErrorMessage); - cstrMessage.Format("PTMergeAndValidatePrintTicket failed with message: %s\n", cstrError); + cstrMessage.Format("PTMergeAndValidatePrintTicket failed with message: %s\n", static_cast(cstrError)); ERR(cstrMessage.GetBuffer()); } diff --git a/print/XPSDrvSmpl/src/filters/common/xdfltcmn.vcxproj b/print/XPSDrvSmpl/src/filters/common/xdfltcmn.vcxproj index 636dce26..44ec5cb7 100644 --- a/print/XPSDrvSmpl/src/filters/common/xdfltcmn.vcxproj +++ b/print/XPSDrvSmpl/src/filters/common/xdfltcmn.vcxproj @@ -1,10 +1,18 @@  + + Debug + ARM64 + Debug Win32 + + Release + ARM64 + Release Win32 @@ -36,6 +44,14 @@ WindowsApplicationForDrivers10.0 StaticLibrary + + Windows10 + False + Desktop + + WindowsApplicationForDrivers10.0 + StaticLibrary + Windows10 True @@ -44,6 +60,14 @@ WindowsApplicationForDrivers10.0 StaticLibrary + + Windows10 + True + Desktop + + WindowsApplicationForDrivers10.0 + StaticLibrary + Windows10 False @@ -67,9 +91,15 @@ + + + + + + @@ -88,6 +118,17 @@ %(AdditionalIncludeDirectories);..\xdcont + + + %(AdditionalIncludeDirectories);..\xdcont + + + %(AdditionalIncludeDirectories);..\xdcont + + + %(AdditionalIncludeDirectories);..\xdcont + + %(AdditionalIncludeDirectories);..\xdcont @@ -99,6 +140,17 @@ %(AdditionalIncludeDirectories);..\xdcont + + + %(AdditionalIncludeDirectories);..\xdcont + + + %(AdditionalIncludeDirectories);..\xdcont + + + %(AdditionalIncludeDirectories);..\xdcont + + %(AdditionalIncludeDirectories);..\xdcont @@ -124,9 +176,15 @@ xdfltcmn + + xdfltcmn + xdfltcmn + + xdfltcmn + xdfltcmn @@ -152,6 +210,25 @@ %(AdditionalDependencies);uuid.lib;WIAGUID.lib;msxml6.lib;Kernel32.lib;ole32.lib;oleaut32.lib;prntvpt.lib;winspool.lib;gdi32.lib;gdiplus.lib;shlwapi.lib;Advapi32.lib;user32.lib;.\..\..\debug\$(IntDir)\xdsdbg.lib;.\..\..\common\$(IntDir)\xdsmplcmn.lib;.\..\..\filters\common\$(IntDir)\xdfltcmn.lib + + + %(AdditionalIncludeDirectories);..\;..\common;..\..\inc;..\..\common;..\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + + + %(AdditionalIncludeDirectories);..\;..\common;..\..\inc;..\..\common;..\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + MultiThreaded + MultiThreadedDebug + true + Level4 + Sync + + + %(AdditionalIncludeDirectories);..\;..\common;..\..\inc;..\..\common;..\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + + + %(AdditionalDependencies);uuid.lib;WIAGUID.lib;msxml6.lib;Kernel32.lib;ole32.lib;oleaut32.lib;prntvpt.lib;winspool.lib;gdi32.lib;gdiplus.lib;shlwapi.lib;Advapi32.lib;user32.lib;.\..\..\debug\$(IntDir)\xdsdbg.lib;.\..\..\common\$(IntDir)\xdsmplcmn.lib;.\..\..\filters\common\$(IntDir)\xdfltcmn.lib + + %(AdditionalIncludeDirectories);..\;..\common;..\..\inc;..\..\common;..\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus @@ -171,6 +248,25 @@ %(AdditionalDependencies);uuid.lib;WIAGUID.lib;msxml6.lib;Kernel32.lib;ole32.lib;oleaut32.lib;prntvpt.lib;winspool.lib;gdi32.lib;gdiplus.lib;shlwapi.lib;Advapi32.lib;user32.lib;.\..\..\debug\$(IntDir)\xdsdbg.lib;.\..\..\common\$(IntDir)\xdsmplcmn.lib;.\..\..\filters\common\$(IntDir)\xdfltcmn.lib + + + %(AdditionalIncludeDirectories);..\;..\common;..\..\inc;..\..\common;..\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + + + %(AdditionalIncludeDirectories);..\;..\common;..\..\inc;..\..\common;..\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + MultiThreaded + MultiThreadedDebug + true + Level4 + Sync + + + %(AdditionalIncludeDirectories);..\;..\common;..\..\inc;..\..\common;..\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + + + %(AdditionalDependencies);uuid.lib;WIAGUID.lib;msxml6.lib;Kernel32.lib;ole32.lib;oleaut32.lib;prntvpt.lib;winspool.lib;gdi32.lib;gdiplus.lib;shlwapi.lib;Advapi32.lib;user32.lib;.\..\..\debug\$(IntDir)\xdsdbg.lib;.\..\..\common\$(IntDir)\xdsmplcmn.lib;.\..\..\filters\common\$(IntDir)\xdfltcmn.lib + + %(AdditionalIncludeDirectories);..\;..\common;..\..\inc;..\..\common;..\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus @@ -220,6 +316,17 @@ %(PreprocessorDefinitions);_UNICODE;UNICODE + + + %(PreprocessorDefinitions);_UNICODE;UNICODE + + + %(PreprocessorDefinitions);_UNICODE;UNICODE + + + %(PreprocessorDefinitions);_UNICODE;UNICODE + + %(PreprocessorDefinitions);_UNICODE;UNICODE @@ -231,6 +338,17 @@ %(PreprocessorDefinitions);_UNICODE;UNICODE + + + %(PreprocessorDefinitions);_UNICODE;UNICODE + + + %(PreprocessorDefinitions);_UNICODE;UNICODE + + + %(PreprocessorDefinitions);_UNICODE;UNICODE + + %(PreprocessorDefinitions);_UNICODE;UNICODE diff --git a/print/XPSDrvSmpl/src/filters/common/xdfltcmn.vcxproj.Filters b/print/XPSDrvSmpl/src/filters/common/xdfltcmn.vcxproj.Filters index d43f3fa3..926f85a0 100644 --- a/print/XPSDrvSmpl/src/filters/common/xdfltcmn.vcxproj.Filters +++ b/print/XPSDrvSmpl/src/filters/common/xdfltcmn.vcxproj.Filters @@ -43,4 +43,105 @@ Source Files + + + Header Files + + + + + + + + + + + Header Files + + + + + + + + + + + Header Files + + + + + + + + + + + Header Files + + + + + + + + + + + Header Files + + + + + + + + + + + Header Files + + + + + + + + + + + Header Files + + + + + + + + + + + Header Files + + + + + + + + + + + Header Files + + + + + + + + + + \ No newline at end of file diff --git a/print/XPSDrvSmpl/src/filters/nup/nupsax.cpp b/print/XPSDrvSmpl/src/filters/nup/nupsax.cpp index 830f6928..399b353b 100644 --- a/print/XPSDrvSmpl/src/filters/nup/nupsax.cpp +++ b/print/XPSDrvSmpl/src/filters/nup/nupsax.cpp @@ -363,8 +363,8 @@ CNUpSaxHandler::startElement( sizePage.Height); cstrOut.Format(L"(bstrMatrix), + static_cast(strClip)); // // Add additional namespaces from the FixedPage diff --git a/print/XPSDrvSmpl/src/filters/nup/xdnup.vcxproj b/print/XPSDrvSmpl/src/filters/nup/xdnup.vcxproj index ec80a406..ef276008 100644 --- a/print/XPSDrvSmpl/src/filters/nup/xdnup.vcxproj +++ b/print/XPSDrvSmpl/src/filters/nup/xdnup.vcxproj @@ -1,10 +1,18 @@  + + Debug + ARM64 + Debug Win32 + + Release + ARM64 + Release Win32 @@ -36,6 +44,14 @@ WindowsApplicationForDrivers10.0 DynamicLibrary + + Windows10 + False + Desktop + + WindowsApplicationForDrivers10.0 + DynamicLibrary + Windows10 True @@ -44,6 +60,14 @@ WindowsApplicationForDrivers10.0 DynamicLibrary + + Windows10 + True + Desktop + + WindowsApplicationForDrivers10.0 + DynamicLibrary + Windows10 False @@ -67,9 +91,15 @@ + + + + + + @@ -80,9 +110,15 @@ xdnup + + xdnup + xdnup + + xdnup + xdnup @@ -95,12 +131,24 @@ _DllMainCRTStartup + + + _DllMainCRTStartup@12 + _DllMainCRTStartup + + _DllMainCRTStartup@12 _DllMainCRTStartup + + + _DllMainCRTStartup@12 + _DllMainCRTStartup + + _DllMainCRTStartup@12 @@ -132,6 +180,25 @@ %(AdditionalDependencies);uuid.lib;WIAGUID.lib;msxml6.lib;Kernel32.lib;ole32.lib;oleaut32.lib;prntvpt.lib;winspool.lib;gdi32.lib;gdiplus.lib;shlwapi.lib;Advapi32.lib;user32.lib;.\..\..\debug\$(IntDir)\xdsdbg.lib;.\..\..\common\$(IntDir)\xdsmplcmn.lib;.\..\..\filters\common\$(IntDir)\xdfltcmn.lib + + + %(AdditionalIncludeDirectories);..\;..\common;..\..\inc;..\..\common;..\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + + + %(AdditionalIncludeDirectories);..\;..\common;..\..\inc;..\..\common;..\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + MultiThreaded + MultiThreadedDebug + true + Level4 + Sync + + + %(AdditionalIncludeDirectories);..\;..\common;..\..\inc;..\..\common;..\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + + + %(AdditionalDependencies);uuid.lib;WIAGUID.lib;msxml6.lib;Kernel32.lib;ole32.lib;oleaut32.lib;prntvpt.lib;winspool.lib;gdi32.lib;gdiplus.lib;shlwapi.lib;Advapi32.lib;user32.lib;.\..\..\debug\$(IntDir)\xdsdbg.lib;.\..\..\common\$(IntDir)\xdsmplcmn.lib;.\..\..\filters\common\$(IntDir)\xdfltcmn.lib + + %(AdditionalIncludeDirectories);..\;..\common;..\..\inc;..\..\common;..\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus @@ -151,6 +218,25 @@ %(AdditionalDependencies);uuid.lib;WIAGUID.lib;msxml6.lib;Kernel32.lib;ole32.lib;oleaut32.lib;prntvpt.lib;winspool.lib;gdi32.lib;gdiplus.lib;shlwapi.lib;Advapi32.lib;user32.lib;.\..\..\debug\$(IntDir)\xdsdbg.lib;.\..\..\common\$(IntDir)\xdsmplcmn.lib;.\..\..\filters\common\$(IntDir)\xdfltcmn.lib + + + %(AdditionalIncludeDirectories);..\;..\common;..\..\inc;..\..\common;..\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + + + %(AdditionalIncludeDirectories);..\;..\common;..\..\inc;..\..\common;..\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + MultiThreaded + MultiThreadedDebug + true + Level4 + Sync + + + %(AdditionalIncludeDirectories);..\;..\common;..\..\inc;..\..\common;..\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + + + %(AdditionalDependencies);uuid.lib;WIAGUID.lib;msxml6.lib;Kernel32.lib;ole32.lib;oleaut32.lib;prntvpt.lib;winspool.lib;gdi32.lib;gdiplus.lib;shlwapi.lib;Advapi32.lib;user32.lib;.\..\..\debug\$(IntDir)\xdsdbg.lib;.\..\..\common\$(IntDir)\xdsmplcmn.lib;.\..\..\filters\common\$(IntDir)\xdfltcmn.lib + + %(AdditionalIncludeDirectories);..\;..\common;..\..\inc;..\..\common;..\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus @@ -200,6 +286,17 @@ %(PreprocessorDefinitions);_UNICODE;UNICODE + + + %(PreprocessorDefinitions);_UNICODE;UNICODE + + + %(PreprocessorDefinitions);_UNICODE;UNICODE + + + %(PreprocessorDefinitions);_UNICODE;UNICODE + + %(PreprocessorDefinitions);_UNICODE;UNICODE @@ -211,6 +308,17 @@ %(PreprocessorDefinitions);_UNICODE;UNICODE + + + %(PreprocessorDefinitions);_UNICODE;UNICODE + + + %(PreprocessorDefinitions);_UNICODE;UNICODE + + + %(PreprocessorDefinitions);_UNICODE;UNICODE + + %(PreprocessorDefinitions);_UNICODE;UNICODE @@ -277,11 +385,21 @@ xdnup.def + + + xdnup.def + + xdnup.def + + + xdnup.def + + xdnup.def diff --git a/print/XPSDrvSmpl/src/filters/nup/xdnup.vcxproj.Filters b/print/XPSDrvSmpl/src/filters/nup/xdnup.vcxproj.Filters index 57c9ed18..b52a76f1 100644 --- a/print/XPSDrvSmpl/src/filters/nup/xdnup.vcxproj.Filters +++ b/print/XPSDrvSmpl/src/filters/nup/xdnup.vcxproj.Filters @@ -36,13 +36,52 @@ Source Files - - Source Files - Resource Files + + + Header Files + + + + + + + Header Files + + + + + + + Header Files + + + + + + + Header Files + + + + + + + Header Files + + + + + + + + + Source Files + + \ No newline at end of file diff --git a/print/XPSDrvSmpl/src/filters/scaling/pagescale.cpp b/print/XPSDrvSmpl/src/filters/scaling/pagescale.cpp index 44e0d5d3..7a7bc160 100644 --- a/print/XPSDrvSmpl/src/filters/scaling/pagescale.cpp +++ b/print/XPSDrvSmpl/src/filters/scaling/pagescale.cpp @@ -699,7 +699,7 @@ CPageScaling::GetOpenTagXML( if (SUCCEEDED(hr = CreateTransform(&bstrMatrixXForm))) { CStringXDW cstrCanvas; - cstrCanvas.Format(L"(bstrMatrixXForm)); *pbstrXML = cstrCanvas.AllocSysString(); } } diff --git a/print/XPSDrvSmpl/src/filters/scaling/xdscale.vcxproj b/print/XPSDrvSmpl/src/filters/scaling/xdscale.vcxproj index 6de38ad0..05e4aeb5 100644 --- a/print/XPSDrvSmpl/src/filters/scaling/xdscale.vcxproj +++ b/print/XPSDrvSmpl/src/filters/scaling/xdscale.vcxproj @@ -1,10 +1,18 @@  + + Debug + ARM64 + Debug Win32 + + Release + ARM64 + Release Win32 @@ -36,6 +44,14 @@ WindowsApplicationForDrivers10.0 DynamicLibrary + + Windows10 + False + Desktop + + WindowsApplicationForDrivers10.0 + DynamicLibrary + Windows10 True @@ -44,6 +60,14 @@ WindowsApplicationForDrivers10.0 DynamicLibrary + + Windows10 + True + Desktop + + WindowsApplicationForDrivers10.0 + DynamicLibrary + Windows10 False @@ -67,9 +91,15 @@ + + + + + + @@ -80,9 +110,15 @@ xdscale + + xdscale + xdscale + + xdscale + xdscale @@ -95,12 +131,24 @@ _DllMainCRTStartup + + + _DllMainCRTStartup@12 + _DllMainCRTStartup + + _DllMainCRTStartup@12 _DllMainCRTStartup + + + _DllMainCRTStartup@12 + _DllMainCRTStartup + + _DllMainCRTStartup@12 @@ -136,6 +184,29 @@ %(AdditionalDependencies);uuid.lib;WIAGUID.lib;msxml6.lib;Kernel32.lib;ole32.lib;oleaut32.lib;prntvpt.lib;winspool.lib;gdi32.lib;gdiplus.lib;shlwapi.lib;Advapi32.lib;user32.lib;.\..\..\debug\$(IntDir)\xdsdbg.lib;.\..\..\common\$(IntDir)\xdsmplcmn.lib;.\..\..\filters\common\$(IntDir)\xdfltcmn.lib + + + %(AdditionalIncludeDirectories);..\xdcont + %(AdditionalIncludeDirectories);..\;..\common;..\..\inc;..\..\common;..\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + + + %(AdditionalIncludeDirectories);..\xdcont + %(AdditionalIncludeDirectories);..\;..\common;..\..\inc;..\..\common;..\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + MultiThreaded + MultiThreadedDebug + true + Level4 + Sync + + + %(AdditionalIncludeDirectories);..\xdcont + %(AdditionalIncludeDirectories);..\;..\common;..\..\inc;..\..\common;..\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + + + %(AdditionalDependencies);.\..\xdcont\$(IntDir)\xdcont.lib + %(AdditionalDependencies);uuid.lib;WIAGUID.lib;msxml6.lib;Kernel32.lib;ole32.lib;oleaut32.lib;prntvpt.lib;winspool.lib;gdi32.lib;gdiplus.lib;shlwapi.lib;Advapi32.lib;user32.lib;.\..\..\debug\$(IntDir)\xdsdbg.lib;.\..\..\common\$(IntDir)\xdsmplcmn.lib;.\..\..\filters\common\$(IntDir)\xdfltcmn.lib + + %(AdditionalIncludeDirectories);..\xdcont @@ -159,6 +230,29 @@ %(AdditionalDependencies);uuid.lib;WIAGUID.lib;msxml6.lib;Kernel32.lib;ole32.lib;oleaut32.lib;prntvpt.lib;winspool.lib;gdi32.lib;gdiplus.lib;shlwapi.lib;Advapi32.lib;user32.lib;.\..\..\debug\$(IntDir)\xdsdbg.lib;.\..\..\common\$(IntDir)\xdsmplcmn.lib;.\..\..\filters\common\$(IntDir)\xdfltcmn.lib + + + %(AdditionalIncludeDirectories);..\xdcont + %(AdditionalIncludeDirectories);..\;..\common;..\..\inc;..\..\common;..\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + + + %(AdditionalIncludeDirectories);..\xdcont + %(AdditionalIncludeDirectories);..\;..\common;..\..\inc;..\..\common;..\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + MultiThreaded + MultiThreadedDebug + true + Level4 + Sync + + + %(AdditionalIncludeDirectories);..\xdcont + %(AdditionalIncludeDirectories);..\;..\common;..\..\inc;..\..\common;..\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + + + %(AdditionalDependencies);.\..\xdcont\$(IntDir)\xdcont.lib + %(AdditionalDependencies);uuid.lib;WIAGUID.lib;msxml6.lib;Kernel32.lib;ole32.lib;oleaut32.lib;prntvpt.lib;winspool.lib;gdi32.lib;gdiplus.lib;shlwapi.lib;Advapi32.lib;user32.lib;.\..\..\debug\$(IntDir)\xdsdbg.lib;.\..\..\common\$(IntDir)\xdsmplcmn.lib;.\..\..\filters\common\$(IntDir)\xdfltcmn.lib + + %(AdditionalIncludeDirectories);..\xdcont @@ -216,6 +310,17 @@ %(PreprocessorDefinitions);_UNICODE;UNICODE + + + %(PreprocessorDefinitions);_UNICODE;UNICODE + + + %(PreprocessorDefinitions);_UNICODE;UNICODE + + + %(PreprocessorDefinitions);_UNICODE;UNICODE + + %(PreprocessorDefinitions);_UNICODE;UNICODE @@ -227,6 +332,17 @@ %(PreprocessorDefinitions);_UNICODE;UNICODE + + + %(PreprocessorDefinitions);_UNICODE;UNICODE + + + %(PreprocessorDefinitions);_UNICODE;UNICODE + + + %(PreprocessorDefinitions);_UNICODE;UNICODE + + %(PreprocessorDefinitions);_UNICODE;UNICODE @@ -287,11 +403,21 @@ xdscale.def + + + xdscale.def + + xdscale.def + + + xdscale.def + + xdscale.def diff --git a/print/XPSDrvSmpl/src/filters/scaling/xdscale.vcxproj.Filters b/print/XPSDrvSmpl/src/filters/scaling/xdscale.vcxproj.Filters index c72bf9da..0f7b4ae3 100644 --- a/print/XPSDrvSmpl/src/filters/scaling/xdscale.vcxproj.Filters +++ b/print/XPSDrvSmpl/src/filters/scaling/xdscale.vcxproj.Filters @@ -33,13 +33,41 @@ Source Files - - Source Files - Resource Files + + + Header Files + + + + + + Header Files + + + + + + Header Files + + + + + + Header Files + + + + + + + + Source Files + + \ No newline at end of file diff --git a/print/XPSDrvSmpl/src/filters/watermark/wmvect.cpp b/print/XPSDrvSmpl/src/filters/watermark/wmvect.cpp index 578995bf..a7c9d595 100644 --- a/print/XPSDrvSmpl/src/filters/watermark/wmvect.cpp +++ b/print/XPSDrvSmpl/src/filters/watermark/wmvect.cpp @@ -159,7 +159,7 @@ CVectorWatermark::CreateXMLElement( try { CStringXDW strOpenCanvas; - strOpenCanvas.Format(L"", bstrWMOpacity, bstrMatrixXForm); + strOpenCanvas.Format(L"", static_cast(bstrWMOpacity), static_cast(bstrMatrixXForm)); IStream* pStream; CComBSTR bstrContent; diff --git a/print/XPSDrvSmpl/src/filters/watermark/xdwmark.vcxproj b/print/XPSDrvSmpl/src/filters/watermark/xdwmark.vcxproj index 740e3c9d..db90ca84 100644 --- a/print/XPSDrvSmpl/src/filters/watermark/xdwmark.vcxproj +++ b/print/XPSDrvSmpl/src/filters/watermark/xdwmark.vcxproj @@ -1,10 +1,18 @@  + + Debug + ARM64 + Debug Win32 + + Release + ARM64 + Release Win32 @@ -36,6 +44,14 @@ WindowsApplicationForDrivers10.0 DynamicLibrary + + Windows10 + False + Desktop + + WindowsApplicationForDrivers10.0 + DynamicLibrary + Windows10 True @@ -44,6 +60,14 @@ WindowsApplicationForDrivers10.0 DynamicLibrary + + Windows10 + True + Desktop + + WindowsApplicationForDrivers10.0 + DynamicLibrary + Windows10 False @@ -67,9 +91,15 @@ + + + + + + @@ -80,9 +110,15 @@ xdwmark + + xdwmark + xdwmark + + xdwmark + xdwmark @@ -95,12 +131,24 @@ _DllMainCRTStartup + + + _DllMainCRTStartup@12 + _DllMainCRTStartup + + _DllMainCRTStartup@12 _DllMainCRTStartup + + + _DllMainCRTStartup@12 + _DllMainCRTStartup + + _DllMainCRTStartup@12 @@ -132,6 +180,25 @@ %(AdditionalDependencies);uuid.lib;WIAGUID.lib;msxml6.lib;Kernel32.lib;ole32.lib;oleaut32.lib;prntvpt.lib;winspool.lib;gdi32.lib;gdiplus.lib;shlwapi.lib;Advapi32.lib;user32.lib;.\..\..\debug\$(IntDir)\xdsdbg.lib;.\..\..\common\$(IntDir)\xdsmplcmn.lib;.\..\..\filters\common\$(IntDir)\xdfltcmn.lib + + + %(AdditionalIncludeDirectories);..\;..\common;..\..\inc;..\..\common;..\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + + + %(AdditionalIncludeDirectories);..\;..\common;..\..\inc;..\..\common;..\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + MultiThreaded + MultiThreadedDebug + true + Level4 + Sync + + + %(AdditionalIncludeDirectories);..\;..\common;..\..\inc;..\..\common;..\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + + + %(AdditionalDependencies);uuid.lib;WIAGUID.lib;msxml6.lib;Kernel32.lib;ole32.lib;oleaut32.lib;prntvpt.lib;winspool.lib;gdi32.lib;gdiplus.lib;shlwapi.lib;Advapi32.lib;user32.lib;.\..\..\debug\$(IntDir)\xdsdbg.lib;.\..\..\common\$(IntDir)\xdsmplcmn.lib;.\..\..\filters\common\$(IntDir)\xdfltcmn.lib + + %(AdditionalIncludeDirectories);..\;..\common;..\..\inc;..\..\common;..\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus @@ -151,6 +218,25 @@ %(AdditionalDependencies);uuid.lib;WIAGUID.lib;msxml6.lib;Kernel32.lib;ole32.lib;oleaut32.lib;prntvpt.lib;winspool.lib;gdi32.lib;gdiplus.lib;shlwapi.lib;Advapi32.lib;user32.lib;.\..\..\debug\$(IntDir)\xdsdbg.lib;.\..\..\common\$(IntDir)\xdsmplcmn.lib;.\..\..\filters\common\$(IntDir)\xdfltcmn.lib + + + %(AdditionalIncludeDirectories);..\;..\common;..\..\inc;..\..\common;..\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + + + %(AdditionalIncludeDirectories);..\;..\common;..\..\inc;..\..\common;..\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + MultiThreaded + MultiThreadedDebug + true + Level4 + Sync + + + %(AdditionalIncludeDirectories);..\;..\common;..\..\inc;..\..\common;..\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + + + %(AdditionalDependencies);uuid.lib;WIAGUID.lib;msxml6.lib;Kernel32.lib;ole32.lib;oleaut32.lib;prntvpt.lib;winspool.lib;gdi32.lib;gdiplus.lib;shlwapi.lib;Advapi32.lib;user32.lib;.\..\..\debug\$(IntDir)\xdsdbg.lib;.\..\..\common\$(IntDir)\xdsmplcmn.lib;.\..\..\filters\common\$(IntDir)\xdfltcmn.lib + + %(AdditionalIncludeDirectories);..\;..\common;..\..\inc;..\..\common;..\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus @@ -200,6 +286,17 @@ %(PreprocessorDefinitions);_UNICODE;UNICODE + + + %(PreprocessorDefinitions);_UNICODE;UNICODE + + + %(PreprocessorDefinitions);_UNICODE;UNICODE + + + %(PreprocessorDefinitions);_UNICODE;UNICODE + + %(PreprocessorDefinitions);_UNICODE;UNICODE @@ -211,6 +308,17 @@ %(PreprocessorDefinitions);_UNICODE;UNICODE + + + %(PreprocessorDefinitions);_UNICODE;UNICODE + + + %(PreprocessorDefinitions);_UNICODE;UNICODE + + + %(PreprocessorDefinitions);_UNICODE;UNICODE + + %(PreprocessorDefinitions);_UNICODE;UNICODE @@ -307,11 +415,21 @@ xdwmark.def + + + xdwmark.def + + xdwmark.def + + + xdwmark.def + + xdwmark.def diff --git a/print/XPSDrvSmpl/src/filters/watermark/xdwmark.vcxproj.Filters b/print/XPSDrvSmpl/src/filters/watermark/xdwmark.vcxproj.Filters index fbaaa4cc..9825590c 100644 --- a/print/XPSDrvSmpl/src/filters/watermark/xdwmark.vcxproj.Filters +++ b/print/XPSDrvSmpl/src/filters/watermark/xdwmark.vcxproj.Filters @@ -51,13 +51,163 @@ Source Files - - Source Files - Resource Files + + + Header Files + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + Resource Files + + + Source Files + + \ No newline at end of file diff --git a/print/XPSDrvSmpl/src/filters/xdcont/xdcont.vcxproj b/print/XPSDrvSmpl/src/filters/xdcont/xdcont.vcxproj index b414e460..37d7855a 100644 --- a/print/XPSDrvSmpl/src/filters/xdcont/xdcont.vcxproj +++ b/print/XPSDrvSmpl/src/filters/xdcont/xdcont.vcxproj @@ -1,10 +1,18 @@  + + Debug + ARM64 + Debug Win32 + + Release + ARM64 + Release Win32 @@ -36,6 +44,14 @@ WindowsApplicationForDrivers10.0 StaticLibrary + + Windows10 + False + Desktop + + WindowsApplicationForDrivers10.0 + StaticLibrary + Windows10 True @@ -44,6 +60,14 @@ WindowsApplicationForDrivers10.0 StaticLibrary + + Windows10 + True + Desktop + + WindowsApplicationForDrivers10.0 + StaticLibrary + Windows10 False @@ -67,9 +91,15 @@ + + + + + + @@ -80,9 +110,15 @@ xdcont + + xdcont + xdcont + + xdcont + xdcont @@ -108,6 +144,25 @@ %(AdditionalDependencies);uuid.lib;WIAGUID.lib;msxml6.lib;Kernel32.lib;ole32.lib;oleaut32.lib;prntvpt.lib;winspool.lib;gdi32.lib;gdiplus.lib;shlwapi.lib;Advapi32.lib;user32.lib;.\..\..\debug\$(IntDir)\xdsdbg.lib;.\..\..\common\$(IntDir)\xdsmplcmn.lib;.\..\..\filters\common\$(IntDir)\xdfltcmn.lib + + + %(AdditionalIncludeDirectories);..\;..\common;..\..\inc;..\..\common;..\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + + + %(AdditionalIncludeDirectories);..\;..\common;..\..\inc;..\..\common;..\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + MultiThreaded + MultiThreadedDebug + true + Level4 + Sync + + + %(AdditionalIncludeDirectories);..\;..\common;..\..\inc;..\..\common;..\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + + + %(AdditionalDependencies);uuid.lib;WIAGUID.lib;msxml6.lib;Kernel32.lib;ole32.lib;oleaut32.lib;prntvpt.lib;winspool.lib;gdi32.lib;gdiplus.lib;shlwapi.lib;Advapi32.lib;user32.lib;.\..\..\debug\$(IntDir)\xdsdbg.lib;.\..\..\common\$(IntDir)\xdsmplcmn.lib;.\..\..\filters\common\$(IntDir)\xdfltcmn.lib + + %(AdditionalIncludeDirectories);..\;..\common;..\..\inc;..\..\common;..\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus @@ -127,6 +182,25 @@ %(AdditionalDependencies);uuid.lib;WIAGUID.lib;msxml6.lib;Kernel32.lib;ole32.lib;oleaut32.lib;prntvpt.lib;winspool.lib;gdi32.lib;gdiplus.lib;shlwapi.lib;Advapi32.lib;user32.lib;.\..\..\debug\$(IntDir)\xdsdbg.lib;.\..\..\common\$(IntDir)\xdsmplcmn.lib;.\..\..\filters\common\$(IntDir)\xdfltcmn.lib + + + %(AdditionalIncludeDirectories);..\;..\common;..\..\inc;..\..\common;..\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + + + %(AdditionalIncludeDirectories);..\;..\common;..\..\inc;..\..\common;..\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + MultiThreaded + MultiThreadedDebug + true + Level4 + Sync + + + %(AdditionalIncludeDirectories);..\;..\common;..\..\inc;..\..\common;..\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + + + %(AdditionalDependencies);uuid.lib;WIAGUID.lib;msxml6.lib;Kernel32.lib;ole32.lib;oleaut32.lib;prntvpt.lib;winspool.lib;gdi32.lib;gdiplus.lib;shlwapi.lib;Advapi32.lib;user32.lib;.\..\..\debug\$(IntDir)\xdsdbg.lib;.\..\..\common\$(IntDir)\xdsmplcmn.lib;.\..\..\filters\common\$(IntDir)\xdfltcmn.lib + + %(AdditionalIncludeDirectories);..\;..\common;..\..\inc;..\..\common;..\..\debug;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus @@ -176,6 +250,17 @@ %(PreprocessorDefinitions);_UNICODE;UNICODE + + + %(PreprocessorDefinitions);_UNICODE;UNICODE + + + %(PreprocessorDefinitions);_UNICODE;UNICODE + + + %(PreprocessorDefinitions);_UNICODE;UNICODE + + %(PreprocessorDefinitions);_UNICODE;UNICODE @@ -187,6 +272,17 @@ %(PreprocessorDefinitions);_UNICODE;UNICODE + + + %(PreprocessorDefinitions);_UNICODE;UNICODE + + + %(PreprocessorDefinitions);_UNICODE;UNICODE + + + %(PreprocessorDefinitions);_UNICODE;UNICODE + + %(PreprocessorDefinitions);_UNICODE;UNICODE diff --git a/print/XPSDrvSmpl/src/filters/xdcont/xdcont.vcxproj.Filters b/print/XPSDrvSmpl/src/filters/xdcont/xdcont.vcxproj.Filters index 2cf80087..d56ecb83 100644 --- a/print/XPSDrvSmpl/src/filters/xdcont/xdcont.vcxproj.Filters +++ b/print/XPSDrvSmpl/src/filters/xdcont/xdcont.vcxproj.Filters @@ -43,4 +43,105 @@ Source Files + + + Header Files + + + + + + + + + + + Header Files + + + + + + + + + + + Header Files + + + + + + + + + + + Header Files + + + + + + + + + + + Header Files + + + + + + + + + + + Header Files + + + + + + + + + + + Header Files + + + + + + + + + + + Header Files + + + + + + + + + + + Header Files + + + + + + + + + + \ No newline at end of file diff --git a/print/XPSDrvSmpl/src/ui/xdsmplui.vcxproj b/print/XPSDrvSmpl/src/ui/xdsmplui.vcxproj index 92148069..89faeba5 100644 --- a/print/XPSDrvSmpl/src/ui/xdsmplui.vcxproj +++ b/print/XPSDrvSmpl/src/ui/xdsmplui.vcxproj @@ -1,10 +1,18 @@  + + Debug + ARM64 + Debug Win32 + + Release + ARM64 + Release Win32 @@ -36,6 +44,14 @@ WindowsApplicationForDrivers10.0 DynamicLibrary + + Windows10 + False + Desktop + + WindowsApplicationForDrivers10.0 + DynamicLibrary + Windows10 True @@ -44,6 +60,14 @@ WindowsApplicationForDrivers10.0 DynamicLibrary + + Windows10 + True + Desktop + + WindowsApplicationForDrivers10.0 + DynamicLibrary + Windows10 False @@ -67,9 +91,15 @@ + + + + + + @@ -83,12 +113,24 @@ _DllMainCRTStartup + + + _DllMainCRTStartup@12 + _DllMainCRTStartup + + _DllMainCRTStartup@12 _DllMainCRTStartup + + + _DllMainCRTStartup@12 + _DllMainCRTStartup + + _DllMainCRTStartup@12 @@ -110,6 +152,15 @@ Sync + + + MultiThreaded + MultiThreadedDebug + true + Level4 + Sync + + MultiThreaded @@ -119,6 +170,15 @@ Sync + + + MultiThreaded + MultiThreadedDebug + true + Level4 + Sync + + MultiThreaded @@ -140,9 +200,15 @@ xdsmplui + + xdsmplui + xdsmplui + + xdsmplui + xdsmplui @@ -170,6 +236,27 @@ xdsmplui.def + + + %(PreprocessorDefinitions);USERMODE_DRIVER;_UNICODE;UNICODE + %(PreprocessorDefinitions);PLUGIN_PRINTTICKET + %(AdditionalIncludeDirectories);..\inc;..\debug;..\common;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + + + %(PreprocessorDefinitions);USERMODE_DRIVER;_UNICODE;UNICODE + %(PreprocessorDefinitions);PLUGIN_PRINTTICKET + %(AdditionalIncludeDirectories);..\inc;..\debug;..\common;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + + + %(PreprocessorDefinitions);USERMODE_DRIVER;_UNICODE;UNICODE + %(PreprocessorDefinitions);PLUGIN_PRINTTICKET + %(AdditionalIncludeDirectories);..\inc;..\debug;..\common;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + + + %(AdditionalDependencies);kernel32.lib;user32.lib;winspool.lib;ole32.lib;oleaut32.lib;advapi32.lib;msxml6.lib;uuid.lib;Comdlg32.lib;.\..\debug\$(IntDir)\xdsdbg.lib;.\..\common\$(IntDir)\xdsmplcmn.lib + xdsmplui.def + + %(PreprocessorDefinitions);USERMODE_DRIVER;_UNICODE;UNICODE @@ -191,6 +278,27 @@ xdsmplui.def + + + %(PreprocessorDefinitions);USERMODE_DRIVER;_UNICODE;UNICODE + %(PreprocessorDefinitions);PLUGIN_PRINTTICKET + %(AdditionalIncludeDirectories);..\inc;..\debug;..\common;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + + + %(PreprocessorDefinitions);USERMODE_DRIVER;_UNICODE;UNICODE + %(PreprocessorDefinitions);PLUGIN_PRINTTICKET + %(AdditionalIncludeDirectories);..\inc;..\debug;..\common;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + + + %(PreprocessorDefinitions);USERMODE_DRIVER;_UNICODE;UNICODE + %(PreprocessorDefinitions);PLUGIN_PRINTTICKET + %(AdditionalIncludeDirectories);..\inc;..\debug;..\common;$(DDK_INC_PATH);$(SDK_INC_PATH)\gdiplus + + + %(AdditionalDependencies);kernel32.lib;user32.lib;winspool.lib;ole32.lib;oleaut32.lib;advapi32.lib;msxml6.lib;uuid.lib;Comdlg32.lib;.\..\debug\$(IntDir)\xdsdbg.lib;.\..\common\$(IntDir)\xdsmplcmn.lib + xdsmplui.def + + %(PreprocessorDefinitions);USERMODE_DRIVER;_UNICODE;UNICODE diff --git a/print/XPSDrvSmpl/src/ui/xdsmplui.vcxproj.Filters b/print/XPSDrvSmpl/src/ui/xdsmplui.vcxproj.Filters index 90668633..4d74c630 100644 --- a/print/XPSDrvSmpl/src/ui/xdsmplui.vcxproj.Filters +++ b/print/XPSDrvSmpl/src/ui/xdsmplui.vcxproj.Filters @@ -72,13 +72,500 @@ Source Files - - Source Files - Resource Files + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + + + + + + + + Source Files + + \ No newline at end of file diff --git a/print/XpsRasFilter/XpsRasFilter.sln b/print/XpsRasFilter/XpsRasFilter.sln index e7a317ef..1c155e19 100644 --- a/print/XpsRasFilter/XpsRasFilter.sln +++ b/print/XpsRasFilter/XpsRasFilter.sln @@ -1,24 +1,30 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0 +# Visual Studio 15 +VisualStudioVersion = 15.0.26430.16 MinimumVisualStudioVersion = 12.0 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xpsrasfilter", "src\xpsrasfilter.vcxproj", "{D8784A15-C959-4CDF-B5B8-A603F347BDA4}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|ARM64 = Debug|ARM64 Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 Debug|x64 = Debug|x64 + Release|ARM64 = Release|ARM64 + Release|Win32 = Release|Win32 Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D8784A15-C959-4CDF-B5B8-A603F347BDA4}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {D8784A15-C959-4CDF-B5B8-A603F347BDA4}.Debug|ARM64.Build.0 = Debug|ARM64 {D8784A15-C959-4CDF-B5B8-A603F347BDA4}.Debug|Win32.ActiveCfg = Debug|Win32 {D8784A15-C959-4CDF-B5B8-A603F347BDA4}.Debug|Win32.Build.0 = Debug|Win32 - {D8784A15-C959-4CDF-B5B8-A603F347BDA4}.Release|Win32.ActiveCfg = Release|Win32 - {D8784A15-C959-4CDF-B5B8-A603F347BDA4}.Release|Win32.Build.0 = Release|Win32 {D8784A15-C959-4CDF-B5B8-A603F347BDA4}.Debug|x64.ActiveCfg = Debug|x64 {D8784A15-C959-4CDF-B5B8-A603F347BDA4}.Debug|x64.Build.0 = Debug|x64 + {D8784A15-C959-4CDF-B5B8-A603F347BDA4}.Release|ARM64.ActiveCfg = Release|ARM64 + {D8784A15-C959-4CDF-B5B8-A603F347BDA4}.Release|ARM64.Build.0 = Release|ARM64 + {D8784A15-C959-4CDF-B5B8-A603F347BDA4}.Release|Win32.ActiveCfg = Release|Win32 + {D8784A15-C959-4CDF-B5B8-A603F347BDA4}.Release|Win32.Build.0 = Release|Win32 {D8784A15-C959-4CDF-B5B8-A603F347BDA4}.Release|x64.ActiveCfg = Release|x64 {D8784A15-C959-4CDF-B5B8-A603F347BDA4}.Release|x64.Build.0 = Release|x64 EndGlobalSection diff --git a/print/XpsRasFilter/install/xpsrassmpl.inf b/print/XpsRasFilter/install/xpsrassmpl.inf index 3e7a8224..d16530be 100644 --- a/print/XpsRasFilter/install/xpsrassmpl.inf +++ b/print/XpsRasFilter/install/xpsrassmpl.inf @@ -24,7 +24,7 @@ Class=Printer DriverVer=10/17/2008,6.1.6930.0 [Manufacturer] -%ManufacturerName%=Standard,NTx86.6.1,NTia64.6.1,NTamd64.6.1 +%ManufacturerName%=Standard,NTx86.6.1,NTia64.6.1,NTamd64.6.1,NTarm64.6.1 [Standard.NTx86.6.1] @@ -36,6 +36,9 @@ DriverVer=10/17/2008,6.1.6930.0 [Standard.NTamd64.6.1] "XPSRas WDK Sample Driver" = INSTALL_FILTER +[Standard.NTarm64.6.1] +"XPSRas WDK Sample Driver" = INSTALL_FILTER + [INSTALL_FILTER] CopyFiles=XPSRasSample DriverFile=mxdwdrv.dll @@ -56,6 +59,10 @@ CoreDriverDependencies={D20EA372-DD35-4950-9ED8-A6335AFE79F0}, {D20EA372-DD35-49 PackageAware=TRUE CoreDriverDependencies={D20EA372-DD35-4950-9ED8-A6335AFE79F0}, {D20EA372-DD35-4950-9ED8-A6335AFE79F5} +[PrinterPackageInstallation.arm64] +PackageAware=TRUE +CoreDriverDependencies={D20EA372-DD35-4950-9ED8-A6335AFE79F0}, {D20EA372-DD35-4950-9ED8-A6335AFE79F5} + [DestinationDirs] DefaultDestDir=66000 @@ -76,6 +83,10 @@ xpsrasfilter.dll 1 = %Location%,, 2 = %Location%,,,amd64 +[SourceDisksNames.arm64] +1 = %Location%,, +2 = %Location%,,,arm64 + [SourceDisksFiles] xpsrassmpl.gpd = 1 xpsrassmpl-pipelineconfig.xml = 1 diff --git a/print/XpsRasFilter/src/precomp.h b/print/XpsRasFilter/src/precomp.h index 97e8f4ee..8cfbe37b 100644 --- a/print/XpsRasFilter/src/precomp.h +++ b/print/XpsRasFilter/src/precomp.h @@ -36,6 +36,7 @@ __user_driver #include #include #include +#include // STL #include diff --git a/print/XpsRasFilter/src/xpsrasfilter.vcxproj b/print/XpsRasFilter/src/xpsrasfilter.vcxproj index f7ce2baf..267efbef 100644 --- a/print/XpsRasFilter/src/xpsrasfilter.vcxproj +++ b/print/XpsRasFilter/src/xpsrasfilter.vcxproj @@ -1,10 +1,18 @@  + + Debug + ARM64 + Debug Win32 + + Release + ARM64 + Release Win32 @@ -34,6 +42,14 @@ WindowsApplicationForDrivers10.0 DynamicLibrary + + Windows10 + False + Desktop + + WindowsApplicationForDrivers10.0 + DynamicLibrary + Windows10 True @@ -42,6 +58,14 @@ WindowsApplicationForDrivers10.0 DynamicLibrary + + Windows10 + True + Desktop + + WindowsApplicationForDrivers10.0 + DynamicLibrary + Windows10 False @@ -65,9 +89,15 @@ + + + + + + @@ -174,9 +204,15 @@ xpsrasfilter + + xpsrasfilter + xpsrasfilter + + xpsrasfilter + xpsrasfilter @@ -189,12 +225,24 @@ _DllMainCRTStartup + + + _DllMainCRTStartup@12 + _DllMainCRTStartup + + _DllMainCRTStartup@12 _DllMainCRTStartup + + + _DllMainCRTStartup@12 + _DllMainCRTStartup + + _DllMainCRTStartup@12 @@ -221,6 +269,20 @@ %(AdditionalDependencies);uuid.lib;prntvpt.lib;Kernel32.lib;winspool.lib;ole32.lib;oleaut32.lib;Advapi32.lib + + + %(AdditionalIncludeDirectories);$(DDK_INC_PATH) + + + %(AdditionalIncludeDirectories);$(DDK_INC_PATH) + + + %(AdditionalIncludeDirectories);$(DDK_INC_PATH) + + + %(AdditionalDependencies);uuid.lib;prntvpt.lib;Kernel32.lib;winspool.lib;ole32.lib;oleaut32.lib;Advapi32.lib + + %(AdditionalIncludeDirectories);$(DDK_INC_PATH) @@ -235,6 +297,20 @@ %(AdditionalDependencies);uuid.lib;prntvpt.lib;Kernel32.lib;winspool.lib;ole32.lib;oleaut32.lib;Advapi32.lib + + + %(AdditionalIncludeDirectories);$(DDK_INC_PATH) + + + %(AdditionalIncludeDirectories);$(DDK_INC_PATH) + + + %(AdditionalIncludeDirectories);$(DDK_INC_PATH) + + + %(AdditionalDependencies);uuid.lib;prntvpt.lib;Kernel32.lib;winspool.lib;ole32.lib;oleaut32.lib;Advapi32.lib + + %(AdditionalIncludeDirectories);$(DDK_INC_PATH) @@ -266,9 +342,15 @@ Dynamic + + Dynamic + Dynamic + + Dynamic + Dynamic @@ -282,6 +364,13 @@ Level4 + + + Sync + true + Level4 + + Sync @@ -289,6 +378,13 @@ Level4 + + + Sync + true + Level4 + + Sync @@ -308,11 +404,21 @@ xpsrasfilter.def + + + xpsrasfilter.def + + xpsrasfilter.def + + + xpsrasfilter.def + + xpsrasfilter.def diff --git a/print/XpsRasFilter/src/xpsrasfilter.vcxproj.Filters b/print/XpsRasFilter/src/xpsrasfilter.vcxproj.Filters index bc40227c..220e456f 100644 --- a/print/XpsRasFilter/src/xpsrasfilter.vcxproj.Filters +++ b/print/XpsRasFilter/src/xpsrasfilter.vcxproj.Filters @@ -42,13 +42,137 @@ Source Files - - Source Files - Resource Files + + + Header Files + + + + + + + + + + + + Header Files + + + + + + + + + + + + Header Files + + + + + + + + + + + + Header Files + + + + + + + + + + + + Header Files + + + + + + + + + + + + Header Files + + + + + + + + + + + + Header Files + + + + + + + + + + + + Header Files + + + + + + + + + + + + Header Files + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + Source Files + + \ No newline at end of file diff --git a/print/autoconfig/AutoCnfg.inf b/print/autoconfig/AutoCnfg.inf index 17209219..4c9208d0 100644 --- a/print/autoconfig/AutoCnfg.inf +++ b/print/autoconfig/AutoCnfg.inf @@ -21,7 +21,7 @@ CatalogFile=AutoCnfg.cat ; that we will display in the Dialog box ; [Manufacturer] -%ManufacturerName%=Standard, NTx86, NTamd64, NTia64 +%ManufacturerName%=Standard, NTx86, NTamd64, NTia64, NTarm64 ; ; Model sections. @@ -42,6 +42,9 @@ CatalogFile=AutoCnfg.cat "Unidrv AutoConfiguration Sample" = INSTALL_AUTO_CONFIG.UNI,DO_NOT_USE_THIS_HWID1 "PScript5 AutoConfiguration Sample" = INSTALL_AUTO_CONFIG.PS,DO_NOT_USE_THIS_HWID2 +[Standard.NTarm64] +"Unidrv AutoConfiguration Sample" = INSTALL_AUTO_CONFIG.UNI,DO_NOT_USE_THIS_HWID1 +"PScript5 AutoConfiguration Sample" = INSTALL_AUTO_CONFIG.PS,DO_NOT_USE_THIS_HWID2 ; diff --git a/print/autoconfig/AutoConfig.sln b/print/autoconfig/AutoConfig.sln index c813e5fa..41c3f755 100644 --- a/print/autoconfig/AutoConfig.sln +++ b/print/autoconfig/AutoConfig.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0 +# Visual Studio 15 +VisualStudioVersion = 15.0.26430.16 MinimumVisualStudioVersion = 12.0 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Package", "Package", "{C8C5A4C2-DE1C-4B59-9E50-DD766C931F7A}" EndProject @@ -13,26 +13,40 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AutoConfig", "AutoConfig.vc EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|ARM64 = Debug|ARM64 Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 Debug|x64 = Debug|x64 + Release|ARM64 = Release|ARM64 + Release|Win32 = Release|Win32 Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {34C973B1-CBF0-4A78-A05A-176FCFB1D25F}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {34C973B1-CBF0-4A78-A05A-176FCFB1D25F}.Debug|ARM64.Build.0 = Debug|ARM64 + {34C973B1-CBF0-4A78-A05A-176FCFB1D25F}.Debug|ARM64.Deploy.0 = Debug|ARM64 {34C973B1-CBF0-4A78-A05A-176FCFB1D25F}.Debug|Win32.ActiveCfg = Debug|Win32 {34C973B1-CBF0-4A78-A05A-176FCFB1D25F}.Debug|Win32.Build.0 = Debug|Win32 - {34C973B1-CBF0-4A78-A05A-176FCFB1D25F}.Release|Win32.ActiveCfg = Release|Win32 - {34C973B1-CBF0-4A78-A05A-176FCFB1D25F}.Release|Win32.Build.0 = Release|Win32 {34C973B1-CBF0-4A78-A05A-176FCFB1D25F}.Debug|x64.ActiveCfg = Debug|x64 {34C973B1-CBF0-4A78-A05A-176FCFB1D25F}.Debug|x64.Build.0 = Debug|x64 + {34C973B1-CBF0-4A78-A05A-176FCFB1D25F}.Release|ARM64.ActiveCfg = Release|ARM64 + {34C973B1-CBF0-4A78-A05A-176FCFB1D25F}.Release|ARM64.Build.0 = Release|ARM64 + {34C973B1-CBF0-4A78-A05A-176FCFB1D25F}.Release|ARM64.Deploy.0 = Release|ARM64 + {34C973B1-CBF0-4A78-A05A-176FCFB1D25F}.Release|Win32.ActiveCfg = Release|Win32 + {34C973B1-CBF0-4A78-A05A-176FCFB1D25F}.Release|Win32.Build.0 = Release|Win32 {34C973B1-CBF0-4A78-A05A-176FCFB1D25F}.Release|x64.ActiveCfg = Release|x64 {34C973B1-CBF0-4A78-A05A-176FCFB1D25F}.Release|x64.Build.0 = Release|x64 + {DBBDF822-170C-4685-BAE7-5E0531334164}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {DBBDF822-170C-4685-BAE7-5E0531334164}.Debug|ARM64.Build.0 = Debug|ARM64 + {DBBDF822-170C-4685-BAE7-5E0531334164}.Debug|ARM64.Deploy.0 = Debug|ARM64 {DBBDF822-170C-4685-BAE7-5E0531334164}.Debug|Win32.ActiveCfg = Debug|Win32 {DBBDF822-170C-4685-BAE7-5E0531334164}.Debug|Win32.Build.0 = Debug|Win32 - {DBBDF822-170C-4685-BAE7-5E0531334164}.Release|Win32.ActiveCfg = Release|Win32 - {DBBDF822-170C-4685-BAE7-5E0531334164}.Release|Win32.Build.0 = Release|Win32 {DBBDF822-170C-4685-BAE7-5E0531334164}.Debug|x64.ActiveCfg = Debug|x64 {DBBDF822-170C-4685-BAE7-5E0531334164}.Debug|x64.Build.0 = Debug|x64 + {DBBDF822-170C-4685-BAE7-5E0531334164}.Release|ARM64.ActiveCfg = Release|ARM64 + {DBBDF822-170C-4685-BAE7-5E0531334164}.Release|ARM64.Build.0 = Release|ARM64 + {DBBDF822-170C-4685-BAE7-5E0531334164}.Release|ARM64.Deploy.0 = Release|ARM64 + {DBBDF822-170C-4685-BAE7-5E0531334164}.Release|Win32.ActiveCfg = Release|Win32 + {DBBDF822-170C-4685-BAE7-5E0531334164}.Release|Win32.Build.0 = Release|Win32 {DBBDF822-170C-4685-BAE7-5E0531334164}.Release|x64.ActiveCfg = Release|x64 {DBBDF822-170C-4685-BAE7-5E0531334164}.Release|x64.Build.0 = Release|x64 EndGlobalSection @@ -40,8 +54,8 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution + {C8C5A4C2-DE1C-4B59-9E50-DD766C931F7A} = {02B91EC2-24FC-4562-AEB5-4269AA96F54F} {34C973B1-CBF0-4A78-A05A-176FCFB1D25F} = {C8C5A4C2-DE1C-4B59-9E50-DD766C931F7A} {DBBDF822-170C-4685-BAE7-5E0531334164} = {02B91EC2-24FC-4562-AEB5-4269AA96F54F} - {C8C5A4C2-DE1C-4B59-9E50-DD766C931F7A} = {02B91EC2-24FC-4562-AEB5-4269AA96F54F} EndGlobalSection EndGlobal diff --git a/print/autoconfig/AutoConfig.vcxproj b/print/autoconfig/AutoConfig.vcxproj index 8ec3679c..2cf8308a 100644 --- a/print/autoconfig/AutoConfig.vcxproj +++ b/print/autoconfig/AutoConfig.vcxproj @@ -1,10 +1,18 @@  + + Debug + ARM64 + Debug Win32 + + Release + ARM64 + Release Win32 @@ -36,6 +44,14 @@ WindowsKernelModeDriver10.0 Utility + + Windows10 + False + Desktop + None + WindowsKernelModeDriver10.0 + Utility + Windows10 True @@ -44,6 +60,14 @@ WindowsKernelModeDriver10.0 Utility + + Windows10 + True + Desktop + None + WindowsKernelModeDriver10.0 + Utility + Windows10 False @@ -67,9 +91,15 @@ + + + + + + @@ -80,9 +110,15 @@ AutoConfig + + AutoConfig + AutoConfig + + AutoConfig + AutoConfig @@ -107,12 +143,24 @@ + + + + + + + + + + + + diff --git a/print/autoconfig/AutoConfig.vcxproj.Filters b/print/autoconfig/AutoConfig.vcxproj.Filters index 189b108d..de588577 100644 --- a/print/autoconfig/AutoConfig.vcxproj.Filters +++ b/print/autoconfig/AutoConfig.vcxproj.Filters @@ -18,4 +18,16 @@ {4E1D1476-C128-41DB-8AC6-44D5C6CD9B08} + + + Driver Files + + + + + + + + + \ No newline at end of file diff --git a/print/autoconfig/Package/package.VcxProj b/print/autoconfig/Package/package.VcxProj index 536ee697..21f048f5 100644 --- a/print/autoconfig/Package/package.VcxProj +++ b/print/autoconfig/Package/package.VcxProj @@ -1,10 +1,18 @@  + + Debug + ARM64 + Debug Win32 + + Release + ARM64 + Release Win32 @@ -48,10 +56,18 @@ Windows10 true + + Windows10 + true + Windows10 false + + Windows10 + false + diff --git a/print/autoconfig/README.md b/print/autoconfig/README.md index e4642008..d215c36f 100644 --- a/print/autoconfig/README.md +++ b/print/autoconfig/README.md @@ -1,4 +1,4 @@ -Print auto-configuration sample +Print auto-configuration sample test =============================== This sample demonstrates how to implement auto-configuration in v4 print drivers. diff --git a/print/cpsuisam/cpsuisam.sln b/print/cpsuisam/cpsuisam.sln index 5f01ba5a..252f1c33 100644 --- a/print/cpsuisam/cpsuisam.sln +++ b/print/cpsuisam/cpsuisam.sln @@ -1,24 +1,30 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0 +# Visual Studio 15 +VisualStudioVersion = 15.0.26430.16 MinimumVisualStudioVersion = 12.0 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpsuisam", "cpsuisam.vcxproj", "{96055373-96CC-491C-916C-0BC49C225094}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|ARM64 = Debug|ARM64 Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 Debug|x64 = Debug|x64 + Release|ARM64 = Release|ARM64 + Release|Win32 = Release|Win32 Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {96055373-96CC-491C-916C-0BC49C225094}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {96055373-96CC-491C-916C-0BC49C225094}.Debug|ARM64.Build.0 = Debug|ARM64 {96055373-96CC-491C-916C-0BC49C225094}.Debug|Win32.ActiveCfg = Debug|Win32 {96055373-96CC-491C-916C-0BC49C225094}.Debug|Win32.Build.0 = Debug|Win32 - {96055373-96CC-491C-916C-0BC49C225094}.Release|Win32.ActiveCfg = Release|Win32 - {96055373-96CC-491C-916C-0BC49C225094}.Release|Win32.Build.0 = Release|Win32 {96055373-96CC-491C-916C-0BC49C225094}.Debug|x64.ActiveCfg = Debug|x64 {96055373-96CC-491C-916C-0BC49C225094}.Debug|x64.Build.0 = Debug|x64 + {96055373-96CC-491C-916C-0BC49C225094}.Release|ARM64.ActiveCfg = Release|ARM64 + {96055373-96CC-491C-916C-0BC49C225094}.Release|ARM64.Build.0 = Release|ARM64 + {96055373-96CC-491C-916C-0BC49C225094}.Release|Win32.ActiveCfg = Release|Win32 + {96055373-96CC-491C-916C-0BC49C225094}.Release|Win32.Build.0 = Release|Win32 {96055373-96CC-491C-916C-0BC49C225094}.Release|x64.ActiveCfg = Release|x64 {96055373-96CC-491C-916C-0BC49C225094}.Release|x64.Build.0 = Release|x64 EndGlobalSection diff --git a/print/cpsuisam/cpsuisam.vcxproj b/print/cpsuisam/cpsuisam.vcxproj index dc7d31fc..8315bee6 100644 --- a/print/cpsuisam/cpsuisam.vcxproj +++ b/print/cpsuisam/cpsuisam.vcxproj @@ -1,10 +1,18 @@  + + Debug + ARM64 + Debug Win32 + + Release + ARM64 + Release Win32 @@ -34,6 +42,14 @@ WindowsApplicationForDrivers10.0 Application + + Windows10 + False + Desktop + + WindowsApplicationForDrivers10.0 + Application + Windows10 True @@ -42,6 +58,14 @@ WindowsApplicationForDrivers10.0 Application + + Windows10 + True + Desktop + + WindowsApplicationForDrivers10.0 + Application + Windows10 False @@ -65,9 +89,15 @@ + + + + + + @@ -78,9 +108,15 @@ cpsuisam + + cpsuisam + cpsuisam + + cpsuisam + cpsuisam @@ -101,6 +137,20 @@ %(AdditionalIncludeDirectories);. + + + %(AdditionalDependencies);comdlg32.lib;winspool.lib;comctl32.lib;shlwapi.lib;compstui.lib + + + %(AdditionalIncludeDirectories);. + + + %(AdditionalIncludeDirectories);. + + + %(AdditionalIncludeDirectories);. + + %(AdditionalDependencies);comdlg32.lib;winspool.lib;comctl32.lib;shlwapi.lib;compstui.lib @@ -115,6 +165,20 @@ %(AdditionalIncludeDirectories);. + + + %(AdditionalDependencies);comdlg32.lib;winspool.lib;comctl32.lib;shlwapi.lib;compstui.lib + + + %(AdditionalIncludeDirectories);. + + + %(AdditionalIncludeDirectories);. + + + %(AdditionalIncludeDirectories);. + + %(AdditionalDependencies);comdlg32.lib;winspool.lib;comctl32.lib;shlwapi.lib;compstui.lib @@ -154,6 +218,17 @@ %(PreprocessorDefinitions);WIN32;STRICT;UNICODE;_UNICODE;cpsuisam + + + %(PreprocessorDefinitions);WIN32;STRICT;UNICODE;_UNICODE;cpsuisam + + + %(PreprocessorDefinitions);WIN32;STRICT;UNICODE;_UNICODE;cpsuisam + + + %(PreprocessorDefinitions);WIN32;STRICT;UNICODE;_UNICODE;cpsuisam + + %(PreprocessorDefinitions);WIN32;STRICT;UNICODE;_UNICODE;cpsuisam @@ -165,6 +240,17 @@ %(PreprocessorDefinitions);WIN32;STRICT;UNICODE;_UNICODE;cpsuisam + + + %(PreprocessorDefinitions);WIN32;STRICT;UNICODE;_UNICODE;cpsuisam + + + %(PreprocessorDefinitions);WIN32;STRICT;UNICODE;_UNICODE;cpsuisam + + + %(PreprocessorDefinitions);WIN32;STRICT;UNICODE;_UNICODE;cpsuisam + + %(PreprocessorDefinitions);WIN32;STRICT;UNICODE;_UNICODE;cpsuisam @@ -193,12 +279,24 @@ + + + + + + + + + + + + diff --git a/print/cpsuisam/cpsuisam.vcxproj.Filters b/print/cpsuisam/cpsuisam.vcxproj.Filters index 3921f2cf..d51cba0d 100644 --- a/print/cpsuisam/cpsuisam.vcxproj.Filters +++ b/print/cpsuisam/cpsuisam.vcxproj.Filters @@ -33,4 +33,38 @@ Resource Files + + + Header Files + + + + + + Header Files + + + + + + Header Files + + + + + + Header Files + + + + + + + + Resource Files + + + Source Files + + \ No newline at end of file diff --git a/print/v4PrintDriverSamples/PrinterExtensionSample/ExtensionSample/PrinterExtensionSample.csproj b/print/v4PrintDriverSamples/PrinterExtensionSample/ExtensionSample/PrinterExtensionSample.csproj index bbb7f044..293ca0e4 100644 --- a/print/v4PrintDriverSamples/PrinterExtensionSample/ExtensionSample/PrinterExtensionSample.csproj +++ b/print/v4PrintDriverSamples/PrinterExtensionSample/ExtensionSample/PrinterExtensionSample.csproj @@ -118,6 +118,72 @@ 4 false + + bin\Win10 Debug\ + DEBUG;TRACE + x86 + true + full + false + prompt + 4 + false + + + bin\Win10 Release\ + TRACE + x86 + true + pdbonly + true + prompt + 4 + false + + + bin\x64\Win10 Debug\ + DEBUG;TRACE + x64 + true + full + false + prompt + 4 + false + + + bin\x64\Win10 Release\ + TRACE + x64 + true + pdbonly + true + prompt + 4 + false + + + bin\ARM64\Win10 Debug\ + DEBUG;TRACE + ARM64 + true + full + false + prompt + 4 + false + + + bin\ARM64\Win10 Release\ + TRACE + ARM64 + true + pdbonly + true + prompt + 4 + false + diff --git a/print/v4PrintDriverSamples/PrinterExtensionSample/PrinterExtensionLibrary/PrinterExtensionLibrary.csproj b/print/v4PrintDriverSamples/PrinterExtensionSample/PrinterExtensionLibrary/PrinterExtensionLibrary.csproj index 8ecb8721..3c24e74b 100644 --- a/print/v4PrintDriverSamples/PrinterExtensionSample/PrinterExtensionLibrary/PrinterExtensionLibrary.csproj +++ b/print/v4PrintDriverSamples/PrinterExtensionSample/PrinterExtensionLibrary/PrinterExtensionLibrary.csproj @@ -50,6 +50,24 @@ prompt 4 + + true + full + false + bin\Win10 Debug\ + DEBUG;TRACE;WINDOWS_81_APIS + prompt + 4 + + + true + pdbonly + true + bin\Win10 Release\ + TRACE;WINDOWS_81_APIS + prompt + 4 + diff --git a/print/v4PrintDriverSamples/PrinterExtensionSample/PrinterExtensionSample.sln b/print/v4PrintDriverSamples/PrinterExtensionSample/PrinterExtensionSample.sln index 29f0dec4..ac95581f 100644 --- a/print/v4PrintDriverSamples/PrinterExtensionSample/PrinterExtensionSample.sln +++ b/print/v4PrintDriverSamples/PrinterExtensionSample/PrinterExtensionSample.sln @@ -21,10 +21,18 @@ Global Win8.1 Debug|x64 = Win8.1 Debug|x64 Win8.1 Release|x86 = Win8.1 Release|x86 Win8.1 Release|x64 = Win8.1 Release|x64 + Win10 Debug|x86 = Win10 Debug|x86 + Win10 Debug|x64 = Win10 Debug|x64 + Win10 Debug|ARM64 = Win10 Debug|ARM64 + Win10 Release|x86 = Win10 Release|x86 + Win10 Release|x64 = Win10 Release|x64 + Win10 Release|ARM64 = Win10 Release|ARM64 Win8 Debug|Any CPU = Win8 Debug|Any CPU Win8 Release|Any CPU = Win8 Release|Any CPU Win8.1 Debug|Any CPU = Win8.1 Debug|Any CPU Win8.1 Release|Any CPU = Win8.1 Release|Any CPU + Win10 Debug|Any CPU = Win10 Debug|Any CPU + Win10 Release|Any CPU = Win10 Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {CF554A99-6889-4B86-934F-B6AADBFEFC01}.Win8 Debug|x86.ActiveCfg = Win8 Debug|x86 @@ -43,6 +51,18 @@ Global {CF554A99-6889-4B86-934F-B6AADBFEFC01}.Win8.1 Release|x86.Build.0 = Win8.1 Release|x86 {CF554A99-6889-4B86-934F-B6AADBFEFC01}.Win8.1 Release|x64.ActiveCfg = Win8.1 Release|x64 {CF554A99-6889-4B86-934F-B6AADBFEFC01}.Win8.1 Release|x64.Build.0 = Win8.1 Release|x64 + {CF554A99-6889-4B86-934F-B6AADBFEFC01}.Win10 Debug|x86.ActiveCfg = Win10 Debug|x86 + {CF554A99-6889-4B86-934F-B6AADBFEFC01}.Win10 Debug|x86.Build.0 = Win10 Debug|x86 + {CF554A99-6889-4B86-934F-B6AADBFEFC01}.Win10 Debug|x64.ActiveCfg = Win10 Debug|x64 + {CF554A99-6889-4B86-934F-B6AADBFEFC01}.Win10 Debug|x64.Build.0 = Win10 Debug|x64 + {CF554A99-6889-4B86-934F-B6AADBFEFC01}.Win10 Debug|ARM64.ActiveCfg = Win10 Debug|ARM64 + {CF554A99-6889-4B86-934F-B6AADBFEFC01}.Win10 Debug|ARM64.Build.0 = Win10 Debug|ARM64 + {CF554A99-6889-4B86-934F-B6AADBFEFC01}.Win10 Release|x86.ActiveCfg = Win10 Release|x86 + {CF554A99-6889-4B86-934F-B6AADBFEFC01}.Win10 Release|x86.Build.0 = Win10 Release|x86 + {CF554A99-6889-4B86-934F-B6AADBFEFC01}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 + {CF554A99-6889-4B86-934F-B6AADBFEFC01}.Win10 Release|x64.Build.0 = Win10 Release|x64 + {CF554A99-6889-4B86-934F-B6AADBFEFC01}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 + {CF554A99-6889-4B86-934F-B6AADBFEFC01}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {CF554A99-6889-4B86-934F-B6AADBFEFC01}.Win8 Debug|Any CPU.ActiveCfg = Win8 Debug|x86 {CF554A99-6889-4B86-934F-B6AADBFEFC01}.Win8 Debug|Any CPU.Build.0 = Win8 Debug|x86 {CF554A99-6889-4B86-934F-B6AADBFEFC01}.Win8 Release|Any CPU.ActiveCfg = Win8 Release|x86 @@ -51,6 +71,10 @@ Global {CF554A99-6889-4B86-934F-B6AADBFEFC01}.Win8.1 Debug|Any CPU.Build.0 = Win8.1 Debug|x86 {CF554A99-6889-4B86-934F-B6AADBFEFC01}.Win8.1 Release|Any CPU.ActiveCfg = Win8.1 Release|x86 {CF554A99-6889-4B86-934F-B6AADBFEFC01}.Win8.1 Release|Any CPU.Build.0 = Win8.1 Release|x86 + {CF554A99-6889-4B86-934F-B6AADBFEFC01}.Win10 Debug|Any CPU.ActiveCfg = Win10 Debug|x86 + {CF554A99-6889-4B86-934F-B6AADBFEFC01}.Win10 Debug|Any CPU.Build.0 = Win10 Debug|x86 + {CF554A99-6889-4B86-934F-B6AADBFEFC01}.Win10 Release|Any CPU.ActiveCfg = Win10 Release|x86 + {CF554A99-6889-4B86-934F-B6AADBFEFC01}.Win10 Release|Any CPU.Build.0 = Win10 Release|x86 {D8DA0C4D-F972-4546-9068-8EB256F222F7}.Win8 Debug|x86.ActiveCfg = Win8 Debug|Any CPU {D8DA0C4D-F972-4546-9068-8EB256F222F7}.Win8 Debug|x86.Build.0 = Win8 Debug|Any CPU {D8DA0C4D-F972-4546-9068-8EB256F222F7}.Win8 Debug|x64.ActiveCfg = Win8 Debug|Any CPU @@ -67,6 +91,18 @@ Global {D8DA0C4D-F972-4546-9068-8EB256F222F7}.Win8.1 Release|x86.Build.0 = Win8.1 Release|Any CPU {D8DA0C4D-F972-4546-9068-8EB256F222F7}.Win8.1 Release|x64.ActiveCfg = Win8.1 Release|Any CPU {D8DA0C4D-F972-4546-9068-8EB256F222F7}.Win8.1 Release|x64.Build.0 = Win8.1 Release|Any CPU + {D8DA0C4D-F972-4546-9068-8EB256F222F7}.Win10 Debug|x86.ActiveCfg = Win10 Debug|Any CPU + {D8DA0C4D-F972-4546-9068-8EB256F222F7}.Win10 Debug|x86.Build.0 = Win10 Debug|Any CPU + {D8DA0C4D-F972-4546-9068-8EB256F222F7}.Win10 Debug|x64.ActiveCfg = Win10 Debug|Any CPU + {D8DA0C4D-F972-4546-9068-8EB256F222F7}.Win10 Debug|x64.Build.0 = Win10 Debug|Any CPU + {D8DA0C4D-F972-4546-9068-8EB256F222F7}.Win10 Debug|ARM64.ActiveCfg = Win10 Debug|Any CPU + {D8DA0C4D-F972-4546-9068-8EB256F222F7}.Win10 Debug|ARM64.Build.0 = Win10 Debug|Any CPU + {D8DA0C4D-F972-4546-9068-8EB256F222F7}.Win10 Release|x86.ActiveCfg = Win10 Release|Any CPU + {D8DA0C4D-F972-4546-9068-8EB256F222F7}.Win10 Release|x86.Build.0 = Win10 Release|Any CPU + {D8DA0C4D-F972-4546-9068-8EB256F222F7}.Win10 Release|x64.ActiveCfg = Win10 Release|Any CPU + {D8DA0C4D-F972-4546-9068-8EB256F222F7}.Win10 Release|x64.Build.0 = Win10 Release|Any CPU + {D8DA0C4D-F972-4546-9068-8EB256F222F7}.Win10 Release|ARM64.ActiveCfg = Win10 Release|Any CPU + {D8DA0C4D-F972-4546-9068-8EB256F222F7}.Win10 Release|ARM64.Build.0 = Win10 Release|Any CPU {D8DA0C4D-F972-4546-9068-8EB256F222F7}.Win8 Debug|Any CPU.ActiveCfg = Win8 Debug|Any CPU {D8DA0C4D-F972-4546-9068-8EB256F222F7}.Win8 Debug|Any CPU.Build.0 = Win8 Debug|Any CPU {D8DA0C4D-F972-4546-9068-8EB256F222F7}.Win8 Release|Any CPU.ActiveCfg = Win8 Release|Any CPU @@ -75,6 +111,10 @@ Global {D8DA0C4D-F972-4546-9068-8EB256F222F7}.Win8.1 Debug|Any CPU.Build.0 = Win8.1 Debug|Any CPU {D8DA0C4D-F972-4546-9068-8EB256F222F7}.Win8.1 Release|Any CPU.ActiveCfg = Win8.1 Release|Any CPU {D8DA0C4D-F972-4546-9068-8EB256F222F7}.Win8.1 Release|Any CPU.Build.0 = Win8.1 Release|Any CPU + {D8DA0C4D-F972-4546-9068-8EB256F222F7}.Win10 Debug|Any CPU.ActiveCfg = Win10 Debug|Any CPU + {D8DA0C4D-F972-4546-9068-8EB256F222F7}.Win10 Debug|Any CPU.Build.0 = Win10 Debug|Any CPU + {D8DA0C4D-F972-4546-9068-8EB256F222F7}.Win10 Release|Any CPU.ActiveCfg = Win10 Release|Any CPU + {D8DA0C4D-F972-4546-9068-8EB256F222F7}.Win10 Release|Any CPU.Build.0 = Win10 Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/print/v4PrintDriverSamples/v4PrintDriver-ConstraintScript/ConstraintScript.sln b/print/v4PrintDriverSamples/v4PrintDriver-ConstraintScript/ConstraintScript.sln index 64832ae7..67e9e904 100644 --- a/print/v4PrintDriverSamples/v4PrintDriver-ConstraintScript/ConstraintScript.sln +++ b/print/v4PrintDriverSamples/v4PrintDriver-ConstraintScript/ConstraintScript.sln @@ -11,6 +11,8 @@ Global Release|Win32 = Release|Win32 Debug|x64 = Debug|x64 Release|x64 = Release|x64 + Debug|ARM64 = Debug|ARM64 + Release|ARM64 = Release|ARM64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {6701474B-F8FF-4260-BFA6-3CA57816EF12}.Debug|Win32.ActiveCfg = Debug|Win32 @@ -21,6 +23,10 @@ Global {6701474B-F8FF-4260-BFA6-3CA57816EF12}.Debug|x64.Build.0 = Debug|x64 {6701474B-F8FF-4260-BFA6-3CA57816EF12}.Release|x64.ActiveCfg = Release|x64 {6701474B-F8FF-4260-BFA6-3CA57816EF12}.Release|x64.Build.0 = Release|x64 + {6701474B-F8FF-4260-BFA6-3CA57816EF12}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {6701474B-F8FF-4260-BFA6-3CA57816EF12}.Debug|ARM64.Build.0 = Debug|ARM64 + {6701474B-F8FF-4260-BFA6-3CA57816EF12}.Release|ARM64.ActiveCfg = Release|ARM64 + {6701474B-F8FF-4260-BFA6-3CA57816EF12}.Release|ARM64.Build.0 = Release|ARM64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/print/v4PrintDriverSamples/v4PrintDriver-ConstraintScript/ConstraintScript.vcxproj b/print/v4PrintDriverSamples/v4PrintDriver-ConstraintScript/ConstraintScript.vcxproj index 68fdd15a..a6e21240 100644 --- a/print/v4PrintDriverSamples/v4PrintDriver-ConstraintScript/ConstraintScript.vcxproj +++ b/print/v4PrintDriverSamples/v4PrintDriver-ConstraintScript/ConstraintScript.vcxproj @@ -17,6 +17,14 @@ Release x64 + + Debug + ARM64 + + + Release + ARM64 + {6701474B-F8FF-4260-BFA6-3CA57816EF12} @@ -59,6 +67,22 @@ WindowsKernelModeDriver10.0 Utility + + Windows10 + False + Desktop + None + WindowsKernelModeDriver10.0 + Utility + + + Windows10 + True + Desktop + None + WindowsKernelModeDriver10.0 + Utility + $(IntDir) @@ -75,6 +99,12 @@ + + + + + + ConstraintScript @@ -88,6 +118,12 @@ ConstraintScript + + ConstraintScript + + + ConstraintScript + @@ -115,6 +151,18 @@ + + + + + + + + + + + + diff --git a/print/v4PrintDriverSamples/v4PrintDriver-HostBasedSampleDriver/HostBasedSampleDriver.sln b/print/v4PrintDriverSamples/v4PrintDriver-HostBasedSampleDriver/HostBasedSampleDriver.sln index 5c04f0c9..da7ca087 100644 --- a/print/v4PrintDriverSamples/v4PrintDriver-HostBasedSampleDriver/HostBasedSampleDriver.sln +++ b/print/v4PrintDriverSamples/v4PrintDriver-HostBasedSampleDriver/HostBasedSampleDriver.sln @@ -15,6 +15,8 @@ Global Release|Win32 = Release|Win32 Debug|x64 = Debug|x64 Release|x64 = Release|x64 + Debug|ARM64 = Debug|ARM64 + Release|ARM64 = Release|ARM64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {B756657D-AC58-4D5A-A446-1582707D012E}.Debug|Win32.ActiveCfg = Debug|Win32 @@ -25,6 +27,10 @@ Global {B756657D-AC58-4D5A-A446-1582707D012E}.Debug|x64.Build.0 = Debug|x64 {B756657D-AC58-4D5A-A446-1582707D012E}.Release|x64.ActiveCfg = Release|x64 {B756657D-AC58-4D5A-A446-1582707D012E}.Release|x64.Build.0 = Release|x64 + {B756657D-AC58-4D5A-A446-1582707D012E}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {B756657D-AC58-4D5A-A446-1582707D012E}.Debug|ARM64.Build.0 = Debug|ARM64 + {B756657D-AC58-4D5A-A446-1582707D012E}.Release|ARM64.ActiveCfg = Release|ARM64 + {B756657D-AC58-4D5A-A446-1582707D012E}.Release|ARM64.Build.0 = Release|ARM64 {9D446972-7555-4D86-9665-CB304793A0C7}.Debug|Win32.ActiveCfg = Debug|Win32 {9D446972-7555-4D86-9665-CB304793A0C7}.Debug|Win32.Build.0 = Debug|Win32 {9D446972-7555-4D86-9665-CB304793A0C7}.Release|Win32.ActiveCfg = Release|Win32 @@ -33,6 +39,10 @@ Global {9D446972-7555-4D86-9665-CB304793A0C7}.Debug|x64.Build.0 = Debug|x64 {9D446972-7555-4D86-9665-CB304793A0C7}.Release|x64.ActiveCfg = Release|x64 {9D446972-7555-4D86-9665-CB304793A0C7}.Release|x64.Build.0 = Release|x64 + {9D446972-7555-4D86-9665-CB304793A0C7}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {9D446972-7555-4D86-9665-CB304793A0C7}.Debug|ARM64.Build.0 = Debug|ARM64 + {9D446972-7555-4D86-9665-CB304793A0C7}.Release|ARM64.ActiveCfg = Release|ARM64 + {9D446972-7555-4D86-9665-CB304793A0C7}.Release|ARM64.Build.0 = Release|ARM64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/print/v4PrintDriverSamples/v4PrintDriver-HostBasedSampleDriver/HostBasedSampleDriver.vcxproj b/print/v4PrintDriverSamples/v4PrintDriver-HostBasedSampleDriver/HostBasedSampleDriver.vcxproj index 7e7d744c..9242769a 100644 --- a/print/v4PrintDriverSamples/v4PrintDriver-HostBasedSampleDriver/HostBasedSampleDriver.vcxproj +++ b/print/v4PrintDriverSamples/v4PrintDriver-HostBasedSampleDriver/HostBasedSampleDriver.vcxproj @@ -17,6 +17,14 @@ Release x64 + + Debug + ARM64 + + + Release + ARM64 + {9D446972-7555-4D86-9665-CB304793A0C7} @@ -60,6 +68,22 @@ WindowsKernelModeDriver10.0 Utility + + Windows10 + False + Desktop + None + WindowsKernelModeDriver10.0 + Utility + + + Windows10 + True + Desktop + None + WindowsKernelModeDriver10.0 + Utility + $(IntDir) @@ -76,6 +100,12 @@ + + + + + + HostBasedSampleDriver @@ -89,6 +119,12 @@ HostBasedSampleDriver + + HostBasedSampleDriver + + + HostBasedSampleDriver + @@ -96,12 +132,6 @@ - - - - - - @@ -127,6 +157,18 @@ + + + + + + + + + + + + diff --git a/print/v4PrintDriverSamples/v4PrintDriver-HostBasedSampleDriver/Package/package.VcxProj b/print/v4PrintDriverSamples/v4PrintDriver-HostBasedSampleDriver/Package/package.VcxProj index 700c98ca..d68c6610 100644 --- a/print/v4PrintDriverSamples/v4PrintDriver-HostBasedSampleDriver/Package/package.VcxProj +++ b/print/v4PrintDriverSamples/v4PrintDriver-HostBasedSampleDriver/Package/package.VcxProj @@ -17,6 +17,14 @@ Release x64 + + Debug + ARM64 + + + Release + ARM64 + @@ -52,6 +60,14 @@ Windows10 false + + Windows10 + true + + + Windows10 + false + diff --git a/print/v4PrintDriverSamples/v4PrintDriver-USBMon-Bidi-Extension/USBMon-Bidi-Extension.sln b/print/v4PrintDriverSamples/v4PrintDriver-USBMon-Bidi-Extension/USBMon-Bidi-Extension.sln index dc681627..04c53721 100644 --- a/print/v4PrintDriverSamples/v4PrintDriver-USBMon-Bidi-Extension/USBMon-Bidi-Extension.sln +++ b/print/v4PrintDriverSamples/v4PrintDriver-USBMon-Bidi-Extension/USBMon-Bidi-Extension.sln @@ -11,6 +11,8 @@ Global Release|Win32 = Release|Win32 Debug|x64 = Debug|x64 Release|x64 = Release|x64 + Debug|ARM64 = Debug|ARM64 + Release|ARM64 = Release|ARM64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {A43939C2-3210-449C-B415-CD3C91108C58}.Debug|Win32.ActiveCfg = Debug|Win32 @@ -21,6 +23,10 @@ Global {A43939C2-3210-449C-B415-CD3C91108C58}.Debug|x64.Build.0 = Debug|x64 {A43939C2-3210-449C-B415-CD3C91108C58}.Release|x64.ActiveCfg = Release|x64 {A43939C2-3210-449C-B415-CD3C91108C58}.Release|x64.Build.0 = Release|x64 + {A43939C2-3210-449C-B415-CD3C91108C58}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {A43939C2-3210-449C-B415-CD3C91108C58}.Debug|ARM64.Build.0 = Debug|ARM64 + {A43939C2-3210-449C-B415-CD3C91108C58}.Release|ARM64.ActiveCfg = Release|ARM64 + {A43939C2-3210-449C-B415-CD3C91108C58}.Release|ARM64.Build.0 = Release|ARM64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/print/v4PrintDriverSamples/v4PrintDriver-USBMon-Bidi-Extension/USBMon-Bidi-Extension.vcxproj b/print/v4PrintDriverSamples/v4PrintDriver-USBMon-Bidi-Extension/USBMon-Bidi-Extension.vcxproj index cf955d03..0a5d5d4c 100644 --- a/print/v4PrintDriverSamples/v4PrintDriver-USBMon-Bidi-Extension/USBMon-Bidi-Extension.vcxproj +++ b/print/v4PrintDriverSamples/v4PrintDriver-USBMon-Bidi-Extension/USBMon-Bidi-Extension.vcxproj @@ -17,6 +17,14 @@ Release x64 + + Debug + ARM64 + + + Release + ARM64 + {A43939C2-3210-449C-B415-CD3C91108C58} @@ -59,6 +67,22 @@ WindowsKernelModeDriver10.0 Utility + + Windows10 + False + Desktop + None + WindowsKernelModeDriver10.0 + Utility + + + Windows10 + True + Desktop + None + WindowsKernelModeDriver10.0 + Utility + $(IntDir) @@ -75,6 +99,12 @@ + + + + + + USBMon-Bidi-Extension @@ -88,6 +118,12 @@ USBMon-Bidi-Extension + + USBMon-Bidi-Extension + + + USBMon-Bidi-Extension + @@ -116,6 +152,18 @@ + + + + + + + + + + + + diff --git a/print/v4PrintDriverSamples/v4PrintDriver-WSDMon-Bidi-Extension/WSDMon-Bidi-Extension.sln b/print/v4PrintDriverSamples/v4PrintDriver-WSDMon-Bidi-Extension/WSDMon-Bidi-Extension.sln index 31560b5a..2e8d1d08 100644 --- a/print/v4PrintDriverSamples/v4PrintDriver-WSDMon-Bidi-Extension/WSDMon-Bidi-Extension.sln +++ b/print/v4PrintDriverSamples/v4PrintDriver-WSDMon-Bidi-Extension/WSDMon-Bidi-Extension.sln @@ -11,6 +11,8 @@ Global Release|Win32 = Release|Win32 Debug|x64 = Debug|x64 Release|x64 = Release|x64 + Debug|ARM64 = Debug|ARM64 + Release|ARM64 = Release|ARM64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {F7531C4D-8172-499C-A273-601A99F93A4D}.Debug|Win32.ActiveCfg = Debug|Win32 @@ -21,6 +23,10 @@ Global {F7531C4D-8172-499C-A273-601A99F93A4D}.Debug|x64.Build.0 = Debug|x64 {F7531C4D-8172-499C-A273-601A99F93A4D}.Release|x64.ActiveCfg = Release|x64 {F7531C4D-8172-499C-A273-601A99F93A4D}.Release|x64.Build.0 = Release|x64 + {F7531C4D-8172-499C-A273-601A99F93A4D}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {F7531C4D-8172-499C-A273-601A99F93A4D}.Debug|ARM64.Build.0 = Debug|ARM64 + {F7531C4D-8172-499C-A273-601A99F93A4D}.Release|ARM64.ActiveCfg = Release|ARM64 + {F7531C4D-8172-499C-A273-601A99F93A4D}.Release|ARM64.Build.0 = Release|ARM64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/print/v4PrintDriverSamples/v4PrintDriver-WSDMon-Bidi-Extension/WSDMon-Bidi-Extension.vcxproj b/print/v4PrintDriverSamples/v4PrintDriver-WSDMon-Bidi-Extension/WSDMon-Bidi-Extension.vcxproj index f0afdde5..6b6b54a8 100644 --- a/print/v4PrintDriverSamples/v4PrintDriver-WSDMon-Bidi-Extension/WSDMon-Bidi-Extension.vcxproj +++ b/print/v4PrintDriverSamples/v4PrintDriver-WSDMon-Bidi-Extension/WSDMon-Bidi-Extension.vcxproj @@ -17,6 +17,14 @@ Release x64 + + Debug + ARM64 + + + Release + ARM64 + {F7531C4D-8172-499C-A273-601A99F93A4D} @@ -59,6 +67,22 @@ WindowsKernelModeDriver10.0 Utility + + Windows10 + False + Desktop + None + WindowsKernelModeDriver10.0 + Utility + + + Windows10 + True + Desktop + None + WindowsKernelModeDriver10.0 + Utility + $(IntDir) @@ -75,6 +99,12 @@ + + + + + + WSDMon-Bidi-Extension @@ -88,6 +118,12 @@ WSDMon-Bidi-Extension + + WSDMon-Bidi-Extension + + + WSDMon-Bidi-Extension + @@ -115,6 +151,18 @@ + + + + + + + + + + + + -- cgit v1.3.1