From c8233845f82131c6347409a216a49bbe6b5dbb0c Mon Sep 17 00:00:00 2001
From: SuperPat <guerin45@free.fr>
Date: Tue, 31 Oct 2017 12:06:25 +0100
Subject: [PATCH] Fixed UMUI_PAGE_SERIALNUMBER and UMUI_PAGE_SERIALNUMBER pages
 did not compile.

---
 Contrib/UltraModernUI/UMUI.nsh | 41 +++++++++++++++++++++++++---------
 Docs/UltraModernUI/Readme.html | 10 +++++++--
 2 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/Contrib/UltraModernUI/UMUI.nsh b/Contrib/UltraModernUI/UMUI.nsh
index 268fee1..285e8e0 100644
--- a/Contrib/UltraModernUI/UMUI.nsh
+++ b/Contrib/UltraModernUI/UMUI.nsh
@@ -467,7 +467,7 @@ Var UMUI_INSTALLFLAG                ; Contains a OR of all the flags define here
       ChangeUI IDD_SELCOM "${UMUI_UI_COMPONENTSPAGE_BIGDESC}"
     !endif
 
-    ; Workaround for unsigned detail button
+    ; Workaround for unstyled detail button
     !ifdef UMUI_BUTTONIMAGE_BMP | UMUI_UNBUTTONIMAGE_BMP
       !if ! "${UMUI_XPSTYLE}" == "On"
         ChangeUI IDD_INSTFILES "${UMUI_UI_SB}"
@@ -1625,7 +1625,26 @@ Var UMUI_INSTALLFLAG                ; Contains a OR of all the flags define here
             StrCmp $MUI_TEMP1 HKPD 0 +2
               WriteRegStr HKPD "$MUI_TEMP2" "$R2" "$R3"
               Goto loop
-
+            !if ${NSIS_PACKEDVERSION} >= 0x03002000
+              StrCmp $MUI_TEMP1 HKCR32 0 +2
+                WriteRegStr HKCR32 "$MUI_TEMP2" "$R2" "$R3"
+                Goto loop
+              StrCmp $MUI_TEMP1 HKCR64 0 +2
+                WriteRegStr HKCR64 "$MUI_TEMP2" "$R2" "$R3"
+                Goto loop
+              StrCmp $MUI_TEMP1 HKCU32 0 +2
+                WriteRegStr HKCU32 "$MUI_TEMP2" "$R2" "$R3"
+                Goto loop
+              StrCmp $MUI_TEMP1 HKCU64 0 +2
+                WriteRegStr HKCU64 "$MUI_TEMP2" "$R2" "$R3"
+                Goto loop
+              StrCmp $MUI_TEMP1 HKLM32 0 +2
+                WriteRegStr HKLM32 "$MUI_TEMP2" "$R2" "$R3"
+                Goto loop
+              StrCmp $MUI_TEMP1 HKLM64 0 +2
+                WriteRegStr HKLM64 "$MUI_TEMP2" "$R2" "$R3"
+                Goto loop
+            !endif
       end:
       ClearErrors
 
@@ -5865,15 +5884,15 @@ Var UMUI_INSTALLFLAG                ; Contains a OR of all the flags define here
     !endif
   !endif
 
-  PageEx custom
+  PageEx ${MUI_PAGE_UNINSTALLER_FUNCPREFIX}custom
 
-    PageCallbacks mui.AdditionalTasksPre_${MUI_UNIQUEID} mui.AdditionalTasksLeave_${MUI_UNIQUEID}
+    PageCallbacks ${MUI_PAGE_UNINSTALLER_FUNCPREFIX}mui.AdditionalTasksPre_${MUI_UNIQUEID} ${MUI_PAGE_UNINSTALLER_FUNCPREFIX}mui.AdditionalTasksLeave_${MUI_UNIQUEID}
 
     Caption " "
 
   PageExEnd
 
-  !insertmacro UMUI_FUNCTION_ADDITIONALTASKSPAGE mui.AdditionalTasksPre_${MUI_UNIQUEID} mui.AdditionalTasksLeave_${MUI_UNIQUEID}
+  !insertmacro UMUI_FUNCTION_ADDITIONALTASKSPAGE ${MUI_PAGE_UNINSTALLER_FUNCPREFIX}mui.AdditionalTasksPre_${MUI_UNIQUEID} ${MUI_PAGE_UNINSTALLER_FUNCPREFIX}mui.AdditionalTasksLeave_${MUI_UNIQUEID}
 
   !undef UMUI_ADDITIONALTASKSPAGE_TEXT_TOP
 
@@ -6420,15 +6439,15 @@ Var UMUI_INSTALLFLAG                ; Contains a OR of all the flags define here
     !define UMUI_VAR_UMUI_SNTEXT
   !endif
 
-  PageEx custom
+  PageEx ${MUI_PAGE_UNINSTALLER_FUNCPREFIX}custom
 
-    PageCallbacks mui.serialnumberPre_${MUI_UNIQUEID} mui.serialnumberLeave_${MUI_UNIQUEID}
+    PageCallbacks ${MUI_PAGE_UNINSTALLER_FUNCPREFIX}mui.serialnumberPre_${MUI_UNIQUEID} ${MUI_PAGE_UNINSTALLER_FUNCPREFIX}mui.serialnumberLeave_${MUI_UNIQUEID}
 
     Caption " "
 
   PageExEnd
 
-  !insertmacro UMUI_FUNCTION_SERIALNUMBERPAGE mui.serialnumberPre_${MUI_UNIQUEID} mui.serialnumberLeave_${MUI_UNIQUEID}
+  !insertmacro UMUI_FUNCTION_SERIALNUMBERPAGE ${MUI_PAGE_UNINSTALLER_FUNCPREFIX}mui.serialnumberPre_${MUI_UNIQUEID} ${MUI_PAGE_UNINSTALLER_FUNCPREFIX}mui.serialnumberLeave_${MUI_UNIQUEID}
 
   !undef UMUI_SERIALNUMBERPAGE_TEXT_TOP
 
@@ -8715,15 +8734,15 @@ Var UMUI_INSTALLFLAG                ; Contains a OR of all the flags define here
     !define UMUI_VAR_NEWVERSION
   !endif
 
-  PageEx custom
+  PageEx ${MUI_PAGE_UNINSTALLER_FUNCPREFIX}custom
 
-    PageCallbacks mui.updatePre_${MUI_UNIQUEID} mui.updateLeave_${MUI_UNIQUEID}
+    PageCallbacks ${MUI_PAGE_UNINSTALLER_FUNCPREFIX}mui.updatePre_${MUI_UNIQUEID} ${MUI_PAGE_UNINSTALLER_FUNCPREFIX}mui.updateLeave_${MUI_UNIQUEID}
 
     Caption " "
 
   PageExEnd
 
-  !insertmacro UMUI_FUNCTION_UPDATEPAGE mui.updatePre_${MUI_UNIQUEID} mui.updateLeave_${MUI_UNIQUEID}
+  !insertmacro UMUI_FUNCTION_UPDATEPAGE ${MUI_PAGE_UNINSTALLER_FUNCPREFIX}mui.updatePre_${MUI_UNIQUEID} ${MUI_PAGE_UNINSTALLER_FUNCPREFIX}mui.updateLeave_${MUI_UNIQUEID}
 
   !insertmacro MUI_UNSET UMUI_UPDATEPAGE_TEXT
   !insertmacro MUI_UNSET UMUI_UPDATEPAGE_UPDATE_TITLE
diff --git a/Docs/UltraModernUI/Readme.html b/Docs/UltraModernUI/Readme.html
index b6e04db..85b1654 100644
--- a/Docs/UltraModernUI/Readme.html
+++ b/Docs/UltraModernUI/Readme.html
@@ -1206,11 +1206,11 @@ <h2>3. Pages</h2>
       <li>MUI_UNPAGE_CONFIRM</li>
       <li>MUI_UNPAGE_LICENSE <span class="parameter">text/rtf_file</span></li>
       <li><span class="blue">UMUI_UNPAGE_INFORMATION</span> <span class="parameter">text/rtf_files</span></li>
-      <li><span class="blue">UMUI_UNPAGE_SERIALNUMBER</span> <span class="parameter">function</span></li>
+      <li><span class="blue">UMUI_UNPAGE_SERIALNUMBER</span> <span class="parameter">un.function</span></li>
       <li><span class="blue">UMUI_UNPAGE_SETUPTYPE</span></li>
       <li>MUI_UNPAGE_COMPONENTS</li>
       <li>MUI_UNPAGE_DIRECTORY</li>
-      <li><span class="blue">UMUI_UNPAGE_ADDITIONALTASKS</span> <span class="parameter">page_id function</span></li>
+      <li><span class="blue">UMUI_UNPAGE_ADDITIONALTASKS</span> <span class="parameter">page_id un.function</span></li>
       <li><span class="blue">UMUI_UNPAGE_CONFIRM</span></li>
       <li><span class="blue">UMUI_UNPAGE_FILEDISKREQUEST</span></li>
       <li>MUI_UNPAGE_INSTFILES</li>
@@ -2642,6 +2642,12 @@ <h1><a id="examples"></a>Example Scripts</h1>
 <h1>Version History</h1>
 <ul>
 
+  <li><strong>Version 2.0 beta 4</strong> - ???? ??, 2017
+  <ul>
+    <li>Fixed UMUI_PAGE_SERIALNUMBER and UMUI_PAGE_SERIALNUMBER pages did not compile.</li>
+  </ul>
+  </li>
+
   <li><strong>Version 2.0 beta 3</strong> - August 06, 2017
   <ul>
     <li>New Bulgarian language files by Angel.</li>