From 69a9aa97cc1f6d81d699a202d37117774a0630b6 Mon Sep 17 00:00:00 2001 From: Andy Durant Date: Sun, 29 Jan 2017 00:13:15 +0000 Subject: [PATCH 01/24] Upgrade to VS2015 .NETv4 --- BAPS2.sln | 80 +- BAPSController/BAPSController.vcproj | 265 ------- .../BAPSController.vcproj.URY.lpw.user | 65 -- .../BAPSController.vcproj.URY.mattbw.user | 65 -- .../BAPSController.vcproj.URY.ury.user | 65 -- .../BAPSController.vcproj.WALLPC1.root.user | 65 -- .../BAPSController.vcproj.WALLPC1.ury.user | 65 -- BAPSController/BAPSController.vcxproj | 219 ++++++ BAPSController/BAPSController.vcxproj.filters | 60 ++ BAPSFormControls/BAPSFormControls.csproj | 7 +- BAPSPresenter/BAPSPresenter.vcproj | 687 ------------------ .../BAPSPresenter.vcproj.MATPC.matthew.user | 65 -- .../BAPSPresenter.vcproj.URY.lpw.user | 65 -- .../BAPSPresenter.vcproj.URY.mattbw.user | 65 -- .../BAPSPresenter.vcproj.URY.ury.user | 65 -- .../BAPSPresenter.vcproj.WALLPC1.root.user | 65 -- .../BAPSPresenter.vcproj.WALLPC1.ury.user | 65 -- BAPSPresenter/BAPSPresenter.vcxproj | 401 ++++++++++ BAPSPresenter/BAPSPresenter.vcxproj.filters | 340 +++++++++ BAPSServerAssembly/BAPSServerAssembly.vcproj | 567 --------------- ...SServerAssembly.vcproj.MATTOP.matthew.user | 65 -- .../BAPSServerAssembly.vcproj.URY.lpw.user | 65 -- .../BAPSServerAssembly.vcproj.URY.mattbw.user | 65 -- .../BAPSServerAssembly.vcproj.URY.ury.user | 65 -- ...APSServerAssembly.vcproj.WALLPC1.root.user | 65 -- ...BAPSServerAssembly.vcproj.WALLPC1.ury.user | 65 -- BAPSServerAssembly/BAPSServerAssembly.vcxproj | 292 ++++++++ .../BAPSServerAssembly.vcxproj.filters | 265 +++++++ BAPSServerAssembly/app.aps | Bin 2280 -> 0 bytes BAPSServerService/BAPSServerService.csproj | 19 +- .../BAPSServerService.csproj.user | 7 +- .../ProjectInstaller.Designer.cs | 2 + BAPSServerService/ProjectInstaller.cs | 5 + BAPSServerService/ProjectInstaller.resx | 16 +- BAPSServerService/app.config | 3 + BAPSSetup/BAPSSetup.vdproj | 455 ++++-------- BAPSlib/BAPS.h | 0 BAPSlib/BAPS.vcproj | 443 ----------- BAPSlib/BAPS.vcxproj | 500 +++++++++++++ BAPSlib/BAPS.vcxproj.filters | 68 ++ BAPSlib/BAPSAudioOutput.h | 0 BAPSlib/BAPSAudioOutputChannel.cpp | 3 +- BAPSlib/BAPSAudioOutputChannel.h | 0 BAPSlib/BAPSAudioOutputChannels.h | 0 BAPSlib/BAPSAudioOutputDevice.h | 0 BAPSlib/BAPSAudioOutputDevices.h | 0 BAPSlib/BAPSCommon.h | 0 BAPSlib/BAPSTest/BAPSTest.vcproj | 231 ------ BAPSlib/BAPSTest/BAPSTest.vcxproj | 326 +++++++++ BAPSlib/BAPSTest/BAPSTest.vcxproj.filters | 52 ++ Common/BAPS.dll | Bin 118784 -> 0 bytes Common/bapsinc/BAPS.h | 11 - Common/bapsinc/BAPSAudioOutput.h | 52 -- Common/bapsinc/BAPSAudioOutputChannel.h | 132 ---- Common/bapsinc/BAPSAudioOutputChannels.h | 59 -- Common/bapsinc/BAPSAudioOutputDevice.h | 71 -- Common/bapsinc/BAPSAudioOutputDevices.h | 68 -- Common/bapsinc/BAPSCommon.h | 37 - Common/lib/BAPS.lib | Bin 21266 -> 0 bytes Tinker/Tinker.vcproj | 167 +++++ Tinker/Tinker.vcxproj | 220 ++++++ Tinker/Tinker.vcxproj.filters | 55 ++ .../Properties/Resources.Designer.cs | 7 +- .../Properties/Settings.Designer.cs | 4 +- TinkerInCSharp/TinkerInCSharp.csproj | 8 +- TinkerInCSharp/app.config | 3 + .../Properties.Resources.Designer.cs.dll | Bin 4608 -> 0 bytes TinkerInCSharp/obj/Debug/build.force | 0 .../Release/ResolveAssemblyReference.cache | Bin 7556 -> 0 bytes .../Properties.Resources.Designer.cs.dll | Bin 4608 -> 0 bytes .../Release/TinkerInCSharp.Form1.resources | Bin 180 -> 0 bytes ...kerInCSharp.Properties.Resources.resources | Bin 1972 -> 0 bytes ...TinkerInCSharp.csproj.FileListAbsolute.txt | 20 - ...nkerInCSharp.csproj.GenerateResource.Cache | Bin 888 -> 0 bytes TinkerInCSharp/obj/Release/TinkerInCSharp.exe | Bin 10240 -> 0 bytes TinkerInCSharp/obj/Release/TinkerInCSharp.pdb | Bin 26112 -> 0 bytes Tinkerinc++/Tinkerinc++.vcproj | 170 +++++ Tinkerinc++/Tinkerinc++.vcxproj | 236 ++++++ Tinkerinc++/Tinkerinc++.vcxproj.filters | 57 ++ 79 files changed, 3693 insertions(+), 4102 deletions(-) delete mode 100644 BAPSController/BAPSController.vcproj delete mode 100644 BAPSController/BAPSController.vcproj.URY.lpw.user delete mode 100644 BAPSController/BAPSController.vcproj.URY.mattbw.user delete mode 100644 BAPSController/BAPSController.vcproj.URY.ury.user delete mode 100644 BAPSController/BAPSController.vcproj.WALLPC1.root.user delete mode 100644 BAPSController/BAPSController.vcproj.WALLPC1.ury.user create mode 100755 BAPSController/BAPSController.vcxproj create mode 100755 BAPSController/BAPSController.vcxproj.filters delete mode 100644 BAPSPresenter/BAPSPresenter.vcproj delete mode 100644 BAPSPresenter/BAPSPresenter.vcproj.MATPC.matthew.user delete mode 100644 BAPSPresenter/BAPSPresenter.vcproj.URY.lpw.user delete mode 100644 BAPSPresenter/BAPSPresenter.vcproj.URY.mattbw.user delete mode 100644 BAPSPresenter/BAPSPresenter.vcproj.URY.ury.user delete mode 100644 BAPSPresenter/BAPSPresenter.vcproj.WALLPC1.root.user delete mode 100644 BAPSPresenter/BAPSPresenter.vcproj.WALLPC1.ury.user create mode 100755 BAPSPresenter/BAPSPresenter.vcxproj create mode 100755 BAPSPresenter/BAPSPresenter.vcxproj.filters delete mode 100644 BAPSServerAssembly/BAPSServerAssembly.vcproj delete mode 100644 BAPSServerAssembly/BAPSServerAssembly.vcproj.MATTOP.matthew.user delete mode 100644 BAPSServerAssembly/BAPSServerAssembly.vcproj.URY.lpw.user delete mode 100644 BAPSServerAssembly/BAPSServerAssembly.vcproj.URY.mattbw.user delete mode 100644 BAPSServerAssembly/BAPSServerAssembly.vcproj.URY.ury.user delete mode 100644 BAPSServerAssembly/BAPSServerAssembly.vcproj.WALLPC1.root.user delete mode 100644 BAPSServerAssembly/BAPSServerAssembly.vcproj.WALLPC1.ury.user create mode 100755 BAPSServerAssembly/BAPSServerAssembly.vcxproj create mode 100755 BAPSServerAssembly/BAPSServerAssembly.vcxproj.filters delete mode 100644 BAPSServerAssembly/app.aps create mode 100755 BAPSServerService/app.config mode change 100644 => 100755 BAPSlib/BAPS.h delete mode 100644 BAPSlib/BAPS.vcproj create mode 100755 BAPSlib/BAPS.vcxproj create mode 100755 BAPSlib/BAPS.vcxproj.filters mode change 100644 => 100755 BAPSlib/BAPSAudioOutput.h mode change 100644 => 100755 BAPSlib/BAPSAudioOutputChannel.h mode change 100644 => 100755 BAPSlib/BAPSAudioOutputChannels.h mode change 100644 => 100755 BAPSlib/BAPSAudioOutputDevice.h mode change 100644 => 100755 BAPSlib/BAPSAudioOutputDevices.h mode change 100644 => 100755 BAPSlib/BAPSCommon.h delete mode 100644 BAPSlib/BAPSTest/BAPSTest.vcproj create mode 100755 BAPSlib/BAPSTest/BAPSTest.vcxproj create mode 100755 BAPSlib/BAPSTest/BAPSTest.vcxproj.filters delete mode 100644 Common/BAPS.dll delete mode 100644 Common/bapsinc/BAPS.h delete mode 100644 Common/bapsinc/BAPSAudioOutput.h delete mode 100644 Common/bapsinc/BAPSAudioOutputChannel.h delete mode 100644 Common/bapsinc/BAPSAudioOutputChannels.h delete mode 100644 Common/bapsinc/BAPSAudioOutputDevice.h delete mode 100644 Common/bapsinc/BAPSAudioOutputDevices.h delete mode 100644 Common/bapsinc/BAPSCommon.h delete mode 100644 Common/lib/BAPS.lib create mode 100755 Tinker/Tinker.vcxproj create mode 100755 Tinker/Tinker.vcxproj.filters create mode 100755 TinkerInCSharp/app.config delete mode 100644 TinkerInCSharp/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll delete mode 100644 TinkerInCSharp/obj/Debug/build.force delete mode 100644 TinkerInCSharp/obj/Release/ResolveAssemblyReference.cache delete mode 100644 TinkerInCSharp/obj/Release/TempPE/Properties.Resources.Designer.cs.dll delete mode 100644 TinkerInCSharp/obj/Release/TinkerInCSharp.Form1.resources delete mode 100644 TinkerInCSharp/obj/Release/TinkerInCSharp.Properties.Resources.resources delete mode 100644 TinkerInCSharp/obj/Release/TinkerInCSharp.csproj.FileListAbsolute.txt delete mode 100644 TinkerInCSharp/obj/Release/TinkerInCSharp.csproj.GenerateResource.Cache delete mode 100644 TinkerInCSharp/obj/Release/TinkerInCSharp.exe delete mode 100644 TinkerInCSharp/obj/Release/TinkerInCSharp.pdb create mode 100755 Tinkerinc++/Tinkerinc++.vcxproj create mode 100755 Tinkerinc++/Tinkerinc++.vcxproj.filters diff --git a/BAPS2.sln b/BAPS2.sln index b4853924..3433703e 100644 --- a/BAPS2.sln +++ b/BAPS2.sln @@ -1,11 +1,15 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BAPSPresenter", "BAPSPresenter\BAPSPresenter.vcproj", "{46FD9397-DD3B-456A-9D95-504D60F6A9B5}" +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +VisualStudioVersion = 14.0.25420.1 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BAPSPresenter", "BAPSPresenter\BAPSPresenter.vcxproj", "{46FD9397-DD3B-456A-9D95-504D60F6A9B5}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tinker", "Tinker\Tinker.vcproj", "{72C648CC-A0E6-4439-8474-76BE38A621B4}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tinker", "Tinker\Tinker.vcxproj", "{72C648CC-A0E6-4439-8474-76BE38A621B4}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BAPSServerAssembly", "BAPSServerAssembly\BAPSServerAssembly.vcproj", "{B93BB821-0BB3-466C-9D53-7FECF8722F1D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BAPSServerAssembly", "BAPSServerAssembly\BAPSServerAssembly.vcxproj", "{B93BB821-0BB3-466C-9D53-7FECF8722F1D}" + ProjectSection(ProjectDependencies) = postProject + {2EAB373E-2054-4AB5-A2F9-34139FB08AE4} = {2EAB373E-2054-4AB5-A2F9-34139FB08AE4} + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BAPSServerService", "BAPSServerService\BAPSServerService.csproj", "{A19900A2-8C8B-416A-8642-7F20CB9CA145}" EndProject @@ -13,20 +17,26 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TinkerInCSharp", "TinkerInC EndProject Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "BAPSSetup", "BAPSSetup\BAPSSetup.vdproj", "{9A851E69-B851-432F-B2E8-2C3A03E54D29}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tinkerinc++", "Tinkerinc++\Tinkerinc++.vcproj", "{8633265B-8675-489E-BB7B-DAD384B287A1}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tinkerinc++", "Tinkerinc++\Tinkerinc++.vcxproj", "{8633265B-8675-489E-BB7B-DAD384B287A1}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BAPSFormControls", "BAPSFormControls\BAPSFormControls.csproj", "{4C3D1722-7B93-4081-8D61-572F8F088CED}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BAPSControllerAssembly", "BAPSController\BAPSController.vcproj", "{E1CEEE2E-DF20-4929-80BD-D73E896C5245}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BAPSControllerAssembly", "BAPSController\BAPSController.vcxproj", "{E1CEEE2E-DF20-4929-80BD-D73E896C5245}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BAPS", "..\BAPSlib\BAPS.vcxproj", "{2EAB373E-2054-4AB5-A2F9-34139FB08AE4}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BAPSTest", "..\BAPSlib\BAPSTest\BAPSTest.vcxproj", "{87038750-A2E1-4F9D-8EA3-19BC6E2B371B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Debug|Mixed Platforms = Debug|Mixed Platforms Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Any CPU = Release|Any CPU Release|Mixed Platforms = Release|Mixed Platforms Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Debug|Any CPU.ActiveCfg = Debug|Win32 @@ -34,85 +44,139 @@ Global {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Debug|Win32.ActiveCfg = Debug|Win32 {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Debug|Win32.Build.0 = Debug|Win32 + {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Debug|x64.ActiveCfg = Debug|x64 + {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Debug|x64.Build.0 = Debug|x64 {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Release|Any CPU.ActiveCfg = Release|Win32 {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Release|Mixed Platforms.Build.0 = Release|Win32 {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Release|Win32.ActiveCfg = Release|Win32 {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Release|Win32.Build.0 = Release|Win32 + {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Release|x64.ActiveCfg = Release|x64 + {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Release|x64.Build.0 = Release|x64 {72C648CC-A0E6-4439-8474-76BE38A621B4}.Debug|Any CPU.ActiveCfg = Debug|Win32 {72C648CC-A0E6-4439-8474-76BE38A621B4}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {72C648CC-A0E6-4439-8474-76BE38A621B4}.Debug|Win32.ActiveCfg = Debug|Win32 + {72C648CC-A0E6-4439-8474-76BE38A621B4}.Debug|x64.ActiveCfg = Debug|x64 {72C648CC-A0E6-4439-8474-76BE38A621B4}.Release|Any CPU.ActiveCfg = Release|Win32 {72C648CC-A0E6-4439-8474-76BE38A621B4}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {72C648CC-A0E6-4439-8474-76BE38A621B4}.Release|Win32.ActiveCfg = Release|Win32 + {72C648CC-A0E6-4439-8474-76BE38A621B4}.Release|x64.ActiveCfg = Release|x64 {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Debug|Any CPU.ActiveCfg = Debug|Win32 {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Debug|Win32.ActiveCfg = Debug|Win32 {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Debug|Win32.Build.0 = Debug|Win32 + {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Debug|x64.ActiveCfg = Debug|x64 + {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Debug|x64.Build.0 = Debug|x64 {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Release|Any CPU.ActiveCfg = Release|Win32 {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Release|Mixed Platforms.Build.0 = Release|Win32 {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Release|Win32.ActiveCfg = Release|Win32 {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Release|Win32.Build.0 = Release|Win32 + {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Release|x64.ActiveCfg = Release|x64 + {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Release|x64.Build.0 = Release|x64 {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Debug|Any CPU.Build.0 = Debug|Any CPU {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Debug|Win32.ActiveCfg = Debug|Any CPU {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Debug|Win32.Build.0 = Debug|Any CPU + {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Debug|x64.ActiveCfg = Debug|Any CPU + {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Debug|x64.Build.0 = Debug|Any CPU {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Release|Any CPU.ActiveCfg = Release|Any CPU {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Release|Any CPU.Build.0 = Release|Any CPU {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Release|Mixed Platforms.Build.0 = Release|Any CPU {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Release|Win32.ActiveCfg = Release|Any CPU {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Release|Win32.Build.0 = Release|Any CPU + {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Release|x64.ActiveCfg = Release|Any CPU + {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Release|x64.Build.0 = Release|Any CPU {27F57299-ED16-454A-967C-03A3BA2D6F89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {27F57299-ED16-454A-967C-03A3BA2D6F89}.Debug|Any CPU.Build.0 = Debug|Any CPU {27F57299-ED16-454A-967C-03A3BA2D6F89}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {27F57299-ED16-454A-967C-03A3BA2D6F89}.Debug|Win32.ActiveCfg = Debug|Any CPU + {27F57299-ED16-454A-967C-03A3BA2D6F89}.Debug|x64.ActiveCfg = Debug|Any CPU {27F57299-ED16-454A-967C-03A3BA2D6F89}.Release|Any CPU.ActiveCfg = Release|Any CPU {27F57299-ED16-454A-967C-03A3BA2D6F89}.Release|Any CPU.Build.0 = Release|Any CPU {27F57299-ED16-454A-967C-03A3BA2D6F89}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {27F57299-ED16-454A-967C-03A3BA2D6F89}.Release|Win32.ActiveCfg = Release|Any CPU + {27F57299-ED16-454A-967C-03A3BA2D6F89}.Release|x64.ActiveCfg = Release|Any CPU {9A851E69-B851-432F-B2E8-2C3A03E54D29}.Debug|Any CPU.ActiveCfg = Debug {9A851E69-B851-432F-B2E8-2C3A03E54D29}.Debug|Any CPU.Build.0 = Debug {9A851E69-B851-432F-B2E8-2C3A03E54D29}.Debug|Mixed Platforms.ActiveCfg = Debug {9A851E69-B851-432F-B2E8-2C3A03E54D29}.Debug|Mixed Platforms.Build.0 = Debug {9A851E69-B851-432F-B2E8-2C3A03E54D29}.Debug|Win32.ActiveCfg = Debug {9A851E69-B851-432F-B2E8-2C3A03E54D29}.Debug|Win32.Build.0 = Debug + {9A851E69-B851-432F-B2E8-2C3A03E54D29}.Debug|x64.ActiveCfg = Debug + {9A851E69-B851-432F-B2E8-2C3A03E54D29}.Debug|x64.Build.0 = Debug {9A851E69-B851-432F-B2E8-2C3A03E54D29}.Release|Any CPU.ActiveCfg = Release {9A851E69-B851-432F-B2E8-2C3A03E54D29}.Release|Any CPU.Build.0 = Release {9A851E69-B851-432F-B2E8-2C3A03E54D29}.Release|Mixed Platforms.ActiveCfg = Release {9A851E69-B851-432F-B2E8-2C3A03E54D29}.Release|Mixed Platforms.Build.0 = Release {9A851E69-B851-432F-B2E8-2C3A03E54D29}.Release|Win32.ActiveCfg = Release {9A851E69-B851-432F-B2E8-2C3A03E54D29}.Release|Win32.Build.0 = Release + {9A851E69-B851-432F-B2E8-2C3A03E54D29}.Release|x64.ActiveCfg = Release + {9A851E69-B851-432F-B2E8-2C3A03E54D29}.Release|x64.Build.0 = Release {8633265B-8675-489E-BB7B-DAD384B287A1}.Debug|Any CPU.ActiveCfg = Debug|Win32 {8633265B-8675-489E-BB7B-DAD384B287A1}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {8633265B-8675-489E-BB7B-DAD384B287A1}.Debug|Win32.ActiveCfg = Debug|Win32 + {8633265B-8675-489E-BB7B-DAD384B287A1}.Debug|x64.ActiveCfg = Debug|x64 {8633265B-8675-489E-BB7B-DAD384B287A1}.Release|Any CPU.ActiveCfg = Release|Win32 {8633265B-8675-489E-BB7B-DAD384B287A1}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {8633265B-8675-489E-BB7B-DAD384B287A1}.Release|Win32.ActiveCfg = Release|Win32 + {8633265B-8675-489E-BB7B-DAD384B287A1}.Release|x64.ActiveCfg = Release|x64 {4C3D1722-7B93-4081-8D61-572F8F088CED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4C3D1722-7B93-4081-8D61-572F8F088CED}.Debug|Any CPU.Build.0 = Debug|Any CPU {4C3D1722-7B93-4081-8D61-572F8F088CED}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {4C3D1722-7B93-4081-8D61-572F8F088CED}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU {4C3D1722-7B93-4081-8D61-572F8F088CED}.Debug|Win32.ActiveCfg = Debug|Any CPU + {4C3D1722-7B93-4081-8D61-572F8F088CED}.Debug|Win32.Build.0 = Debug|Any CPU + {4C3D1722-7B93-4081-8D61-572F8F088CED}.Debug|x64.ActiveCfg = Debug|Any CPU + {4C3D1722-7B93-4081-8D61-572F8F088CED}.Debug|x64.Build.0 = Debug|Any CPU {4C3D1722-7B93-4081-8D61-572F8F088CED}.Release|Any CPU.ActiveCfg = Release|Any CPU {4C3D1722-7B93-4081-8D61-572F8F088CED}.Release|Any CPU.Build.0 = Release|Any CPU {4C3D1722-7B93-4081-8D61-572F8F088CED}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {4C3D1722-7B93-4081-8D61-572F8F088CED}.Release|Mixed Platforms.Build.0 = Release|Any CPU {4C3D1722-7B93-4081-8D61-572F8F088CED}.Release|Win32.ActiveCfg = Release|Any CPU + {4C3D1722-7B93-4081-8D61-572F8F088CED}.Release|Win32.Build.0 = Release|Any CPU + {4C3D1722-7B93-4081-8D61-572F8F088CED}.Release|x64.ActiveCfg = Release|Any CPU + {4C3D1722-7B93-4081-8D61-572F8F088CED}.Release|x64.Build.0 = Release|Any CPU {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Debug|Any CPU.ActiveCfg = Debug|Win32 {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Debug|Win32.ActiveCfg = Debug|Win32 {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Debug|Win32.Build.0 = Debug|Win32 + {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Debug|x64.ActiveCfg = Debug|x64 + {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Debug|x64.Build.0 = Debug|x64 {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Release|Any CPU.ActiveCfg = Release|Win32 {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Release|Mixed Platforms.Build.0 = Release|Win32 {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Release|Win32.ActiveCfg = Release|Win32 {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Release|Win32.Build.0 = Release|Win32 + {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Release|x64.ActiveCfg = Release|x64 + {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Release|x64.Build.0 = Release|x64 + {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Debug|Win32.ActiveCfg = Debug|Win32 + {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Debug|Win32.Build.0 = Debug|Win32 + {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Debug|x64.ActiveCfg = Debug|x64 + {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Debug|x64.Build.0 = Debug|x64 + {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Release|Any CPU.ActiveCfg = Release|Win32 + {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Release|Mixed Platforms.Build.0 = Release|Win32 + {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Release|Win32.ActiveCfg = Release|Win32 + {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Release|Win32.Build.0 = Release|Win32 + {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Release|x64.ActiveCfg = Release|x64 + {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Release|x64.Build.0 = Release|x64 + {87038750-A2E1-4F9D-8EA3-19BC6E2B371B}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {87038750-A2E1-4F9D-8EA3-19BC6E2B371B}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {87038750-A2E1-4F9D-8EA3-19BC6E2B371B}.Debug|Win32.ActiveCfg = Debug|Win32 + {87038750-A2E1-4F9D-8EA3-19BC6E2B371B}.Debug|x64.ActiveCfg = Debug|x64 + {87038750-A2E1-4F9D-8EA3-19BC6E2B371B}.Release|Any CPU.ActiveCfg = Release|Win32 + {87038750-A2E1-4F9D-8EA3-19BC6E2B371B}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {87038750-A2E1-4F9D-8EA3-19BC6E2B371B}.Release|Win32.ActiveCfg = Release|Win32 + {87038750-A2E1-4F9D-8EA3-19BC6E2B371B}.Release|x64.ActiveCfg = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/BAPSController/BAPSController.vcproj b/BAPSController/BAPSController.vcproj deleted file mode 100644 index 5467cf3d..00000000 --- a/BAPSController/BAPSController.vcproj +++ /dev/null @@ -1,265 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/BAPSController/BAPSController.vcproj.URY.lpw.user b/BAPSController/BAPSController.vcproj.URY.lpw.user deleted file mode 100644 index fccccacf..00000000 --- a/BAPSController/BAPSController.vcproj.URY.lpw.user +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - diff --git a/BAPSController/BAPSController.vcproj.URY.mattbw.user b/BAPSController/BAPSController.vcproj.URY.mattbw.user deleted file mode 100644 index b8bedf86..00000000 --- a/BAPSController/BAPSController.vcproj.URY.mattbw.user +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - diff --git a/BAPSController/BAPSController.vcproj.URY.ury.user b/BAPSController/BAPSController.vcproj.URY.ury.user deleted file mode 100644 index fccccacf..00000000 --- a/BAPSController/BAPSController.vcproj.URY.ury.user +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - diff --git a/BAPSController/BAPSController.vcproj.WALLPC1.root.user b/BAPSController/BAPSController.vcproj.WALLPC1.root.user deleted file mode 100644 index fccccacf..00000000 --- a/BAPSController/BAPSController.vcproj.WALLPC1.root.user +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - diff --git a/BAPSController/BAPSController.vcproj.WALLPC1.ury.user b/BAPSController/BAPSController.vcproj.WALLPC1.ury.user deleted file mode 100644 index fccccacf..00000000 --- a/BAPSController/BAPSController.vcproj.WALLPC1.ury.user +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - diff --git a/BAPSController/BAPSController.vcxproj b/BAPSController/BAPSController.vcxproj new file mode 100755 index 00000000..8a09beb5 --- /dev/null +++ b/BAPSController/BAPSController.vcxproj @@ -0,0 +1,219 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + BAPSControllerAssembly + {E1CEEE2E-DF20-4929-80BD-D73E896C5245} + BAPSController + ManagedCProj + 8.1 + + + + DynamicLibrary + v140 + Unicode + true + true + + + DynamicLibrary + v140 + Unicode + true + + + DynamicLibrary + v140 + Unicode + true + true + + + DynamicLibrary + v140 + Unicode + true + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.25431.1 + + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + false + + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + + + + Disabled + WIN32;_DEBUG;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + Use + Level3 + ProgramDatabase + true + + + + true + true + false + + MachineX86 + + + true + + + + + WIN32;NDEBUG;%(PreprocessorDefinitions) + MultiThreadedDLL + Use + Level3 + ProgramDatabase + + + + true + false + + MachineX86 + + + + + X64 + + + Disabled + WIN32;_DEBUG;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + Use + Level3 + ProgramDatabase + + + + true + true + false + + MachineX64 + + + + + X64 + + + WIN32;NDEBUG;%(PreprocessorDefinitions) + MultiThreadedDLL + Use + Level3 + ProgramDatabase + + + + true + false + + MachineX64 + + + + + true + true + + + true + true + + + true + true + + + + + + + Create + Create + Create + Create + + + + + + + + + + + + + + + + + true + + + + + + + + + \ No newline at end of file diff --git a/BAPSController/BAPSController.vcxproj.filters b/BAPSController/BAPSController.vcxproj.filters new file mode 100755 index 00000000..d42daf7b --- /dev/null +++ b/BAPSController/BAPSController.vcxproj.filters @@ -0,0 +1,60 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + + + Resource Files + + + + + Resource Files + + + + + + \ No newline at end of file diff --git a/BAPSFormControls/BAPSFormControls.csproj b/BAPSFormControls/BAPSFormControls.csproj index 21b5546b..ff5efd06 100644 --- a/BAPSFormControls/BAPSFormControls.csproj +++ b/BAPSFormControls/BAPSFormControls.csproj @@ -1,4 +1,5 @@ - + + Debug AnyCPU @@ -11,9 +12,11 @@ BAPSFormControls - 2.0 + 3.5 + v4.0 + true diff --git a/BAPSPresenter/BAPSPresenter.vcproj b/BAPSPresenter/BAPSPresenter.vcproj deleted file mode 100644 index acf35cc9..00000000 --- a/BAPSPresenter/BAPSPresenter.vcproj +++ /dev/null @@ -1,687 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/BAPSPresenter/BAPSPresenter.vcproj.MATPC.matthew.user b/BAPSPresenter/BAPSPresenter.vcproj.MATPC.matthew.user deleted file mode 100644 index 628acf6c..00000000 --- a/BAPSPresenter/BAPSPresenter.vcproj.MATPC.matthew.user +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - diff --git a/BAPSPresenter/BAPSPresenter.vcproj.URY.lpw.user b/BAPSPresenter/BAPSPresenter.vcproj.URY.lpw.user deleted file mode 100644 index a3faa550..00000000 --- a/BAPSPresenter/BAPSPresenter.vcproj.URY.lpw.user +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - diff --git a/BAPSPresenter/BAPSPresenter.vcproj.URY.mattbw.user b/BAPSPresenter/BAPSPresenter.vcproj.URY.mattbw.user deleted file mode 100644 index 875b6db9..00000000 --- a/BAPSPresenter/BAPSPresenter.vcproj.URY.mattbw.user +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - diff --git a/BAPSPresenter/BAPSPresenter.vcproj.URY.ury.user b/BAPSPresenter/BAPSPresenter.vcproj.URY.ury.user deleted file mode 100644 index a3faa550..00000000 --- a/BAPSPresenter/BAPSPresenter.vcproj.URY.ury.user +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - diff --git a/BAPSPresenter/BAPSPresenter.vcproj.WALLPC1.root.user b/BAPSPresenter/BAPSPresenter.vcproj.WALLPC1.root.user deleted file mode 100644 index a3faa550..00000000 --- a/BAPSPresenter/BAPSPresenter.vcproj.WALLPC1.root.user +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - diff --git a/BAPSPresenter/BAPSPresenter.vcproj.WALLPC1.ury.user b/BAPSPresenter/BAPSPresenter.vcproj.WALLPC1.ury.user deleted file mode 100644 index a3faa550..00000000 --- a/BAPSPresenter/BAPSPresenter.vcproj.WALLPC1.ury.user +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - diff --git a/BAPSPresenter/BAPSPresenter.vcxproj b/BAPSPresenter/BAPSPresenter.vcxproj new file mode 100755 index 00000000..fa789a67 --- /dev/null +++ b/BAPSPresenter/BAPSPresenter.vcxproj @@ -0,0 +1,401 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {46FD9397-DD3B-456A-9D95-504D60F6A9B5} + BAPSPresenter + ManagedCProj + 8.1 + + + + Application + v140 + Unicode + Pure + true + + + Application + v140 + Unicode + Pure + + + Application + v140 + Unicode + Pure + true + + + Application + v140 + Unicode + Pure + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.25431.1 + + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + false + + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + + + + copy ..\help\BAPSPresenterHelp.chm ..\debug\ + + ..\debug\BAPSPresenterHelp.chm;%(Outputs) + + + Disabled + ../Common;..\..\BAPSLib\$(Platform)\$(Configuration);..\..\BAPSLib\$(Platform)\$(Configuration)\inc;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + Use + Level3 + ProgramDatabase + true + + + + textItem.png;libraryItem.png;fileItem.png;textItemSel.png;%(EmbedManagedResourceFile) + true + true + Windows + main + false + + MachineX86 + + + true + + + + + copy ..\help\BAPSPresenterHelp.chm ..\release\ + + ..\release\BAPSPresenterHelp.chm;%(Outputs) + + + ../Common;..\..\BAPSLib\$(Platform)\$(Configuration);..\..\BAPSLib\$(Platform)\$(Configuration)\inc;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;%(PreprocessorDefinitions) + MultiThreadedDLL + Use + Level3 + ProgramDatabase + + + + textItem.png;libraryItem.png;fileItem.png;textItemSel.png;%(EmbedManagedResourceFile) + true + Windows + main + false + + MachineX86 + + + + + copy ..\help\BAPSPresenterHelp.chm ..\debug\ + + ..\debug\BAPSPresenterHelp.chm;%(Outputs) + + + X64 + + + Disabled + ../Common;..\..\BAPSLib\$(Platform)\$(Configuration);..\..\BAPSLib\$(Platform)\$(Configuration)\inc;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + Use + Level3 + ProgramDatabase + + + + textItem.png;libraryItem.png;fileItem.png;textItemSel.png;%(EmbedManagedResourceFile) + true + true + Windows + main + false + + MachineX64 + + + + + copy ..\help\BAPSPresenterHelp.chm ..\release\ + + ..\release\BAPSPresenterHelp.chm;%(Outputs) + + + X64 + + + ../Common;..\..\BAPSLib\$(Platform)\$(Configuration);..\..\BAPSLib\$(Platform)\$(Configuration)\inc;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;%(PreprocessorDefinitions) + MultiThreadedDLL + Use + Level3 + ProgramDatabase + + + + textItem.png;libraryItem.png;fileItem.png;textItemSel.png;%(EmbedManagedResourceFile) + true + Windows + main + false + + MachineX64 + + + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Create + Create + Create + Create + + + + + + + + + + + + CppForm + + + + + + + + + + + + + + + + CppForm + + + + + + CppForm + + + + + + + CppForm + + + + + + + CppForm + + + CppForm + + + CppForm + + + + CppForm + + + + CppForm + + + + + CppForm + + + + + + + + + + + + + + + + + + + + + + + + + + + About.h + Designer + + + AudioWall.h + Designer + + + BAPSPresenterMain.h + Designer + + + ConfigDialog.h + Designer + + + LoadShowDialog.h + Designer + + + LocalConfigDialog.h + Designer + + + LoginDialog.h + Designer + + + RecordLibrarySearch.h + Designer + + + SecurityDialog.h + Designer + + + TextDialog.h + Designer + + + + + + diff --git a/BAPSPresenter/BAPSPresenter.vcxproj.filters b/BAPSPresenter/BAPSPresenter.vcxproj.filters new file mode 100755 index 00000000..d980e496 --- /dev/null +++ b/BAPSPresenter/BAPSPresenter.vcxproj.filters @@ -0,0 +1,340 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {d9990367-4b06-4447-8a49-00d5189d89f3} + + + {7e3d0260-f1b6-4593-8ccd-92972a272b15} + + + {1a5f11a8-0382-4acf-85a6-3e587a584100} + + + {c1c38b73-834e-4ff6-8a6a-cb3fc1d88412} + + + {118d4f3e-cf6c-4763-b40b-f1582007b429} + + + {ef77a3f4-5337-427d-9b66-15c28ba3c190} + + + {7a6794b1-8993-4cc8-90e3-d0b543798d02} + + + {ec2c962b-79ce-4758-99aa-27ce435817c1} + + + {8933a6b2-c3ab-47c0-9939-8221b72ca35c} + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Header Files\About + + + Header Files\ConfigDialog + + + Header Files\LoadShowDialog + + + Header Files\LoginDialog + + + Header Files\RecordLibrarySearch + + + Header Files\SecurityDialog + + + Header Files\LocalConfigDialog + + + Header Files\AudioWall + + + + + 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\Messages + + + Header Files\Messages + + + Header Files\Messages + + + Header Files\Messages + + + Header Files\Messages + + + Header Files\Messages + + + Header Files\Messages + + + Header Files\Messages + + + Header Files\Messages + + + Header Files\Messages + + + Header Files\Messages + + + Header Files\Messages + + + Header Files\Messages + + + Header Files\Messages + + + Header Files\About + + + Header Files\ConfigDialog + + + Header Files\ConfigDialog + + + Header Files\ConfigDialog + + + Header Files\LoadShowDialog + + + Header Files\LoginDialog + + + Header Files\RecordLibrarySearch + + + Header Files\SecurityDialog + + + Header Files\SecurityDialog + + + Header Files\LocalConfigDialog + + + Header Files\AudioWall + + + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + + + Resource Files + + + + + + + + + + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + \ No newline at end of file diff --git a/BAPSServerAssembly/BAPSServerAssembly.vcproj b/BAPSServerAssembly/BAPSServerAssembly.vcproj deleted file mode 100644 index a6fac4d5..00000000 --- a/BAPSServerAssembly/BAPSServerAssembly.vcproj +++ /dev/null @@ -1,567 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/BAPSServerAssembly/BAPSServerAssembly.vcproj.MATTOP.matthew.user b/BAPSServerAssembly/BAPSServerAssembly.vcproj.MATTOP.matthew.user deleted file mode 100644 index 5e15ca37..00000000 --- a/BAPSServerAssembly/BAPSServerAssembly.vcproj.MATTOP.matthew.user +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - diff --git a/BAPSServerAssembly/BAPSServerAssembly.vcproj.URY.lpw.user b/BAPSServerAssembly/BAPSServerAssembly.vcproj.URY.lpw.user deleted file mode 100644 index fccccacf..00000000 --- a/BAPSServerAssembly/BAPSServerAssembly.vcproj.URY.lpw.user +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - diff --git a/BAPSServerAssembly/BAPSServerAssembly.vcproj.URY.mattbw.user b/BAPSServerAssembly/BAPSServerAssembly.vcproj.URY.mattbw.user deleted file mode 100644 index b8bedf86..00000000 --- a/BAPSServerAssembly/BAPSServerAssembly.vcproj.URY.mattbw.user +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - diff --git a/BAPSServerAssembly/BAPSServerAssembly.vcproj.URY.ury.user b/BAPSServerAssembly/BAPSServerAssembly.vcproj.URY.ury.user deleted file mode 100644 index fccccacf..00000000 --- a/BAPSServerAssembly/BAPSServerAssembly.vcproj.URY.ury.user +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - diff --git a/BAPSServerAssembly/BAPSServerAssembly.vcproj.WALLPC1.root.user b/BAPSServerAssembly/BAPSServerAssembly.vcproj.WALLPC1.root.user deleted file mode 100644 index fccccacf..00000000 --- a/BAPSServerAssembly/BAPSServerAssembly.vcproj.WALLPC1.root.user +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - diff --git a/BAPSServerAssembly/BAPSServerAssembly.vcproj.WALLPC1.ury.user b/BAPSServerAssembly/BAPSServerAssembly.vcproj.WALLPC1.ury.user deleted file mode 100644 index fccccacf..00000000 --- a/BAPSServerAssembly/BAPSServerAssembly.vcproj.WALLPC1.ury.user +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - diff --git a/BAPSServerAssembly/BAPSServerAssembly.vcxproj b/BAPSServerAssembly/BAPSServerAssembly.vcxproj new file mode 100755 index 00000000..37ff10e3 --- /dev/null +++ b/BAPSServerAssembly/BAPSServerAssembly.vcxproj @@ -0,0 +1,292 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {B93BB821-0BB3-466C-9D53-7FECF8722F1D} + BAPSServerAssembly + ManagedCProj + 8.1 + + + + DynamicLibrary + v140 + Unicode + true + true + + + DynamicLibrary + v140 + Unicode + true + + + DynamicLibrary + v140 + Unicode + true + true + + + DynamicLibrary + v140 + Unicode + true + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.25431.1 + + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + false + + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + + + + Disabled + ..\Common;..\..\BAPSLib\$(Platform)\$(Configuration);..\..\BAPSLib\$(Platform)\$(Configuration)\inc;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + Use + Level3 + ProgramDatabase + true + + + + true + true + false + + MachineX86 + + + true + + + + + ..\Common;..\..\BAPSLib\$(Platform)\$(Configuration);..\..\BAPSLib\$(Platform)\$(Configuration)\inc;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;%(PreprocessorDefinitions) + MultiThreadedDLL + Use + Level3 + ProgramDatabase + + + + ..\..\BAPSLib\$(Platform)\$(Configuration)\lib;%(AdditionalLibraryDirectories) + true + false + + MachineX86 + + + + + X64 + + + Disabled + ..\Common;..\..\BAPSLib\$(Platform)\$(Configuration);..\..\BAPSLib\$(Platform)\$(Configuration)\inc;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + Use + Level3 + ProgramDatabase + + + + true + true + false + + MachineX64 + + + + + X64 + + + ..\Common;..\..\BAPSLib\$(Platform)\$(Configuration);..\..\BAPSLib\$(Platform)\$(Configuration)\inc;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;%(PreprocessorDefinitions) + MultiThreadedDLL + Use + Level3 + ProgramDatabase + + + + ..\..\BAPSLib\$(Platform)\$(Configuration)\lib;%(AdditionalLibraryDirectories) + true + false + + MachineX64 + + + + + ..\Common\Npgsql1.0\Npgsql\bin\ms2.0\Mono.Security.dll + + + ..\Common\Npgsql1.0\Npgsql\bin\ms2.0\Npgsql.dll + + + true + true + + + true + true + + + true + true + + + + + {e1ceee2e-df20-4929-80bd-d73e896c5245} + true + true + + + {2eab373e-2054-4ab5-a2f9-34139fb08ae4} + + + + + + + + + + + + + + + + + + + + + + + + + Create + Create + Create + Create + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/BAPSServerAssembly/BAPSServerAssembly.vcxproj.filters b/BAPSServerAssembly/BAPSServerAssembly.vcxproj.filters new file mode 100755 index 00000000..c803bc44 --- /dev/null +++ b/BAPSServerAssembly/BAPSServerAssembly.vcxproj.filters @@ -0,0 +1,265 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {5319bfcb-a8ea-4623-a271-0b9ce8c6a9ff} + + + {970ed28b-02a3-4e06-a418-71fe1fbfd2ce} + + + {4a0e3c34-4d2b-4c06-b96b-7a58e974a466} + + + {52f2ad67-a15b-400d-83ed-8057f18da209} + + + {2e1f5d27-74c6-4116-b049-2242aa169808} + + + {91707f90-a782-4ee9-a18d-d56bcb40bf91} + + + {a9c948a6-96a5-4083-93e7-e167a7148c07} + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {08589f29-0476-4365-8656-f76b55c18442} + + + {3d999d2f-8636-412c-8c48-da1cb76ac1c3} + + + {f1b247fa-258c-4362-bd42-bd9990e8acca} + + + {f34e7224-110a-4880-aa29-f0db2a4f756b} + + + {248f0957-8921-4381-9bee-30bf67f484d1} + + + {20cd8baf-8833-4bd0-b924-016f31f2c6f2} + + + {c831e220-897e-4225-97e2-49a2801bb35f} + + + {349352a5-1e96-431f-af6e-23e8fe4f1aeb} + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files\Comms + + + Source Files\Audio + + + Source Files\Audio + + + Source Files\Managers + + + Source Files\Managers + + + Source Files\Managers + + + Source Files\Managers + + + Source Files\Managers + + + Source Files\ClientInstance + + + Source Files\ClientInstance + + + Source Files\ClientInstance + + + Source Files\ClientInstance + + + Source Files\ClientInstance + + + Source Files\ClientInstance + + + Source Files\Main + + + Source Files\Main + + + Source Files\Playlist + + + Source Files\Utilities + + + Source Files\Utilities + + + Source Files\Utilities + + + Source Files\Utilities + + + Source Files\Utilities + + + Source Files\Utilities + + + + + Header Files\Audio + + + Header Files\Audio + + + Header Files\Comms + + + Header Files\Comms + + + Header Files\ClientInstance + + + Header Files\Main + + + Header Files\Main + + + Header Files\Managers + + + Header Files\Managers + + + Header Files\Managers + + + Header Files\Managers + + + Header Files\Managers + + + Header Files\Managers + + + Header Files\Playlist + + + Header Files\Playlist + + + Header Files\Playlist + + + Header Files\Playlist + + + Header Files\Playlist + + + Header Files\Utilities + + + Header Files\Utilities + + + Header Files\Utilities + + + Header Files\Utilities + + + Header Files\Utilities + + + Header Files\Utilities + + + Header Files\Utilities + + + Header Files\Utilities + + + Header Files\Utilities + + + Header Files\Utilities + + + Header Files\Utilities + + + Header Files\Utilities + + + Header Files\Utilities + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + + + Resource Files + + + + + + + + + \ No newline at end of file diff --git a/BAPSServerAssembly/app.aps b/BAPSServerAssembly/app.aps deleted file mode 100644 index 51a885d6c6d33a186498bc482280515a1eede310..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2280 zcmbVN%}*0i5dRg>QdiBMyjm)WoGKs(Lr9=d0we@U3Xww(mRchT2-&7p5))Uvc<|`a zKVt8DDTxO({t*~Cc;v{z@chkt`&m8|2j;z*dB6F1v$IaOff|ds11_m@dVS{ zmC6L?x&A=FqbyJ#uh!emYRlQJPM4M|qk640oOZ)0HJgpC_08RCZD*(G)PY|;Vb0zt zo^9v)!gxaz^5iLU27#GAA=wm!4Y>gS;kstyN|EfM)9LU)E+(5Y8&`8zF{a7#eJ`|F zA|`bBJh8%4?xG`vTRwa_3;{kEOY{I>0$G7BV0{q87qmnRHp>gcip?iBsau}q8MK_n zDU8;IW}4(3f~pKu(shNRnoMQx7@{Rr>Xfy0=`mDGeoUV9mS`5_NtZm!Vr5L=OY3+g z%b2w837SSiB!x~ZJN+nYC>QCt5B5S_snbPt3eqBN6ubzmM#4!sytIifvQjdDnq76A z*;j{|L$ZC!u{*^ieq)kj^mgCPDn&j)RvptpSP#@)?!uD{q71+1&Z&Jzc7?}5#8!G!NYhw}O4a_D)&jC$ir@k;MO_LZTsp}EJr zi&7{5z0ZHpG`IL&)7%#mx5Fw^Bpq{8mVZ##JMj}P5S}M1b(_os(s1H?BHimjK5y$T z%GW0Y+cug!1L^!t@)&sqvsmN0fF;ae5vwTEBC&(Gh`&=#qq*I3>W$(H;LczD&GQ{j z_}|-jS>J3uYvc>H=dT&8_@Z#@2IEMk%WLT+f_F^B68%1TkQ{%j55z3Eev=&-(3Sxt zYG=C8il1z!rai9dSYNe08B31`mt21x zQrf~gHnoRCt%+?Np-#C7wl;dMxxN~9_*cXRb8YK-Drf5acBameF^p*AAVaOpuB|LA z%`C2#XD_gho{N1LStSZSvTN!7M9(+swfuIL$?@}`lcxB$Q>O6~ZRQ(b&Qsq2nm+S! zU-XSA(D$e>?vaE~&c4j`#I>u + + Debug AnyCPU @@ -12,9 +13,11 @@ true - 2.0 + 3.5 + v4.0 + http://localhost/BAPSServerService/ true Web @@ -34,15 +37,16 @@ true full false - bin\Debug\ + Debug\ DEBUG;TRACE prompt 4 + x86 pdbonly true - bin\Release\ + Release\ TRACE prompt 4 @@ -123,8 +127,11 @@ - - {B93BB821-0BB3-466C-9D53-7FECF8722F1D} + + + + + {b93bb821-0bb3-466c-9d53-7fecf8722f1d} BAPSServerAssembly diff --git a/BAPSServerService/BAPSServerService.csproj.user b/BAPSServerService/BAPSServerService.csproj.user index 29d9cf07..92ad3948 100644 --- a/BAPSServerService/BAPSServerService.csproj.user +++ b/BAPSServerService/BAPSServerService.csproj.user @@ -1,4 +1,5 @@ - + + http://localhost/BAPSServerService/ @@ -14,4 +15,8 @@ + + + + \ No newline at end of file diff --git a/BAPSServerService/ProjectInstaller.Designer.cs b/BAPSServerService/ProjectInstaller.Designer.cs index 048c4355..6e654db0 100644 --- a/BAPSServerService/ProjectInstaller.Designer.cs +++ b/BAPSServerService/ProjectInstaller.Designer.cs @@ -34,6 +34,7 @@ private void InitializeComponent() // // serviceProcessInstaller1 // + this.serviceProcessInstaller1.Account = System.ServiceProcess.ServiceAccount.LocalSystem; this.serviceProcessInstaller1.Password = null; this.serviceProcessInstaller1.Username = null; // @@ -42,6 +43,7 @@ private void InitializeComponent() this.serviceInstaller1.Description = "Broadcasting And Presenting Suite - Server"; this.serviceInstaller1.ServiceName = "BAPS Server Service"; this.serviceInstaller1.StartType = System.ServiceProcess.ServiceStartMode.Automatic; + this.serviceInstaller1.AfterInstall += new System.Configuration.Install.InstallEventHandler(this.serviceInstaller1_AfterInstall); // // bapsServiceController // diff --git a/BAPSServerService/ProjectInstaller.cs b/BAPSServerService/ProjectInstaller.cs index 7d9eb749..b5086a69 100644 --- a/BAPSServerService/ProjectInstaller.cs +++ b/BAPSServerService/ProjectInstaller.cs @@ -263,5 +263,10 @@ public override void Uninstall(System.Collections.IDictionary savedState) { base.Uninstall(savedState); } + + private void serviceInstaller1_AfterInstall(object sender, InstallEventArgs e) + { + + } } } \ No newline at end of file diff --git a/BAPSServerService/ProjectInstaller.resx b/BAPSServerService/ProjectInstaller.resx index 495ea31e..d5aa83a7 100644 --- a/BAPSServerService/ProjectInstaller.resx +++ b/BAPSServerService/ProjectInstaller.resx @@ -112,21 +112,21 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 17, 54 + + 17, 56 - - 187, 17 + + 17, 95 - + 187, 54 - + False \ No newline at end of file diff --git a/BAPSServerService/app.config b/BAPSServerService/app.config new file mode 100755 index 00000000..fcd0c937 --- /dev/null +++ b/BAPSServerService/app.config @@ -0,0 +1,3 @@ + + + diff --git a/BAPSSetup/BAPSSetup.vdproj b/BAPSSetup/BAPSSetup.vdproj index 5cb3a7c7..2b78e5c6 100644 --- a/BAPSSetup/BAPSSetup.vdproj +++ b/BAPSSetup/BAPSSetup.vdproj @@ -33,68 +33,74 @@ } "Entry" { - "MsmKey" = "8:_2A0E5E7437AF00A03C12BEB09BE6400C" + "MsmKey" = "8:_3D5716CC72B24188A23C32648D7C5C3F" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_AA78357FCE26CF17169BBF0DF975A49E" "OwnerKey" = "8:_3D5716CC72B24188A23C32648D7C5C3F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_3D5716CC72B24188A23C32648D7C5C3F" + "MsmKey" = "8:_AC1C28AA9FF148079D23451F3C595168" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_5E5C49B30CB7A33931A06A826524129E" - "OwnerKey" = "8:_2A0E5E7437AF00A03C12BEB09BE6400C" + "MsmKey" = "8:_C1BB6E1FD7EF984C86A11524EC8282FC" + "OwnerKey" = "8:_AA78357FCE26CF17169BBF0DF975A49E" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_5E5C49B30CB7A33931A06A826524129E" + "MsmKey" = "8:_D5B37F57DCB419E7D11FE9EF26FC6E7C" "OwnerKey" = "8:_3D5716CC72B24188A23C32648D7C5C3F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_612A13D0372F0BFC20B005B25D5E2A2E" - "OwnerKey" = "8:_3D5716CC72B24188A23C32648D7C5C3F" + "MsmKey" = "8:_D5B37F57DCB419E7D11FE9EF26FC6E7C" + "OwnerKey" = "8:_DE64D31EEDF76B6D5037380CAA999FE3" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_612A13D0372F0BFC20B005B25D5E2A2E" - "OwnerKey" = "8:_2A0E5E7437AF00A03C12BEB09BE6400C" + "MsmKey" = "8:_DE64D31EEDF76B6D5037380CAA999FE3" + "OwnerKey" = "8:_3D5716CC72B24188A23C32648D7C5C3F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_69C958EF46CE598A0DF6B5FC83DC2255" - "OwnerKey" = "8:_3D5716CC72B24188A23C32648D7C5C3F" + "MsmKey" = "8:_E4D441FB7F55676EA157970F56DB0343" + "OwnerKey" = "8:_DE64D31EEDF76B6D5037380CAA999FE3" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_6F8569CF96014A7F85DEF880366E37AF" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_E4D441FB7F55676EA157970F56DB0343" + "OwnerKey" = "8:_3D5716CC72B24188A23C32648D7C5C3F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D95AEAB76A9F2EF7ABA531C28620D190" - "OwnerKey" = "8:_2A0E5E7437AF00A03C12BEB09BE6400C" + "MsmKey" = "8:_E54F958F2E720A66411FC17FF7E40E77" + "OwnerKey" = "8:_DE64D31EEDF76B6D5037380CAA999FE3" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D95AEAB76A9F2EF7ABA531C28620D190" + "MsmKey" = "8:_E54F958F2E720A66411FC17FF7E40E77" "OwnerKey" = "8:_3D5716CC72B24188A23C32648D7C5C3F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D95AEAB76A9F2EF7ABA531C28620D190" - "OwnerKey" = "8:_5E5C49B30CB7A33931A06A826524129E" + "MsmKey" = "8:_E54F958F2E720A66411FC17FF7E40E77" + "OwnerKey" = "8:_E4D441FB7F55676EA157970F56DB0343" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -112,37 +118,31 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_2A0E5E7437AF00A03C12BEB09BE6400C" + "OwnerKey" = "8:_DE64D31EEDF76B6D5037380CAA999FE3" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_612A13D0372F0BFC20B005B25D5E2A2E" + "OwnerKey" = "8:_D5B37F57DCB419E7D11FE9EF26FC6E7C" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_69C958EF46CE598A0DF6B5FC83DC2255" + "OwnerKey" = "8:_E4D441FB7F55676EA157970F56DB0343" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_E884D04B37754238996327AF7A16BC96" + "OwnerKey" = "8:_E54F958F2E720A66411FC17FF7E40E77" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_5E5C49B30CB7A33931A06A826524129E" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_D95AEAB76A9F2EF7ABA531C28620D190" + "OwnerKey" = "8:_AA78357FCE26CF17169BBF0DF975A49E" "MsmSig" = "8:_UNDEFINED" } } @@ -172,15 +172,25 @@ "ComponentsUrl" = "8:" "Items" { - "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Net.Framework.2.0" + "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.0" + { + "Name" = "8:Microsoft .NET Framework 4 (x86 and x64)" + "ProductCode" = "8:.NETFramework,Version=v4.0" + } + "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Visual.C++.14.0.x64" + { + "Name" = "8:Visual C++ \"14\" Runtime Libraries (x64)" + "ProductCode" = "8:Microsoft.Visual.C++.14.0.x64" + } + "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Visual.C++.14.0.x86" { - "Name" = "8:.NET Framework 2.0 (x86)" - "ProductCode" = "8:Microsoft.Net.Framework.2.0" + "Name" = "8:Visual C++ \"14\" Runtime Libraries (x86)" + "ProductCode" = "8:Microsoft.Visual.C++.14.0.x86" } - "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Visual.C++.9.0.x86" + "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Windows.Installer.4.5" { - "Name" = "8:Visual C++ Runtime Libraries (x86)" - "ProductCode" = "8:Microsoft.Visual.C++.9.0.x86" + "Name" = "8:Windows Installer 4.5" + "ProductCode" = "8:Microsoft.Windows.Installer.4.5" } } } @@ -209,10 +219,25 @@ "ComponentsUrl" = "8:" "Items" { - "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Net.Framework.2.0" + "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.0" + { + "Name" = "8:Microsoft .NET Framework 4 (x86 and x64)" + "ProductCode" = "8:.NETFramework,Version=v4.0" + } + "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Visual.C++.14.0.x64" { - "Name" = "8:.NET Framework 2.0" - "ProductCode" = "8:Microsoft.Net.Framework.2.0" + "Name" = "8:Visual C++ \"14\" Runtime Libraries (x64)" + "ProductCode" = "8:Microsoft.Visual.C++.14.0.x64" + } + "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Visual.C++.14.0.x86" + { + "Name" = "8:Visual C++ \"14\" Runtime Libraries (x86)" + "ProductCode" = "8:Microsoft.Visual.C++.14.0.x86" + } + "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Windows.Installer.4.5" + { + "Name" = "8:Windows Installer 4.5" + "ProductCode" = "8:Microsoft.Windows.Installer.4.5" } } } @@ -262,7 +287,7 @@ "Sequence" = "3:1" "Identifier" = "8:_549D4605_117A_40A5_81A7_CCF0BF9CCB2E" "InstallerClass" = "11:TRUE" - "CustomActionData" = "8:/CredentialType=\"[SRVCREDA_TYPE]\" /Uname=\"[SRVCREDA_USR]\" /Passwd=\"[SRVCREDA_PWD]\" /PasswdConf=\"[SRVCREDA_PWD2]\" /PredefinedAccount=\"[SRVCREDA_PREDEFINED]\"" + "CustomActionData" = "8:/CredentialType=\"Predefined\" /PredefinedAccount=\"Local System\"" } "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_DBBF48AEDB974762800A504853C2CE61" { @@ -293,7 +318,7 @@ { "Name" = "8:.NET Framework" "Message" = "8:[VSDNETMSG]" - "Version" = "8:2.0.50727" + "FrameworkVersion" = "8:.NETFramework,Version=v4.0" "AllowLaterVersions" = "11:FALSE" "InstallUrl" = "8:http://go.microsoft.com/fwlink/?LinkId=9832" } @@ -361,20 +386,20 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2A0E5E7437AF00A03C12BEB09BE6400C" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_AA78357FCE26CF17169BBF0DF975A49E" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:BAPSServerAssembly, Version=2.6.2.0, Culture=neutral, processorArchitecture=x86" + "AssemblyAsmDisplayName" = "8:Interop.SpeechLib, Version=5.4.0.0, Culture=neutral, processorArchitecture=x86" "ScatterAssemblies" { - "_2A0E5E7437AF00A03C12BEB09BE6400C" + "_AA78357FCE26CF17169BBF0DF975A49E" { - "Name" = "8:BAPSServerAssembly.dll" + "Name" = "8:Interop.SpeechLib.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:BAPSServerAssembly.dll" + "SourcePath" = "8:Interop.SpeechLib.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_7ACEEE10989D49BF98528FEAF5172271" @@ -392,24 +417,13 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5E5C49B30CB7A33931A06A826524129E" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C1BB6E1FD7EF984C86A11524EC8282FC" { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Npgsql, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_5E5C49B30CB7A33931A06A826524129E" - { - "Name" = "8:Npgsql.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:Npgsql.dll" - "TargetName" = "8:" + "SourcePath" = "8:sapi.dll" + "TargetName" = "8:sapi.dll" "Tag" = "8:" "Folder" = "8:_7ACEEE10989D49BF98528FEAF5172271" - "Condition" = "8:(COMPONENTCHOICE=2)" + "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" "ReadOnly" = "11:FALSE" @@ -423,14 +437,14 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_612A13D0372F0BFC20B005B25D5E2A2E" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D5B37F57DCB419E7D11FE9EF26FC6E7C" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" "AssemblyAsmDisplayName" = "8:BAPSControllerAssembly, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86" "ScatterAssemblies" { - "_612A13D0372F0BFC20B005B25D5E2A2E" + "_D5B37F57DCB419E7D11FE9EF26FC6E7C" { "Name" = "8:BAPSControllerAssembly.dll" "Attributes" = "3:512" @@ -454,20 +468,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_69C958EF46CE598A0DF6B5FC83DC2255" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_DE64D31EEDF76B6D5037380CAA999FE3" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Interop.SpeechLib, Version=5.4.0.0, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:BAPSServerAssembly, Version=2.6.2.0, Culture=neutral, processorArchitecture=x86" "ScatterAssemblies" { - "_69C958EF46CE598A0DF6B5FC83DC2255" + "_DE64D31EEDF76B6D5037380CAA999FE3" { - "Name" = "8:Interop.SpeechLib.dll" + "Name" = "8:BAPSServerAssembly.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:Interop.SpeechLib.dll" + "SourcePath" = "8:BAPSServerAssembly.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_7ACEEE10989D49BF98528FEAF5172271" @@ -485,13 +499,24 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6F8569CF96014A7F85DEF880366E37AF" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E4D441FB7F55676EA157970F56DB0343" { - "SourcePath" = "8:..\\Common\\BAPS.dll" - "TargetName" = "8:BAPS.dll" + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Npgsql, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_E4D441FB7F55676EA157970F56DB0343" + { + "Name" = "8:Npgsql.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:Npgsql.dll" + "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_7ACEEE10989D49BF98528FEAF5172271" - "Condition" = "8:" + "Condition" = "8:(COMPONENTCHOICE=2)" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" "ReadOnly" = "11:FALSE" @@ -502,17 +527,17 @@ "PackageAs" = "3:1" "Register" = "3:1" "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" + "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D95AEAB76A9F2EF7ABA531C28620D190" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E54F958F2E720A66411FC17FF7E40E77" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" "AssemblyAsmDisplayName" = "8:Mono.Security, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL" "ScatterAssemblies" { - "_D95AEAB76A9F2EF7ABA531C28620D190" + "_E54F958F2E720A66411FC17FF7E40E77" { "Name" = "8:Mono.Security.dll" "Attributes" = "3:512" @@ -544,7 +569,7 @@ { "{3C67513D-01DD-4637-8A68-80971EB9504F}:_7ACEEE10989D49BF98528FEAF5172271" { - "DefaultLocation" = "8:[ProgramFilesFolder][Manufacturer]\\[ProductName]" + "DefaultLocation" = "8:[ProgramFiles64Folder][Manufacturer]\\[ProductName]" "Name" = "8:#1925" "AlwaysCreate" = "11:FALSE" "Condition" = "8:" @@ -604,8 +629,9 @@ "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:BAPS" "ProductCode" = "8:{42D8CBF4-C691-4E9A-8439-CFCE1999B2D6}" - "PackageCode" = "8:{71EC5CFB-8FD2-4259-B496-4E56D1643B69}" + "PackageCode" = "8:{3ED63891-A331-4E55-9428-E9BF8379B495}" "UpgradeCode" = "8:{8AB7A3FC-F959-49CA-8C15-2D3FB95B1BCE}" + "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" @@ -624,7 +650,7 @@ "ARPIconIndex" = "3:1" "SearchPath" = "8:" "UseSystemSearchPath" = "11:TRUE" - "TargetPlatform" = "3:0" + "TargetPlatform" = "3:1" "PreBuildEvent" = "8:" "PostBuildEvent" = "8:" "RunPostBuildEvent" = "3:0" @@ -1157,249 +1183,6 @@ } } } - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_A95AB52D64204555BCF711D090BC44F8" - { - "Sequence" = "3:300" - "DisplayName" = "8:Supply Credentials (A)" - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdServiceCredentials1Dlg.wid" - "Properties" - { - "BannerBitmap" - { - "Name" = "8:BannerBitmap" - "DisplayName" = "8:#1001" - "Description" = "8:#1101" - "Type" = "3:8" - "ContextData" = "8:Bitmap" - "Attributes" = "3:4" - "Setting" = "3:1" - "UsePlugInResources" = "11:TRUE" - } - "BannerText" - { - "Name" = "8:BannerText" - "DisplayName" = "8:#1014" - "Description" = "8:#1114" - "Type" = "3:3" - "ContextData" = "8:" - "Attributes" = "3:0" - "Setting" = "3:2" - "Value" = "8:Enter credentials for BAPS Server" - "DefaultValue" = "8:#1214" - "UsePlugInResources" = "11:TRUE" - } - "BodyText" - { - "Name" = "8:BodyText" - "DisplayName" = "8:#1015" - "Description" = "8:#1115" - "Type" = "3:3" - "ContextData" = "8:" - "Attributes" = "3:0" - "Setting" = "3:2" - "Value" = "8:If installing the server, please enter the account details for the BAPS Server Process. This account must be able to access all resources used by the BAPS Server." - "DefaultValue" = "8:#1215" - "UsePlugInResources" = "11:TRUE" - } - "ComboBoxProperty" - { - "Name" = "8:ComboBoxProperty" - "DisplayName" = "8:PreconfiguredAccountProperty" - "Description" = "8:The name of the property that will indicate the type of preconfigured account selected." - "Type" = "3:14" - "ContextData" = "8:Public" - "Attributes" = "3:2" - "Setting" = "3:2" - "Value" = "8:SRVCREDA_PREDEFINED" - "DefaultValue" = "8:SRVCREDA_PREDEFINED" - "UsePlugInResources" = "11:TRUE" - } - "ComboBoxValue" - { - "Name" = "8:ComboBoxValue" - "DisplayName" = "8:PreconfiguredAccountValue" - "Description" = "8:Select the default account that will be presented." - "Type" = "3:5" - "ContextData" = "8:2;Local System=2;Local Service=1;Network Service=0" - "Attributes" = "3:0" - "Setting" = "3:0" - "Value" = "3:0" - "DefaultValue" = "3:0" - "UsePlugInResources" = "11:TRUE" - } - "Edit2Label" - { - "Name" = "8:Edit2Label" - "DisplayName" = "8:#1047" - "Description" = "8:#1147" - "Type" = "3:3" - "ContextData" = "8:" - "Attributes" = "3:0" - "Setting" = "3:2" - "Value" = "8:Username:" - "DefaultValue" = "8:#1247" - "UsePlugInResources" = "11:TRUE" - } - "Edit2Property" - { - "Name" = "8:Edit2Property" - "DisplayName" = "8:#1051" - "Description" = "8:#1151" - "Type" = "3:14" - "ContextData" = "8:Public" - "Attributes" = "3:2" - "Setting" = "3:2" - "Value" = "8:SRVCREDA_USR" - "DefaultValue" = "8:SRVCREDA_USR" - "UsePlugInResources" = "11:TRUE" - } - "Edit2Value" - { - "Name" = "8:Edit2Value" - "DisplayName" = "8:#1055" - "Description" = "8:#1155" - "Type" = "3:3" - "ContextData" = "8:" - "Attributes" = "3:0" - "Setting" = "3:1" - "Value" = "8:" - "DefaultValue" = "8:" - "UsePlugInResources" = "11:TRUE" - } - "Edit3Label" - { - "Name" = "8:Edit3Label" - "DisplayName" = "8:#1048" - "Description" = "8:#1148" - "Type" = "3:3" - "ContextData" = "8:" - "Attributes" = "3:0" - "Setting" = "3:2" - "Value" = "8:Password:" - "DefaultValue" = "8:#1248" - "UsePlugInResources" = "11:TRUE" - } - "Edit3Property" - { - "Name" = "8:Edit3Property" - "DisplayName" = "8:#1052" - "Description" = "8:#1152" - "Type" = "3:14" - "ContextData" = "8:Public" - "Attributes" = "3:2" - "Setting" = "3:2" - "Value" = "8:SRVCREDA_PWD" - "DefaultValue" = "8:SRVCREDA_PWD" - "UsePlugInResources" = "11:TRUE" - } - "Edit3Value" - { - "Name" = "8:Edit3Value" - "DisplayName" = "8:#1056" - "Description" = "8:#1156" - "Type" = "3:3" - "ContextData" = "8:" - "Attributes" = "3:0" - "Setting" = "3:1" - "Value" = "8:" - "DefaultValue" = "8:" - "UsePlugInResources" = "11:TRUE" - } - "Edit3Visible" - { - "Name" = "8:Edit3Visible" - "DisplayName" = "8:#1044" - "Description" = "8:#1144" - "Type" = "3:5" - "ContextData" = "8:1;True=1;False=0" - "Attributes" = "3:0" - "Setting" = "3:0" - "Value" = "3:1" - "DefaultValue" = "3:1" - "UsePlugInResources" = "11:TRUE" - } - "Edit4Label" - { - "Name" = "8:Edit4Label" - "DisplayName" = "8:#1049" - "Description" = "8:#1149" - "Type" = "3:3" - "ContextData" = "8:" - "Attributes" = "3:0" - "Setting" = "3:2" - "Value" = "8:Confirm Password:" - "DefaultValue" = "8:#1249" - "UsePlugInResources" = "11:TRUE" - } - "Edit4Property" - { - "Name" = "8:Edit4Property" - "DisplayName" = "8:#1053" - "Description" = "8:#1153" - "Type" = "3:14" - "ContextData" = "8:Public" - "Attributes" = "3:2" - "Setting" = "3:2" - "Value" = "8:SRVCREDA_PWD2" - "DefaultValue" = "8:SRVCREDA_PWD2" - "UsePlugInResources" = "11:TRUE" - } - "Edit4Value" - { - "Name" = "8:Edit4Value" - "DisplayName" = "8:#1057" - "Description" = "8:#1157" - "Type" = "3:3" - "ContextData" = "8:" - "Attributes" = "3:0" - "Setting" = "3:1" - "Value" = "8:" - "DefaultValue" = "8:" - "UsePlugInResources" = "11:TRUE" - } - "Edit4Visible" - { - "Name" = "8:Edit4Visible" - "DisplayName" = "8:#1045" - "Description" = "8:#1145" - "Type" = "3:5" - "ContextData" = "8:1;True=1;False=0" - "Attributes" = "3:0" - "Setting" = "3:0" - "Value" = "3:1" - "DefaultValue" = "3:1" - "UsePlugInResources" = "11:TRUE" - } - "RadioButtonProperty" - { - "Name" = "8:RadioButtonProperty" - "DisplayName" = "8:AccountTypeProperty" - "Description" = "8:The name of the property that will contain whether a predefined account or configured account was specified " - "Type" = "3:14" - "ContextData" = "8:Public" - "Attributes" = "3:2" - "Setting" = "3:2" - "Value" = "8:SRVCREDA_TYPE" - "DefaultValue" = "8:SRVCREDA_TYPE" - "UsePlugInResources" = "11:TRUE" - } - "RadioButtonValue" - { - "Name" = "8:RadioButtonValue" - "DisplayName" = "8:AccountTypeValue" - "Description" = "8:Select the default account type that will be set." - "Type" = "3:5" - "ContextData" = "8:1;Predefined=0;Configurable=1" - "Attributes" = "3:0" - "Setting" = "3:0" - "Value" = "3:0" - "DefaultValue" = "3:0" - "UsePlugInResources" = "11:TRUE" - } - } - } "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_DB7351FF74A84CEE9F9ECA29335BEB10" { "Sequence" = "3:500" @@ -1507,7 +1290,7 @@ { "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_3D5716CC72B24188A23C32648D7C5C3F" { - "SourcePath" = "8:..\\BAPSServerService\\obj\\Release\\BAPSServerService.exe" + "SourcePath" = "8:..\\BAPSServerService\\obj\\Debug\\BAPSServerService.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_7ACEEE10989D49BF98528FEAF5172271" @@ -1533,9 +1316,37 @@ { } } + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_AC1C28AA9FF148079D23451F3C595168" + { + "SourcePath" = "8:..\\..\\BAPSlib\\Win32\\Debug\\BAPS.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_7ACEEE10989D49BF98528FEAF5172271" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + "ProjectOutputGroupRegister" = "3:1" + "OutputConfiguration" = "8:" + "OutputGroupCanonicalName" = "8:Built" + "OutputProjectGuid" = "8:{2EAB373E-2054-4AB5-A2F9-34139FB08AE4}" + "ShowKeyOutput" = "11:TRUE" + "ExcludeFilters" + { + } + } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_E884D04B37754238996327AF7A16BC96" { - "SourcePath" = "8:..\\Release\\BAPSPresenter.exe" + "SourcePath" = "8:..\\Win32\\Debug\\BAPSPresenter.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_7ACEEE10989D49BF98528FEAF5172271" diff --git a/BAPSlib/BAPS.h b/BAPSlib/BAPS.h old mode 100644 new mode 100755 diff --git a/BAPSlib/BAPS.vcproj b/BAPSlib/BAPS.vcproj deleted file mode 100644 index 0c6b2083..00000000 --- a/BAPSlib/BAPS.vcproj +++ /dev/null @@ -1,443 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/BAPSlib/BAPS.vcxproj b/BAPSlib/BAPS.vcxproj new file mode 100755 index 00000000..31e24d54 --- /dev/null +++ b/BAPSlib/BAPS.vcxproj @@ -0,0 +1,500 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {2EAB373E-2054-4AB5-A2F9-34139FB08AE4} + BAPS + 8.1 + + + + DynamicLibrary + v140 + false + MultiByte + + + DynamicLibrary + v140 + false + MultiByte + + + DynamicLibrary + v140 + false + MultiByte + + + DynamicLibrary + v140 + false + MultiByte + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.25431.1 + + + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + MinimumRecommendedRules.ruleset + + + + + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + MinimumRecommendedRules.ruleset + + + + + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + MinimumRecommendedRules.ruleset + + + + + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + MinimumRecommendedRules.ruleset + + + + + + copy $(Platform)\$(Configuration)\BAPS.lib $(Platform)\$(Configuration)\lib\BAPS.lib + $(Platform)\$(Configuration)\lib\BAPS.lib;%(Outputs) + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Debug/BAPS.tlb + + + + Disabled + $(Platform)\$(Configuration)\inc;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;BAPS_EXPORTS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Use + stdafx.h + $(Platform)\$(Configuration)\BAPS.pch + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + Level3 + true + EditAndContinue + Default + + + _DEBUG;%(PreprocessorDefinitions) + 0x0809 + + + odbc32.lib;odbccp32.lib;rpcrt4.lib;strmiids.lib;quartz.lib;%(AdditionalDependencies) + $(Platform)\$(Configuration)\BAPS.dll + true + $(Platform)\lib;%(AdditionalLibraryDirectories) + true + $(Platform)\$(Configuration)\BAPS.pdb + false + + $(Platform)\$(Configuration)\BAPS.lib + MachineX86 + + + + + copy $(Platform)\$(Configuration)\BAPS.lib $(Platform)\$(Configuration)\lib\BAPS.lib + $(Platform)\$(Configuration)\lib\BAPS.lib;%(Outputs) + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Release/BAPS.tlb + + + + MaxSpeed + OnlyExplicitInline + $(Platform)\$(Configuration)\inc;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;BAPS_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreaded + true + Use + stdafx.h + $(Platform)\$(Configuration)\BAPS.pch + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + Level3 + true + Default + EditAndContinue + + + NDEBUG;%(PreprocessorDefinitions) + 0x0809 + + + odbc32.lib;odbccp32.lib;rpcrt4.lib;strmiids.lib;quartz.lib;%(AdditionalDependencies) + $(Platform)\$(Configuration)\BAPS.dll + true + $(Platform)\lib;%(AdditionalLibraryDirectories) + $(Platform)\$(Configuration)\BAPS.pdb + false + + $(Platform)\$(Configuration)\BAPS.lib + MachineX86 + + + + + copy $(Platform)\$(Configuration)\BAPS.lib $(Platform)\$(Configuration)\lib\BAPS.lib + $(Platform)\$(Configuration)\lib\BAPS.lib;%(Outputs) + + + _DEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\Debug/BAPS.tlb + + + + Disabled + $(Platform)\$(Configuration)\inc;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;BAPS_EXPORTS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Use + stdafx.h + $(Platform)\$(Configuration)\BAPS.pch + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + Level3 + true + EditAndContinue + Default + + + _DEBUG;%(PreprocessorDefinitions) + 0x0809 + + + odbc32.lib;odbccp32.lib;rpcrt4.lib;strmiids.lib;quartz.lib;%(AdditionalDependencies) + $(Platform)\$(Configuration)\BAPS.dll + true + $(Platform)\lib;%(AdditionalLibraryDirectories) + true + $(Platform)\$(Configuration)\BAPS.pdb + false + + $(Platform)\$(Configuration)\BAPS.lib + MachineX64 + + + + + copy $(Platform)\$(Configuration)\BAPS.lib $(Platform)\$(Configuration)\lib\BAPS.lib + $(Platform)\$(Configuration)\lib\BAPS.lib;%(Outputs) + + + NDEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\Release/BAPS.tlb + + + + MaxSpeed + OnlyExplicitInline + $(Platform)\$(Configuration)\inc;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;BAPS_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreaded + true + Use + stdafx.h + $(Platform)\$(Configuration)\BAPS.pch + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + Level3 + true + Default + EditAndContinue + + + NDEBUG;%(PreprocessorDefinitions) + 0x0809 + + + odbc32.lib;odbccp32.lib;rpcrt4.lib;strmiids.lib;quartz.lib;%(AdditionalDependencies) + $(Platform)\$(Configuration)\BAPS.dll + true + $(Platform)\lib;%(AdditionalLibraryDirectories) + $(Platform)\$(Configuration)\BAPS.pdb + false + + $(Platform)\$(Configuration)\BAPS.lib + MachineX64 + + + + + Disabled + WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;BAPS_EXPORTS + EnableFastChecks + true + Disabled + WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;BAPS_EXPORTS + EnableFastChecks + true + MaxSpeed + WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;BAPS_EXPORTS + MaxSpeed + WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;BAPS_EXPORTS + + + Disabled + WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;BAPS_EXPORTS + EnableFastChecks + true + Disabled + WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;BAPS_EXPORTS + EnableFastChecks + true + MaxSpeed + WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;BAPS_EXPORTS + MaxSpeed + WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;BAPS_EXPORTS + + + Disabled + WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;BAPS_EXPORTS + EnableFastChecks + true + Disabled + WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;BAPS_EXPORTS + EnableFastChecks + true + MaxSpeed + WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;BAPS_EXPORTS + MaxSpeed + WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;BAPS_EXPORTS + + + Disabled + WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;BAPS_EXPORTS + EnableFastChecks + true + Disabled + WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;BAPS_EXPORTS + EnableFastChecks + true + MaxSpeed + WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;BAPS_EXPORTS + MaxSpeed + WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;BAPS_EXPORTS + + + Disabled + WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;BAPS_EXPORTS + EnableFastChecks + true + Disabled + WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;BAPS_EXPORTS + EnableFastChecks + true + MaxSpeed + WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;BAPS_EXPORTS + MaxSpeed + WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;BAPS_EXPORTS + + + Disabled + WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;BAPS_EXPORTS + EnableFastChecks + Create + true + Disabled + WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;BAPS_EXPORTS + EnableFastChecks + Create + true + MaxSpeed + WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;BAPS_EXPORTS + Create + MaxSpeed + WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;BAPS_EXPORTS + Create + + + + + copy "%(Filename)".h $(Platform)\$(Configuration)\inc\"%(Filename)".h + + $(Platform)\$(Configuration)\inc\%(Filename).h;%(Outputs) + copy "%(Filename)".h $(Platform)\$(Configuration)\inc\"%(Filename)".h + + $(Platform)\$(Configuration)\inc\%(Filename).h;%(Outputs) + copy "%(Filename)".h $(Platform)\$(Configuration)\inc\"%(Filename)".h + + $(Platform)\$(Configuration)\inc\%(Filename).h;%(Outputs) + copy "%(Filename)".h $(Platform)\$(Configuration)\inc\"%(Filename)".h + + $(Platform)\$(Configuration)\inc\%(Filename).h;%(Outputs) + + + copy "%(Filename)".h $(Platform)\$(Configuration)\inc\"%(Filename)".h + + $(Platform)\$(Configuration)\inc\%(Filename).h;%(Outputs) + copy "%(Filename)".h $(Platform)\$(Configuration)\inc\"%(Filename)".h + + $(Platform)\$(Configuration)\inc\%(Filename).h;%(Outputs) + copy "%(Filename)".h $(Platform)\$(Configuration)\inc\"%(Filename)".h + + $(Platform)\$(Configuration)\inc\%(Filename).h;%(Outputs) + copy "%(Filename)".h $(Platform)\$(Configuration)\inc\"%(Filename)".h + + $(Platform)\$(Configuration)\inc\%(Filename).h;%(Outputs) + + + copy "%(Filename)".h $(Platform)\$(Configuration)\inc\"%(Filename)".h + + $(Platform)\$(Configuration)\inc\%(Filename).h;%(Outputs) + copy "%(Filename)".h $(Platform)\$(Configuration)\inc\"%(Filename)".h + + $(Platform)\$(Configuration)\inc\%(Filename).h;%(Outputs) + copy "%(Filename)".h $(Platform)\$(Configuration)\inc\"%(Filename)".h + + $(Platform)\$(Configuration)\inc\%(Filename).h;%(Outputs) + copy "%(Filename)".h $(Platform)\$(Configuration)\inc\"%(Filename)".h + + $(Platform)\$(Configuration)\inc\%(Filename).h;%(Outputs) + + + copy "%(Filename)".h $(Platform)\$(Configuration)\inc\"%(Filename)".h + + $(Platform)\$(Configuration)\inc\%(Filename).h;%(Outputs) + copy "%(Filename)".h $(Platform)\$(Configuration)\inc\"%(Filename)".h + + $(Platform)\$(Configuration)\inc\%(Filename).h;%(Outputs) + copy "%(Filename)".h $(Platform)\$(Configuration)\inc\"%(Filename)".h + + $(Platform)\$(Configuration)\inc\%(Filename).h;%(Outputs) + copy "%(Filename)".h $(Platform)\$(Configuration)\inc\"%(Filename)".h + + $(Platform)\$(Configuration)\inc\%(Filename).h;%(Outputs) + + + copy "%(Filename)".h $(Platform)\$(Configuration)\inc\"%(Filename)".h + + $(Platform)\$(Configuration)\inc\%(Filename).h;%(Outputs) + copy "%(Filename)".h $(Platform)\$(Configuration)\inc\"%(Filename)".h + + $(Platform)\$(Configuration)\inc\%(Filename).h;%(Outputs) + copy "%(Filename)".h $(Platform)\$(Configuration)\inc\"%(Filename)".h + + $(Platform)\$(Configuration)\inc\%(Filename).h;%(Outputs) + copy "%(Filename)".h $(Platform)\$(Configuration)\inc\"%(Filename)".h + + $(Platform)\$(Configuration)\inc\%(Filename).h;%(Outputs) + + + copy "%(Filename)".h $(Platform)\$(Configuration)\inc\"%(Filename)".h + + $(Platform)\$(Configuration)\inc\%(Filename).h;%(Outputs) + copy "%(Filename)".h $(Platform)\$(Configuration)\inc\"%(Filename)".h + + $(Platform)\$(Configuration)\inc\%(Filename).h;%(Outputs) + copy "%(Filename)".h $(Platform)\$(Configuration)\inc\"%(Filename)".h + + $(Platform)\$(Configuration)\inc\%(Filename).h;%(Outputs) + copy "%(Filename)".h $(Platform)\$(Configuration)\inc\"%(Filename)".h + + $(Platform)\$(Configuration)\inc\%(Filename).h;%(Outputs) + + + copy "%(Filename)".h $(Platform)\$(Configuration)\inc\"%(Filename)".h + + $(Platform)\$(Configuration)\inc\%(Filename).h;%(Outputs) + copy "%(Filename)".h $(Platform)\$(Configuration)\inc\"%(Filename)".h + + $(Platform)\$(Configuration)\inc\%(Filename).h;%(Outputs) + copy "%(Filename)".h $(Platform)\$(Configuration)\inc\"%(Filename)".h + + $(Platform)\$(Configuration)\inc\%(Filename).h;%(Outputs) + copy "%(Filename)".h $(Platform)\$(Configuration)\inc\"%(Filename)".h + + $(Platform)\$(Configuration)\inc\%(Filename).h;%(Outputs) + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/BAPSlib/BAPS.vcxproj.filters b/BAPSlib/BAPS.vcxproj.filters new file mode 100755 index 00000000..a44fa66a --- /dev/null +++ b/BAPSlib/BAPS.vcxproj.filters @@ -0,0 +1,68 @@ + + + + + {04a3f65a-b186-438f-a377-a33c89826896} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {6710dd47-107d-47bb-83c6-1bcc5befa772} + h;hpp;hxx;hm;inl + + + {2d84904d-14ce-439b-9e7a-74b8b1c5ce4b} + ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source 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/BAPSlib/BAPSAudioOutput.h b/BAPSlib/BAPSAudioOutput.h old mode 100644 new mode 100755 diff --git a/BAPSlib/BAPSAudioOutputChannel.cpp b/BAPSlib/BAPSAudioOutputChannel.cpp index cf461bbc..68ba382c 100644 --- a/BAPSlib/BAPSAudioOutputChannel.cpp +++ b/BAPSlib/BAPSAudioOutputChannel.cpp @@ -200,7 +200,8 @@ DWORD CBAPSAudioOutputChannel::EventMonitorThreadProc() HRESULT hr; HANDLE hObject[2]; BOOL bExit; - long lEventCode, lParam1, lParam2; + long lEventCode; + LONG_PTR lParam1, lParam2; // Get the DirectShow event hr = m_pMediaEvent->GetEventHandle((OAEVENT*)&hObject[0]); diff --git a/BAPSlib/BAPSAudioOutputChannel.h b/BAPSlib/BAPSAudioOutputChannel.h old mode 100644 new mode 100755 diff --git a/BAPSlib/BAPSAudioOutputChannels.h b/BAPSlib/BAPSAudioOutputChannels.h old mode 100644 new mode 100755 diff --git a/BAPSlib/BAPSAudioOutputDevice.h b/BAPSlib/BAPSAudioOutputDevice.h old mode 100644 new mode 100755 diff --git a/BAPSlib/BAPSAudioOutputDevices.h b/BAPSlib/BAPSAudioOutputDevices.h old mode 100644 new mode 100755 diff --git a/BAPSlib/BAPSCommon.h b/BAPSlib/BAPSCommon.h old mode 100644 new mode 100755 diff --git a/BAPSlib/BAPSTest/BAPSTest.vcproj b/BAPSlib/BAPSTest/BAPSTest.vcproj deleted file mode 100644 index 874ca288..00000000 --- a/BAPSlib/BAPSTest/BAPSTest.vcproj +++ /dev/null @@ -1,231 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/BAPSlib/BAPSTest/BAPSTest.vcxproj b/BAPSlib/BAPSTest/BAPSTest.vcxproj new file mode 100755 index 00000000..51fbeb3c --- /dev/null +++ b/BAPSlib/BAPSTest/BAPSTest.vcxproj @@ -0,0 +1,326 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {87038750-A2E1-4F9D-8EA3-19BC6E2B371B} + + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.25431.1 + + + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + MinimumRecommendedRules.ruleset + + + + + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + MinimumRecommendedRules.ruleset + + + + + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + MinimumRecommendedRules.ruleset + + + + + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + MinimumRecommendedRules.ruleset + + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + $(Platform)\$(Configuration)\BAPSTest.tlb + + + + Disabled + ..\$(Platform)\$(Configuration)\inc;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Use + stdafx.h + $(Platform)\$(Configuration)\BAPSTest.pch + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + Level3 + true + EditAndContinue + Default + + + _DEBUG;%(PreprocessorDefinitions) + 0x0809 + + + odbc32.lib;odbccp32.lib;BAPS.lib;%(AdditionalDependencies) + ..\$(Platform)\$(Configuration)\bin\BAPSTest.exe + true + ..\$(Platform)\$(Configuration)\lib;%(AdditionalLibraryDirectories) + true + $(Platform)\$(Configuration)\BAPSTest.pdb + Windows + false + + MachineX86 + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + $(Platform)\$(Configuration)\BAPSTest.tlb + + + + MaxSpeed + OnlyExplicitInline + ..\$(Platform)\$(Configuration)\inc;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreaded + true + Use + stdafx.h + $(Platform)\$(Configuration)\BAPSTest.pch + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + Level3 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0809 + + + ..\$(Platform)\$(Configuration)\bin\BAPSTest.exe + true + ..\$(Platform)\$(Configuration)\lib;%(AdditionalLibraryDirectories) + $(Platform)\$(Configuration)\BAPSTest.pdb + Windows + false + + MachineX86 + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + X64 + $(Platform)\$(Configuration)\BAPSTest.tlb + + + + Disabled + ..\$(Platform)\$(Configuration)\inc;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Use + stdafx.h + $(Platform)\$(Configuration)\BAPSTest.pch + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + Level3 + true + ProgramDatabase + Default + + + _DEBUG;%(PreprocessorDefinitions) + 0x0809 + + + odbc32.lib;odbccp32.lib;BAPS.lib;%(AdditionalDependencies) + ..\$(Platform)\$(Configuration)\bin\BAPSTest.exe + true + ..\$(Platform)\$(Configuration)\lib;%(AdditionalLibraryDirectories) + true + $(Platform)\$(Configuration)\BAPSTest.pdb + Windows + false + + MachineX64 + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + X64 + $(Platform)\$(Configuration)\BAPSTest.tlb + + + + MaxSpeed + OnlyExplicitInline + ..\$(Platform)\$(Configuration)\inc;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreaded + true + Use + stdafx.h + $(Platform)\$(Configuration)\BAPSTest.pch + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + Level3 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0809 + + + ..\$(Platform)\$(Configuration)\bin\BAPSTest.exe + true + ..\$(Platform)\$(Configuration)\lib;%(AdditionalLibraryDirectories) + $(Platform)\$(Configuration)\BAPSTest.pdb + Windows + false + + MachineX64 + + + + + Disabled + EnableFastChecks + true + Disabled + EnableFastChecks + true + MaxSpeed + MaxSpeed + + + Disabled + EnableFastChecks + Create + true + Disabled + EnableFastChecks + Create + true + MaxSpeed + Create + MaxSpeed + Create + + + + + + + + + + + + + + + + + + + + {2eab373e-2054-4ab5-a2f9-34139fb08ae4} + false + + + + + + diff --git a/BAPSlib/BAPSTest/BAPSTest.vcxproj.filters b/BAPSlib/BAPSTest/BAPSTest.vcxproj.filters new file mode 100755 index 00000000..6d4a8f53 --- /dev/null +++ b/BAPSlib/BAPSTest/BAPSTest.vcxproj.filters @@ -0,0 +1,52 @@ + + + + + {15b8bf93-e5ec-4b3e-9a49-e38cae9677e9} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {55c667d6-2c38-4c5c-bee6-a0ed3ce7f858} + h;hpp;hxx;hm;inl + + + {0583cf6e-3079-4b1d-93f5-8234503ecacb} + ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe + + + + + Source Files + + + Source Files + + + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + Resource Files + + + + + + \ No newline at end of file diff --git a/Common/BAPS.dll b/Common/BAPS.dll deleted file mode 100644 index 636fbb7f82e33eef4de9ec43a15f2a6c8586ee28..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 118784 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 diff --git a/Common/bapsinc/BAPS.h b/Common/bapsinc/BAPS.h deleted file mode 100644 index 46f13259..00000000 --- a/Common/bapsinc/BAPS.h +++ /dev/null @@ -1,11 +0,0 @@ -// BAPS.h - - -#ifndef INCLUDED_BAPS_H -#define INCLUDED_BAPS_H - - -#include "BAPSAudioOutput.h" - - -#endif //INCLUDED_BAPS_H \ No newline at end of file diff --git a/Common/bapsinc/BAPSAudioOutput.h b/Common/bapsinc/BAPSAudioOutput.h deleted file mode 100644 index 8c18772a..00000000 --- a/Common/bapsinc/BAPSAudioOutput.h +++ /dev/null @@ -1,52 +0,0 @@ -// BAPSAudioOutput.h - - -#ifndef INCLUDED_BAPSAUDIOOUTPUT_H -#define INCLUDED_BAPSAUDIOOUTPUT_H - - -#include "BAPSCommon.h" -#include "BAPSAudioOutputChannels.h" -#include "BAPSAudioOutputDevices.h" - - -class BAPS_API CBAPSAudioOutput -{ - - -public: - - // Constructor - CBAPSAudioOutput(); - - // Destructor - ~CBAPSAudioOutput(); - - -public: - - // Initialises BAPS audio output ready for use - BOOL BAPS_CALL Initialise(int iNumberOfChannels, NotifyCallback _callback); - - // Returns the collection of audio output channels - CBAPSAudioOutputChannels* BAPS_CALL GetAudioOutputChannels(); - - // Returns the collection of audio output devices - CBAPSAudioOutputDevices* BAPS_CALL GetAudioOutputDevices(); - - -protected: - - // Deletes objects, frees memory, etc. - void CleanUp(); - - // The collection of channels - CBAPSAudioOutputChannels* m_pChannels; - - // The collection of devices - CBAPSAudioOutputDevices* m_pDevices; - -}; - - -#endif //INCLUDED_BAPSAUDIOOUTPUT_H \ No newline at end of file diff --git a/Common/bapsinc/BAPSAudioOutputChannel.h b/Common/bapsinc/BAPSAudioOutputChannel.h deleted file mode 100644 index e6be87fe..00000000 --- a/Common/bapsinc/BAPSAudioOutputChannel.h +++ /dev/null @@ -1,132 +0,0 @@ -// BAPSAudioOutputChannel.h - - -#ifndef INCLUDED_BAPSAUDIOOUTPUTCHANNEL_H -#define INCLUDED_BAPSAUDIOOUTPUTCHANNEL_H - - -#include "BAPSCommon.h" -#include "BAPSAudioOutputDevice.h" - -// Function pointer for notifying a channel has stopped -typedef void (*NotifyCallback)(int); - -// Still need to implement current graph state / play state -// and send events when they change - -// Might be worth doing loading etc on a different thread -// to keep the client application responsive - - -class BAPS_API CBAPSAudioOutputChannel -{ - - friend class CBAPSAudioOutputChannels; - - -public: - - // Sets the audio output device for this channel - BOOL BAPS_CALL SetDevice(CBAPSAudioOutputDevice* pDevice); - - // Gets the audio output device - CBAPSAudioOutputDevice* BAPS_CALL GetDevice(); - - // Loads a new file into the channel - BOOL BAPS_CALL LoadFile(LPCWSTR szFileName); - - // Starts/resumes playback of the current file - BOOL BAPS_CALL Play(); - - // Suspends playback of the current file - BOOL BAPS_CALL Pause(); - - // Suspends playback of the current file and resets the position to the start - BOOL BAPS_CALL Stop(); - - // Returns the duration of the current file - int BAPS_CALL GetDuration(); - - // Gets and sets the playback position within the current file - int BAPS_CALL GetPosition(); - void BAPS_CALL SetPosition(int iPosition); - - // Gets and sets this channel's output volume - // Range: 0.0 (silence) - 1.0 (maximum) - float BAPS_CALL GetVolume(); - void BAPS_CALL SetVolume(float fVolume); - - // Gets and sets the channel's panning - // Range -1.0 (fully left) - 1.0 (fully right) - float BAPS_CALL GetPan(); - void BAPS_CALL SetPan(float fPan); - - -protected: - - // Constructor - CBAPSAudioOutputChannel(); - - // Destructor - ~CBAPSAudioOutputChannel(); - - // Sets the windows handle to which the object should send its messages - // and tells it its index in the collection - BOOL Initialise(int iIndex, NotifyCallback _callback); - - // Releases interfaces, deletes objects, etc. - void CleanUp(); - - // Event monitoring thread procedures - static DWORD WINAPI EventMonitorThreadProc(void* pParameter); - DWORD EventMonitorThreadProc(); - - __inline int ReferenceTimeToMilliseconds(LONGLONG* pllTime); - __inline LONGLONG MillisecondsToReferenceTime(int nMilliseconds); - - -protected: - - // BAPS audio output device - CBAPSAudioOutputDevice* m_pOutputDevice; - - // Graph builder - IGraphBuilder* m_pGraphBuilder; - - // Media control - IMediaControl* m_pMediaControl; - - // Media event - IMediaEvent* m_pMediaEvent; - - // Media seeking - IMediaSeeking* m_pMediaSeeking; - - // Basic Audio - IBasicAudio* m_pBasicAudio; - - // Renderer filter - IBaseFilter* m_pRendererFilter; - - // Source filter - IBaseFilter* m_pSourceFilter; - - // Index of this object in the channels collection - int m_iIndex; - - // Handle of the DirectShow event monitoring thread - HANDLE m_hEventMonitorThread; - - // Event that's signalled when event monitoring should stop - HANDLE m_hStopEventMonitorEvent; - - // The current state of the graph - FILTER_STATE m_FilterState; - - // The callback - NotifyCallback callback; - -}; - - -#endif //INCLUDED_BAPSAUDIOOUTPUTCHANNEL_H \ No newline at end of file diff --git a/Common/bapsinc/BAPSAudioOutputChannels.h b/Common/bapsinc/BAPSAudioOutputChannels.h deleted file mode 100644 index 353ff96a..00000000 --- a/Common/bapsinc/BAPSAudioOutputChannels.h +++ /dev/null @@ -1,59 +0,0 @@ -// BAPSAudioOutputChannels.h - - -#ifndef INCLUDED_BAPSAUDIOOUTPUTCHANNELS_H -#define INCLUDED_BAPSAUDIOOUTPUTCHANNELS_H - - -#include "BAPSCommon.h" -#include "BAPSAudioOutputChannel.h" - - -#define BAPS_MAX_CHANNELS 16 - - -class BAPS_API CBAPSAudioOutputChannels -{ - - friend class CBAPSAudioOutput; - - -public: - - // Returns the number of channels - int BAPS_CALL GetCount(); - - // Returns the specified channel - CBAPSAudioOutputChannel* BAPS_CALL GetChannel(int iIndex); - - -protected: - - //Constructor - CBAPSAudioOutputChannels(); - - //Destructor - ~CBAPSAudioOutputChannels(); - - // Sets the notification window and creates the specified number of channels - BOOL Initialise(int iNumberOfChannels, NotifyCallback _callback); - - // Deletes objects and frees memory - void CleanUp(); - - -protected: - - // The number of channels - int m_iChannelCount; - - // An array of channel pointers - CBAPSAudioOutputChannel* m_arpChannel[BAPS_MAX_CHANNELS]; - - // The notification callback for channel stopped - NotifyCallback callback; - -}; - - -#endif //INCLUDED_BAPSAUDIOOUTPUTCHANNELS_H diff --git a/Common/bapsinc/BAPSAudioOutputDevice.h b/Common/bapsinc/BAPSAudioOutputDevice.h deleted file mode 100644 index ce956fef..00000000 --- a/Common/bapsinc/BAPSAudioOutputDevice.h +++ /dev/null @@ -1,71 +0,0 @@ -// BAPSAudioOutputDevice.h - - -#ifndef INCLUDED_BAPSAUDIOOUTPUTDEVICE_H -#define INCLUDED_BAPSAUDIOOUTPUTDEVICE_H - - -#include "BAPSCommon.h" - - -class BAPS_API CBAPSAudioOutputDevice -{ - - friend class CBAPSAudioOutputDevices; - friend class CBAPSAudioOutputChannel; - - -public: - - // Returns the description of the device - // WARNING: Returns a pointer to our string - don't change or free it! - LPCWSTR BAPS_CALL GetDescription(); - - // Returns the device's module name - // WARNING: Returns a pointer to our string - don't change or free it! - LPCWSTR BAPS_CALL GetModule(); - - // Returns the device's unique ID - // WARNING: As above - LPCWSTR BAPS_CALL GetID(); - - -protected: - - // Constructor - CBAPSAudioOutputDevice(); - - // Destructor - ~CBAPSAudioOutputDevice(); - - // Sets the device info - BOOL Initialise(IMoniker* pDeviceMoniker); - - // Returns the string GUID of the device - // WARNING: Returns a pointer to our string - don't change or free it! - LPCWSTR GetGUID(); - - // Takes a pointer to a string pointer and if the string pointer is NULL, - // it assigns an empty string to it - void NullToEmptyString(LPWSTR* pszString); - - // Frees memory and stuff - void CleanUp(); - - -protected: - - // The description - LPWSTR m_szDescription; - - // The module - LPWSTR m_szModule; - - // The GUID - LPWSTR m_szGUID; - - -}; - - -#endif //INCLUDED_BAPSAUDIOOUTPUTDEVICE_H \ No newline at end of file diff --git a/Common/bapsinc/BAPSAudioOutputDevices.h b/Common/bapsinc/BAPSAudioOutputDevices.h deleted file mode 100644 index dfc7ddcd..00000000 --- a/Common/bapsinc/BAPSAudioOutputDevices.h +++ /dev/null @@ -1,68 +0,0 @@ -// BAPSAudioOutputDevices.h - - -#ifndef INCLUDED_BAPSAUDIOOUTPUTDEVICES_H -#define INCLUDED_BAPSAUDIOOUTPUTDEVICES_H - - -#include "BAPSCommon.h" -#include "BAPSAudioOutputDevice.h" - - -#define BAPS_MAX_DEVICES 32 - - -class BAPS_API CBAPSAudioOutputDevices -{ - - friend class CBAPSAudioOutput; - - -public: - - // Returns the number of devices - int BAPS_CALL GetCount(); - - // Returns the device at the specified index - CBAPSAudioOutputDevice* BAPS_CALL GetDevice(int iIndex); - - // Returns the device with the specified identifier - // Can pass NULL for the default audio device - CBAPSAudioOutputDevice* BAPS_CALL GetDevice(LPCWSTR szID); - - // Constructor - CBAPSAudioOutputDevices(); - - // Destructor - ~CBAPSAudioOutputDevices(); - - // Enumerates the available devices ready for use - BOOL Initialise(); - -protected: - - // The callback function for Direct Sound device enumeration - static BOOL CALLBACK DSDeviceEnumCallback(LPGUID lpGUID, LPCTSTR szDescription, LPCTSTR szModule, LPVOID lpContext); - - // The callback handler - BOOL DSDeviceEnumCallback(LPGUID lpGUID, LPCTSTR szDescription, LPCTSTR szModule); - - // Free memory and stuff - void CleanUp(); - - -protected: - - // The number of devices - int m_iDeviceCount; - - // An array of device object pointers - CBAPSAudioOutputDevice* m_arpDevice[BAPS_MAX_DEVICES]; - - // Whether the enumeration succeeded - BOOL m_bEnumerateSuccess; - -}; - - -#endif //INCLUDED_BAPSAUDIOOUTPUTDEVICES_H \ No newline at end of file diff --git a/Common/bapsinc/BAPSCommon.h b/Common/bapsinc/BAPSCommon.h deleted file mode 100644 index 2b0aec26..00000000 --- a/Common/bapsinc/BAPSCommon.h +++ /dev/null @@ -1,37 +0,0 @@ -// BAPSCommon.h - - -#ifndef INCLUDED_BAPSCOMMON_H -#define INCLUDED_BAPSCOMMON_H - - -#ifdef BAPS_EXPORTS -#define BAPS_API __declspec(dllexport) -#else -#define BAPS_API __declspec(dllimport) -#endif - -#define BAPS_CALL __stdcall - -#define _CRT_SECURE_NO_DEPRECATE -#define _USE_MATH_DEFINES -#include -#include -#include -#include - - -// The (only) BAPS window message -// wParam is a member of the BAPSEventType enumeration -// lParam is the index of the channel that sent the message -#define WM_BAPS_CHANNEL_EVENT (WM_APP + 0x1000) - -typedef enum -{ - ChannelPlay, - ChannelStop, - ChannelPlaybackComplete -} BAPSEventType; - - -#endif //INCLUDED_BAPSCOMMON_H \ No newline at end of file diff --git a/Common/lib/BAPS.lib b/Common/lib/BAPS.lib deleted file mode 100644 index 563cf33a58c0b983cb60309d3b5b983cfe08450c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21266 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 LVRIfOu)_ZVVbv$s diff --git a/Tinker/Tinker.vcproj b/Tinker/Tinker.vcproj index 1ab629a9..fb45d0e2 100644 --- a/Tinker/Tinker.vcproj +++ b/Tinker/Tinker.vcproj @@ -12,6 +12,9 @@ + @@ -161,6 +164,153 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -211,6 +362,22 @@ UsePrecompiledHeader="1" /> + + + + + + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {72C648CC-A0E6-4439-8474-76BE38A621B4} + Tinker + ManagedCProj + 8.1 + + + + Application + v140 + Unicode + true + true + + + Application + v140 + Unicode + true + + + Application + v140 + Unicode + true + true + + + Application + v140 + Unicode + true + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.25431.1 + + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + false + + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + + + + Disabled + WIN32;_DEBUG;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + Use + Level3 + ProgramDatabase + true + + + + true + true + false + + MachineX86 + + + true + + + + + WIN32;NDEBUG;%(PreprocessorDefinitions) + MultiThreadedDLL + Use + Level3 + ProgramDatabase + + + + true + false + + MachineX86 + + + + + X64 + + + Disabled + WIN32;_DEBUG;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + Use + Level3 + ProgramDatabase + + + + true + true + false + + MachineX64 + + + + + X64 + + + WIN32;NDEBUG;%(PreprocessorDefinitions) + MultiThreadedDLL + Use + Level3 + ProgramDatabase + + + + true + false + + MachineX64 + + + + + true + true + + + true + true + + + true + true + + + + + {e1ceee2e-df20-4929-80bd-d73e896c5245} + true + true + + + + + + Create + Create + Create + Create + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Tinker/Tinker.vcxproj.filters b/Tinker/Tinker.vcxproj.filters new file mode 100755 index 00000000..0b2d1d14 --- /dev/null +++ b/Tinker/Tinker.vcxproj.filters @@ -0,0 +1,55 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + + + Resource Files + + + + + + \ No newline at end of file diff --git a/TinkerInCSharp/Properties/Resources.Designer.cs b/TinkerInCSharp/Properties/Resources.Designer.cs index cab0166a..57ba1b38 100644 --- a/TinkerInCSharp/Properties/Resources.Designer.cs +++ b/TinkerInCSharp/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.3623 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -19,7 +19,7 @@ namespace TinkerInCSharp.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -60,6 +60,9 @@ internal Resources() { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap marble2 { get { object obj = ResourceManager.GetObject("marble2", resourceCulture); diff --git a/TinkerInCSharp/Properties/Settings.Designer.cs b/TinkerInCSharp/Properties/Settings.Designer.cs index bbbae70d..5c19288b 100644 --- a/TinkerInCSharp/Properties/Settings.Designer.cs +++ b/TinkerInCSharp/Properties/Settings.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.3623 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -12,7 +12,7 @@ namespace TinkerInCSharp.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/TinkerInCSharp/TinkerInCSharp.csproj b/TinkerInCSharp/TinkerInCSharp.csproj index 71267e5d..a8a81c32 100644 --- a/TinkerInCSharp/TinkerInCSharp.csproj +++ b/TinkerInCSharp/TinkerInCSharp.csproj @@ -1,4 +1,5 @@ - + + Debug AnyCPU @@ -11,9 +12,11 @@ TinkerInCSharp - 2.0 + 3.5 + v4.0 + true @@ -63,6 +66,7 @@ Resources.resx True + SettingsSingleFileGenerator Settings.Designer.cs diff --git a/TinkerInCSharp/app.config b/TinkerInCSharp/app.config new file mode 100755 index 00000000..fcd0c937 --- /dev/null +++ b/TinkerInCSharp/app.config @@ -0,0 +1,3 @@ + + + diff --git a/TinkerInCSharp/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll b/TinkerInCSharp/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll deleted file mode 100644 index e9aba9a03d3df7c2a636c80a5ee99d57bf70345c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4608 zcmeHKU5p$@5w4!y+g-2kF5V5cY{g3Ed^S3t$>idkl{k=i@AiIt;Ip0E^Tk9K_Uvrm z-Xya#o1R(Q=Ld5LB?2iAMkqWWAw`jp{9q-H6p08#NR&K83Kn_E1LA=QAwWC;Zy^JC?ISWqwu=H$5u9Aiee)nj6TO1Yz{Ft0b_3J)^GF-$;B(7RD^tTH{gZ;cuLz~dINv;6;_$Jzlm!24PAiQ;vve7?;~S_iE-X*1oJq;5{-eCQwz|pB?Byk&S(Ip#M-E<58;G9 ztcvxmgfK8SHiQKcn8pUrjNfaF4TCcd{nNECPm3fv9P5jRtqJSM#KVUl27&l_fY-47 z=vAVBU_1*2qqRu6elui=Wkly3#?do1x(S?*XmtL}!VJc@KwpOAqtjkc2h9yC#FIN; z7Mv#ZckvMIiqD4ELACA(p0)@!63cOlV4WV}vz}vFxR6+$gPju8wy+$tq{)TSR zFdY*UB1bpG3xGcdEYhg4-N@0R@hITa2J>GuB;>!Z;RnW>Mv-!vzX0B+;TJR7(PXDM zRy*hcI*RCMO650XQ_ zA`5xDC@i|0R^Z(s`TnB0~%vEKzYC%Vw>H7*p~K3WEOjyHpEt=TY2(hyw4M^UfjO47&JPb ze4I|Jpe_|3vrl&8BgljkbAdFlmggf<46Nhp#@Xv%&ZIw^m>8k6gT9T_$Nd#y1*^cdnw7lN# zdc*i}+i!RhhD1!wsi2i`5*x7ILuTnb3Pahdd+R#PQz?O!{mIvA2fp+pWWV%iw&5ZX zrd4n$v~h?%%lam25#oTX(P`6{r@phM0^hwN8~S3+FOy3?J%gI8P!W98h8nGr4XTa$ zaT;R)jAtWAN>pu&mh>1<2V6(vbXQBSsq5-~I9C1pukD*O9+|pv{l#DJ`QiI7P~k^c z&aLd3{OH@6TzLq+ltJ-Cl_?J~D4|A+a;b3h*!i!QJ}f@Uyq(zs&jOSf?8Kr$<_|J8 zm^Fnc448%(9X@;2 zZ;nLy{?db4lgdYOti60BpU;$s%0osr4-3KDI}CI4#@_PI0oYJ_tRRy5c2>|=7F|aL zVXzumD{hEHsYRWJ8(8rf!Jeed?{qFt{v2Z8oa`|*`qgO>GxQVcfJ~^8P8j^ zU7vK7lv0;hmbi0(%t}x6zs7|A9@$N_u~k+4isOVn#%HM-7xsgT0tJ4 z2b@K=){xn!=p^U`z&YUDewzLBZGM6K8-F))L!xbYwU{@9E})g~#~khhf6MT#S;Z~k zwqLJW#;gr)hjJ|u0 z*3;gyj|tfcWJphT1+oejxv(_0Wdb+3*9o>BfINE>X;~k(dx)1!EztC-Yk`F*ah-7C znXffjs1jT^8qmjIsYGMij}w?}>Rqb3%B*Wony5eg`@}?#v`wcHK1YjfN+ZwI|K7Gq z9k;mhHBjRmSkWK7Ufei__}!w{Ou@?#KDBUK9<9TJf42@xKfBG0e>1+tAD91cpScM9 E6YUMNIRF3v diff --git a/TinkerInCSharp/obj/Debug/build.force b/TinkerInCSharp/obj/Debug/build.force deleted file mode 100644 index e69de29b..00000000 diff --git a/TinkerInCSharp/obj/Release/ResolveAssemblyReference.cache b/TinkerInCSharp/obj/Release/ResolveAssemblyReference.cache deleted file mode 100644 index 66401ba32e58d2747fc526dd3c474e54c8715050..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7556 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 diff --git a/TinkerInCSharp/obj/Release/TinkerInCSharp.csproj.FileListAbsolute.txt b/TinkerInCSharp/obj/Release/TinkerInCSharp.csproj.FileListAbsolute.txt deleted file mode 100644 index 34f3dee2..00000000 --- a/TinkerInCSharp/obj/Release/TinkerInCSharp.csproj.FileListAbsolute.txt +++ /dev/null @@ -1,20 +0,0 @@ -C:\Documents and Settings\ury\My Documents\Ripper\BAPS2\TinkerInCSharp\bin\Release\TinkerInCSharp.exe -C:\Documents and Settings\ury\My Documents\Ripper\BAPS2\TinkerInCSharp\bin\Release\TinkerInCSharp.pdb -C:\Documents and Settings\ury\My Documents\Ripper\BAPS2\TinkerInCSharp\bin\Release\BAPSFormControls.dll -C:\Documents and Settings\ury\My Documents\Ripper\BAPS2\TinkerInCSharp\bin\Release\BAPSFormControls.pdb -C:\Documents and Settings\ury\My Documents\Ripper\BAPS2\TinkerInCSharp\obj\Release\ResolveAssemblyReference.cache -C:\Documents and Settings\ury\My Documents\Ripper\BAPS2\TinkerInCSharp\obj\Release\TinkerInCSharp.Form1.resources -C:\Documents and Settings\ury\My Documents\Ripper\BAPS2\TinkerInCSharp\obj\Release\TinkerInCSharp.Properties.Resources.resources -C:\Documents and Settings\ury\My Documents\Ripper\BAPS2\TinkerInCSharp\obj\Release\TinkerInCSharp.csproj.GenerateResource.Cache -C:\Documents and Settings\ury\My Documents\Ripper\BAPS2\TinkerInCSharp\obj\Release\TinkerInCSharp.exe -C:\Documents and Settings\ury\My Documents\Ripper\BAPS2\TinkerInCSharp\obj\Release\TinkerInCSharp.pdb -H:\baps2\TinkerInCSharp\bin\Release\TinkerInCSharp.exe -H:\baps2\TinkerInCSharp\bin\Release\TinkerInCSharp.pdb -H:\baps2\TinkerInCSharp\bin\Release\BAPSFormControls.dll -H:\baps2\TinkerInCSharp\bin\Release\BAPSFormControls.pdb -H:\baps2\TinkerInCSharp\obj\Release\ResolveAssemblyReference.cache -H:\baps2\TinkerInCSharp\obj\Release\TinkerInCSharp.Form1.resources -H:\baps2\TinkerInCSharp\obj\Release\TinkerInCSharp.Properties.Resources.resources -H:\baps2\TinkerInCSharp\obj\Release\TinkerInCSharp.csproj.GenerateResource.Cache -H:\baps2\TinkerInCSharp\obj\Release\TinkerInCSharp.exe -H:\baps2\TinkerInCSharp\obj\Release\TinkerInCSharp.pdb diff --git a/TinkerInCSharp/obj/Release/TinkerInCSharp.csproj.GenerateResource.Cache b/TinkerInCSharp/obj/Release/TinkerInCSharp.csproj.GenerateResource.Cache deleted file mode 100644 index d9837addf667c5d623193b28c631b3bbc83c8791..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 888 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 diff --git a/Tinkerinc++/Tinkerinc++.vcproj b/Tinkerinc++/Tinkerinc++.vcproj index 8e30cab0..51deb156 100644 --- a/Tinkerinc++/Tinkerinc++.vcproj +++ b/Tinkerinc++/Tinkerinc++.vcproj @@ -12,6 +12,9 @@ + @@ -165,6 +168,157 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {8633265B-8675-489E-BB7B-DAD384B287A1} + Tinkerinc + ManagedCProj + 8.1 + + + + Application + v140 + Unicode + Pure + true + + + Application + v140 + Unicode + Pure + + + Application + v140 + Unicode + Pure + true + + + Application + v140 + Unicode + Pure + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.25431.1 + + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + false + + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + + + + Disabled + WIN32;_DEBUG;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + Use + Level3 + ProgramDatabase + true + + + + true + true + Windows + main + false + + MachineX86 + + + true + + + + + WIN32;NDEBUG;%(PreprocessorDefinitions) + MultiThreadedDLL + Use + Level3 + ProgramDatabase + + + + true + Windows + main + false + + MachineX86 + + + + + X64 + + + Disabled + WIN32;_DEBUG;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + Use + Level3 + ProgramDatabase + + + + true + true + Windows + main + false + + MachineX64 + + + + + X64 + + + WIN32;NDEBUG;%(PreprocessorDefinitions) + MultiThreadedDLL + Use + Level3 + ProgramDatabase + + + + true + Windows + main + false + + MachineX64 + + + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + + + + Create + Create + Create + Create + + + + + + CppForm + + + + + + + + + + + + + + + + Form1.h + Designer + + + + + + \ No newline at end of file diff --git a/Tinkerinc++/Tinkerinc++.vcxproj.filters b/Tinkerinc++/Tinkerinc++.vcxproj.filters new file mode 100755 index 00000000..22ca9f51 --- /dev/null +++ b/Tinkerinc++/Tinkerinc++.vcxproj.filters @@ -0,0 +1,57 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + + + Resource Files + + + + + + + + Resource Files + + + \ No newline at end of file From 69e2bd2f83bf15470327d9f94c38de1ec1f44c3d Mon Sep 17 00:00:00 2001 From: Andy Durant Date: Sun, 29 Jan 2017 00:35:41 +0000 Subject: [PATCH 02/24] fix include paths --- BAPS2.sln | 4 ++-- BAPSPresenter/BAPSPresenter.vcxproj | 8 +++---- BAPSServerAssembly/BAPSServerAssembly.vcxproj | 19 ++++++----------- .../BAPSServerAssembly.vcxproj.filters | 21 ------------------- 4 files changed, 12 insertions(+), 40 deletions(-) diff --git a/BAPS2.sln b/BAPS2.sln index 3433703e..a50be16f 100644 --- a/BAPS2.sln +++ b/BAPS2.sln @@ -23,9 +23,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BAPSFormControls", "BAPSFor EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BAPSControllerAssembly", "BAPSController\BAPSController.vcxproj", "{E1CEEE2E-DF20-4929-80BD-D73E896C5245}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BAPS", "..\BAPSlib\BAPS.vcxproj", "{2EAB373E-2054-4AB5-A2F9-34139FB08AE4}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BAPS", "BAPSlib\BAPS.vcxproj", "{2EAB373E-2054-4AB5-A2F9-34139FB08AE4}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BAPSTest", "..\BAPSlib\BAPSTest\BAPSTest.vcxproj", "{87038750-A2E1-4F9D-8EA3-19BC6E2B371B}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BAPSTest", "BAPSlib\BAPSTest\BAPSTest.vcxproj", "{87038750-A2E1-4F9D-8EA3-19BC6E2B371B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/BAPSPresenter/BAPSPresenter.vcxproj b/BAPSPresenter/BAPSPresenter.vcxproj index fa789a67..e36fbf43 100755 --- a/BAPSPresenter/BAPSPresenter.vcxproj +++ b/BAPSPresenter/BAPSPresenter.vcxproj @@ -98,7 +98,7 @@ Disabled - ../Common;..\..\BAPSLib\$(Platform)\$(Configuration);..\..\BAPSLib\$(Platform)\$(Configuration)\inc;%(AdditionalIncludeDirectories) + ..\Common;..\BAPSLib\$(Platform)\$(Configuration);..\BAPSLib\$(Platform)\$(Configuration)\inc;%(AdditionalIncludeDirectories) WIN32;_DEBUG;%(PreprocessorDefinitions) MultiThreadedDebugDLL Use @@ -128,7 +128,7 @@ ..\release\BAPSPresenterHelp.chm;%(Outputs) - ../Common;..\..\BAPSLib\$(Platform)\$(Configuration);..\..\BAPSLib\$(Platform)\$(Configuration)\inc;%(AdditionalIncludeDirectories) + ..\Common;..\BAPSLib\$(Platform)\$(Configuration);..\BAPSLib\$(Platform)\$(Configuration)\inc;%(AdditionalIncludeDirectories) WIN32;NDEBUG;%(PreprocessorDefinitions) MultiThreadedDLL Use @@ -157,7 +157,7 @@ Disabled - ../Common;..\..\BAPSLib\$(Platform)\$(Configuration);..\..\BAPSLib\$(Platform)\$(Configuration)\inc;%(AdditionalIncludeDirectories) + ..\Common;..\BAPSLib\$(Platform)\$(Configuration);..\BAPSLib\$(Platform)\$(Configuration)\inc;%(AdditionalIncludeDirectories) WIN32;_DEBUG;%(PreprocessorDefinitions) MultiThreadedDebugDLL Use @@ -186,7 +186,7 @@ X64 - ../Common;..\..\BAPSLib\$(Platform)\$(Configuration);..\..\BAPSLib\$(Platform)\$(Configuration)\inc;%(AdditionalIncludeDirectories) + ..\Common;..\BAPSLib\$(Platform)\$(Configuration);..\BAPSLib\$(Platform)\$(Configuration)\inc;%(AdditionalIncludeDirectories) WIN32;NDEBUG;%(PreprocessorDefinitions) MultiThreadedDLL Use diff --git a/BAPSServerAssembly/BAPSServerAssembly.vcxproj b/BAPSServerAssembly/BAPSServerAssembly.vcxproj index 37ff10e3..0ab355df 100755 --- a/BAPSServerAssembly/BAPSServerAssembly.vcxproj +++ b/BAPSServerAssembly/BAPSServerAssembly.vcxproj @@ -93,7 +93,7 @@ Disabled - ..\Common;..\..\BAPSLib\$(Platform)\$(Configuration);..\..\BAPSLib\$(Platform)\$(Configuration)\inc;%(AdditionalIncludeDirectories) + ..\Common;..\BAPSLib\$(Platform)\$(Configuration);..\BAPSLib\$(Platform)\$(Configuration)\inc;%(AdditionalIncludeDirectories) WIN32;_DEBUG;%(PreprocessorDefinitions) MultiThreadedDebugDLL Use @@ -115,7 +115,7 @@ - ..\Common;..\..\BAPSLib\$(Platform)\$(Configuration);..\..\BAPSLib\$(Platform)\$(Configuration)\inc;%(AdditionalIncludeDirectories) + ..\Common;..\BAPSLib\$(Platform)\$(Configuration);..\BAPSLib\$(Platform)\$(Configuration)\inc;%(AdditionalIncludeDirectories) WIN32;NDEBUG;%(PreprocessorDefinitions) MultiThreadedDLL Use @@ -124,7 +124,7 @@ - ..\..\BAPSLib\$(Platform)\$(Configuration)\lib;%(AdditionalLibraryDirectories) + ..\BAPSLib\$(Platform)\$(Configuration)\lib;%(AdditionalLibraryDirectories) true false @@ -137,7 +137,7 @@ Disabled - ..\Common;..\..\BAPSLib\$(Platform)\$(Configuration);..\..\BAPSLib\$(Platform)\$(Configuration)\inc;%(AdditionalIncludeDirectories) + ..\Common;..\BAPSLib\$(Platform)\$(Configuration);..\BAPSLib\$(Platform)\$(Configuration)\inc;%(AdditionalIncludeDirectories) WIN32;_DEBUG;%(PreprocessorDefinitions) MultiThreadedDebugDLL Use @@ -158,7 +158,7 @@ X64 - ..\Common;..\..\BAPSLib\$(Platform)\$(Configuration);..\..\BAPSLib\$(Platform)\$(Configuration)\inc;%(AdditionalIncludeDirectories) + ..\Common;..\BAPSLib\$(Platform)\$(Configuration);..\BAPSLib\$(Platform)\$(Configuration)\inc;%(AdditionalIncludeDirectories) WIN32;NDEBUG;%(PreprocessorDefinitions) MultiThreadedDLL Use @@ -167,7 +167,7 @@ - ..\..\BAPSLib\$(Platform)\$(Configuration)\lib;%(AdditionalLibraryDirectories) + ..\BAPSLib\$(Platform)\$(Configuration)\lib;%(AdditionalLibraryDirectories) true false @@ -235,13 +235,6 @@ - - - - - - - diff --git a/BAPSServerAssembly/BAPSServerAssembly.vcxproj.filters b/BAPSServerAssembly/BAPSServerAssembly.vcxproj.filters index c803bc44..b190d6c9 100755 --- a/BAPSServerAssembly/BAPSServerAssembly.vcxproj.filters +++ b/BAPSServerAssembly/BAPSServerAssembly.vcxproj.filters @@ -224,27 +224,6 @@ Header Files\Utilities - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - From 08b691c0e33236a022c02b400df74ced6f345060 Mon Sep 17 00:00:00 2001 From: Andy Durant Date: Sat, 4 Feb 2017 18:32:44 +0000 Subject: [PATCH 03/24] minor project updates --- BAPSServerAssembly/BAPSServerAssembly.vcxproj | 4 ++-- BAPSServerService/BAPSServerService.csproj | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/BAPSServerAssembly/BAPSServerAssembly.vcxproj b/BAPSServerAssembly/BAPSServerAssembly.vcxproj index 0ab355df..661472df 100755 --- a/BAPSServerAssembly/BAPSServerAssembly.vcxproj +++ b/BAPSServerAssembly/BAPSServerAssembly.vcxproj @@ -76,8 +76,8 @@ true - $(SolutionDir)$(Configuration)\ - $(Configuration)\ + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ false diff --git a/BAPSServerService/BAPSServerService.csproj b/BAPSServerService/BAPSServerService.csproj index ee6117d7..01e830ab 100644 --- a/BAPSServerService/BAPSServerService.csproj +++ b/BAPSServerService/BAPSServerService.csproj @@ -41,7 +41,7 @@ DEBUG;TRACE prompt 4 - x86 + AnyCPU pdbonly @@ -50,7 +50,10 @@ TRACE prompt 4 - x86 + AnyCPU + + + BAPSServerService.Program From 09d256e1c44106f2f17687957a90bc33ed00e4a4 Mon Sep 17 00:00:00 2001 From: Thomas Lee Date: Sun, 21 Jan 2018 01:18:58 +0000 Subject: [PATCH 04/24] Updates to build on Windows 10/.NET 4.0 You need to copy the BAPS.dll and all other files in that directory to the BAPSServerService build directory for it to launch. Setup still doesn't build. Required the Windows SDK v10.0.15.063.0, MFC and ATL support, and VC++ 2015.3 v140 toolset from the Visual Studio installer (VS 2017). Added checks to ConfigManager.cpp to allow BAPS to be run without a USB controller, even if the controller configuration option is set as a debug workaround. --- BAPS2.sln | 101 +++++++++++++++--- BAPSController/BAPSController.cpp | 9 ++ BAPSController/BAPSController.h | 2 + BAPSController/BAPSController.vcxproj | 4 +- BAPSFormControls/BAPSFormControls.csproj | 36 +++++++ BAPSPresenter/BAPSPresenter.vcxproj | 6 +- BAPSServerAssembly/AsyncActionManager.cpp | 12 +-- BAPSServerAssembly/AudioOutput.cpp | 2 +- BAPSServerAssembly/BAPSServerAssembly.vcxproj | 86 ++++++++++++++- BAPSServerAssembly/ConfigManager.cpp | 18 +++- BAPSServerAssembly/globalaudioobject.cpp | 2 +- BAPSServerService/BAPSServerService.cs | 1 + BAPSServerService/BAPSServerService.csproj | 36 +++++++ .../ProjectInstaller.Designer.cs | 2 +- BAPSServerService/ProjectInstaller.cs | 10 +- BAPSlib/BAPS.vcxproj | 4 +- BAPSlib/BAPSTest/BAPSTest.cpp | 1 + BAPSlib/BAPSTest/BAPSTest.vcxproj | 5 +- Tinker/Tinker.vcxproj | 4 +- TinkerInCSharp/TinkerInCSharp.csproj | 36 +++++++ Tinkerinc++/Tinkerinc++.vcxproj | 4 +- 21 files changed, 333 insertions(+), 48 deletions(-) diff --git a/BAPS2.sln b/BAPS2.sln index a50be16f..9c6ff17a 100644 --- a/BAPS2.sln +++ b/BAPS2.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.27130.2024 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BAPSPresenter", "BAPSPresenter\BAPSPresenter.vcxproj", "{46FD9397-DD3B-456A-9D95-504D60F6A9B5}" EndProject @@ -33,19 +33,25 @@ Global Debug|Mixed Platforms = Debug|Mixed Platforms Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU Release|Mixed Platforms = Release|Mixed Platforms Release|Win32 = Release|Win32 Release|x64 = Release|x64 + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Debug|Any CPU.ActiveCfg = Debug|x64 + {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Debug|Any CPU.Build.0 = Debug|x64 {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Debug|Win32.ActiveCfg = Debug|Win32 {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Debug|Win32.Build.0 = Debug|Win32 {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Debug|x64.ActiveCfg = Debug|x64 {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Debug|x64.Build.0 = Debug|x64 + {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Debug|x86.ActiveCfg = Debug|Win32 + {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Debug|x86.Build.0 = Debug|Win32 + {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Debug|x86.Deploy.0 = Debug|Win32 {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Release|Any CPU.ActiveCfg = Release|Win32 {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Release|Mixed Platforms.Build.0 = Release|Win32 @@ -53,21 +59,34 @@ Global {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Release|Win32.Build.0 = Release|Win32 {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Release|x64.ActiveCfg = Release|x64 {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Release|x64.Build.0 = Release|x64 + {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Release|x86.ActiveCfg = Release|Win32 + {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Release|x86.Build.0 = Release|Win32 + {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Release|x86.Deploy.0 = Release|Win32 {72C648CC-A0E6-4439-8474-76BE38A621B4}.Debug|Any CPU.ActiveCfg = Debug|Win32 {72C648CC-A0E6-4439-8474-76BE38A621B4}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {72C648CC-A0E6-4439-8474-76BE38A621B4}.Debug|Win32.ActiveCfg = Debug|Win32 {72C648CC-A0E6-4439-8474-76BE38A621B4}.Debug|x64.ActiveCfg = Debug|x64 + {72C648CC-A0E6-4439-8474-76BE38A621B4}.Debug|x64.Build.0 = Debug|x64 + {72C648CC-A0E6-4439-8474-76BE38A621B4}.Debug|x86.ActiveCfg = Debug|Win32 + {72C648CC-A0E6-4439-8474-76BE38A621B4}.Debug|x86.Build.0 = Debug|Win32 + {72C648CC-A0E6-4439-8474-76BE38A621B4}.Debug|x86.Deploy.0 = Debug|Win32 {72C648CC-A0E6-4439-8474-76BE38A621B4}.Release|Any CPU.ActiveCfg = Release|Win32 {72C648CC-A0E6-4439-8474-76BE38A621B4}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {72C648CC-A0E6-4439-8474-76BE38A621B4}.Release|Win32.ActiveCfg = Release|Win32 {72C648CC-A0E6-4439-8474-76BE38A621B4}.Release|x64.ActiveCfg = Release|x64 - {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {72C648CC-A0E6-4439-8474-76BE38A621B4}.Release|x86.ActiveCfg = Release|Win32 + {72C648CC-A0E6-4439-8474-76BE38A621B4}.Release|x86.Build.0 = Release|Win32 + {72C648CC-A0E6-4439-8474-76BE38A621B4}.Release|x86.Deploy.0 = Release|Win32 + {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Debug|Any CPU.ActiveCfg = Debug|x64 + {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Debug|Any CPU.Build.0 = Debug|x64 {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Debug|Win32.ActiveCfg = Debug|Win32 {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Debug|Win32.Build.0 = Debug|Win32 {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Debug|x64.ActiveCfg = Debug|x64 {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Debug|x64.Build.0 = Debug|x64 + {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Debug|x86.ActiveCfg = Debug|Win32 + {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Debug|x86.Build.0 = Debug|Win32 {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Release|Any CPU.ActiveCfg = Release|Win32 {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Release|Mixed Platforms.Build.0 = Release|Win32 @@ -75,14 +94,18 @@ Global {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Release|Win32.Build.0 = Release|Win32 {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Release|x64.ActiveCfg = Release|x64 {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Release|x64.Build.0 = Release|x64 - {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Release|x86.ActiveCfg = Release|Win32 + {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Release|x86.Build.0 = Release|Win32 + {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Debug|Any CPU.ActiveCfg = Debug|x64 + {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Debug|Any CPU.Build.0 = Debug|x64 {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Debug|Win32.ActiveCfg = Debug|Any CPU - {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Debug|Win32.Build.0 = Debug|Any CPU - {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Debug|x64.ActiveCfg = Debug|Any CPU - {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Debug|x64.Build.0 = Debug|Any CPU + {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Debug|Win32.ActiveCfg = Debug|x86 + {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Debug|Win32.Build.0 = Debug|x86 + {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Debug|x64.ActiveCfg = Debug|x64 + {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Debug|x64.Build.0 = Debug|x64 + {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Debug|x86.ActiveCfg = Debug|x86 + {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Debug|x86.Build.0 = Debug|x86 {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Release|Any CPU.ActiveCfg = Release|Any CPU {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Release|Any CPU.Build.0 = Release|Any CPU {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU @@ -91,16 +114,23 @@ Global {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Release|Win32.Build.0 = Release|Any CPU {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Release|x64.ActiveCfg = Release|Any CPU {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Release|x64.Build.0 = Release|Any CPU + {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Release|x86.ActiveCfg = Release|x86 + {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Release|x86.Build.0 = Release|x86 {27F57299-ED16-454A-967C-03A3BA2D6F89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {27F57299-ED16-454A-967C-03A3BA2D6F89}.Debug|Any CPU.Build.0 = Debug|Any CPU {27F57299-ED16-454A-967C-03A3BA2D6F89}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {27F57299-ED16-454A-967C-03A3BA2D6F89}.Debug|Win32.ActiveCfg = Debug|Any CPU - {27F57299-ED16-454A-967C-03A3BA2D6F89}.Debug|x64.ActiveCfg = Debug|Any CPU + {27F57299-ED16-454A-967C-03A3BA2D6F89}.Debug|x64.ActiveCfg = Debug|x64 + {27F57299-ED16-454A-967C-03A3BA2D6F89}.Debug|x64.Build.0 = Debug|x64 + {27F57299-ED16-454A-967C-03A3BA2D6F89}.Debug|x86.ActiveCfg = Debug|x86 + {27F57299-ED16-454A-967C-03A3BA2D6F89}.Debug|x86.Build.0 = Debug|x86 {27F57299-ED16-454A-967C-03A3BA2D6F89}.Release|Any CPU.ActiveCfg = Release|Any CPU {27F57299-ED16-454A-967C-03A3BA2D6F89}.Release|Any CPU.Build.0 = Release|Any CPU {27F57299-ED16-454A-967C-03A3BA2D6F89}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {27F57299-ED16-454A-967C-03A3BA2D6F89}.Release|Win32.ActiveCfg = Release|Any CPU {27F57299-ED16-454A-967C-03A3BA2D6F89}.Release|x64.ActiveCfg = Release|Any CPU + {27F57299-ED16-454A-967C-03A3BA2D6F89}.Release|x86.ActiveCfg = Release|x86 + {27F57299-ED16-454A-967C-03A3BA2D6F89}.Release|x86.Build.0 = Release|x86 {9A851E69-B851-432F-B2E8-2C3A03E54D29}.Debug|Any CPU.ActiveCfg = Debug {9A851E69-B851-432F-B2E8-2C3A03E54D29}.Debug|Any CPU.Build.0 = Debug {9A851E69-B851-432F-B2E8-2C3A03E54D29}.Debug|Mixed Platforms.ActiveCfg = Debug @@ -109,6 +139,7 @@ Global {9A851E69-B851-432F-B2E8-2C3A03E54D29}.Debug|Win32.Build.0 = Debug {9A851E69-B851-432F-B2E8-2C3A03E54D29}.Debug|x64.ActiveCfg = Debug {9A851E69-B851-432F-B2E8-2C3A03E54D29}.Debug|x64.Build.0 = Debug + {9A851E69-B851-432F-B2E8-2C3A03E54D29}.Debug|x86.ActiveCfg = Debug {9A851E69-B851-432F-B2E8-2C3A03E54D29}.Release|Any CPU.ActiveCfg = Release {9A851E69-B851-432F-B2E8-2C3A03E54D29}.Release|Any CPU.Build.0 = Release {9A851E69-B851-432F-B2E8-2C3A03E54D29}.Release|Mixed Platforms.ActiveCfg = Release @@ -117,22 +148,32 @@ Global {9A851E69-B851-432F-B2E8-2C3A03E54D29}.Release|Win32.Build.0 = Release {9A851E69-B851-432F-B2E8-2C3A03E54D29}.Release|x64.ActiveCfg = Release {9A851E69-B851-432F-B2E8-2C3A03E54D29}.Release|x64.Build.0 = Release + {9A851E69-B851-432F-B2E8-2C3A03E54D29}.Release|x86.ActiveCfg = Release {8633265B-8675-489E-BB7B-DAD384B287A1}.Debug|Any CPU.ActiveCfg = Debug|Win32 {8633265B-8675-489E-BB7B-DAD384B287A1}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {8633265B-8675-489E-BB7B-DAD384B287A1}.Debug|Win32.ActiveCfg = Debug|Win32 {8633265B-8675-489E-BB7B-DAD384B287A1}.Debug|x64.ActiveCfg = Debug|x64 + {8633265B-8675-489E-BB7B-DAD384B287A1}.Debug|x64.Build.0 = Debug|x64 + {8633265B-8675-489E-BB7B-DAD384B287A1}.Debug|x86.ActiveCfg = Debug|Win32 + {8633265B-8675-489E-BB7B-DAD384B287A1}.Debug|x86.Build.0 = Debug|Win32 + {8633265B-8675-489E-BB7B-DAD384B287A1}.Debug|x86.Deploy.0 = Debug|Win32 {8633265B-8675-489E-BB7B-DAD384B287A1}.Release|Any CPU.ActiveCfg = Release|Win32 {8633265B-8675-489E-BB7B-DAD384B287A1}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {8633265B-8675-489E-BB7B-DAD384B287A1}.Release|Win32.ActiveCfg = Release|Win32 {8633265B-8675-489E-BB7B-DAD384B287A1}.Release|x64.ActiveCfg = Release|x64 - {4C3D1722-7B93-4081-8D61-572F8F088CED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4C3D1722-7B93-4081-8D61-572F8F088CED}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8633265B-8675-489E-BB7B-DAD384B287A1}.Release|x86.ActiveCfg = Release|Win32 + {8633265B-8675-489E-BB7B-DAD384B287A1}.Release|x86.Build.0 = Release|Win32 + {8633265B-8675-489E-BB7B-DAD384B287A1}.Release|x86.Deploy.0 = Release|Win32 + {4C3D1722-7B93-4081-8D61-572F8F088CED}.Debug|Any CPU.ActiveCfg = Debug|x64 + {4C3D1722-7B93-4081-8D61-572F8F088CED}.Debug|Any CPU.Build.0 = Debug|x64 {4C3D1722-7B93-4081-8D61-572F8F088CED}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {4C3D1722-7B93-4081-8D61-572F8F088CED}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU {4C3D1722-7B93-4081-8D61-572F8F088CED}.Debug|Win32.ActiveCfg = Debug|Any CPU {4C3D1722-7B93-4081-8D61-572F8F088CED}.Debug|Win32.Build.0 = Debug|Any CPU - {4C3D1722-7B93-4081-8D61-572F8F088CED}.Debug|x64.ActiveCfg = Debug|Any CPU - {4C3D1722-7B93-4081-8D61-572F8F088CED}.Debug|x64.Build.0 = Debug|Any CPU + {4C3D1722-7B93-4081-8D61-572F8F088CED}.Debug|x64.ActiveCfg = Debug|x64 + {4C3D1722-7B93-4081-8D61-572F8F088CED}.Debug|x64.Build.0 = Debug|x64 + {4C3D1722-7B93-4081-8D61-572F8F088CED}.Debug|x86.ActiveCfg = Debug|x86 + {4C3D1722-7B93-4081-8D61-572F8F088CED}.Debug|x86.Build.0 = Debug|x86 {4C3D1722-7B93-4081-8D61-572F8F088CED}.Release|Any CPU.ActiveCfg = Release|Any CPU {4C3D1722-7B93-4081-8D61-572F8F088CED}.Release|Any CPU.Build.0 = Release|Any CPU {4C3D1722-7B93-4081-8D61-572F8F088CED}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU @@ -141,13 +182,19 @@ Global {4C3D1722-7B93-4081-8D61-572F8F088CED}.Release|Win32.Build.0 = Release|Any CPU {4C3D1722-7B93-4081-8D61-572F8F088CED}.Release|x64.ActiveCfg = Release|Any CPU {4C3D1722-7B93-4081-8D61-572F8F088CED}.Release|x64.Build.0 = Release|Any CPU - {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {4C3D1722-7B93-4081-8D61-572F8F088CED}.Release|x86.ActiveCfg = Release|x86 + {4C3D1722-7B93-4081-8D61-572F8F088CED}.Release|x86.Build.0 = Release|x86 + {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Debug|Any CPU.ActiveCfg = Debug|x64 + {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Debug|Any CPU.Build.0 = Debug|x64 {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Debug|Win32.ActiveCfg = Debug|Win32 {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Debug|Win32.Build.0 = Debug|Win32 {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Debug|x64.ActiveCfg = Debug|x64 {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Debug|x64.Build.0 = Debug|x64 + {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Debug|x86.ActiveCfg = Debug|Win32 + {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Debug|x86.Build.0 = Debug|Win32 + {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Debug|x86.Deploy.0 = Debug|Win32 {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Release|Any CPU.ActiveCfg = Release|Win32 {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Release|Mixed Platforms.Build.0 = Release|Win32 @@ -155,13 +202,20 @@ Global {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Release|Win32.Build.0 = Release|Win32 {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Release|x64.ActiveCfg = Release|x64 {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Release|x64.Build.0 = Release|x64 - {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Release|x86.ActiveCfg = Release|Win32 + {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Release|x86.Build.0 = Release|Win32 + {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Release|x86.Deploy.0 = Release|Win32 + {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Debug|Any CPU.ActiveCfg = Debug|x64 + {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Debug|Any CPU.Build.0 = Debug|x64 {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Debug|Win32.ActiveCfg = Debug|Win32 {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Debug|Win32.Build.0 = Debug|Win32 {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Debug|x64.ActiveCfg = Debug|x64 {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Debug|x64.Build.0 = Debug|x64 + {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Debug|x86.ActiveCfg = Debug|Win32 + {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Debug|x86.Build.0 = Debug|Win32 + {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Debug|x86.Deploy.0 = Debug|Win32 {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Release|Any CPU.ActiveCfg = Release|Win32 {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Release|Mixed Platforms.Build.0 = Release|Win32 @@ -169,16 +223,29 @@ Global {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Release|Win32.Build.0 = Release|Win32 {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Release|x64.ActiveCfg = Release|x64 {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Release|x64.Build.0 = Release|x64 + {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Release|x86.ActiveCfg = Release|Win32 + {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Release|x86.Build.0 = Release|Win32 + {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Release|x86.Deploy.0 = Release|Win32 {87038750-A2E1-4F9D-8EA3-19BC6E2B371B}.Debug|Any CPU.ActiveCfg = Debug|Win32 {87038750-A2E1-4F9D-8EA3-19BC6E2B371B}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {87038750-A2E1-4F9D-8EA3-19BC6E2B371B}.Debug|Win32.ActiveCfg = Debug|Win32 {87038750-A2E1-4F9D-8EA3-19BC6E2B371B}.Debug|x64.ActiveCfg = Debug|x64 + {87038750-A2E1-4F9D-8EA3-19BC6E2B371B}.Debug|x64.Build.0 = Debug|x64 + {87038750-A2E1-4F9D-8EA3-19BC6E2B371B}.Debug|x86.ActiveCfg = Debug|Win32 + {87038750-A2E1-4F9D-8EA3-19BC6E2B371B}.Debug|x86.Build.0 = Debug|Win32 + {87038750-A2E1-4F9D-8EA3-19BC6E2B371B}.Debug|x86.Deploy.0 = Debug|Win32 {87038750-A2E1-4F9D-8EA3-19BC6E2B371B}.Release|Any CPU.ActiveCfg = Release|Win32 {87038750-A2E1-4F9D-8EA3-19BC6E2B371B}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {87038750-A2E1-4F9D-8EA3-19BC6E2B371B}.Release|Win32.ActiveCfg = Release|Win32 {87038750-A2E1-4F9D-8EA3-19BC6E2B371B}.Release|x64.ActiveCfg = Release|x64 + {87038750-A2E1-4F9D-8EA3-19BC6E2B371B}.Release|x86.ActiveCfg = Release|Win32 + {87038750-A2E1-4F9D-8EA3-19BC6E2B371B}.Release|x86.Build.0 = Release|Win32 + {87038750-A2E1-4F9D-8EA3-19BC6E2B371B}.Release|x86.Deploy.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {27528D5D-0BA2-4E60-8FEC-B9203687D6C0} + EndGlobalSection EndGlobal diff --git a/BAPSController/BAPSController.cpp b/BAPSController/BAPSController.cpp index 90039d4e..1e289a3c 100644 --- a/BAPSController/BAPSController.cpp +++ b/BAPSController/BAPSController.cpp @@ -19,8 +19,12 @@ BAPSController::BAPSController() if (hDll == 0) { + this->hasUSBDevices = false; return; } + else { + this->hasUSBDevices = true; + } USBm_FindDevices = (USBm_FindDevices_type)GetProcAddress(hDll, "USBm_FindDevices"); USBm_NumberOfDevices = (USBm_NumberOfDevices_type)GetProcAddress(hDll, "USBm_NumberOfDevices"); @@ -200,4 +204,9 @@ void BAPSController::runHelper() array^ BAPSController::getSerialNumbers() { return safe_cast^>(serialNumbers->Clone()); +} + +bool BAPSController::hasUSB() +{ + return hasUSBDevices; } \ No newline at end of file diff --git a/BAPSController/BAPSController.h b/BAPSController/BAPSController.h index fe2aec8a..6021657b 100644 --- a/BAPSController/BAPSController.h +++ b/BAPSController/BAPSController.h @@ -28,6 +28,7 @@ namespace BAPSControllerAssembly } } array^ getSerialNumbers(); + bool hasUSB(); private: void runHelper(); HINSTANCE hDll; @@ -81,6 +82,7 @@ namespace BAPSControllerAssembly array^ serialNumbers; array^ lastByteA; array^ lastByteB; + bool hasUSBDevices; bool quit; System::Threading::Thread^ pollThread; SignalCallback^ callback; diff --git a/BAPSController/BAPSController.vcxproj b/BAPSController/BAPSController.vcxproj index 8a09beb5..5e82532e 100755 --- a/BAPSController/BAPSController.vcxproj +++ b/BAPSController/BAPSController.vcxproj @@ -23,7 +23,7 @@ {E1CEEE2E-DF20-4929-80BD-D73E896C5245} BAPSController ManagedCProj - 8.1 + 10.0.15063.0 @@ -35,7 +35,7 @@ DynamicLibrary - v140 + v141 Unicode true diff --git a/BAPSFormControls/BAPSFormControls.csproj b/BAPSFormControls/BAPSFormControls.csproj index ff5efd06..0b082138 100644 --- a/BAPSFormControls/BAPSFormControls.csproj +++ b/BAPSFormControls/BAPSFormControls.csproj @@ -35,6 +35,42 @@ prompt 4 + + true + bin\x86\Debug\ + DEBUG;TRACE + full + x86 + prompt + MinimumRecommendedRules.ruleset + + + bin\x86\Release\ + TRACE + true + pdbonly + x86 + prompt + MinimumRecommendedRules.ruleset + + + true + bin\x64\Debug\ + DEBUG;TRACE + full + x64 + prompt + MinimumRecommendedRules.ruleset + + + bin\x64\Release\ + TRACE + true + pdbonly + x64 + prompt + MinimumRecommendedRules.ruleset + diff --git a/BAPSPresenter/BAPSPresenter.vcxproj b/BAPSPresenter/BAPSPresenter.vcxproj index e36fbf43..fd899893 100755 --- a/BAPSPresenter/BAPSPresenter.vcxproj +++ b/BAPSPresenter/BAPSPresenter.vcxproj @@ -22,7 +22,7 @@ {46FD9397-DD3B-456A-9D95-504D60F6A9B5} BAPSPresenter ManagedCProj - 8.1 + 10.0.15063.0 @@ -34,7 +34,7 @@ Application - v140 + v141 Unicode Pure @@ -398,4 +398,4 @@ - + \ No newline at end of file diff --git a/BAPSServerAssembly/AsyncActionManager.cpp b/BAPSServerAssembly/AsyncActionManager.cpp index d807c366..f5a4c739 100644 --- a/BAPSServerAssembly/AsyncActionManager.cpp +++ b/BAPSServerAssembly/AsyncActionManager.cpp @@ -122,7 +122,7 @@ void AsyncActionManager::doActions(System::Object^) if (updateDataset->Tables->Count == 1 && updateDataset->Tables[0]->Rows->Count != 0) { - ServerID = updateDataset->Tables[0]->Rows[0][0]->ToString(); + ServerID = updateDataset->Tables[0]->Rows[0]->ToString(); } else { @@ -136,7 +136,7 @@ void AsyncActionManager::doActions(System::Object^) "WHERE servername=:sname"); updateDataset->Reset(); bapsDataAdapter->Fill(updateDataset); - ServerID = updateDataset->Tables[0]->Rows[0][0]->ToString(); + ServerID = updateDataset->Tables[0]->Rows[0]->ToString(); } bapsDataAdapter->SelectCommand = oldCommand; @@ -155,7 +155,7 @@ void AsyncActionManager::doActions(System::Object^) if (updateDataset->Tables->Count == 1 && updateDataset->Tables[0]->Rows->Count != 0) { - AudioID = updateDataset->Tables[0]->Rows[0][0]->ToString(); + AudioID = updateDataset->Tables[0]->Rows[0]->ToString(); } } if (AudioID == nullptr) @@ -178,7 +178,7 @@ void AsyncActionManager::doActions(System::Object^) if (updateDataset->Tables->Count == 1 && updateDataset->Tables[0]->Rows->Count != 0) { - AudioID = updateDataset->Tables[0]->Rows[0][0]->ToString(); + AudioID = updateDataset->Tables[0]->Rows[0]->ToString(); } else { @@ -207,8 +207,8 @@ void AsyncActionManager::doActions(System::Object^) updateDataset->Reset(); bapsDataAdapter->Fill(updateDataset); - System::Object^ fred = updateDataset->Tables[0]->Rows[0][0]; - AudioID = updateDataset->Tables[0]->Rows[0][0]->ToString(); + System::Object^ fred = updateDataset->Tables[0]->Rows[0]; + AudioID = updateDataset->Tables[0]->Rows[0]->ToString(); } bapsDataAdapter->SelectCommand = oldCommand; } diff --git a/BAPSServerAssembly/AudioOutput.cpp b/BAPSServerAssembly/AudioOutput.cpp index 661598a4..76b26c14 100644 --- a/BAPSServerAssembly/AudioOutput.cpp +++ b/BAPSServerAssembly/AudioOutput.cpp @@ -1,4 +1,4 @@ -#include +#include "stdafx.h" #include "AudioOutput.h" #include "ClientManager.h" #include "Track.h" diff --git a/BAPSServerAssembly/BAPSServerAssembly.vcxproj b/BAPSServerAssembly/BAPSServerAssembly.vcxproj index 661472df..45979ddf 100755 --- a/BAPSServerAssembly/BAPSServerAssembly.vcxproj +++ b/BAPSServerAssembly/BAPSServerAssembly.vcxproj @@ -1,6 +1,10 @@ + + Debug + ARM + Debug Win32 @@ -9,6 +13,10 @@ Debug x64 + + Release + ARM + Release Win32 @@ -22,7 +30,7 @@ {B93BB821-0BB3-466C-9D53-7FECF8722F1D} BAPSServerAssembly ManagedCProj - 8.1 + 10.0.15063.0 @@ -32,7 +40,20 @@ true true + + DynamicLibrary + v140 + Unicode + true + true + + DynamicLibrary + v141 + Unicode + true + + DynamicLibrary v140 Unicode @@ -57,9 +78,15 @@ + + + + + + @@ -75,11 +102,21 @@ $(Platform)\$(Configuration)\ true + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + $(SolutionDir)$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ false + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + $(SolutionDir)$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ @@ -113,6 +150,30 @@ true + + + Disabled + ..\Common;..\BAPSLib\$(Platform)\$(Configuration);..\BAPSLib\$(Platform)\$(Configuration)\inc;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + Use + Level3 + ProgramDatabase + true + + + + + true + true + false + + + + + true + + ..\Common;..\BAPSLib\$(Platform)\$(Configuration);..\BAPSLib\$(Platform)\$(Configuration)\inc;%(AdditionalIncludeDirectories) @@ -131,6 +192,25 @@ MachineX86 + + + ..\Common;..\BAPSLib\$(Platform)\$(Configuration);..\BAPSLib\$(Platform)\$(Configuration)\inc;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;%(PreprocessorDefinitions) + MultiThreadedDLL + Use + Level3 + ProgramDatabase + + + + + ..\BAPSLib\$(Platform)\$(Configuration)\lib;%(AdditionalLibraryDirectories) + true + false + + + + X64 @@ -197,8 +277,6 @@ {e1ceee2e-df20-4929-80bd-d73e896c5245} - true - true {2eab373e-2054-4ab5-a2f9-34139fb08ae4} @@ -227,8 +305,10 @@ Create + Create Create Create + Create Create diff --git a/BAPSServerAssembly/ConfigManager.cpp b/BAPSServerAssembly/ConfigManager.cpp index c2712eff..d9a944c8 100644 --- a/BAPSServerAssembly/ConfigManager.cpp +++ b/BAPSServerAssembly/ConfigManager.cpp @@ -144,12 +144,22 @@ void ConfigManager::initConfigManager() BAPSControllerAssembly::BAPSController^ bc = gcnew BAPSControllerAssembly::BAPSController(); ConfigStringChoices^ bapsController2Choices = gcnew ConfigStringChoices(); - array^ serials = bc->getSerialNumbers(); - for (int i = 0 ; i < serials->Length ; i++) + array^ serials = {}; + + if (bc->hasUSB() == true) { + serials = bc->getSerialNumbers(); + for (int i = 0; i < serials->Length; i++) + { + bapsController2Choices->add(serials[i], serials[i], (i == 0)); + } + + bapsController2Choices->add("none", "none", (serials->Length == 0)); + } + else { - bapsController2Choices->add(serials[i], serials[i], (i==0)); + bapsController2Choices->add("none", "none", true); } - bapsController2Choices->add("none","none", (serials->Length==0)); + delete bc; configDescriptions[CONFIG_BAPSCONTROLLER2ENABLED] = gcnew ConfigDescriptorIntChoice("BAPSController2Enabled", "BAPS USB Controller Enabled", noYesChoices, CA_SU_ONLY); diff --git a/BAPSServerAssembly/globalaudioobject.cpp b/BAPSServerAssembly/globalaudioobject.cpp index 4f9c73a0..5877d7f8 100644 --- a/BAPSServerAssembly/globalaudioobject.cpp +++ b/BAPSServerAssembly/globalaudioobject.cpp @@ -1,4 +1,4 @@ -#include +#include "stdafx.h" #include "GlobalAudioObject.h" #include "ConfigManager.h" #include "Exceptions.h" diff --git a/BAPSServerService/BAPSServerService.cs b/BAPSServerService/BAPSServerService.cs index 608ca8ce..3a2f6de7 100644 --- a/BAPSServerService/BAPSServerService.cs +++ b/BAPSServerService/BAPSServerService.cs @@ -24,6 +24,7 @@ public BAPSServerService() protected override void OnStart(string[] args) { + System.Diagnostics.Debugger.Launch(); BAPSServerAssembly.Utility.start(); } diff --git a/BAPSServerService/BAPSServerService.csproj b/BAPSServerService/BAPSServerService.csproj index 01e830ab..2d3e8709 100644 --- a/BAPSServerService/BAPSServerService.csproj +++ b/BAPSServerService/BAPSServerService.csproj @@ -55,6 +55,42 @@ BAPSServerService.Program + + true + bin\x86\Debug\ + DEBUG;TRACE + full + x86 + prompt + MinimumRecommendedRules.ruleset + + + bin\x86\Release\ + TRACE + true + pdbonly + x86 + prompt + MinimumRecommendedRules.ruleset + + + true + bin\x64\Debug\ + DEBUG;TRACE + full + x64 + prompt + MinimumRecommendedRules.ruleset + + + bin\x64\Release\ + TRACE + true + pdbonly + x64 + prompt + MinimumRecommendedRules.ruleset + diff --git a/BAPSServerService/ProjectInstaller.Designer.cs b/BAPSServerService/ProjectInstaller.Designer.cs index 6e654db0..fe1fbca0 100644 --- a/BAPSServerService/ProjectInstaller.Designer.cs +++ b/BAPSServerService/ProjectInstaller.Designer.cs @@ -34,7 +34,7 @@ private void InitializeComponent() // // serviceProcessInstaller1 // - this.serviceProcessInstaller1.Account = System.ServiceProcess.ServiceAccount.LocalSystem; + this.serviceProcessInstaller1.Account = System.ServiceProcess.ServiceAccount.LocalService; this.serviceProcessInstaller1.Password = null; this.serviceProcessInstaller1.Username = null; // diff --git a/BAPSServerService/ProjectInstaller.cs b/BAPSServerService/ProjectInstaller.cs index b5086a69..99ff78f4 100644 --- a/BAPSServerService/ProjectInstaller.cs +++ b/BAPSServerService/ProjectInstaller.cs @@ -256,8 +256,14 @@ public override void Commit(System.Collections.IDictionary savedState) } public override void Rollback(System.Collections.IDictionary savedState) { - base.Rollback(savedState); - + try + { + base.Rollback(savedState); + } + catch (System.Exception) + { + /** ignore it **/ + } } public override void Uninstall(System.Collections.IDictionary savedState) { diff --git a/BAPSlib/BAPS.vcxproj b/BAPSlib/BAPS.vcxproj index 31e24d54..ae11d6ef 100755 --- a/BAPSlib/BAPS.vcxproj +++ b/BAPSlib/BAPS.vcxproj @@ -21,7 +21,7 @@ {2EAB373E-2054-4AB5-A2F9-34139FB08AE4} BAPS - 8.1 + 10.0.15063.0 @@ -32,7 +32,7 @@ DynamicLibrary - v140 + v141 false MultiByte diff --git a/BAPSlib/BAPSTest/BAPSTest.cpp b/BAPSlib/BAPSTest/BAPSTest.cpp index 91ed4787..54aa3a91 100644 --- a/BAPSlib/BAPSTest/BAPSTest.cpp +++ b/BAPSlib/BAPSTest/BAPSTest.cpp @@ -104,6 +104,7 @@ ATOM MyRegisterClass(HINSTANCE hInstance) // create and display the main program window. // +NotifyCallback urm; BOOL InitInstance(HINSTANCE hInstance, int nCmdShow) { diff --git a/BAPSlib/BAPSTest/BAPSTest.vcxproj b/BAPSlib/BAPSTest/BAPSTest.vcxproj index 51fbeb3c..be597af2 100755 --- a/BAPSlib/BAPSTest/BAPSTest.vcxproj +++ b/BAPSlib/BAPSTest/BAPSTest.vcxproj @@ -20,6 +20,7 @@ {87038750-A2E1-4F9D-8EA3-19BC6E2B371B} + 10.0.15063.0 @@ -30,7 +31,7 @@ Application - v140 + v141 false MultiByte @@ -323,4 +324,4 @@ - + \ No newline at end of file diff --git a/Tinker/Tinker.vcxproj b/Tinker/Tinker.vcxproj index 855fd30c..f29532cc 100755 --- a/Tinker/Tinker.vcxproj +++ b/Tinker/Tinker.vcxproj @@ -22,7 +22,7 @@ {72C648CC-A0E6-4439-8474-76BE38A621B4} Tinker ManagedCProj - 8.1 + 10.0.15063.0 @@ -34,7 +34,7 @@ Application - v140 + v141 Unicode true diff --git a/TinkerInCSharp/TinkerInCSharp.csproj b/TinkerInCSharp/TinkerInCSharp.csproj index a8a81c32..64243580 100644 --- a/TinkerInCSharp/TinkerInCSharp.csproj +++ b/TinkerInCSharp/TinkerInCSharp.csproj @@ -35,6 +35,42 @@ prompt 4 + + true + bin\x86\Debug\ + DEBUG;TRACE + full + x86 + prompt + MinimumRecommendedRules.ruleset + + + bin\x86\Release\ + TRACE + true + pdbonly + x86 + prompt + MinimumRecommendedRules.ruleset + + + true + bin\x64\Debug\ + DEBUG;TRACE + full + x64 + prompt + MinimumRecommendedRules.ruleset + + + bin\x64\Release\ + TRACE + true + pdbonly + x64 + prompt + MinimumRecommendedRules.ruleset + diff --git a/Tinkerinc++/Tinkerinc++.vcxproj b/Tinkerinc++/Tinkerinc++.vcxproj index f6b4d978..388b520b 100755 --- a/Tinkerinc++/Tinkerinc++.vcxproj +++ b/Tinkerinc++/Tinkerinc++.vcxproj @@ -22,7 +22,7 @@ {8633265B-8675-489E-BB7B-DAD384B287A1} Tinkerinc ManagedCProj - 8.1 + 10.0.15063.0 @@ -34,7 +34,7 @@ Application - v140 + v141 Unicode Pure From 85756cf8a24bf3addc26ecc4ea553698c6c33a79 Mon Sep 17 00:00:00 2001 From: Thomas Lee Date: Sun, 21 Jan 2018 01:51:08 +0000 Subject: [PATCH 05/24] Removed debugger --- BAPSServerService/BAPSServerService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BAPSServerService/BAPSServerService.cs b/BAPSServerService/BAPSServerService.cs index 3a2f6de7..64627984 100644 --- a/BAPSServerService/BAPSServerService.cs +++ b/BAPSServerService/BAPSServerService.cs @@ -24,7 +24,7 @@ public BAPSServerService() protected override void OnStart(string[] args) { - System.Diagnostics.Debugger.Launch(); + //System.Diagnostics.Debugger.Launch(); BAPSServerAssembly.Utility.start(); } From 9e8f35f1e35ced8431c2a945202af22f1eb23c20 Mon Sep 17 00:00:00 2001 From: Matthew Stratford Date: Sat, 20 Oct 2018 18:48:06 +0100 Subject: [PATCH 06/24] Add a new BAPSSetupV2. Essentially tried to replicate the old BAPSSetup with a new Installer Project, and actually make it install the registry items. It didn't seem to do that before. --- BAPS2.sln | 20 +- BAPSController/BAPSController.vcxproj | 2 +- BAPSPresenter/BAPSPresenter.vcxproj | 2 +- BAPSServerAssembly/BAPSServerAssembly.vcxproj | 2 +- .../ProjectInstaller.Designer.cs | 1 + BAPSServerService/ProjectInstaller.cs | 11 +- BAPSServerService/ProjectInstaller.resx | 4 +- BAPSSetupV2/BAPSSetupV2.vdproj | 1963 +++++++++++++++++ BAPSlib/BAPS.vcxproj | 2 +- BAPSlib/BAPSTest/BAPSTest.vcxproj | 2 +- BUILD INSTRUCTIONS.txt | 21 +- Tinker/Tinker.vcxproj | 2 +- Tinkerinc++/Tinkerinc++.vcxproj | 2 +- 13 files changed, 2015 insertions(+), 19 deletions(-) create mode 100644 BAPSSetupV2/BAPSSetupV2.vdproj diff --git a/BAPS2.sln b/BAPS2.sln index 9c6ff17a..72a08d8a 100644 --- a/BAPS2.sln +++ b/BAPS2.sln @@ -27,6 +27,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BAPS", "BAPSlib\BAPS.vcxpro EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BAPSTest", "BAPSlib\BAPSTest\BAPSTest.vcxproj", "{87038750-A2E1-4F9D-8EA3-19BC6E2B371B}" EndProject +Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "BAPSSetupV2", "BAPSSetupV2\BAPSSetupV2.vdproj", "{AA7B2A60-7EBE-4297-9194-68AAD0AC730D}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -83,8 +85,8 @@ Global {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Debug|Win32.ActiveCfg = Debug|Win32 {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Debug|Win32.Build.0 = Debug|Win32 - {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Debug|x64.ActiveCfg = Debug|x64 - {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Debug|x64.Build.0 = Debug|x64 + {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Debug|x64.ActiveCfg = Debug|Win32 + {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Debug|x64.Build.0 = Debug|Win32 {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Debug|x86.ActiveCfg = Debug|Win32 {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Debug|x86.Build.0 = Debug|Win32 {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Release|Any CPU.ActiveCfg = Release|Win32 @@ -100,8 +102,8 @@ Global {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Debug|Any CPU.Build.0 = Debug|x64 {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Debug|Win32.ActiveCfg = Debug|x86 - {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Debug|Win32.Build.0 = Debug|x86 + {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Debug|Win32.ActiveCfg = Debug|x64 + {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Debug|Win32.Build.0 = Debug|x64 {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Debug|x64.ActiveCfg = Debug|x64 {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Debug|x64.Build.0 = Debug|x64 {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Debug|x86.ActiveCfg = Debug|x86 @@ -241,6 +243,16 @@ Global {87038750-A2E1-4F9D-8EA3-19BC6E2B371B}.Release|x86.ActiveCfg = Release|Win32 {87038750-A2E1-4F9D-8EA3-19BC6E2B371B}.Release|x86.Build.0 = Release|Win32 {87038750-A2E1-4F9D-8EA3-19BC6E2B371B}.Release|x86.Deploy.0 = Release|Win32 + {AA7B2A60-7EBE-4297-9194-68AAD0AC730D}.Debug|Any CPU.ActiveCfg = Debug + {AA7B2A60-7EBE-4297-9194-68AAD0AC730D}.Debug|Mixed Platforms.ActiveCfg = Debug + {AA7B2A60-7EBE-4297-9194-68AAD0AC730D}.Debug|Win32.ActiveCfg = Debug + {AA7B2A60-7EBE-4297-9194-68AAD0AC730D}.Debug|x64.ActiveCfg = Debug + {AA7B2A60-7EBE-4297-9194-68AAD0AC730D}.Debug|x86.ActiveCfg = Debug + {AA7B2A60-7EBE-4297-9194-68AAD0AC730D}.Release|Any CPU.ActiveCfg = Release + {AA7B2A60-7EBE-4297-9194-68AAD0AC730D}.Release|Mixed Platforms.ActiveCfg = Release + {AA7B2A60-7EBE-4297-9194-68AAD0AC730D}.Release|Win32.ActiveCfg = Release + {AA7B2A60-7EBE-4297-9194-68AAD0AC730D}.Release|x64.ActiveCfg = Release + {AA7B2A60-7EBE-4297-9194-68AAD0AC730D}.Release|x86.ActiveCfg = Release EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/BAPSController/BAPSController.vcxproj b/BAPSController/BAPSController.vcxproj index 5e82532e..bbf51de6 100755 --- a/BAPSController/BAPSController.vcxproj +++ b/BAPSController/BAPSController.vcxproj @@ -23,7 +23,7 @@ {E1CEEE2E-DF20-4929-80BD-D73E896C5245} BAPSController ManagedCProj - 10.0.15063.0 + 10.0.17134.0 diff --git a/BAPSPresenter/BAPSPresenter.vcxproj b/BAPSPresenter/BAPSPresenter.vcxproj index fd899893..8c655e0a 100755 --- a/BAPSPresenter/BAPSPresenter.vcxproj +++ b/BAPSPresenter/BAPSPresenter.vcxproj @@ -22,7 +22,7 @@ {46FD9397-DD3B-456A-9D95-504D60F6A9B5} BAPSPresenter ManagedCProj - 10.0.15063.0 + 10.0.17134.0 diff --git a/BAPSServerAssembly/BAPSServerAssembly.vcxproj b/BAPSServerAssembly/BAPSServerAssembly.vcxproj index 45979ddf..f6f6e85d 100755 --- a/BAPSServerAssembly/BAPSServerAssembly.vcxproj +++ b/BAPSServerAssembly/BAPSServerAssembly.vcxproj @@ -30,7 +30,7 @@ {B93BB821-0BB3-466C-9D53-7FECF8722F1D} BAPSServerAssembly ManagedCProj - 10.0.15063.0 + 10.0.17134.0 diff --git a/BAPSServerService/ProjectInstaller.Designer.cs b/BAPSServerService/ProjectInstaller.Designer.cs index fe1fbca0..7a972a28 100644 --- a/BAPSServerService/ProjectInstaller.Designer.cs +++ b/BAPSServerService/ProjectInstaller.Designer.cs @@ -37,6 +37,7 @@ private void InitializeComponent() this.serviceProcessInstaller1.Account = System.ServiceProcess.ServiceAccount.LocalService; this.serviceProcessInstaller1.Password = null; this.serviceProcessInstaller1.Username = null; + this.serviceProcessInstaller1.AfterInstall += new System.Configuration.Install.InstallEventHandler(this.serviceProcessInstaller1_AfterInstall); // // serviceInstaller1 // diff --git a/BAPSServerService/ProjectInstaller.cs b/BAPSServerService/ProjectInstaller.cs index 99ff78f4..54771179 100644 --- a/BAPSServerService/ProjectInstaller.cs +++ b/BAPSServerService/ProjectInstaller.cs @@ -265,14 +265,21 @@ public override void Rollback(System.Collections.IDictionary savedState) /** ignore it **/ } } - public override void Uninstall(System.Collections.IDictionary savedState) + /* Removed the following because it seemed to prevent the BAPS Server Service from being removed on Uninstall. + * Don't ask me why, but it does. + * public override void Uninstall(System.Collections.IDictionary savedState) { base.Uninstall(savedState); - } + } */ private void serviceInstaller1_AfterInstall(object sender, InstallEventArgs e) { } + + private void serviceProcessInstaller1_AfterInstall(object sender, InstallEventArgs e) + { + + } } } \ No newline at end of file diff --git a/BAPSServerService/ProjectInstaller.resx b/BAPSServerService/ProjectInstaller.resx index d5aa83a7..7bd22caa 100644 --- a/BAPSServerService/ProjectInstaller.resx +++ b/BAPSServerService/ProjectInstaller.resx @@ -118,10 +118,10 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 17, 56 + 17, 60 - 17, 95 + 17, 103 187, 54 diff --git a/BAPSSetupV2/BAPSSetupV2.vdproj b/BAPSSetupV2/BAPSSetupV2.vdproj new file mode 100644 index 00000000..37ba27a6 --- /dev/null +++ b/BAPSSetupV2/BAPSSetupV2.vdproj @@ -0,0 +1,1963 @@ +"DeployProject" +{ +"VSVersion" = "3:800" +"ProjectType" = "8:{978C614F-708E-4E1A-B201-565925725DBA}" +"IsWebType" = "8:FALSE" +"ProjectName" = "8:BAPSSetupV2" +"LanguageId" = "3:1033" +"CodePage" = "3:1252" +"UILanguageId" = "3:1033" +"SccProjectName" = "8:" +"SccLocalPath" = "8:" +"SccAuxPath" = "8:" +"SccProvider" = "8:" + "Hierarchy" + { + "Entry" + { + "MsmKey" = "8:_1F5CD9C8B6F24FDDBE69FCABFE9F4701" + "OwnerKey" = "8:_316226F94C8543899B8445A98A7C0946" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_316226F94C8543899B8445A98A7C0946" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_5377AB4A1E064C4590FCF306C2AF17B3" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_5576626F84BB40838D5F1ABFD3EEA739" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_6D3FBA1DCC31457398F77F2A76F910C9" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_7605FD5C0C311CD42C7373A0DAC3C798" + "OwnerKey" = "8:_316226F94C8543899B8445A98A7C0946" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_82105C046FE744EFADDC88F49143DF37" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_86AD68D610AC8347843952CC3E213557" + "OwnerKey" = "8:_316226F94C8543899B8445A98A7C0946" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_86AD68D610AC8347843952CC3E213557" + "OwnerKey" = "8:_1F5CD9C8B6F24FDDBE69FCABFE9F4701" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_89DE8D6EA5D407F64A7C948641ED064F" + "OwnerKey" = "8:_7605FD5C0C311CD42C7373A0DAC3C798" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_8D19959388A44CB69CA8C6F1C2BE4EDA" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_9608DF056FD742EBADA8C6B2316FFE36" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_A4337A3633BCD50D39E48BFD0F0309DE" + "OwnerKey" = "8:_1F5CD9C8B6F24FDDBE69FCABFE9F4701" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_A4337A3633BCD50D39E48BFD0F0309DE" + "OwnerKey" = "8:_316226F94C8543899B8445A98A7C0946" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_A4337A3633BCD50D39E48BFD0F0309DE" + "OwnerKey" = "8:_AE52BD3051FE80D9B487173FCC566142" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_AE52BD3051FE80D9B487173FCC566142" + "OwnerKey" = "8:_1F5CD9C8B6F24FDDBE69FCABFE9F4701" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_AE52BD3051FE80D9B487173FCC566142" + "OwnerKey" = "8:_316226F94C8543899B8445A98A7C0946" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_CA761FCA4DD442F0A4D28667C01C0EE1" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_D8C012D7671941BFABEA737AEEE095FC" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_5377AB4A1E064C4590FCF306C2AF17B3" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_316226F94C8543899B8445A98A7C0946" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_1F5CD9C8B6F24FDDBE69FCABFE9F4701" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_AE52BD3051FE80D9B487173FCC566142" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_A4337A3633BCD50D39E48BFD0F0309DE" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_86AD68D610AC8347843952CC3E213557" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_7605FD5C0C311CD42C7373A0DAC3C798" + "MsmSig" = "8:_UNDEFINED" + } + } + "Configurations" + { + "Debug" + { + "DisplayName" = "8:Debug" + "IsDebugOnly" = "11:TRUE" + "IsReleaseOnly" = "11:FALSE" + "OutputFilename" = "8:Debug\\BAPSSetupV2.msi" + "PackageFilesAs" = "3:2" + "PackageFileSize" = "3:-2147483648" + "CabType" = "3:1" + "Compression" = "3:2" + "SignOutput" = "11:FALSE" + "CertificateFile" = "8:" + "PrivateKeyFile" = "8:" + "TimeStampServer" = "8:" + "InstallerBootstrapper" = "3:2" + } + "Release" + { + "DisplayName" = "8:Release" + "IsDebugOnly" = "11:FALSE" + "IsReleaseOnly" = "11:TRUE" + "OutputFilename" = "8:Release\\BAPSSetupV2.msi" + "PackageFilesAs" = "3:2" + "PackageFileSize" = "3:-2147483648" + "CabType" = "3:1" + "Compression" = "3:2" + "SignOutput" = "11:FALSE" + "CertificateFile" = "8:" + "PrivateKeyFile" = "8:" + "TimeStampServer" = "8:" + "InstallerBootstrapper" = "3:2" + } + } + "Deployable" + { + "CustomAction" + { + "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_66050A16F10A471C95C6208AE114DDF3" + { + "Name" = "8:Primary output from BAPSServerService (Active)" + "Condition" = "8:" + "Object" = "8:_316226F94C8543899B8445A98A7C0946" + "FileType" = "3:2" + "InstallAction" = "3:1" + "Arguments" = "8:" + "EntryPoint" = "8:" + "Sequence" = "3:1" + "Identifier" = "8:_4245443A_21D7_4808_A869_93253B51E268" + "InstallerClass" = "11:TRUE" + "CustomActionData" = "8:" + } + "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_7B1A980AFBEC48FF8C42FB88DD368D84" + { + "Name" = "8:Primary output from BAPSServerService (Active)" + "Condition" = "8:" + "Object" = "8:_316226F94C8543899B8445A98A7C0946" + "FileType" = "3:2" + "InstallAction" = "3:3" + "Arguments" = "8:" + "EntryPoint" = "8:" + "Sequence" = "3:1" + "Identifier" = "8:_B1353B26_1265_4501_B24D_9BDD3D6929FD" + "InstallerClass" = "11:TRUE" + "CustomActionData" = "8:" + } + "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_CC3F4ABFF95D420CA5C802AA1B0E06CD" + { + "Name" = "8:Primary output from BAPSServerService (Active)" + "Condition" = "8:" + "Object" = "8:_316226F94C8543899B8445A98A7C0946" + "FileType" = "3:2" + "InstallAction" = "3:2" + "Arguments" = "8:" + "EntryPoint" = "8:" + "Sequence" = "3:1" + "Identifier" = "8:_22112535_00B4_43DC_AA49_A267F1D831B5" + "InstallerClass" = "11:TRUE" + "CustomActionData" = "8:" + } + "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_FB55FF1CB80043D89616D2978CC40983" + { + "Name" = "8:Primary output from BAPSServerService (Active)" + "Condition" = "8:" + "Object" = "8:_316226F94C8543899B8445A98A7C0946" + "FileType" = "3:2" + "InstallAction" = "3:4" + "Arguments" = "8:" + "EntryPoint" = "8:" + "Sequence" = "3:1" + "Identifier" = "8:_388856D8_93BC_46A4_B032_66270DF550BB" + "InstallerClass" = "11:TRUE" + "CustomActionData" = "8:" + } + } + "DefaultFeature" + { + "Name" = "8:DefaultFeature" + "Title" = "8:" + "Description" = "8:" + } + "ExternalPersistence" + { + "LaunchCondition" + { + "{A06ECF26-33A3-4562-8140-9B0E340D4F24}:_90DA046AA3854D79927664BE00DD0EAF" + { + "Name" = "8:.NET Framework" + "Message" = "8:[VSDNETMSG]" + "FrameworkVersion" = "8:.NETFramework,Version=v4.0" + "AllowLaterVersions" = "11:FALSE" + "InstallUrl" = "8:http://go.microsoft.com/fwlink/?LinkId=671728" + } + } + } + "File" + { + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_1F5CD9C8B6F24FDDBE69FCABFE9F4701" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:BAPSServerAssembly, Version=2.6.2.0, Culture=neutral, processorArchitecture=x86" + "ScatterAssemblies" + { + "_1F5CD9C8B6F24FDDBE69FCABFE9F4701" + { + "Name" = "8:BAPSServerAssembly.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:BAPSServerAssembly.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_AA6E4ED00D1542C3AC78BFB908085FED" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6D3FBA1DCC31457398F77F2A76F910C9" + { + "SourcePath" = "8:..\\BAPSPresenter\\app.ico" + "TargetName" = "8:app.ico" + "Tag" = "8:" + "Folder" = "8:_AA6E4ED00D1542C3AC78BFB908085FED" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_7605FD5C0C311CD42C7373A0DAC3C798" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Interop.SpeechLib, Version=5.4.0.0, Culture=neutral, processorArchitecture=x86" + "ScatterAssemblies" + { + "_7605FD5C0C311CD42C7373A0DAC3C798" + { + "Name" = "8:Interop.SpeechLib.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:Interop.SpeechLib.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_AA6E4ED00D1542C3AC78BFB908085FED" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_86AD68D610AC8347843952CC3E213557" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:BAPSControllerAssembly, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86" + "ScatterAssemblies" + { + "_86AD68D610AC8347843952CC3E213557" + { + "Name" = "8:BAPSControllerAssembly.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:BAPSControllerAssembly.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_AA6E4ED00D1542C3AC78BFB908085FED" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_89DE8D6EA5D407F64A7C948641ED064F" + { + "SourcePath" = "8:sapi.dll" + "TargetName" = "8:sapi.dll" + "Tag" = "8:" + "Folder" = "8:_AA6E4ED00D1542C3AC78BFB908085FED" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9608DF056FD742EBADA8C6B2316FFE36" + { + "SourcePath" = "8:..\\help\\BAPSPresenterHelp.chm" + "TargetName" = "8:BAPSPresenterHelp.chm" + "Tag" = "8:" + "Folder" = "8:_7A85486C51C04458844B26DD5BBC80B0" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A4337A3633BCD50D39E48BFD0F0309DE" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Mono.Security, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_A4337A3633BCD50D39E48BFD0F0309DE" + { + "Name" = "8:Mono.Security.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:Mono.Security.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_AA6E4ED00D1542C3AC78BFB908085FED" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_AE52BD3051FE80D9B487173FCC566142" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Npgsql, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_AE52BD3051FE80D9B487173FCC566142" + { + "Name" = "8:Npgsql.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:Npgsql.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_AA6E4ED00D1542C3AC78BFB908085FED" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CA761FCA4DD442F0A4D28667C01C0EE1" + { + "SourcePath" = "8:..\\Common\\USBm.dll" + "TargetName" = "8:USBm.dll" + "Tag" = "8:" + "Folder" = "8:_AA6E4ED00D1542C3AC78BFB908085FED" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_D8C012D7671941BFABEA737AEEE095FC" + { + "SourcePath" = "8:..\\BAPSServerService\\serverstate.xml" + "TargetName" = "8:serverstate.xml" + "Tag" = "8:" + "Folder" = "8:_AA6E4ED00D1542C3AC78BFB908085FED" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + } + "FileType" + { + } + "Folder" + { + "{1525181F-901A-416C-8A58-119130FE478E}:_43A1F3C512FB4E99A77A7046B917D8F0" + { + "Name" = "8:#1916" + "AlwaysCreate" = "11:FALSE" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Property" = "8:DesktopFolder" + "Folders" + { + } + } + "{3C67513D-01DD-4637-8A68-80971EB9504F}:_AA6E4ED00D1542C3AC78BFB908085FED" + { + "DefaultLocation" = "8:[ProgramFilesFolder][Manufacturer]\\[ProductName]" + "Name" = "8:#1925" + "AlwaysCreate" = "11:FALSE" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Property" = "8:TARGETDIR" + "Folders" + { + "{9EF0B969-E518-4E46-987F-47570745A589}:_7A85486C51C04458844B26DD5BBC80B0" + { + "Name" = "8:Help" + "AlwaysCreate" = "11:FALSE" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Property" = "8:_E8DFEC2F07544905823A179CFBCE8D8F" + "Folders" + { + } + } + } + } + "{1525181F-901A-416C-8A58-119130FE478E}:_EB395113D18D4B849F61C8AEE7E29711" + { + "Name" = "8:#1919" + "AlwaysCreate" = "11:FALSE" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Property" = "8:ProgramMenuFolder" + "Folders" + { + } + } + } + "LaunchCondition" + { + } + "Locator" + { + } + "MsiBootstrapper" + { + "LangId" = "3:1033" + "RequiresElevation" = "11:FALSE" + } + "Product" + { + "Name" = "8:Microsoft Visual Studio" + "ProductName" = "8:BAPS2" + "ProductCode" = "8:{D4FCAF84-61A5-4E97-A131-8601C5C9FC2D}" + "PackageCode" = "8:{981C723A-6F99-4E6B-B42C-68521E6D3AF6}" + "UpgradeCode" = "8:{CA0D6999-E3B1-4ACC-86AC-FAB85E211A57}" + "AspNetVersion" = "8:4.0.30319.0" + "RestartWWWService" = "11:FALSE" + "RemovePreviousVersions" = "11:FALSE" + "DetectNewerInstalledVersion" = "11:TRUE" + "InstallAllUsers" = "11:TRUE" + "ProductVersion" = "8:2.6.2" + "Manufacturer" = "8:URY" + "ARPHELPTELEPHONE" = "8:" + "ARPHELPLINK" = "8:https://github.com/UniversityRadioYork/BAPS2/" + "Title" = "8:BAPS Setup Installer" + "Subject" = "8:" + "ARPCONTACT" = "8:University Radio York" + "Keywords" = "8:" + "ARPCOMMENTS" = "8:" + "ARPURLINFOABOUT" = "8:https://ury.org.uk/" + "ARPPRODUCTICON" = "8:_6D3FBA1DCC31457398F77F2A76F910C9" + "ARPIconIndex" = "3:0" + "SearchPath" = "8:" + "UseSystemSearchPath" = "11:TRUE" + "TargetPlatform" = "3:0" + "PreBuildEvent" = "8:" + "PostBuildEvent" = "8:" + "RunPostBuildEvent" = "3:0" + } + "Registry" + { + "HKLM" + { + "Keys" + { + "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_970B24A0051F4DC9ABE58486EB3953AC" + { + "Name" = "8:Software" + "Condition" = "8:" + "AlwaysCreate" = "11:FALSE" + "DeleteAtUninstall" = "11:FALSE" + "Transitive" = "11:FALSE" + "Keys" + { + "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_73D13475BF4744EE9540E500B7BB6A58" + { + "Name" = "8:[Manufacturer]" + "Condition" = "8:" + "AlwaysCreate" = "11:TRUE" + "DeleteAtUninstall" = "11:TRUE" + "Transitive" = "11:FALSE" + "Keys" + { + } + "Values" + { + } + } + "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_89BB68442EF44D5EB4CF84FA70A6848C" + { + "Name" = "8:URY" + "Condition" = "8:" + "AlwaysCreate" = "11:FALSE" + "DeleteAtUninstall" = "11:FALSE" + "Transitive" = "11:FALSE" + "Keys" + { + "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_78BC70F574D048AE9F246407EC0EBA0E" + { + "Name" = "8:BAPS" + "Condition" = "8:" + "AlwaysCreate" = "11:FALSE" + "DeleteAtUninstall" = "11:FALSE" + "Transitive" = "11:FALSE" + "Keys" + { + } + "Values" + { + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_07095DF9EFE54AD58D9A3E9284B71BD6" + { + "Name" = "8:BAPSControllerButtonCode1" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:2" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_07417F57E9324F8C94AB57B7CA504A76" + { + "Name" = "8:BAPSController2ButtonCode5" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:255" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_084FA239F69C47D5886BDB4688FD4C7F" + { + "Name" = "8:ClientConnectionLimit" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:10" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_0E102327719B43CDB23A5B8C86B4FE09" + { + "Name" = "8:NiceDirectoryName1" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:1" + "Value" = "8:Beds" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_10F73934FD9C445FB021ABAE4B95CBD2" + { + "Name" = "8:AutoPlay0" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:0" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_12B558420AD949DBB9E386333ECD4759" + { + "Name" = "8:BAPSControllerButtonCode4" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:5" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_141FC5D2AAEF41F6B9D527BF30B0401E" + { + "Name" = "8:StorePlaybackEvents" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:2" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_1520361350A0465C84D738FD5516B125" + { + "Name" = "8:OnlyAllowCleanMusic" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:0" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_19D18F64EC2E4A50BC110A358266BD2C" + { + "Name" = "8:AutoAdvance1" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:1" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_25A028B886C248EAA7EE72AEF4551856" + { + "Name" = "8:Directory0" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:1" + "Value" = "8:\\\\musicstore\\jingles" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_274D2B08DAB341019626B2826BACA945" + { + "Name" = "8:LibraryDBServer" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:1" + "Value" = "8:dbserver" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_282D1C0D5A8540CAB6EF3D0FB11754A6" + { + "Name" = "8:LibraryDBPort" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:1" + "Value" = "8:5433" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_3298956A298344F3B88481A98384415B" + { + "Name" = "8:NiceDirectoryName0" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:1" + "Value" = "8:Jingles" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_3581FE0558EC47108D1D0AFFF32F8E7B" + { + "Name" = "8:ChannelName2" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:1" + "Value" = "8:Channel 3" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_3647A7D282A945E98BA4ACE66D8A9316" + { + "Name" = "8:BAPSController2ButtonCode4" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:255" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_3D83366B202F422EBDEF3BCE3E3D408C" + { + "Name" = "8:AutoPlay1" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:0" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_3DBAA2AEB7A646019EC57A460364647B" + { + "Name" = "8:ChannelName0" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:1" + "Value" = "8:Channel 1" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_3E82501599A244079833ED450F413D8E" + { + "Name" = "8:Directory2" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:1" + "Value" = "8:\\\\musicstore\\adverts" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_42F7932CA84C4A32859AC607A7F268A6" + { + "Name" = "8:ServerID" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:1" + "Value" = "8:((URY)) Test" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_498C6DA6A2454C1FA86C53D4E2093AAF" + { + "Name" = "8:SupportAddress" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:1" + "Value" = "8:computing@ury.org.uk" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_4A14550FD9A24228A207EF975D9641EE" + { + "Name" = "8:NiceDirectoryName2" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:1" + "Value" = "8:Adverts" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_4B03062A01C14262B0D323B2456285FF" + { + "Name" = "8:BAPSController2DeviceCount" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:1" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_4BDBBBD453FF4299926D472D39EFC4C5" + { + "Name" = "8:Port" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:1350" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_4DC6765B1B524076919FCF997F77EAF3" + { + "Name" = "8:AutoAdvance0" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:1" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_508B2A175809416BAA3D65B191921B74" + { + "Name" = "8:BAPSPaddleMode" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:0" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_50D183A5F0E5461DB5815AA0F11D9162" + { + "Name" = "8:LibraryDBPassword" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:1" + "Value" = "8:dbpass" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_559AAD958EC14D7DBFD17177E9B0EAC0" + { + "Name" = "8:BAPSController2ButtonCode2" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:255" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_593321412EF84C5184880A57529112A2" + { + "Name" = "8:BAPSControllerButtonCode3" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:4" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_5EE773A4DF514B98ACF560B3DE161260" + { + "Name" = "8:LibraryLocation" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:1" + "Value" = "8:\\\\musicstore\\music\\records" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_65E58BA0F6AB4E6BBFD83DD728E92A45" + { + "Name" = "8:BAPSController2ButtonCode8" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:15" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_662595D93168496B8CD26C28C0830205" + { + "Name" = "8:AutoPlay2" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:0" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_675991AEFB7745A0BCE994A06323AF9F" + { + "Name" = "8:Device1" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:1" + "Value" = "8:" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_69E9F6A7706B49449EDF11878308CB6E" + { + "Name" = "8:BAPSControllerButtonCode5" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:6" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_69FF2150CFF7455FB23D7D927BCEF34D" + { + "Name" = "8:ChannelName1" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:1" + "Value" = "8:Channel 2" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_6C55CF958CB947BD8571B5E78C5034A5" + { + "Name" = "8:SaveIntroPositions" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:1" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_6E8152B01B6F4BF99F59738EA0DF65CF" + { + "Name" = "8:Device0" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:1" + "Value" = "8:" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_70A78F3EC01141BE8843957DB45CAF7E" + { + "Name" = "8:BAPSController2Serial0" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:1" + "Value" = "8: " + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_718BC2F216054180A49CC03EE3FA0760" + { + "Name" = "8:BAPSController2ButtonCode1" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:255" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_78FE52E4F6984FAE8ABCBC5D84A7BC8D" + { + "Name" = "8:Repeat2" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:0" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_83FAD404256044CCA292A6B08ACE9DE0" + { + "Name" = "8:AutoAdvance2" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:1" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_8E35EFCB56DE430EA4D53D600390DA3E" + { + "Name" = "8:BAPSController2ButtonCode6" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:11" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_91FDB74FFC504795BBD06F46210C2449" + { + "Name" = "8:ChannelCount" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:3" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_9305BFD6CE6C45F7BCDB81E3FA3C1024" + { + "Name" = "8:LibraryDBUsername" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:1" + "Value" = "8:dbusername" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_9829F31255B3494393A6956EFBEBC679" + { + "Name" = "8:DirectoryCount" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:3" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_9D903F9B5BD84DBC974FDA92B444B5A9" + { + "Name" = "8:ef4c38d0dc11b8792245201b0b8e43fc" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:0" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_B49E79C0C9E04EE6B64D70BB82A5D677" + { + "Name" = "8:LibraryDBDatabase" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:1" + "Value" = "8:dbname" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_BB5ED0E1348D4E44861A4008DFF82390" + { + "Name" = "8:Repeat0" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:0" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_BE63DAC1A0EA49BD9ABF66D95CF79ED4" + { + "Name" = "8:SMTP Server" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:1" + "Value" = "8:nameorIP" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_C6F51540B1434BC4AA94404CBEDDC895" + { + "Name" = "8:BAPSController2Enabled" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:0" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_C72F3B3F8441405C83527C558D00E431" + { + "Name" = "8:MaxQueueConnections" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:10" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_C96472676F3B4373AA35029172595318" + { + "Name" = "8:Repeat1" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:0" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_CEE84209A0424263B4121B63C755AE4E" + { + "Name" = "8:Device2" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:1" + "Value" = "8:" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_D0FD199A704E427899AE76992A2823A6" + { + "Name" = "8:Directory1" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:1" + "Value" = "8:\\\\musicstore\\beds" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_D6D34E92A72542D2B96BD92AB72BE92B" + { + "Name" = "8:BAPSController2ButtonCode7" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:12" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_D824AAB447AC40C2A2DD687FB51BBF70" + { + "Name" = "8:BAPSDBDatabase" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:1" + "Value" = "8:dbname" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_DD34CDC96F554AB6979F634429D5B7D5" + { + "Name" = "8:BAPSControllerButtonCode0" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:1" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_DE37B89AC593441E9B5050F3C6B74D83" + { + "Name" = "8:BAPSControllerEnabled" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:1" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_DFEC33F89F1C410FA277EE845F1104AC" + { + "Name" = "8:BAPSController2ButtonCode0" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:255" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_E0CA6B043E50455692B8C67C5E94E657" + { + "Name" = "8:LogSource" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:1" + "Value" = "8:BAPS" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_E28AB5A0BD134192A32FE8B5F52FA72A" + { + "Name" = "8:BAPSController2ButtonCode3" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:255" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_E4903E67B20646BEB5E54F2D852E6194" + { + "Name" = "8:BAPSController2ButtonCount" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:9" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_EB1837F5193A4FB4BB6B971F6E3BD5CD" + { + "Name" = "8:LogName" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:1" + "Value" = "8:BAPS Log" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_EFB85120AEFA42589A75895A457DC92D" + { + "Name" = "8:BAPSController2Offset0" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:0" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_F16A49267DD54B77A0B87D11C4D2589D" + { + "Name" = "8:BAPSControllerButtonCount" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:6" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_FE16F99D3E24491E915446FDF7AF9803" + { + "Name" = "8:BAPSControllerButtonCode2" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:3" + } + } + } + } + "Values" + { + } + } + } + "Values" + { + } + } + } + } + "HKCU" + { + "Keys" + { + "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_4B60FE8FCE4A4D22BFDB3F6A14EF05C0" + { + "Name" = "8:Software" + "Condition" = "8:" + "AlwaysCreate" = "11:FALSE" + "DeleteAtUninstall" = "11:FALSE" + "Transitive" = "11:FALSE" + "Keys" + { + "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_7EF27631F91F46A99B6CFEAD0055F3CF" + { + "Name" = "8:[Manufacturer]" + "Condition" = "8:" + "AlwaysCreate" = "11:FALSE" + "DeleteAtUninstall" = "11:FALSE" + "Transitive" = "11:FALSE" + "Keys" + { + } + "Values" + { + } + } + } + "Values" + { + } + } + } + } + "HKCR" + { + "Keys" + { + } + } + "HKU" + { + "Keys" + { + } + } + "HKPU" + { + "Keys" + { + } + } + } + "Sequences" + { + } + "Shortcut" + { + "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_815620B9537E4635966D927C60A97236" + { + "Name" = "8:BAPS Presenter" + "Arguments" = "8:" + "Description" = "8:" + "ShowCmd" = "3:1" + "IconIndex" = "3:0" + "Transitive" = "11:FALSE" + "Target" = "8:_8D19959388A44CB69CA8C6F1C2BE4EDA" + "Folder" = "8:_43A1F3C512FB4E99A77A7046B917D8F0" + "WorkingFolder" = "8:_AA6E4ED00D1542C3AC78BFB908085FED" + "Icon" = "8:" + "Feature" = "8:" + } + "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_BA0D4537C33E4F2F894AE496EC35BF75" + { + "Name" = "8:BAPS Presenter" + "Arguments" = "8:" + "Description" = "8:" + "ShowCmd" = "3:1" + "IconIndex" = "3:0" + "Transitive" = "11:FALSE" + "Target" = "8:_8D19959388A44CB69CA8C6F1C2BE4EDA" + "Folder" = "8:_EB395113D18D4B849F61C8AEE7E29711" + "WorkingFolder" = "8:_AA6E4ED00D1542C3AC78BFB908085FED" + "Icon" = "8:" + "Feature" = "8:" + } + } + "UserInterface" + { + "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_118C5E8DA40D47779490590152C40E9A" + { + "Name" = "8:#1902" + "Sequence" = "3:2" + "Attributes" = "3:3" + "Dialogs" + { + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_1C67BD2255EE4E4C97E1EBA28C011A3B" + { + "Sequence" = "3:100" + "DisplayName" = "8:Finished" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdAdminFinishedDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + } + } + } + } + "{2479F3F5-0309-486D-8047-8187E2CE5BA0}:_229583E115B9492F87006BFF0667FD40" + { + "UseDynamicProperties" = "11:FALSE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdBasicDialogs.wim" + } + "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_26C0F4F4A30642D89CD9D025BF47F6C9" + { + "Name" = "8:#1902" + "Sequence" = "3:1" + "Attributes" = "3:3" + "Dialogs" + { + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_F0EC8538D2A34F6FAA3FE58CC41C6A4D" + { + "Sequence" = "3:100" + "DisplayName" = "8:Finished" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdFinishedDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + "UpdateText" + { + "Name" = "8:UpdateText" + "DisplayName" = "8:#1058" + "Description" = "8:#1158" + "Type" = "3:15" + "ContextData" = "8:" + "Attributes" = "3:0" + "Setting" = "3:1" + "Value" = "8:#1258" + "DefaultValue" = "8:#1258" + "UsePlugInResources" = "11:TRUE" + } + } + } + } + } + "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_2D6F7740A8BC43FDADA3418D19050C12" + { + "Name" = "8:#1900" + "Sequence" = "3:2" + "Attributes" = "3:1" + "Dialogs" + { + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_23ADE183D22041B290579228E94DC88C" + { + "Sequence" = "3:100" + "DisplayName" = "8:Welcome" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdAdminWelcomeDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + "CopyrightWarning" + { + "Name" = "8:CopyrightWarning" + "DisplayName" = "8:#1002" + "Description" = "8:#1102" + "Type" = "3:3" + "ContextData" = "8:" + "Attributes" = "3:0" + "Setting" = "3:1" + "Value" = "8:#1202" + "DefaultValue" = "8:#1202" + "UsePlugInResources" = "11:TRUE" + } + "Welcome" + { + "Name" = "8:Welcome" + "DisplayName" = "8:#1003" + "Description" = "8:#1103" + "Type" = "3:3" + "ContextData" = "8:" + "Attributes" = "3:0" + "Setting" = "3:1" + "Value" = "8:#1203" + "DefaultValue" = "8:#1203" + "UsePlugInResources" = "11:TRUE" + } + } + } + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_90F25AC9967C46A380CEE5D1B414D2F2" + { + "Sequence" = "3:200" + "DisplayName" = "8:Installation Folder" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdAdminFolderDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + } + } + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_9788125504B24018917D52F4D997C25F" + { + "Sequence" = "3:300" + "DisplayName" = "8:Confirm Installation" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdAdminConfirmDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + } + } + } + } + "{2479F3F5-0309-486D-8047-8187E2CE5BA0}:_8A2BBEA5EA134403BC5ED8BD8F5BAAB1" + { + "UseDynamicProperties" = "11:FALSE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdUserInterface.wim" + } + "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_97EB13C31ADF49E481E26EE3D8B8108C" + { + "Name" = "8:#1901" + "Sequence" = "3:1" + "Attributes" = "3:2" + "Dialogs" + { + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_06E280DD9FC44FAE98DFD124DAF85382" + { + "Sequence" = "3:100" + "DisplayName" = "8:Progress" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdProgressDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + "ShowProgress" + { + "Name" = "8:ShowProgress" + "DisplayName" = "8:#1009" + "Description" = "8:#1109" + "Type" = "3:5" + "ContextData" = "8:1;True=1;False=0" + "Attributes" = "3:0" + "Setting" = "3:0" + "Value" = "3:1" + "DefaultValue" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + } + } + } + } + "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_A1B2AA132DF54A549EAFA1D85B061AEB" + { + "Name" = "8:#1900" + "Sequence" = "3:1" + "Attributes" = "3:1" + "Dialogs" + { + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_4D3D456376BF4338A0A1F7E1C305DA0C" + { + "Sequence" = "3:100" + "DisplayName" = "8:Welcome" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdWelcomeDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + "CopyrightWarning" + { + "Name" = "8:CopyrightWarning" + "DisplayName" = "8:#1002" + "Description" = "8:#1102" + "Type" = "3:3" + "ContextData" = "8:" + "Attributes" = "3:0" + "Setting" = "3:1" + "Value" = "8:#1202" + "DefaultValue" = "8:#1202" + "UsePlugInResources" = "11:TRUE" + } + "Welcome" + { + "Name" = "8:Welcome" + "DisplayName" = "8:#1003" + "Description" = "8:#1103" + "Type" = "3:3" + "ContextData" = "8:" + "Attributes" = "3:0" + "Setting" = "3:1" + "Value" = "8:#1203" + "DefaultValue" = "8:#1203" + "UsePlugInResources" = "11:TRUE" + } + } + } + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_5AD6D75903D045419F0B9812307D6312" + { + "Sequence" = "3:300" + "DisplayName" = "8:Confirm Installation" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdConfirmDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + } + } + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_A72A90C22E8E42EFBF600AD4B894FBF0" + { + "Sequence" = "3:200" + "DisplayName" = "8:Installation Folder" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdFolderDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + "InstallAllUsersVisible" + { + "Name" = "8:InstallAllUsersVisible" + "DisplayName" = "8:#1059" + "Description" = "8:#1159" + "Type" = "3:5" + "ContextData" = "8:1;True=1;False=0" + "Attributes" = "3:0" + "Setting" = "3:0" + "Value" = "3:1" + "DefaultValue" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + } + } + } + } + "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_D0E00A22691049A685F44762544140AA" + { + "Name" = "8:#1901" + "Sequence" = "3:2" + "Attributes" = "3:2" + "Dialogs" + { + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_0F9763BE0EF4461BA30DA70ADC7977E9" + { + "Sequence" = "3:100" + "DisplayName" = "8:Progress" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdAdminProgressDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + "ShowProgress" + { + "Name" = "8:ShowProgress" + "DisplayName" = "8:#1009" + "Description" = "8:#1109" + "Type" = "3:5" + "ContextData" = "8:1;True=1;False=0" + "Attributes" = "3:0" + "Setting" = "3:0" + "Value" = "3:1" + "DefaultValue" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + } + } + } + } + } + "MergeModule" + { + } + "ProjectOutput" + { + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_26103AD9283340DA94969F4882FB2A13" + { + "SourcePath" = "8:" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_7A85486C51C04458844B26DD5BBC80B0" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + "ProjectOutputGroupRegister" = "3:1" + "OutputConfiguration" = "8:" + "OutputGroupCanonicalName" = "8:Documentation" + "OutputProjectGuid" = "8:{4C3D1722-7B93-4081-8D61-572F8F088CED}" + "ShowKeyOutput" = "11:TRUE" + "ExcludeFilters" + { + } + } + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_316226F94C8543899B8445A98A7C0946" + { + "SourcePath" = "8:..\\BAPSServerService\\obj\\x86\\Debug\\BAPSServerService.exe" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_AA6E4ED00D1542C3AC78BFB908085FED" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + "ProjectOutputGroupRegister" = "3:1" + "OutputConfiguration" = "8:" + "OutputGroupCanonicalName" = "8:Built" + "OutputProjectGuid" = "8:{A19900A2-8C8B-416A-8642-7F20CB9CA145}" + "ShowKeyOutput" = "11:TRUE" + "ExcludeFilters" + { + } + } + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_5377AB4A1E064C4590FCF306C2AF17B3" + { + "SourcePath" = "8:..\\BAPSFormControls\\obj\\x86\\Debug\\BAPSFormControls.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_AA6E4ED00D1542C3AC78BFB908085FED" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + "ProjectOutputGroupRegister" = "3:1" + "OutputConfiguration" = "8:" + "OutputGroupCanonicalName" = "8:Built" + "OutputProjectGuid" = "8:{4C3D1722-7B93-4081-8D61-572F8F088CED}" + "ShowKeyOutput" = "11:TRUE" + "ExcludeFilters" + { + } + } + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_5576626F84BB40838D5F1ABFD3EEA739" + { + "SourcePath" = "8:..\\BAPSlib\\Win32\\Debug\\BAPS.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_AA6E4ED00D1542C3AC78BFB908085FED" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + "ProjectOutputGroupRegister" = "3:1" + "OutputConfiguration" = "8:" + "OutputGroupCanonicalName" = "8:Built" + "OutputProjectGuid" = "8:{2EAB373E-2054-4AB5-A2F9-34139FB08AE4}" + "ShowKeyOutput" = "11:TRUE" + "ExcludeFilters" + { + } + } + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_73005F2EA8E74A8C87711792AFF08DC9" + { + "SourcePath" = "8:" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_7A85486C51C04458844B26DD5BBC80B0" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + "ProjectOutputGroupRegister" = "3:1" + "OutputConfiguration" = "8:" + "OutputGroupCanonicalName" = "8:Documentation" + "OutputProjectGuid" = "8:{46FD9397-DD3B-456A-9D95-504D60F6A9B5}" + "ShowKeyOutput" = "11:TRUE" + "ExcludeFilters" + { + } + } + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_82105C046FE744EFADDC88F49143DF37" + { + "SourcePath" = "8:..\\Win32\\Debug\\BAPSServerAssembly.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_AA6E4ED00D1542C3AC78BFB908085FED" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + "ProjectOutputGroupRegister" = "3:1" + "OutputConfiguration" = "8:" + "OutputGroupCanonicalName" = "8:Built" + "OutputProjectGuid" = "8:{B93BB821-0BB3-466C-9D53-7FECF8722F1D}" + "ShowKeyOutput" = "11:TRUE" + "ExcludeFilters" + { + } + } + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_8D19959388A44CB69CA8C6F1C2BE4EDA" + { + "SourcePath" = "8:..\\Win32\\Debug\\BAPSPresenter.exe" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_AA6E4ED00D1542C3AC78BFB908085FED" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + "ProjectOutputGroupRegister" = "3:1" + "OutputConfiguration" = "8:" + "OutputGroupCanonicalName" = "8:Built" + "OutputProjectGuid" = "8:{46FD9397-DD3B-456A-9D95-504D60F6A9B5}" + "ShowKeyOutput" = "11:TRUE" + "ExcludeFilters" + { + } + } + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_9B4F22B9F3E24A6F984F653782E30AE3" + { + "SourcePath" = "8:" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_7A85486C51C04458844B26DD5BBC80B0" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + "ProjectOutputGroupRegister" = "3:1" + "OutputConfiguration" = "8:" + "OutputGroupCanonicalName" = "8:Documentation" + "OutputProjectGuid" = "8:{2EAB373E-2054-4AB5-A2F9-34139FB08AE4}" + "ShowKeyOutput" = "11:TRUE" + "ExcludeFilters" + { + } + } + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_AD625BB6FF5F43ACA2A45300645E68CF" + { + "SourcePath" = "8:" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_7A85486C51C04458844B26DD5BBC80B0" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + "ProjectOutputGroupRegister" = "3:1" + "OutputConfiguration" = "8:" + "OutputGroupCanonicalName" = "8:Documentation" + "OutputProjectGuid" = "8:{A19900A2-8C8B-416A-8642-7F20CB9CA145}" + "ShowKeyOutput" = "11:TRUE" + "ExcludeFilters" + { + } + } + } + } +} diff --git a/BAPSlib/BAPS.vcxproj b/BAPSlib/BAPS.vcxproj index ae11d6ef..eff3d227 100755 --- a/BAPSlib/BAPS.vcxproj +++ b/BAPSlib/BAPS.vcxproj @@ -21,7 +21,7 @@ {2EAB373E-2054-4AB5-A2F9-34139FB08AE4} BAPS - 10.0.15063.0 + 10.0.17134.0 diff --git a/BAPSlib/BAPSTest/BAPSTest.vcxproj b/BAPSlib/BAPSTest/BAPSTest.vcxproj index be597af2..e5b556bd 100755 --- a/BAPSlib/BAPSTest/BAPSTest.vcxproj +++ b/BAPSlib/BAPSTest/BAPSTest.vcxproj @@ -20,7 +20,7 @@ {87038750-A2E1-4F9D-8EA3-19BC6E2B371B} - 10.0.15063.0 + 10.0.17134.0 diff --git a/BUILD INSTRUCTIONS.txt b/BUILD INSTRUCTIONS.txt index 3e446fcc..27cd53c2 100644 --- a/BUILD INSTRUCTIONS.txt +++ b/BUILD INSTRUCTIONS.txt @@ -1,15 +1,28 @@ ***BUILD INSTRUCTIONS FOR VS2008 On 64-BIT MACHINES*** + + Actually worked on 06/May/2015 -- If it complains about lacking certain executables or libraries during build, the paths must be modified. --- Go to Tool -> Options -> Projects and Solutions -> VC++ Directories -> Executable files. + +--Go to Tool -> Options -> Projects and Solutions -> VC++ Directories -> Executable files. + -- Add C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin + -- Then -> Library files. Add C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Lib + + -- BAPSSetup fails to build This seems to use some setup dialogue frames etc - BAPS has a custom one which it used to copy into -Program Files (!). In the post WinXP days, this isn't really feasible so it must be put there manually. -The file VsdServiceCredentials1Dlg.wid needs copying to C:\Program Files\Microsoft Visual Studio 9.0\Common7\Tools\Deployment\VsdDialogs\0 and 1033. The entire (yes, entire) VsdDialogs path may also need -copying to the not-x86 path. Maybe the other way around. \ No newline at end of file +Program Files (!). +In the post WinXP days, this isn't really feasible so it must be put there manually. + +The file VsdServiceCredentials1Dlg.wid needs copying to C:\Program Files\Microsoft Visual Studio 9.0\Common7\Tools\Deployment\VsdDialogs\0 and 1033. +The entire (yes, entire) VsdDialogs path may also need + copying to the not-x86 path. Maybe the other way around. + +To use the BAPSSetupV2, you will need to install the follow (or equivalent for your version of VS): +https://marketplace.visualstudio.com/items?itemName=VisualStudioClient.MicrosoftVisualStudio2017InstallerProjects \ No newline at end of file diff --git a/Tinker/Tinker.vcxproj b/Tinker/Tinker.vcxproj index f29532cc..6e0f7cfe 100755 --- a/Tinker/Tinker.vcxproj +++ b/Tinker/Tinker.vcxproj @@ -22,7 +22,7 @@ {72C648CC-A0E6-4439-8474-76BE38A621B4} Tinker ManagedCProj - 10.0.15063.0 + 10.0.17134.0 diff --git a/Tinkerinc++/Tinkerinc++.vcxproj b/Tinkerinc++/Tinkerinc++.vcxproj index 388b520b..34f6744e 100755 --- a/Tinkerinc++/Tinkerinc++.vcxproj +++ b/Tinkerinc++/Tinkerinc++.vcxproj @@ -22,7 +22,7 @@ {8633265B-8675-489E-BB7B-DAD384B287A1} Tinkerinc ManagedCProj - 10.0.15063.0 + 10.0.17134.0 From 5304969dafcfdbf22a2d2c82466fdcd2a6180242 Mon Sep 17 00:00:00 2001 From: Matthew Stratford Date: Sat, 20 Oct 2018 23:58:04 +0100 Subject: [PATCH 07/24] Add USB device checks --- BAPSController/BAPSController.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/BAPSController/BAPSController.cpp b/BAPSController/BAPSController.cpp index 1e289a3c..95b3f5ed 100644 --- a/BAPSController/BAPSController.cpp +++ b/BAPSController/BAPSController.cpp @@ -203,7 +203,14 @@ void BAPSController::runHelper() array^ BAPSController::getSerialNumbers() { - return safe_cast^>(serialNumbers->Clone()); + if (hasUSBDevices == true) { + return safe_cast^>(serialNumbers->Clone()); + } + else { + array^ empty = gcnew array(1); + empty[0] = ""; + return empty; + } } bool BAPSController::hasUSB() From 5f43b4421382d5666b8b538c76273ec1db0814d7 Mon Sep 17 00:00:00 2001 From: Matthew Stratford Date: Sun, 21 Oct 2018 00:56:36 +0100 Subject: [PATCH 08/24] Fix NullReference when Controller2 was disabled. Allows the menus to work with or without the USB Controller option enabled. --- BAPSServerAssembly/ClientInstance_config.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/BAPSServerAssembly/ClientInstance_config.cpp b/BAPSServerAssembly/ClientInstance_config.cpp index f9a582f8..7e2e713e 100644 --- a/BAPSServerAssembly/ClientInstance_config.cpp +++ b/BAPSServerAssembly/ClientInstance_config.cpp @@ -78,7 +78,12 @@ BEGIN_ACTION_BLOCKED1(sendAllOptionChoices, u32int optionid) if (optionid == CONFIG_BAPSCONTROLLER2SERIAL) { ConfigStringChoices^ bapsController2Choices = gcnew ConfigStringChoices(); - array^ serials = BAPSController::getBAPSController2Serials(); + + array^ serials = gcnew array(1); + if (CONFIG_GETINT(CONFIG_BAPSCONTROLLER2ENABLED) == CONFIG_YES_VALUE) { + array^ serials = BAPSController::getBAPSController2Serials(); + } + for (int i = 0 ; i < serials->Length ; i++) { bapsController2Choices->add(serials[i], serials[i], (i==0)); From 86acb5d058fb519259b13f3c803641c17c5cd005 Mon Sep 17 00:00:00 2001 From: Matthew Stratford Date: Sun, 21 Oct 2018 01:17:28 +0100 Subject: [PATCH 09/24] Actually fix BAPS Menu NullReference --- BAPSController/BAPSController.cpp | 6 ++---- BAPSServerAssembly/ClientInstance_config.cpp | 5 +++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/BAPSController/BAPSController.cpp b/BAPSController/BAPSController.cpp index 95b3f5ed..4b984310 100644 --- a/BAPSController/BAPSController.cpp +++ b/BAPSController/BAPSController.cpp @@ -205,10 +205,8 @@ array^ BAPSController::getSerialNumbers() { if (hasUSBDevices == true) { return safe_cast^>(serialNumbers->Clone()); - } - else { - array^ empty = gcnew array(1); - empty[0] = ""; + } else { + array^ empty = gcnew array(0); return empty; } } diff --git a/BAPSServerAssembly/ClientInstance_config.cpp b/BAPSServerAssembly/ClientInstance_config.cpp index 7e2e713e..4990da76 100644 --- a/BAPSServerAssembly/ClientInstance_config.cpp +++ b/BAPSServerAssembly/ClientInstance_config.cpp @@ -79,9 +79,10 @@ BEGIN_ACTION_BLOCKED1(sendAllOptionChoices, u32int optionid) { ConfigStringChoices^ bapsController2Choices = gcnew ConfigStringChoices(); - array^ serials = gcnew array(1); + // Initialise + array^ serials = gcnew array(0); if (CONFIG_GETINT(CONFIG_BAPSCONTROLLER2ENABLED) == CONFIG_YES_VALUE) { - array^ serials = BAPSController::getBAPSController2Serials(); + serials = BAPSController::getBAPSController2Serials(); } for (int i = 0 ; i < serials->Length ; i++) From 8fa408d878ccb3f7b657e22fe5de8696aac156f3 Mon Sep 17 00:00:00 2001 From: Matthew Stratford Date: Sun, 21 Oct 2018 03:16:20 +0100 Subject: [PATCH 10/24] Presenter Icons & Fix Popup Centering Now those pesky Load Show Boxes (and others) will always appear where BAPS is! (Not all the way on the other screen!) --- BAPSPresenter/About.h | 1 + BAPSPresenter/About.resx | 230 +------------------ BAPSPresenter/AudioWall.h | 7 +- BAPSPresenter/AudioWall.resx | 230 +------------------ BAPSPresenter/BAPSPresenter.vcxproj | 7 +- BAPSPresenter/BAPSPresenter.vcxproj.filters | 9 +- BAPSPresenter/BAPSPresenterMain.resx | 240 +------------------- BAPSPresenter/ConfigDialog.h | 1 + BAPSPresenter/LoadShowDialog.h | 1 + BAPSPresenter/LoadShowDialog.resx | 230 +------------------ BAPSPresenter/LocalConfigDialog.h | 1 + BAPSPresenter/LocalConfigDialog.resx | 29 +-- BAPSPresenter/LoginDialog.h | 2 +- BAPSPresenter/LoginDialog.resx | 235 +------------------ BAPSPresenter/RecordLibrarySearch.h | 1 + BAPSPresenter/RecordLibrarySearch.resx | 240 +------------------- BAPSPresenter/SecurityDialog.h | 1 + BAPSPresenter/SecurityDialog.resx | 230 +------------------ BAPSPresenter/TextDialog.resx | 17 +- Common/app.ico | Bin 0 -> 1078 bytes 20 files changed, 78 insertions(+), 1634 deletions(-) create mode 100644 Common/app.ico diff --git a/BAPSPresenter/About.h b/BAPSPresenter/About.h index ca92277d..97013ba2 100644 --- a/BAPSPresenter/About.h +++ b/BAPSPresenter/About.h @@ -288,6 +288,7 @@ namespace BAPSPresenter { this->AutoScaleDimensions = System::Drawing::SizeF(6, 13); this->AutoScaleMode = System::Windows::Forms::AutoScaleMode::Font; this->ClientSize = System::Drawing::Size(284, 384); + this->StartPosition = System::Windows::Forms::FormStartPosition::CenterParent; this->Controls->Add(this->presenterGroup); this->Controls->Add(this->mailTitle); this->Controls->Add(this->serverGroup); diff --git a/BAPSPresenter/About.resx b/BAPSPresenter/About.resx index 17808c86..c36bf988 100644 --- a/BAPSPresenter/About.resx +++ b/BAPSPresenter/About.resx @@ -112,233 +112,13 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - AAABAAQAEBAAAAAAAABoBQAARgAAACAgAAAAAAAAqAgAAK4FAAAwMAAAAAAAAKgOAABWDgAAQEAAAAAA - AAAoFgAA/hwAACgAAAAQAAAAIAAAAAEACAAAAAAAQAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////AJ13 - awBfNiUAzL64ADoVBgCvnJQAeVdLAOXe2wDMppkAsIh7AHFAOwBMJRcAjGdaAOjEtgDazckApJGJALmT - hgCZgngA07GjAI10awBkPzIA9/f0AFQtIACEXlEAl3BgAEEdDwBzTT8A4NbSAKR+cQDs5OEAbUAtAGhF - OQCJbGIAk3pwAMW5tACAY1gAso+CAJtvaABXMyYAqId8AM25sgB4UkUAYDksAG9IOgBIIRMAgFpNAOHb - 1wCfgngAoHxtAN7QywBOKRoA1c3HAOTCswBrQzUAfVVIAI5qXgBRJhYAyaOWAK+JgACYcmUAf15SAIVk - WABQKx4AVzAiAHZQQQBEHxIAYj0tAJZtXQCSd20AkHNoAHRDOwCyjH8AYzclAGg/MQB3WU4AfVdMAKyG - fACuhngA18rGAFUrHQBnQTQAupaIAJp0ZwDj19MARR4PAF04KwBhPjAAakEuAGtFOACeemsA6+LfAGU9 - MABxSTwAsYp9AJ1xaQCXcGMA4NjUANOvoQDYzMcAUiodAF83KgBhOy4AbUY5AKuFegCLZVkAnXltAJx2 - aQBIIhUATScaAGRANABpQzYAbUg7AHRQQgB7VEgAgltNAJ96bQDq5OEARh8SAE4lFwBZMyYAdlBDAOHX - 0wDWy8cA1LCiAMqklwBjPjEAZ0AyALOQgwCvh3oAf1lMAJlzZgBOKBsAWDImAFc0JQBhOi0Aa0Q3ALKL - fgCjfXEAjGZZAI50agCOaV0A///+AOHW0gDXzMcA58S2AOTCtABFHxIATSUXANKxowBgOSsAXzksAGI7 - LgBkPTAAZT8yAGc/MgBoRTgAbkg7AH1XSwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAARGg7O00ZAAAAAAAAAAAfcmlTih1rjUxYAAAAAABJmJZdGA2LcypZfgMAAAAA - QG4SRZ0beT5wl1aFAAAAOXYUAY4iUAYWNCAXPwwAAFWTJxAjkHeML3VLLWwaAAAFQm2UnE8rh5ocJGSE - GgAAM3hmmQdjf2dcHCFll4YAAEMVb4g9DzYsSo9Gm1FXAABBnoIuOAhhewR6MDcucQAAR1o8gwIpMlRb - HihgMQsAAAB0EUhITk6BCl6JUmoAAAAAAIBiCX06OjoJfCUAAAAAAAAAXxM1kQ6SlSYAAAAAAAAAAAAA - AAAAAAAAAAAAAP//AAD4HwAA4AcAAMADAADAAwAAgAEAAIABAACAAQAAgAEAAIABAACAAQAAgAEAAMAD - AADgBwAA8A8AAP//AAAoAAAAIAAAAEAAAAABAAgAAAAAAIAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP// - /wCdd2oAYjQjAMm9twA5EwYAfFZJAK+akgDl3NgA7ci5AM6omwBMJBcAdkUyAK6IewDx7+wAjWlYANbN - yQDeuKoAwpyMAL+xqgBuSkMAZT8yAJ2GfQC7o5oAjXFnAEkbCQClkIgAuJKFAIJfVwBULiEA+Pj0AKaA - cwCTfHMAeVA9AJdxXQDPxL8AVycTAMq1rQBqQDwA5sCzANWwoQCIYk8Ag2ddAEcbFABCFQEA29TPAF85 - LAC5nJIAQRsOAGo5JgCvjoMAXC8cAFswKADn494A1bWoAG5DMgDErKQAxaeZAI9pTwBuSDsAdVFFALaM - fgBRIg8AwaGTAIJbTgDXxsEAsp+YAIpsYQC0lYsAqpWNAJZzawBPKR0A0L22AINWRQCUZ1YAqoN2AIlj - VgCRa18A/Pz5AJxzZACafHEAYDUcAHhZTgChe24AVioZAFgqJwByQS0AkXdtAGdDNwBySz0A7uvnAMW5 - swDMrJ8AeUs5AH1bUwA+FwgASSARALmYjQCAZFoAvqylAOfFtgDz8e8A3tfTANmzpgCjjYQAlW9iAGQ8 - LwDGn5IARxgFAEQdEABcNSgAaz8uAIZfUgDUycQAWDIlAMvAugBzTkIAbUQ2AIZjWgBhNycATB4UAOS+ - sAC1nZUAeVNGAKCEegDm39wASSMWAGtGOQA5EQIAUikbAG5KPQB3UEEAg1hJAJlzZgDGtrAAm3FhAFgt - GQBVLR0AYTEdAFo0JwCTaFoA9/XzAD4WBADY0MsAQhgKAEcZDADrxLcAtaGZAMOdkAC+n5EAsJ2VAHNP - PgCsmJAAupSHALSKfQCsin4ApXttAJx3YwCOdWsAqIN2APr6+ABGIBMATiUVAE0nGgBQKh4AyKmaAGdB - MwBwRDMAqI+FALCLegCpgXMAhmVXAJ95awCNa18Aa0Q1AKyFeQB/XlUAnXVnANHGwQBiOiwAbExBAKiS - igB+WEsAg11QAIdiVQCkfXAAlX51AJNtYADi3dkARBwNAFw0JgBlPS8Aa0EzAI1nWgCOaFsA/P38AD4Y - DABCHRAA0q+gAL6kmgC4o5sAckk8AHZLPAB2Tz0AflpOAJhyZADy8e4A2dLNAM7CvQDGu7UAWjAeAF40 - HgBgOSsAzqiZAGE7LgBiPTEAcUw/AHFQRACsinoAnoh/AEsbCwBMIxUAWTImAF43KgBqRDcAbUY4AD0V - BwBBFwgA6MG0AEgcCwBHIBQASiQWAFIjEQBVKBQATygbANStoABTLB8AVismAFYwIwBeNBsAYjkpALeX - jABoQjUAb0k8AHhOPAB1T0IAdE9GAHZTRgCYdGwAmnRnAI9nWQD+/v0A+fn2AO/r6ADQwr4ASSEUAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADoinZ0iOgAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAKZyaPT2ampo9PbkpAAAAAAAAAAAAAAAAAAAAAAAA9EqHsblLr6+vr68frE+MywAA - AAAAAAAAAAAAAAAAUV1JQExN+VOqS0ufuQJpwbeEyu8AAAAAAAAAAAAAANMMN/N7QExNzQKsrAKFu8Fw - Bth1p9IAAAAAAAAAAACIVr/X8th7QEzBTU1NTcJMtwb1fxW/b4gAAAAAAAAAADHwLta/pvM8BkBwuLhw - t7Z72H8V1y7UdwAAAAAAAAAzA97fi27yFb/YPHsGBntZ4eDgFdfW34u+iQAAAAAA6Irs7u7ZE48jFqbg - O/PhgkMYPG7W1i5uch3SAAAAAADpVEfs7ASgDs4emN8VaoJzDs41aG5ui3IdpIGiAAAAACTno0fqBKD9 - WmUtFS7eV6D9Wg6NKuxy7KSjC6IAAADcPqF+o+e0EI0eZY/Xbr7ZNfzOZU66C+ykowvmYJEAABnlxaF+ - o//uYp5i0ddybh1SW7zPZiD/R6N+ocW9kAAAbOPEMG3mC6ML3S4EWNTW125uf24a2wuko35txOLiAAAs - gAUwfqRyLtZq2NB04H9/f+CmbgcavtYui+yjbV8AAI69o3Ju1tYVphV00HTg4eHh4X+zBxpu19Yuboty - 5wAAor6Lbi7W16ampjwjPOE7Ozs7O2qWtdSm19Yubm7nAADdd24u1hWm8uDg97L3O/Pz8/Pzv0JFs/Km - 19Yu1OYAAHg3FfJ/O/PY2NjMcXvhyclZWVnAkweu2PM7f/KuKwAAACF09Tx7Bga2trh9/mPIB6h8UK2G - k4MGBns89ZcAAAAAy3BAt3BwTExMTf0BAQEBAfugjft6QExwcHBMggAAAAA0h01NTU27aWmFCKCgwwEB - AQEBARf6abu7Tc3tAAAAAAAPuQKsU1NTU1OfMkQvxzglSEFBm6xTU1MfqwAAAAAAAFWpr6+vrw0NDa9L - S0uqqqqqqqqvDQ0NDdoAAAAAAAAAAPYSGxsbGxuZmZmZmZmZmZmZmZmZGxsSFAAAAAAAAAAAAHbVlJSU - lJSUlJRra2tra2uUlJRr1bAAAAAAAAAAAAAAABwo6woKCgoKCgoKCgoKCgoKKMZeAAAAAAAAAAAAAAAA - ACY/eRFnZ2dnZ2dnZ2dnEXmVAAAAAAAAAAAAAAAAAAAAAAB2pWQJkuQnJ+SSCWQ5HAAAAAAAAAAAAAAA - AAAAAAAAAAAAAPhhXDY2XPFGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAD///////gf///AA///AAD//AAAP/gAAB/wAAAP8AAAD+AAAAfAAAAHwAAAA8AAAAOAAAABgAAAAYAA - AAGAAAABgAAAAYAAAAGAAAABgAAAAcAAAAPAAAADwAAAA+AAAAfgAAAP8AAAD/gAAB/8AAA//gAA//+A - Af//8A///////ygAAAAwAAAAYAAAAAEACAAAAAAAgAoAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////AKZ1 - YgBhMyAA37irAKyZkgB7VUgAOhECAOLc2ABFIR8A9M/AAMCyqwCGamAAsoh5AHhDLQDTxsIAyaCSAPHw - 7ABkRkAAmYJ5AJdjTwBPHwkAVzgzALuUhgDSq54Ayry3AKSOhQCVdWoAtqafAD8cDgBUKxcAhV9RAIdS - PABmPzIA5sS1AHNLPQCmf3EA2dDMAOzl4wCUa1oASisnAPn59wDBqJ4ASyIUAGw6JgBXMSQA1banAF8o - EQBuSywASRYAAIBKNACwj4QAXzgqAHtZUwB9YloAPxoYALuNfACgeWsAjHBlALyglwDBmo0AybWuAHJR - RABsRjkAtZiMAJ6IgACWcGMAg1dHAItlWADvyLoAlXtyAN7X0wBqNR8AfV5MADQOBwBGHQ0AXT4wAHRI - NQCpkooAqoR3AEIXBwDNwbsA4r6wAHtQPgBNJxoAZS8ZAF0uHADm4t0AQRMAAFMsHgC5qqMAsaCZALGD - cwDZy8UAp3tqAJJmVABYOCYA7ernAFkkDwDctqYAczwlADkTBgBHJxkAZjsrAPb18gCfgngAdk9CANex - pADHsakAyqSXAPv7+gBHJyQAbEExALWLfQB/X1QAg2NbAJx1aADf0s4AThkCAE8hEABwPioAgFlMAOa/ - sQDDta8AVicTAKJ8bwCPb2EAXzUmAGhCNQC7mYkAZjUiAHtGMQCxlIcARR8SAM69uABZKRQAYj0wAHtJ - NgCIbmMAPhoTAFAmFgBcNikAZDgmAHZAKQByQS4AeFdMALyupwCym5MAZkk+AG9JPACIYlUAOA8HAD0T - BABfMRsAb05DAKuHfACmeGYAmXtxAIJcTwCPaFsA1MvFAGs+KwCtj4EAlmtXAFgvIABaMyYAsYt+AIVV - QQDg2dYA29TQAOzFuAA9FwoA0MS/AMe5swDQqp0Aw52QAHRSQQB4UkUAln50AJlyZQBAGQwAQhwPAFAp - GwBwRzcAtI6BAKKLggCriHgAlG1gADUQAwBZLhkAXzsuALebkQCvhngA78u8AFAfDADdt6oAuJSFAGtJ - OwCPZlcAkWteAPPx7wDl39sA5NvXANfPygA1EQkA1cW/AEgcCgBKJBcAVSwcAHNNQACnj4YAglVDAKmC - dQB7XVMAlmdVAGhFOAB/UDwA8OzpAOrj3wDn390AQhUDAEUZBgBAHBgAy7+5AFUvIQBbMB4Atot6AHVP - PgCAV0kApYBzAEQcCwBPHAUATSUXAFsrGQBpPi0AakQ2ALyPfgBmREAArJGEAKR6aQCUeW8AkmhYAPf2 - 9ADLurQARyEUAMW3sQDBtK0At6ihAMmilQBhOi0AZT0uAHBNLgB2RTIAsox/AH5YSwDnwbQAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwSX4kwA1xcQ3AJH5J - +wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAsLtcODjiDQ3AwA0N4jjsDUKwAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAMXWApzvJE9PT09PT09PT0/UJF6cJ8UAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAABg0xRf8buzOSRPT09PT09PT9R9dELH8dZDYAAAAAAAAAAAAAAAAAAAAAAAAAAAADQgp+Selp+7 - dDkk1NRPT0/U5X05QsdEH3lDp74AAAAAAAAAAAAAAAAAAAAAAAAA6jJNI2r+npafu7M5OX0kJCR9OXRC - u0SWeQbRI4n6AAAAAAAAAAAAAAAAAAAAAAChg3AhP9Gx/h+Wn7tCs3R0dHR0QrvHRJaeBmqVgCH8+gAA - AAAAAAAAAAAAAAAAAI4O6oghgD/Rsf6elkSfx7u7u7u7x59EH54GapXrIYiIkDQAAAAAAAAAAAAAAAAA - pI9n+YiIIYA/0bEGnh+WRERERERElh+eeQZq0T8hIYi+NHjgAAAAAAAAAAAAAADPZI6Njb6IiCGAP9Fq - Bv55nh8fHx+ennkGsdGV6yEhiIg0jX8sZgAAAAAAAAAAAABIgqWljTS+NH+NNCGV0WqxBgYG/gYGBrHR - 0T+AISGIiL6NjaV/AwAAAAAAAAAAALZIpOAtpY2k14pGOj40gJXR0dFqamoj6yH6iCEhiIiINDSNpS3g - A1QAAAAAAAAAS1VWWVktLVmKRxHIEckFgIiAPz8/PyGV8BpBc/k0iIg0jY2lLeBZ0Fa1AAAAAAAAK1W2 - VFngWddXyGFhYdnyC4iIISEh+XLLyMjI2d+RpTSNjaUt4Fm2VOn0AAAAAAAAh4foVLZZ6NXIYWFhYWFh - yAyliIiIiKzyYWFhYWgImi2lLS3gWbZUVIyMAAAAAAC0LyvP6FS2VIjJyGFhYWFhaLItiIg01wgRYWFh - YWEpBbYtLeBZtlRUz/R8tAAAAABLYoX0z+hUtisMYSnIERFo8kakNDQ0pXspYWFhYWHyHFTg4Fm2VFTP - 9IV3HQAAAAAVwrWF9M/PVFQrmlqpyUeSybJZjY2NpcWgbmjIyPJuW+hZWbZU6M/0hbVL5gAAAAAVzrS1 - hfTPz1RUKystiI1ZJRO2paWljeC+QVEIR/clHCtZtlToz/SFtR20zgAAAADnUKu0tYWF9M/oVFRUtrYt - qRNZjY00NL6NpKWAiCv2ks9ZVFTP9IW1tKur3QAAAJd2mGWrq7S1hfRUWS2lNPkhR7k0gIDr6+vr64Ah - ITQZC6W+jaXgtuiFtatl3JcAAJcxB7xlq4VU4KU0iCEhISGAR7n56+s/Pz8/6+uAgPkZ9o2IiL40NI2l - WVSFzkoAAEpYB7VU4KWNNL6IiCEhISHrqBr5Pz8/Pz8/Pz/rgPnfezQhiIi+NI2NpS0t4cwAAEp8WS2l - pY00NIiIISGAgIA/qBqIPz8/Pz8/Pz8/P4jfezQhIYiIvjSNjS0t4UoAAACZpS2ljY00iIiIIYCAgIA/ - CBohlZWVlZWVlT8/P/pRe/mAISGIiL40jaWlpAAAAAC9f6WNjTSIiCEhgICAP+s/CNIhlZWVlZWVlZWV - PyFR9fmAgIAhiIi+NI2N0AAAAAAeZ42+iIghgIDrPz8/lZXRyU6A0dHR0dHR0dHR0eusrSE/Pz+AgCEh - iIj6tgAAAADoTSGA6z8/lZXR0dHRamqx205wI9FqamqxsbGxsSMPGZXR0dHRlZU/P4C3ZgAAAACL2CPR - 0dFqsbGxBgYG/v55CMqT0mmdG35Elh95BiMPUWoGBgaxsWpq0dFTiwAAAAAAU+QGBgb+/nmenp4fHx+W - CAEBAW4p8sjZJsmoJazIhuQfnp6eef7+/nnjAAAAAAAAiF8fHx8fH5aWlkRERETH2m4pKSkpbm5ubm4B - AQEB8x9ERJaWlpYfH8ZMAAAAAAAA3qOfn5+fn8fHx8e7u7tC2gEBAQEBAW5ubm5ubm4BhkS7u8fHx8fH - xyc3AAAAAAAAALDvQrOzs7Ozs7N0dHSzv81ddcrbJtnIKW4BAQEBPbt0dHR0s7OzOT4AAAAAAAAAAN7v - fTk5fX19fX19fX19OXQ5OTl95U+bM0A7Kmwq5X19fX19fX19Od4AAAAAAAAAAACU4tTU1NRPT09PT09P - urq6urpPT09P1NQkJCQkT7pPT09PT09xlAAAAAAAAAAAAAAAfhempqb9/f39uLi4uLi4uLi4uLi4uLi4 - uLi4uLi4uP39/Rd+AAAAAAAAAAAAAAAAN7o8xBcXFxcXFxcXFxcXFxcXFxcXFxcXFxcXFxcXFxcXPLo3 - AAAAAAAAAAAAAAAAAG/EEDw8PDyvr6+vr6+vr6+vr6+vr6+vr6+vr6+vrzz4xG8AAAAAAAAAAAAAAAAA - AAAogRj4+PhtbW1tbW1tbW1tbW1tbW1tbW1tbW1tbRiBKAAAAAAAAAAAAAAAAAAAAAAACaJjGK6urq6u - rq6urq6urq6urq6urq6urq4YY6IJAAAAAAAAAAAAAAAAAAAAAAAAAACKYwRra2tra2tra2tra2tra2tr - a2trawRjigAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFoR6egTDw8PDw8PDw8PDw8PDwwR6eoQWAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAS7lJFqv96UlJSUlJSev+qRVLuEgAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAA2QC4iwQoKCgrBIi5ANgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAA7TVzczXtAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAA////////AAD///////8AAP//gAH//wAA//4AAH//AAD/+AAAH/8AAP/g - AAAH/wAA/8AAAAP/AAD/gAAAAf8AAP8AAAAA/wAA/gAAAAB/AAD8AAAAAD8AAPgAAAAAHwAA+AAAAAAf - AADwAAAAAA8AAOAAAAAABwAA4AAAAAAHAADgAAAAAAcAAMAAAAAAAwAAwAAAAAADAADAAAAAAAMAAMAA - AAAAAwAAwAAAAAADAACAAAAAAAEAAIAAAAAAAQAAgAAAAAABAACAAAAAAAEAAMAAAAAAAwAAwAAAAAAD - AADAAAAAAAMAAMAAAAAAAwAAwAAAAAADAADgAAAAAAcAAOAAAAAABwAA4AAAAAAHAADwAAAAAA8AAPAA - AAAADwAA+AAAAAAfAAD8AAAAAD8AAPwAAAAAPwAA/gAAAAB/AAD/AAAAAP8AAP+AAAAB/wAA/+AAAAf/ - AAD/8AAAD/8AAP/8AAA//wAA//+AAf//AAD///gf//8AAP///////wAAKAAAAEAAAACAAAAAAQAIAAAA - AAAAEgAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8Ap3dkAGswFwDfuasAa1VKADkRAwCxmZEA493ZAEEt - JwCSXEYAfkUsAPTNvwC+r6gAW0AyAIVvZQDUy8YAuYl2AJyFfABWHQUAz6SUAPDu6wA1HRoAVzoeAH1f - UwB8UD4ASyQWAMKWhADKvrgAKAwGAJF5cACebFcAbUc6AG48JwDqxLUAtaWdANOwoQCogXQAlW9iAFsr - GAClkYkAkGRUAGFLQwDb084AMBIQAEEbDQBQOjEAShYAAPj39QCvin0AYTYlAOvl4gBOLyIAxKiaAMGb - jgBAJBgAX0IjAIVnWwBkSzMAt5CDAKB6bQBxQzAAfFZJAIBMNQBOHwwAZ0AyAI1WPgB2YVYANxcKAFtE - PwDDt7AAbFJBAGk2IACvf2sAz8O+AEUrHwBYMSMAWCQMAHY7IwBjKxIAv5B9ALmdkwCWfnUAeUk3ALmZ - iQCuhngA2rOlAHRNQACbdWcAjXRqAC4SCADUqpoAkWtaAOa/sQBBFgQATykcALCgmACcb1wAPyUjAKON - hAB1WUwAyqydADseEQCEV0YA8Mi6AEosKgDJno0AYjstAGZMPQCHYFIAiW1dAOHZ1QDHoZQAu6ujAMav - pwBjLxgASTUuALCQhAC0jYAAy7ewACwMDABGIBMARyoUANfOygCEUz8Ag1tMAJhnVABSJRQA7uvnAL+k - lgB5UkQAj3BjAHA1HAClemsAlGNPAPv7+gD08/AAZEMzAHlBKQDNp5kAsoRxAGAyIQBcNSgAaFBKAKCI - fACVdmoAVy0dAFY9LwCMZlkA5+HeAEgbCQCsk4oAgGhcACsHBgBuRTUANBQGANiungCqhHcAmX5yAGg6 - KACbg3gAPRcKALOXiwByPikAqI2DAHpHMgBcRDkAe2JWANC/uADApp4AQhIAAEshEgBZJxIAVC0gAEw0 - JQDku6sAPCQgAF4vHABlMx4AaUM2AKN9cACBY1cA0qudAFMpGQDYyMMAy8G7AKt/bgCPYU4AMhUOAFsh - CABBKRwAtIl4AKyDcwCgg3kArHxpAIVqXgDQxsEAx7m0ADwiFgDAs6wAw6ykAEguIgC7lYgAgkkwAKyI - fABlTUcAcEs+AJxxYADe1tIALRAOADcTCwBEGAgAPRsLANu2qABSGgQAVCIPAEcmFwBfOCsAZD4wALuN - ewBsQC8AoHhqAI9dSgCSbF4AiG5jAI9nWgBIGAUAuqSdAHlOPgCUYEsAThgCALSimgDd0cwA8su9ADkT - BgA3GQ4Af1lMAHhdTwCYcmUAiGJVANexowBMGgcARR0PAFEzJABcMh4AWTIlAL2XigC+lIMAdkMuAHVJ - NgB+VUYAjFhCAI94bACDXVAAQCETAEMqJgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - ODpHZBi1tRhkRzo4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - F2w5PL/bUFBQUFBQUFDbVTy1bBcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAOGIURUNu/v7+/VVVVVb+/v7/bUNuFGJMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAA5tAsLCusBVVVVVVVVVVVVVVVVVVVXAukkCbZMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAArvofH2HPWN20JZ2dnZ2dnZ2dnZ2dnZ0ltN1Yz2Efgq4AAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAB6iQrluynh3yZYPLQlnZ2dnZ2dnZ2dnZ0lPN3uJlzhKYbeDnoAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAABL+UJ8Z33975TfJlg8tCUlnZ2dnZ2dnSW0PN3uJt+Ubf19Z/sgvgAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAADJPz9T5II+7G3v4d8mWN08tLQlJSUlJbS0PFjuJt+U7/3sgoLkP1NLAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAA0y6U9miBXgj59be/h3ybuWN08PDy0PDw83VjuJt+U7/3sPoLOIJqlpckA - AAAAAAAAAAAAAAAAAAAAAAAAAAA0y/g9QUGzzleCPv1t75Tf3ybuWFhYWFhY7u4m3+GU7/3sPoJXILNB - QT2lSwAAAAAAAAAAAAAAAAAAAAAAAABLC/jc2traQSDOV4I+fW3vlOHf3yYmJiYmJibf35Tvbf3sPoJX - zrNB2tpBPfi+AAAAAAAAAAAAAAAAAAAAAAA3iqOfa2va2tqzIM5Xgj7s/W3vlJTh4d/f3+HhlO/vbf3s - PoJXzrNB2tpra2sho8YAAAAAAAAAAAAAAAAAAABmIaOf2dlra9ra2rMgzleCPux9/W1t7+/v7+/v7239 - /ew+PoJXzrNB2traa2vZMiEyZgAAAAAAAAAAAAAAAAAATE6fMo7Z2Wtr2trasyDOV4KCPuzsff39/f39 - /f3s7D4+gldXILNB2traa2vZ2Y4yITQAAAAAAAAAAAAAAAAAN05IjfWOjtnZa2va2tpBsyDOV4KCPj4+ - Puzs7D4+PoKCV1fOILNB2traa2vZ2Y6O9TJIxgAAAAAAAAAAAAAAZrJIjUxM9Y6O2dn1jtpBa45rsyDO - V1eCgoKCgoKCgldXV84gs0Ha2traa2vZ2Y6O9UxMspIAAAAAAAAAAAAAANiEsa2tTPX1jo714HEQe0rn - OWvasyDOzs5XV1dXVyBBQdpr2Wva2tpra2vZ2Y6O9UytrZKyxgAAAAAAAAAAAOtzc5Jfra1M9fWOI4iI - FRUViBUNIGtBs7OzICAgs9o+Y3EN51LOjmtra2vZ2Y6O9Uytra1fsZIAAAAAAAAAAAD+AydfX1+trUxf - UjCAgICAgICAMEqza9ra2kFBQWsSlYiIiIiICGPZ2dnZ2Y6O9UxMra1fX7dzZgAAAAAAAAAArHO3Gl9f - X62tX8eIgICAgICAgIAwY/Xa2tra2tnDFRWAgICAgBUwI/XZjo6O9Uytra1fX18aJxoAAAAAAAAA60+s - GhoaX19frRoNiICAgICAgICAiByOa2va2tqOcTCAgICAgICAgIhZrY6O9Uytra1fX18aGn+sRAAAAAAA - AC1PfxoaGhpfX18a4DCAgICAgICAgIjE2dlra2tr9ceIgICAgICAgICIxa319Uytra1fX18aGhoarOsA - AAAAAABArKt5eRoaGl9fX19ghxWAgICAgBWIxI7Z2dnZ2UygMICAgICAgICAiEpMTEytra1fX18aGhp5 - edctAAAAAADSTdfyeXkaGhoaX19fXxKVMDCIMDCAFcSOjtnZ2dmO2RyHFYCAgICAFYi5ra2trV9fX18a - Ghp5efJAQAAAAAAAvL1ALS3yeXkaGhpfX1952h4jRscoZHt79Y6Ojo6O2UzaDYgwiIiIMDAwuV+trV9f - X18aGhp5efIt8kC8AAAAAES9li0tLfJ5eRoaGl9fXxqrGl9fGq0re0z1jo6Ojo6OTK21IxDQ0MVSCMRf - X61fX18aGhp5efItLS1AWgAAAAChE9OhoS0t8nl5GhoaX19fX19fra2tK3tM9Y6Ojo7Z2dmOrZKO2tlf - rQjEX19fX18aGhp5efItLaGh8ZsAAAAAXtZe6qGhLS3yeXkaGhoaX1+tTI6Oayt72tpBs7Ozs7Ozs7Oz - Qdra2rMIEI6OjkytXxoaefItLaGh6uKbAAAAAF7mBurqoaEtLfJ5Gl+tjtlr2tpBQbPQK0Gzs7Ozs7Oz - s7Ozs7Ozs9ogCBBr2tpra9nZjkytGnktoepemwAAAABeLwYGBuqheRqt9dnZa2va2traQUGz0Cuzs7Oz - s7Ozs7Ozs7Ozs7NBIAgQa9raa2vZ2dmOjo71rV8aQOoAAAAABqoG6vIarfWO2dnZa2tr2traQUFBs9Ar - s7Ozs7OzILOzs7Ozs7OzQSCVe2va2tpra9nZ2Y6O9fVMrY3UAAAAAJtAGl9M9fWOjtnZa2tr2tpBQUGz - QbPQK7OzICAgICAgICAgICCzs0EglXvaQUHa2mtra9nZjo71TK2N1AAAAADUSEytTPWOjtnZa2tr2tpB - QUGzs7MgbysgICAgICAgICAgICAgICCzzpV7QUFBQdraa2tr2dmOjvX1MkQAAAAAREhM9fWOjtnZa2va - 2tpBQUGzs7OzIG/QICAgICAgICAgICAgICAgs86Ve0Gzs0Ha2tpra2vZ2Y6O9TKbAAAAAFpIMvWOjtnZ - a2tr2tpBQbOzs7OzsyAI0CAgzs7Ozs7Ozs7Ozs4gILPOM3tBs7OzQUHa2mtra9nZjo6NWgAAAAAdSDKO - jtlra2va2kFBs7Ozs7MgICDOCNAgzs7Ozs7Ozs7Ozs7Ozs4gVzMrs7Ozs7OzQUHa2mtra9nZjR0AAAAA - mUjca9ra2kGzs7OzICAgzs7OV1dXVwhvV1dXgoKCgoKCgoKCV1dXV4IzKyDOzs7OICAgs7OzQdraQfSZ - AAAAAAD0U7Ozs7MgIM7OzldXV1eCgoKCgj4Ib1dXV4KCgj4+Pj4+Pj4+PoLsM9BXgoJXV1dXV87OICAg - s/lfAAAAAAAA2HxXzs5XV1dXgoKCgj4+Pj4+7D7sCDDjwZ6Rg5Tv/ew++oKCgoKCPjPQgj4+Pj4+goKC - gldXV1cZxgAAAAAAALx8+oKCgoI+Pj4+7Ozsff39/f39bQgBAQGHMIgVMwjQe0rFDeMHpJeI0Oz9/X3s - 7OzsPj4+Pj4+GdEAAAAAAAAA+bvs7Ozs7Oz9/f1tbW1tbe/v75SVhzAwMIeHh4eHAQEBAQEBAQEBAdBt - bW1tbW39/f19fX3sbYkAAAAAAAAAAPN+bW1tbW1tbe/v7++UlJSUlJTflYcwMDAwMDAwMDAwMDAwMDAw - MAHo75SUlO/v7+/v7+/v7ylLAAAAAAAAAAAsu9+UlJSU4eHh4eHf39/f39/fJjMBh4eHh4eHh4eHh4eH - h4eHh4cB6OHf39/f39/f3+Hh4d99eAAAAAAAAAAAAIkCJiYmJiYmJiYmJu7u7u7u7iaoMIeHAQEBAQEB - AQEBAYeHh4eHAW/f7u7u7u4mJiYmJibdkwAAAAAAAAAAAAC8YYVYWFhYWFhY3d3d3d3d3d3d3cx1olGp - cneouOhvlTMViDCHATDIWN3d3d3d3d3d3Vg8XNEAAAAAAAAAAAAAAA6MtDw8tLS0tLS0tLS0tLS0tLS0 - PDzd3d3d3d3dPLQlncx1olExPLS0tLS0tLS0tLS0wC4AAAAAAAAAAAAAAAB4XL8lJSWdnZ2dnZ2dnZ2d - nZ2dnZ1VVVVVVVVVVZ2dnZ2dJSUlwJ2dnZ2dnZ2dnZ2dv7UAAAAAAAAAAAAAAAAAALC/dszMMTExMTEx - MTExMTExMTExdnZ2dnZ2dnZ2dnZ2dnZ2djExMTExMTExMTExdsAWAAAAAAAAAAAAAAAAAAAAphs7dnZ2 - djs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O/cuAAAAAAAAAAAAAAAAAAAAAADt - asrKysrKysrKysr29vb29vb29vb29vb29vb29vb29vb29vb29vb2ysrK9moFAAAAAAAAAAAAAAAAAAAA - AAAAAG4UNjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NhSnAAAAAAAAAAAAAAAA - AAAAAAAAAAAAg1twcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcFuYAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAADDnIuLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLtpxDAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAW2Vra2tra2tra2tra2tra2tra2tra2tra2tra2tra2tra2VosqAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdFSvViTw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PBWr3UJ - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAsmPBd1VbV1dXV1dXV1dXV1dXV1dXV1dXV1dXV1QRd - JEMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/ngQiXQQEBAQEBAQEBAQEBAQEBAQEBAQE - XSLV/LAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/WSRoaCJdXV1dXV1dXV1dXV1d - XSJoaGUPYgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKqBlIgwMDOloaGjp - 6QwM6SJlUkUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGmPD5Ci - gTU1gaKQD81pAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////////////////// - /8AD///////8AAA///////AAAA//////wAAAA/////8AAAAA/////AAAAAA////4AAAAAB////AAAAAA - D///4AAAAAAH///AAAAAAAP//4AAAAAAAf//AAAAAAAA//4AAAAAAAB//gAAAAAAAH/8AAAAAAAAP/gA - AAAAAAA/+AAAAAAAAB/wAAAAAAAAH/AAAAAAAAAP8AAAAAAAAA/gAAAAAAAAB+AAAAAAAAAH4AAAAAAA - AAfAAAAAAAAAB8AAAAAAAAADwAAAAAAAAAPAAAAAAAAAA8AAAAAAAAADwAAAAAAAAAPAAAAAAAAAA8AA - AAAAAAADwAAAAAAAAAPAAAAAAAAAA8AAAAAAAAADwAAAAAAAAAPAAAAAAAAAA8AAAAAAAAAD4AAAAAAA - AAfgAAAAAAAAB+AAAAAAAAAH8AAAAAAAAA/wAAAAAAAAD/AAAAAAAAAP+AAAAAAAAB/4AAAAAAAAH/wA - AAAAAAA//AAAAAAAAH/+AAAAAAAAf/8AAAAAAAD//4AAAAAAAf//wAAAAAAD///gAAAAAAf///AAAAAA - D///+AAAAAAf///8AAAAAD////4AAAAA/////4AAAAH/////4AAAB//////8AAA///////+AAf////// - //////////////////8= - + + + ..\Common\app.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/BAPSPresenter/AudioWall.h b/BAPSPresenter/AudioWall.h index 513d510f..e6a9d973 100644 --- a/BAPSPresenter/AudioWall.h +++ b/BAPSPresenter/AudioWall.h @@ -169,9 +169,12 @@ namespace BAPSPresenter { this->AutoScaleDimensions = System::Drawing::SizeF(6, 13); this->AutoScaleMode = System::Windows::Forms::AutoScaleMode::Font; this->ClientSize = System::Drawing::Size(1026, 735); - this->ControlBox = false; + this->ControlBox = true; + this->MinimizeBox = false; + this->MaximizeBox = false; + this->StartPosition = System::Windows::Forms::FormStartPosition::CenterParent; this->FormBorderStyle = System::Windows::Forms::FormBorderStyle::FixedSingle; - this->Icon = (cli::safe_cast(resources->GetObject(L"$this.Icon"))); + this->Icon = (cli::safe_cast(resources->GetObject(L"$this.Icon"))); this->KeyPreview = true; this->Name = L"AudioWall"; this->Text = L"Audio Wall"; diff --git a/BAPSPresenter/AudioWall.resx b/BAPSPresenter/AudioWall.resx index 17808c86..c36bf988 100644 --- a/BAPSPresenter/AudioWall.resx +++ b/BAPSPresenter/AudioWall.resx @@ -112,233 +112,13 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - 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 - djs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O/cuAAAAAAAAAAAAAAAAAAAAAADt - asrKysrKysrKysr29vb29vb29vb29vb29vb29vb29vb29vb29vb2ysrK9moFAAAAAAAAAAAAAAAAAAAA - AAAAAG4UNjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NhSnAAAAAAAAAAAAAAAA - AAAAAAAAAAAAg1twcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcFuYAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAADDnIuLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLtpxDAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAW2Vra2tra2tra2tra2tra2tra2tra2tra2tra2tra2tra2VosqAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdFSvViTw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PBWr3UJ - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAsmPBd1VbV1dXV1dXV1dXV1dXV1dXV1dXV1dXV1QRd - JEMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/ngQiXQQEBAQEBAQEBAQEBAQEBAQEBAQE - XSLV/LAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/WSRoaCJdXV1dXV1dXV1dXV1d - XSJoaGUPYgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKqBlIgwMDOloaGjp - 6QwM6SJlUkUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGmPD5Ci - gTU1gaKQD81pAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////////////////// - /8AD///////8AAA///////AAAA//////wAAAA/////8AAAAA/////AAAAAA////4AAAAAB////AAAAAA - D///4AAAAAAH///AAAAAAAP//4AAAAAAAf//AAAAAAAA//4AAAAAAAB//gAAAAAAAH/8AAAAAAAAP/gA - AAAAAAA/+AAAAAAAAB/wAAAAAAAAH/AAAAAAAAAP8AAAAAAAAA/gAAAAAAAAB+AAAAAAAAAH4AAAAAAA - AAfAAAAAAAAAB8AAAAAAAAADwAAAAAAAAAPAAAAAAAAAA8AAAAAAAAADwAAAAAAAAAPAAAAAAAAAA8AA - AAAAAAADwAAAAAAAAAPAAAAAAAAAA8AAAAAAAAADwAAAAAAAAAPAAAAAAAAAA8AAAAAAAAAD4AAAAAAA - AAfgAAAAAAAAB+AAAAAAAAAH8AAAAAAAAA/wAAAAAAAAD/AAAAAAAAAP+AAAAAAAAB/4AAAAAAAAH/wA - AAAAAAA//AAAAAAAAH/+AAAAAAAAf/8AAAAAAAD//4AAAAAAAf//wAAAAAAD///gAAAAAAf///AAAAAA - D///+AAAAAAf///8AAAAAD////4AAAAA/////4AAAAH/////4AAAB//////8AAA///////+AAf////// - //////////////////8= - + + + ..\Common\app.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/BAPSPresenter/BAPSPresenter.vcxproj b/BAPSPresenter/BAPSPresenter.vcxproj index 8c655e0a..512469df 100755 --- a/BAPSPresenter/BAPSPresenter.vcxproj +++ b/BAPSPresenter/BAPSPresenter.vcxproj @@ -27,7 +27,7 @@ Application - v140 + v141 Unicode Pure true @@ -71,7 +71,7 @@ <_ProjectFileVersion>14.0.25431.1 - $(SolutionDir)$(Platform)\$(Configuration)\ + $(SolutionDir)\BAPSPresenter\$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ true @@ -335,10 +335,9 @@ - + - diff --git a/BAPSPresenter/BAPSPresenter.vcxproj.filters b/BAPSPresenter/BAPSPresenter.vcxproj.filters index d980e496..5d3d25cc 100755 --- a/BAPSPresenter/BAPSPresenter.vcxproj.filters +++ b/BAPSPresenter/BAPSPresenter.vcxproj.filters @@ -271,18 +271,12 @@ - - Resource Files - Resource Files Resource Files - - Resource Files - Resource Files @@ -292,6 +286,9 @@ Resource Files + + Resource Files + diff --git a/BAPSPresenter/BAPSPresenterMain.resx b/BAPSPresenter/BAPSPresenterMain.resx index 7354bf4c..097927d4 100644 --- a/BAPSPresenter/BAPSPresenterMain.resx +++ b/BAPSPresenter/BAPSPresenterMain.resx @@ -112,239 +112,21 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + 11, 5 - - + + + 25 - - - - - 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 - djs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O/cuAAAAAAAAAAAAAAAAAAAAAADt - asrKysrKysrKysr29vb29vb29vb29vb29vb29vb29vb29vb29vb2ysrK9moFAAAAAAAAAAAAAAAAAAAA - AAAAAG4UNjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NhSnAAAAAAAAAAAAAAAA - AAAAAAAAAAAAg1twcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcFuYAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAADDnIuLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLtpxDAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAW2Vra2tra2tra2tra2tra2tra2tra2tra2tra2tra2tra2VosqAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdFSvViTw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PBWr3UJ - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAsmPBd1VbV1dXV1dXV1dXV1dXV1dXV1dXV1dXV1QRd - JEMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/ngQiXQQEBAQEBAQEBAQEBAQEBAQEBAQE - XSLV/LAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/WSRoaCJdXV1dXV1dXV1dXV1d - XSJoaGUPYgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKqBlIgwMDOloaGjp - 6QwM6SJlUkUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGmPD5Ci - gTU1gaKQD81pAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////////////////// - /8AD///////8AAA///////AAAA//////wAAAA/////8AAAAA/////AAAAAA////4AAAAAB////AAAAAA - D///4AAAAAAH///AAAAAAAP//4AAAAAAAf//AAAAAAAA//4AAAAAAAB//gAAAAAAAH/8AAAAAAAAP/gA - AAAAAAA/+AAAAAAAAB/wAAAAAAAAH/AAAAAAAAAP8AAAAAAAAA/gAAAAAAAAB+AAAAAAAAAH4AAAAAAA - AAfAAAAAAAAAB8AAAAAAAAADwAAAAAAAAAPAAAAAAAAAA8AAAAAAAAADwAAAAAAAAAPAAAAAAAAAA8AA - AAAAAAADwAAAAAAAAAPAAAAAAAAAA8AAAAAAAAADwAAAAAAAAAPAAAAAAAAAA8AAAAAAAAAD4AAAAAAA - AAfgAAAAAAAAB+AAAAAAAAAH8AAAAAAAAA/wAAAAAAAAD/AAAAAAAAAP+AAAAAAAAB/4AAAAAAAAH/wA - AAAAAAA//AAAAAAAAH/+AAAAAAAAf/8AAAAAAAD//4AAAAAAAf//wAAAAAAD///gAAAAAAf///AAAAAA - D///+AAAAAAf///8AAAAAD////4AAAAA/////4AAAAH/////4AAAB//////8AAA///////+AAf////// - //////////////////8= - + + + + ..\Common\app.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/BAPSPresenter/ConfigDialog.h b/BAPSPresenter/ConfigDialog.h index dd71ff49..0efefaa9 100644 --- a/BAPSPresenter/ConfigDialog.h +++ b/BAPSPresenter/ConfigDialog.h @@ -186,6 +186,7 @@ namespace BAPSPresenter { this->Controls->Add(this->status); this->Controls->Add(this->cancelButton); this->Controls->Add(this->saveButton); + this->StartPosition = System::Windows::Forms::FormStartPosition::CenterParent; this->Font = (gcnew System::Drawing::Font(L"Tahoma", 8.25F, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, static_cast(0))); this->FormBorderStyle = System::Windows::Forms::FormBorderStyle::FixedDialog; diff --git a/BAPSPresenter/LoadShowDialog.h b/BAPSPresenter/LoadShowDialog.h index 8d512c3c..ea90df21 100644 --- a/BAPSPresenter/LoadShowDialog.h +++ b/BAPSPresenter/LoadShowDialog.h @@ -262,6 +262,7 @@ namespace BAPSPresenter { this->CancelButton = this->cancelButton; this->ClientSize = System::Drawing::Size(334, 161); this->ControlBox = false; + this->StartPosition = System::Windows::Forms::FormStartPosition::CenterParent; this->Controls->Add(this->listBox); this->Controls->Add(this->cancelButton); this->Controls->Add(this->goButton); diff --git a/BAPSPresenter/LoadShowDialog.resx b/BAPSPresenter/LoadShowDialog.resx index 17808c86..c36bf988 100644 --- a/BAPSPresenter/LoadShowDialog.resx +++ b/BAPSPresenter/LoadShowDialog.resx @@ -112,233 +112,13 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - AAABAAQAEBAAAAAAAABoBQAARgAAACAgAAAAAAAAqAgAAK4FAAAwMAAAAAAAAKgOAABWDgAAQEAAAAAA - AAAoFgAA/hwAACgAAAAQAAAAIAAAAAEACAAAAAAAQAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////AJ13 - awBfNiUAzL64ADoVBgCvnJQAeVdLAOXe2wDMppkAsIh7AHFAOwBMJRcAjGdaAOjEtgDazckApJGJALmT - hgCZgngA07GjAI10awBkPzIA9/f0AFQtIACEXlEAl3BgAEEdDwBzTT8A4NbSAKR+cQDs5OEAbUAtAGhF - OQCJbGIAk3pwAMW5tACAY1gAso+CAJtvaABXMyYAqId8AM25sgB4UkUAYDksAG9IOgBIIRMAgFpNAOHb - 1wCfgngAoHxtAN7QywBOKRoA1c3HAOTCswBrQzUAfVVIAI5qXgBRJhYAyaOWAK+JgACYcmUAf15SAIVk - WABQKx4AVzAiAHZQQQBEHxIAYj0tAJZtXQCSd20AkHNoAHRDOwCyjH8AYzclAGg/MQB3WU4AfVdMAKyG - fACuhngA18rGAFUrHQBnQTQAupaIAJp0ZwDj19MARR4PAF04KwBhPjAAakEuAGtFOACeemsA6+LfAGU9 - MABxSTwAsYp9AJ1xaQCXcGMA4NjUANOvoQDYzMcAUiodAF83KgBhOy4AbUY5AKuFegCLZVkAnXltAJx2 - aQBIIhUATScaAGRANABpQzYAbUg7AHRQQgB7VEgAgltNAJ96bQDq5OEARh8SAE4lFwBZMyYAdlBDAOHX - 0wDWy8cA1LCiAMqklwBjPjEAZ0AyALOQgwCvh3oAf1lMAJlzZgBOKBsAWDImAFc0JQBhOi0Aa0Q3ALKL - fgCjfXEAjGZZAI50agCOaV0A///+AOHW0gDXzMcA58S2AOTCtABFHxIATSUXANKxowBgOSsAXzksAGI7 - LgBkPTAAZT8yAGc/MgBoRTgAbkg7AH1XSwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAARGg7O00ZAAAAAAAAAAAfcmlTih1rjUxYAAAAAABJmJZdGA2LcypZfgMAAAAA - QG4SRZ0beT5wl1aFAAAAOXYUAY4iUAYWNCAXPwwAAFWTJxAjkHeML3VLLWwaAAAFQm2UnE8rh5ocJGSE - GgAAM3hmmQdjf2dcHCFll4YAAEMVb4g9DzYsSo9Gm1FXAABBnoIuOAhhewR6MDcucQAAR1o8gwIpMlRb - HihgMQsAAAB0EUhITk6BCl6JUmoAAAAAAIBiCX06OjoJfCUAAAAAAAAAXxM1kQ6SlSYAAAAAAAAAAAAA - AAAAAAAAAAAAAP//AAD4HwAA4AcAAMADAADAAwAAgAEAAIABAACAAQAAgAEAAIABAACAAQAAgAEAAMAD - AADgBwAA8A8AAP//AAAoAAAAIAAAAEAAAAABAAgAAAAAAIAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP// - /wCdd2oAYjQjAMm9twA5EwYAfFZJAK+akgDl3NgA7ci5AM6omwBMJBcAdkUyAK6IewDx7+wAjWlYANbN - yQDeuKoAwpyMAL+xqgBuSkMAZT8yAJ2GfQC7o5oAjXFnAEkbCQClkIgAuJKFAIJfVwBULiEA+Pj0AKaA - cwCTfHMAeVA9AJdxXQDPxL8AVycTAMq1rQBqQDwA5sCzANWwoQCIYk8Ag2ddAEcbFABCFQEA29TPAF85 - LAC5nJIAQRsOAGo5JgCvjoMAXC8cAFswKADn494A1bWoAG5DMgDErKQAxaeZAI9pTwBuSDsAdVFFALaM - fgBRIg8AwaGTAIJbTgDXxsEAsp+YAIpsYQC0lYsAqpWNAJZzawBPKR0A0L22AINWRQCUZ1YAqoN2AIlj - VgCRa18A/Pz5AJxzZACafHEAYDUcAHhZTgChe24AVioZAFgqJwByQS0AkXdtAGdDNwBySz0A7uvnAMW5 - swDMrJ8AeUs5AH1bUwA+FwgASSARALmYjQCAZFoAvqylAOfFtgDz8e8A3tfTANmzpgCjjYQAlW9iAGQ8 - LwDGn5IARxgFAEQdEABcNSgAaz8uAIZfUgDUycQAWDIlAMvAugBzTkIAbUQ2AIZjWgBhNycATB4UAOS+ - sAC1nZUAeVNGAKCEegDm39wASSMWAGtGOQA5EQIAUikbAG5KPQB3UEEAg1hJAJlzZgDGtrAAm3FhAFgt - GQBVLR0AYTEdAFo0JwCTaFoA9/XzAD4WBADY0MsAQhgKAEcZDADrxLcAtaGZAMOdkAC+n5EAsJ2VAHNP - PgCsmJAAupSHALSKfQCsin4ApXttAJx3YwCOdWsAqIN2APr6+ABGIBMATiUVAE0nGgBQKh4AyKmaAGdB - MwBwRDMAqI+FALCLegCpgXMAhmVXAJ95awCNa18Aa0Q1AKyFeQB/XlUAnXVnANHGwQBiOiwAbExBAKiS - igB+WEsAg11QAIdiVQCkfXAAlX51AJNtYADi3dkARBwNAFw0JgBlPS8Aa0EzAI1nWgCOaFsA/P38AD4Y - DABCHRAA0q+gAL6kmgC4o5sAckk8AHZLPAB2Tz0AflpOAJhyZADy8e4A2dLNAM7CvQDGu7UAWjAeAF40 - HgBgOSsAzqiZAGE7LgBiPTEAcUw/AHFQRACsinoAnoh/AEsbCwBMIxUAWTImAF43KgBqRDcAbUY4AD0V - BwBBFwgA6MG0AEgcCwBHIBQASiQWAFIjEQBVKBQATygbANStoABTLB8AVismAFYwIwBeNBsAYjkpALeX - jABoQjUAb0k8AHhOPAB1T0IAdE9GAHZTRgCYdGwAmnRnAI9nWQD+/v0A+fn2AO/r6ADQwr4ASSEUAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADoinZ0iOgAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAKZyaPT2ampo9PbkpAAAAAAAAAAAAAAAAAAAAAAAA9EqHsblLr6+vr68frE+MywAA - AAAAAAAAAAAAAAAAUV1JQExN+VOqS0ufuQJpwbeEyu8AAAAAAAAAAAAAANMMN/N7QExNzQKsrAKFu8Fw - Bth1p9IAAAAAAAAAAACIVr/X8th7QEzBTU1NTcJMtwb1fxW/b4gAAAAAAAAAADHwLta/pvM8BkBwuLhw - t7Z72H8V1y7UdwAAAAAAAAAzA97fi27yFb/YPHsGBntZ4eDgFdfW34u+iQAAAAAA6Irs7u7ZE48jFqbg - O/PhgkMYPG7W1i5uch3SAAAAAADpVEfs7ASgDs4emN8VaoJzDs41aG5ui3IdpIGiAAAAACTno0fqBKD9 - WmUtFS7eV6D9Wg6NKuxy7KSjC6IAAADcPqF+o+e0EI0eZY/Xbr7ZNfzOZU66C+ykowvmYJEAABnlxaF+ - o//uYp5i0ddybh1SW7zPZiD/R6N+ocW9kAAAbOPEMG3mC6ML3S4EWNTW125uf24a2wuko35txOLiAAAs - gAUwfqRyLtZq2NB04H9/f+CmbgcavtYui+yjbV8AAI69o3Ju1tYVphV00HTg4eHh4X+zBxpu19Yuboty - 5wAAor6Lbi7W16ampjwjPOE7Ozs7O2qWtdSm19Yubm7nAADdd24u1hWm8uDg97L3O/Pz8/Pzv0JFs/Km - 19Yu1OYAAHg3FfJ/O/PY2NjMcXvhyclZWVnAkweu2PM7f/KuKwAAACF09Tx7Bga2trh9/mPIB6h8UK2G - k4MGBns89ZcAAAAAy3BAt3BwTExMTf0BAQEBAfugjft6QExwcHBMggAAAAA0h01NTU27aWmFCKCgwwEB - AQEBARf6abu7Tc3tAAAAAAAPuQKsU1NTU1OfMkQvxzglSEFBm6xTU1MfqwAAAAAAAFWpr6+vrw0NDa9L - S0uqqqqqqqqvDQ0NDdoAAAAAAAAAAPYSGxsbGxuZmZmZmZmZmZmZmZmZGxsSFAAAAAAAAAAAAHbVlJSU - lJSUlJRra2tra2uUlJRr1bAAAAAAAAAAAAAAABwo6woKCgoKCgoKCgoKCgoKKMZeAAAAAAAAAAAAAAAA - ACY/eRFnZ2dnZ2dnZ2dnEXmVAAAAAAAAAAAAAAAAAAAAAAB2pWQJkuQnJ+SSCWQ5HAAAAAAAAAAAAAAA - AAAAAAAAAAAAAPhhXDY2XPFGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAD///////gf///AA///AAD//AAAP/gAAB/wAAAP8AAAD+AAAAfAAAAHwAAAA8AAAAOAAAABgAAAAYAA - AAGAAAABgAAAAYAAAAGAAAABgAAAAcAAAAPAAAADwAAAA+AAAAfgAAAP8AAAD/gAAB/8AAA//gAA//+A - Af//8A///////ygAAAAwAAAAYAAAAAEACAAAAAAAgAoAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////AKZ1 - YgBhMyAA37irAKyZkgB7VUgAOhECAOLc2ABFIR8A9M/AAMCyqwCGamAAsoh5AHhDLQDTxsIAyaCSAPHw - 7ABkRkAAmYJ5AJdjTwBPHwkAVzgzALuUhgDSq54Ayry3AKSOhQCVdWoAtqafAD8cDgBUKxcAhV9RAIdS - PABmPzIA5sS1AHNLPQCmf3EA2dDMAOzl4wCUa1oASisnAPn59wDBqJ4ASyIUAGw6JgBXMSQA1banAF8o - EQBuSywASRYAAIBKNACwj4QAXzgqAHtZUwB9YloAPxoYALuNfACgeWsAjHBlALyglwDBmo0AybWuAHJR - RABsRjkAtZiMAJ6IgACWcGMAg1dHAItlWADvyLoAlXtyAN7X0wBqNR8AfV5MADQOBwBGHQ0AXT4wAHRI - NQCpkooAqoR3AEIXBwDNwbsA4r6wAHtQPgBNJxoAZS8ZAF0uHADm4t0AQRMAAFMsHgC5qqMAsaCZALGD - cwDZy8UAp3tqAJJmVABYOCYA7ernAFkkDwDctqYAczwlADkTBgBHJxkAZjsrAPb18gCfgngAdk9CANex - pADHsakAyqSXAPv7+gBHJyQAbEExALWLfQB/X1QAg2NbAJx1aADf0s4AThkCAE8hEABwPioAgFlMAOa/ - sQDDta8AVicTAKJ8bwCPb2EAXzUmAGhCNQC7mYkAZjUiAHtGMQCxlIcARR8SAM69uABZKRQAYj0wAHtJ - NgCIbmMAPhoTAFAmFgBcNikAZDgmAHZAKQByQS4AeFdMALyupwCym5MAZkk+AG9JPACIYlUAOA8HAD0T - BABfMRsAb05DAKuHfACmeGYAmXtxAIJcTwCPaFsA1MvFAGs+KwCtj4EAlmtXAFgvIABaMyYAsYt+AIVV - QQDg2dYA29TQAOzFuAA9FwoA0MS/AMe5swDQqp0Aw52QAHRSQQB4UkUAln50AJlyZQBAGQwAQhwPAFAp - GwBwRzcAtI6BAKKLggCriHgAlG1gADUQAwBZLhkAXzsuALebkQCvhngA78u8AFAfDADdt6oAuJSFAGtJ - OwCPZlcAkWteAPPx7wDl39sA5NvXANfPygA1EQkA1cW/AEgcCgBKJBcAVSwcAHNNQACnj4YAglVDAKmC - dQB7XVMAlmdVAGhFOAB/UDwA8OzpAOrj3wDn390AQhUDAEUZBgBAHBgAy7+5AFUvIQBbMB4Atot6AHVP - PgCAV0kApYBzAEQcCwBPHAUATSUXAFsrGQBpPi0AakQ2ALyPfgBmREAArJGEAKR6aQCUeW8AkmhYAPf2 - 9ADLurQARyEUAMW3sQDBtK0At6ihAMmilQBhOi0AZT0uAHBNLgB2RTIAsox/AH5YSwDnwbQAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwSX4kwA1xcQ3AJH5J - +wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAsLtcODjiDQ3AwA0N4jjsDUKwAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAMXWApzvJE9PT09PT09PT0/UJF6cJ8UAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAABg0xRf8buzOSRPT09PT09PT9R9dELH8dZDYAAAAAAAAAAAAAAAAAAAAAAAAAAAADQgp+Selp+7 - dDkk1NRPT0/U5X05QsdEH3lDp74AAAAAAAAAAAAAAAAAAAAAAAAA6jJNI2r+npafu7M5OX0kJCR9OXRC - u0SWeQbRI4n6AAAAAAAAAAAAAAAAAAAAAAChg3AhP9Gx/h+Wn7tCs3R0dHR0QrvHRJaeBmqVgCH8+gAA - AAAAAAAAAAAAAAAAAI4O6oghgD/Rsf6elkSfx7u7u7u7x59EH54GapXrIYiIkDQAAAAAAAAAAAAAAAAA - pI9n+YiIIYA/0bEGnh+WRERERERElh+eeQZq0T8hIYi+NHjgAAAAAAAAAAAAAADPZI6Njb6IiCGAP9Fq - Bv55nh8fHx+ennkGsdGV6yEhiIg0jX8sZgAAAAAAAAAAAABIgqWljTS+NH+NNCGV0WqxBgYG/gYGBrHR - 0T+AISGIiL6NjaV/AwAAAAAAAAAAALZIpOAtpY2k14pGOj40gJXR0dFqamoj6yH6iCEhiIiINDSNpS3g - A1QAAAAAAAAAS1VWWVktLVmKRxHIEckFgIiAPz8/PyGV8BpBc/k0iIg0jY2lLeBZ0Fa1AAAAAAAAK1W2 - VFngWddXyGFhYdnyC4iIISEh+XLLyMjI2d+RpTSNjaUt4Fm2VOn0AAAAAAAAh4foVLZZ6NXIYWFhYWFh - yAyliIiIiKzyYWFhYWgImi2lLS3gWbZUVIyMAAAAAAC0LyvP6FS2VIjJyGFhYWFhaLItiIg01wgRYWFh - YWEpBbYtLeBZtlRUz/R8tAAAAABLYoX0z+hUtisMYSnIERFo8kakNDQ0pXspYWFhYWHyHFTg4Fm2VFTP - 9IV3HQAAAAAVwrWF9M/PVFQrmlqpyUeSybJZjY2NpcWgbmjIyPJuW+hZWbZU6M/0hbVL5gAAAAAVzrS1 - hfTPz1RUKystiI1ZJRO2paWljeC+QVEIR/clHCtZtlToz/SFtR20zgAAAADnUKu0tYWF9M/oVFRUtrYt - qRNZjY00NL6NpKWAiCv2ks9ZVFTP9IW1tKur3QAAAJd2mGWrq7S1hfRUWS2lNPkhR7k0gIDr6+vr64Ah - ITQZC6W+jaXgtuiFtatl3JcAAJcxB7xlq4VU4KU0iCEhISGAR7n56+s/Pz8/6+uAgPkZ9o2IiL40NI2l - WVSFzkoAAEpYB7VU4KWNNL6IiCEhISHrqBr5Pz8/Pz8/Pz/rgPnfezQhiIi+NI2NpS0t4cwAAEp8WS2l - pY00NIiIISGAgIA/qBqIPz8/Pz8/Pz8/P4jfezQhIYiIvjSNjS0t4UoAAACZpS2ljY00iIiIIYCAgIA/ - CBohlZWVlZWVlT8/P/pRe/mAISGIiL40jaWlpAAAAAC9f6WNjTSIiCEhgICAP+s/CNIhlZWVlZWVlZWV - PyFR9fmAgIAhiIi+NI2N0AAAAAAeZ42+iIghgIDrPz8/lZXRyU6A0dHR0dHR0dHR0eusrSE/Pz+AgCEh - iIj6tgAAAADoTSGA6z8/lZXR0dHRamqx205wI9FqamqxsbGxsSMPGZXR0dHRlZU/P4C3ZgAAAACL2CPR - 0dFqsbGxBgYG/v55CMqT0mmdG35Elh95BiMPUWoGBgaxsWpq0dFTiwAAAAAAU+QGBgb+/nmenp4fHx+W - CAEBAW4p8sjZJsmoJazIhuQfnp6eef7+/nnjAAAAAAAAiF8fHx8fH5aWlkRERETH2m4pKSkpbm5ubm4B - AQEB8x9ERJaWlpYfH8ZMAAAAAAAA3qOfn5+fn8fHx8e7u7tC2gEBAQEBAW5ubm5ubm4BhkS7u8fHx8fH - xyc3AAAAAAAAALDvQrOzs7Ozs7N0dHSzv81ddcrbJtnIKW4BAQEBPbt0dHR0s7OzOT4AAAAAAAAAAN7v - fTk5fX19fX19fX19OXQ5OTl95U+bM0A7Kmwq5X19fX19fX19Od4AAAAAAAAAAACU4tTU1NRPT09PT09P - urq6urpPT09P1NQkJCQkT7pPT09PT09xlAAAAAAAAAAAAAAAfhempqb9/f39uLi4uLi4uLi4uLi4uLi4 - uLi4uLi4uP39/Rd+AAAAAAAAAAAAAAAAN7o8xBcXFxcXFxcXFxcXFxcXFxcXFxcXFxcXFxcXFxcXPLo3 - AAAAAAAAAAAAAAAAAG/EEDw8PDyvr6+vr6+vr6+vr6+vr6+vr6+vr6+vrzz4xG8AAAAAAAAAAAAAAAAA - AAAogRj4+PhtbW1tbW1tbW1tbW1tbW1tbW1tbW1tbRiBKAAAAAAAAAAAAAAAAAAAAAAACaJjGK6urq6u - rq6urq6urq6urq6urq6urq4YY6IJAAAAAAAAAAAAAAAAAAAAAAAAAACKYwRra2tra2tra2tra2tra2tr - a2trawRjigAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFoR6egTDw8PDw8PDw8PDw8PDwwR6eoQWAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAS7lJFqv96UlJSUlJSev+qRVLuEgAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAA2QC4iwQoKCgrBIi5ANgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAA7TVzczXtAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAA////////AAD///////8AAP//gAH//wAA//4AAH//AAD/+AAAH/8AAP/g - AAAH/wAA/8AAAAP/AAD/gAAAAf8AAP8AAAAA/wAA/gAAAAB/AAD8AAAAAD8AAPgAAAAAHwAA+AAAAAAf - AADwAAAAAA8AAOAAAAAABwAA4AAAAAAHAADgAAAAAAcAAMAAAAAAAwAAwAAAAAADAADAAAAAAAMAAMAA - AAAAAwAAwAAAAAADAACAAAAAAAEAAIAAAAAAAQAAgAAAAAABAACAAAAAAAEAAMAAAAAAAwAAwAAAAAAD - AADAAAAAAAMAAMAAAAAAAwAAwAAAAAADAADgAAAAAAcAAOAAAAAABwAA4AAAAAAHAADwAAAAAA8AAPAA - AAAADwAA+AAAAAAfAAD8AAAAAD8AAPwAAAAAPwAA/gAAAAB/AAD/AAAAAP8AAP+AAAAB/wAA/+AAAAf/ - AAD/8AAAD/8AAP/8AAA//wAA//+AAf//AAD///gf//8AAP///////wAAKAAAAEAAAACAAAAAAQAIAAAA - AAAAEgAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8Ap3dkAGswFwDfuasAa1VKADkRAwCxmZEA493ZAEEt - JwCSXEYAfkUsAPTNvwC+r6gAW0AyAIVvZQDUy8YAuYl2AJyFfABWHQUAz6SUAPDu6wA1HRoAVzoeAH1f - UwB8UD4ASyQWAMKWhADKvrgAKAwGAJF5cACebFcAbUc6AG48JwDqxLUAtaWdANOwoQCogXQAlW9iAFsr - GAClkYkAkGRUAGFLQwDb084AMBIQAEEbDQBQOjEAShYAAPj39QCvin0AYTYlAOvl4gBOLyIAxKiaAMGb - jgBAJBgAX0IjAIVnWwBkSzMAt5CDAKB6bQBxQzAAfFZJAIBMNQBOHwwAZ0AyAI1WPgB2YVYANxcKAFtE - PwDDt7AAbFJBAGk2IACvf2sAz8O+AEUrHwBYMSMAWCQMAHY7IwBjKxIAv5B9ALmdkwCWfnUAeUk3ALmZ - iQCuhngA2rOlAHRNQACbdWcAjXRqAC4SCADUqpoAkWtaAOa/sQBBFgQATykcALCgmACcb1wAPyUjAKON - hAB1WUwAyqydADseEQCEV0YA8Mi6AEosKgDJno0AYjstAGZMPQCHYFIAiW1dAOHZ1QDHoZQAu6ujAMav - pwBjLxgASTUuALCQhAC0jYAAy7ewACwMDABGIBMARyoUANfOygCEUz8Ag1tMAJhnVABSJRQA7uvnAL+k - lgB5UkQAj3BjAHA1HAClemsAlGNPAPv7+gD08/AAZEMzAHlBKQDNp5kAsoRxAGAyIQBcNSgAaFBKAKCI - fACVdmoAVy0dAFY9LwCMZlkA5+HeAEgbCQCsk4oAgGhcACsHBgBuRTUANBQGANiungCqhHcAmX5yAGg6 - KACbg3gAPRcKALOXiwByPikAqI2DAHpHMgBcRDkAe2JWANC/uADApp4AQhIAAEshEgBZJxIAVC0gAEw0 - JQDku6sAPCQgAF4vHABlMx4AaUM2AKN9cACBY1cA0qudAFMpGQDYyMMAy8G7AKt/bgCPYU4AMhUOAFsh - CABBKRwAtIl4AKyDcwCgg3kArHxpAIVqXgDQxsEAx7m0ADwiFgDAs6wAw6ykAEguIgC7lYgAgkkwAKyI - fABlTUcAcEs+AJxxYADe1tIALRAOADcTCwBEGAgAPRsLANu2qABSGgQAVCIPAEcmFwBfOCsAZD4wALuN - ewBsQC8AoHhqAI9dSgCSbF4AiG5jAI9nWgBIGAUAuqSdAHlOPgCUYEsAThgCALSimgDd0cwA8su9ADkT - BgA3GQ4Af1lMAHhdTwCYcmUAiGJVANexowBMGgcARR0PAFEzJABcMh4AWTIlAL2XigC+lIMAdkMuAHVJ - NgB+VUYAjFhCAI94bACDXVAAQCETAEMqJgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - ODpHZBi1tRhkRzo4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - F2w5PL/bUFBQUFBQUFDbVTy1bBcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAOGIURUNu/v7+/VVVVVb+/v7/bUNuFGJMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAA5tAsLCusBVVVVVVVVVVVVVVVVVVVXAukkCbZMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAArvofH2HPWN20JZ2dnZ2dnZ2dnZ2dnZ0ltN1Yz2Efgq4AAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAB6iQrluynh3yZYPLQlnZ2dnZ2dnZ2dnZ0lPN3uJlzhKYbeDnoAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAABL+UJ8Z33975TfJlg8tCUlnZ2dnZ2dnSW0PN3uJt+Ubf19Z/sgvgAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAADJPz9T5II+7G3v4d8mWN08tLQlJSUlJbS0PFjuJt+U7/3sgoLkP1NLAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAA0y6U9miBXgj59be/h3ybuWN08PDy0PDw83VjuJt+U7/3sPoLOIJqlpckA - AAAAAAAAAAAAAAAAAAAAAAAAAAA0y/g9QUGzzleCPv1t75Tf3ybuWFhYWFhY7u4m3+GU7/3sPoJXILNB - QT2lSwAAAAAAAAAAAAAAAAAAAAAAAABLC/jc2traQSDOV4I+fW3vlOHf3yYmJiYmJibf35Tvbf3sPoJX - zrNB2tpBPfi+AAAAAAAAAAAAAAAAAAAAAAA3iqOfa2va2tqzIM5Xgj7s/W3vlJTh4d/f3+HhlO/vbf3s - PoJXzrNB2tpra2sho8YAAAAAAAAAAAAAAAAAAABmIaOf2dlra9ra2rMgzleCPux9/W1t7+/v7+/v7239 - /ew+PoJXzrNB2traa2vZMiEyZgAAAAAAAAAAAAAAAAAATE6fMo7Z2Wtr2trasyDOV4KCPuzsff39/f39 - /f3s7D4+gldXILNB2traa2vZ2Y4yITQAAAAAAAAAAAAAAAAAN05IjfWOjtnZa2va2tpBsyDOV4KCPj4+ - Puzs7D4+PoKCV1fOILNB2traa2vZ2Y6O9TJIxgAAAAAAAAAAAAAAZrJIjUxM9Y6O2dn1jtpBa45rsyDO - V1eCgoKCgoKCgldXV84gs0Ha2traa2vZ2Y6O9UxMspIAAAAAAAAAAAAAANiEsa2tTPX1jo714HEQe0rn - OWvasyDOzs5XV1dXVyBBQdpr2Wva2tpra2vZ2Y6O9UytrZKyxgAAAAAAAAAAAOtzc5Jfra1M9fWOI4iI - FRUViBUNIGtBs7OzICAgs9o+Y3EN51LOjmtra2vZ2Y6O9Uytra1fsZIAAAAAAAAAAAD+AydfX1+trUxf - UjCAgICAgICAMEqza9ra2kFBQWsSlYiIiIiICGPZ2dnZ2Y6O9UxMra1fX7dzZgAAAAAAAAAArHO3Gl9f - X62tX8eIgICAgICAgIAwY/Xa2tra2tnDFRWAgICAgBUwI/XZjo6O9Uytra1fX18aJxoAAAAAAAAA60+s - GhoaX19frRoNiICAgICAgICAiByOa2va2tqOcTCAgICAgICAgIhZrY6O9Uytra1fX18aGn+sRAAAAAAA - AC1PfxoaGhpfX18a4DCAgICAgICAgIjE2dlra2tr9ceIgICAgICAgICIxa319Uytra1fX18aGhoarOsA - AAAAAABArKt5eRoaGl9fX19ghxWAgICAgBWIxI7Z2dnZ2UygMICAgICAgICAiEpMTEytra1fX18aGhp5 - edctAAAAAADSTdfyeXkaGhoaX19fXxKVMDCIMDCAFcSOjtnZ2dmO2RyHFYCAgICAFYi5ra2trV9fX18a - Ghp5efJAQAAAAAAAvL1ALS3yeXkaGhpfX1952h4jRscoZHt79Y6Ojo6O2UzaDYgwiIiIMDAwuV+trV9f - X18aGhp5efIt8kC8AAAAAES9li0tLfJ5eRoaGl9fXxqrGl9fGq0re0z1jo6Ojo6OTK21IxDQ0MVSCMRf - X61fX18aGhp5efItLS1AWgAAAAChE9OhoS0t8nl5GhoaX19fX19fra2tK3tM9Y6Ojo7Z2dmOrZKO2tlf - rQjEX19fX18aGhp5efItLaGh8ZsAAAAAXtZe6qGhLS3yeXkaGhoaX1+tTI6Oayt72tpBs7Ozs7Ozs7Oz - Qdra2rMIEI6OjkytXxoaefItLaGh6uKbAAAAAF7mBurqoaEtLfJ5Gl+tjtlr2tpBQbPQK0Gzs7Ozs7Oz - s7Ozs7Ozs9ogCBBr2tpra9nZjkytGnktoepemwAAAABeLwYGBuqheRqt9dnZa2va2traQUGz0Cuzs7Oz - s7Ozs7Ozs7Ozs7NBIAgQa9raa2vZ2dmOjo71rV8aQOoAAAAABqoG6vIarfWO2dnZa2tr2traQUFBs9Ar - s7Ozs7OzILOzs7Ozs7OzQSCVe2va2tpra9nZ2Y6O9fVMrY3UAAAAAJtAGl9M9fWOjtnZa2tr2tpBQUGz - QbPQK7OzICAgICAgICAgICCzs0EglXvaQUHa2mtra9nZjo71TK2N1AAAAADUSEytTPWOjtnZa2tr2tpB - QUGzs7MgbysgICAgICAgICAgICAgICCzzpV7QUFBQdraa2tr2dmOjvX1MkQAAAAAREhM9fWOjtnZa2va - 2tpBQUGzs7OzIG/QICAgICAgICAgICAgICAgs86Ve0Gzs0Ha2tpra2vZ2Y6O9TKbAAAAAFpIMvWOjtnZ - a2tr2tpBQbOzs7OzsyAI0CAgzs7Ozs7Ozs7Ozs4gILPOM3tBs7OzQUHa2mtra9nZjo6NWgAAAAAdSDKO - jtlra2va2kFBs7Ozs7MgICDOCNAgzs7Ozs7Ozs7Ozs7Ozs4gVzMrs7Ozs7OzQUHa2mtra9nZjR0AAAAA - mUjca9ra2kGzs7OzICAgzs7OV1dXVwhvV1dXgoKCgoKCgoKCV1dXV4IzKyDOzs7OICAgs7OzQdraQfSZ - AAAAAAD0U7Ozs7MgIM7OzldXV1eCgoKCgj4Ib1dXV4KCgj4+Pj4+Pj4+PoLsM9BXgoJXV1dXV87OICAg - s/lfAAAAAAAA2HxXzs5XV1dXgoKCgj4+Pj4+7D7sCDDjwZ6Rg5Tv/ew++oKCgoKCPjPQgj4+Pj4+goKC - gldXV1cZxgAAAAAAALx8+oKCgoI+Pj4+7Ozsff39/f39bQgBAQGHMIgVMwjQe0rFDeMHpJeI0Oz9/X3s - 7OzsPj4+Pj4+GdEAAAAAAAAA+bvs7Ozs7Oz9/f1tbW1tbe/v75SVhzAwMIeHh4eHAQEBAQEBAQEBAdBt - bW1tbW39/f19fX3sbYkAAAAAAAAAAPN+bW1tbW1tbe/v7++UlJSUlJTflYcwMDAwMDAwMDAwMDAwMDAw - MAHo75SUlO/v7+/v7+/v7ylLAAAAAAAAAAAsu9+UlJSU4eHh4eHf39/f39/fJjMBh4eHh4eHh4eHh4eH - h4eHh4cB6OHf39/f39/f3+Hh4d99eAAAAAAAAAAAAIkCJiYmJiYmJiYmJu7u7u7u7iaoMIeHAQEBAQEB - AQEBAYeHh4eHAW/f7u7u7u4mJiYmJibdkwAAAAAAAAAAAAC8YYVYWFhYWFhY3d3d3d3d3d3d3cx1olGp - cneouOhvlTMViDCHATDIWN3d3d3d3d3d3Vg8XNEAAAAAAAAAAAAAAA6MtDw8tLS0tLS0tLS0tLS0tLS0 - PDzd3d3d3d3dPLQlncx1olExPLS0tLS0tLS0tLS0wC4AAAAAAAAAAAAAAAB4XL8lJSWdnZ2dnZ2dnZ2d - nZ2dnZ1VVVVVVVVVVZ2dnZ2dJSUlwJ2dnZ2dnZ2dnZ2dv7UAAAAAAAAAAAAAAAAAALC/dszMMTExMTEx - MTExMTExMTExdnZ2dnZ2dnZ2dnZ2dnZ2djExMTExMTExMTExdsAWAAAAAAAAAAAAAAAAAAAAphs7dnZ2 - djs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O/cuAAAAAAAAAAAAAAAAAAAAAADt - asrKysrKysrKysr29vb29vb29vb29vb29vb29vb29vb29vb29vb2ysrK9moFAAAAAAAAAAAAAAAAAAAA - AAAAAG4UNjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NhSnAAAAAAAAAAAAAAAA - AAAAAAAAAAAAg1twcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcFuYAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAADDnIuLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLtpxDAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAW2Vra2tra2tra2tra2tra2tra2tra2tra2tra2tra2tra2VosqAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdFSvViTw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PBWr3UJ - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAsmPBd1VbV1dXV1dXV1dXV1dXV1dXV1dXV1dXV1QRd - JEMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/ngQiXQQEBAQEBAQEBAQEBAQEBAQEBAQE - XSLV/LAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/WSRoaCJdXV1dXV1dXV1dXV1d - XSJoaGUPYgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKqBlIgwMDOloaGjp - 6QwM6SJlUkUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGmPD5Ci - gTU1gaKQD81pAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////////////////// - /8AD///////8AAA///////AAAA//////wAAAA/////8AAAAA/////AAAAAA////4AAAAAB////AAAAAA - D///4AAAAAAH///AAAAAAAP//4AAAAAAAf//AAAAAAAA//4AAAAAAAB//gAAAAAAAH/8AAAAAAAAP/gA - AAAAAAA/+AAAAAAAAB/wAAAAAAAAH/AAAAAAAAAP8AAAAAAAAA/gAAAAAAAAB+AAAAAAAAAH4AAAAAAA - AAfAAAAAAAAAB8AAAAAAAAADwAAAAAAAAAPAAAAAAAAAA8AAAAAAAAADwAAAAAAAAAPAAAAAAAAAA8AA - AAAAAAADwAAAAAAAAAPAAAAAAAAAA8AAAAAAAAADwAAAAAAAAAPAAAAAAAAAA8AAAAAAAAAD4AAAAAAA - AAfgAAAAAAAAB+AAAAAAAAAH8AAAAAAAAA/wAAAAAAAAD/AAAAAAAAAP+AAAAAAAAB/4AAAAAAAAH/wA - AAAAAAA//AAAAAAAAH/+AAAAAAAAf/8AAAAAAAD//4AAAAAAAf//wAAAAAAD///gAAAAAAf///AAAAAA - D///+AAAAAAf///8AAAAAD////4AAAAA/////4AAAAH/////4AAAB//////8AAA///////+AAf////// - //////////////////8= - + + + ..\Common\app.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/BAPSPresenter/LocalConfigDialog.h b/BAPSPresenter/LocalConfigDialog.h index 0b16165e..4ba7dac5 100644 --- a/BAPSPresenter/LocalConfigDialog.h +++ b/BAPSPresenter/LocalConfigDialog.h @@ -267,6 +267,7 @@ namespace BAPSPresenter { this->CancelButton = this->cancelButton; this->ClientSize = System::Drawing::Size(246, 218); this->ControlBox = false; + this->StartPosition = System::Windows::Forms::FormStartPosition::CenterParent; this->Controls->Add(this->serverText); this->Controls->Add(this->cancelButton); this->Controls->Add(this->saveButton); diff --git a/BAPSPresenter/LocalConfigDialog.resx b/BAPSPresenter/LocalConfigDialog.resx index b3c7ba64..ddda989a 100644 --- a/BAPSPresenter/LocalConfigDialog.resx +++ b/BAPSPresenter/LocalConfigDialog.resx @@ -112,32 +112,13 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - AAABAAIAEBAQAAAABAAoAQAAJgAAACAgEAAAAAQA6AIAAE4BAAAoAAAAEAAAACAAAAABAAQAAAAAAIAA - AAAAAAAAAAAAABAAAAAQAAAAAAAAAAAAgAAAgAAAAICAAIAAAACAAIAAgIAAAICAgADAwMAAAAD/AAD/ - AAAA//8A/wAAADC7zwDu9f8A////AAAN3d3d3dAADd3u7u7u3dAN7t3u7t3u0N3u7d7u3e7d3u7t7t7t - 3u3e7u7t3e3u7d7u7d3d7u7t3u3d7t3u7u3e7d3u3e7u7d7u7d3d7d7t3u7u7d3t3u3e7d7u3u7d7d3u - 3e7u7t7dDe7e7u7u7tAN3e7u7u7d0AAN3d3d3dAA4AcAAIABAACAAQAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAIABAACAAQAA4AcAACgAAAAgAAAAQAAAAAEABAAAAAAAgAIAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAgICAAMDAwAAAAP8AAP8AAAD/ - /wD/AAAA/wD/AP//AAD///8AAAAAAAAAAAAAAAAAAAAAAAAHiIiIiIiIiIiIiIiIAAAAB/////j///j/ - //j/+AAAAAf////4///4///4//gAAAAH////+P//+P//+P/4AAAAB/////j///j///j/+AAAAAf////4 - ///4///4//gAAAAHiIiIiIiIiIiIiIiIAAAAB/94eHh4eHh4eHj/+AAAAAf/h4eIh4eIh4eI//gAAAAH - /3h4eHh4eHh4eP/4AAAAB/+Hh4iHh4iHh4j/+AAAAAf/eHh4eHh4eHh4//gAAAAHiIiIiIiIiIiIiIiI - AAAAB/94eHh4eHh4eHj/+AAAAAf/h4eIh4eIh4eI//gAAAAH/3h4eHh4eHh4eP/4AAAAB/+Hh4iHh4iH - h4j/+AAAAAf/eHh4eHh4eHh4//gAAAAHiIiIiIiIiIiIiIiIAAAAB/94eHh4eHh4eHj/+AAAAAf/h4eI - h4eIh4eI//gAAAAH/3h4eHh4eHh4eP/4AAAAB/+Hh4iHh4iHh4j/+AAAAAf/eHh4eHh4eHh4//gAAAAH - iIiIiIiIiIiIcAAAAAAAB/////j///j//3/4cAAAAAf////4///4//9/hwAAAAAH////+P//+P//eHAA - AAAAB/////j///j//3cAAAAAAAf////4///4//9wAAAAAAAHd3d3d3d3d3d3cAAAAADgAAAH4AAAB+AA - AAfgAAAH4AAAB+AAAAfgAAAH4AAAB+AAAAfgAAAH4AAAB+AAAAfgAAAH4AAAB+AAAAfgAAAH4AAAB+AA - AAfgAAAH4AAAB+AAAAfgAAAH4AAAB+AAAAfgAAAH4AAAB+AAAA/gAAAf4AAAP+AAAH/gAAD/4AAB/w== - + + + ..\Common\app.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/BAPSPresenter/LoginDialog.h b/BAPSPresenter/LoginDialog.h index 3b6e623a..5a4f1f3b 100644 --- a/BAPSPresenter/LoginDialog.h +++ b/BAPSPresenter/LoginDialog.h @@ -264,6 +264,7 @@ namespace BAPSPresenter { this->CancelButton = this->cancelButton; this->ClientSize = System::Drawing::Size(219, 152); this->ControlBox = false; + this->StartPosition = System::Windows::Forms::FormStartPosition::CenterScreen; this->Controls->Add(this->serverText); this->Controls->Add(this->cancelButton); this->Controls->Add(this->loginButton); @@ -279,7 +280,6 @@ namespace BAPSPresenter { this->FormBorderStyle = System::Windows::Forms::FormBorderStyle::FixedDialog; this->Icon = (cli::safe_cast(resources->GetObject(L"$this.Icon"))); this->Name = L"LoginDialog"; - this->StartPosition = System::Windows::Forms::FormStartPosition::CenterScreen; this->Text = L"BAPS Presenter: Please Login"; this->Load += gcnew System::EventHandler(this, &LoginDialog::LoginDialog_Load); this->ResumeLayout(false); diff --git a/BAPSPresenter/LoginDialog.resx b/BAPSPresenter/LoginDialog.resx index eff63607..3c23a229 100644 --- a/BAPSPresenter/LoginDialog.resx +++ b/BAPSPresenter/LoginDialog.resx @@ -112,236 +112,17 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + 17, 17 - - - - - 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 - djs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O/cuAAAAAAAAAAAAAAAAAAAAAADt - asrKysrKysrKysr29vb29vb29vb29vb29vb29vb29vb29vb29vb2ysrK9moFAAAAAAAAAAAAAAAAAAAA - AAAAAG4UNjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NhSnAAAAAAAAAAAAAAAA - AAAAAAAAAAAAg1twcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcFuYAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAADDnIuLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLtpxDAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAW2Vra2tra2tra2tra2tra2tra2tra2tra2tra2tra2tra2VosqAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdFSvViTw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PBWr3UJ - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAsmPBd1VbV1dXV1dXV1dXV1dXV1dXV1dXV1dXV1QRd - JEMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/ngQiXQQEBAQEBAQEBAQEBAQEBAQEBAQE - XSLV/LAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/WSRoaCJdXV1dXV1dXV1dXV1d - XSJoaGUPYgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKqBlIgwMDOloaGjp - 6QwM6SJlUkUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGmPD5Ci - gTU1gaKQD81pAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////////////////// - /8AD///////8AAA///////AAAA//////wAAAA/////8AAAAA/////AAAAAA////4AAAAAB////AAAAAA - D///4AAAAAAH///AAAAAAAP//4AAAAAAAf//AAAAAAAA//4AAAAAAAB//gAAAAAAAH/8AAAAAAAAP/gA - AAAAAAA/+AAAAAAAAB/wAAAAAAAAH/AAAAAAAAAP8AAAAAAAAA/gAAAAAAAAB+AAAAAAAAAH4AAAAAAA - AAfAAAAAAAAAB8AAAAAAAAADwAAAAAAAAAPAAAAAAAAAA8AAAAAAAAADwAAAAAAAAAPAAAAAAAAAA8AA - AAAAAAADwAAAAAAAAAPAAAAAAAAAA8AAAAAAAAADwAAAAAAAAAPAAAAAAAAAA8AAAAAAAAAD4AAAAAAA - AAfgAAAAAAAAB+AAAAAAAAAH8AAAAAAAAA/wAAAAAAAAD/AAAAAAAAAP+AAAAAAAAB/4AAAAAAAAH/wA - AAAAAAA//AAAAAAAAH/+AAAAAAAAf/8AAAAAAAD//4AAAAAAAf//wAAAAAAD///gAAAAAAf///AAAAAA - D///+AAAAAAf///8AAAAAD////4AAAAA/////4AAAAH/////4AAAB//////8AAA///////+AAf////// - //////////////////8= - + + + + ..\Common\app.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/BAPSPresenter/RecordLibrarySearch.h b/BAPSPresenter/RecordLibrarySearch.h index 07366caf..9f5a8937 100644 --- a/BAPSPresenter/RecordLibrarySearch.h +++ b/BAPSPresenter/RecordLibrarySearch.h @@ -419,6 +419,7 @@ namespace BAPSPresenter { this->CancelButton = this->closeButton; this->ClientSize = System::Drawing::Size(508, 514); this->ControlBox = false; + this->StartPosition = System::Windows::Forms::FormStartPosition::CenterParent; this->Controls->Add(this->ResultsBox); this->Controls->Add(this->SearchButton); this->Controls->Add(this->closeButton); diff --git a/BAPSPresenter/RecordLibrarySearch.resx b/BAPSPresenter/RecordLibrarySearch.resx index bb9760e8..d7ea3b32 100644 --- a/BAPSPresenter/RecordLibrarySearch.resx +++ b/BAPSPresenter/RecordLibrarySearch.resx @@ -112,239 +112,21 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + 17, 17 - - + + + 81 - - - - - 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 - djs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O/cuAAAAAAAAAAAAAAAAAAAAAADt - asrKysrKysrKysr29vb29vb29vb29vb29vb29vb29vb29vb29vb2ysrK9moFAAAAAAAAAAAAAAAAAAAA - AAAAAG4UNjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NhSnAAAAAAAAAAAAAAAA - AAAAAAAAAAAAg1twcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcFuYAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAADDnIuLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLtpxDAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAW2Vra2tra2tra2tra2tra2tra2tra2tra2tra2tra2tra2VosqAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdFSvViTw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PBWr3UJ - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAsmPBd1VbV1dXV1dXV1dXV1dXV1dXV1dXV1dXV1QRd - JEMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/ngQiXQQEBAQEBAQEBAQEBAQEBAQEBAQE - XSLV/LAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/WSRoaCJdXV1dXV1dXV1dXV1d - XSJoaGUPYgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKqBlIgwMDOloaGjp - 6QwM6SJlUkUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGmPD5Ci - gTU1gaKQD81pAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////////////////// - /8AD///////8AAA///////AAAA//////wAAAA/////8AAAAA/////AAAAAA////4AAAAAB////AAAAAA - D///4AAAAAAH///AAAAAAAP//4AAAAAAAf//AAAAAAAA//4AAAAAAAB//gAAAAAAAH/8AAAAAAAAP/gA - AAAAAAA/+AAAAAAAAB/wAAAAAAAAH/AAAAAAAAAP8AAAAAAAAA/gAAAAAAAAB+AAAAAAAAAH4AAAAAAA - AAfAAAAAAAAAB8AAAAAAAAADwAAAAAAAAAPAAAAAAAAAA8AAAAAAAAADwAAAAAAAAAPAAAAAAAAAA8AA - AAAAAAADwAAAAAAAAAPAAAAAAAAAA8AAAAAAAAADwAAAAAAAAAPAAAAAAAAAA8AAAAAAAAAD4AAAAAAA - AAfgAAAAAAAAB+AAAAAAAAAH8AAAAAAAAA/wAAAAAAAAD/AAAAAAAAAP+AAAAAAAAB/4AAAAAAAAH/wA - AAAAAAA//AAAAAAAAH/+AAAAAAAAf/8AAAAAAAD//4AAAAAAAf//wAAAAAAD///gAAAAAAf///AAAAAA - D///+AAAAAAf///8AAAAAD////4AAAAA/////4AAAAH/////4AAAB//////8AAA///////+AAf////// - //////////////////8= - + + + + ..\Common\app.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/BAPSPresenter/SecurityDialog.h b/BAPSPresenter/SecurityDialog.h index cbc1dee4..6c315580 100644 --- a/BAPSPresenter/SecurityDialog.h +++ b/BAPSPresenter/SecurityDialog.h @@ -612,6 +612,7 @@ namespace BAPSPresenter { this->AutoScaleDimensions = System::Drawing::SizeF(6, 13); this->AutoScaleMode = System::Windows::Forms::AutoScaleMode::Font; this->ClientSize = System::Drawing::Size(539, 378); + this->StartPosition = System::Windows::Forms::FormStartPosition::CenterParent; this->Controls->Add(this->securityPageControl); this->FormBorderStyle = System::Windows::Forms::FormBorderStyle::FixedDialog; this->Icon = (cli::safe_cast(resources->GetObject(L"$this.Icon"))); diff --git a/BAPSPresenter/SecurityDialog.resx b/BAPSPresenter/SecurityDialog.resx index 17808c86..c36bf988 100644 --- a/BAPSPresenter/SecurityDialog.resx +++ b/BAPSPresenter/SecurityDialog.resx @@ -112,233 +112,13 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - 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 - djs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O/cuAAAAAAAAAAAAAAAAAAAAAADt - asrKysrKysrKysr29vb29vb29vb29vb29vb29vb29vb29vb29vb2ysrK9moFAAAAAAAAAAAAAAAAAAAA - AAAAAG4UNjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NhSnAAAAAAAAAAAAAAAA - AAAAAAAAAAAAg1twcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcFuYAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAADDnIuLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLtpxDAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAW2Vra2tra2tra2tra2tra2tra2tra2tra2tra2tra2tra2VosqAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdFSvViTw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PBWr3UJ - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAsmPBd1VbV1dXV1dXV1dXV1dXV1dXV1dXV1dXV1QRd - JEMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/ngQiXQQEBAQEBAQEBAQEBAQEBAQEBAQE - XSLV/LAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/WSRoaCJdXV1dXV1dXV1dXV1d - XSJoaGUPYgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKqBlIgwMDOloaGjp - 6QwM6SJlUkUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGmPD5Ci - gTU1gaKQD81pAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////////////////// - /8AD///////8AAA///////AAAA//////wAAAA/////8AAAAA/////AAAAAA////4AAAAAB////AAAAAA - D///4AAAAAAH///AAAAAAAP//4AAAAAAAf//AAAAAAAA//4AAAAAAAB//gAAAAAAAH/8AAAAAAAAP/gA - AAAAAAA/+AAAAAAAAB/wAAAAAAAAH/AAAAAAAAAP8AAAAAAAAA/gAAAAAAAAB+AAAAAAAAAH4AAAAAAA - AAfAAAAAAAAAB8AAAAAAAAADwAAAAAAAAAPAAAAAAAAAA8AAAAAAAAADwAAAAAAAAAPAAAAAAAAAA8AA - AAAAAAADwAAAAAAAAAPAAAAAAAAAA8AAAAAAAAADwAAAAAAAAAPAAAAAAAAAA8AAAAAAAAAD4AAAAAAA - AAfgAAAAAAAAB+AAAAAAAAAH8AAAAAAAAA/wAAAAAAAAD/AAAAAAAAAP+AAAAAAAAB/4AAAAAAAAH/wA - AAAAAAA//AAAAAAAAH/+AAAAAAAAf/8AAAAAAAD//4AAAAAAAf//wAAAAAAD///gAAAAAAf///AAAAAA - D///+AAAAAAf///8AAAAAD////4AAAAA/////4AAAAH/////4AAAB//////8AAA///////+AAf////// - //////////////////8= - + + + ..\Common\app.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/BAPSPresenter/TextDialog.resx b/BAPSPresenter/TextDialog.resx index fe1e9272..c36bf988 100644 --- a/BAPSPresenter/TextDialog.resx +++ b/BAPSPresenter/TextDialog.resx @@ -112,20 +112,13 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - AAABAAEAEBAQAAAABAAoAQAAFgAAACgAAAAQAAAAIAAAAAEABAAAAAAAgAAAAAAAAAAAAAAAEAAAABAA - AAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAgICAAMDAwAAAAP8AAP8AAAD//wD/AAAAMLvPAO71 - /wD///8AAA3d3d3d0AAN3e7u7u7d0A3u3e7u3e7Q3e7t3u7d7t3e7u3u3u3e7d7u7u3d7e7t3u7t3d3u - 7u3e7d3u3e7u7d7t3e7d7u7t3u7t3d3t3u3e7u7t3e3e7d7t3u7e7t3t3e7d7u7u3t0N7t7u7u7u0A3d - 7u7u7t3QAA3d3d3d0ADgBwAAgAEAAIABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAgAEAAIABAADgBwAA - + + + ..\Common\app.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/Common/app.ico b/Common/app.ico new file mode 100644 index 0000000000000000000000000000000000000000..a16f5192cd02669a8bc3b4b7b321b453265b6065 GIT binary patch literal 1078 zcmb`Gu};H442InnsZ$_tKql0YN8ruKd$HsV$i{T1j!5VtmP&|$@cni!q5=s9+&Jg| z{GXk(U9*jCt?ODdyRhf2*$r0P20m=eE_Y@J_B!+q-N18!TSaVXNN>hteIE;NOtiOQ z7;wz~*gVU!+lNP+PP09|yo0_;lNK4>)ud^Wq>UznO6(P3IWs>A1b4##l>{NfEmN+z z$#4N>DtRhpY~0p)=LzFh{KUEH_h8^WHcPIQ{2RbpOVW8Pu;dK8Z;h|aF#LQGpAU{J zMLwnX%P4>33%us@^W+dq`G_BavE=_56G#4%OY!SFRuzO5HB;fZ2*HW!^$Wika8z&k zP_;k}soBE~A$kM!ere;ZpWf8t}=^1J)=GqtDn7__BX_hLCOLY=`(1=Z=n#`&hQB?sNByAQ3K)u5G lb=CgLixUJ077g@y(p-2K=zv#$wBw%d Date: Sun, 21 Oct 2018 03:22:48 +0100 Subject: [PATCH 11/24] Give ServerService an Icon. --- BAPSServerService/BAPSServerService.csproj | 4 ++++ BAPSServerService/app.ico | Bin 0 -> 1078 bytes 2 files changed, 4 insertions(+) create mode 100644 BAPSServerService/app.ico diff --git a/BAPSServerService/BAPSServerService.csproj b/BAPSServerService/BAPSServerService.csproj index 2d3e8709..c3785f65 100644 --- a/BAPSServerService/BAPSServerService.csproj +++ b/BAPSServerService/BAPSServerService.csproj @@ -91,6 +91,9 @@ prompt MinimumRecommendedRules.ruleset + + app.ico + @@ -161,6 +164,7 @@ + Always diff --git a/BAPSServerService/app.ico b/BAPSServerService/app.ico new file mode 100644 index 0000000000000000000000000000000000000000..a16f5192cd02669a8bc3b4b7b321b453265b6065 GIT binary patch literal 1078 zcmb`Gu};H442InnsZ$_tKql0YN8ruKd$HsV$i{T1j!5VtmP&|$@cni!q5=s9+&Jg| z{GXk(U9*jCt?ODdyRhf2*$r0P20m=eE_Y@J_B!+q-N18!TSaVXNN>hteIE;NOtiOQ z7;wz~*gVU!+lNP+PP09|yo0_;lNK4>)ud^Wq>UznO6(P3IWs>A1b4##l>{NfEmN+z z$#4N>DtRhpY~0p)=LzFh{KUEH_h8^WHcPIQ{2RbpOVW8Pu;dK8Z;h|aF#LQGpAU{J zMLwnX%P4>33%us@^W+dq`G_BavE=_56G#4%OY!SFRuzO5HB;fZ2*HW!^$Wika8z&k zP_;k}soBE~A$kM!ere;ZpWf8t}=^1J)=GqtDn7__BX_hLCOLY=`(1=Z=n#`&hQB?sNByAQ3K)u5G lb=CgLixUJ077g@y(p-2K=zv#$wBw%d Date: Sun, 21 Oct 2018 03:57:04 +0100 Subject: [PATCH 12/24] Setup Logo and Bootstrap for .Net --- BAPSSetupV2/BAPSSetupV2.vdproj | 89 ++++++++++++++++++++++++++++----- BAPSSetupV2/header-logo.bmp | Bin 0 -> 182682 bytes 2 files changed, 76 insertions(+), 13 deletions(-) create mode 100644 BAPSSetupV2/header-logo.bmp diff --git a/BAPSSetupV2/BAPSSetupV2.vdproj b/BAPSSetupV2/BAPSSetupV2.vdproj index 37ba27a6..3f66ea57 100644 --- a/BAPSSetupV2/BAPSSetupV2.vdproj +++ b/BAPSSetupV2/BAPSSetupV2.vdproj @@ -21,6 +21,12 @@ } "Entry" { + "MsmKey" = "8:_279D46963AF347829CFBD3C295AA815E" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_316226F94C8543899B8445A98A7C0946" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -187,6 +193,22 @@ "PrivateKeyFile" = "8:" "TimeStampServer" = "8:" "InstallerBootstrapper" = "3:2" + "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}" + { + "Enabled" = "11:TRUE" + "PromptEnabled" = "11:TRUE" + "PrerequisitesLocation" = "2:1" + "Url" = "8:" + "ComponentsUrl" = "8:" + "Items" + { + "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.6.1" + { + "Name" = "8:Microsoft .NET Framework 4.6.1 (x86 and x64)" + "ProductCode" = "8:.NETFramework,Version=v4.6.1" + } + } + } } "Release" { @@ -203,6 +225,22 @@ "PrivateKeyFile" = "8:" "TimeStampServer" = "8:" "InstallerBootstrapper" = "3:2" + "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}" + { + "Enabled" = "11:TRUE" + "PromptEnabled" = "11:TRUE" + "PrerequisitesLocation" = "2:1" + "Url" = "8:" + "ComponentsUrl" = "8:" + "Items" + { + "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.6.1" + { + "Name" = "8:Microsoft .NET Framework 4.6.1 (x86 and x64)" + "ProductCode" = "8:.NETFramework,Version=v4.6.1" + } + } + } } } "Deployable" @@ -292,7 +330,7 @@ { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:BAPSServerAssembly, Version=2.6.2.0, Culture=neutral, processorArchitecture=x86" + "AssemblyAsmDisplayName" = "8:BAPSServerAssembly, Version=2.7.0.0, Culture=neutral, processorArchitecture=x86" "ScatterAssemblies" { "_1F5CD9C8B6F24FDDBE69FCABFE9F4701" @@ -319,6 +357,26 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_279D46963AF347829CFBD3C295AA815E" + { + "SourcePath" = "8:header-logo.bmp" + "TargetName" = "8:header-logo.bmp" + "Tag" = "8:" + "Folder" = "8:_AA6E4ED00D1542C3AC78BFB908085FED" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:TRUE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6D3FBA1DCC31457398F77F2A76F910C9" { "SourcePath" = "8:..\\BAPSPresenter\\app.ico" @@ -610,15 +668,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:BAPS2" - "ProductCode" = "8:{D4FCAF84-61A5-4E97-A131-8601C5C9FC2D}" - "PackageCode" = "8:{981C723A-6F99-4E6B-B42C-68521E6D3AF6}" + "ProductCode" = "8:{32284CF2-2D92-4F7E-972B-83F474EBD89E}" + "PackageCode" = "8:{A9371E7C-BAF5-43AD-A815-B673840C4C6D}" "UpgradeCode" = "8:{CA0D6999-E3B1-4ACC-86AC-FAB85E211A57}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" - "RemovePreviousVersions" = "11:FALSE" + "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:2.6.2" + "ProductVersion" = "8:2.7.0" "Manufacturer" = "8:URY" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:https://github.com/UniversityRadioYork/BAPS2/" @@ -1371,7 +1429,8 @@ "Type" = "3:8" "ContextData" = "8:Bitmap" "Attributes" = "3:4" - "Setting" = "3:1" + "Setting" = "3:2" + "Value" = "8:_279D46963AF347829CFBD3C295AA815E" "UsePlugInResources" = "11:TRUE" } "UpdateText" @@ -1522,7 +1581,8 @@ "Type" = "3:8" "ContextData" = "8:Bitmap" "Attributes" = "3:4" - "Setting" = "3:1" + "Setting" = "3:2" + "Value" = "8:_279D46963AF347829CFBD3C295AA815E" "UsePlugInResources" = "11:TRUE" } "ShowProgress" @@ -1566,7 +1626,8 @@ "Type" = "3:8" "ContextData" = "8:Bitmap" "Attributes" = "3:4" - "Setting" = "3:1" + "Setting" = "3:2" + "Value" = "8:_279D46963AF347829CFBD3C295AA815E" "UsePlugInResources" = "11:TRUE" } "CopyrightWarning" @@ -1590,8 +1651,8 @@ "Type" = "3:3" "ContextData" = "8:" "Attributes" = "3:0" - "Setting" = "3:1" - "Value" = "8:#1203" + "Setting" = "3:2" + "Value" = "8:The installer will guide you through the steps required to install [ProductName] on your computer." "DefaultValue" = "8:#1203" "UsePlugInResources" = "11:TRUE" } @@ -1614,7 +1675,8 @@ "Type" = "3:8" "ContextData" = "8:Bitmap" "Attributes" = "3:4" - "Setting" = "3:1" + "Setting" = "3:2" + "Value" = "8:_279D46963AF347829CFBD3C295AA815E" "UsePlugInResources" = "11:TRUE" } } @@ -1636,7 +1698,8 @@ "Type" = "3:8" "ContextData" = "8:Bitmap" "Attributes" = "3:4" - "Setting" = "3:1" + "Setting" = "3:2" + "Value" = "8:_279D46963AF347829CFBD3C295AA815E" "UsePlugInResources" = "11:TRUE" } "InstallAllUsersVisible" @@ -1876,7 +1939,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_8D19959388A44CB69CA8C6F1C2BE4EDA" { - "SourcePath" = "8:..\\Win32\\Debug\\BAPSPresenter.exe" + "SourcePath" = "8:..\\BAPSPresenter\\Win32\\Debug\\BAPSPresenter.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_AA6E4ED00D1542C3AC78BFB908085FED" diff --git a/BAPSSetupV2/header-logo.bmp b/BAPSSetupV2/header-logo.bmp new file mode 100644 index 0000000000000000000000000000000000000000..07b170986d4777c2aa584bbd28353d1faf08dbf2 GIT binary patch literal 182682 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 If#D?Z|AyYihyVZp literal 0 HcmV?d00001 From 1d33949468f6b9b18e138d5ed75150289446c868 Mon Sep 17 00:00:00 2001 From: Matthew Stratford Date: Sun, 21 Oct 2018 04:01:12 +0100 Subject: [PATCH 13/24] Bump version to 2.7.0 --- BAPSPresenter/AssemblyInfo.cpp | 10 +++++----- BAPSServerAssembly/AssemblyInfo.cpp | 10 +++++----- BAPSServerService/Properties/AssemblyInfo.cs | 8 ++++---- RELEASE NOTES.txt | 20 ++++++++++++++++++++ 4 files changed, 34 insertions(+), 14 deletions(-) diff --git a/BAPSPresenter/AssemblyInfo.cpp b/BAPSPresenter/AssemblyInfo.cpp index 2754c68c..3845557d 100644 --- a/BAPSPresenter/AssemblyInfo.cpp +++ b/BAPSPresenter/AssemblyInfo.cpp @@ -14,12 +14,12 @@ using namespace System::Security::Permissions; [assembly:AssemblyTitleAttribute("BAPS Presenter")]; [assembly:AssemblyDescriptionAttribute("Broadcasting and Presenting Suite - Presenter Interface")]; [assembly:AssemblyConfigurationAttribute("Private")]; -[assembly:AssemblyCompanyAttribute("Uni-Software")]; +[assembly:AssemblyCompanyAttribute("University Radio York")]; [assembly:AssemblyProductAttribute("BAPS Presenter - User Interface")]; -[assembly:AssemblyCopyrightAttribute("Copyright (c) 2008")]; -[assembly:AssemblyTrademarkAttribute("Uni-Software")]; +[assembly:AssemblyCopyrightAttribute("Copyright (c) 2018")]; +[assembly:AssemblyTrademarkAttribute("University Radio York")]; [assembly:AssemblyCultureAttribute("")]; -[assembly:AssemblyInformationalVersionAttribute("2.6.2.0")]; +[assembly:AssemblyInformationalVersionAttribute("2.7.0.0")]; // // Version information for an assembly consists of the following four values: @@ -32,7 +32,7 @@ using namespace System::Security::Permissions; // You can specify all the value or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly:AssemblyVersionAttribute("2.6.2.0")]; +[assembly:AssemblyVersionAttribute("2.7.0.0")]; [assembly:ComVisible(false)]; diff --git a/BAPSServerAssembly/AssemblyInfo.cpp b/BAPSServerAssembly/AssemblyInfo.cpp index d30f3515..27dd5aab 100644 --- a/BAPSServerAssembly/AssemblyInfo.cpp +++ b/BAPSServerAssembly/AssemblyInfo.cpp @@ -14,12 +14,12 @@ using namespace System::Security::Permissions; [assembly:AssemblyTitleAttribute("BAPS Server Class Library")]; [assembly:AssemblyDescriptionAttribute("Broadcasting and Presenting Suite - Server Class Library")]; [assembly:AssemblyConfigurationAttribute("Private")]; -[assembly:AssemblyCompanyAttribute("Uni-Software")]; +[assembly:AssemblyCompanyAttribute("University Radio York")]; [assembly:AssemblyProductAttribute("BAPS Server Class Library")]; -[assembly:AssemblyCopyrightAttribute("Copyright (c) 2008")]; -[assembly:AssemblyTrademarkAttribute("Uni-Software")]; +[assembly:AssemblyCopyrightAttribute("Copyright (c) 2018")]; +[assembly:AssemblyTrademarkAttribute("University Radio York")]; [assembly:AssemblyCultureAttribute("")]; -[assembly:AssemblyInformationalVersionAttribute("2.6.2.0")]; +[assembly:AssemblyInformationalVersionAttribute("2.7.0.0")]; // // Version information for an assembly consists of the following four values: @@ -32,7 +32,7 @@ using namespace System::Security::Permissions; // You can specify all the value or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly:AssemblyVersionAttribute("2.6.2.0")]; +[assembly:AssemblyVersionAttribute("2.7.0.0")]; [assembly:ComVisible(false)]; diff --git a/BAPSServerService/Properties/AssemblyInfo.cs b/BAPSServerService/Properties/AssemblyInfo.cs index fdc7be82..9d9c3b10 100644 --- a/BAPSServerService/Properties/AssemblyInfo.cs +++ b/BAPSServerService/Properties/AssemblyInfo.cs @@ -8,9 +8,9 @@ [assembly: AssemblyTitle("BAPS Server Platform")] [assembly: AssemblyDescription("A Digital Playout System for Radio Stations")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Uni-Software")] +[assembly: AssemblyCompany("University Radio York")] [assembly: AssemblyProduct("BAPSServerService")] -[assembly: AssemblyCopyright("Copyright © 2008")] +[assembly: AssemblyCopyright("Copyright © 2018")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -29,5 +29,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("2.6.2.0")] -[assembly: AssemblyFileVersion("2.6.2.0")] +[assembly: AssemblyVersion("2.7.0.0")] +[assembly: AssemblyFileVersion("2.7.0.0")] diff --git a/RELEASE NOTES.txt b/RELEASE NOTES.txt index 7678ac59..eb3c8390 100644 --- a/RELEASE NOTES.txt +++ b/RELEASE NOTES.txt @@ -1,3 +1,23 @@ +## +Release 2.7.0 +-- +Features +-- +New BAPSSetup installer which is natively supported by Visual Studio 2015/17. +-- +Known Issues +-- +BAPSSetup will require a local user's credentials to run the Server Service as. +This is not currently styled into the installer, but is rather a popup. +-- +Bug Fixes +-- +Fixes USB based BAPS Controller software such that the Ctrl - Alt - O menu for administrator no longer crashes the server. +All windows and popups will now appear in sensible places, central to the parent window. +Audiowall now has a button to close the window. +All windows now share the same icon, some had old blue logo. +-- + ## Release 2.6.2 v0 -- From bc09d02d460a58b9751d498e1738153278eff068 Mon Sep 17 00:00:00 2001 From: Charles Pigott Date: Sun, 21 Oct 2018 18:05:39 +0100 Subject: [PATCH 14/24] Remove need for hasUSBDevices by using empty arrays instead And whitespace fixes --- BAPSController/BAPSController.cpp | 21 +++--------- BAPSController/BAPSController.h | 6 ++-- BAPSServerAssembly/BAPSController.h | 5 +-- BAPSServerAssembly/ClientInstance_config.cpp | 34 +++++++++----------- BAPSServerAssembly/ConfigManager.cpp | 27 ++++++---------- 5 files changed, 35 insertions(+), 58 deletions(-) diff --git a/BAPSController/BAPSController.cpp b/BAPSController/BAPSController.cpp index 4b984310..6552d1f4 100644 --- a/BAPSController/BAPSController.cpp +++ b/BAPSController/BAPSController.cpp @@ -19,12 +19,10 @@ BAPSController::BAPSController() if (hDll == 0) { - this->hasUSBDevices = false; + // Initialise empty array and get out + this->serialNumbers = gcnew array(0); return; } - else { - this->hasUSBDevices = true; - } USBm_FindDevices = (USBm_FindDevices_type)GetProcAddress(hDll, "USBm_FindDevices"); USBm_NumberOfDevices = (USBm_NumberOfDevices_type)GetProcAddress(hDll, "USBm_NumberOfDevices"); @@ -190,7 +188,7 @@ void BAPSController::runHelper() USBm_DirectionB(i, 0x00, 0xFF); USBm_WriteB(i, 0xFF); } - + /* Swap in the new names and offsets */ serialNumbers = newSerialNumbers; deviceCount = newDeviceCount; @@ -203,15 +201,6 @@ void BAPSController::runHelper() array^ BAPSController::getSerialNumbers() { - if (hasUSBDevices == true) { - return safe_cast^>(serialNumbers->Clone()); - } else { - array^ empty = gcnew array(0); - return empty; - } + // Just returns empty array if no usb + return safe_cast^>(serialNumbers->Clone()); } - -bool BAPSController::hasUSB() -{ - return hasUSBDevices; -} \ No newline at end of file diff --git a/BAPSController/BAPSController.h b/BAPSController/BAPSController.h index 6021657b..39a1d793 100644 --- a/BAPSController/BAPSController.h +++ b/BAPSController/BAPSController.h @@ -8,7 +8,7 @@ using namespace System; namespace BAPSControllerAssembly -{ +{ public delegate void SignalCallback(System::String^, int); public ref class BAPSController @@ -28,7 +28,6 @@ namespace BAPSControllerAssembly } } array^ getSerialNumbers(); - bool hasUSB(); private: void runHelper(); HINSTANCE hDll; @@ -77,12 +76,11 @@ namespace BAPSControllerAssembly USBm_Copyright_type USBm_Copyright; USBm_About_type USBm_About; USBm_Version_type USBm_Version; - + int deviceCount; array^ serialNumbers; array^ lastByteA; array^ lastByteB; - bool hasUSBDevices; bool quit; System::Threading::Thread^ pollThread; SignalCallback^ callback; diff --git a/BAPSServerAssembly/BAPSController.h b/BAPSServerAssembly/BAPSController.h index d9ae097a..cd7a9438 100644 --- a/BAPSServerAssembly/BAPSController.h +++ b/BAPSServerAssembly/BAPSController.h @@ -27,9 +27,10 @@ namespace BAPSServerAssembly } } + // Defined, but does nothing if no usb device is defined + bapsController2 = gcnew BAPSControllerAssembly::BAPSController(); if (CONFIG_GETINT(CONFIG_BAPSCONTROLLER2ENABLED) == CONFIG_YES_VALUE) { - bapsController2 = gcnew BAPSControllerAssembly::BAPSController(); bapsController2->run(gcnew BAPSControllerAssembly::SignalCallback(handleSignal)); } } @@ -346,4 +347,4 @@ namespace BAPSServerAssembly static System::IO::Ports::SerialPort^ serialPort; static BAPSControllerAssembly::BAPSController^ bapsController2; }; -}; \ No newline at end of file +}; diff --git a/BAPSServerAssembly/ClientInstance_config.cpp b/BAPSServerAssembly/ClientInstance_config.cpp index 4990da76..c07eda64 100644 --- a/BAPSServerAssembly/ClientInstance_config.cpp +++ b/BAPSServerAssembly/ClientInstance_config.cpp @@ -9,7 +9,7 @@ using namespace BAPSServerAssembly; #define BEGIN_CONFIG_BLOCK() ClientManager::getConfigLock(); #define END_CONFIG_BLOCK() ClientManager::releaseConfigLock(); -/** +/** * WORK NEEDED: validation functions, post-set functions for refreshing server * services with the new config values, security stuff **/ @@ -21,14 +21,14 @@ BEGIN_ACTION_BLOCKED1(sendOption,int optionid) { /** The mode mask flips the bit to say this is an option not a count **/ Command cmd = BAPSNET_CONFIG | BAPSNET_OPTION | BAPSNET_CONFIG_MODEMASK; - /** + /** * If the option is an indexed option the value field is set to the * controlling option's id. (This value is arbitrary using this value * is easiest **/ if (CONFIG_ISINDEXED(optionid)) { - cmd |= BAPSNET_CONFIG_USEVALUEMASK; + cmd |= BAPSNET_CONFIG_USEVALUEMASK; cmd |= CONFIG_INDEXOPTION(optionid); } /** Send the optionid, optionDescription and optionType **/ @@ -38,7 +38,7 @@ END_ACTION_UNBLOCK(); BEGIN_ACTION_BLOCKED0(sendAllOptions) { - /** + /** * Number of options is always CONFIG_LASTOPTION as it * is at the end of the enum **/ @@ -78,18 +78,14 @@ BEGIN_ACTION_BLOCKED1(sendAllOptionChoices, u32int optionid) if (optionid == CONFIG_BAPSCONTROLLER2SERIAL) { ConfigStringChoices^ bapsController2Choices = gcnew ConfigStringChoices(); - - // Initialise - array^ serials = gcnew array(0); - if (CONFIG_GETINT(CONFIG_BAPSCONTROLLER2ENABLED) == CONFIG_YES_VALUE) { - serials = BAPSController::getBAPSController2Serials(); - } + array^ serials = BAPSController::getBAPSController2Serials(); for (int i = 0 ; i < serials->Length ; i++) { bapsController2Choices->add(serials[i], serials[i], (i==0)); } bapsController2Choices->add("none","none", (serials->Length==0)); + safe_cast(ConfigManager::configDescriptions[CONFIG_BAPSCONTROLLER2SERIAL])->setChoices(bapsController2Choices); if (CONFIG_GETINT(CONFIG_BAPSCONTROLLER2DEVICECOUNT) < ((serials->Length==0)?1:serials->Length)) { @@ -97,11 +93,11 @@ BEGIN_ACTION_BLOCKED1(sendAllOptionChoices, u32int optionid) } } - /** + /** * Should be called for any CONFIG_TYPE_CHOICE option * returns all the possible choices the option can be. **/ - /** + /** * If the specified option: * a) is not a valid option * b) is not a CHOICE type @@ -115,7 +111,7 @@ BEGIN_ACTION_BLOCKED1(sendAllOptionChoices, u32int optionid) return; } - /** + /** * We are certain now that the option is of CHOICE type, so cast * its descriptor to the choice superclass **/ @@ -163,7 +159,7 @@ BEGIN_ACTION_BLOCKED3(sendOptionConfigSettings, int optionid, bool shouldBroadca cmd &= ~BAPSNET_CONFIG_VALUEMASK; /** Set the value field to the current index **/ cmd |= j; - /** + /** * Send the correct type of data, the CONFIG_TYPE informs the * client of what to expect **/ @@ -203,7 +199,7 @@ BEGIN_ACTION_BLOCKED3(sendOptionConfigSettings, int optionid, bool shouldBroadca } break; default: - /** This case will cause a client and/or server to hang, it will be a programming error server side **/ + /** This case will cause a client and/or server to hang, it will be a programming error server side **/ LogManager::write(System::String::Concat("The following option has an invalid type:\n", CONFIG_KEY(optionid), CONFIG_DESC(optionid)), LOG_ERROR, LOG_CONFIG); break; } @@ -249,7 +245,7 @@ BEGIN_ACTION_BLOCKED3(sendOptionConfigSettings, int optionid, bool shouldBroadca } break; default: - /** This case will cause a client and/or server to hang, it will be a programming error server side **/ + /** This case will cause a client and/or server to hang, it will be a programming error server side **/ LogManager::write(System::String::Concat("The following option has an invalid type:\n", CONFIG_KEY(optionid), CONFIG_DESC(optionid)), LOG_ERROR, LOG_CONFIG); break; } @@ -260,7 +256,7 @@ END_ACTION_UNBLOCK(); BEGIN_ACTION_BLOCKED0(sendAllConfigSettings) { /** Finds all valid settings and sends them to the client **/ - /** + /** * The count is more complex as we do not know easily how many settings * there are due to indexed options, this short loop works this out **/ @@ -536,7 +532,7 @@ BEGIN_ACTION_BLOCKED1(sendUser, System::String^ username) ClientManager::send(this, cmd, const_cast(UserManager::UserResultText[UR_USERNOTEXIST])); return; } - + Command cmd = BAPSNET_CONFIG | BAPSNET_USER | BAPSNET_CONFIG_MODEMASK; ClientManager::send(this, cmd, username, GETPERM(username)); } @@ -640,4 +636,4 @@ BEGIN_ACTION_BLOCKED3(alterIPRestriction, Command cmd, System::String^ ipaddress cmd = BAPSNET_CONFIG | BAPSNET_CONFIGERROR | ce; ClientManager::send(this, cmd, ConfigManager::configErrors[ce]); } -END_ACTION_UNBLOCK(); \ No newline at end of file +END_ACTION_UNBLOCK(); diff --git a/BAPSServerAssembly/ConfigManager.cpp b/BAPSServerAssembly/ConfigManager.cpp index d9a944c8..db970f96 100644 --- a/BAPSServerAssembly/ConfigManager.cpp +++ b/BAPSServerAssembly/ConfigManager.cpp @@ -71,7 +71,7 @@ void ConfigManager::initConfigManager() // WORK NEEDED: better exception system throw gcnew System::Exception("device enumeration failed"); } - + ConfigStringChoices^ deviceChoices = gcnew ConfigStringChoices(); int i = 0; bool isDefault = true; @@ -82,7 +82,7 @@ void ConfigManager::initConfigManager() { isDefault = false; } - + deviceChoices->add(LPCWSTRToString(devices->GetDevice(i)->GetDescription()), LPCWSTRToString(devices->GetDevice(i)->GetID()), isDefault); @@ -144,22 +144,15 @@ void ConfigManager::initConfigManager() BAPSControllerAssembly::BAPSController^ bc = gcnew BAPSControllerAssembly::BAPSController(); ConfigStringChoices^ bapsController2Choices = gcnew ConfigStringChoices(); - array^ serials = {}; - - if (bc->hasUSB() == true) { - serials = bc->getSerialNumbers(); - for (int i = 0; i < serials->Length; i++) - { - bapsController2Choices->add(serials[i], serials[i], (i == 0)); - } - bapsController2Choices->add("none", "none", (serials->Length == 0)); - } - else + array^ serials = bc->getSerialNumbers(); + for (int i = 0; i < serials->Length; i++) { - bapsController2Choices->add("none", "none", true); + bapsController2Choices->add(serials[i], serials[i], (i == 0)); } - + + bapsController2Choices->add("none", "none", (serials->Length == 0)); + delete bc; configDescriptions[CONFIG_BAPSCONTROLLER2ENABLED] = gcnew ConfigDescriptorIntChoice("BAPSController2Enabled", "BAPS USB Controller Enabled", noYesChoices, CA_SU_ONLY); @@ -180,7 +173,7 @@ void ConfigManager::initConfigManager() configErrors[CE_BADMASK] = "Badly formatted mask"; configErrors[CE_RESTRICTIONEXISTS] = "IP restriction already exists"; configErrors[CE_RESTRICTIONNOTEXIST] = "IP restriction does not exist"; - + } void ConfigManager::closeConfigManager() @@ -270,4 +263,4 @@ void ConfigManager::setConfigValue(System::String^ name, array^ va void ConfigManager::removeValue(System::String^ name) { baps->DeleteValue(name, false); -} \ No newline at end of file +} From 4f3ad843e1cd8c7e37e522194a7831f94cb99843 Mon Sep 17 00:00:00 2001 From: Matthew Stratford Date: Sun, 21 Oct 2018 22:31:22 +0100 Subject: [PATCH 15/24] Don't default to having ControllerV1 enabled. --- BAPSSetupV2/BAPSSetupV2.vdproj | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/BAPSSetupV2/BAPSSetupV2.vdproj b/BAPSSetupV2/BAPSSetupV2.vdproj index 3f66ea57..4bc42481 100644 --- a/BAPSSetupV2/BAPSSetupV2.vdproj +++ b/BAPSSetupV2/BAPSSetupV2.vdproj @@ -710,20 +710,6 @@ "Transitive" = "11:FALSE" "Keys" { - "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_73D13475BF4744EE9540E500B7BB6A58" - { - "Name" = "8:[Manufacturer]" - "Condition" = "8:" - "AlwaysCreate" = "11:TRUE" - "DeleteAtUninstall" = "11:TRUE" - "Transitive" = "11:FALSE" - "Keys" - { - } - "Values" - { - } - } "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_89BB68442EF44D5EB4CF84FA70A6848C" { "Name" = "8:URY" @@ -1199,7 +1185,7 @@ "Condition" = "8:" "Transitive" = "11:FALSE" "ValueTypes" = "3:3" - "Value" = "3:1" + "Value" = "3:0" } "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_DFEC33F89F1C410FA277EE845F1104AC" { From e54d250d498000cd1e6c3d96e48bca8c6ba460d7 Mon Sep 17 00:00:00 2001 From: Matthew Stratford Date: Mon, 22 Oct 2018 21:19:00 +0100 Subject: [PATCH 16/24] Directory Refresh buttons show Registry Values --- BAPSPresenter/BAPSPresenterMain.cpp | 17 ++++++++++++----- BAPSPresenter/BAPSPresenterMain.h | 7 +++---- .../BAPSPresenterMainReactions_system.cpp | 3 ++- BAPSServerAssembly/ClientInstance_system.cpp | 4 +++- Common/decodeStructs.h | 2 +- 5 files changed, 21 insertions(+), 12 deletions(-) diff --git a/BAPSPresenter/BAPSPresenterMain.cpp b/BAPSPresenter/BAPSPresenterMain.cpp index 445eb75c..d3a9c867 100644 --- a/BAPSPresenter/BAPSPresenterMain.cpp +++ b/BAPSPresenter/BAPSPresenterMain.cpp @@ -206,9 +206,15 @@ BAPSPresenterMain::BAPSPresenterMain(void) directoryList[0]->Tag = number0; directoryList[1]->Tag = number1; directoryList[2]->Tag = number2; - Directory0Refresh->Tag = number0; - Directory1Refresh->Tag = number1; - Directory2Refresh->Tag = number2; + + directoryRefresh = gcnew array(3); + directoryRefresh[0] = Directory0Refresh; + directoryRefresh[1] = Directory1Refresh; + directoryRefresh[2] = Directory2Refresh; + directoryRefresh[0]->Tag = number0; + directoryRefresh[1]->Tag = number1; + directoryRefresh[2]->Tag = number2; + loadedText = gcnew array(3); loadedText[0] = Channel0LoadedText; loadedText[1] = Channel1LoadedText; @@ -761,8 +767,9 @@ void BAPSPresenterMain::decodeCommand(Command cmdReceived) else { int count = clientSocket->receiveI(); - MethodInvokerObj^ mi = gcnew MethodInvokerObj(this, &BAPSPresenterMain::clearFiles); - array^ dd = gcnew array(1) {cmdReceived & BAPSNET_SYSTEM_VALUEMASK}; + System::String^ niceDirectoryName = clientSocket->receiveS(); + MethodInvokerObjStr^ mi = gcnew MethodInvokerObjStr(this, &BAPSPresenterMain::clearFiles); + array^ dd = gcnew array(2) {cmdReceived & BAPSNET_SYSTEM_VALUEMASK, niceDirectoryName}; this->Invoke(mi, dd); } break; diff --git a/BAPSPresenter/BAPSPresenterMain.h b/BAPSPresenter/BAPSPresenterMain.h index 421444d7..74bcada4 100644 --- a/BAPSPresenter/BAPSPresenterMain.h +++ b/BAPSPresenter/BAPSPresenterMain.h @@ -16,6 +16,7 @@ #include "BAPSLabel.h" #include "BAPSListBox.h" #include "TimeLine.h" +#include "ConfigManager.h" #define DISABLE_INDEX_CHANGE() channelList[channel]->Enabled=false;\ channelList[channel]->remove_SelectedIndexChanged( gcnew System::EventHandler(this, &BAPSPresenterMain::LoadNewIndex_Event)); @@ -124,7 +125,7 @@ namespace BAPSPresenter { SYSTEM functions **/ void addFileToDirectoryList(System::Object^ _directoryIndex, System::Object^ _fileIndex, System::String^ entry); - void clearFiles(System::Object^ _directoryIndex); + void clearFiles(System::Object^ _directoryIndex, System::String^ niceDirectoryName); void displayVersion(System::String^ version, System::String^ date, System::String^ time, System::String^ author); //void processFeedbackResult(int resultCode); //void addToChatList(System::String^ username); @@ -193,6 +194,7 @@ namespace BAPSPresenter { /** Arrays with channel number indices for easy updating **/ array^ directoryList; + array^ directoryRefresh; array^ loadedText; array^ trackLengthText; array^ timeLeftText; @@ -562,7 +564,6 @@ private: System::ComponentModel::IContainer^ components; this->Directory0Refresh->Name = L"Directory0Refresh"; this->Directory0Refresh->Size = System::Drawing::Size(234, 23); this->Directory0Refresh->TabIndex = 220; - this->Directory0Refresh->Text = L"Jingles"; this->Directory0Refresh->Click += gcnew System::EventHandler(this, &BAPSPresenterMain::RefreshDirectory_Click); // // Directory1Refresh @@ -572,7 +573,6 @@ private: System::ComponentModel::IContainer^ components; this->Directory1Refresh->Name = L"Directory1Refresh"; this->Directory1Refresh->Size = System::Drawing::Size(234, 23); this->Directory1Refresh->TabIndex = 221; - this->Directory1Refresh->Text = L"Beds"; this->Directory1Refresh->Click += gcnew System::EventHandler(this, &BAPSPresenterMain::RefreshDirectory_Click); // // Directory2Refresh @@ -582,7 +582,6 @@ private: System::ComponentModel::IContainer^ components; this->Directory2Refresh->Name = L"Directory2Refresh"; this->Directory2Refresh->Size = System::Drawing::Size(234, 23); this->Directory2Refresh->TabIndex = 222; - this->Directory2Refresh->Text = L"Adverts"; this->Directory2Refresh->Click += gcnew System::EventHandler(this, &BAPSPresenterMain::RefreshDirectory_Click); // // Channel0Play diff --git a/BAPSPresenter/BAPSPresenterMainReactions_system.cpp b/BAPSPresenter/BAPSPresenterMainReactions_system.cpp index 9bd8b509..a1881012 100644 --- a/BAPSPresenter/BAPSPresenterMainReactions_system.cpp +++ b/BAPSPresenter/BAPSPresenterMainReactions_system.cpp @@ -14,13 +14,14 @@ void BAPSPresenterMain::addFileToDirectoryList(System::Object^ _directoryIndex, } } -void BAPSPresenterMain::clearFiles(System::Object^ _directoryIndex) +void BAPSPresenterMain::clearFiles(System::Object^ _directoryIndex, System::String^ niceDirectoryName) { int directoryIndex = safe_cast(_directoryIndex); if (directoryIndex < 3) { /** Empty the list box ready for new entries (required due to implicit indexing) **/ directoryList[directoryIndex]->Items->Clear(); + directoryRefresh[directoryIndex]->Text = niceDirectoryName; } } diff --git a/BAPSServerAssembly/ClientInstance_system.cpp b/BAPSServerAssembly/ClientInstance_system.cpp index 01efa946..e7365d48 100644 --- a/BAPSServerAssembly/ClientInstance_system.cpp +++ b/BAPSServerAssembly/ClientInstance_system.cpp @@ -153,9 +153,11 @@ END_ACTION_UNBLOCK(); void ClientInstance::refreshDir(unsigned char directoryNumber) { System::String^ directoryName = ""; + System::String^ niceDirectoryName = ""; try { directoryName = CONFIG_GETSTRn(CONFIG_DIRECTORYLOCATION, directoryNumber); + niceDirectoryName = CONFIG_GETSTRn(CONFIG_NICEDIRECTORYNAME, directoryNumber); array^ files = System::IO::Directory::GetFiles(directoryName); array^ audioFiles = gcnew array(files->Length); int i = 0; @@ -172,7 +174,7 @@ void ClientInstance::refreshDir(unsigned char directoryNumber) } Command cmd = BAPSNET_SYSTEM | BAPSNET_FILENAME | (directoryNumber & BAPSNET_SYSTEM_VALUEMASK); - ClientManager::send(this, cmd, (u32int)audioCount ); + ClientManager::send(this, cmd, (u32int)audioCount, (System::String^)niceDirectoryName); cmd = BAPSNET_SYSTEM | BAPSNET_FILENAME | BAPSNET_SYSTEM_MODEMASK | (directoryNumber & BAPSNET_SYSTEM_VALUEMASK); diff --git a/Common/decodeStructs.h b/Common/decodeStructs.h index 5b85fe59..f98f39c3 100644 --- a/Common/decodeStructs.h +++ b/Common/decodeStructs.h @@ -162,7 +162,7 @@ typedef unsigned short Command; * System **/ #define BAPSNET_LISTFILES (0<<8) //C-[x][VALUE-dirnumber] -#define BAPSNET_FILENAME (1<<8) //S-[0](count)[VALUE-dirnumber] u32int count +#define BAPSNET_FILENAME (1<<8) //S-[0](count)[VALUE-dirnumber] u32int count, string niceDirectoryName // [1](data) [VALUE-dirnumber] u32int index, string filename #define BAPSNET_SENDMESSAGE (2<<8) //C- u32int clientid, string message #define BAPSNET_AUTOUPDATE (3<<8) //C-[VALUE-1](on) From 271fbecfac2c1ddae86a01f8e25d9800758ddd92 Mon Sep 17 00:00:00 2001 From: Matthew Stratford Date: Mon, 22 Oct 2018 21:23:47 +0100 Subject: [PATCH 17/24] Don't commit cache files. --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index b77a25e4..3fd81195 100644 --- a/.gitignore +++ b/.gitignore @@ -277,3 +277,5 @@ __pycache__/ # Cake - Uncomment if you are using it # tools/** # !tools/packages.config + +*.cache From d620fea3d9993f41ebd1c09a33cb73931c9a97b0 Mon Sep 17 00:00:00 2001 From: Matthew Stratford Date: Mon, 22 Oct 2018 21:30:41 +0100 Subject: [PATCH 18/24] Removed loads on unused build options. --- BAPS2.sln | 396 ++++++++++++++++++------------------------------------ 1 file changed, 133 insertions(+), 263 deletions(-) diff --git a/BAPS2.sln b/BAPS2.sln index 72a08d8a..5a6a31fc 100644 --- a/BAPS2.sln +++ b/BAPS2.sln @@ -1,263 +1,133 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27130.2024 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BAPSPresenter", "BAPSPresenter\BAPSPresenter.vcxproj", "{46FD9397-DD3B-456A-9D95-504D60F6A9B5}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tinker", "Tinker\Tinker.vcxproj", "{72C648CC-A0E6-4439-8474-76BE38A621B4}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BAPSServerAssembly", "BAPSServerAssembly\BAPSServerAssembly.vcxproj", "{B93BB821-0BB3-466C-9D53-7FECF8722F1D}" - ProjectSection(ProjectDependencies) = postProject - {2EAB373E-2054-4AB5-A2F9-34139FB08AE4} = {2EAB373E-2054-4AB5-A2F9-34139FB08AE4} - EndProjectSection -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BAPSServerService", "BAPSServerService\BAPSServerService.csproj", "{A19900A2-8C8B-416A-8642-7F20CB9CA145}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TinkerInCSharp", "TinkerInCSharp\TinkerInCSharp.csproj", "{27F57299-ED16-454A-967C-03A3BA2D6F89}" -EndProject -Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "BAPSSetup", "BAPSSetup\BAPSSetup.vdproj", "{9A851E69-B851-432F-B2E8-2C3A03E54D29}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tinkerinc++", "Tinkerinc++\Tinkerinc++.vcxproj", "{8633265B-8675-489E-BB7B-DAD384B287A1}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BAPSFormControls", "BAPSFormControls\BAPSFormControls.csproj", "{4C3D1722-7B93-4081-8D61-572F8F088CED}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BAPSControllerAssembly", "BAPSController\BAPSController.vcxproj", "{E1CEEE2E-DF20-4929-80BD-D73E896C5245}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BAPS", "BAPSlib\BAPS.vcxproj", "{2EAB373E-2054-4AB5-A2F9-34139FB08AE4}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BAPSTest", "BAPSlib\BAPSTest\BAPSTest.vcxproj", "{87038750-A2E1-4F9D-8EA3-19BC6E2B371B}" -EndProject -Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "BAPSSetupV2", "BAPSSetupV2\BAPSSetupV2.vdproj", "{AA7B2A60-7EBE-4297-9194-68AAD0AC730D}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|Mixed Platforms = Debug|Mixed Platforms - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|Mixed Platforms = Release|Mixed Platforms - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Debug|Any CPU.ActiveCfg = Debug|x64 - {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Debug|Any CPU.Build.0 = Debug|x64 - {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Debug|Win32.ActiveCfg = Debug|Win32 - {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Debug|Win32.Build.0 = Debug|Win32 - {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Debug|x64.ActiveCfg = Debug|x64 - {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Debug|x64.Build.0 = Debug|x64 - {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Debug|x86.ActiveCfg = Debug|Win32 - {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Debug|x86.Build.0 = Debug|Win32 - {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Debug|x86.Deploy.0 = Debug|Win32 - {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Release|Any CPU.ActiveCfg = Release|Win32 - {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Release|Mixed Platforms.Build.0 = Release|Win32 - {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Release|Win32.ActiveCfg = Release|Win32 - {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Release|Win32.Build.0 = Release|Win32 - {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Release|x64.ActiveCfg = Release|x64 - {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Release|x64.Build.0 = Release|x64 - {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Release|x86.ActiveCfg = Release|Win32 - {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Release|x86.Build.0 = Release|Win32 - {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Release|x86.Deploy.0 = Release|Win32 - {72C648CC-A0E6-4439-8474-76BE38A621B4}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {72C648CC-A0E6-4439-8474-76BE38A621B4}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {72C648CC-A0E6-4439-8474-76BE38A621B4}.Debug|Win32.ActiveCfg = Debug|Win32 - {72C648CC-A0E6-4439-8474-76BE38A621B4}.Debug|x64.ActiveCfg = Debug|x64 - {72C648CC-A0E6-4439-8474-76BE38A621B4}.Debug|x64.Build.0 = Debug|x64 - {72C648CC-A0E6-4439-8474-76BE38A621B4}.Debug|x86.ActiveCfg = Debug|Win32 - {72C648CC-A0E6-4439-8474-76BE38A621B4}.Debug|x86.Build.0 = Debug|Win32 - {72C648CC-A0E6-4439-8474-76BE38A621B4}.Debug|x86.Deploy.0 = Debug|Win32 - {72C648CC-A0E6-4439-8474-76BE38A621B4}.Release|Any CPU.ActiveCfg = Release|Win32 - {72C648CC-A0E6-4439-8474-76BE38A621B4}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {72C648CC-A0E6-4439-8474-76BE38A621B4}.Release|Win32.ActiveCfg = Release|Win32 - {72C648CC-A0E6-4439-8474-76BE38A621B4}.Release|x64.ActiveCfg = Release|x64 - {72C648CC-A0E6-4439-8474-76BE38A621B4}.Release|x86.ActiveCfg = Release|Win32 - {72C648CC-A0E6-4439-8474-76BE38A621B4}.Release|x86.Build.0 = Release|Win32 - {72C648CC-A0E6-4439-8474-76BE38A621B4}.Release|x86.Deploy.0 = Release|Win32 - {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Debug|Any CPU.ActiveCfg = Debug|x64 - {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Debug|Any CPU.Build.0 = Debug|x64 - {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Debug|Win32.ActiveCfg = Debug|Win32 - {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Debug|Win32.Build.0 = Debug|Win32 - {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Debug|x64.ActiveCfg = Debug|Win32 - {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Debug|x64.Build.0 = Debug|Win32 - {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Debug|x86.ActiveCfg = Debug|Win32 - {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Debug|x86.Build.0 = Debug|Win32 - {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Release|Any CPU.ActiveCfg = Release|Win32 - {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Release|Mixed Platforms.Build.0 = Release|Win32 - {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Release|Win32.ActiveCfg = Release|Win32 - {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Release|Win32.Build.0 = Release|Win32 - {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Release|x64.ActiveCfg = Release|x64 - {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Release|x64.Build.0 = Release|x64 - {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Release|x86.ActiveCfg = Release|Win32 - {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Release|x86.Build.0 = Release|Win32 - {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Debug|Any CPU.ActiveCfg = Debug|x64 - {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Debug|Any CPU.Build.0 = Debug|x64 - {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Debug|Win32.ActiveCfg = Debug|x64 - {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Debug|Win32.Build.0 = Debug|x64 - {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Debug|x64.ActiveCfg = Debug|x64 - {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Debug|x64.Build.0 = Debug|x64 - {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Debug|x86.ActiveCfg = Debug|x86 - {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Debug|x86.Build.0 = Debug|x86 - {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Release|Any CPU.Build.0 = Release|Any CPU - {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Release|Win32.ActiveCfg = Release|Any CPU - {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Release|Win32.Build.0 = Release|Any CPU - {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Release|x64.ActiveCfg = Release|Any CPU - {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Release|x64.Build.0 = Release|Any CPU - {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Release|x86.ActiveCfg = Release|x86 - {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Release|x86.Build.0 = Release|x86 - {27F57299-ED16-454A-967C-03A3BA2D6F89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {27F57299-ED16-454A-967C-03A3BA2D6F89}.Debug|Any CPU.Build.0 = Debug|Any CPU - {27F57299-ED16-454A-967C-03A3BA2D6F89}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {27F57299-ED16-454A-967C-03A3BA2D6F89}.Debug|Win32.ActiveCfg = Debug|Any CPU - {27F57299-ED16-454A-967C-03A3BA2D6F89}.Debug|x64.ActiveCfg = Debug|x64 - {27F57299-ED16-454A-967C-03A3BA2D6F89}.Debug|x64.Build.0 = Debug|x64 - {27F57299-ED16-454A-967C-03A3BA2D6F89}.Debug|x86.ActiveCfg = Debug|x86 - {27F57299-ED16-454A-967C-03A3BA2D6F89}.Debug|x86.Build.0 = Debug|x86 - {27F57299-ED16-454A-967C-03A3BA2D6F89}.Release|Any CPU.ActiveCfg = Release|Any CPU - {27F57299-ED16-454A-967C-03A3BA2D6F89}.Release|Any CPU.Build.0 = Release|Any CPU - {27F57299-ED16-454A-967C-03A3BA2D6F89}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {27F57299-ED16-454A-967C-03A3BA2D6F89}.Release|Win32.ActiveCfg = Release|Any CPU - {27F57299-ED16-454A-967C-03A3BA2D6F89}.Release|x64.ActiveCfg = Release|Any CPU - {27F57299-ED16-454A-967C-03A3BA2D6F89}.Release|x86.ActiveCfg = Release|x86 - {27F57299-ED16-454A-967C-03A3BA2D6F89}.Release|x86.Build.0 = Release|x86 - {9A851E69-B851-432F-B2E8-2C3A03E54D29}.Debug|Any CPU.ActiveCfg = Debug - {9A851E69-B851-432F-B2E8-2C3A03E54D29}.Debug|Any CPU.Build.0 = Debug - {9A851E69-B851-432F-B2E8-2C3A03E54D29}.Debug|Mixed Platforms.ActiveCfg = Debug - {9A851E69-B851-432F-B2E8-2C3A03E54D29}.Debug|Mixed Platforms.Build.0 = Debug - {9A851E69-B851-432F-B2E8-2C3A03E54D29}.Debug|Win32.ActiveCfg = Debug - {9A851E69-B851-432F-B2E8-2C3A03E54D29}.Debug|Win32.Build.0 = Debug - {9A851E69-B851-432F-B2E8-2C3A03E54D29}.Debug|x64.ActiveCfg = Debug - {9A851E69-B851-432F-B2E8-2C3A03E54D29}.Debug|x64.Build.0 = Debug - {9A851E69-B851-432F-B2E8-2C3A03E54D29}.Debug|x86.ActiveCfg = Debug - {9A851E69-B851-432F-B2E8-2C3A03E54D29}.Release|Any CPU.ActiveCfg = Release - {9A851E69-B851-432F-B2E8-2C3A03E54D29}.Release|Any CPU.Build.0 = Release - {9A851E69-B851-432F-B2E8-2C3A03E54D29}.Release|Mixed Platforms.ActiveCfg = Release - {9A851E69-B851-432F-B2E8-2C3A03E54D29}.Release|Mixed Platforms.Build.0 = Release - {9A851E69-B851-432F-B2E8-2C3A03E54D29}.Release|Win32.ActiveCfg = Release - {9A851E69-B851-432F-B2E8-2C3A03E54D29}.Release|Win32.Build.0 = Release - {9A851E69-B851-432F-B2E8-2C3A03E54D29}.Release|x64.ActiveCfg = Release - {9A851E69-B851-432F-B2E8-2C3A03E54D29}.Release|x64.Build.0 = Release - {9A851E69-B851-432F-B2E8-2C3A03E54D29}.Release|x86.ActiveCfg = Release - {8633265B-8675-489E-BB7B-DAD384B287A1}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {8633265B-8675-489E-BB7B-DAD384B287A1}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {8633265B-8675-489E-BB7B-DAD384B287A1}.Debug|Win32.ActiveCfg = Debug|Win32 - {8633265B-8675-489E-BB7B-DAD384B287A1}.Debug|x64.ActiveCfg = Debug|x64 - {8633265B-8675-489E-BB7B-DAD384B287A1}.Debug|x64.Build.0 = Debug|x64 - {8633265B-8675-489E-BB7B-DAD384B287A1}.Debug|x86.ActiveCfg = Debug|Win32 - {8633265B-8675-489E-BB7B-DAD384B287A1}.Debug|x86.Build.0 = Debug|Win32 - {8633265B-8675-489E-BB7B-DAD384B287A1}.Debug|x86.Deploy.0 = Debug|Win32 - {8633265B-8675-489E-BB7B-DAD384B287A1}.Release|Any CPU.ActiveCfg = Release|Win32 - {8633265B-8675-489E-BB7B-DAD384B287A1}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {8633265B-8675-489E-BB7B-DAD384B287A1}.Release|Win32.ActiveCfg = Release|Win32 - {8633265B-8675-489E-BB7B-DAD384B287A1}.Release|x64.ActiveCfg = Release|x64 - {8633265B-8675-489E-BB7B-DAD384B287A1}.Release|x86.ActiveCfg = Release|Win32 - {8633265B-8675-489E-BB7B-DAD384B287A1}.Release|x86.Build.0 = Release|Win32 - {8633265B-8675-489E-BB7B-DAD384B287A1}.Release|x86.Deploy.0 = Release|Win32 - {4C3D1722-7B93-4081-8D61-572F8F088CED}.Debug|Any CPU.ActiveCfg = Debug|x64 - {4C3D1722-7B93-4081-8D61-572F8F088CED}.Debug|Any CPU.Build.0 = Debug|x64 - {4C3D1722-7B93-4081-8D61-572F8F088CED}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {4C3D1722-7B93-4081-8D61-572F8F088CED}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {4C3D1722-7B93-4081-8D61-572F8F088CED}.Debug|Win32.ActiveCfg = Debug|Any CPU - {4C3D1722-7B93-4081-8D61-572F8F088CED}.Debug|Win32.Build.0 = Debug|Any CPU - {4C3D1722-7B93-4081-8D61-572F8F088CED}.Debug|x64.ActiveCfg = Debug|x64 - {4C3D1722-7B93-4081-8D61-572F8F088CED}.Debug|x64.Build.0 = Debug|x64 - {4C3D1722-7B93-4081-8D61-572F8F088CED}.Debug|x86.ActiveCfg = Debug|x86 - {4C3D1722-7B93-4081-8D61-572F8F088CED}.Debug|x86.Build.0 = Debug|x86 - {4C3D1722-7B93-4081-8D61-572F8F088CED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4C3D1722-7B93-4081-8D61-572F8F088CED}.Release|Any CPU.Build.0 = Release|Any CPU - {4C3D1722-7B93-4081-8D61-572F8F088CED}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {4C3D1722-7B93-4081-8D61-572F8F088CED}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {4C3D1722-7B93-4081-8D61-572F8F088CED}.Release|Win32.ActiveCfg = Release|Any CPU - {4C3D1722-7B93-4081-8D61-572F8F088CED}.Release|Win32.Build.0 = Release|Any CPU - {4C3D1722-7B93-4081-8D61-572F8F088CED}.Release|x64.ActiveCfg = Release|Any CPU - {4C3D1722-7B93-4081-8D61-572F8F088CED}.Release|x64.Build.0 = Release|Any CPU - {4C3D1722-7B93-4081-8D61-572F8F088CED}.Release|x86.ActiveCfg = Release|x86 - {4C3D1722-7B93-4081-8D61-572F8F088CED}.Release|x86.Build.0 = Release|x86 - {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Debug|Any CPU.ActiveCfg = Debug|x64 - {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Debug|Any CPU.Build.0 = Debug|x64 - {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Debug|Win32.ActiveCfg = Debug|Win32 - {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Debug|Win32.Build.0 = Debug|Win32 - {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Debug|x64.ActiveCfg = Debug|x64 - {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Debug|x64.Build.0 = Debug|x64 - {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Debug|x86.ActiveCfg = Debug|Win32 - {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Debug|x86.Build.0 = Debug|Win32 - {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Debug|x86.Deploy.0 = Debug|Win32 - {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Release|Any CPU.ActiveCfg = Release|Win32 - {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Release|Mixed Platforms.Build.0 = Release|Win32 - {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Release|Win32.ActiveCfg = Release|Win32 - {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Release|Win32.Build.0 = Release|Win32 - {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Release|x64.ActiveCfg = Release|x64 - {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Release|x64.Build.0 = Release|x64 - {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Release|x86.ActiveCfg = Release|Win32 - {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Release|x86.Build.0 = Release|Win32 - {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Release|x86.Deploy.0 = Release|Win32 - {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Debug|Any CPU.ActiveCfg = Debug|x64 - {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Debug|Any CPU.Build.0 = Debug|x64 - {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Debug|Win32.ActiveCfg = Debug|Win32 - {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Debug|Win32.Build.0 = Debug|Win32 - {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Debug|x64.ActiveCfg = Debug|x64 - {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Debug|x64.Build.0 = Debug|x64 - {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Debug|x86.ActiveCfg = Debug|Win32 - {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Debug|x86.Build.0 = Debug|Win32 - {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Debug|x86.Deploy.0 = Debug|Win32 - {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Release|Any CPU.ActiveCfg = Release|Win32 - {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Release|Mixed Platforms.Build.0 = Release|Win32 - {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Release|Win32.ActiveCfg = Release|Win32 - {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Release|Win32.Build.0 = Release|Win32 - {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Release|x64.ActiveCfg = Release|x64 - {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Release|x64.Build.0 = Release|x64 - {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Release|x86.ActiveCfg = Release|Win32 - {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Release|x86.Build.0 = Release|Win32 - {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Release|x86.Deploy.0 = Release|Win32 - {87038750-A2E1-4F9D-8EA3-19BC6E2B371B}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {87038750-A2E1-4F9D-8EA3-19BC6E2B371B}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {87038750-A2E1-4F9D-8EA3-19BC6E2B371B}.Debug|Win32.ActiveCfg = Debug|Win32 - {87038750-A2E1-4F9D-8EA3-19BC6E2B371B}.Debug|x64.ActiveCfg = Debug|x64 - {87038750-A2E1-4F9D-8EA3-19BC6E2B371B}.Debug|x64.Build.0 = Debug|x64 - {87038750-A2E1-4F9D-8EA3-19BC6E2B371B}.Debug|x86.ActiveCfg = Debug|Win32 - {87038750-A2E1-4F9D-8EA3-19BC6E2B371B}.Debug|x86.Build.0 = Debug|Win32 - {87038750-A2E1-4F9D-8EA3-19BC6E2B371B}.Debug|x86.Deploy.0 = Debug|Win32 - {87038750-A2E1-4F9D-8EA3-19BC6E2B371B}.Release|Any CPU.ActiveCfg = Release|Win32 - {87038750-A2E1-4F9D-8EA3-19BC6E2B371B}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {87038750-A2E1-4F9D-8EA3-19BC6E2B371B}.Release|Win32.ActiveCfg = Release|Win32 - {87038750-A2E1-4F9D-8EA3-19BC6E2B371B}.Release|x64.ActiveCfg = Release|x64 - {87038750-A2E1-4F9D-8EA3-19BC6E2B371B}.Release|x86.ActiveCfg = Release|Win32 - {87038750-A2E1-4F9D-8EA3-19BC6E2B371B}.Release|x86.Build.0 = Release|Win32 - {87038750-A2E1-4F9D-8EA3-19BC6E2B371B}.Release|x86.Deploy.0 = Release|Win32 - {AA7B2A60-7EBE-4297-9194-68AAD0AC730D}.Debug|Any CPU.ActiveCfg = Debug - {AA7B2A60-7EBE-4297-9194-68AAD0AC730D}.Debug|Mixed Platforms.ActiveCfg = Debug - {AA7B2A60-7EBE-4297-9194-68AAD0AC730D}.Debug|Win32.ActiveCfg = Debug - {AA7B2A60-7EBE-4297-9194-68AAD0AC730D}.Debug|x64.ActiveCfg = Debug - {AA7B2A60-7EBE-4297-9194-68AAD0AC730D}.Debug|x86.ActiveCfg = Debug - {AA7B2A60-7EBE-4297-9194-68AAD0AC730D}.Release|Any CPU.ActiveCfg = Release - {AA7B2A60-7EBE-4297-9194-68AAD0AC730D}.Release|Mixed Platforms.ActiveCfg = Release - {AA7B2A60-7EBE-4297-9194-68AAD0AC730D}.Release|Win32.ActiveCfg = Release - {AA7B2A60-7EBE-4297-9194-68AAD0AC730D}.Release|x64.ActiveCfg = Release - {AA7B2A60-7EBE-4297-9194-68AAD0AC730D}.Release|x86.ActiveCfg = Release - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {27528D5D-0BA2-4E60-8FEC-B9203687D6C0} - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.27130.2024 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BAPSPresenter", "BAPSPresenter\BAPSPresenter.vcxproj", "{46FD9397-DD3B-456A-9D95-504D60F6A9B5}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tinker", "Tinker\Tinker.vcxproj", "{72C648CC-A0E6-4439-8474-76BE38A621B4}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BAPSServerAssembly", "BAPSServerAssembly\BAPSServerAssembly.vcxproj", "{B93BB821-0BB3-466C-9D53-7FECF8722F1D}" + ProjectSection(ProjectDependencies) = postProject + {2EAB373E-2054-4AB5-A2F9-34139FB08AE4} = {2EAB373E-2054-4AB5-A2F9-34139FB08AE4} + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BAPSServerService", "BAPSServerService\BAPSServerService.csproj", "{A19900A2-8C8B-416A-8642-7F20CB9CA145}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TinkerInCSharp", "TinkerInCSharp\TinkerInCSharp.csproj", "{27F57299-ED16-454A-967C-03A3BA2D6F89}" +EndProject +Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "BAPSSetup", "BAPSSetup\BAPSSetup.vdproj", "{9A851E69-B851-432F-B2E8-2C3A03E54D29}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tinkerinc++", "Tinkerinc++\Tinkerinc++.vcxproj", "{8633265B-8675-489E-BB7B-DAD384B287A1}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BAPSFormControls", "BAPSFormControls\BAPSFormControls.csproj", "{4C3D1722-7B93-4081-8D61-572F8F088CED}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BAPSControllerAssembly", "BAPSController\BAPSController.vcxproj", "{E1CEEE2E-DF20-4929-80BD-D73E896C5245}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BAPS", "BAPSlib\BAPS.vcxproj", "{2EAB373E-2054-4AB5-A2F9-34139FB08AE4}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BAPSTest", "BAPSlib\BAPSTest\BAPSTest.vcxproj", "{87038750-A2E1-4F9D-8EA3-19BC6E2B371B}" +EndProject +Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "BAPSSetupV2", "BAPSSetupV2\BAPSSetupV2.vdproj", "{AA7B2A60-7EBE-4297-9194-68AAD0AC730D}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Debug|x64.ActiveCfg = Debug|x64 + {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Debug|x64.Build.0 = Debug|x64 + {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Debug|x86.ActiveCfg = Debug|Win32 + {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Debug|x86.Build.0 = Debug|Win32 + {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Debug|x86.Deploy.0 = Debug|Win32 + {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Release|x64.ActiveCfg = Release|x64 + {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Release|x64.Build.0 = Release|x64 + {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Release|x86.ActiveCfg = Release|Win32 + {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Release|x86.Build.0 = Release|Win32 + {46FD9397-DD3B-456A-9D95-504D60F6A9B5}.Release|x86.Deploy.0 = Release|Win32 + {72C648CC-A0E6-4439-8474-76BE38A621B4}.Debug|x64.ActiveCfg = Debug|x64 + {72C648CC-A0E6-4439-8474-76BE38A621B4}.Debug|x86.ActiveCfg = Debug|Win32 + {72C648CC-A0E6-4439-8474-76BE38A621B4}.Debug|x86.Deploy.0 = Debug|Win32 + {72C648CC-A0E6-4439-8474-76BE38A621B4}.Release|x64.ActiveCfg = Release|x64 + {72C648CC-A0E6-4439-8474-76BE38A621B4}.Release|x86.ActiveCfg = Release|Win32 + {72C648CC-A0E6-4439-8474-76BE38A621B4}.Release|x86.Deploy.0 = Release|Win32 + {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Debug|x64.ActiveCfg = Debug|Win32 + {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Debug|x64.Build.0 = Debug|Win32 + {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Debug|x86.ActiveCfg = Debug|Win32 + {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Debug|x86.Build.0 = Debug|Win32 + {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Release|x64.ActiveCfg = Release|x64 + {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Release|x64.Build.0 = Release|x64 + {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Release|x86.ActiveCfg = Release|Win32 + {B93BB821-0BB3-466C-9D53-7FECF8722F1D}.Release|x86.Build.0 = Release|Win32 + {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Debug|x64.ActiveCfg = Debug|x64 + {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Debug|x64.Build.0 = Debug|x64 + {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Debug|x86.ActiveCfg = Debug|x86 + {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Debug|x86.Build.0 = Debug|x86 + {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Release|x64.ActiveCfg = Release|x64 + {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Release|x64.Build.0 = Release|x64 + {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Release|x86.ActiveCfg = Release|x86 + {A19900A2-8C8B-416A-8642-7F20CB9CA145}.Release|x86.Build.0 = Release|x86 + {27F57299-ED16-454A-967C-03A3BA2D6F89}.Debug|x64.ActiveCfg = Debug|x64 + {27F57299-ED16-454A-967C-03A3BA2D6F89}.Debug|x86.ActiveCfg = Debug|x86 + {27F57299-ED16-454A-967C-03A3BA2D6F89}.Release|x64.ActiveCfg = Release|x64 + {27F57299-ED16-454A-967C-03A3BA2D6F89}.Release|x86.ActiveCfg = Release|x86 + {9A851E69-B851-432F-B2E8-2C3A03E54D29}.Debug|x64.ActiveCfg = Debug + {9A851E69-B851-432F-B2E8-2C3A03E54D29}.Debug|x64.Build.0 = Debug + {9A851E69-B851-432F-B2E8-2C3A03E54D29}.Debug|x86.ActiveCfg = Debug + {9A851E69-B851-432F-B2E8-2C3A03E54D29}.Release|x64.ActiveCfg = Release + {9A851E69-B851-432F-B2E8-2C3A03E54D29}.Release|x64.Build.0 = Release + {9A851E69-B851-432F-B2E8-2C3A03E54D29}.Release|x86.ActiveCfg = Release + {8633265B-8675-489E-BB7B-DAD384B287A1}.Debug|x64.ActiveCfg = Debug|x64 + {8633265B-8675-489E-BB7B-DAD384B287A1}.Debug|x86.ActiveCfg = Debug|Win32 + {8633265B-8675-489E-BB7B-DAD384B287A1}.Debug|x86.Deploy.0 = Debug|Win32 + {8633265B-8675-489E-BB7B-DAD384B287A1}.Release|x64.ActiveCfg = Release|x64 + {8633265B-8675-489E-BB7B-DAD384B287A1}.Release|x86.ActiveCfg = Release|Win32 + {8633265B-8675-489E-BB7B-DAD384B287A1}.Release|x86.Deploy.0 = Release|Win32 + {4C3D1722-7B93-4081-8D61-572F8F088CED}.Debug|x64.ActiveCfg = Debug|x64 + {4C3D1722-7B93-4081-8D61-572F8F088CED}.Debug|x64.Build.0 = Debug|x64 + {4C3D1722-7B93-4081-8D61-572F8F088CED}.Debug|x86.ActiveCfg = Debug|x86 + {4C3D1722-7B93-4081-8D61-572F8F088CED}.Debug|x86.Build.0 = Debug|x86 + {4C3D1722-7B93-4081-8D61-572F8F088CED}.Release|x64.ActiveCfg = Release|x64 + {4C3D1722-7B93-4081-8D61-572F8F088CED}.Release|x64.Build.0 = Release|x64 + {4C3D1722-7B93-4081-8D61-572F8F088CED}.Release|x86.ActiveCfg = Release|x86 + {4C3D1722-7B93-4081-8D61-572F8F088CED}.Release|x86.Build.0 = Release|x86 + {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Debug|x64.ActiveCfg = Debug|x64 + {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Debug|x64.Build.0 = Debug|x64 + {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Debug|x86.ActiveCfg = Debug|Win32 + {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Debug|x86.Build.0 = Debug|Win32 + {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Debug|x86.Deploy.0 = Debug|Win32 + {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Release|x64.ActiveCfg = Release|x64 + {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Release|x64.Build.0 = Release|x64 + {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Release|x86.ActiveCfg = Release|Win32 + {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Release|x86.Build.0 = Release|Win32 + {E1CEEE2E-DF20-4929-80BD-D73E896C5245}.Release|x86.Deploy.0 = Release|Win32 + {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Debug|x64.ActiveCfg = Debug|x64 + {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Debug|x64.Build.0 = Debug|x64 + {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Debug|x86.ActiveCfg = Debug|Win32 + {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Debug|x86.Build.0 = Debug|Win32 + {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Debug|x86.Deploy.0 = Debug|Win32 + {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Release|x64.ActiveCfg = Release|x64 + {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Release|x64.Build.0 = Release|x64 + {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Release|x86.ActiveCfg = Release|Win32 + {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Release|x86.Build.0 = Release|Win32 + {2EAB373E-2054-4AB5-A2F9-34139FB08AE4}.Release|x86.Deploy.0 = Release|Win32 + {87038750-A2E1-4F9D-8EA3-19BC6E2B371B}.Debug|x64.ActiveCfg = Debug|x64 + {87038750-A2E1-4F9D-8EA3-19BC6E2B371B}.Debug|x86.ActiveCfg = Debug|Win32 + {87038750-A2E1-4F9D-8EA3-19BC6E2B371B}.Debug|x86.Deploy.0 = Debug|Win32 + {87038750-A2E1-4F9D-8EA3-19BC6E2B371B}.Release|x64.ActiveCfg = Release|x64 + {87038750-A2E1-4F9D-8EA3-19BC6E2B371B}.Release|x86.ActiveCfg = Release|Win32 + {87038750-A2E1-4F9D-8EA3-19BC6E2B371B}.Release|x86.Deploy.0 = Release|Win32 + {AA7B2A60-7EBE-4297-9194-68AAD0AC730D}.Debug|x64.ActiveCfg = Debug + {AA7B2A60-7EBE-4297-9194-68AAD0AC730D}.Debug|x86.ActiveCfg = Debug + {AA7B2A60-7EBE-4297-9194-68AAD0AC730D}.Release|x64.ActiveCfg = Release + {AA7B2A60-7EBE-4297-9194-68AAD0AC730D}.Release|x86.ActiveCfg = Release + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {27528D5D-0BA2-4E60-8FEC-B9203687D6C0} + EndGlobalSection +EndGlobal From de87c4f521cb0b5fc6b302c868f83ee22513cff8 Mon Sep 17 00:00:00 2001 From: Matthew Stratford Date: Mon, 22 Oct 2018 21:54:53 +0100 Subject: [PATCH 19/24] Added bapserror.log --- BAPSPresenter/bapserror.log | 1 + 1 file changed, 1 insertion(+) create mode 100644 BAPSPresenter/bapserror.log diff --git a/BAPSPresenter/bapserror.log b/BAPSPresenter/bapserror.log new file mode 100644 index 00000000..58d86537 --- /dev/null +++ b/BAPSPresenter/bapserror.log @@ -0,0 +1 @@ +BEGIN BAPS PRESENTER ERROR LOG \ No newline at end of file From 8ac528e2a719bb93ec9b04efa196af1acbe1998a Mon Sep 17 00:00:00 2001 From: Matthew Stratford Date: Mon, 22 Oct 2018 22:27:08 +0100 Subject: [PATCH 20/24] Bapserror.log --- BAPSPresenter/BAPSPresenterMain.cpp | 2 +- BAPSPresenter/bapserror.log | 0 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 BAPSPresenter/bapserror.log diff --git a/BAPSPresenter/BAPSPresenterMain.cpp b/BAPSPresenter/BAPSPresenterMain.cpp index d3a9c867..8cc6adbf 100644 --- a/BAPSPresenter/BAPSPresenterMain.cpp +++ b/BAPSPresenter/BAPSPresenterMain.cpp @@ -890,7 +890,7 @@ void BAPSPresenterMain::logError(System::String^ errorMessage) System::IO::StreamWriter^ stream = nullptr; try { - stream = gcnew System::IO::StreamWriter("c:\\bapserror.log", true); + stream = gcnew System::IO::StreamWriter("bapserror.log", true); stream->Write(errorMessage); } catch (System::Exception^) diff --git a/BAPSPresenter/bapserror.log b/BAPSPresenter/bapserror.log new file mode 100644 index 00000000..e69de29b From 7ddcd27dc27f9e843bd535ffe5dd8d84f6450948 Mon Sep 17 00:00:00 2001 From: Matthew Stratford Date: Mon, 22 Oct 2018 22:28:03 +0100 Subject: [PATCH 21/24] Update some project files. --- BAPSPresenter/BAPSPresenter.vcxproj | 799 ++-- BAPSPresenter/BAPSPresenter.vcxproj.filters | 673 +-- BAPSSetupV2/BAPSSetupV2.vdproj | 4052 ++++++++++--------- 3 files changed, 2781 insertions(+), 2743 deletions(-) diff --git a/BAPSPresenter/BAPSPresenter.vcxproj b/BAPSPresenter/BAPSPresenter.vcxproj index 512469df..0e92b325 100755 --- a/BAPSPresenter/BAPSPresenter.vcxproj +++ b/BAPSPresenter/BAPSPresenter.vcxproj @@ -1,400 +1,409 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {46FD9397-DD3B-456A-9D95-504D60F6A9B5} - BAPSPresenter - ManagedCProj - 10.0.17134.0 - - - - Application - v141 - Unicode - Pure - true - - - Application - v141 - Unicode - Pure - - - Application - v140 - Unicode - Pure - true - - - Application - v140 - Unicode - Pure - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>14.0.25431.1 - - - $(SolutionDir)\BAPSPresenter\$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - true - - - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - false - - - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - true - - - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - - - + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {46FD9397-DD3B-456A-9D95-504D60F6A9B5} + BAPSPresenter + ManagedCProj + 10.0.17134.0 + + + + Application + v141 + Unicode + Pure + true + + + Application + v141 + Unicode + Pure + + + Application + v140 + Unicode + Pure + true + + + Application + v140 + Unicode + Pure + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.25431.1 + + + $(SolutionDir)\BAPSPresenter\$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + false + + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + + + copy ..\help\BAPSPresenterHelp.chm ..\debug\ - - ..\debug\BAPSPresenterHelp.chm;%(Outputs) - - - Disabled - ..\Common;..\BAPSLib\$(Platform)\$(Configuration);..\BAPSLib\$(Platform)\$(Configuration)\inc;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;%(PreprocessorDefinitions) - MultiThreadedDebugDLL - Use - Level3 - ProgramDatabase - true - - - - textItem.png;libraryItem.png;fileItem.png;textItemSel.png;%(EmbedManagedResourceFile) - true - true - Windows - main - false - - MachineX86 - - - true - - - - + + ..\debug\BAPSPresenterHelp.chm;%(Outputs) + + + Disabled + ..\Common;..\BAPSLib\$(Platform)\$(Configuration);..\BAPSLib\$(Platform)\$(Configuration)\inc;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + Use + Level3 + ProgramDatabase + true + + + + textItem.png;libraryItem.png;fileItem.png;textItemSel.png;%(EmbedManagedResourceFile) + true + true + Windows + main + false + + MachineX86 + + + true + + + + copy ..\help\BAPSPresenterHelp.chm ..\release\ - - ..\release\BAPSPresenterHelp.chm;%(Outputs) - - - ..\Common;..\BAPSLib\$(Platform)\$(Configuration);..\BAPSLib\$(Platform)\$(Configuration)\inc;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;%(PreprocessorDefinitions) - MultiThreadedDLL - Use - Level3 - ProgramDatabase - - - - textItem.png;libraryItem.png;fileItem.png;textItemSel.png;%(EmbedManagedResourceFile) - true - Windows - main - false - - MachineX86 - - - - + +copy bapserror.log ..\release\ + ..\release\BAPSPresenterHelp.chm;..\release\bapserror.log;%(Outputs) + %(Inputs) + + + ..\Common;..\BAPSLib\$(Platform)\$(Configuration);..\BAPSLib\$(Platform)\$(Configuration)\inc;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;%(PreprocessorDefinitions) + MultiThreadedDLL + Use + Level3 + ProgramDatabase + + + + textItem.png;libraryItem.png;fileItem.png;textItemSel.png;%(EmbedManagedResourceFile) + true + Windows + main + false + + MachineX86 + + + + copy ..\help\BAPSPresenterHelp.chm ..\debug\ - - ..\debug\BAPSPresenterHelp.chm;%(Outputs) - - - X64 - - - Disabled - ..\Common;..\BAPSLib\$(Platform)\$(Configuration);..\BAPSLib\$(Platform)\$(Configuration)\inc;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;%(PreprocessorDefinitions) - MultiThreadedDebugDLL - Use - Level3 - ProgramDatabase - - - - textItem.png;libraryItem.png;fileItem.png;textItemSel.png;%(EmbedManagedResourceFile) - true - true - Windows - main - false - - MachineX64 - - - - + + ..\debug\BAPSPresenterHelp.chm;%(Outputs) + + + X64 + + + Disabled + ..\Common;..\BAPSLib\$(Platform)\$(Configuration);..\BAPSLib\$(Platform)\$(Configuration)\inc;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + Use + Level3 + ProgramDatabase + + + + textItem.png;libraryItem.png;fileItem.png;textItemSel.png;%(EmbedManagedResourceFile) + true + true + Windows + main + false + + MachineX64 + + + + copy ..\help\BAPSPresenterHelp.chm ..\release\ - - ..\release\BAPSPresenterHelp.chm;%(Outputs) - - - X64 - - - ..\Common;..\BAPSLib\$(Platform)\$(Configuration);..\BAPSLib\$(Platform)\$(Configuration)\inc;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;%(PreprocessorDefinitions) - MultiThreadedDLL - Use - Level3 - ProgramDatabase - - - - textItem.png;libraryItem.png;fileItem.png;textItemSel.png;%(EmbedManagedResourceFile) - true - Windows - main - false - - MachineX64 - - - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Create - Create - Create - Create - - - - - - - - - - - - CppForm - - - - - - - - - - - - - - - - CppForm - - - - - - CppForm - - - - - - - CppForm - - - - - - - CppForm - - - CppForm - - - CppForm - - - - CppForm - - - - CppForm - - - - - CppForm - - - - - - - - - - - - - - - - - - - - - - - - - - About.h - Designer - - - AudioWall.h - Designer - - - BAPSPresenterMain.h - Designer - - - ConfigDialog.h - Designer - - - LoadShowDialog.h - Designer - - - LocalConfigDialog.h - Designer - - - LoginDialog.h - Designer - - - RecordLibrarySearch.h - Designer - - - SecurityDialog.h - Designer - - - TextDialog.h - Designer - - - - - + +copy bapserror.log ..\release\ + ..\release\BAPSPresenterHelp.chm;..\release\bapserror.log;%(Outputs) + %(Inputs) + + + X64 + + + ..\Common;..\BAPSLib\$(Platform)\$(Configuration);..\BAPSLib\$(Platform)\$(Configuration)\inc;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;%(PreprocessorDefinitions) + MultiThreadedDLL + Use + Level3 + ProgramDatabase + + + + textItem.png;libraryItem.png;fileItem.png;textItemSel.png;%(EmbedManagedResourceFile) + true + Windows + main + false + + MachineX64 + + + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Create + Create + Create + Create + + + + + + + + + + + + CppForm + + + + + + + + + + + + + + + + CppForm + + + + + + CppForm + + + + + + + CppForm + + + + + + + CppForm + + + CppForm + + + CppForm + + + + CppForm + + + + CppForm + + + + + CppForm + + + + + + + + + + + + + + + + + + + + + + + true + false + false + + + + + + About.h + Designer + + + AudioWall.h + Designer + + + BAPSPresenterMain.h + Designer + + + ConfigDialog.h + Designer + + + LoadShowDialog.h + Designer + + + LocalConfigDialog.h + Designer + + + LoginDialog.h + Designer + + + RecordLibrarySearch.h + Designer + + + SecurityDialog.h + Designer + + + TextDialog.h + Designer + + + + + \ No newline at end of file diff --git a/BAPSPresenter/BAPSPresenter.vcxproj.filters b/BAPSPresenter/BAPSPresenter.vcxproj.filters index 5d3d25cc..d67e619c 100755 --- a/BAPSPresenter/BAPSPresenter.vcxproj.filters +++ b/BAPSPresenter/BAPSPresenter.vcxproj.filters @@ -1,337 +1,338 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {d9990367-4b06-4447-8a49-00d5189d89f3} - - - {7e3d0260-f1b6-4593-8ccd-92972a272b15} - - - {1a5f11a8-0382-4acf-85a6-3e587a584100} - - - {c1c38b73-834e-4ff6-8a6a-cb3fc1d88412} - - - {118d4f3e-cf6c-4763-b40b-f1582007b429} - - - {ef77a3f4-5337-427d-9b66-15c28ba3c190} - - - {7a6794b1-8993-4cc8-90e3-d0b543798d02} - - - {ec2c962b-79ce-4758-99aa-27ce435817c1} - - - {8933a6b2-c3ab-47c0-9939-8221b72ca35c} - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Header Files\About - - - Header Files\ConfigDialog - - - Header Files\LoadShowDialog - - - Header Files\LoginDialog - - - Header Files\RecordLibrarySearch - - - Header Files\SecurityDialog - - - Header Files\LocalConfigDialog - - - Header Files\AudioWall - - - - - 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\Messages - - - Header Files\Messages - - - Header Files\Messages - - - Header Files\Messages - - - Header Files\Messages - - - Header Files\Messages - - - Header Files\Messages - - - Header Files\Messages - - - Header Files\Messages - - - Header Files\Messages - - - Header Files\Messages - - - Header Files\Messages - - - Header Files\Messages - - - Header Files\Messages - - - Header Files\About - - - Header Files\ConfigDialog - - - Header Files\ConfigDialog - - - Header Files\ConfigDialog - - - Header Files\LoadShowDialog - - - Header Files\LoginDialog - - - Header Files\RecordLibrarySearch - - - Header Files\SecurityDialog - - - Header Files\SecurityDialog - - - Header Files\LocalConfigDialog - - - Header Files\AudioWall - - - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - - - Resource Files - - - - - - - - - - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {d9990367-4b06-4447-8a49-00d5189d89f3} + + + {7e3d0260-f1b6-4593-8ccd-92972a272b15} + + + {1a5f11a8-0382-4acf-85a6-3e587a584100} + + + {c1c38b73-834e-4ff6-8a6a-cb3fc1d88412} + + + {118d4f3e-cf6c-4763-b40b-f1582007b429} + + + {ef77a3f4-5337-427d-9b66-15c28ba3c190} + + + {7a6794b1-8993-4cc8-90e3-d0b543798d02} + + + {ec2c962b-79ce-4758-99aa-27ce435817c1} + + + {8933a6b2-c3ab-47c0-9939-8221b72ca35c} + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Header Files\About + + + Header Files\ConfigDialog + + + Header Files\LoadShowDialog + + + Header Files\LoginDialog + + + Header Files\RecordLibrarySearch + + + Header Files\SecurityDialog + + + Header Files\LocalConfigDialog + + + Header Files\AudioWall + + + + + 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\Messages + + + Header Files\Messages + + + Header Files\Messages + + + Header Files\Messages + + + Header Files\Messages + + + Header Files\Messages + + + Header Files\Messages + + + Header Files\Messages + + + Header Files\Messages + + + Header Files\Messages + + + Header Files\Messages + + + Header Files\Messages + + + Header Files\Messages + + + Header Files\Messages + + + Header Files\About + + + Header Files\ConfigDialog + + + Header Files\ConfigDialog + + + Header Files\ConfigDialog + + + Header Files\LoadShowDialog + + + Header Files\LoginDialog + + + Header Files\RecordLibrarySearch + + + Header Files\SecurityDialog + + + Header Files\SecurityDialog + + + Header Files\LocalConfigDialog + + + Header Files\AudioWall + + + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + + + Resource Files + + + + + + + + + + + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + \ No newline at end of file diff --git a/BAPSSetupV2/BAPSSetupV2.vdproj b/BAPSSetupV2/BAPSSetupV2.vdproj index 4bc42481..2724cd38 100644 --- a/BAPSSetupV2/BAPSSetupV2.vdproj +++ b/BAPSSetupV2/BAPSSetupV2.vdproj @@ -1,2012 +1,2040 @@ -"DeployProject" -{ -"VSVersion" = "3:800" -"ProjectType" = "8:{978C614F-708E-4E1A-B201-565925725DBA}" -"IsWebType" = "8:FALSE" -"ProjectName" = "8:BAPSSetupV2" -"LanguageId" = "3:1033" -"CodePage" = "3:1252" -"UILanguageId" = "3:1033" -"SccProjectName" = "8:" -"SccLocalPath" = "8:" -"SccAuxPath" = "8:" -"SccProvider" = "8:" - "Hierarchy" - { - "Entry" - { - "MsmKey" = "8:_1F5CD9C8B6F24FDDBE69FCABFE9F4701" - "OwnerKey" = "8:_316226F94C8543899B8445A98A7C0946" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_279D46963AF347829CFBD3C295AA815E" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_316226F94C8543899B8445A98A7C0946" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_5377AB4A1E064C4590FCF306C2AF17B3" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_5576626F84BB40838D5F1ABFD3EEA739" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_6D3FBA1DCC31457398F77F2A76F910C9" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_7605FD5C0C311CD42C7373A0DAC3C798" - "OwnerKey" = "8:_316226F94C8543899B8445A98A7C0946" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_82105C046FE744EFADDC88F49143DF37" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_86AD68D610AC8347843952CC3E213557" - "OwnerKey" = "8:_316226F94C8543899B8445A98A7C0946" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_86AD68D610AC8347843952CC3E213557" - "OwnerKey" = "8:_1F5CD9C8B6F24FDDBE69FCABFE9F4701" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_89DE8D6EA5D407F64A7C948641ED064F" - "OwnerKey" = "8:_7605FD5C0C311CD42C7373A0DAC3C798" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_8D19959388A44CB69CA8C6F1C2BE4EDA" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_9608DF056FD742EBADA8C6B2316FFE36" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_A4337A3633BCD50D39E48BFD0F0309DE" - "OwnerKey" = "8:_1F5CD9C8B6F24FDDBE69FCABFE9F4701" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_A4337A3633BCD50D39E48BFD0F0309DE" - "OwnerKey" = "8:_316226F94C8543899B8445A98A7C0946" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_A4337A3633BCD50D39E48BFD0F0309DE" - "OwnerKey" = "8:_AE52BD3051FE80D9B487173FCC566142" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_AE52BD3051FE80D9B487173FCC566142" - "OwnerKey" = "8:_1F5CD9C8B6F24FDDBE69FCABFE9F4701" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_AE52BD3051FE80D9B487173FCC566142" - "OwnerKey" = "8:_316226F94C8543899B8445A98A7C0946" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_CA761FCA4DD442F0A4D28667C01C0EE1" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_D8C012D7671941BFABEA737AEEE095FC" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_5377AB4A1E064C4590FCF306C2AF17B3" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_316226F94C8543899B8445A98A7C0946" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_1F5CD9C8B6F24FDDBE69FCABFE9F4701" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_AE52BD3051FE80D9B487173FCC566142" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_A4337A3633BCD50D39E48BFD0F0309DE" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_86AD68D610AC8347843952CC3E213557" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_7605FD5C0C311CD42C7373A0DAC3C798" - "MsmSig" = "8:_UNDEFINED" - } - } - "Configurations" - { - "Debug" - { - "DisplayName" = "8:Debug" - "IsDebugOnly" = "11:TRUE" - "IsReleaseOnly" = "11:FALSE" - "OutputFilename" = "8:Debug\\BAPSSetupV2.msi" - "PackageFilesAs" = "3:2" - "PackageFileSize" = "3:-2147483648" - "CabType" = "3:1" - "Compression" = "3:2" - "SignOutput" = "11:FALSE" - "CertificateFile" = "8:" - "PrivateKeyFile" = "8:" - "TimeStampServer" = "8:" - "InstallerBootstrapper" = "3:2" - "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}" - { - "Enabled" = "11:TRUE" - "PromptEnabled" = "11:TRUE" - "PrerequisitesLocation" = "2:1" - "Url" = "8:" - "ComponentsUrl" = "8:" - "Items" - { - "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.6.1" - { - "Name" = "8:Microsoft .NET Framework 4.6.1 (x86 and x64)" - "ProductCode" = "8:.NETFramework,Version=v4.6.1" - } - } - } - } - "Release" - { - "DisplayName" = "8:Release" - "IsDebugOnly" = "11:FALSE" - "IsReleaseOnly" = "11:TRUE" - "OutputFilename" = "8:Release\\BAPSSetupV2.msi" - "PackageFilesAs" = "3:2" - "PackageFileSize" = "3:-2147483648" - "CabType" = "3:1" - "Compression" = "3:2" - "SignOutput" = "11:FALSE" - "CertificateFile" = "8:" - "PrivateKeyFile" = "8:" - "TimeStampServer" = "8:" - "InstallerBootstrapper" = "3:2" - "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}" - { - "Enabled" = "11:TRUE" - "PromptEnabled" = "11:TRUE" - "PrerequisitesLocation" = "2:1" - "Url" = "8:" - "ComponentsUrl" = "8:" - "Items" - { - "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.6.1" - { - "Name" = "8:Microsoft .NET Framework 4.6.1 (x86 and x64)" - "ProductCode" = "8:.NETFramework,Version=v4.6.1" - } - } - } - } - } - "Deployable" - { - "CustomAction" - { - "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_66050A16F10A471C95C6208AE114DDF3" - { - "Name" = "8:Primary output from BAPSServerService (Active)" - "Condition" = "8:" - "Object" = "8:_316226F94C8543899B8445A98A7C0946" - "FileType" = "3:2" - "InstallAction" = "3:1" - "Arguments" = "8:" - "EntryPoint" = "8:" - "Sequence" = "3:1" - "Identifier" = "8:_4245443A_21D7_4808_A869_93253B51E268" - "InstallerClass" = "11:TRUE" - "CustomActionData" = "8:" - } - "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_7B1A980AFBEC48FF8C42FB88DD368D84" - { - "Name" = "8:Primary output from BAPSServerService (Active)" - "Condition" = "8:" - "Object" = "8:_316226F94C8543899B8445A98A7C0946" - "FileType" = "3:2" - "InstallAction" = "3:3" - "Arguments" = "8:" - "EntryPoint" = "8:" - "Sequence" = "3:1" - "Identifier" = "8:_B1353B26_1265_4501_B24D_9BDD3D6929FD" - "InstallerClass" = "11:TRUE" - "CustomActionData" = "8:" - } - "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_CC3F4ABFF95D420CA5C802AA1B0E06CD" - { - "Name" = "8:Primary output from BAPSServerService (Active)" - "Condition" = "8:" - "Object" = "8:_316226F94C8543899B8445A98A7C0946" - "FileType" = "3:2" - "InstallAction" = "3:2" - "Arguments" = "8:" - "EntryPoint" = "8:" - "Sequence" = "3:1" - "Identifier" = "8:_22112535_00B4_43DC_AA49_A267F1D831B5" - "InstallerClass" = "11:TRUE" - "CustomActionData" = "8:" - } - "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_FB55FF1CB80043D89616D2978CC40983" - { - "Name" = "8:Primary output from BAPSServerService (Active)" - "Condition" = "8:" - "Object" = "8:_316226F94C8543899B8445A98A7C0946" - "FileType" = "3:2" - "InstallAction" = "3:4" - "Arguments" = "8:" - "EntryPoint" = "8:" - "Sequence" = "3:1" - "Identifier" = "8:_388856D8_93BC_46A4_B032_66270DF550BB" - "InstallerClass" = "11:TRUE" - "CustomActionData" = "8:" - } - } - "DefaultFeature" - { - "Name" = "8:DefaultFeature" - "Title" = "8:" - "Description" = "8:" - } - "ExternalPersistence" - { - "LaunchCondition" - { - "{A06ECF26-33A3-4562-8140-9B0E340D4F24}:_90DA046AA3854D79927664BE00DD0EAF" - { - "Name" = "8:.NET Framework" - "Message" = "8:[VSDNETMSG]" - "FrameworkVersion" = "8:.NETFramework,Version=v4.0" - "AllowLaterVersions" = "11:FALSE" - "InstallUrl" = "8:http://go.microsoft.com/fwlink/?LinkId=671728" - } - } - } - "File" - { - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_1F5CD9C8B6F24FDDBE69FCABFE9F4701" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:BAPSServerAssembly, Version=2.7.0.0, Culture=neutral, processorArchitecture=x86" - "ScatterAssemblies" - { - "_1F5CD9C8B6F24FDDBE69FCABFE9F4701" - { - "Name" = "8:BAPSServerAssembly.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:BAPSServerAssembly.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_AA6E4ED00D1542C3AC78BFB908085FED" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_279D46963AF347829CFBD3C295AA815E" - { - "SourcePath" = "8:header-logo.bmp" - "TargetName" = "8:header-logo.bmp" - "Tag" = "8:" - "Folder" = "8:_AA6E4ED00D1542C3AC78BFB908085FED" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:TRUE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6D3FBA1DCC31457398F77F2A76F910C9" - { - "SourcePath" = "8:..\\BAPSPresenter\\app.ico" - "TargetName" = "8:app.ico" - "Tag" = "8:" - "Folder" = "8:_AA6E4ED00D1542C3AC78BFB908085FED" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_7605FD5C0C311CD42C7373A0DAC3C798" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Interop.SpeechLib, Version=5.4.0.0, Culture=neutral, processorArchitecture=x86" - "ScatterAssemblies" - { - "_7605FD5C0C311CD42C7373A0DAC3C798" - { - "Name" = "8:Interop.SpeechLib.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:Interop.SpeechLib.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_AA6E4ED00D1542C3AC78BFB908085FED" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_86AD68D610AC8347843952CC3E213557" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:BAPSControllerAssembly, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86" - "ScatterAssemblies" - { - "_86AD68D610AC8347843952CC3E213557" - { - "Name" = "8:BAPSControllerAssembly.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:BAPSControllerAssembly.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_AA6E4ED00D1542C3AC78BFB908085FED" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_89DE8D6EA5D407F64A7C948641ED064F" - { - "SourcePath" = "8:sapi.dll" - "TargetName" = "8:sapi.dll" - "Tag" = "8:" - "Folder" = "8:_AA6E4ED00D1542C3AC78BFB908085FED" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9608DF056FD742EBADA8C6B2316FFE36" - { - "SourcePath" = "8:..\\help\\BAPSPresenterHelp.chm" - "TargetName" = "8:BAPSPresenterHelp.chm" - "Tag" = "8:" - "Folder" = "8:_7A85486C51C04458844B26DD5BBC80B0" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A4337A3633BCD50D39E48BFD0F0309DE" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Mono.Security, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_A4337A3633BCD50D39E48BFD0F0309DE" - { - "Name" = "8:Mono.Security.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:Mono.Security.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_AA6E4ED00D1542C3AC78BFB908085FED" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_AE52BD3051FE80D9B487173FCC566142" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Npgsql, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_AE52BD3051FE80D9B487173FCC566142" - { - "Name" = "8:Npgsql.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:Npgsql.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_AA6E4ED00D1542C3AC78BFB908085FED" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CA761FCA4DD442F0A4D28667C01C0EE1" - { - "SourcePath" = "8:..\\Common\\USBm.dll" - "TargetName" = "8:USBm.dll" - "Tag" = "8:" - "Folder" = "8:_AA6E4ED00D1542C3AC78BFB908085FED" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_D8C012D7671941BFABEA737AEEE095FC" - { - "SourcePath" = "8:..\\BAPSServerService\\serverstate.xml" - "TargetName" = "8:serverstate.xml" - "Tag" = "8:" - "Folder" = "8:_AA6E4ED00D1542C3AC78BFB908085FED" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } - } - "FileType" - { - } - "Folder" - { - "{1525181F-901A-416C-8A58-119130FE478E}:_43A1F3C512FB4E99A77A7046B917D8F0" - { - "Name" = "8:#1916" - "AlwaysCreate" = "11:FALSE" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Property" = "8:DesktopFolder" - "Folders" - { - } - } - "{3C67513D-01DD-4637-8A68-80971EB9504F}:_AA6E4ED00D1542C3AC78BFB908085FED" - { - "DefaultLocation" = "8:[ProgramFilesFolder][Manufacturer]\\[ProductName]" - "Name" = "8:#1925" - "AlwaysCreate" = "11:FALSE" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Property" = "8:TARGETDIR" - "Folders" - { - "{9EF0B969-E518-4E46-987F-47570745A589}:_7A85486C51C04458844B26DD5BBC80B0" - { - "Name" = "8:Help" - "AlwaysCreate" = "11:FALSE" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Property" = "8:_E8DFEC2F07544905823A179CFBCE8D8F" - "Folders" - { - } - } - } - } - "{1525181F-901A-416C-8A58-119130FE478E}:_EB395113D18D4B849F61C8AEE7E29711" - { - "Name" = "8:#1919" - "AlwaysCreate" = "11:FALSE" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Property" = "8:ProgramMenuFolder" - "Folders" - { - } - } - } - "LaunchCondition" - { - } - "Locator" - { - } - "MsiBootstrapper" - { - "LangId" = "3:1033" - "RequiresElevation" = "11:FALSE" - } - "Product" - { - "Name" = "8:Microsoft Visual Studio" - "ProductName" = "8:BAPS2" - "ProductCode" = "8:{32284CF2-2D92-4F7E-972B-83F474EBD89E}" - "PackageCode" = "8:{A9371E7C-BAF5-43AD-A815-B673840C4C6D}" - "UpgradeCode" = "8:{CA0D6999-E3B1-4ACC-86AC-FAB85E211A57}" - "AspNetVersion" = "8:4.0.30319.0" - "RestartWWWService" = "11:FALSE" - "RemovePreviousVersions" = "11:TRUE" - "DetectNewerInstalledVersion" = "11:TRUE" - "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:2.7.0" - "Manufacturer" = "8:URY" - "ARPHELPTELEPHONE" = "8:" - "ARPHELPLINK" = "8:https://github.com/UniversityRadioYork/BAPS2/" - "Title" = "8:BAPS Setup Installer" - "Subject" = "8:" - "ARPCONTACT" = "8:University Radio York" - "Keywords" = "8:" - "ARPCOMMENTS" = "8:" - "ARPURLINFOABOUT" = "8:https://ury.org.uk/" - "ARPPRODUCTICON" = "8:_6D3FBA1DCC31457398F77F2A76F910C9" - "ARPIconIndex" = "3:0" - "SearchPath" = "8:" - "UseSystemSearchPath" = "11:TRUE" - "TargetPlatform" = "3:0" - "PreBuildEvent" = "8:" - "PostBuildEvent" = "8:" - "RunPostBuildEvent" = "3:0" - } - "Registry" - { - "HKLM" - { - "Keys" - { - "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_970B24A0051F4DC9ABE58486EB3953AC" - { - "Name" = "8:Software" - "Condition" = "8:" - "AlwaysCreate" = "11:FALSE" - "DeleteAtUninstall" = "11:FALSE" - "Transitive" = "11:FALSE" - "Keys" - { - "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_89BB68442EF44D5EB4CF84FA70A6848C" - { - "Name" = "8:URY" - "Condition" = "8:" - "AlwaysCreate" = "11:FALSE" - "DeleteAtUninstall" = "11:FALSE" - "Transitive" = "11:FALSE" - "Keys" - { - "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_78BC70F574D048AE9F246407EC0EBA0E" - { - "Name" = "8:BAPS" - "Condition" = "8:" - "AlwaysCreate" = "11:FALSE" - "DeleteAtUninstall" = "11:FALSE" - "Transitive" = "11:FALSE" - "Keys" - { - } - "Values" - { - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_07095DF9EFE54AD58D9A3E9284B71BD6" - { - "Name" = "8:BAPSControllerButtonCode1" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:3" - "Value" = "3:2" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_07417F57E9324F8C94AB57B7CA504A76" - { - "Name" = "8:BAPSController2ButtonCode5" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:3" - "Value" = "3:255" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_084FA239F69C47D5886BDB4688FD4C7F" - { - "Name" = "8:ClientConnectionLimit" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:3" - "Value" = "3:10" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_0E102327719B43CDB23A5B8C86B4FE09" - { - "Name" = "8:NiceDirectoryName1" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:1" - "Value" = "8:Beds" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_10F73934FD9C445FB021ABAE4B95CBD2" - { - "Name" = "8:AutoPlay0" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:3" - "Value" = "3:0" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_12B558420AD949DBB9E386333ECD4759" - { - "Name" = "8:BAPSControllerButtonCode4" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:3" - "Value" = "3:5" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_141FC5D2AAEF41F6B9D527BF30B0401E" - { - "Name" = "8:StorePlaybackEvents" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:3" - "Value" = "3:2" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_1520361350A0465C84D738FD5516B125" - { - "Name" = "8:OnlyAllowCleanMusic" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:3" - "Value" = "3:0" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_19D18F64EC2E4A50BC110A358266BD2C" - { - "Name" = "8:AutoAdvance1" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:3" - "Value" = "3:1" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_25A028B886C248EAA7EE72AEF4551856" - { - "Name" = "8:Directory0" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:1" - "Value" = "8:\\\\musicstore\\jingles" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_274D2B08DAB341019626B2826BACA945" - { - "Name" = "8:LibraryDBServer" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:1" - "Value" = "8:dbserver" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_282D1C0D5A8540CAB6EF3D0FB11754A6" - { - "Name" = "8:LibraryDBPort" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:1" - "Value" = "8:5433" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_3298956A298344F3B88481A98384415B" - { - "Name" = "8:NiceDirectoryName0" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:1" - "Value" = "8:Jingles" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_3581FE0558EC47108D1D0AFFF32F8E7B" - { - "Name" = "8:ChannelName2" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:1" - "Value" = "8:Channel 3" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_3647A7D282A945E98BA4ACE66D8A9316" - { - "Name" = "8:BAPSController2ButtonCode4" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:3" - "Value" = "3:255" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_3D83366B202F422EBDEF3BCE3E3D408C" - { - "Name" = "8:AutoPlay1" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:3" - "Value" = "3:0" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_3DBAA2AEB7A646019EC57A460364647B" - { - "Name" = "8:ChannelName0" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:1" - "Value" = "8:Channel 1" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_3E82501599A244079833ED450F413D8E" - { - "Name" = "8:Directory2" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:1" - "Value" = "8:\\\\musicstore\\adverts" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_42F7932CA84C4A32859AC607A7F268A6" - { - "Name" = "8:ServerID" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:1" - "Value" = "8:((URY)) Test" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_498C6DA6A2454C1FA86C53D4E2093AAF" - { - "Name" = "8:SupportAddress" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:1" - "Value" = "8:computing@ury.org.uk" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_4A14550FD9A24228A207EF975D9641EE" - { - "Name" = "8:NiceDirectoryName2" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:1" - "Value" = "8:Adverts" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_4B03062A01C14262B0D323B2456285FF" - { - "Name" = "8:BAPSController2DeviceCount" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:3" - "Value" = "3:1" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_4BDBBBD453FF4299926D472D39EFC4C5" - { - "Name" = "8:Port" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:3" - "Value" = "3:1350" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_4DC6765B1B524076919FCF997F77EAF3" - { - "Name" = "8:AutoAdvance0" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:3" - "Value" = "3:1" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_508B2A175809416BAA3D65B191921B74" - { - "Name" = "8:BAPSPaddleMode" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:3" - "Value" = "3:0" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_50D183A5F0E5461DB5815AA0F11D9162" - { - "Name" = "8:LibraryDBPassword" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:1" - "Value" = "8:dbpass" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_559AAD958EC14D7DBFD17177E9B0EAC0" - { - "Name" = "8:BAPSController2ButtonCode2" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:3" - "Value" = "3:255" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_593321412EF84C5184880A57529112A2" - { - "Name" = "8:BAPSControllerButtonCode3" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:3" - "Value" = "3:4" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_5EE773A4DF514B98ACF560B3DE161260" - { - "Name" = "8:LibraryLocation" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:1" - "Value" = "8:\\\\musicstore\\music\\records" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_65E58BA0F6AB4E6BBFD83DD728E92A45" - { - "Name" = "8:BAPSController2ButtonCode8" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:3" - "Value" = "3:15" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_662595D93168496B8CD26C28C0830205" - { - "Name" = "8:AutoPlay2" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:3" - "Value" = "3:0" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_675991AEFB7745A0BCE994A06323AF9F" - { - "Name" = "8:Device1" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:1" - "Value" = "8:" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_69E9F6A7706B49449EDF11878308CB6E" - { - "Name" = "8:BAPSControllerButtonCode5" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:3" - "Value" = "3:6" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_69FF2150CFF7455FB23D7D927BCEF34D" - { - "Name" = "8:ChannelName1" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:1" - "Value" = "8:Channel 2" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_6C55CF958CB947BD8571B5E78C5034A5" - { - "Name" = "8:SaveIntroPositions" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:3" - "Value" = "3:1" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_6E8152B01B6F4BF99F59738EA0DF65CF" - { - "Name" = "8:Device0" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:1" - "Value" = "8:" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_70A78F3EC01141BE8843957DB45CAF7E" - { - "Name" = "8:BAPSController2Serial0" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:1" - "Value" = "8: " - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_718BC2F216054180A49CC03EE3FA0760" - { - "Name" = "8:BAPSController2ButtonCode1" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:3" - "Value" = "3:255" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_78FE52E4F6984FAE8ABCBC5D84A7BC8D" - { - "Name" = "8:Repeat2" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:3" - "Value" = "3:0" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_83FAD404256044CCA292A6B08ACE9DE0" - { - "Name" = "8:AutoAdvance2" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:3" - "Value" = "3:1" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_8E35EFCB56DE430EA4D53D600390DA3E" - { - "Name" = "8:BAPSController2ButtonCode6" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:3" - "Value" = "3:11" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_91FDB74FFC504795BBD06F46210C2449" - { - "Name" = "8:ChannelCount" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:3" - "Value" = "3:3" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_9305BFD6CE6C45F7BCDB81E3FA3C1024" - { - "Name" = "8:LibraryDBUsername" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:1" - "Value" = "8:dbusername" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_9829F31255B3494393A6956EFBEBC679" - { - "Name" = "8:DirectoryCount" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:3" - "Value" = "3:3" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_9D903F9B5BD84DBC974FDA92B444B5A9" - { - "Name" = "8:ef4c38d0dc11b8792245201b0b8e43fc" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:3" - "Value" = "3:0" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_B49E79C0C9E04EE6B64D70BB82A5D677" - { - "Name" = "8:LibraryDBDatabase" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:1" - "Value" = "8:dbname" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_BB5ED0E1348D4E44861A4008DFF82390" - { - "Name" = "8:Repeat0" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:3" - "Value" = "3:0" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_BE63DAC1A0EA49BD9ABF66D95CF79ED4" - { - "Name" = "8:SMTP Server" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:1" - "Value" = "8:nameorIP" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_C6F51540B1434BC4AA94404CBEDDC895" - { - "Name" = "8:BAPSController2Enabled" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:3" - "Value" = "3:0" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_C72F3B3F8441405C83527C558D00E431" - { - "Name" = "8:MaxQueueConnections" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:3" - "Value" = "3:10" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_C96472676F3B4373AA35029172595318" - { - "Name" = "8:Repeat1" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:3" - "Value" = "3:0" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_CEE84209A0424263B4121B63C755AE4E" - { - "Name" = "8:Device2" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:1" - "Value" = "8:" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_D0FD199A704E427899AE76992A2823A6" - { - "Name" = "8:Directory1" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:1" - "Value" = "8:\\\\musicstore\\beds" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_D6D34E92A72542D2B96BD92AB72BE92B" - { - "Name" = "8:BAPSController2ButtonCode7" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:3" - "Value" = "3:12" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_D824AAB447AC40C2A2DD687FB51BBF70" - { - "Name" = "8:BAPSDBDatabase" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:1" - "Value" = "8:dbname" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_DD34CDC96F554AB6979F634429D5B7D5" - { - "Name" = "8:BAPSControllerButtonCode0" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:3" - "Value" = "3:1" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_DE37B89AC593441E9B5050F3C6B74D83" - { - "Name" = "8:BAPSControllerEnabled" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:3" - "Value" = "3:0" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_DFEC33F89F1C410FA277EE845F1104AC" - { - "Name" = "8:BAPSController2ButtonCode0" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:3" - "Value" = "3:255" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_E0CA6B043E50455692B8C67C5E94E657" - { - "Name" = "8:LogSource" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:1" - "Value" = "8:BAPS" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_E28AB5A0BD134192A32FE8B5F52FA72A" - { - "Name" = "8:BAPSController2ButtonCode3" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:3" - "Value" = "3:255" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_E4903E67B20646BEB5E54F2D852E6194" - { - "Name" = "8:BAPSController2ButtonCount" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:3" - "Value" = "3:9" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_EB1837F5193A4FB4BB6B971F6E3BD5CD" - { - "Name" = "8:LogName" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:1" - "Value" = "8:BAPS Log" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_EFB85120AEFA42589A75895A457DC92D" - { - "Name" = "8:BAPSController2Offset0" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:3" - "Value" = "3:0" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_F16A49267DD54B77A0B87D11C4D2589D" - { - "Name" = "8:BAPSControllerButtonCount" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:3" - "Value" = "3:6" - } - "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_FE16F99D3E24491E915446FDF7AF9803" - { - "Name" = "8:BAPSControllerButtonCode2" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "ValueTypes" = "3:3" - "Value" = "3:3" - } - } - } - } - "Values" - { - } - } - } - "Values" - { - } - } - } - } - "HKCU" - { - "Keys" - { - "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_4B60FE8FCE4A4D22BFDB3F6A14EF05C0" - { - "Name" = "8:Software" - "Condition" = "8:" - "AlwaysCreate" = "11:FALSE" - "DeleteAtUninstall" = "11:FALSE" - "Transitive" = "11:FALSE" - "Keys" - { - "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_7EF27631F91F46A99B6CFEAD0055F3CF" - { - "Name" = "8:[Manufacturer]" - "Condition" = "8:" - "AlwaysCreate" = "11:FALSE" - "DeleteAtUninstall" = "11:FALSE" - "Transitive" = "11:FALSE" - "Keys" - { - } - "Values" - { - } - } - } - "Values" - { - } - } - } - } - "HKCR" - { - "Keys" - { - } - } - "HKU" - { - "Keys" - { - } - } - "HKPU" - { - "Keys" - { - } - } - } - "Sequences" - { - } - "Shortcut" - { - "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_815620B9537E4635966D927C60A97236" - { - "Name" = "8:BAPS Presenter" - "Arguments" = "8:" - "Description" = "8:" - "ShowCmd" = "3:1" - "IconIndex" = "3:0" - "Transitive" = "11:FALSE" - "Target" = "8:_8D19959388A44CB69CA8C6F1C2BE4EDA" - "Folder" = "8:_43A1F3C512FB4E99A77A7046B917D8F0" - "WorkingFolder" = "8:_AA6E4ED00D1542C3AC78BFB908085FED" - "Icon" = "8:" - "Feature" = "8:" - } - "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_BA0D4537C33E4F2F894AE496EC35BF75" - { - "Name" = "8:BAPS Presenter" - "Arguments" = "8:" - "Description" = "8:" - "ShowCmd" = "3:1" - "IconIndex" = "3:0" - "Transitive" = "11:FALSE" - "Target" = "8:_8D19959388A44CB69CA8C6F1C2BE4EDA" - "Folder" = "8:_EB395113D18D4B849F61C8AEE7E29711" - "WorkingFolder" = "8:_AA6E4ED00D1542C3AC78BFB908085FED" - "Icon" = "8:" - "Feature" = "8:" - } - } - "UserInterface" - { - "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_118C5E8DA40D47779490590152C40E9A" - { - "Name" = "8:#1902" - "Sequence" = "3:2" - "Attributes" = "3:3" - "Dialogs" - { - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_1C67BD2255EE4E4C97E1EBA28C011A3B" - { - "Sequence" = "3:100" - "DisplayName" = "8:Finished" - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdAdminFinishedDlg.wid" - "Properties" - { - "BannerBitmap" - { - "Name" = "8:BannerBitmap" - "DisplayName" = "8:#1001" - "Description" = "8:#1101" - "Type" = "3:8" - "ContextData" = "8:Bitmap" - "Attributes" = "3:4" - "Setting" = "3:1" - "UsePlugInResources" = "11:TRUE" - } - } - } - } - } - "{2479F3F5-0309-486D-8047-8187E2CE5BA0}:_229583E115B9492F87006BFF0667FD40" - { - "UseDynamicProperties" = "11:FALSE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdBasicDialogs.wim" - } - "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_26C0F4F4A30642D89CD9D025BF47F6C9" - { - "Name" = "8:#1902" - "Sequence" = "3:1" - "Attributes" = "3:3" - "Dialogs" - { - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_F0EC8538D2A34F6FAA3FE58CC41C6A4D" - { - "Sequence" = "3:100" - "DisplayName" = "8:Finished" - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdFinishedDlg.wid" - "Properties" - { - "BannerBitmap" - { - "Name" = "8:BannerBitmap" - "DisplayName" = "8:#1001" - "Description" = "8:#1101" - "Type" = "3:8" - "ContextData" = "8:Bitmap" - "Attributes" = "3:4" - "Setting" = "3:2" - "Value" = "8:_279D46963AF347829CFBD3C295AA815E" - "UsePlugInResources" = "11:TRUE" - } - "UpdateText" - { - "Name" = "8:UpdateText" - "DisplayName" = "8:#1058" - "Description" = "8:#1158" - "Type" = "3:15" - "ContextData" = "8:" - "Attributes" = "3:0" - "Setting" = "3:1" - "Value" = "8:#1258" - "DefaultValue" = "8:#1258" - "UsePlugInResources" = "11:TRUE" - } - } - } - } - } - "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_2D6F7740A8BC43FDADA3418D19050C12" - { - "Name" = "8:#1900" - "Sequence" = "3:2" - "Attributes" = "3:1" - "Dialogs" - { - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_23ADE183D22041B290579228E94DC88C" - { - "Sequence" = "3:100" - "DisplayName" = "8:Welcome" - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdAdminWelcomeDlg.wid" - "Properties" - { - "BannerBitmap" - { - "Name" = "8:BannerBitmap" - "DisplayName" = "8:#1001" - "Description" = "8:#1101" - "Type" = "3:8" - "ContextData" = "8:Bitmap" - "Attributes" = "3:4" - "Setting" = "3:1" - "UsePlugInResources" = "11:TRUE" - } - "CopyrightWarning" - { - "Name" = "8:CopyrightWarning" - "DisplayName" = "8:#1002" - "Description" = "8:#1102" - "Type" = "3:3" - "ContextData" = "8:" - "Attributes" = "3:0" - "Setting" = "3:1" - "Value" = "8:#1202" - "DefaultValue" = "8:#1202" - "UsePlugInResources" = "11:TRUE" - } - "Welcome" - { - "Name" = "8:Welcome" - "DisplayName" = "8:#1003" - "Description" = "8:#1103" - "Type" = "3:3" - "ContextData" = "8:" - "Attributes" = "3:0" - "Setting" = "3:1" - "Value" = "8:#1203" - "DefaultValue" = "8:#1203" - "UsePlugInResources" = "11:TRUE" - } - } - } - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_90F25AC9967C46A380CEE5D1B414D2F2" - { - "Sequence" = "3:200" - "DisplayName" = "8:Installation Folder" - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdAdminFolderDlg.wid" - "Properties" - { - "BannerBitmap" - { - "Name" = "8:BannerBitmap" - "DisplayName" = "8:#1001" - "Description" = "8:#1101" - "Type" = "3:8" - "ContextData" = "8:Bitmap" - "Attributes" = "3:4" - "Setting" = "3:1" - "UsePlugInResources" = "11:TRUE" - } - } - } - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_9788125504B24018917D52F4D997C25F" - { - "Sequence" = "3:300" - "DisplayName" = "8:Confirm Installation" - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdAdminConfirmDlg.wid" - "Properties" - { - "BannerBitmap" - { - "Name" = "8:BannerBitmap" - "DisplayName" = "8:#1001" - "Description" = "8:#1101" - "Type" = "3:8" - "ContextData" = "8:Bitmap" - "Attributes" = "3:4" - "Setting" = "3:1" - "UsePlugInResources" = "11:TRUE" - } - } - } - } - } - "{2479F3F5-0309-486D-8047-8187E2CE5BA0}:_8A2BBEA5EA134403BC5ED8BD8F5BAAB1" - { - "UseDynamicProperties" = "11:FALSE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdUserInterface.wim" - } - "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_97EB13C31ADF49E481E26EE3D8B8108C" - { - "Name" = "8:#1901" - "Sequence" = "3:1" - "Attributes" = "3:2" - "Dialogs" - { - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_06E280DD9FC44FAE98DFD124DAF85382" - { - "Sequence" = "3:100" - "DisplayName" = "8:Progress" - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdProgressDlg.wid" - "Properties" - { - "BannerBitmap" - { - "Name" = "8:BannerBitmap" - "DisplayName" = "8:#1001" - "Description" = "8:#1101" - "Type" = "3:8" - "ContextData" = "8:Bitmap" - "Attributes" = "3:4" - "Setting" = "3:2" - "Value" = "8:_279D46963AF347829CFBD3C295AA815E" - "UsePlugInResources" = "11:TRUE" - } - "ShowProgress" - { - "Name" = "8:ShowProgress" - "DisplayName" = "8:#1009" - "Description" = "8:#1109" - "Type" = "3:5" - "ContextData" = "8:1;True=1;False=0" - "Attributes" = "3:0" - "Setting" = "3:0" - "Value" = "3:1" - "DefaultValue" = "3:1" - "UsePlugInResources" = "11:TRUE" - } - } - } - } - } - "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_A1B2AA132DF54A549EAFA1D85B061AEB" - { - "Name" = "8:#1900" - "Sequence" = "3:1" - "Attributes" = "3:1" - "Dialogs" - { - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_4D3D456376BF4338A0A1F7E1C305DA0C" - { - "Sequence" = "3:100" - "DisplayName" = "8:Welcome" - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdWelcomeDlg.wid" - "Properties" - { - "BannerBitmap" - { - "Name" = "8:BannerBitmap" - "DisplayName" = "8:#1001" - "Description" = "8:#1101" - "Type" = "3:8" - "ContextData" = "8:Bitmap" - "Attributes" = "3:4" - "Setting" = "3:2" - "Value" = "8:_279D46963AF347829CFBD3C295AA815E" - "UsePlugInResources" = "11:TRUE" - } - "CopyrightWarning" - { - "Name" = "8:CopyrightWarning" - "DisplayName" = "8:#1002" - "Description" = "8:#1102" - "Type" = "3:3" - "ContextData" = "8:" - "Attributes" = "3:0" - "Setting" = "3:1" - "Value" = "8:#1202" - "DefaultValue" = "8:#1202" - "UsePlugInResources" = "11:TRUE" - } - "Welcome" - { - "Name" = "8:Welcome" - "DisplayName" = "8:#1003" - "Description" = "8:#1103" - "Type" = "3:3" - "ContextData" = "8:" - "Attributes" = "3:0" - "Setting" = "3:2" - "Value" = "8:The installer will guide you through the steps required to install [ProductName] on your computer." - "DefaultValue" = "8:#1203" - "UsePlugInResources" = "11:TRUE" - } - } - } - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_5AD6D75903D045419F0B9812307D6312" - { - "Sequence" = "3:300" - "DisplayName" = "8:Confirm Installation" - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdConfirmDlg.wid" - "Properties" - { - "BannerBitmap" - { - "Name" = "8:BannerBitmap" - "DisplayName" = "8:#1001" - "Description" = "8:#1101" - "Type" = "3:8" - "ContextData" = "8:Bitmap" - "Attributes" = "3:4" - "Setting" = "3:2" - "Value" = "8:_279D46963AF347829CFBD3C295AA815E" - "UsePlugInResources" = "11:TRUE" - } - } - } - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_A72A90C22E8E42EFBF600AD4B894FBF0" - { - "Sequence" = "3:200" - "DisplayName" = "8:Installation Folder" - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdFolderDlg.wid" - "Properties" - { - "BannerBitmap" - { - "Name" = "8:BannerBitmap" - "DisplayName" = "8:#1001" - "Description" = "8:#1101" - "Type" = "3:8" - "ContextData" = "8:Bitmap" - "Attributes" = "3:4" - "Setting" = "3:2" - "Value" = "8:_279D46963AF347829CFBD3C295AA815E" - "UsePlugInResources" = "11:TRUE" - } - "InstallAllUsersVisible" - { - "Name" = "8:InstallAllUsersVisible" - "DisplayName" = "8:#1059" - "Description" = "8:#1159" - "Type" = "3:5" - "ContextData" = "8:1;True=1;False=0" - "Attributes" = "3:0" - "Setting" = "3:0" - "Value" = "3:1" - "DefaultValue" = "3:1" - "UsePlugInResources" = "11:TRUE" - } - } - } - } - } - "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_D0E00A22691049A685F44762544140AA" - { - "Name" = "8:#1901" - "Sequence" = "3:2" - "Attributes" = "3:2" - "Dialogs" - { - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_0F9763BE0EF4461BA30DA70ADC7977E9" - { - "Sequence" = "3:100" - "DisplayName" = "8:Progress" - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdAdminProgressDlg.wid" - "Properties" - { - "BannerBitmap" - { - "Name" = "8:BannerBitmap" - "DisplayName" = "8:#1001" - "Description" = "8:#1101" - "Type" = "3:8" - "ContextData" = "8:Bitmap" - "Attributes" = "3:4" - "Setting" = "3:1" - "UsePlugInResources" = "11:TRUE" - } - "ShowProgress" - { - "Name" = "8:ShowProgress" - "DisplayName" = "8:#1009" - "Description" = "8:#1109" - "Type" = "3:5" - "ContextData" = "8:1;True=1;False=0" - "Attributes" = "3:0" - "Setting" = "3:0" - "Value" = "3:1" - "DefaultValue" = "3:1" - "UsePlugInResources" = "11:TRUE" - } - } - } - } - } - } - "MergeModule" - { - } - "ProjectOutput" - { - "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_26103AD9283340DA94969F4882FB2A13" - { - "SourcePath" = "8:" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_7A85486C51C04458844B26DD5BBC80B0" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - "ProjectOutputGroupRegister" = "3:1" - "OutputConfiguration" = "8:" - "OutputGroupCanonicalName" = "8:Documentation" - "OutputProjectGuid" = "8:{4C3D1722-7B93-4081-8D61-572F8F088CED}" - "ShowKeyOutput" = "11:TRUE" - "ExcludeFilters" - { - } - } - "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_316226F94C8543899B8445A98A7C0946" - { - "SourcePath" = "8:..\\BAPSServerService\\obj\\x86\\Debug\\BAPSServerService.exe" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_AA6E4ED00D1542C3AC78BFB908085FED" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - "ProjectOutputGroupRegister" = "3:1" - "OutputConfiguration" = "8:" - "OutputGroupCanonicalName" = "8:Built" - "OutputProjectGuid" = "8:{A19900A2-8C8B-416A-8642-7F20CB9CA145}" - "ShowKeyOutput" = "11:TRUE" - "ExcludeFilters" - { - } - } - "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_5377AB4A1E064C4590FCF306C2AF17B3" - { - "SourcePath" = "8:..\\BAPSFormControls\\obj\\x86\\Debug\\BAPSFormControls.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_AA6E4ED00D1542C3AC78BFB908085FED" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - "ProjectOutputGroupRegister" = "3:1" - "OutputConfiguration" = "8:" - "OutputGroupCanonicalName" = "8:Built" - "OutputProjectGuid" = "8:{4C3D1722-7B93-4081-8D61-572F8F088CED}" - "ShowKeyOutput" = "11:TRUE" - "ExcludeFilters" - { - } - } - "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_5576626F84BB40838D5F1ABFD3EEA739" - { - "SourcePath" = "8:..\\BAPSlib\\Win32\\Debug\\BAPS.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_AA6E4ED00D1542C3AC78BFB908085FED" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - "ProjectOutputGroupRegister" = "3:1" - "OutputConfiguration" = "8:" - "OutputGroupCanonicalName" = "8:Built" - "OutputProjectGuid" = "8:{2EAB373E-2054-4AB5-A2F9-34139FB08AE4}" - "ShowKeyOutput" = "11:TRUE" - "ExcludeFilters" - { - } - } - "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_73005F2EA8E74A8C87711792AFF08DC9" - { - "SourcePath" = "8:" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_7A85486C51C04458844B26DD5BBC80B0" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - "ProjectOutputGroupRegister" = "3:1" - "OutputConfiguration" = "8:" - "OutputGroupCanonicalName" = "8:Documentation" - "OutputProjectGuid" = "8:{46FD9397-DD3B-456A-9D95-504D60F6A9B5}" - "ShowKeyOutput" = "11:TRUE" - "ExcludeFilters" - { - } - } - "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_82105C046FE744EFADDC88F49143DF37" - { - "SourcePath" = "8:..\\Win32\\Debug\\BAPSServerAssembly.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_AA6E4ED00D1542C3AC78BFB908085FED" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - "ProjectOutputGroupRegister" = "3:1" - "OutputConfiguration" = "8:" - "OutputGroupCanonicalName" = "8:Built" - "OutputProjectGuid" = "8:{B93BB821-0BB3-466C-9D53-7FECF8722F1D}" - "ShowKeyOutput" = "11:TRUE" - "ExcludeFilters" - { - } - } - "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_8D19959388A44CB69CA8C6F1C2BE4EDA" - { - "SourcePath" = "8:..\\BAPSPresenter\\Win32\\Debug\\BAPSPresenter.exe" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_AA6E4ED00D1542C3AC78BFB908085FED" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - "ProjectOutputGroupRegister" = "3:1" - "OutputConfiguration" = "8:" - "OutputGroupCanonicalName" = "8:Built" - "OutputProjectGuid" = "8:{46FD9397-DD3B-456A-9D95-504D60F6A9B5}" - "ShowKeyOutput" = "11:TRUE" - "ExcludeFilters" - { - } - } - "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_9B4F22B9F3E24A6F984F653782E30AE3" - { - "SourcePath" = "8:" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_7A85486C51C04458844B26DD5BBC80B0" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - "ProjectOutputGroupRegister" = "3:1" - "OutputConfiguration" = "8:" - "OutputGroupCanonicalName" = "8:Documentation" - "OutputProjectGuid" = "8:{2EAB373E-2054-4AB5-A2F9-34139FB08AE4}" - "ShowKeyOutput" = "11:TRUE" - "ExcludeFilters" - { - } - } - "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_AD625BB6FF5F43ACA2A45300645E68CF" - { - "SourcePath" = "8:" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_7A85486C51C04458844B26DD5BBC80B0" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - "ProjectOutputGroupRegister" = "3:1" - "OutputConfiguration" = "8:" - "OutputGroupCanonicalName" = "8:Documentation" - "OutputProjectGuid" = "8:{A19900A2-8C8B-416A-8642-7F20CB9CA145}" - "ShowKeyOutput" = "11:TRUE" - "ExcludeFilters" - { - } - } - } - } -} +"DeployProject" +{ +"VSVersion" = "3:800" +"ProjectType" = "8:{978C614F-708E-4E1A-B201-565925725DBA}" +"IsWebType" = "8:FALSE" +"ProjectName" = "8:BAPSSetupV2" +"LanguageId" = "3:1033" +"CodePage" = "3:1252" +"UILanguageId" = "3:1033" +"SccProjectName" = "8:" +"SccLocalPath" = "8:" +"SccAuxPath" = "8:" +"SccProvider" = "8:" + "Hierarchy" + { + "Entry" + { + "MsmKey" = "8:_279D46963AF347829CFBD3C295AA815E" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_316226F94C8543899B8445A98A7C0946" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_5377AB4A1E064C4590FCF306C2AF17B3" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_5576626F84BB40838D5F1ABFD3EEA739" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_6D3FBA1DCC31457398F77F2A76F910C9" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_82105C046FE744EFADDC88F49143DF37" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_821508F3154B18B3E7CA0A40A9192D97" + "OwnerKey" = "8:_C8CDCB357940659FF9FC506F1906BF27" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_821508F3154B18B3E7CA0A40A9192D97" + "OwnerKey" = "8:_316226F94C8543899B8445A98A7C0946" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_821508F3154B18B3E7CA0A40A9192D97" + "OwnerKey" = "8:_BFFCBF89C39ADAE120595D50074E2B38" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_89DE8D6EA5D407F64A7C948641ED064F" + "OwnerKey" = "8:_CB5FE0ED31759AB3E1A711CF592F7C2D" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_8D19959388A44CB69CA8C6F1C2BE4EDA" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_9608DF056FD742EBADA8C6B2316FFE36" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_B7A379FA4EE24FD10FC4F793AA666E09" + "OwnerKey" = "8:_316226F94C8543899B8445A98A7C0946" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_B7A379FA4EE24FD10FC4F793AA666E09" + "OwnerKey" = "8:_C8CDCB357940659FF9FC506F1906BF27" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_BFFCBF89C39ADAE120595D50074E2B38" + "OwnerKey" = "8:_C8CDCB357940659FF9FC506F1906BF27" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_BFFCBF89C39ADAE120595D50074E2B38" + "OwnerKey" = "8:_316226F94C8543899B8445A98A7C0946" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_C8CDCB357940659FF9FC506F1906BF27" + "OwnerKey" = "8:_316226F94C8543899B8445A98A7C0946" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_CA761FCA4DD442F0A4D28667C01C0EE1" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_CB5FE0ED31759AB3E1A711CF592F7C2D" + "OwnerKey" = "8:_316226F94C8543899B8445A98A7C0946" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_D8C012D7671941BFABEA737AEEE095FC" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_5377AB4A1E064C4590FCF306C2AF17B3" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_316226F94C8543899B8445A98A7C0946" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_C8CDCB357940659FF9FC506F1906BF27" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_BFFCBF89C39ADAE120595D50074E2B38" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_821508F3154B18B3E7CA0A40A9192D97" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_B7A379FA4EE24FD10FC4F793AA666E09" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_CB5FE0ED31759AB3E1A711CF592F7C2D" + "MsmSig" = "8:_UNDEFINED" + } + } + "Configurations" + { + "Debug" + { + "DisplayName" = "8:Debug" + "IsDebugOnly" = "11:TRUE" + "IsReleaseOnly" = "11:FALSE" + "OutputFilename" = "8:Debug\\BAPSSetupV2.msi" + "PackageFilesAs" = "3:2" + "PackageFileSize" = "3:-2147483648" + "CabType" = "3:1" + "Compression" = "3:2" + "SignOutput" = "11:FALSE" + "CertificateFile" = "8:" + "PrivateKeyFile" = "8:" + "TimeStampServer" = "8:" + "InstallerBootstrapper" = "3:2" + "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}" + { + "Enabled" = "11:TRUE" + "PromptEnabled" = "11:TRUE" + "PrerequisitesLocation" = "2:1" + "Url" = "8:" + "ComponentsUrl" = "8:" + "Items" + { + "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.6.1" + { + "Name" = "8:Microsoft .NET Framework 4.6.1 (x86 and x64)" + "ProductCode" = "8:.NETFramework,Version=v4.6.1" + } + } + } + } + "Release" + { + "DisplayName" = "8:Release" + "IsDebugOnly" = "11:FALSE" + "IsReleaseOnly" = "11:TRUE" + "OutputFilename" = "8:Release\\BAPSSetupV2.msi" + "PackageFilesAs" = "3:2" + "PackageFileSize" = "3:-2147483648" + "CabType" = "3:1" + "Compression" = "3:2" + "SignOutput" = "11:FALSE" + "CertificateFile" = "8:" + "PrivateKeyFile" = "8:" + "TimeStampServer" = "8:" + "InstallerBootstrapper" = "3:2" + "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}" + { + "Enabled" = "11:TRUE" + "PromptEnabled" = "11:TRUE" + "PrerequisitesLocation" = "2:1" + "Url" = "8:" + "ComponentsUrl" = "8:" + "Items" + { + "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.6.1" + { + "Name" = "8:Microsoft .NET Framework 4.6.1 (x86 and x64)" + "ProductCode" = "8:.NETFramework,Version=v4.6.1" + } + } + } + } + } + "Deployable" + { + "CustomAction" + { + "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_66050A16F10A471C95C6208AE114DDF3" + { + "Name" = "8:Primary output from BAPSServerService (Active)" + "Condition" = "8:" + "Object" = "8:_316226F94C8543899B8445A98A7C0946" + "FileType" = "3:2" + "InstallAction" = "3:1" + "Arguments" = "8:" + "EntryPoint" = "8:" + "Sequence" = "3:1" + "Identifier" = "8:_4245443A_21D7_4808_A869_93253B51E268" + "InstallerClass" = "11:TRUE" + "CustomActionData" = "8:" + } + "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_7B1A980AFBEC48FF8C42FB88DD368D84" + { + "Name" = "8:Primary output from BAPSServerService (Active)" + "Condition" = "8:" + "Object" = "8:_316226F94C8543899B8445A98A7C0946" + "FileType" = "3:2" + "InstallAction" = "3:3" + "Arguments" = "8:" + "EntryPoint" = "8:" + "Sequence" = "3:1" + "Identifier" = "8:_B1353B26_1265_4501_B24D_9BDD3D6929FD" + "InstallerClass" = "11:TRUE" + "CustomActionData" = "8:" + } + "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_CC3F4ABFF95D420CA5C802AA1B0E06CD" + { + "Name" = "8:Primary output from BAPSServerService (Active)" + "Condition" = "8:" + "Object" = "8:_316226F94C8543899B8445A98A7C0946" + "FileType" = "3:2" + "InstallAction" = "3:2" + "Arguments" = "8:" + "EntryPoint" = "8:" + "Sequence" = "3:1" + "Identifier" = "8:_22112535_00B4_43DC_AA49_A267F1D831B5" + "InstallerClass" = "11:TRUE" + "CustomActionData" = "8:" + } + "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_FB55FF1CB80043D89616D2978CC40983" + { + "Name" = "8:Primary output from BAPSServerService (Active)" + "Condition" = "8:" + "Object" = "8:_316226F94C8543899B8445A98A7C0946" + "FileType" = "3:2" + "InstallAction" = "3:4" + "Arguments" = "8:" + "EntryPoint" = "8:" + "Sequence" = "3:1" + "Identifier" = "8:_388856D8_93BC_46A4_B032_66270DF550BB" + "InstallerClass" = "11:TRUE" + "CustomActionData" = "8:" + } + } + "DefaultFeature" + { + "Name" = "8:DefaultFeature" + "Title" = "8:" + "Description" = "8:" + } + "ExternalPersistence" + { + "LaunchCondition" + { + "{A06ECF26-33A3-4562-8140-9B0E340D4F24}:_90DA046AA3854D79927664BE00DD0EAF" + { + "Name" = "8:.NET Framework" + "Message" = "8:[VSDNETMSG]" + "FrameworkVersion" = "8:.NETFramework,Version=v4.0" + "AllowLaterVersions" = "11:FALSE" + "InstallUrl" = "8:http://go.microsoft.com/fwlink/?LinkId=671728" + } + } + } + "File" + { + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_279D46963AF347829CFBD3C295AA815E" + { + "SourcePath" = "8:header-logo.bmp" + "TargetName" = "8:header-logo.bmp" + "Tag" = "8:" + "Folder" = "8:_AA6E4ED00D1542C3AC78BFB908085FED" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:TRUE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6D3FBA1DCC31457398F77F2A76F910C9" + { + "SourcePath" = "8:..\\BAPSPresenter\\app.ico" + "TargetName" = "8:app.ico" + "Tag" = "8:" + "Folder" = "8:_AA6E4ED00D1542C3AC78BFB908085FED" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_821508F3154B18B3E7CA0A40A9192D97" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Mono.Security, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_821508F3154B18B3E7CA0A40A9192D97" + { + "Name" = "8:Mono.Security.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:Mono.Security.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_AA6E4ED00D1542C3AC78BFB908085FED" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_89DE8D6EA5D407F64A7C948641ED064F" + { + "SourcePath" = "8:sapi.dll" + "TargetName" = "8:sapi.dll" + "Tag" = "8:" + "Folder" = "8:_AA6E4ED00D1542C3AC78BFB908085FED" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9608DF056FD742EBADA8C6B2316FFE36" + { + "SourcePath" = "8:..\\help\\BAPSPresenterHelp.chm" + "TargetName" = "8:BAPSPresenterHelp.chm" + "Tag" = "8:" + "Folder" = "8:_7A85486C51C04458844B26DD5BBC80B0" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_B7A379FA4EE24FD10FC4F793AA666E09" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:BAPSControllerAssembly, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86" + "ScatterAssemblies" + { + "_B7A379FA4EE24FD10FC4F793AA666E09" + { + "Name" = "8:BAPSControllerAssembly.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:BAPSControllerAssembly.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_AA6E4ED00D1542C3AC78BFB908085FED" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_BFFCBF89C39ADAE120595D50074E2B38" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Npgsql, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_BFFCBF89C39ADAE120595D50074E2B38" + { + "Name" = "8:Npgsql.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:Npgsql.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_AA6E4ED00D1542C3AC78BFB908085FED" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_C8CDCB357940659FF9FC506F1906BF27" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:BAPSServerAssembly, Version=2.7.0.0, Culture=neutral, processorArchitecture=x86" + "ScatterAssemblies" + { + "_C8CDCB357940659FF9FC506F1906BF27" + { + "Name" = "8:BAPSServerAssembly.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:BAPSServerAssembly.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_AA6E4ED00D1542C3AC78BFB908085FED" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CA761FCA4DD442F0A4D28667C01C0EE1" + { + "SourcePath" = "8:..\\Common\\USBm.dll" + "TargetName" = "8:USBm.dll" + "Tag" = "8:" + "Folder" = "8:_AA6E4ED00D1542C3AC78BFB908085FED" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_CB5FE0ED31759AB3E1A711CF592F7C2D" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Interop.SpeechLib, Version=5.4.0.0, Culture=neutral, processorArchitecture=x86" + "ScatterAssemblies" + { + "_CB5FE0ED31759AB3E1A711CF592F7C2D" + { + "Name" = "8:Interop.SpeechLib.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:Interop.SpeechLib.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_AA6E4ED00D1542C3AC78BFB908085FED" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_D8C012D7671941BFABEA737AEEE095FC" + { + "SourcePath" = "8:..\\BAPSServerService\\serverstate.xml" + "TargetName" = "8:serverstate.xml" + "Tag" = "8:" + "Folder" = "8:_AA6E4ED00D1542C3AC78BFB908085FED" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + } + "FileType" + { + } + "Folder" + { + "{1525181F-901A-416C-8A58-119130FE478E}:_43A1F3C512FB4E99A77A7046B917D8F0" + { + "Name" = "8:#1916" + "AlwaysCreate" = "11:FALSE" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Property" = "8:DesktopFolder" + "Folders" + { + } + } + "{3C67513D-01DD-4637-8A68-80971EB9504F}:_AA6E4ED00D1542C3AC78BFB908085FED" + { + "DefaultLocation" = "8:[ProgramFilesFolder][Manufacturer]\\[ProductName]" + "Name" = "8:#1925" + "AlwaysCreate" = "11:FALSE" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Property" = "8:TARGETDIR" + "Folders" + { + "{9EF0B969-E518-4E46-987F-47570745A589}:_7A85486C51C04458844B26DD5BBC80B0" + { + "Name" = "8:Help" + "AlwaysCreate" = "11:FALSE" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Property" = "8:_E8DFEC2F07544905823A179CFBCE8D8F" + "Folders" + { + } + } + } + } + "{1525181F-901A-416C-8A58-119130FE478E}:_EB395113D18D4B849F61C8AEE7E29711" + { + "Name" = "8:#1919" + "AlwaysCreate" = "11:FALSE" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Property" = "8:ProgramMenuFolder" + "Folders" + { + } + } + } + "LaunchCondition" + { + } + "Locator" + { + } + "MsiBootstrapper" + { + "LangId" = "3:1033" + "RequiresElevation" = "11:FALSE" + } + "Product" + { + "Name" = "8:Microsoft Visual Studio" + "ProductName" = "8:BAPS2" + "ProductCode" = "8:{32284CF2-2D92-4F7E-972B-83F474EBD89E}" + "PackageCode" = "8:{79181A39-1A0B-431B-BD01-093CBCCC4983}" + "UpgradeCode" = "8:{CA0D6999-E3B1-4ACC-86AC-FAB85E211A57}" + "AspNetVersion" = "8:4.0.30319.0" + "RestartWWWService" = "11:FALSE" + "RemovePreviousVersions" = "11:TRUE" + "DetectNewerInstalledVersion" = "11:TRUE" + "InstallAllUsers" = "11:TRUE" + "ProductVersion" = "8:2.7.0" + "Manufacturer" = "8:URY" + "ARPHELPTELEPHONE" = "8:" + "ARPHELPLINK" = "8:https://github.com/UniversityRadioYork/BAPS2/" + "Title" = "8:BAPS Setup Installer" + "Subject" = "8:" + "ARPCONTACT" = "8:University Radio York" + "Keywords" = "8:" + "ARPCOMMENTS" = "8:" + "ARPURLINFOABOUT" = "8:https://ury.org.uk/" + "ARPPRODUCTICON" = "8:_6D3FBA1DCC31457398F77F2A76F910C9" + "ARPIconIndex" = "3:0" + "SearchPath" = "8:" + "UseSystemSearchPath" = "11:TRUE" + "TargetPlatform" = "3:0" + "PreBuildEvent" = "8:" + "PostBuildEvent" = "8:" + "RunPostBuildEvent" = "3:0" + } + "Registry" + { + "HKLM" + { + "Keys" + { + "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_970B24A0051F4DC9ABE58486EB3953AC" + { + "Name" = "8:Software" + "Condition" = "8:" + "AlwaysCreate" = "11:FALSE" + "DeleteAtUninstall" = "11:FALSE" + "Transitive" = "11:FALSE" + "Keys" + { + "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_89BB68442EF44D5EB4CF84FA70A6848C" + { + "Name" = "8:URY" + "Condition" = "8:" + "AlwaysCreate" = "11:FALSE" + "DeleteAtUninstall" = "11:FALSE" + "Transitive" = "11:FALSE" + "Keys" + { + "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_78BC70F574D048AE9F246407EC0EBA0E" + { + "Name" = "8:BAPS" + "Condition" = "8:" + "AlwaysCreate" = "11:FALSE" + "DeleteAtUninstall" = "11:FALSE" + "Transitive" = "11:FALSE" + "Keys" + { + } + "Values" + { + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_07095DF9EFE54AD58D9A3E9284B71BD6" + { + "Name" = "8:BAPSControllerButtonCode1" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:2" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_07417F57E9324F8C94AB57B7CA504A76" + { + "Name" = "8:BAPSController2ButtonCode5" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:255" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_084FA239F69C47D5886BDB4688FD4C7F" + { + "Name" = "8:ClientConnectionLimit" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:10" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_0E102327719B43CDB23A5B8C86B4FE09" + { + "Name" = "8:NiceDirectoryName1" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:1" + "Value" = "8:Beds" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_10F73934FD9C445FB021ABAE4B95CBD2" + { + "Name" = "8:AutoPlay0" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:0" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_12B558420AD949DBB9E386333ECD4759" + { + "Name" = "8:BAPSControllerButtonCode4" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:5" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_141FC5D2AAEF41F6B9D527BF30B0401E" + { + "Name" = "8:StorePlaybackEvents" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:2" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_1520361350A0465C84D738FD5516B125" + { + "Name" = "8:OnlyAllowCleanMusic" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:0" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_19D18F64EC2E4A50BC110A358266BD2C" + { + "Name" = "8:AutoAdvance1" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:1" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_25A028B886C248EAA7EE72AEF4551856" + { + "Name" = "8:Directory0" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:1" + "Value" = "8:\\\\musicstore\\jingles" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_274D2B08DAB341019626B2826BACA945" + { + "Name" = "8:LibraryDBServer" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:1" + "Value" = "8:dbserver" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_282D1C0D5A8540CAB6EF3D0FB11754A6" + { + "Name" = "8:LibraryDBPort" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:1" + "Value" = "8:5433" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_3298956A298344F3B88481A98384415B" + { + "Name" = "8:NiceDirectoryName0" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:1" + "Value" = "8:Jingles" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_3581FE0558EC47108D1D0AFFF32F8E7B" + { + "Name" = "8:ChannelName2" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:1" + "Value" = "8:Channel 3" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_3647A7D282A945E98BA4ACE66D8A9316" + { + "Name" = "8:BAPSController2ButtonCode4" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:255" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_3D83366B202F422EBDEF3BCE3E3D408C" + { + "Name" = "8:AutoPlay1" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:0" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_3DBAA2AEB7A646019EC57A460364647B" + { + "Name" = "8:ChannelName0" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:1" + "Value" = "8:Channel 1" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_3E82501599A244079833ED450F413D8E" + { + "Name" = "8:Directory2" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:1" + "Value" = "8:\\\\musicstore\\adverts" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_42F7932CA84C4A32859AC607A7F268A6" + { + "Name" = "8:ServerID" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:1" + "Value" = "8:((URY)) Test" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_498C6DA6A2454C1FA86C53D4E2093AAF" + { + "Name" = "8:SupportAddress" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:1" + "Value" = "8:computing@ury.org.uk" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_4A14550FD9A24228A207EF975D9641EE" + { + "Name" = "8:NiceDirectoryName2" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:1" + "Value" = "8:Adverts" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_4B03062A01C14262B0D323B2456285FF" + { + "Name" = "8:BAPSController2DeviceCount" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:1" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_4BDBBBD453FF4299926D472D39EFC4C5" + { + "Name" = "8:Port" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:1350" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_4DC6765B1B524076919FCF997F77EAF3" + { + "Name" = "8:AutoAdvance0" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:1" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_508B2A175809416BAA3D65B191921B74" + { + "Name" = "8:BAPSPaddleMode" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:0" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_50D183A5F0E5461DB5815AA0F11D9162" + { + "Name" = "8:LibraryDBPassword" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:1" + "Value" = "8:dbpass" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_559AAD958EC14D7DBFD17177E9B0EAC0" + { + "Name" = "8:BAPSController2ButtonCode2" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:255" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_593321412EF84C5184880A57529112A2" + { + "Name" = "8:BAPSControllerButtonCode3" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:4" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_5EE773A4DF514B98ACF560B3DE161260" + { + "Name" = "8:LibraryLocation" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:1" + "Value" = "8:\\\\musicstore\\music\\records" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_65E58BA0F6AB4E6BBFD83DD728E92A45" + { + "Name" = "8:BAPSController2ButtonCode8" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:15" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_662595D93168496B8CD26C28C0830205" + { + "Name" = "8:AutoPlay2" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:0" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_675991AEFB7745A0BCE994A06323AF9F" + { + "Name" = "8:Device1" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:1" + "Value" = "8:" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_69E9F6A7706B49449EDF11878308CB6E" + { + "Name" = "8:BAPSControllerButtonCode5" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:6" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_69FF2150CFF7455FB23D7D927BCEF34D" + { + "Name" = "8:ChannelName1" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:1" + "Value" = "8:Channel 2" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_6C55CF958CB947BD8571B5E78C5034A5" + { + "Name" = "8:SaveIntroPositions" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:1" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_6E8152B01B6F4BF99F59738EA0DF65CF" + { + "Name" = "8:Device0" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:1" + "Value" = "8:" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_70A78F3EC01141BE8843957DB45CAF7E" + { + "Name" = "8:BAPSController2Serial0" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:1" + "Value" = "8: " + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_718BC2F216054180A49CC03EE3FA0760" + { + "Name" = "8:BAPSController2ButtonCode1" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:255" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_78FE52E4F6984FAE8ABCBC5D84A7BC8D" + { + "Name" = "8:Repeat2" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:0" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_83FAD404256044CCA292A6B08ACE9DE0" + { + "Name" = "8:AutoAdvance2" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:1" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_8E35EFCB56DE430EA4D53D600390DA3E" + { + "Name" = "8:BAPSController2ButtonCode6" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:11" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_91FDB74FFC504795BBD06F46210C2449" + { + "Name" = "8:ChannelCount" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:3" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_9305BFD6CE6C45F7BCDB81E3FA3C1024" + { + "Name" = "8:LibraryDBUsername" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:1" + "Value" = "8:dbusername" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_9829F31255B3494393A6956EFBEBC679" + { + "Name" = "8:DirectoryCount" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:3" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_9D903F9B5BD84DBC974FDA92B444B5A9" + { + "Name" = "8:ef4c38d0dc11b8792245201b0b8e43fc" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:0" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_B49E79C0C9E04EE6B64D70BB82A5D677" + { + "Name" = "8:LibraryDBDatabase" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:1" + "Value" = "8:dbname" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_BB5ED0E1348D4E44861A4008DFF82390" + { + "Name" = "8:Repeat0" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:0" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_BE63DAC1A0EA49BD9ABF66D95CF79ED4" + { + "Name" = "8:SMTP Server" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:1" + "Value" = "8:nameorIP" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_C6F51540B1434BC4AA94404CBEDDC895" + { + "Name" = "8:BAPSController2Enabled" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:0" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_C72F3B3F8441405C83527C558D00E431" + { + "Name" = "8:MaxQueueConnections" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:10" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_C96472676F3B4373AA35029172595318" + { + "Name" = "8:Repeat1" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:0" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_CEE84209A0424263B4121B63C755AE4E" + { + "Name" = "8:Device2" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:1" + "Value" = "8:" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_D0FD199A704E427899AE76992A2823A6" + { + "Name" = "8:Directory1" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:1" + "Value" = "8:\\\\musicstore\\beds" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_D6D34E92A72542D2B96BD92AB72BE92B" + { + "Name" = "8:BAPSController2ButtonCode7" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:12" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_D824AAB447AC40C2A2DD687FB51BBF70" + { + "Name" = "8:BAPSDBDatabase" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:1" + "Value" = "8:dbname" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_DD34CDC96F554AB6979F634429D5B7D5" + { + "Name" = "8:BAPSControllerButtonCode0" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:1" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_DE37B89AC593441E9B5050F3C6B74D83" + { + "Name" = "8:BAPSControllerEnabled" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:0" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_DFEC33F89F1C410FA277EE845F1104AC" + { + "Name" = "8:BAPSController2ButtonCode0" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:255" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_E0CA6B043E50455692B8C67C5E94E657" + { + "Name" = "8:LogSource" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:1" + "Value" = "8:BAPS" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_E28AB5A0BD134192A32FE8B5F52FA72A" + { + "Name" = "8:BAPSController2ButtonCode3" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:255" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_E4903E67B20646BEB5E54F2D852E6194" + { + "Name" = "8:BAPSController2ButtonCount" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:9" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_EB1837F5193A4FB4BB6B971F6E3BD5CD" + { + "Name" = "8:LogName" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:1" + "Value" = "8:BAPS Log" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_EFB85120AEFA42589A75895A457DC92D" + { + "Name" = "8:BAPSController2Offset0" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:0" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_F16A49267DD54B77A0B87D11C4D2589D" + { + "Name" = "8:BAPSControllerButtonCount" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:6" + } + "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_FE16F99D3E24491E915446FDF7AF9803" + { + "Name" = "8:BAPSControllerButtonCode2" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "ValueTypes" = "3:3" + "Value" = "3:3" + } + } + } + } + "Values" + { + } + } + } + "Values" + { + } + } + } + } + "HKCU" + { + "Keys" + { + "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_4B60FE8FCE4A4D22BFDB3F6A14EF05C0" + { + "Name" = "8:Software" + "Condition" = "8:" + "AlwaysCreate" = "11:FALSE" + "DeleteAtUninstall" = "11:FALSE" + "Transitive" = "11:FALSE" + "Keys" + { + "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_7EF27631F91F46A99B6CFEAD0055F3CF" + { + "Name" = "8:[Manufacturer]" + "Condition" = "8:" + "AlwaysCreate" = "11:FALSE" + "DeleteAtUninstall" = "11:FALSE" + "Transitive" = "11:FALSE" + "Keys" + { + } + "Values" + { + } + } + } + "Values" + { + } + } + } + } + "HKCR" + { + "Keys" + { + } + } + "HKU" + { + "Keys" + { + } + } + "HKPU" + { + "Keys" + { + } + } + } + "Sequences" + { + } + "Shortcut" + { + "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_815620B9537E4635966D927C60A97236" + { + "Name" = "8:BAPS Presenter" + "Arguments" = "8:" + "Description" = "8:" + "ShowCmd" = "3:1" + "IconIndex" = "3:0" + "Transitive" = "11:FALSE" + "Target" = "8:_8D19959388A44CB69CA8C6F1C2BE4EDA" + "Folder" = "8:_43A1F3C512FB4E99A77A7046B917D8F0" + "WorkingFolder" = "8:_AA6E4ED00D1542C3AC78BFB908085FED" + "Icon" = "8:" + "Feature" = "8:" + } + "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_BA0D4537C33E4F2F894AE496EC35BF75" + { + "Name" = "8:BAPS Presenter" + "Arguments" = "8:" + "Description" = "8:" + "ShowCmd" = "3:1" + "IconIndex" = "3:0" + "Transitive" = "11:FALSE" + "Target" = "8:_8D19959388A44CB69CA8C6F1C2BE4EDA" + "Folder" = "8:_EB395113D18D4B849F61C8AEE7E29711" + "WorkingFolder" = "8:_AA6E4ED00D1542C3AC78BFB908085FED" + "Icon" = "8:" + "Feature" = "8:" + } + } + "UserInterface" + { + "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_118C5E8DA40D47779490590152C40E9A" + { + "Name" = "8:#1902" + "Sequence" = "3:2" + "Attributes" = "3:3" + "Dialogs" + { + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_1C67BD2255EE4E4C97E1EBA28C011A3B" + { + "Sequence" = "3:100" + "DisplayName" = "8:Finished" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdAdminFinishedDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + } + } + } + } + "{2479F3F5-0309-486D-8047-8187E2CE5BA0}:_229583E115B9492F87006BFF0667FD40" + { + "UseDynamicProperties" = "11:FALSE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdBasicDialogs.wim" + } + "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_26C0F4F4A30642D89CD9D025BF47F6C9" + { + "Name" = "8:#1902" + "Sequence" = "3:1" + "Attributes" = "3:3" + "Dialogs" + { + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_F0EC8538D2A34F6FAA3FE58CC41C6A4D" + { + "Sequence" = "3:100" + "DisplayName" = "8:Finished" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdFinishedDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:2" + "Value" = "8:_279D46963AF347829CFBD3C295AA815E" + "UsePlugInResources" = "11:TRUE" + } + "UpdateText" + { + "Name" = "8:UpdateText" + "DisplayName" = "8:#1058" + "Description" = "8:#1158" + "Type" = "3:15" + "ContextData" = "8:" + "Attributes" = "3:0" + "Setting" = "3:1" + "Value" = "8:#1258" + "DefaultValue" = "8:#1258" + "UsePlugInResources" = "11:TRUE" + } + } + } + } + } + "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_2D6F7740A8BC43FDADA3418D19050C12" + { + "Name" = "8:#1900" + "Sequence" = "3:2" + "Attributes" = "3:1" + "Dialogs" + { + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_23ADE183D22041B290579228E94DC88C" + { + "Sequence" = "3:100" + "DisplayName" = "8:Welcome" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdAdminWelcomeDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + "CopyrightWarning" + { + "Name" = "8:CopyrightWarning" + "DisplayName" = "8:#1002" + "Description" = "8:#1102" + "Type" = "3:3" + "ContextData" = "8:" + "Attributes" = "3:0" + "Setting" = "3:1" + "Value" = "8:#1202" + "DefaultValue" = "8:#1202" + "UsePlugInResources" = "11:TRUE" + } + "Welcome" + { + "Name" = "8:Welcome" + "DisplayName" = "8:#1003" + "Description" = "8:#1103" + "Type" = "3:3" + "ContextData" = "8:" + "Attributes" = "3:0" + "Setting" = "3:1" + "Value" = "8:#1203" + "DefaultValue" = "8:#1203" + "UsePlugInResources" = "11:TRUE" + } + } + } + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_90F25AC9967C46A380CEE5D1B414D2F2" + { + "Sequence" = "3:200" + "DisplayName" = "8:Installation Folder" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdAdminFolderDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + } + } + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_9788125504B24018917D52F4D997C25F" + { + "Sequence" = "3:300" + "DisplayName" = "8:Confirm Installation" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdAdminConfirmDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + } + } + } + } + "{2479F3F5-0309-486D-8047-8187E2CE5BA0}:_8A2BBEA5EA134403BC5ED8BD8F5BAAB1" + { + "UseDynamicProperties" = "11:FALSE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdUserInterface.wim" + } + "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_97EB13C31ADF49E481E26EE3D8B8108C" + { + "Name" = "8:#1901" + "Sequence" = "3:1" + "Attributes" = "3:2" + "Dialogs" + { + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_06E280DD9FC44FAE98DFD124DAF85382" + { + "Sequence" = "3:100" + "DisplayName" = "8:Progress" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdProgressDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:2" + "Value" = "8:_279D46963AF347829CFBD3C295AA815E" + "UsePlugInResources" = "11:TRUE" + } + "ShowProgress" + { + "Name" = "8:ShowProgress" + "DisplayName" = "8:#1009" + "Description" = "8:#1109" + "Type" = "3:5" + "ContextData" = "8:1;True=1;False=0" + "Attributes" = "3:0" + "Setting" = "3:0" + "Value" = "3:1" + "DefaultValue" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + } + } + } + } + "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_A1B2AA132DF54A549EAFA1D85B061AEB" + { + "Name" = "8:#1900" + "Sequence" = "3:1" + "Attributes" = "3:1" + "Dialogs" + { + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_4D3D456376BF4338A0A1F7E1C305DA0C" + { + "Sequence" = "3:100" + "DisplayName" = "8:Welcome" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdWelcomeDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:2" + "Value" = "8:_279D46963AF347829CFBD3C295AA815E" + "UsePlugInResources" = "11:TRUE" + } + "CopyrightWarning" + { + "Name" = "8:CopyrightWarning" + "DisplayName" = "8:#1002" + "Description" = "8:#1102" + "Type" = "3:3" + "ContextData" = "8:" + "Attributes" = "3:0" + "Setting" = "3:1" + "Value" = "8:#1202" + "DefaultValue" = "8:#1202" + "UsePlugInResources" = "11:TRUE" + } + "Welcome" + { + "Name" = "8:Welcome" + "DisplayName" = "8:#1003" + "Description" = "8:#1103" + "Type" = "3:3" + "ContextData" = "8:" + "Attributes" = "3:0" + "Setting" = "3:2" + "Value" = "8:The installer will guide you through the steps required to install [ProductName] on your computer." + "DefaultValue" = "8:#1203" + "UsePlugInResources" = "11:TRUE" + } + } + } + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_5AD6D75903D045419F0B9812307D6312" + { + "Sequence" = "3:300" + "DisplayName" = "8:Confirm Installation" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdConfirmDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:2" + "Value" = "8:_279D46963AF347829CFBD3C295AA815E" + "UsePlugInResources" = "11:TRUE" + } + } + } + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_A72A90C22E8E42EFBF600AD4B894FBF0" + { + "Sequence" = "3:200" + "DisplayName" = "8:Installation Folder" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdFolderDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:2" + "Value" = "8:_279D46963AF347829CFBD3C295AA815E" + "UsePlugInResources" = "11:TRUE" + } + "InstallAllUsersVisible" + { + "Name" = "8:InstallAllUsersVisible" + "DisplayName" = "8:#1059" + "Description" = "8:#1159" + "Type" = "3:5" + "ContextData" = "8:1;True=1;False=0" + "Attributes" = "3:0" + "Setting" = "3:0" + "Value" = "3:1" + "DefaultValue" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + } + } + } + } + "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_D0E00A22691049A685F44762544140AA" + { + "Name" = "8:#1901" + "Sequence" = "3:2" + "Attributes" = "3:2" + "Dialogs" + { + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_0F9763BE0EF4461BA30DA70ADC7977E9" + { + "Sequence" = "3:100" + "DisplayName" = "8:Progress" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdAdminProgressDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + "ShowProgress" + { + "Name" = "8:ShowProgress" + "DisplayName" = "8:#1009" + "Description" = "8:#1109" + "Type" = "3:5" + "ContextData" = "8:1;True=1;False=0" + "Attributes" = "3:0" + "Setting" = "3:0" + "Value" = "3:1" + "DefaultValue" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + } + } + } + } + } + "MergeModule" + { + } + "ProjectOutput" + { + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_26103AD9283340DA94969F4882FB2A13" + { + "SourcePath" = "8:" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_7A85486C51C04458844B26DD5BBC80B0" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + "ProjectOutputGroupRegister" = "3:1" + "OutputConfiguration" = "8:" + "OutputGroupCanonicalName" = "8:Documentation" + "OutputProjectGuid" = "8:{4C3D1722-7B93-4081-8D61-572F8F088CED}" + "ShowKeyOutput" = "11:TRUE" + "ExcludeFilters" + { + } + } + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_316226F94C8543899B8445A98A7C0946" + { + "SourcePath" = "8:..\\BAPSServerService\\obj\\x86\\Release\\BAPSServerService.exe" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_AA6E4ED00D1542C3AC78BFB908085FED" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + "ProjectOutputGroupRegister" = "3:1" + "OutputConfiguration" = "8:" + "OutputGroupCanonicalName" = "8:Built" + "OutputProjectGuid" = "8:{A19900A2-8C8B-416A-8642-7F20CB9CA145}" + "ShowKeyOutput" = "11:TRUE" + "ExcludeFilters" + { + } + } + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_5377AB4A1E064C4590FCF306C2AF17B3" + { + "SourcePath" = "8:..\\BAPSFormControls\\obj\\x86\\Release\\BAPSFormControls.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_AA6E4ED00D1542C3AC78BFB908085FED" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + "ProjectOutputGroupRegister" = "3:1" + "OutputConfiguration" = "8:" + "OutputGroupCanonicalName" = "8:Built" + "OutputProjectGuid" = "8:{4C3D1722-7B93-4081-8D61-572F8F088CED}" + "ShowKeyOutput" = "11:TRUE" + "ExcludeFilters" + { + } + } + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_5576626F84BB40838D5F1ABFD3EEA739" + { + "SourcePath" = "8:..\\BAPSlib\\Win32\\Release\\BAPS.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_AA6E4ED00D1542C3AC78BFB908085FED" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + "ProjectOutputGroupRegister" = "3:1" + "OutputConfiguration" = "8:" + "OutputGroupCanonicalName" = "8:Built" + "OutputProjectGuid" = "8:{2EAB373E-2054-4AB5-A2F9-34139FB08AE4}" + "ShowKeyOutput" = "11:TRUE" + "ExcludeFilters" + { + } + } + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_73005F2EA8E74A8C87711792AFF08DC9" + { + "SourcePath" = "8:" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_7A85486C51C04458844B26DD5BBC80B0" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + "ProjectOutputGroupRegister" = "3:1" + "OutputConfiguration" = "8:" + "OutputGroupCanonicalName" = "8:Documentation" + "OutputProjectGuid" = "8:{46FD9397-DD3B-456A-9D95-504D60F6A9B5}" + "ShowKeyOutput" = "11:TRUE" + "ExcludeFilters" + { + } + } + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_82105C046FE744EFADDC88F49143DF37" + { + "SourcePath" = "8:..\\Win32\\Release\\BAPSServerAssembly.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_AA6E4ED00D1542C3AC78BFB908085FED" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + "ProjectOutputGroupRegister" = "3:1" + "OutputConfiguration" = "8:" + "OutputGroupCanonicalName" = "8:Built" + "OutputProjectGuid" = "8:{B93BB821-0BB3-466C-9D53-7FECF8722F1D}" + "ShowKeyOutput" = "11:TRUE" + "ExcludeFilters" + { + } + } + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_8D19959388A44CB69CA8C6F1C2BE4EDA" + { + "SourcePath" = "8:..\\Release\\BAPSPresenter.exe" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_AA6E4ED00D1542C3AC78BFB908085FED" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + "ProjectOutputGroupRegister" = "3:1" + "OutputConfiguration" = "8:" + "OutputGroupCanonicalName" = "8:Built" + "OutputProjectGuid" = "8:{46FD9397-DD3B-456A-9D95-504D60F6A9B5}" + "ShowKeyOutput" = "11:TRUE" + "ExcludeFilters" + { + } + } + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_9B4F22B9F3E24A6F984F653782E30AE3" + { + "SourcePath" = "8:" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_7A85486C51C04458844B26DD5BBC80B0" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + "ProjectOutputGroupRegister" = "3:1" + "OutputConfiguration" = "8:" + "OutputGroupCanonicalName" = "8:Documentation" + "OutputProjectGuid" = "8:{2EAB373E-2054-4AB5-A2F9-34139FB08AE4}" + "ShowKeyOutput" = "11:TRUE" + "ExcludeFilters" + { + } + } + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_AD625BB6FF5F43ACA2A45300645E68CF" + { + "SourcePath" = "8:" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_7A85486C51C04458844B26DD5BBC80B0" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + "ProjectOutputGroupRegister" = "3:1" + "OutputConfiguration" = "8:" + "OutputGroupCanonicalName" = "8:Documentation" + "OutputProjectGuid" = "8:{A19900A2-8C8B-416A-8642-7F20CB9CA145}" + "ShowKeyOutput" = "11:TRUE" + "ExcludeFilters" + { + } + } + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_DFF6EE6BB3F74D548404D7F1951625B9" + { + "SourcePath" = "8:" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_AA6E4ED00D1542C3AC78BFB908085FED" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + "ProjectOutputGroupRegister" = "3:1" + "OutputConfiguration" = "8:" + "OutputGroupCanonicalName" = "8:ContentFiles" + "OutputProjectGuid" = "8:{46FD9397-DD3B-456A-9D95-504D60F6A9B5}" + "ShowKeyOutput" = "11:TRUE" + "ExcludeFilters" + { + } + } + } + } +} From 6bcbd68619c2a9afd22959f1e055d01db5ddb3d2 Mon Sep 17 00:00:00 2001 From: Matthew Stratford Date: Mon, 22 Oct 2018 23:07:04 +0100 Subject: [PATCH 22/24] Update Controller Version No --- BAPSController/AssemblyInfo.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/BAPSController/AssemblyInfo.cpp b/BAPSController/AssemblyInfo.cpp index 021c4a7b..1deb4926 100644 --- a/BAPSController/AssemblyInfo.cpp +++ b/BAPSController/AssemblyInfo.cpp @@ -14,12 +14,12 @@ using namespace System::Security::Permissions; [assembly:AssemblyTitleAttribute("BAPS USB Controller")]; [assembly:AssemblyDescriptionAttribute(".NET wrapper for the 2nd generation BAPS Controller")]; [assembly:AssemblyConfigurationAttribute("Private")]; -[assembly:AssemblyCompanyAttribute("Uni-Software")]; +[assembly:AssemblyCompanyAttribute("URY")]; [assembly:AssemblyProductAttribute("BAPS USB Controller")]; -[assembly:AssemblyCopyrightAttribute("Copyright (c) 2008")]; -[assembly:AssemblyTrademarkAttribute("Uni-Software")]; +[assembly:AssemblyCopyrightAttribute("Copyright (c) 2018")]; +[assembly:AssemblyTrademarkAttribute("University Radio York")]; [assembly:AssemblyCultureAttribute("")]; -[assembly:AssemblyInformationalVersionAttribute("1.0.0.0")]; +[assembly:AssemblyInformationalVersionAttribute("1.1.0.0")]; // // Version information for an assembly consists of the following four values: @@ -32,7 +32,7 @@ using namespace System::Security::Permissions; // You can specify all the value or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly:AssemblyVersionAttribute("1.0.0.0")]; +[assembly:AssemblyVersionAttribute("1.1.0.0")]; [assembly:ComVisible(false)]; From cd8feed28532ea870ddb095fc620c51d675067a9 Mon Sep 17 00:00:00 2001 From: Matthew Stratford Date: Mon, 22 Oct 2018 23:07:22 +0100 Subject: [PATCH 23/24] Add Sidebar bug fix to release notes. --- RELEASE NOTES.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE NOTES.txt b/RELEASE NOTES.txt index eb3c8390..485fd13b 100644 --- a/RELEASE NOTES.txt +++ b/RELEASE NOTES.txt @@ -16,6 +16,7 @@ Fixes USB based BAPS Controller software such that the Ctrl - Alt - O menu for a All windows and popups will now appear in sensible places, central to the parent window. Audiowall now has a button to close the window. All windows now share the same icon, some had old blue logo. +The sidebar jingles/beds/adverts refresh buttons now actually follow the registry / options values. -- ## From d6b23be6ecd7983221e16cb5ca69aeb1ce811f48 Mon Sep 17 00:00:00 2001 From: Charles Pigott Date: Mon, 22 Oct 2018 23:12:12 +0100 Subject: [PATCH 24/24] Add gitattributes file --- .gitattributes | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..176a458f --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +* text=auto