From 96eb96dfb613e4c745db6bd1f53a92fe7e2290fc Mon Sep 17 00:00:00 2001 From: karlf Date: Thu, 11 Aug 2016 13:28:13 -0700 Subject: Updated for "Windows 10 Anniversary Update" (Version 1607) --- .../MagneticStripeReader/MagneticStripeReader.sln | 24 +++-- .../SampleMagneticStripeReaderDrv.vcxproj | 100 +++++++++++++++++++-- .../SampleMagneticStripeReaderDrv.vcxproj.Filters | 8 +- pos/drivers/barcodescanner/BarcodeScanner.sln | 26 +++--- .../barcodescanner/SampleBarcodeScannerDrv.vcxproj | 4 +- .../SampleBarcodeScannerDrv.vcxproj.Filters | 8 +- pos/drivers/barcodescanner/sources | 38 -------- 7 files changed, 132 insertions(+), 76 deletions(-) delete mode 100644 pos/drivers/barcodescanner/sources (limited to 'pos') diff --git a/pos/drivers/MagneticStripeReader/MagneticStripeReader.sln b/pos/drivers/MagneticStripeReader/MagneticStripeReader.sln index f1209ca7..f2bb1bc0 100644 --- a/pos/drivers/MagneticStripeReader/MagneticStripeReader.sln +++ b/pos/drivers/MagneticStripeReader/MagneticStripeReader.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 VisualStudioVersion = 12.0 MinimumVisualStudioVersion = 12.0 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleMagneticStripeReaderDrv", "SampleMagneticStripeReaderDrv.vcxproj", "{F9DEC69D-2609-48DF-BE52-A0099482FB40}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleMagneticStripeReaderDrv", "SampleMagneticStripeReaderDrv.vcxproj", "{262DC8B4-08AF-4B12-BE35-2F020EFF69AF}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -11,16 +11,22 @@ Global Release|Win32 = Release|Win32 Debug|x64 = Debug|x64 Release|x64 = Release|x64 + Debug|Arm = Debug|Arm + Release|Arm = Release|Arm EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {F9DEC69D-2609-48DF-BE52-A0099482FB40}.Debug|Win32.ActiveCfg = Debug|Win32 - {F9DEC69D-2609-48DF-BE52-A0099482FB40}.Debug|Win32.Build.0 = Debug|Win32 - {F9DEC69D-2609-48DF-BE52-A0099482FB40}.Release|Win32.ActiveCfg = Release|Win32 - {F9DEC69D-2609-48DF-BE52-A0099482FB40}.Release|Win32.Build.0 = Release|Win32 - {F9DEC69D-2609-48DF-BE52-A0099482FB40}.Debug|x64.ActiveCfg = Debug|x64 - {F9DEC69D-2609-48DF-BE52-A0099482FB40}.Debug|x64.Build.0 = Debug|x64 - {F9DEC69D-2609-48DF-BE52-A0099482FB40}.Release|x64.ActiveCfg = Release|x64 - {F9DEC69D-2609-48DF-BE52-A0099482FB40}.Release|x64.Build.0 = Release|x64 + {262DC8B4-08AF-4B12-BE35-2F020EFF69AF}.Debug|Win32.ActiveCfg = Debug|Win32 + {262DC8B4-08AF-4B12-BE35-2F020EFF69AF}.Debug|Win32.Build.0 = Debug|Win32 + {262DC8B4-08AF-4B12-BE35-2F020EFF69AF}.Release|Win32.ActiveCfg = Release|Win32 + {262DC8B4-08AF-4B12-BE35-2F020EFF69AF}.Release|Win32.Build.0 = Release|Win32 + {262DC8B4-08AF-4B12-BE35-2F020EFF69AF}.Debug|x64.ActiveCfg = Debug|x64 + {262DC8B4-08AF-4B12-BE35-2F020EFF69AF}.Debug|x64.Build.0 = Debug|x64 + {262DC8B4-08AF-4B12-BE35-2F020EFF69AF}.Release|x64.ActiveCfg = Release|x64 + {262DC8B4-08AF-4B12-BE35-2F020EFF69AF}.Release|x64.Build.0 = Release|x64 + {262DC8B4-08AF-4B12-BE35-2F020EFF69AF}.Debug|Arm.ActiveCfg = Debug|Arm + {262DC8B4-08AF-4B12-BE35-2F020EFF69AF}.Debug|Arm.Build.0 = Debug|Arm + {262DC8B4-08AF-4B12-BE35-2F020EFF69AF}.Release|Arm.ActiveCfg = Release|Arm + {262DC8B4-08AF-4B12-BE35-2F020EFF69AF}.Release|Arm.Build.0 = Release|Arm EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/pos/drivers/MagneticStripeReader/SampleMagneticStripeReaderDrv.vcxproj b/pos/drivers/MagneticStripeReader/SampleMagneticStripeReaderDrv.vcxproj index a23fdcfb..455019ce 100644 --- a/pos/drivers/MagneticStripeReader/SampleMagneticStripeReaderDrv.vcxproj +++ b/pos/drivers/MagneticStripeReader/SampleMagneticStripeReaderDrv.vcxproj @@ -17,20 +17,44 @@ Release x64 + + Debug + Arm + + + Release + Arm + - {FA5835C3-4B1D-4B48-BE8E-2A9B5764932E} + {262DC8B4-08AF-4B12-BE35-2F020EFF69AF} $(MSBuildProjectName) 2 Debug Win32 - {F3A9F934-71E7-434E-B9F4-486EF2F9B1D5} + {25F25D8B-8F3A-4813-B004-1F38ADFBEAEE} + + Windows10 + False + Universal + UMDF + WindowsUserModeDriver10.0 + DynamicLibrary + + + Windows10 + True + Universal + UMDF + WindowsUserModeDriver10.0 + DynamicLibrary + Windows10 False - Desktop + Universal UMDF WindowsUserModeDriver10.0 DynamicLibrary @@ -38,7 +62,7 @@ Windows10 True - Desktop + Universal UMDF WindowsUserModeDriver10.0 DynamicLibrary @@ -46,7 +70,7 @@ Windows10 False - Desktop + Universal UMDF WindowsUserModeDriver10.0 DynamicLibrary @@ -54,7 +78,7 @@ Windows10 True - Desktop + Universal UMDF WindowsUserModeDriver10.0 DynamicLibrary @@ -63,6 +87,12 @@ $(IntDir) + + + + + + @@ -76,6 +106,12 @@ + + SampleMagneticStripeReaderDrv + + + SampleMagneticStripeReaderDrv + SampleMagneticStripeReaderDrv @@ -88,6 +124,18 @@ SampleMagneticStripeReaderDrv + + + _DllMainCRTStartup@12 + _DllMainCRTStartup + + + + + _DllMainCRTStartup@12 + _DllMainCRTStartup + + _DllMainCRTStartup@12 @@ -112,6 +160,34 @@ _DllMainCRTStartup + + + Sync + true + Level4 + %(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SDK_INC_PATH)\pos\1.1;..\inc + + + %(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SDK_INC_PATH)\pos\1.1;..\inc + + + %(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SDK_INC_PATH)\pos\1.1;..\inc + + + + + Sync + true + Level4 + %(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SDK_INC_PATH)\pos\1.1;..\inc + + + %(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SDK_INC_PATH)\pos\1.1;..\inc + + + %(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SDK_INC_PATH)\pos\1.1;..\inc + + Sync @@ -168,6 +244,18 @@ %(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SDK_INC_PATH)\pos\1.1;..\inc + + + %(AdditionalDependencies);$(SDK_LIB_PATH)\pos\1.1\poscxstub.lib + exports.def + + + + + %(AdditionalDependencies);$(SDK_LIB_PATH)\pos\1.1\poscxstub.lib + exports.def + + %(AdditionalDependencies);$(SDK_LIB_PATH)\pos\1.1\poscxstub.lib diff --git a/pos/drivers/MagneticStripeReader/SampleMagneticStripeReaderDrv.vcxproj.Filters b/pos/drivers/MagneticStripeReader/SampleMagneticStripeReaderDrv.vcxproj.Filters index 6721e14e..f87da971 100644 --- a/pos/drivers/MagneticStripeReader/SampleMagneticStripeReaderDrv.vcxproj.Filters +++ b/pos/drivers/MagneticStripeReader/SampleMagneticStripeReaderDrv.vcxproj.Filters @@ -3,19 +3,19 @@ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;* - {52A5F13E-45A2-4076-ABBD-A9DD641BD180} + {FDEC6084-26BF-4BD8-B792-CB599648EF82} h;hpp;hxx;hm;inl;inc;xsd - {BA08299B-8F7E-482D-9464-D2E1E3718EB8} + {5798E714-A0A5-4BD7-9915-B42D9752CFBD} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml - {BD45DA3A-8FEB-4DD6-BB19-6D73802A80B8} + {90D946C6-0521-482F-9DA9-FB8A9330965E} inf;inv;inx;mof;mc; - {664C5380-85E0-4C11-B14E-3C7A80180599} + {A354A1EC-7BF9-4032-8014-5EF1A4B9BD9A} diff --git a/pos/drivers/barcodescanner/BarcodeScanner.sln b/pos/drivers/barcodescanner/BarcodeScanner.sln index 390805d5..84324ec7 100644 --- a/pos/drivers/barcodescanner/BarcodeScanner.sln +++ b/pos/drivers/barcodescanner/BarcodeScanner.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 VisualStudioVersion = 12.0 MinimumVisualStudioVersion = 12.0 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleBarcodeScannerDrv", "SampleBarcodeScannerDrv.vcxproj", "{6551F16A-3A12-4CDA-B585-2E2F813CF25E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleBarcodeScannerDrv", "SampleBarcodeScannerDrv.vcxproj", "{AD0547CF-66EE-4B75-A711-F91FD45E0A50}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -15,18 +15,18 @@ Global Release|Arm = Release|Arm EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {6551F16A-3A12-4CDA-B585-2E2F813CF25E}.Debug|Win32.ActiveCfg = Debug|Win32 - {6551F16A-3A12-4CDA-B585-2E2F813CF25E}.Debug|Win32.Build.0 = Debug|Win32 - {6551F16A-3A12-4CDA-B585-2E2F813CF25E}.Release|Win32.ActiveCfg = Release|Win32 - {6551F16A-3A12-4CDA-B585-2E2F813CF25E}.Release|Win32.Build.0 = Release|Win32 - {6551F16A-3A12-4CDA-B585-2E2F813CF25E}.Debug|x64.ActiveCfg = Debug|x64 - {6551F16A-3A12-4CDA-B585-2E2F813CF25E}.Debug|x64.Build.0 = Debug|x64 - {6551F16A-3A12-4CDA-B585-2E2F813CF25E}.Release|x64.ActiveCfg = Release|x64 - {6551F16A-3A12-4CDA-B585-2E2F813CF25E}.Release|x64.Build.0 = Release|x64 - {6551F16A-3A12-4CDA-B585-2E2F813CF25E}.Debug|Arm.ActiveCfg = Debug|Arm - {6551F16A-3A12-4CDA-B585-2E2F813CF25E}.Debug|Arm.Build.0 = Debug|Arm - {6551F16A-3A12-4CDA-B585-2E2F813CF25E}.Release|Arm.ActiveCfg = Release|Arm - {6551F16A-3A12-4CDA-B585-2E2F813CF25E}.Release|Arm.Build.0 = Release|Arm + {AD0547CF-66EE-4B75-A711-F91FD45E0A50}.Debug|Win32.ActiveCfg = Debug|Win32 + {AD0547CF-66EE-4B75-A711-F91FD45E0A50}.Debug|Win32.Build.0 = Debug|Win32 + {AD0547CF-66EE-4B75-A711-F91FD45E0A50}.Release|Win32.ActiveCfg = Release|Win32 + {AD0547CF-66EE-4B75-A711-F91FD45E0A50}.Release|Win32.Build.0 = Release|Win32 + {AD0547CF-66EE-4B75-A711-F91FD45E0A50}.Debug|x64.ActiveCfg = Debug|x64 + {AD0547CF-66EE-4B75-A711-F91FD45E0A50}.Debug|x64.Build.0 = Debug|x64 + {AD0547CF-66EE-4B75-A711-F91FD45E0A50}.Release|x64.ActiveCfg = Release|x64 + {AD0547CF-66EE-4B75-A711-F91FD45E0A50}.Release|x64.Build.0 = Release|x64 + {AD0547CF-66EE-4B75-A711-F91FD45E0A50}.Debug|Arm.ActiveCfg = Debug|Arm + {AD0547CF-66EE-4B75-A711-F91FD45E0A50}.Debug|Arm.Build.0 = Debug|Arm + {AD0547CF-66EE-4B75-A711-F91FD45E0A50}.Release|Arm.ActiveCfg = Release|Arm + {AD0547CF-66EE-4B75-A711-F91FD45E0A50}.Release|Arm.Build.0 = Release|Arm EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/pos/drivers/barcodescanner/SampleBarcodeScannerDrv.vcxproj b/pos/drivers/barcodescanner/SampleBarcodeScannerDrv.vcxproj index 555c9289..715a7b17 100644 --- a/pos/drivers/barcodescanner/SampleBarcodeScannerDrv.vcxproj +++ b/pos/drivers/barcodescanner/SampleBarcodeScannerDrv.vcxproj @@ -27,12 +27,12 @@ - {6551F16A-3A12-4CDA-B585-2E2F813CF25E} + {AD0547CF-66EE-4B75-A711-F91FD45E0A50} $(MSBuildProjectName) 2 Debug Win32 - {ABA12C7E-CC0F-45F2-881E-9A2C7C7EFEFC} + {60CC46F4-6C75-4A65-9B6D-E3E3DBF713BF} diff --git a/pos/drivers/barcodescanner/SampleBarcodeScannerDrv.vcxproj.Filters b/pos/drivers/barcodescanner/SampleBarcodeScannerDrv.vcxproj.Filters index 9b16c2dc..d3fc9c2b 100644 --- a/pos/drivers/barcodescanner/SampleBarcodeScannerDrv.vcxproj.Filters +++ b/pos/drivers/barcodescanner/SampleBarcodeScannerDrv.vcxproj.Filters @@ -3,19 +3,19 @@ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;* - {A8857C1C-EE8A-44D9-8EB2-A78D510F4E43} + {964066F9-EA2E-4923-AF13-486BC4826D16} h;hpp;hxx;hm;inl;inc;xsd - {04004AF3-4725-41BB-932B-DB734ACB684E} + {91274E2B-F3C6-4FE4-BCFC-E84C25A9D809} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml - {9474798F-C7E3-4CC5-B3A4-D524A84DCD5F} + {325C1638-56F5-4A4B-B96B-8AF010C21DE9} inf;inv;inx;mof;mc; - {E2A7C868-3D64-4BE3-9F17-CB286F80D354} + {97049BEE-D35C-407B-9B81-BCBBEA93D17B} diff --git a/pos/drivers/barcodescanner/sources b/pos/drivers/barcodescanner/sources deleted file mode 100644 index 11c406dc..00000000 --- a/pos/drivers/barcodescanner/sources +++ /dev/null @@ -1,38 +0,0 @@ -TARGETNAME=SampleBarcodeScannerDrv -TARGETTYPE=DYNLINK - -TARGET_DESTINATION=NTTEST\drivers\pos\Samples -DLLENTRY=_DllMainCRTStartup -DLLDEF=exports.def - -DDK_TARGET_PLATFORM=Universal - -UMDF_VERSION_MAJOR=2 - -USE_MSVCRT=1 -USE_NATIVE_EH=1 - -USE_STL=1 -STL_VER=STL_VER_CURRENT - - -MSC_WARNING_LEVEL=/W4 /WX - -INCLUDES=$(INCLUDES);\ - $(DDK_INC_PATH); \ - $(SDK_INC_PATH)\pos\1.1; \ - ..\inc; \ - -PRECOMPILED_INCLUDE=pch.h -PRECOMPILED_CXX=1 - -SOURCES= \ - Driver.cpp \ - Device.cpp \ - File.cpp \ - Ioctl.cpp \ - IoRead.cpp \ - PosEvents.cpp \ - -TARGETLIBS= \ - $(SDK_LIB_PATH)\pos\1.1\poscxstub.lib -- cgit v1.3.1