From 14627f5e4fa6d2218e7b066978ca0587d0becc95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20H=C3=B6glinger-Stelzer?= <nefarius@dhmx.at>
Date: Tue, 20 Nov 2018 02:40:00 +0100
Subject: [PATCH] Wording fix

---
 DerpingDrivers/MainWindow.xaml | 86 +++++++++++++++++++++++-----------
 1 file changed, 59 insertions(+), 27 deletions(-)

diff --git a/DerpingDrivers/MainWindow.xaml b/DerpingDrivers/MainWindow.xaml
index 8476310..ba57cc2 100644
--- a/DerpingDrivers/MainWindow.xaml
+++ b/DerpingDrivers/MainWindow.xaml
@@ -65,7 +65,7 @@
 
                 <Label Grid.Row="5" Grid.Column="0">Secure Boot state:</Label>
                 <Label Grid.Row="5" Grid.Column="2" Content="{Binding Path=SecureBootEnabled}"
-                       ToolTip="Boot drivers must be WHQL certified." />
+                       ToolTip="Boot drivers must be WHQL certified if enabled." />
 
                 <Label Grid.Row="6" Grid.Column="0">OS upgrade status:</Label>
                 <Label Grid.Row="6" Grid.Column="2" Content="{Binding Path=OsUpgradeStatus}"
@@ -87,29 +87,59 @@
         <TabItem Header="Test Settings">
             <Grid>
                 <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="*" />
                 </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition />
-                    <ColumnDefinition />
-                </Grid.ColumnDefinitions>
 
-                <controls:ToggleSwitch Grid.Row="0" Grid.Column="0"
-                                       Margin="0,10,0,0"
-                                       Header="Allow Prerelease Signatures"
-                                       OnLabel="TESTSINGING is on"
-                                       OffLabel="TESTSINGING is off"
-                                       IsChecked="{Binding Path=AllowPrereleaseSignatures}" />
+                <Label Grid.Row="0">A reboot is required for these changes to become active!</Label>
 
-                <controls:ToggleSwitch Grid.Row="1" Grid.Column="0"
-                                       Margin="0,10,0,0"
-                                       Header="WHQL Developer Test Mode"
-                                       OnLabel="Cross-signed driver loading allowed"
-                                       OffLabel="Only WHQL-signed drivers allowed"
-                                       IsEnabled="{Binding Path=IsWindows10}"
-                                       IsChecked="{Binding Path=WhqlDeveloperTestMode}" />
+                <Grid Grid.Row="1" Margin="0,20,0,0">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="*" />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition />
+                        <ColumnDefinition />
+                    </Grid.ColumnDefinitions>
+
+                    <controls:ToggleSwitch Grid.Row="0" Grid.Column="0"
+                                           Margin="0,10,0,0"
+                                           Header="Allow Prerelease Signatures"
+                                           OnLabel="TESTSINGING is on"
+                                           OffLabel="TESTSINGING is off"
+                                           IsChecked="{Binding Path=AllowPrereleaseSignatures}" />
+
+                    <TextBlock Grid.Row="0" Grid.Column="1"
+                               Margin="10,0,0,0"
+                               TextWrapping="Wrap" 
+                               TextAlignment="Justify"
+                               VerticalAlignment="Center">
+                        The TESTSIGNING boot configuration option determines whether Windows Vista and later versions of Windows will load 
+                        any type of test-signed kernel-mode code. This option is not set by default, which means test-signed kernel-mode 
+                        drivers will not load by default on 64-bit versions of Windows Vista and later versions of Windows.
+                    </TextBlock>
+
+                    <controls:ToggleSwitch Grid.Row="1" Grid.Column="0"
+                                           Margin="0,10,0,0"
+                                           Header="WHQL Developer Test Mode"
+                                           OnLabel="Cross-signed driver loading allowed"
+                                           OffLabel="Only WHQL-signed drivers allowed"
+                                           IsEnabled="{Binding Path=IsWindows10}"
+                                           IsChecked="{Binding Path=WhqlDeveloperTestMode}" />
+                    
+                    <TextBlock Grid.Row="1" Grid.Column="1"
+                               Margin="10,20,0,0"
+                               TextWrapping="Wrap" 
+                               TextAlignment="Justify"
+                               VerticalAlignment="Center">
+                        When the WhqlDeveloperTestMode is enabled, WHQL signatures are not required. A WHQL-signed driver is signed with a 
+                        certificate whose private key is kept by Microsoft so that only Microsoft can do the signing. Microsoft’s involvement 
+                        in cross-signing is only indirect, to vet CAs as having sufficiently high standards for authenticating that whoever 
+                        they issue their certificates to is an identifiable (and hopefully responsible) software publisher.
+                    </TextBlock>
+                </Grid>
             </Grid>
         </TabItem>
 
@@ -154,7 +184,7 @@
                             Content="{iconPacks:FontAwesome Kind=NodeJsBrands, Width=32, Height=32}"
                             ToolTip="Visit community forums"
                             Click="Forums_OnClick" />
-                    
+
                     <Button Grid.Column="3"
                             Margin="10"
                             Width="64" Height="64"
@@ -168,13 +198,15 @@
                 <TextBlock TextWrapping="Wrap"
                            TextAlignment="Justify"
                            Grid.Row="1">
-                    MIT License<LineBreak/>
-                    Copyright (c) 2018 Benjamin Höglinger-Stelzer<LineBreak/>
-                    <LineBreak/>
-                    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:<LineBreak/>
-                    <LineBreak/>
-                    The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.<LineBreak/>
-                    <LineBreak/>
+                    MIT License<LineBreak />
+                    Copyright (c) 2018 Benjamin Höglinger-Stelzer<LineBreak />
+                    <LineBreak />
+                    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+                    <LineBreak />
+                    <LineBreak />
+                    The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+                    <LineBreak />
+                    <LineBreak />
                     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
                 </TextBlock>