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) --- bluetooth/bthecho/bthcli/app/BthEcho.vcxproj | 4 +- .../bthecho/bthcli/app/BthEcho.vcxproj.Filters | 6 +- bluetooth/bthecho/bthcli/sys/BthEchoSampleCli.inx | Bin 2911 -> 6024 bytes .../bthecho/bthcli/sys/BthEchoSampleCli.vcxproj | 9 +- .../bthcli/sys/BthEchoSampleCli.vcxproj.Filters | 13 +-- bluetooth/bthecho/bthecho.sln | 130 ++++++++++----------- bluetooth/bthecho/bthsrv/inst/bthsrvinst.vcxproj | 4 +- .../bthecho/bthsrv/inst/bthsrvinst.vcxproj.Filters | 6 +- bluetooth/bthecho/bthsrv/sys/BthEchoSampleSrv.inx | Bin 2917 -> 6038 bytes .../bthecho/bthsrv/sys/BthEchoSampleSrv.vcxproj | 9 +- .../bthsrv/sys/BthEchoSampleSrv.vcxproj.Filters | 13 +-- bluetooth/bthecho/common/lib/bthecho.vcxproj | 4 +- .../bthecho/common/lib/bthecho.vcxproj.Filters | 8 +- bluetooth/serialhcibus/Fdo.c | 2 + bluetooth/serialhcibus/WDK/SerialBusWdk.inx | Bin 2263 -> 4702 bytes bluetooth/serialhcibus/WDK/SerialBusWdk.vcxproj | 9 +- .../serialhcibus/WDK/SerialBusWdk.vcxproj.Filters | 13 +-- bluetooth/serialhcibus/serialhcibus.sln | 18 +-- 18 files changed, 110 insertions(+), 138 deletions(-) (limited to 'bluetooth') diff --git a/bluetooth/bthecho/bthcli/app/BthEcho.vcxproj b/bluetooth/bthecho/bthcli/app/BthEcho.vcxproj index 8da1d16a..382f447b 100644 --- a/bluetooth/bthecho/bthcli/app/BthEcho.vcxproj +++ b/bluetooth/bthecho/bthcli/app/BthEcho.vcxproj @@ -19,11 +19,11 @@ - {8D6A9C42-F4FA-4D7B-A038-5209844883C3} + {9A21231F-47C6-4448-9EDA-3BD5FCFD1CF3} $(MSBuildProjectName) Debug Win32 - {A9FD1AC6-CE1D-45EE-9079-FE3C370F871F} + {B86B6683-5342-447B-9F08-B5E7B956C928} diff --git a/bluetooth/bthecho/bthcli/app/BthEcho.vcxproj.Filters b/bluetooth/bthecho/bthcli/app/BthEcho.vcxproj.Filters index 5f00fc7a..a2ed035c 100644 --- a/bluetooth/bthecho/bthcli/app/BthEcho.vcxproj.Filters +++ b/bluetooth/bthecho/bthcli/app/BthEcho.vcxproj.Filters @@ -3,15 +3,15 @@ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;* - {D5028DD9-763A-43E5-A26D-8D3BEF9DEB88} + {855285DE-7DE3-4F1C-B556-350F59FF60FD} h;hpp;hxx;hm;inl;inc;xsd - {AD474526-552E-4398-818A-E95F266E7F91} + {99EFA70E-E112-4050-81F0-BC32B528A172} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml - {6B067815-190E-45D2-B008-7E8562CD0B30} + {CEE63141-0C6E-423B-A0E8-3BBA44B90513} diff --git a/bluetooth/bthecho/bthcli/sys/BthEchoSampleCli.inx b/bluetooth/bthecho/bthcli/sys/BthEchoSampleCli.inx index 4fe47e28..3c8332e9 100644 Binary files a/bluetooth/bthecho/bthcli/sys/BthEchoSampleCli.inx and b/bluetooth/bthecho/bthcli/sys/BthEchoSampleCli.inx differ diff --git a/bluetooth/bthecho/bthcli/sys/BthEchoSampleCli.vcxproj b/bluetooth/bthecho/bthcli/sys/BthEchoSampleCli.vcxproj index 2b111734..d7d2be78 100644 --- a/bluetooth/bthecho/bthcli/sys/BthEchoSampleCli.vcxproj +++ b/bluetooth/bthecho/bthcli/sys/BthEchoSampleCli.vcxproj @@ -19,12 +19,12 @@ - {D0526687-DE4D-409A-9488-F0A874D6EA3E} + {77C52F5F-5FF9-4EE2-8640-498B84C4CC67} $(MSBuildProjectName) 1 Debug Win32 - {67C06B25-EC35-414F-A8A1-03BC3787C159} + {83758879-1C4F-4804-86FB-0202AE85C175} @@ -82,11 +82,6 @@ TraceEvents(LEVEL,FLAGS,MSG,...) {km-WdfDefault.tpl}*.tmh - - $(InfArch) - true - .\$(IntDir)\BthEchoSampleCli.inf - BthEchoSampleCli diff --git a/bluetooth/bthecho/bthcli/sys/BthEchoSampleCli.vcxproj.Filters b/bluetooth/bthecho/bthcli/sys/BthEchoSampleCli.vcxproj.Filters index 49ad94cf..679ee1c2 100644 --- a/bluetooth/bthecho/bthcli/sys/BthEchoSampleCli.vcxproj.Filters +++ b/bluetooth/bthecho/bthcli/sys/BthEchoSampleCli.vcxproj.Filters @@ -3,19 +3,19 @@ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;* - {33095013-BA3C-4D73-972A-1BC536F0480F} + {D5FA676F-3E01-4EA4-8FDA-B374EBC2291E} h;hpp;hxx;hm;inl;inc;xsd - {54B5DEBA-240B-44F1-AEA4-DCA8F28C63CB} + {6F626035-843E-4274-904E-4C34739433E7} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml - {04631531-1FEF-42BD-83FA-5382EC0D29A3} + {36B129F5-47B6-4C3A-9473-D6D30B98952C} inf;inv;inx;mof;mc; - {32A5AE44-0838-409A-BAB9-2611B33E8829} + {02AABC2E-3B5F-485C-9064-94C6616B1492} @@ -32,9 +32,4 @@ Source Files - - - Driver Files - - \ No newline at end of file diff --git a/bluetooth/bthecho/bthecho.sln b/bluetooth/bthecho/bthecho.sln index cf33ad90..e3072265 100644 --- a/bluetooth/bthecho/bthecho.sln +++ b/bluetooth/bthecho/bthecho.sln @@ -3,36 +3,36 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 VisualStudioVersion = 12.0 MinimumVisualStudioVersion = 12.0 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Lib", "Lib", "{ABF4399D-D992-42E1-8EBF-68C9CFB7F2C3}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Lib", "Lib", "{69DD0AD2-1488-4D85-9935-521A3D9342E8}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{556D6471-9F94-46BB-BF1D-B4436E8577E1}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{C7856BC8-A874-4E66-89C8-F934BB0F4099}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "App", "App", "{CD3B1A5A-0BBE-4F0C-B412-2A5662ED766A}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "App", "App", "{A57512D9-3899-446F-B2C9-0980A2A4761D}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Bthcli", "Bthcli", "{A10654D9-385E-4D89-B10B-992F8B31D5DC}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Bthcli", "Bthcli", "{80493F99-CD7A-4B8B-90A5-FAF0918781B7}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sys", "Sys", "{B1A01E5B-0A99-42AD-A897-8B91E9ADAB2F}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sys", "Sys", "{9301455F-7447-4A19-8434-CBA3E2AB8821}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Inst", "Inst", "{82373034-DC87-4536-9BE6-06818943E8BA}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Inst", "Inst", "{B0DAB4D0-F627-4C45-82D8-0988B0500774}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Bthsrv", "Bthsrv", "{23D66828-26DC-48AC-A34B-6503C2345B78}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Bthsrv", "Bthsrv", "{064121EB-6816-4EF6-93BD-AE770997B860}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sys", "Sys", "{52BF960B-FC39-4AC7-9486-C3EC71456856}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sys", "Sys", "{24B1221B-4674-4751-BE63-38F1EFC2829A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bthecho", "common\lib\bthecho.vcxproj", "{279A982A-666D-434D-A53D-3FF3CEBC175D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bthecho", "common\lib\bthecho.vcxproj", "{6DCBEDF9-2E01-4FFC-B1D0-B1FF37BA8AB1}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BthEcho", "bthcli\app\BthEcho.vcxproj", "{8D6A9C42-F4FA-4D7B-A038-5209844883C3}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BthEcho", "bthcli\app\BthEcho.vcxproj", "{9A21231F-47C6-4448-9EDA-3BD5FCFD1CF3}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BthEchoSampleCli", "bthcli\sys\BthEchoSampleCli.vcxproj", "{5346197B-56DB-4486-BEE2-68D0380B7D5B}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BthEchoSampleCli", "bthcli\sys\BthEchoSampleCli.vcxproj", "{77C52F5F-5FF9-4EE2-8640-498B84C4CC67}" ProjectSection(ProjectDependencies) = postProject - {279A982A-666D-434D-A53D-3FF3CEBC175D} = {279A982A-666D-434D-A53D-3FF3CEBC175D} + {6DCBEDF9-2E01-4FFC-B1D0-B1FF37BA8AB1} = {6DCBEDF9-2E01-4FFC-B1D0-B1FF37BA8AB1} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bthsrvinst", "bthsrv\inst\bthsrvinst.vcxproj", "{AD63285D-E1DA-41F5-93F8-A076CF4A3B64}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bthsrvinst", "bthsrv\inst\bthsrvinst.vcxproj", "{45C01E94-3016-4496-8D66-5E84000096B0}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BthEchoSampleSrv", "bthsrv\sys\BthEchoSampleSrv.vcxproj", "{2A776B98-0216-4882-A0EA-1AC2251AD597}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BthEchoSampleSrv", "bthsrv\sys\BthEchoSampleSrv.vcxproj", "{70D1528B-703D-4A9C-9650-3122FA8A4CD8}" ProjectSection(ProjectDependencies) = postProject - {279A982A-666D-434D-A53D-3FF3CEBC175D} = {279A982A-666D-434D-A53D-3FF3CEBC175D} + {6DCBEDF9-2E01-4FFC-B1D0-B1FF37BA8AB1} = {6DCBEDF9-2E01-4FFC-B1D0-B1FF37BA8AB1} EndProjectSection EndProject Global @@ -43,60 +43,60 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {279A982A-666D-434D-A53D-3FF3CEBC175D}.Debug|Win32.ActiveCfg = Debug|Win32 - {279A982A-666D-434D-A53D-3FF3CEBC175D}.Debug|Win32.Build.0 = Debug|Win32 - {279A982A-666D-434D-A53D-3FF3CEBC175D}.Release|Win32.ActiveCfg = Release|Win32 - {279A982A-666D-434D-A53D-3FF3CEBC175D}.Release|Win32.Build.0 = Release|Win32 - {279A982A-666D-434D-A53D-3FF3CEBC175D}.Debug|x64.ActiveCfg = Debug|x64 - {279A982A-666D-434D-A53D-3FF3CEBC175D}.Debug|x64.Build.0 = Debug|x64 - {279A982A-666D-434D-A53D-3FF3CEBC175D}.Release|x64.ActiveCfg = Release|x64 - {279A982A-666D-434D-A53D-3FF3CEBC175D}.Release|x64.Build.0 = Release|x64 - {8D6A9C42-F4FA-4D7B-A038-5209844883C3}.Debug|Win32.ActiveCfg = Debug|Win32 - {8D6A9C42-F4FA-4D7B-A038-5209844883C3}.Debug|Win32.Build.0 = Debug|Win32 - {8D6A9C42-F4FA-4D7B-A038-5209844883C3}.Release|Win32.ActiveCfg = Release|Win32 - {8D6A9C42-F4FA-4D7B-A038-5209844883C3}.Release|Win32.Build.0 = Release|Win32 - {8D6A9C42-F4FA-4D7B-A038-5209844883C3}.Debug|x64.ActiveCfg = Debug|x64 - {8D6A9C42-F4FA-4D7B-A038-5209844883C3}.Debug|x64.Build.0 = Debug|x64 - {8D6A9C42-F4FA-4D7B-A038-5209844883C3}.Release|x64.ActiveCfg = Release|x64 - {8D6A9C42-F4FA-4D7B-A038-5209844883C3}.Release|x64.Build.0 = Release|x64 - {5346197B-56DB-4486-BEE2-68D0380B7D5B}.Debug|Win32.ActiveCfg = Debug|Win32 - {5346197B-56DB-4486-BEE2-68D0380B7D5B}.Debug|Win32.Build.0 = Debug|Win32 - {5346197B-56DB-4486-BEE2-68D0380B7D5B}.Release|Win32.ActiveCfg = Release|Win32 - {5346197B-56DB-4486-BEE2-68D0380B7D5B}.Release|Win32.Build.0 = Release|Win32 - {5346197B-56DB-4486-BEE2-68D0380B7D5B}.Debug|x64.ActiveCfg = Debug|x64 - {5346197B-56DB-4486-BEE2-68D0380B7D5B}.Debug|x64.Build.0 = Debug|x64 - {5346197B-56DB-4486-BEE2-68D0380B7D5B}.Release|x64.ActiveCfg = Release|x64 - {5346197B-56DB-4486-BEE2-68D0380B7D5B}.Release|x64.Build.0 = Release|x64 - {AD63285D-E1DA-41F5-93F8-A076CF4A3B64}.Debug|Win32.ActiveCfg = Debug|Win32 - {AD63285D-E1DA-41F5-93F8-A076CF4A3B64}.Debug|Win32.Build.0 = Debug|Win32 - {AD63285D-E1DA-41F5-93F8-A076CF4A3B64}.Release|Win32.ActiveCfg = Release|Win32 - {AD63285D-E1DA-41F5-93F8-A076CF4A3B64}.Release|Win32.Build.0 = Release|Win32 - {AD63285D-E1DA-41F5-93F8-A076CF4A3B64}.Debug|x64.ActiveCfg = Debug|x64 - {AD63285D-E1DA-41F5-93F8-A076CF4A3B64}.Debug|x64.Build.0 = Debug|x64 - {AD63285D-E1DA-41F5-93F8-A076CF4A3B64}.Release|x64.ActiveCfg = Release|x64 - {AD63285D-E1DA-41F5-93F8-A076CF4A3B64}.Release|x64.Build.0 = Release|x64 - {2A776B98-0216-4882-A0EA-1AC2251AD597}.Debug|Win32.ActiveCfg = Debug|Win32 - {2A776B98-0216-4882-A0EA-1AC2251AD597}.Debug|Win32.Build.0 = Debug|Win32 - {2A776B98-0216-4882-A0EA-1AC2251AD597}.Release|Win32.ActiveCfg = Release|Win32 - {2A776B98-0216-4882-A0EA-1AC2251AD597}.Release|Win32.Build.0 = Release|Win32 - {2A776B98-0216-4882-A0EA-1AC2251AD597}.Debug|x64.ActiveCfg = Debug|x64 - {2A776B98-0216-4882-A0EA-1AC2251AD597}.Debug|x64.Build.0 = Debug|x64 - {2A776B98-0216-4882-A0EA-1AC2251AD597}.Release|x64.ActiveCfg = Release|x64 - {2A776B98-0216-4882-A0EA-1AC2251AD597}.Release|x64.Build.0 = Release|x64 + {6DCBEDF9-2E01-4FFC-B1D0-B1FF37BA8AB1}.Debug|Win32.ActiveCfg = Debug|Win32 + {6DCBEDF9-2E01-4FFC-B1D0-B1FF37BA8AB1}.Debug|Win32.Build.0 = Debug|Win32 + {6DCBEDF9-2E01-4FFC-B1D0-B1FF37BA8AB1}.Release|Win32.ActiveCfg = Release|Win32 + {6DCBEDF9-2E01-4FFC-B1D0-B1FF37BA8AB1}.Release|Win32.Build.0 = Release|Win32 + {6DCBEDF9-2E01-4FFC-B1D0-B1FF37BA8AB1}.Debug|x64.ActiveCfg = Debug|x64 + {6DCBEDF9-2E01-4FFC-B1D0-B1FF37BA8AB1}.Debug|x64.Build.0 = Debug|x64 + {6DCBEDF9-2E01-4FFC-B1D0-B1FF37BA8AB1}.Release|x64.ActiveCfg = Release|x64 + {6DCBEDF9-2E01-4FFC-B1D0-B1FF37BA8AB1}.Release|x64.Build.0 = Release|x64 + {9A21231F-47C6-4448-9EDA-3BD5FCFD1CF3}.Debug|Win32.ActiveCfg = Debug|Win32 + {9A21231F-47C6-4448-9EDA-3BD5FCFD1CF3}.Debug|Win32.Build.0 = Debug|Win32 + {9A21231F-47C6-4448-9EDA-3BD5FCFD1CF3}.Release|Win32.ActiveCfg = Release|Win32 + {9A21231F-47C6-4448-9EDA-3BD5FCFD1CF3}.Release|Win32.Build.0 = Release|Win32 + {9A21231F-47C6-4448-9EDA-3BD5FCFD1CF3}.Debug|x64.ActiveCfg = Debug|x64 + {9A21231F-47C6-4448-9EDA-3BD5FCFD1CF3}.Debug|x64.Build.0 = Debug|x64 + {9A21231F-47C6-4448-9EDA-3BD5FCFD1CF3}.Release|x64.ActiveCfg = Release|x64 + {9A21231F-47C6-4448-9EDA-3BD5FCFD1CF3}.Release|x64.Build.0 = Release|x64 + {77C52F5F-5FF9-4EE2-8640-498B84C4CC67}.Debug|Win32.ActiveCfg = Debug|Win32 + {77C52F5F-5FF9-4EE2-8640-498B84C4CC67}.Debug|Win32.Build.0 = Debug|Win32 + {77C52F5F-5FF9-4EE2-8640-498B84C4CC67}.Release|Win32.ActiveCfg = Release|Win32 + {77C52F5F-5FF9-4EE2-8640-498B84C4CC67}.Release|Win32.Build.0 = Release|Win32 + {77C52F5F-5FF9-4EE2-8640-498B84C4CC67}.Debug|x64.ActiveCfg = Debug|x64 + {77C52F5F-5FF9-4EE2-8640-498B84C4CC67}.Debug|x64.Build.0 = Debug|x64 + {77C52F5F-5FF9-4EE2-8640-498B84C4CC67}.Release|x64.ActiveCfg = Release|x64 + {77C52F5F-5FF9-4EE2-8640-498B84C4CC67}.Release|x64.Build.0 = Release|x64 + {45C01E94-3016-4496-8D66-5E84000096B0}.Debug|Win32.ActiveCfg = Debug|Win32 + {45C01E94-3016-4496-8D66-5E84000096B0}.Debug|Win32.Build.0 = Debug|Win32 + {45C01E94-3016-4496-8D66-5E84000096B0}.Release|Win32.ActiveCfg = Release|Win32 + {45C01E94-3016-4496-8D66-5E84000096B0}.Release|Win32.Build.0 = Release|Win32 + {45C01E94-3016-4496-8D66-5E84000096B0}.Debug|x64.ActiveCfg = Debug|x64 + {45C01E94-3016-4496-8D66-5E84000096B0}.Debug|x64.Build.0 = Debug|x64 + {45C01E94-3016-4496-8D66-5E84000096B0}.Release|x64.ActiveCfg = Release|x64 + {45C01E94-3016-4496-8D66-5E84000096B0}.Release|x64.Build.0 = Release|x64 + {70D1528B-703D-4A9C-9650-3122FA8A4CD8}.Debug|Win32.ActiveCfg = Debug|Win32 + {70D1528B-703D-4A9C-9650-3122FA8A4CD8}.Debug|Win32.Build.0 = Debug|Win32 + {70D1528B-703D-4A9C-9650-3122FA8A4CD8}.Release|Win32.ActiveCfg = Release|Win32 + {70D1528B-703D-4A9C-9650-3122FA8A4CD8}.Release|Win32.Build.0 = Release|Win32 + {70D1528B-703D-4A9C-9650-3122FA8A4CD8}.Debug|x64.ActiveCfg = Debug|x64 + {70D1528B-703D-4A9C-9650-3122FA8A4CD8}.Debug|x64.Build.0 = Debug|x64 + {70D1528B-703D-4A9C-9650-3122FA8A4CD8}.Release|x64.ActiveCfg = Release|x64 + {70D1528B-703D-4A9C-9650-3122FA8A4CD8}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {279A982A-666D-434D-A53D-3FF3CEBC175D} = {ABF4399D-D992-42E1-8EBF-68C9CFB7F2C3} - {8D6A9C42-F4FA-4D7B-A038-5209844883C3} = {CD3B1A5A-0BBE-4F0C-B412-2A5662ED766A} - {5346197B-56DB-4486-BEE2-68D0380B7D5B} = {B1A01E5B-0A99-42AD-A897-8B91E9ADAB2F} - {AD63285D-E1DA-41F5-93F8-A076CF4A3B64} = {82373034-DC87-4536-9BE6-06818943E8BA} - {2A776B98-0216-4882-A0EA-1AC2251AD597} = {52BF960B-FC39-4AC7-9486-C3EC71456856} - {ABF4399D-D992-42E1-8EBF-68C9CFB7F2C3} = {556D6471-9F94-46BB-BF1D-B4436E8577E1} - {CD3B1A5A-0BBE-4F0C-B412-2A5662ED766A} = {A10654D9-385E-4D89-B10B-992F8B31D5DC} - {B1A01E5B-0A99-42AD-A897-8B91E9ADAB2F} = {A10654D9-385E-4D89-B10B-992F8B31D5DC} - {82373034-DC87-4536-9BE6-06818943E8BA} = {23D66828-26DC-48AC-A34B-6503C2345B78} - {52BF960B-FC39-4AC7-9486-C3EC71456856} = {23D66828-26DC-48AC-A34B-6503C2345B78} + {6DCBEDF9-2E01-4FFC-B1D0-B1FF37BA8AB1} = {69DD0AD2-1488-4D85-9935-521A3D9342E8} + {9A21231F-47C6-4448-9EDA-3BD5FCFD1CF3} = {A57512D9-3899-446F-B2C9-0980A2A4761D} + {77C52F5F-5FF9-4EE2-8640-498B84C4CC67} = {9301455F-7447-4A19-8434-CBA3E2AB8821} + {45C01E94-3016-4496-8D66-5E84000096B0} = {B0DAB4D0-F627-4C45-82D8-0988B0500774} + {70D1528B-703D-4A9C-9650-3122FA8A4CD8} = {24B1221B-4674-4751-BE63-38F1EFC2829A} + {69DD0AD2-1488-4D85-9935-521A3D9342E8} = {C7856BC8-A874-4E66-89C8-F934BB0F4099} + {A57512D9-3899-446F-B2C9-0980A2A4761D} = {80493F99-CD7A-4B8B-90A5-FAF0918781B7} + {9301455F-7447-4A19-8434-CBA3E2AB8821} = {80493F99-CD7A-4B8B-90A5-FAF0918781B7} + {B0DAB4D0-F627-4C45-82D8-0988B0500774} = {064121EB-6816-4EF6-93BD-AE770997B860} + {24B1221B-4674-4751-BE63-38F1EFC2829A} = {064121EB-6816-4EF6-93BD-AE770997B860} EndGlobalSection EndGlobal diff --git a/bluetooth/bthecho/bthsrv/inst/bthsrvinst.vcxproj b/bluetooth/bthecho/bthsrv/inst/bthsrvinst.vcxproj index 2f38026b..c5f3d960 100644 --- a/bluetooth/bthecho/bthsrv/inst/bthsrvinst.vcxproj +++ b/bluetooth/bthecho/bthsrv/inst/bthsrvinst.vcxproj @@ -19,11 +19,11 @@ - {4BAF5A1E-F44D-4883-8434-758C29841444} + {45C01E94-3016-4496-8D66-5E84000096B0} $(MSBuildProjectName) Debug Win32 - {E2F8D294-B9B1-4F9E-9A7B-F0A49D7C4C8F} + {49F5BC83-8094-41B8-8901-5CCF2143A45A} diff --git a/bluetooth/bthecho/bthsrv/inst/bthsrvinst.vcxproj.Filters b/bluetooth/bthecho/bthsrv/inst/bthsrvinst.vcxproj.Filters index a4d8af9a..f1a0105f 100644 --- a/bluetooth/bthecho/bthsrv/inst/bthsrvinst.vcxproj.Filters +++ b/bluetooth/bthecho/bthsrv/inst/bthsrvinst.vcxproj.Filters @@ -3,15 +3,15 @@ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;* - {54764289-21F6-4CB7-B759-F580ABFAA48F} + {BC225E71-58BF-40FD-A064-143AFDCEC5D0} h;hpp;hxx;hm;inl;inc;xsd - {2CA7739A-5BEB-4DBE-B55B-4E42BC89D6BC} + {46095F7C-F887-4721-A9B7-73A61114EC56} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml - {755A8841-90F7-4E7A-92AF-47B1BF16358B} + {D41CEEF7-D80E-4C3C-A53F-313479528DDC} diff --git a/bluetooth/bthecho/bthsrv/sys/BthEchoSampleSrv.inx b/bluetooth/bthecho/bthsrv/sys/BthEchoSampleSrv.inx index a85479d0..8518d776 100644 Binary files a/bluetooth/bthecho/bthsrv/sys/BthEchoSampleSrv.inx and b/bluetooth/bthecho/bthsrv/sys/BthEchoSampleSrv.inx differ diff --git a/bluetooth/bthecho/bthsrv/sys/BthEchoSampleSrv.vcxproj b/bluetooth/bthecho/bthsrv/sys/BthEchoSampleSrv.vcxproj index c46955f2..43afa40e 100644 --- a/bluetooth/bthecho/bthsrv/sys/BthEchoSampleSrv.vcxproj +++ b/bluetooth/bthecho/bthsrv/sys/BthEchoSampleSrv.vcxproj @@ -19,12 +19,12 @@ - {E76B7342-7D14-4C40-ADA4-40D0269CC2C4} + {70D1528B-703D-4A9C-9650-3122FA8A4CD8} $(MSBuildProjectName) 1 Debug Win32 - {8092859B-AF55-4BF1-A3F4-945B4198D753} + {2B10AA6F-8FEA-4371-A926-5652363314EA} @@ -82,11 +82,6 @@ TraceEvents(LEVEL,FLAGS,MSG,...) {km-WdfDefault.tpl}*.tmh - - $(InfArch) - true - .\$(IntDir)\BthEchoSampleSrv.inf - BthEchoSampleSrv diff --git a/bluetooth/bthecho/bthsrv/sys/BthEchoSampleSrv.vcxproj.Filters b/bluetooth/bthecho/bthsrv/sys/BthEchoSampleSrv.vcxproj.Filters index 12d1cfc1..ef56b091 100644 --- a/bluetooth/bthecho/bthsrv/sys/BthEchoSampleSrv.vcxproj.Filters +++ b/bluetooth/bthecho/bthsrv/sys/BthEchoSampleSrv.vcxproj.Filters @@ -3,19 +3,19 @@ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;* - {DB9631DF-48DF-461B-AE7F-506167663FDB} + {8F4E1315-5AE6-42C1-9805-2CEE83FC73F9} h;hpp;hxx;hm;inl;inc;xsd - {80DE4EC6-38A5-4477-89E7-7474A47F2AB9} + {B8FCA8F8-0A1A-4394-9FAA-156D7B5ACFE2} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml - {9A504811-A75F-4216-9CF0-308AA242BA42} + {82014751-C401-4476-ACFB-2D23D2424BF6} inf;inv;inx;mof;mc; - {D808070A-9612-4A62-842D-141D1C7A3100} + {DDB3C091-B021-4283-8DED-A7E68D9E1C3A} @@ -35,9 +35,4 @@ Source Files - - - Driver Files - - \ No newline at end of file diff --git a/bluetooth/bthecho/common/lib/bthecho.vcxproj b/bluetooth/bthecho/common/lib/bthecho.vcxproj index 0966aafa..63481f32 100644 --- a/bluetooth/bthecho/common/lib/bthecho.vcxproj +++ b/bluetooth/bthecho/common/lib/bthecho.vcxproj @@ -19,12 +19,12 @@ - {279A982A-666D-434D-A53D-3FF3CEBC175D} + {6DCBEDF9-2E01-4FFC-B1D0-B1FF37BA8AB1} $(MSBuildProjectName) 1 Debug Win32 - {2887F895-DC60-4F81-9E78-B126FC82D6DE} + {2251CD36-3DF0-4B2B-8674-70AD8C38B1DD} diff --git a/bluetooth/bthecho/common/lib/bthecho.vcxproj.Filters b/bluetooth/bthecho/common/lib/bthecho.vcxproj.Filters index ec089435..cef55ba6 100644 --- a/bluetooth/bthecho/common/lib/bthecho.vcxproj.Filters +++ b/bluetooth/bthecho/common/lib/bthecho.vcxproj.Filters @@ -3,19 +3,19 @@ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;* - {6217FA2C-0C23-4AB7-A668-E0C7E3CA4CF6} + {9E9EB8E2-0A7F-454D-A29C-CE50442C8FE6} h;hpp;hxx;hm;inl;inc;xsd - {620A4632-EEE2-4CB4-AC1B-3E0BB40B6E8F} + {2A633866-4A04-4843-AB2C-2F15F11ACF40} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml - {0A73451A-D21E-42CE-810D-663390E414AF} + {D817AF75-A209-41F2-8C5F-60FFAE66ECA3} inf;inv;inx;mof;mc; - {BD9AA505-1CD0-4D77-AECB-D3D8871886E6} + {791754B5-0B54-4031-9663-1A42A2DE9149} diff --git a/bluetooth/serialhcibus/Fdo.c b/bluetooth/serialhcibus/Fdo.c index 8082e4e8..89a1ba96 100644 --- a/bluetooth/serialhcibus/Fdo.c +++ b/bluetooth/serialhcibus/Fdo.c @@ -90,6 +90,8 @@ Return Value: sizeof(BT_PDO_HARDWARE_IDS)/sizeof(WCHAR), BLUETOOTH_FUNC_IDS ); + WdfObjectDelete(_WorkItem); + DoTrace(LEVEL_INFO, TFLAG_POWER, ("-DeviceEnablePDOWorker %!STATUS!", Status)); } diff --git a/bluetooth/serialhcibus/WDK/SerialBusWdk.inx b/bluetooth/serialhcibus/WDK/SerialBusWdk.inx index 5ba76403..6fa29006 100644 Binary files a/bluetooth/serialhcibus/WDK/SerialBusWdk.inx and b/bluetooth/serialhcibus/WDK/SerialBusWdk.inx differ diff --git a/bluetooth/serialhcibus/WDK/SerialBusWdk.vcxproj b/bluetooth/serialhcibus/WDK/SerialBusWdk.vcxproj index 79bbcc83..c28833ce 100644 --- a/bluetooth/serialhcibus/WDK/SerialBusWdk.vcxproj +++ b/bluetooth/serialhcibus/WDK/SerialBusWdk.vcxproj @@ -19,12 +19,12 @@ - {6844B626-ABF4-4F07-BD90-7AA8A8A87E12} + {F8EFDBF2-B339-413F-94F5-AEB55DCCBA01} $(MSBuildProjectName) 1 Debug Win32 - {F1C3593E-8279-482B-8D67-8319913E265E} + {680EFDDE-117B-443A-9A50-E8A7F919AA4F} @@ -82,11 +82,6 @@ debugdef.h DoTrace(LEVEL,FLAG,(MSG,...)) - - $(InfArch) - true - .\$(IntDir)\SerialBusWdk.inf - true true diff --git a/bluetooth/serialhcibus/WDK/SerialBusWdk.vcxproj.Filters b/bluetooth/serialhcibus/WDK/SerialBusWdk.vcxproj.Filters index 7d476dc7..0e9d5b81 100644 --- a/bluetooth/serialhcibus/WDK/SerialBusWdk.vcxproj.Filters +++ b/bluetooth/serialhcibus/WDK/SerialBusWdk.vcxproj.Filters @@ -3,19 +3,19 @@ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;* - {413E2A31-6D3D-48D5-B3C7-73714F810CAF} + {3C5C9A91-1ADD-4D55-B3D0-83F1F16C51F8} h;hpp;hxx;hm;inl;inc;xsd - {1494E901-78AF-4262-8B85-C70B93AA8465} + {410A6453-45FC-46C0-8DE2-20ABD4F36BF9} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml - {38B6E2D0-6448-48E5-B1F7-BD648B4C0112} + {973C1445-3407-4B61-804A-804293BB1332} inf;inv;inx;mof;mc; - {62F3F5F6-E755-4AFE-9C33-C1E065E5BAF1} + {8DB3B538-0E77-4029-8DB3-30F5B80CAA5F} @@ -35,11 +35,6 @@ Source Files - - - Driver Files - - Resource Files diff --git a/bluetooth/serialhcibus/serialhcibus.sln b/bluetooth/serialhcibus/serialhcibus.sln index 25bc57e7..7740f864 100644 --- a/bluetooth/serialhcibus/serialhcibus.sln +++ b/bluetooth/serialhcibus/serialhcibus.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}") = "SerialBusWdk", "WDK\SerialBusWdk.vcxproj", "{6844B626-ABF4-4F07-BD90-7AA8A8A87E12}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SerialBusWdk", "WDK\SerialBusWdk.vcxproj", "{F8EFDBF2-B339-413F-94F5-AEB55DCCBA01}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -13,14 +13,14 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {6844B626-ABF4-4F07-BD90-7AA8A8A87E12}.Debug|Win32.ActiveCfg = Debug|Win32 - {6844B626-ABF4-4F07-BD90-7AA8A8A87E12}.Debug|Win32.Build.0 = Debug|Win32 - {6844B626-ABF4-4F07-BD90-7AA8A8A87E12}.Release|Win32.ActiveCfg = Release|Win32 - {6844B626-ABF4-4F07-BD90-7AA8A8A87E12}.Release|Win32.Build.0 = Release|Win32 - {6844B626-ABF4-4F07-BD90-7AA8A8A87E12}.Debug|x64.ActiveCfg = Debug|x64 - {6844B626-ABF4-4F07-BD90-7AA8A8A87E12}.Debug|x64.Build.0 = Debug|x64 - {6844B626-ABF4-4F07-BD90-7AA8A8A87E12}.Release|x64.ActiveCfg = Release|x64 - {6844B626-ABF4-4F07-BD90-7AA8A8A87E12}.Release|x64.Build.0 = Release|x64 + {F8EFDBF2-B339-413F-94F5-AEB55DCCBA01}.Debug|Win32.ActiveCfg = Debug|Win32 + {F8EFDBF2-B339-413F-94F5-AEB55DCCBA01}.Debug|Win32.Build.0 = Debug|Win32 + {F8EFDBF2-B339-413F-94F5-AEB55DCCBA01}.Release|Win32.ActiveCfg = Release|Win32 + {F8EFDBF2-B339-413F-94F5-AEB55DCCBA01}.Release|Win32.Build.0 = Release|Win32 + {F8EFDBF2-B339-413F-94F5-AEB55DCCBA01}.Debug|x64.ActiveCfg = Debug|x64 + {F8EFDBF2-B339-413F-94F5-AEB55DCCBA01}.Debug|x64.Build.0 = Debug|x64 + {F8EFDBF2-B339-413F-94F5-AEB55DCCBA01}.Release|x64.ActiveCfg = Release|x64 + {F8EFDBF2-B339-413F-94F5-AEB55DCCBA01}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE -- cgit v1.3.1