Merge remote-tracking branch 'remotes/origin/develop'

# Conflicts:
#	README.md

Author: jonathanbennett73

HISTORY.txt

@@ -0,0 +1,15 @@
+
+HISTORY
+=======
+
+v1.0.0.0 - 28th Jun 2018
+------------------------
+ - Added 2 level password option for admins and users.
+ - Added customizable user tools menu for launching command prompts, registry tools, anything!
+ - Added task sequence variables explorer and editor.
+ - Options.xml reorganized.
+ 
+
+v0.1.0.0 - 30th Jan 2018
+------------------------
+Initial release.

README.md

@@ -9,8 +9,17 @@ When doing an SCCM or MDT Operating System Deployment a common task is to custom
 
 During Windows 7 setup there is a window that shows the message "Setup is preparing your computer for first use". On Windows 8 and Windows 10 that message is "Getting Ready" or the circling dots animation. These setup windows obscure the background thus hiding our custom background.
 
-The only solution is to create a new custom window and place it above this progress window and fill it with our wallpaper bitmap thus creating a "fake" background.
+The only solution is to create a new custom window and place it above this progress window and fill it with our wallpaper bitmap thus creating a "fake" background. Additionally, the tool also registers a hotkey combination to bring up a debug menu for running user configurable tools and task sequence variables.
 
 ## Main Web Site and Binary Downloads
 
 Please see the product page for more details and binary downloads. [https://www.autoitconsulting.com/site/software/osd-background/](https://www.autoitconsulting.com/site/software/osd-background/).
+
+## Features
+Here are some of the key features of OSD Background:
+* Allows background bitmap to be seen on Windows 10 during deployment.
+* Background can be configured to show an automatic progress bar that is based on the position in the current task sequence
+* Hotkey combination (Ctrl+Alt+F12) will bring up a debug menu.
+* Debug menu can be protected with two different passwords for Admin and User levels access.
+* User-configurable tools menu. Command prompts, registry editing, system information, anything! Individual tools can be marked as 'Admin Only' and are only shown when the Admin password is used to open the menu.
+* Editable list of task sequence variables.

src/AutoIt.OSD.Background/AutoIt.OSD.Background.csproj

@@ -56,6 +56,10 @@
     <ApplicationIcon>Resources\main.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="ProgressUILib_DotNet40">
+      <HintPath>ReferenceAssemblies\TSCore\ProgressUILib_DotNet40.dll</HintPath>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -78,6 +82,20 @@
     <Compile Include="FormBackground.Designer.cs">
       <DependentUpon>FormBackground.cs</DependentUpon>
     </Compile>
+    <Compile Include="FormPassword.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FormPassword.Designer.cs">
+      <DependentUpon>FormPassword.cs</DependentUpon>
+    </Compile>
+    <Compile Include="FormTools.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FormTools.Designer.cs">
+      <DependentUpon>FormTools.cs</DependentUpon>
+    </Compile>
+    <Compile Include="KeyboardHook.cs" />
+    <Compile Include="NamedPipeXmlPayload.cs" />
     <Compile Include="Options.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -93,6 +111,12 @@
     <EmbeddedResource Include="FormBackground.resx">
       <DependentUpon>FormBackground.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="FormPassword.resx">
+      <DependentUpon>FormPassword.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="FormTools.resx">
+      <DependentUpon>FormTools.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
@@ -158,9 +182,6 @@
     <Content Include="Example\Error.jpg">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Example\Options.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
     <Content Include="Example\OSD_SetPhase.vbs">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
@@ -175,7 +196,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>if $(ConfigurationName)==Debug goto :debug
-call "generate_release_package.cmd"
+REM call "generate_release_package.cmd"
 :debug</PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

src/AutoIt.OSD.Background/Example/OSD_SetPhase.vbs

@@ -1,16 +1,13 @@
 
 '-----------------------------------------------------------------------------
 ' ScriptName:	OSD_SetPhase.vbs
-' Date:			23/01/18
+' Date:			26/06/18
 ' Author:		Jonathan Bennett <jon@autoitconsulting.com>
 ' Purpose:		Launches BGinfo to customize the desktop and then ensure it is visible on Windows 7 / 8 / 10.
-' Usage:			cscript.exe OSD_SetPhase.vbs "Installing Something"  (Use the phrase "ERROR: xxxx" to show the Error.jpg bitmap")
+' Usage:		cscript.exe OSD_SetPhase.vbs "Installing Something"  (Use the phrase "ERROR: xxxx" to show the Error.jpg bitmap")
 '-----------------------------------------------------------------------------
 Option Explicit
 
-' Set this to True if your WinPE boot image has .NET support and AutoIt.OSD.Background.exe works correctly there
-Const DotNetInWinPE = False
-
 Const WinStyleMinimizedInactive = 7
 Const WinStyleNormal = 1
 Const WinStyleHidden = 0
@@ -24,20 +21,22 @@ Dim g_bTaskSequenceRunning : g_bTaskSequenceRunning = False
 On Error Resume Next
 Dim g_oTSEnv : Set g_oTSEnv = CreateObject("Microsoft.SMS.TSEnvironment")
 If Err.Number = 0 Then 
-	g_bTaskSequenceRunning = True
+	' May succeed because of a failed Task Sequence or bad clean-up of COM objects.
+	' Double check by reading the Task Sequence type, if its blank - not in a Task Sequence
+	If g_oTSEnv("_SMSTSType") <> "" Then 
+		g_bTaskSequenceRunning = True
+	End If	
 End If
 On Error Goto 0
 
-Dim sBGInfoText
-
 ' Get arguments
+Dim sBGInfoText
 Dim oArgs : Set oArgs = WScript.Arguments
 If oArgs.Count >= 1 Then
 	sBGInfoText = oArgs(0)
 End If
 
 Dim sBgi : sBgi = "Default.bgi"
-
 If InStr(UCase(sBGInfoText), "ERROR:") > 0 Then
 	sBgi = "Error.bgi"
 End If
@@ -63,16 +62,8 @@ Else
 End If
 On Error Goto 0
 
-' We run differently depending on if we are in WinPE as we can't really assume that .NET is present.
-Dim bInWinPE
-If UCase(GetTSVariable("_SMSTSInWinPE")) = "TRUE" Then
-	bInWinPE = True
-Else	
-	bInWinPE = False
-End If
-
-' Run our custom OSD background exe?
-If bInWinPE = False Or (bInWinPE = True And DotNetInWinPE = True) Then
+' Run our custom OSD background exe? Needs .NET 4 or later
+If IsDotNet4Or45Installed() Then
 	On Error Resume Next			
 	g_oShell.Run "AutoIt.OSD.Background.exe Options.xml", WinStyleNormal, False
 	On Error Goto 0
@@ -90,3 +81,33 @@ Function GetTSVariable(ByVal sVar)
 End Function
 
 '----------------------------------------------------
+	
+Function IsDotNet4Or45Installed()
+	
+	If ReadFromRegistry("HKLM\SOFTWARE\Microsoft\NET Framework Setup\NDP\v4.0\Full\Version", "") <> "" Then
+		IsDotNet4Or45Installed = True
+	ElseIf ReadFromRegistry("HKLM\SOFTWARE\Microsoft\NET Framework Setup\NDP\v4.0\Client\Version", "") <> "" Then
+		IsDotNet4Or45Installed = True
+	ElseIf ReadFromRegistry("HKLM\SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full\Version", "") <> "" Then
+		IsDotNet4Or45Installed = True
+	Else
+		IsDotNet4Or45Installed = False
+	End If
+	
+End Function
+	
+'----------------------------------------------------
+
+Function ReadFromRegistry (ByVal strRegistryKey, ByVal strDefault )
+	On Error Resume Next
+	
+	Dim val : val = g_oShell.RegRead( strRegistryKey )
+	if err.number <> 0 then
+	
+		ReadFromRegistry = strDefault
+	else
+		ReadFromRegistry = val
+	end if
+End Function
+
+'----------------------------------------------------

src/AutoIt.OSD.Background/Example/Options.xml

@@ -1,3 +1,8 @@
+AutoIt.OSD.Background Example
+-----------------------------
+https://www.autoitconsulting.com/site/software/osd-background/
+
+
 1. Please download Sysinternals BGInfo from:
 
 https://docs.microsoft.com/en-us/sysinternals/downloads/bginfo
@@ -7,11 +12,14 @@ Open the archive and copy BGInfo.exe and BGInfo64.exe into this folder.
 
 2. Modify Options.xml as required.
 
-3. Open BGInfo.exe and open Default.bgi and Error.bgi to customize your BGInfo text.
+3. Run the script inside your task sequence like so:
 
-4. Modify Default.jpg and Error.jpg as required.
+	cscript.exe //NoLogo OSD_SetPhase.vbs "This is some phase text"
 
-5. Run the script inside your task sequence like so:
 
-	cscript.exe //NoLogo OSD_SetPhase.vbs "This is some phase text"
+
+
+To customize the bitmaps used edit Default.jpg and Error.jpg.
+
+Open BGInfo.exe and open Default.bgi and Error.bgi to customize your BGInfo text.