GraphicsMagick: VisualMagick/installer/inc/body.isx 64 bit distr...

changeset 351c48be6ba2 in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=351c48be6ba2
summary: VisualMagick/installer/inc/body.isx 64 bit distribution MUST NOT be installed on pure	32 bit system. Sanity check added.

diffstat:

 ChangeLog                                 |   5 ++++-
 VisualMagick/installer/inc/body.isx       |  15 +++++++++++++++
 VisualMagick/installer/inc/files-dlls.isx |   2 +-
 3 files changed, 20 insertions(+), 2 deletions(-)

diffs (60 lines):

diff -r a51272db0457 -r 351c48be6ba2 ChangeLog
--- a/ChangeLog	Thu Jan 05 06:22:44 2023 +0100
+++ b/ChangeLog	Thu Jan 05 07:48:58 2023 +0100
@@ -1,3 +1,7 @@
+2023-01-05 Fojtik Jaroslav  <[email protected]>
+	* VisualMagick/installer/inc/body.isx 64 bit distribution MUST NOT be installed on pure
+	32 bit system. Sanity check added.
+
 2023-01-05 Fojtik Jaroslav  <[email protected]>
 
 	* VisualMagick/installer/inc/body.isx
@@ -6,7 +10,6 @@
 	( VisualMagick/installer/redist/VC2008SP1/vcredist_x86.exe must be downloaded from www) 
 	Fix graphics magick installer for Windows.
 
-
 2023-01-04 Fojtik Jaroslav  <[email protected]>
 
 	* VisualMagick/tests/runtest.bat Added new tests for PGX (jp2), MAT,
diff -r a51272db0457 -r 351c48be6ba2 VisualMagick/installer/inc/body.isx
--- a/VisualMagick/installer/inc/body.isx	Thu Jan 05 06:22:44 2023 +0100
+++ b/VisualMagick/installer/inc/body.isx	Thu Jan 05 07:48:58 2023 +0100
@@ -115,6 +115,7 @@
 
 [Code]
 
+
 #IFDEF UNICODE
   #DEFINE AW "W"
 #ELSE
@@ -190,3 +191,17 @@
   Result := not ((r1 and r2) or r3);
 end;
 
+
+#ifdef WIN64
+// Sanity check to prevent installation on 32 bit system.
+function InitializeSetup(): Boolean;
+begin
+ if not IsWin64() then begin
+   MsgBox('Windows 64 bit distribution should not be installed on WIN 32 system', mbError, MB_OK);
+   Result := false;
+   end 
+ else begin
+   Result := true;
+ end;
+end;
+#endif
diff -r a51272db0457 -r 351c48be6ba2 VisualMagick/installer/inc/files-dlls.isx
--- a/VisualMagick/installer/inc/files-dlls.isx	Thu Jan 05 06:22:44 2023 +0100
+++ b/VisualMagick/installer/inc/files-dlls.isx	Thu Jan 05 07:48:58 2023 +0100
@@ -8,7 +8,7 @@
 ;
 #endif
 
-#define  public MSVCRedist "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\redist"
+;#define  public MSVCRedist "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\redist"
 
 #ifdef WIN64
   #define  public CPUARCH "amd64"