From e625ab5f3a4c8eb80a14c378f59e45a65af30051 Mon Sep 17 00:00:00 2001
From: Andy McFadden <fadden@fadden.com>
Date: Thu, 26 Mar 2020 11:09:20 -0700
Subject: [PATCH] Version 4.0.4-d1

The latest DeployMaster got fussy about registry keys and whether
it's installing for the computer or a single user.  Seemed to work
okay on my system.
---
 DIST/with-mdc.deploy | 49 +++++++++++++++++++++++++++++++++++++++-----
 app/MyApp.h          |  4 ++--
 2 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/DIST/with-mdc.deploy b/DIST/with-mdc.deploy
index 6fe85ac..adc65c2 100644
--- a/DIST/with-mdc.deploy
+++ b/DIST/with-mdc.deploy
@@ -1,18 +1,26 @@
 DeployMaster Installation Script
-17
+630
 faddenSoft
 http://www.faddensoft.com/
 CiderPress
 http://a2ciderpress.com/
-4.0.3
-43081
+4.0.4d1
+TRUE
+43916
 C:\DATA\faddenSoft\fs.ico
-Copyright © 2017 CiderPress project authors.  All rights reserved.
+Copyright © 2020 CiderPress project authors.  All rights reserved.
 C:\Src\CiderPress\DIST\ReadMe.txt
 C:\Src\CiderPress\DIST\License.txt
 FALSE
 
 
+FALSE
+%PROGRAMFILES%\faddenSoft\CiderPress
+%COMMONFILES%\faddenSoft\
+%PROGRAMSMENU%\CiderPress
+
+TRUE
+TRUE
 %PROGRAMFILES%\faddenSoft\CiderPress
 %COMMONFILES%\faddenSoft\
 %PROGRAMSMENU%\CiderPress
@@ -31,9 +39,19 @@ TRUE
 TRUE
 TRUE
 TRUE
+1507
+9999
 TRUE
 1
 You are attempting to run the installer for %APP% %VERSION%.  This installer supports the following versions of Windows: %INSTALLER%.  You are running %USER%.  Please check the developer's website to see whether there is a separate installer for %APP% that you can use on %USER%.
+FALSE
+FALSE
+FALSE
+FALSE
+3
+The installer for %APP% %VERSION% needs to be able to write to folders that look like they are being protected by Controlled Folder Access in Windows Defender.
+
+You will need to add %FILE% to the list of apps allowed through Controlled Folder Access in Windows Defender.  Do this before you click Yes to continue with the installation.  Otherwise the installer will not be able to properly install %APP% %VERSION%.
 TRUE
 TRUE
 1
@@ -283,6 +301,14 @@ FALSE
 TRUE
 CiderPress
 +
+HKEY_AUTO
+0
+FALSE
++
+Software
+0
+FALSE
+-
 HKEY_CLASSES_ROOT
 0
 FALSE
@@ -322,6 +348,14 @@ TRUE
 -
 -
 -
+HKEY_USERS
+0
+FALSE
++
+Software
+0
+FALSE
+-
 -
 0
 FALSE
@@ -353,11 +387,16 @@ FALSE
 0
 FALSE
 36725
+FALSE
+43446
+FALSE
+365
+0
 0
 4095
 
 
-Setup403.exe
+Setup404d1.exe
 
 FALSE
 
diff --git a/app/MyApp.h b/app/MyApp.h
index 30f0971..c91e783 100644
--- a/app/MyApp.h
+++ b/app/MyApp.h
@@ -14,8 +14,8 @@
 /* CiderPress version numbers */
 #define kAppMajorVersion    4
 #define kAppMinorVersion    0
-#define kAppBugVersion      3
-#define kAppDevString       L""
+#define kAppBugVersion      4
+#define kAppDevString       L"d1"
 
 /*
  * Windows application object.