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) --- wmi/wmiacpi/acpimof.vcxproj | 4 ++-- wmi/wmiacpi/acpimof.vcxproj.Filters | 6 +++--- wmi/wmiacpi/wmiacpi.sln | 18 +++++++++--------- wmi/wmisamp/WmiSamp.vcxproj | 9 ++------- wmi/wmisamp/WmiSamp.vcxproj.Filters | 11 ++++------- wmi/wmisamp/wmisamp.c | 4 ++-- wmi/wmisamp/wmisamp.inx | Bin 2929 -> 6098 bytes wmi/wmisamp/wmisamp.sln | 18 +++++++++--------- 8 files changed, 31 insertions(+), 39 deletions(-) (limited to 'wmi') diff --git a/wmi/wmiacpi/acpimof.vcxproj b/wmi/wmiacpi/acpimof.vcxproj index 93433b83..2ed19356 100644 --- a/wmi/wmiacpi/acpimof.vcxproj +++ b/wmi/wmiacpi/acpimof.vcxproj @@ -19,11 +19,11 @@ - {60A09FC3-05DB-4754-9305-678A4CFBD6C9} + {F346FBD0-9A67-4761-B670-BA329B8BC97E} $(MSBuildProjectName) Debug Win32 - {7718FA76-CE99-4A25-AE4C-5A12C000CEDB} + {240985EC-6170-4D04-9445-B44552D14F8F} diff --git a/wmi/wmiacpi/acpimof.vcxproj.Filters b/wmi/wmiacpi/acpimof.vcxproj.Filters index c4ae4712..3e479270 100644 --- a/wmi/wmiacpi/acpimof.vcxproj.Filters +++ b/wmi/wmiacpi/acpimof.vcxproj.Filters @@ -3,15 +3,15 @@ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;* - {6C19878B-4845-4749-B7E3-B811AE466FA3} + {FE34A204-FE18-4962-84E3-BF082BB4C857} h;hpp;hxx;hm;inl;inc;xsd - {FA95778D-B590-458E-B8FB-8487CA153A45} + {F517ED08-F4D7-4042-950C-B76D63C83AE4} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml - {E4C2CE5D-D18B-4989-9A3E-8C4E90E496B3} + {EB06D28C-74B3-4DC0-83C1-ECDE45BE3E45} diff --git a/wmi/wmiacpi/wmiacpi.sln b/wmi/wmiacpi/wmiacpi.sln index 3bcc16b6..e8188eaf 100644 --- a/wmi/wmiacpi/wmiacpi.sln +++ b/wmi/wmiacpi/wmiacpi.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}") = "acpimof", "acpimof.vcxproj", "{60A09FC3-05DB-4754-9305-678A4CFBD6C9}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "acpimof", "acpimof.vcxproj", "{F346FBD0-9A67-4761-B670-BA329B8BC97E}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -13,14 +13,14 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {60A09FC3-05DB-4754-9305-678A4CFBD6C9}.Debug|Win32.ActiveCfg = Debug|Win32 - {60A09FC3-05DB-4754-9305-678A4CFBD6C9}.Debug|Win32.Build.0 = Debug|Win32 - {60A09FC3-05DB-4754-9305-678A4CFBD6C9}.Release|Win32.ActiveCfg = Release|Win32 - {60A09FC3-05DB-4754-9305-678A4CFBD6C9}.Release|Win32.Build.0 = Release|Win32 - {60A09FC3-05DB-4754-9305-678A4CFBD6C9}.Debug|x64.ActiveCfg = Debug|x64 - {60A09FC3-05DB-4754-9305-678A4CFBD6C9}.Debug|x64.Build.0 = Debug|x64 - {60A09FC3-05DB-4754-9305-678A4CFBD6C9}.Release|x64.ActiveCfg = Release|x64 - {60A09FC3-05DB-4754-9305-678A4CFBD6C9}.Release|x64.Build.0 = Release|x64 + {F346FBD0-9A67-4761-B670-BA329B8BC97E}.Debug|Win32.ActiveCfg = Debug|Win32 + {F346FBD0-9A67-4761-B670-BA329B8BC97E}.Debug|Win32.Build.0 = Debug|Win32 + {F346FBD0-9A67-4761-B670-BA329B8BC97E}.Release|Win32.ActiveCfg = Release|Win32 + {F346FBD0-9A67-4761-B670-BA329B8BC97E}.Release|Win32.Build.0 = Release|Win32 + {F346FBD0-9A67-4761-B670-BA329B8BC97E}.Debug|x64.ActiveCfg = Debug|x64 + {F346FBD0-9A67-4761-B670-BA329B8BC97E}.Debug|x64.Build.0 = Debug|x64 + {F346FBD0-9A67-4761-B670-BA329B8BC97E}.Release|x64.ActiveCfg = Release|x64 + {F346FBD0-9A67-4761-B670-BA329B8BC97E}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/wmi/wmisamp/WmiSamp.vcxproj b/wmi/wmisamp/WmiSamp.vcxproj index 97c15d36..70763334 100644 --- a/wmi/wmisamp/WmiSamp.vcxproj +++ b/wmi/wmisamp/WmiSamp.vcxproj @@ -19,12 +19,12 @@ - {AB1C3428-9D78-4226-9A5D-DC92A47C279E} + {126FE1F4-434C-496A-A52B-400BBB74AC3B} $(MSBuildProjectName) 1 Debug Win32 - {BB241330-87DE-4B07-A649-644EA6B5DD53} + {224F1D35-6CD5-408C-822A-A57A2BAABE53} @@ -76,11 +76,6 @@ - - $(InfArch) - true - .\$(IntDir)\WmiSamp.inf - true .\$(IntDir)\wmisamp.bmf diff --git a/wmi/wmisamp/WmiSamp.vcxproj.Filters b/wmi/wmisamp/WmiSamp.vcxproj.Filters index 5762f68d..62740dd2 100644 --- a/wmi/wmisamp/WmiSamp.vcxproj.Filters +++ b/wmi/wmisamp/WmiSamp.vcxproj.Filters @@ -3,25 +3,22 @@ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;* - {84DF3964-E443-46B3-B677-E075E77ABFEF} + {A35FAE4A-A10D-4F57-875A-870D11320AB3} h;hpp;hxx;hm;inl;inc;xsd - {6F32A550-2374-44C0-A563-5FA52662B7D8} + {EE71E8BF-130F-40AC-9AAF-550A55E7168B} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml - {AF19E735-3412-4D30-9744-AB595DBAB93B} + {F1CEAE6E-F3C8-4CA5-A43C-133A6A38B446} inf;inv;inx;mof;mc; - {E5626644-0466-47E1-8470-73B4A040D5F2} + {EDD02E0D-300A-45CC-A637-CC38CECCA39A} - - Driver Files - Driver Files diff --git a/wmi/wmisamp/wmisamp.c b/wmi/wmisamp/wmisamp.c index 0c8bba71..5bf8bd61 100644 --- a/wmi/wmisamp/wmisamp.c +++ b/wmi/wmisamp/wmisamp.c @@ -314,7 +314,7 @@ WmiSampSetEc1( return; } - ec1 = ExAllocatePoolWithTag(NonPagedPool, ec1Length, WMI_SAMPLE_TAG); + ec1 = ExAllocatePoolWithTag(NonPagedPoolNx, ec1Length, WMI_SAMPLE_TAG); if (ec1 != NULL) { RtlCopyMemory(ec1, Buffer, Length); @@ -394,7 +394,7 @@ WmiSampSetEc2( return; } - ec2 = ExAllocatePoolWithTag(NonPagedPool, ec2Length, WMI_SAMPLE_TAG); + ec2 = ExAllocatePoolWithTag(NonPagedPoolNx, ec2Length, WMI_SAMPLE_TAG); if (ec2 != NULL) { RtlCopyMemory(ec2, Buffer, Length); diff --git a/wmi/wmisamp/wmisamp.inx b/wmi/wmisamp/wmisamp.inx index 30d83ae8..be89d405 100644 Binary files a/wmi/wmisamp/wmisamp.inx and b/wmi/wmisamp/wmisamp.inx differ diff --git a/wmi/wmisamp/wmisamp.sln b/wmi/wmisamp/wmisamp.sln index 54c94351..2724504e 100644 --- a/wmi/wmisamp/wmisamp.sln +++ b/wmi/wmisamp/wmisamp.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}") = "WmiSamp", "WmiSamp.vcxproj", "{AB1C3428-9D78-4226-9A5D-DC92A47C279E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WmiSamp", "WmiSamp.vcxproj", "{126FE1F4-434C-496A-A52B-400BBB74AC3B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -13,14 +13,14 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {AB1C3428-9D78-4226-9A5D-DC92A47C279E}.Debug|Win32.ActiveCfg = Debug|Win32 - {AB1C3428-9D78-4226-9A5D-DC92A47C279E}.Debug|Win32.Build.0 = Debug|Win32 - {AB1C3428-9D78-4226-9A5D-DC92A47C279E}.Release|Win32.ActiveCfg = Release|Win32 - {AB1C3428-9D78-4226-9A5D-DC92A47C279E}.Release|Win32.Build.0 = Release|Win32 - {AB1C3428-9D78-4226-9A5D-DC92A47C279E}.Debug|x64.ActiveCfg = Debug|x64 - {AB1C3428-9D78-4226-9A5D-DC92A47C279E}.Debug|x64.Build.0 = Debug|x64 - {AB1C3428-9D78-4226-9A5D-DC92A47C279E}.Release|x64.ActiveCfg = Release|x64 - {AB1C3428-9D78-4226-9A5D-DC92A47C279E}.Release|x64.Build.0 = Release|x64 + {126FE1F4-434C-496A-A52B-400BBB74AC3B}.Debug|Win32.ActiveCfg = Debug|Win32 + {126FE1F4-434C-496A-A52B-400BBB74AC3B}.Debug|Win32.Build.0 = Debug|Win32 + {126FE1F4-434C-496A-A52B-400BBB74AC3B}.Release|Win32.ActiveCfg = Release|Win32 + {126FE1F4-434C-496A-A52B-400BBB74AC3B}.Release|Win32.Build.0 = Release|Win32 + {126FE1F4-434C-496A-A52B-400BBB74AC3B}.Debug|x64.ActiveCfg = Debug|x64 + {126FE1F4-434C-496A-A52B-400BBB74AC3B}.Debug|x64.Build.0 = Debug|x64 + {126FE1F4-434C-496A-A52B-400BBB74AC3B}.Release|x64.ActiveCfg = Release|x64 + {126FE1F4-434C-496A-A52B-400BBB74AC3B}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE -- cgit v1.3.1