From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 19 Jan 2021 17:28:16 +0000 (+0000)
Subject: wait #4023 @2
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=aa5d3107d0b963c40ddfed1b226d9263fc29951f;p=cubeextranet.git

wait #4023 @2
---

diff --git a/desktop/assets/flashplayer32_0r0_344_winpep.msi b/desktop/assets/flashplayer32_0r0_344_winpep.msi
new file mode 100644
index 000000000..f6514a998
Binary files /dev/null and b/desktop/assets/flashplayer32_0r0_344_winpep.msi differ
diff --git a/desktop/assets/mms.cfg b/desktop/assets/mms.cfg
new file mode 100644
index 000000000..bd4037c4f
--- /dev/null
+++ b/desktop/assets/mms.cfg
@@ -0,0 +1,6 @@
+EOLUninstallDisable=1
+SilentAutoUpdateEnable=0
+EnableAllowList=1
+AutoUpdateDisable=1
+ErrorReportingEnable=1
+AllowListUrlPattern=https://workshop.fluidbook.com
\ No newline at end of file
diff --git a/desktop/windows-installer/Fluidbook-Workshop.exe b/desktop/windows-installer/Fluidbook-Workshop.exe
index 3206a4b93..d8dd23b5c 100644
Binary files a/desktop/windows-installer/Fluidbook-Workshop.exe and b/desktop/windows-installer/Fluidbook-Workshop.exe differ
diff --git a/desktop/windows-installer/FluidbookWorkshop.nsis b/desktop/windows-installer/FluidbookWorkshop.nsis
index 221ec276a..bb7b1fb68 100644
--- a/desktop/windows-installer/FluidbookWorkshop.nsis
+++ b/desktop/windows-installer/FluidbookWorkshop.nsis
@@ -40,15 +40,25 @@ Section "" ;No components page, name is not important
     ; Set output path to the installation directory.
     SetOutPath $INSTDIR
 
-    File "H:\Works\cubeExtranet\desktop\assets\install_flash_player_ppapi.exe"
+    File "H:\Works\cubeExtranet\desktop\assets\flashplayer32_0r0_344_winpep.msi"
     File "H:\Works\cubeExtranet\desktop\assets\uninstall_flash_player.exe"
-    ExecWait "$INSTDIR\uninstall_flash_player.exe"
-    ExecWait "$INSTDIR\install_flash_player_ppapi.exe"
 
     ; Put file there
     SetOverwrite ifnewer
     File /a  /r "H:\Works\cubeExtranet\desktop\windows\workshop\windows-x32\"
 
+    SetOverwrite on
+    ExecWait "$INSTDIR\uninstall_flash_player.exe -uninstall"
+    ExecWait "$WINDIR\System32\msiexec.exe /i $\"$INSTDIR\flashplayer32_0r0_344_winpep.msi$\" /qn /norestart"
+
+    SetOutPath $WINDIR\SysWOW64\Macromed\Flash
+    SetOverwrite on
+    File "H:\Works\cubeExtranet\desktop\assets\mms.cfg"
+
+    SetOutPath $WINDIR\System32\Macromed\Flash
+    SetOverwrite on
+    File "H:\Works\cubeExtranet\desktop\assets\mms.cfg"
+
     ; Create shortcut
     CreateShortCut "$SMPROGRAMS\${FLUIDBOOKNAME}.lnk" "$INSTDIR\workshop.exe" "" "$INSTDIR\package.nw\icon.ico"
     CreateShortCut "$DESKTOP\${FLUIDBOOKNAME}.lnk" "$INSTDIR\workshop.exe" "" "$INSTDIR\package.nw\icon.ico"
@@ -61,8 +71,6 @@ Section "" ;No components page, name is not important
     WriteRegStr HKCU "${REG_UNINSTALL}" "UninstallString" "$\"$INSTDIR\Uninstall.exe$\""
 
     WriteUninstaller "$INSTDIR\Uninstall.exe"
-
-    ExecShell "" "$INSTDIR\workshop.exe"
 SectionEnd
 
 Section "Uninstall"